Changeset 31579 for main

Timestamp:

2017-04-06T18:58:07+12:00 (7 years ago)

Author:

ak19

Message:

Correction.

Location:

main/trunk/greenstone3/src/java/org/greenstone

Files:

• gsdl3/service/OAIPMH.java (modified) (1 diff)
• util/SafeProcess.java (modified) (1 diff)

main/trunk/greenstone3/src/java/org/greenstone/gsdl3/service/OAIPMH.java

@@ -151 +151 @@
     logger.warn("oai-inf database for collection + " + this.cluster_name + " does not exist.");
     oaiinf_db = null;
-    } else if (!this.oaiinf_db.openDatabase(oaiinf_db_file, SimpleCollectionDatabase.READ)) {
-    logger.warn("Could not open oai-inf database for collection + " + this.cluster_name + "!");
-    oaiinf_db = null;
+    } else {
+    logger.info("Going to try opening oai-inf database for collection " + this.cluster_name);
+    if (!this.oaiinf_db.openDatabase(oaiinf_db_file, SimpleCollectionDatabase.READ)) {
+        logger.warn("Could not open oai-inf database for collection " + this.cluster_name + "!");
+        oaiinf_db = null;
+    }
     }
     

main/trunk/greenstone3/src/java/org/greenstone/util/SafeProcess.java

@@ -129 +129 @@
         // monitor for any error messages
             errorGobbler // ReaderFromProcessOutputStream
-        = new SafeProcess.InputStreamGobbler(prcs.getErrorStream(), splitStdOutputNewLines);
+        = new SafeProcess.InputStreamGobbler(prcs.getErrorStream(), splitStdErrorNewLines);
 
             // monitor for the expected std output line(s)
             outputGobbler
-        = new SafeProcess.InputStreamGobbler(prcs.getInputStream(), splitStdErrorNewLines);
+        = new SafeProcess.InputStreamGobbler(prcs.getInputStream(), splitStdOutputNewLines);
                     
         // register line by line handlers, if any were set, for the process stderr and stdout streams