Author: [log in to unmask]
Date: Thu Dec 11 14:49:25 2014
New Revision: 1701
Log:
Make detector name and run number top level arguments to the CLI tool. They are given default arguments if not present.
Modified:
java/trunk/conditions/src/main/java/org/hps/conditions/cli/AddCommand.java
java/trunk/conditions/src/main/java/org/hps/conditions/cli/CommandLineTool.java
java/trunk/conditions/src/main/java/org/hps/conditions/cli/LoadCommand.java
Modified: java/trunk/conditions/src/main/java/org/hps/conditions/cli/AddCommand.java
=============================================================================
--- java/trunk/conditions/src/main/java/org/hps/conditions/cli/AddCommand.java (original)
+++ java/trunk/conditions/src/main/java/org/hps/conditions/cli/AddCommand.java Thu Dec 11 14:49:25 2014
@@ -35,13 +35,7 @@
void execute(String[] arguments) {
super.execute(arguments);
-
- try {
- DatabaseConditionsManager.getInstance().setDetector(DatabaseConditionsManager.getDefaultEngRunDetectorName(), 2000);
- } catch (ConditionsNotFoundException e) {
- throw new RuntimeException(e);
- }
-
+
int runStart = Integer.parseInt(commandLine.getOptionValue("r"));
int runEnd = runStart;
if (commandLine.hasOption("e")) {
@@ -72,11 +66,6 @@
int collectionId = Integer.parseInt(commandLine.getOptionValue("c"));
ConditionsRecord conditionsRecord = new ConditionsRecord();
- //try {
- // conditionsRecord.setTableMetaData(DatabaseConditionsManager.getInstance().findTableMetaData(TableConstants.CONDITIONS_RECORD));
- //} catch (ConditionsObjectException e) {
- // throw new RuntimeException("Problem assigning meta data to record.", e);
- //}
FieldValueMap fieldValues = new FieldValueMap();
fieldValues.put("run_start", runStart);
fieldValues.put("run_end", runEnd);
Modified: java/trunk/conditions/src/main/java/org/hps/conditions/cli/CommandLineTool.java
=============================================================================
--- java/trunk/conditions/src/main/java/org/hps/conditions/cli/CommandLineTool.java (original)
+++ java/trunk/conditions/src/main/java/org/hps/conditions/cli/CommandLineTool.java Thu Dec 11 14:49:25 2014
@@ -12,6 +12,7 @@
import org.apache.commons.cli.ParseException;
import org.apache.commons.cli.PosixParser;
import org.hps.conditions.database.DatabaseConditionsManager;
+import org.lcsim.conditions.ConditionsManager.ConditionsNotFoundException;
/**
* <p>
@@ -101,7 +102,20 @@
if (verbose)
System.out.println("using XML config file " + xmlConfigFile.getPath());
}
- conditionsManager.openConnection();
+
+ String detectorName = DatabaseConditionsManager.getDefaultEngRunDetectorName();
+ if (commandLine.hasOption("d")) {
+ detectorName = commandLine.getOptionValue("d");
+ }
+ int runNumber = 2000;
+ if (commandLine.hasOption("r")) {
+ runNumber = Integer.parseInt(commandLine.getOptionValue("r"));
+ }
+ try {
+ DatabaseConditionsManager.getInstance().setDetector(detectorName, runNumber);
+ } catch (ConditionsNotFoundException e) {
+ throw new RuntimeException(e);
+ }
}
void printUsage() {
@@ -130,6 +144,8 @@
cli.options.addOption(new Option("v", false, "Enable verbose terminal output"));
cli.options.addOption(new Option("p", true, "Set the connection properties file"));
cli.options.addOption(new Option("x", true, "Set the conditions database XML configuration file"));
+ cli.options.addOption(new Option("d", true, "Set the detector name"));
+ cli.options.addOption(new Option("r", true, "Set the run number"));
cli.registerCommand(new LoadCommand());
cli.registerCommand(new PrintCommand());
cli.registerCommand(new AddCommand());
Modified: java/trunk/conditions/src/main/java/org/hps/conditions/cli/LoadCommand.java
=============================================================================
--- java/trunk/conditions/src/main/java/org/hps/conditions/cli/LoadCommand.java (original)
+++ java/trunk/conditions/src/main/java/org/hps/conditions/cli/LoadCommand.java Thu Dec 11 14:49:25 2014
@@ -57,9 +57,6 @@
}
DatabaseConditionsManager conditionsManager = DatabaseConditionsManager.getInstance();
- if (conditionsManager == null) {
- throw new RuntimeException("The DatabaseConditionsManager was not setup properly.");
- }
int collectionID;
if (commandLine.getOptionValue("c") != null) {
|