Changeset 6325 for trunk/gli/src/org/greenstone/gatherer/collection

Timestamp:

2003-12-19T14:54:25+13:00 (20 years ago)

Author:

jmt12

Message:

Rewrote GImportProgressMonitor to use the new GLI argument based messages from the import script - which are separate from multilingual issues. This required several changes to GShell, GShellEvents, and everything that makes use of them

Location:

trunk/gli/src/org/greenstone/gatherer/collection

Files:

• Collection.java (modified) (1 diff)
• CollectionManager.java (modified) (2 diffs)

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

@@ -309 +309 @@
         count++;
     }
-    for(int i = 0; i < node.getChildCount(); i++) {
+    for(int i = 0; !file.getName().equals("CVS") && i < node.getChildCount(); i++) {
         count = count + getCount(node.getChildAt(i), count_folders, count_files);
     }

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

@@ -745 +745 @@
         String args[];
         if(Utility.isWindows()) {
-        args = new String[6];
+        args = new String[7];
         args[0] = Gatherer.config.perl_path;
         args[1] = "-S";
         args[2] = Gatherer.config.getScriptPath() + "import.pl";
-        args[3] = "-importdir";
-        args[4] = collection_import;
-        args[5] = collection.getName();
+        args[3] = "-gli";
+        args[4] = "-importdir";
+        args[5] = collection_import;
+        args[6] = collection.getName();
         }
         else {
-        args = new String[4];
+        args = new String[5];
         args[0] = Gatherer.config.getScriptPath() + "import.pl";
-        args[1] = "-importdir";
-        args[2] = collection_import;
-        args[3] = collection.getName();
+        args[1] = "-gli";
+        args[2] = "-importdir";
+        args[3] = collection_import;
+        args[4] = collection.getName();
         }
         collection_import = null;
@@ -1091 +1093 @@
         }
         WarningDialog collection_built_warning_dialog = new WarningDialog("warning.CollectionBuilt", false);
+        collection_built_warning_dialog.setMessageOnly(true); // Not a warning
         collection_built_warning_dialog.display();
         collection_built_warning_dialog.dispose();