Author: [log in to unmask]
Date: Thu Jul 7 18:16:50 2016
New Revision: 4422
Log:
[HPSJAVA-675] Minor cleanup
Modified:
java/trunk/crawler/src/main/java/org/hps/crawler/DatacatAddFile.java
java/trunk/datacat/src/main/java/org/hps/datacat/DataType.java
java/trunk/datacat/src/main/java/org/hps/datacat/DatacatConstants.java
java/trunk/datacat/src/main/java/org/hps/datacat/DatacatPrintRun.java
java/trunk/datacat/src/main/java/org/hps/datacat/DatacatUtilities.java
java/trunk/datacat/src/main/java/org/hps/datacat/FileEventRange.java
java/trunk/datacat/src/main/java/org/hps/datacat/FileFormat.java
java/trunk/datacat/src/main/java/org/hps/datacat/Site.java
java/trunk/run-database/src/main/java/org/hps/rundb/builder/BuilderCommandLine.java
java/trunk/run-database/src/main/java/org/hps/rundb/builder/DatacatBuilder.java
java/trunk/run-database/src/test/java/org/hps/rundb/builder/RunBuilderTest.java
Modified: java/trunk/crawler/src/main/java/org/hps/crawler/DatacatAddFile.java
=============================================================================
--- java/trunk/crawler/src/main/java/org/hps/crawler/DatacatAddFile.java (original)
+++ java/trunk/crawler/src/main/java/org/hps/crawler/DatacatAddFile.java Thu Jul 7 18:16:50 2016
@@ -10,6 +10,7 @@
import org.apache.commons.cli.Options;
import org.apache.commons.cli.ParseException;
import org.apache.commons.cli.PosixParser;
+import org.hps.datacat.DatacatConstants;
import org.hps.datacat.DatacatUtilities;
import org.hps.datacat.Site;
import org.srs.datacat.model.DatasetModel;
@@ -27,7 +28,7 @@
private String folder = null;
private Site site = Site.JLAB;
- private String datacatUrl = "http://hpsweb.jlab.org/datacat/r";
+ private String datacatUrl = DatacatConstants.DATACAT_URL;
private boolean dryRun = false;
/**
Modified: java/trunk/datacat/src/main/java/org/hps/datacat/DataType.java
=============================================================================
--- java/trunk/datacat/src/main/java/org/hps/datacat/DataType.java (original)
+++ java/trunk/datacat/src/main/java/org/hps/datacat/DataType.java Thu Jul 7 18:16:50 2016
@@ -3,7 +3,7 @@
/**
* Dataset types for HPS.
*
- * @author Jeremy McCormick, SLAC
+ * @author jeremym
*/
public enum DataType {
/**
Modified: java/trunk/datacat/src/main/java/org/hps/datacat/DatacatConstants.java
=============================================================================
--- java/trunk/datacat/src/main/java/org/hps/datacat/DatacatConstants.java (original)
+++ java/trunk/datacat/src/main/java/org/hps/datacat/DatacatConstants.java Thu Jul 7 18:16:50 2016
@@ -5,6 +5,7 @@
/**
* Static constants for use with the Data Catalog.
+ *
* @author jeremym
*/
public final class DatacatConstants {
Modified: java/trunk/datacat/src/main/java/org/hps/datacat/DatacatPrintRun.java
=============================================================================
--- java/trunk/datacat/src/main/java/org/hps/datacat/DatacatPrintRun.java (original)
+++ java/trunk/datacat/src/main/java/org/hps/datacat/DatacatPrintRun.java Thu Jul 7 18:16:50 2016
@@ -4,8 +4,6 @@
import java.util.SortedSet;
import java.util.TreeSet;
-import org.srs.datacat.client.Client;
-import org.srs.datacat.client.ClientBuilder;
import org.srs.datacat.model.DatasetModel;
import org.srs.datacat.model.DatasetResultSetModel;
import org.srs.datacat.model.dataset.DatasetLocationModel;
@@ -13,6 +11,7 @@
/**
* Example of printing information from all files for a given run in the datacat.
+ *
* @author jeremym
*/
public final class DatacatPrintRun {
@@ -26,20 +25,9 @@
}
private static void printRun(int run) throws Exception {
-
- /* initialize datacat client */
- Client client = new ClientBuilder().setUrl("http://hpsweb.jlab.org/datacat/r").build();
-
- /* perform dataset search */
- DatasetResultSetModel results = client.searchForDatasets(
- "/HPS/data/raw",
- "current", /* dataset version */
- "JLAB",
- "fileFormat eq 'EVIO' AND dataType eq 'RAW' AND runMin eq " + run, /* basic query */
- new String[] {"FILE"}, /* sort on file number */
- DatacatConstants.EVIO_METADATA /* metadata field values to return from query */
- );
-
+
+ DatasetResultSetModel results = DatacatUtilities.findEvioDatasets(run);
+
/* print results including metadata */
for (DatasetModel dataset : results) {
DatasetWithViewModel datasetView = (DatasetWithViewModel) dataset;
Modified: java/trunk/datacat/src/main/java/org/hps/datacat/DatacatUtilities.java
=============================================================================
--- java/trunk/datacat/src/main/java/org/hps/datacat/DatacatUtilities.java (original)
+++ java/trunk/datacat/src/main/java/org/hps/datacat/DatacatUtilities.java Thu Jul 7 18:16:50 2016
@@ -20,6 +20,7 @@
/**
* Data Catalog utility functions.
+ *
* @author jeremym
*/
public class DatacatUtilities {
Modified: java/trunk/datacat/src/main/java/org/hps/datacat/FileEventRange.java
=============================================================================
--- java/trunk/datacat/src/main/java/org/hps/datacat/FileEventRange.java (original)
+++ java/trunk/datacat/src/main/java/org/hps/datacat/FileEventRange.java Thu Jul 7 18:16:50 2016
@@ -11,6 +11,7 @@
/**
* Utility class for assocating a file in the datacat to its event ID range.
+ *
* @author jeremym
*/
public final class FileEventRange {
Modified: java/trunk/datacat/src/main/java/org/hps/datacat/FileFormat.java
=============================================================================
--- java/trunk/datacat/src/main/java/org/hps/datacat/FileFormat.java (original)
+++ java/trunk/datacat/src/main/java/org/hps/datacat/FileFormat.java Thu Jul 7 18:16:50 2016
@@ -7,7 +7,7 @@
/**
* Dataset file formats for HPS.
*
- * @author Jeremy McCormick, SLAC
+ * @author jeremym
*/
public enum FileFormat {
Modified: java/trunk/datacat/src/main/java/org/hps/datacat/Site.java
=============================================================================
--- java/trunk/datacat/src/main/java/org/hps/datacat/Site.java (original)
+++ java/trunk/datacat/src/main/java/org/hps/datacat/Site.java Thu Jul 7 18:16:50 2016
@@ -3,7 +3,7 @@
/**
* Site of a dataset (SLAC or JLAB).
*
- * @author Jeremy McCormick, SLAC
+ * @author jeremym
*/
public enum Site {
/**
Modified: java/trunk/run-database/src/main/java/org/hps/rundb/builder/BuilderCommandLine.java
=============================================================================
--- java/trunk/run-database/src/main/java/org/hps/rundb/builder/BuilderCommandLine.java (original)
+++ java/trunk/run-database/src/main/java/org/hps/rundb/builder/BuilderCommandLine.java Thu Jul 7 18:16:50 2016
@@ -12,14 +12,13 @@
import org.apache.commons.cli.ParseException;
import org.apache.commons.cli.PosixParser;
import org.hps.conditions.database.ConnectionParameters;
+import org.hps.datacat.DatacatConstants;
+import org.hps.datacat.Site;
import org.hps.rundb.DaoProvider;
import org.hps.rundb.RunManager;
import org.hps.rundb.RunSummaryDao;
import org.hps.rundb.RunSummaryImpl;
import org.srs.datacat.client.ClientBuilder;
-
-import org.hps.datacat.DatacatConstants;
-import org.hps.datacat.Site;
/**
* Creates a basic run database record from information in the data catalog
@@ -75,7 +74,7 @@
/**
* Data catalog site.
*/
- private String site = Site.JLAB.toString();
+ private Site site = Site.JLAB;
/**
* Data catalog URL.
@@ -136,7 +135,7 @@
// Site in the data catalog.
if (cl.hasOption("S")) {
- site = cl.getOptionValue("S");
+ site = Site.valueOf(cl.getOptionValue("S"));
}
// Set folder for dataset search.
Modified: java/trunk/run-database/src/main/java/org/hps/rundb/builder/DatacatBuilder.java
=============================================================================
--- java/trunk/run-database/src/main/java/org/hps/rundb/builder/DatacatBuilder.java (original)
+++ java/trunk/run-database/src/main/java/org/hps/rundb/builder/DatacatBuilder.java Thu Jul 7 18:16:50 2016
@@ -7,6 +7,8 @@
import java.util.logging.Level;
import java.util.logging.Logger;
+import org.hps.datacat.DatacatUtilities;
+import org.hps.datacat.Site;
import org.hps.record.triggerbank.TiTimeOffsetCalculator;
import org.srs.datacat.client.Client;
import org.srs.datacat.client.exception.DcClientException;
@@ -36,7 +38,7 @@
};
private Client datacatClient;
- private String site;
+ private Site site;
private String folder;
private List<File> files;
@@ -197,21 +199,15 @@
LOGGER.info("finding EVIO datasets for run " + getRun() + " in " + this.folder + " at " + this.site + " ...");
- DatasetResultSetModel results = datacatClient.searchForDatasets(
- this.folder,
- "current", /* dataset version */
- this.site,
- "fileFormat eq 'EVIO' AND dataType eq 'RAW' AND runMin eq " + getRun(), /* basic query */
- new String[] {"FILE"}, /* sort on file number */
- METADATA_FIELDS /* metadata field values to return from query */
- );
-
+ DatasetResultSetModel results = DatacatUtilities.findEvioDatasets(datacatClient, this.folder, this.site,
+ METADATA_FIELDS, new String[] {"FILE"}, getRun());
+
LOGGER.info("found " + results.getResults().size() + " EVIO datasets for run " + getRun());
return results;
}
- void setSite(String site) {
+ void setSite(Site site) {
this.site = site;
}
Modified: java/trunk/run-database/src/test/java/org/hps/rundb/builder/RunBuilderTest.java
=============================================================================
--- java/trunk/run-database/src/test/java/org/hps/rundb/builder/RunBuilderTest.java (original)
+++ java/trunk/run-database/src/test/java/org/hps/rundb/builder/RunBuilderTest.java Thu Jul 7 18:16:50 2016
@@ -6,6 +6,7 @@
import junit.framework.TestCase;
import org.hps.conditions.database.ConnectionParameters;
+import org.hps.datacat.Site;
import org.hps.rundb.RunManager;
import org.hps.rundb.RunSummaryImpl;
import org.srs.datacat.client.ClientBuilder;
@@ -16,7 +17,7 @@
private static String DATACAT_URL = "http://localhost:8080/datacat-v0.5-SNAPSHOT/r";
private static String SPREADSHEET = "/work/hps/rundb/HPS_Runs_2015_Sheet1.csv";
private static String FOLDER = "/HPS/test";
- private static String SITE = "SLAC";
+ private static Site SITE = Site.SLAC;
private static String EVIO_TEST_FILE = "/nfs/slac/g/hps3/data/engrun2015/evio/hps_005403.evio.0";
private static final ConnectionParameters CONNECTION_PARAMETERS =
