Changeset 27107 for main

Timestamp:

2013-03-21T16:12:41+13:00 (11 years ago)

Author:

ak19

Message:

GS2PerlConstructor.activateCollection() now calls perl method activate.pl, since that has no issues with deleting the jdbm colname.lg file in the index folder when moving building to index, whereas the java code that used to move building to index was at times unable to delete this file, so that saving changes in the online GS3 document editor would fail on such occasions.

File:

• main/trunk/greenstone3/src/java/org/greenstone/gsdl3/build/GS2PerlConstructor.java (modified) (5 diffs)

main/trunk/greenstone3/src/java/org/greenstone/gsdl3/build/GS2PerlConstructor.java

@@ -18 +18 @@
 import java.util.Vector;
 
+import org.apache.log4j.*;
+
 /**
  * CollectionConstructor class for greenstone 2 compatible building it uses the
@@ -24 +26 @@
 public class GS2PerlConstructor extends CollectionConstructor
 {
+    static Logger logger = Logger.getLogger(org.greenstone.gsdl3.build.GS2PerlConstructor.class.getName());
+
     public static final int NEW = 0;
     public static final int IMPORT = 1;
@@ -200 +204 @@
 
         // first check that we have a building directory
+        // (don't want to bother running activate.pl otherwise)
         File build_dir = new File(GSFile.collectionBuildDir(this.site_home, this.collection_name));
         if (!build_dir.exists())
@@ -206 +211 @@
             return;
         }
+
+        /*
 
         // move building to index
@@ -228 +235 @@
         // success!!  - need to send the final completed message
         sendProcessComplete(new ConstructionEvent(this, GSStatus.COMPLETED, ""));
+        */
+
+        // Running activate.pl instead of making java move building to index as above
+        // circumvents the issue of the jdbm .lg log file (managed by TransactionManager) 
+        // in index dir not getting deleted at times. The perl code is able to delete this
+        // sucessfully consistently during testing, whereas java at times is unable to delete it.
+        Vector<String> command = new Vector<String>();
+        command.add(GlobalProperties.getProperty("perl.path", "perl") + "perl");
+        command.add("-S");
+        command.add(GlobalProperties.getGS2Build() + File.separator + "bin" + File.separator + "script" + File.separator + "activate.pl");
+        command.add("-site");
+        command.add(this.site_name);
+        command.add("-collectdir");
+        command.add(GSFile.collectDir(this.site_home));
+        command.addAll(extractParameters(this.process_params));
+        command.add(this.collection_name);
+
+        String[] command_str = {};
+        command_str = command.toArray(command_str);
+
+        if (runPerlCommand(command_str))
+        {
+            // success!! - need to send the final completed message
+            sendProcessComplete(new ConstructionEvent(this, GSStatus.COMPLETED, ""));
+        }// else an error message has already been sent, do nothing     
+
     }