Changeset 18365 for gli/branches

Timestamp:

2009-01-12T11:55:50+13:00 (15 years ago)

Author:

kjdon

Message:

added in a bit of stuff that seemed to get missed out in the merge

File:

• gli/branches/rtl-gli/src/org/greenstone/gatherer/gui/OpenCollectionDialog.java (modified) (4 diffs)

gli/branches/rtl-gli/src/org/greenstone/gatherer/gui/OpenCollectionDialog.java

@@ -39 +39 @@
 import org.greenstone.gatherer.util.StaticStrings;
 import org.greenstone.gatherer.util.Utility;
+import org.greenstone.gatherer.shell.GShell;
+import org.greenstone.gatherer.shell.GShellEvent;
+import org.greenstone.gatherer.shell.GShellListener;
+import org.greenstone.gatherer.shell.GShellProgressMonitor;
 
 /** A dialog which provides a straight-forward access to the currently installed collections. It also will contain the ability to continue through to the original OpenCollectionDialog if your source collection is located somewhere other than the gsdl collect folder. */
@@ -261 +265 @@
 
     private TreeSet data;
+    static final public int COLLECT   = 3;
 
     public CollectionListModel() {
@@ -294 +299 @@
             
             File config_file = new File(collection_folder, file_name);
-            File collection_metadata_directory = new File(collection_folder, "metadata");
+            File collection_metadata_directory = new File(collection_folder, "metadata");
             if (collection_metadata_directory.exists() && config_file.exists()) {
             BasicCollectionConfiguration collection_configuration = new BasicCollectionConfiguration(config_file);
@@ -335 +340 @@
     public int getSize() {
         return data.size();
+    }
+
+    public void convertToGS3Collection(File collection_folder) {
+
+        File collect_cfg_file = new File(collection_folder.getAbsolutePath() + File.separator + "etc" + File.separator + "collect.cfg");
+        File build_cfg_file = new File(collection_folder.getAbsolutePath() + File.separator+"index" + File.separator + "build.cfg");
+
+        if (collect_cfg_file.exists() && build_cfg_file.exists()){
+        // Generate the convert_coll_from_gs2.pl command
+        ArrayList command_parts_list = new ArrayList();
+        if ((Utility.isWindows()) && (!Gatherer.isGsdlRemote)) {
+            command_parts_list.add(Configuration.perl_path);
+            command_parts_list.add("-S");
+        }
+        command_parts_list.add(Configuration.getGS3ScriptPath() + "convert_coll_from_gs2.pl");
+        command_parts_list.add("-collectdir");
+        command_parts_list.add(collection_folder.getParent());
+        command_parts_list.add(collection_folder.getName());
+
+        // Run the convert_coll_from_gs2.pl command
+        String[] command_parts = (String[]) command_parts_list.toArray(new String[0]);
+        GShell process = new GShell(command_parts, GShell.CONVERT, COLLECT, null, null, GShell.GSHELL_CONVERT);
+        //process.addGShellListener(this);
+        process.run(); // Don't bother threading this... yet
+        
+        collect_cfg_file.delete();
+        build_cfg_file.delete();
+        }
     }
     }