Changeset 4970 for trunk/gsdl3/src/java/org/greenstone/gsdl3/build

Timestamp:

2003-07-17T12:11:16+12:00 (21 years ago)

Author:

kjdon

Message:

dont use activate script for actiavte coll, use convert script

File:

• trunk/gsdl3/src/java/org/greenstone/gsdl3/build/GS2PerlConstructor.java (modified) (2 diffs)

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

@@ -169 +169 @@
     }
 
-    // run the convert coll script to convert the gs2 coll to gs3
-    Vector command = new Vector();
-    command.add("activate_gs2_style_coll.pl");
-    command.add("-collectdir");
-    command.add(GSFile.collectDir(site_home_));
-    command.addAll(extractParameters(process_params_));
-    command.add(collection_name_);
-    String [] command_str = {};
-    command_str = (String [])command.toArray(command_str); 
-    
-    if (!runPerlCommand(command_str)) {
-        // an error has occurred, dont carry on
-        return;
-    }
-
-    // now mv building to index
+    // move building to index
     File index_dir = new File(GSFile.collectionIndexDir(site_home_, collection_name_));
     if (index_dir.exists()) {
@@ -198 +183 @@
         sendMessage(new ConstructionEvent(this, GSStatus.ERROR, "index dir wasn't created!"));
     }
+
+    // run the convert coll script to convert the gs2 coll to gs3
+    Vector command = new Vector();
+    command.add("convert_coll_from_gs2.pl");
+    command.add("-collectdir");
+    command.add(GSFile.collectDir(site_home_));
+    command.addAll(extractParameters(process_params_));
+    command.add(collection_name_);
+    String [] command_str = {};
+    command_str = (String [])command.toArray(command_str); 
+    
+    if (!runPerlCommand(command_str)) {
+        // an error has occurred, dont carry on
+        return;
+    }
+
     // success!!  - need to send the final completed message
     sendProcessComplete(new ConstructionEvent(this, GSStatus.COMPLETED, ""));