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

Timestamp:

2008-02-12T16:13:13+13:00 (16 years ago)

Author:

davidb

Message:

Changes to GLI to support export into Fedora. New utility called flisvn diff gems/MetadataSetManager.java

Location:

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

Files:

• Collection.java (modified) (4 diffs)
• CollectionManager.java (modified) (5 diffs)
• ScriptOptions.java (modified) (1 diff)

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

@@ -86 +86 @@
     /** The name of the import element. */
     static final private String IMPORT = "Import";
+    /** The name of the import element. */
+    static final private String EXPORT = "Export";
     /** The name of the imported attribute. */
     static final private String IMPORTED = "imported";
@@ -111 +113 @@
     }
     // Finally create all of the child managers that are directly dependant on a collection
-    build_options = new ScriptOptions(getBuildValues(), "buildcol.pl");
-    import_options = new ScriptOptions(getImportValues(), "import.pl");
+
+    if (Configuration.fedora_info.isActive()) {
+        build_options = new ScriptOptions(getValues(BUILD), "g2f-buildcol.pl");
+        import_options = new ScriptOptions(getValues(IMPORT), "g2f-import.pl");
+    }
+    else {
+        build_options = new ScriptOptions(getBuildValues(), "buildcol.pl");
+        import_options = new ScriptOptions(getImportValues(), "import.pl");
+    }
     }
     
@@ -334 +343 @@
     
 
+    /** Method to retrieve the current import/build/export/whatever options associated with this Collection. */
+    private Element getValues(String val_type) {
+    Element values_element = null;
+    try {
+        Element document_element = document.getDocumentElement();
+        Element config_element = (Element) XMLTools.getNodeFromNamed(document_element, BUILD_CONFIG);
+        values_element = (Element) XMLTools.getNodeFromNamed(config_element, val_type);
+        config_element = null;
+        document_element = null;
+    }
+    catch (Exception error) {
+        DebugStream.printStackTrace(error);
+    }
+    return values_element;
+    }
+
     
     /** Method to retrieve the current build options associated with this Collection. */
@@ -350 +375 @@
     return build_values_element;
     }
+
     
     /** Count either documents or folders, depending on the state of the given boolean. */

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

@@ -159 +159 @@
         command_parts_list.add("-S");
     }
-    command_parts_list.add(LocalGreenstone.getBinScriptDirectoryPath() + "buildcol.pl");
+
+    if (Configuration.fedora_info.isActive()) {
+        command_parts_list.add(LocalGreenstone.getBinScriptDirectoryPath() + "g2f-buildcol.pl");
+
+        command_parts_list.add("-hostname");
+        command_parts_list.add(Configuration.fedora_info.getHostname());
+
+        command_parts_list.add("-port");
+        command_parts_list.add(Configuration.fedora_info.getPort());
+
+        command_parts_list.add("-username");
+        command_parts_list.add(Configuration.fedora_info.getUsername());
+
+        command_parts_list.add("-password");
+        command_parts_list.add(Configuration.fedora_info.getPassword());
+
+        command_parts_list.add("-protocol");
+        command_parts_list.add(Configuration.fedora_info.getProtocol());
+
+    }
+    else {
+        command_parts_list.add(LocalGreenstone.getBinScriptDirectoryPath() + "buildcol.pl");
+    }
     command_parts_list.add("-gli");
     command_parts_list.add("-language");
@@ -193 +215 @@
     public boolean built() {
     if(collection != null) {
-        // Determine if the collection has been built by looking for the build.cfg or buildConfig.xml file
-        String file_name = (Gatherer.GS3)? Utility.BUILD_CONFIG_XML : Utility.BUILD_CFG;
-        File build_cfg_file = new File(getLoadedCollectionIndexDirectoryPath() + file_name);
-        return build_cfg_file.exists();
+        // Determine if the collection has been built by looking for the build.cfg (gs20 buildConfig.xml (gs3) or export.inf (fedora) file
+        String file_name = "";
+
+        if (Gatherer.GS3) {
+        file_name = getLoadedCollectionIndexDirectoryPath() + Utility.BUILD_CONFIG_XML;
+        }
+        else {
+        if (Configuration.fedora_info.isActive()) {
+            // Fedora build
+            //file_name = getLoadedCollectionArchivesDirectoryPath() + "import.inf";
+            file_name = getLoadedCollectionExportDirectoryPath() + "export.inf";
+        }
+        else {
+            file_name = getLoadedCollectionIndexDirectoryPath() + Utility.BUILD_CFG;
+        }
+        }
+
+        File test_file = new File(file_name);
+        return test_file.exists();
     }
     return false;
@@ -592 +629 @@
     }
 
+    /** Returns the absolute filename of the loaded collection's export directory.
+     */
+    static public String getLoadedCollectionExportDirectoryPath()
+    {
+    return getLoadedCollectionDirectoryPath() + "export" + File.separator;
+    }
+
+
 
     /** Returns the absolute filename of the loaded collection's building directory.
@@ -764 +809 @@
         command_parts_list.add("-S");
     }
-    command_parts_list.add(LocalGreenstone.getBinScriptDirectoryPath() + "import.pl");
+
+    if (Configuration.fedora_info.isActive()) {
+        command_parts_list.add(LocalGreenstone.getBinScriptDirectoryPath() + "g2f-import.pl");
+
+        command_parts_list.add("-hostname");
+        command_parts_list.add(Configuration.fedora_info.getHostname());
+
+        command_parts_list.add("-port");
+        command_parts_list.add(Configuration.fedora_info.getPort());
+
+        command_parts_list.add("-username");
+        command_parts_list.add(Configuration.fedora_info.getUsername());
+
+        command_parts_list.add("-password");
+        command_parts_list.add(Configuration.fedora_info.getPassword());
+
+        command_parts_list.add("-protocol");
+        command_parts_list.add(Configuration.fedora_info.getProtocol());
+    }
+    else {
+        command_parts_list.add(LocalGreenstone.getBinScriptDirectoryPath() + "import.pl");
+    }
+
     command_parts_list.add("-gli");
     command_parts_list.add("-language");
@@ -1339 +1406 @@
     private boolean installCollection()
     {
+    if (Configuration.fedora_info.isActive()) {
+        DebugStream.println("Fedora build complete. No need to move files.");
+        return true;
+    }
+
+       
     DebugStream.println("Build complete. Moving files.");
 

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

@@ -247 +247 @@
         }
 
+
         // Create the process.
         Runtime runtime = Runtime.getRuntime();
         Process process = runtime.exec(args);
+
+        /*
+        for (int i=0; i<args.length; i++) { 
+            System.err.print(args[i] + " ");
+        }
+        System.err.println("");
+        */
+
+
         document = XMLTools.parseXML(process.getErrorStream());
+        
+        if (document == null) {
+            // command has not generated XML, script has probably failed in some way
+            for (int i=0; i<args.length; i++) { 
+            DebugStream.print(args[i] + " ");
+            }
+            DebugStream.println("");
+        }
         }