Changeset 14322 for gli/trunk

Timestamp:

2007-08-06T15:21:45+12:00 (17 years ago)

Author:

qq6

Message:

fixed a minor error

File:

• gli/trunk/src/org/greenstone/gatherer/collection/CollectionManager.java (modified) (4 diffs)

gli/trunk/src/org/greenstone/gatherer/collection/CollectionManager.java

@@ -856 +856 @@
         loadCollectionInternal(collection_file_path);
         load_collection_progress_popup.close();
-      Gatherer.setMenuBarEnabled(true);
+        Gatherer.setMenuBarEnabled(true);
     }
     }
@@ -1045 +1045 @@
     }
     command_parts_list.add(LocalGreenstone.getBinScriptDirectoryPath() + "mkcol.pl");
-
     command_parts_list.add((Gatherer.GS3) ? Utility.GS3MODE_ARGUMENT : "");// add '-gs3mode' 
 
     command_parts_list.add("-collectdir");
     command_parts_list.add(getCollectDirectory());
-
-    
+    
     command_parts_list.add("-win31compat");
     command_parts_list.add((Gatherer.isGsdlRemote) ? "false" : "true");
@@ -1064 +1062 @@
     // Run the mkcol.pl command
     String[] command_parts = (String[]) command_parts_list.toArray(new String[0]);
-
+    
     GShell process = new GShell(command_parts, GShell.NEW, COLLECT, this, null, GShell.GSHELL_NEW);
     process.run(); // Don't bother threading this... yet
@@ -1327 +1325 @@
         }
         // deactivate it in tomcat so that windows will release the index files
-        if (Gatherer.GS3) {
+        if (Gatherer.GS3 && !Gatherer.isGsdlRemote) {
         Gatherer.configGS3Server(Configuration.site_name, ServletConfiguration.DEACTIVATE_COMMAND + collection.getName());
         }