Changeset 31591 for main/trunk/greenstone3/src/java/org/greenstone/gsdl3/service/GS2Construct.java

Timestamp:

2017-04-07T17:47:14+12:00 (7 years ago)

Author:

ak19

Message:

1. SafeProcess.CustomProcessHandler replaces SafeProcess.LineByLineHandler to allow GS developers more control over the handling of a Process' iostreams and more transparency to the developer about what happens. But SafeProcess provides default behaviours. 2. Some informative msgs in the GS2Construct method that marks the flat DB for when the oid entry does not occur in the DB.

File:

• main/trunk/greenstone3/src/java/org/greenstone/gsdl3/service/GS2Construct.java (modified) (1 diff)

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

@@ -1187 +1187 @@
         // now we know we have an archives folder
         String old_value = coll_db.getValue(oid);
-        String new_value = old_value.replace("<index-status>B", "<index-status>" + mark);
+        String new_value = "<index-status>" + mark;
+        if(old_value == null) {
+            logger.error("### null old_value in flat DB for oid " + oid);
+        } else {
+            new_value = old_value.replace("<index-status>B", "<index-status>" + mark);
+            logger.info("### Replacing db entry for oid " + oid + " which has old_value " + old_value);
+            logger.info("### with new value " + new_value);
+                    
+        }
         // Close database for reading
         coll_db.closeDatabase();
+
         if (!coll_db.openDatabase(coll_db_file, SimpleCollectionDatabase.WRITE))
-        {
+            {
             logger.error("Could not open collection archives database. Somebody already using this database!");
             return;
-        }
+            }
+        
         coll_db.setValue(oid, new_value);
-        coll_db.closeDatabase();
         
+        coll_db.closeDatabase();        
     }
 }