Changeset 9136

Timestamp:

2005-02-22T15:39:10+13:00 (19 years ago)

Author:

kjdon

Message:

changed to use SCriptOptions instead of BuildOptions

Location:

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

Files:

• Collection.java (modified) (2 diffs)
• CollectionManager.java (modified) (3 diffs)

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

@@ -57 +57 @@
  */
 public class Collection {
-    /** A reference to the BuildOptions. */
-    public BuildOptions build_options;
     /** A reference to the Collection Design Manager. */
     public CollectionDesignManager cdm;
+    /** A reference to the build ScriptOptions. */
+    public ScriptOptions build_options;
+    /** A reference to the import ScriptOptions. */
+    public ScriptOptions import_options;
     /** true if an error has occurred during construction */
     public boolean error = false;
@@ -102 +104 @@
     }
     // Finally create all of the child managers that are directly dependant on a collection
-    build_options = new BuildOptions(getBuildValues(), getImportValues());
+    build_options = new ScriptOptions(getBuildValues(), "buildcol.pl", true);
+    import_options = new ScriptOptions(getImportValues(), "import.pl", true);
     }
     

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

@@ -158 +158 @@
         args[5] = collect_dir;
     }
-    args = ArrayTools.add(args, collection.build_options.getBuildValues());
+    args = ArrayTools.add(args, collection.build_options.getValues());
     args = ArrayTools.add(args, collection.getName());
     GShell shell = new GShell(args, GShell.BUILD, BUILDING, this, build_monitor, GShell.GSHELL_BUILD);
@@ -683 +683 @@
     }
     collect_dir = null;
-    args = ArrayTools.add(args, collection.build_options.getImportValues());
+    args = ArrayTools.add(args, collection.import_options.getValues());
     args = ArrayTools.add(args, collection.getName());
 
@@ -1245 +1245 @@
 
         // Get the build mode from the build options
-        String build_mode = collection.build_options.getBuildValue("mode");
+        String build_mode = collection.build_options.getValue("mode");
 
         // Special case for build mode "all": replace index dir with building dir