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

Timestamp:

2013-06-20T16:06:01+12:00 (11 years ago)

Author:

sjm84

Message:

Added the missing GSDL3SRCHOME enviroment variable into the Perl environment

File:

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

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

@@ -150 +150 @@
         sendMessage(new ConstructionEvent(this, GSStatus.INFO, "Collection construction: import collection."));
         Vector<String> command = new Vector<String>();
-        command.add(GlobalProperties.getProperty("perl.path", "perl"));
+        command.add(GlobalProperties.getProperty("perl.path", "perl") + "perl");
         command.add("-S");
         command.add(GlobalProperties.getGS2Build() + File.separator + "bin" + File.separator + "script" + File.separator + "import.pl");
@@ -212 +212 @@
         }
 
-        /*
+        /*
 
         // move building to index
@@ -235 +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
@@ -295 +295 @@
     protected boolean runPerlCommand(String[] command)
     {
-        String msg;
-        ConstructionEvent evt;
+        int sepIndex = this.gsdl3home.lastIndexOf(File.separator);
+        String srcHome = this.gsdl3home.substring(0, sepIndex);
 
         ArrayList<String> args = new ArrayList<String>();
         args.add("GSDLHOME=" + this.gsdl2home);
         args.add("GSDL3HOME=" + this.gsdl3home);
+        args.add("GSDL3SRCHOME=" + srcHome);
         args.add("GSDLOS=" + this.gsdlos);
         args.add("GSDL-RUN-SETUP=true");
@@ -328 +329 @@
             // Captures the std err of a program and pipes it into
             // std in of java
-            
+
             File logDir = new File(GSFile.collectDir(this.site_home) + File.separator + this.collection_name + File.separator + "log");
-            if(!logDir.exists())
+            if (!logDir.exists())
             {
                 logDir.mkdir();
@@ -336 +337 @@
 
             BufferedWriter bw = new BufferedWriter(new FileWriter(GSFile.collectDir(this.site_home) + File.separator + this.collection_name + File.separator + "log" + File.separator + "build_log." + (System.currentTimeMillis()) + ".txt"));
-            bw.write("Document Editor Build\n");
+            bw.write("Document Editor Build \n");
 
             String eline = null;
@@ -386 +387 @@
                 return false;
             }
-
         }
         catch (Exception e)
         {
+            e.printStackTrace();
             sendProcessStatus(new ConstructionEvent(this, GSStatus.ERROR, "Exception occurred " + e.toString()));
         }