Changeset 7104

Timestamp:

2004-03-22T13:31:35+12:00 (20 years ago)

Author:

kjdon

Message:

added '-language xx' to the import.pl and buildcol.pl options. its not added to the mkcol.pl options cos we don't use the messages, but it could be.

File:

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

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

@@ -154 +154 @@
     Gatherer.println("CollectionManager.buildCollection()");
     building = true;
-
+    String lang = Gatherer.config.getLanguage();
     String args[];
     if(Utility.isWindows()) {
-        args = new String[5];
+        args = new String[7];
         args[0] = Gatherer.config.perl_path;
         args[1] = "-S";
         args[2] = Gatherer.config.getScriptPath() + "buildcol.pl";
         args[3] = "-gli";
-        args[4] = collection.getName();
+        args[4] = "-language";
+        args[5] = lang;
+        args[6] = collection.getName();
     }
     else {
-        args = new String[3];
+        args = new String[5];
         args[0] = Gatherer.config.getScriptPath() + "buildcol.pl";
         args[1] = "-gli";
-        args[2] = collection.getName();
+        args[2] = "-language";
+        args[3] = lang;
+        args[4] = collection.getName();
     }
     args = ArrayTools.add(args, collection.build_options.getBuildValues());
@@ -694 +698 @@
         }
         String args[];
+        String lang = Gatherer.config.getLanguage();
         if(Utility.isWindows()) {
-        args = new String[7];
+        args = new String[9];
         args[0] = Gatherer.config.perl_path;
         args[1] = "-S";
         args[2] = Gatherer.config.getScriptPath() + "import.pl";
         args[3] = "-gli";
+        args[4] = "-language";
+        args[5] = lang;
+        args[6] = "-importdir";
+        args[7] = collection_import;
+        args[8] = collection.getName();
+        }
+        else {
+        args = new String[7];
+        args[0] = Gatherer.config.getScriptPath() + "import.pl";
+        args[1] = "-gli";
+        args[2] = "-language";
+        args[3] = lang;
         args[4] = "-importdir";
         args[5] = collection_import;
         args[6] = collection.getName();
-        }
-        else {
-        args = new String[5];
-        args[0] = Gatherer.config.getScriptPath() + "import.pl";
-        args[1] = "-gli";
-        args[2] = "-importdir";
-        args[3] = collection_import;
-        args[4] = collection.getName();
         }
         collection_import = null;