Have checks manage their data files

NCEAS · Sep 21, 2019 · b9c38b4 · b9c38b4
1 parent bc68664
commit b9c38b4
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 5 deletions.
diff --git a/src/main/java/edu/ucsb/nceas/mdqengine/Worker.java b/src/main/java/edu/ucsb/nceas/mdqengine/Worker.java
@@ -67,7 +67,6 @@ public class Worker {
     private static String RabbitMQusername = null;
     private static String authToken = null;
     private static SolrClient client = null;
-    private static String DataONEformatsFile = null;
     private static Boolean indexLatest = false; // Determine the latest report in the month and record in the index
 
     private static long startTimeIndexing;
@@ -86,7 +85,6 @@ public static void main(String[] argv) throws Exception {
             RabbitMQusername = cfg.getString("RabbitMQ.username");
             RabbitMQhost = cfg.getString("RabbitMQ.host");
             RabbitMQport = cfg.getInt("RabbitMQ.port");
-            DataONEformatsFile = cfg.getString("DataONE.formats");
             indexLatest = Boolean.parseBoolean(cfg.getString("index.latest"));
         } catch (ConfigurationException cex) {
             log.error("Unable to read configuration");
@@ -402,9 +400,6 @@ public Run processReport(QueueEntry message) throws InterruptedException, Except
         // Run the Metadata Quality Engine for the specified metadata object.
         // TODO: set suite params correctly
         Map<String, Object> params = new HashMap<String, Object>();
-        if(DataONEformatsFile != null) {
-            params.put("DataONEformatsFile", DataONEformatsFile);
-        }
         // To run the suite, we need the in memory store, that contains all checks and suites.
         MDQStore store = new InMemoryStore();
 

diff --git a/src/main/resources/configuration/metadig.properties b/src/main/resources/configuration/metadig.properties
@@ -11,3 +11,5 @@ quality.serviceUrl = http://metadig-controller.metadig.svc.cluster.local:8080/qu
 metadig.store.directory = /opt/local/metadig
 DataONE.formats = /opt/local/metadig/DataONEformats.csv 
 index.latest = true
+# This directory can be used for check data files, i.e. DataONE formats, CrossRef Funder Registry files
+metadig.data.dir = /opt/local/metadig/data