Changeset 28995 for main/trunk/gli/src/org/greenstone/gatherer/gui/OpenCollectionDialog.java

Timestamp:

2014-04-24T21:34:33+12:00 (10 years ago)

Author:

ak19

Message:

First commit for GLI part of GS2 to GS3 Format Conversion. Contains all the changes needed for the FormatConversionDialog to work, and some cosmetic changes to cdm.Format4gs3Manager.java. Still need to implement undo and redo and think about what needs to happen and how for Remote GS3.

File:

• main/trunk/gli/src/org/greenstone/gatherer/gui/OpenCollectionDialog.java (modified) (3 diffs)

main/trunk/gli/src/org/greenstone/gatherer/gui/OpenCollectionDialog.java

@@ -43 +43 @@
 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. */
@@ -399 +400 @@
         process.run(); // Don't bother threading this... yet
         
-        collect_cfg_file.delete();
-        build_cfg_file.delete();
+        // From now, won't dangerously delete GS2 collect and build config files anymore
+        //collect_cfg_file.delete();
+        //build_cfg_file.delete();
+
+        File collect_bak_file = new File(collection_folder.getAbsolutePath() + File.separator + "etc" + File.separator + "collect.cfg.bak");
+        File build_bak_file = new File(collection_folder.getAbsolutePath() + File.separator+"index" + File.separator + "build.cfg.bak");
+        if(!collect_cfg_file.renameTo(collect_bak_file)) {
+            System.err.println("Unable to move collect.cfg to " + collect_bak_file);
+        }
+        if(!build_cfg_file.renameTo(build_bak_file)) {
+            System.err.println("Unable to move build.cfg to " + build_bak_file);
+        }
         }
     }
@@ -415 +426 @@
         //****************
         File collect_cfg_file = collection_configuration.getFile(); // returns the collect.cfg file
-        File etc_folder = collect_cfg_file.getParentFile();
-        File collection_folder = etc_folder.getParentFile();
-        filename = collection_folder.getAbsolutePath() + File.separator + "gli.col";
-        collection_folder = null;
-        etc_folder = null;
-        collect_cfg_file = null;
-        collection_configuration = null;
+        result = FormatConversionDialog.checkForGS2FormatStatements(collect_cfg_file);
+        if(result == OK_OPTION) { // either there were no gs2 format stmts or user chose to proceed
+            File etc_folder = collect_cfg_file.getParentFile();
+            File collection_folder = etc_folder.getParentFile();
+            filename = collection_folder.getAbsolutePath() + File.separator + "gli.col";
+            collection_folder = null;
+            etc_folder = null;
+            collect_cfg_file = null;
+            collection_configuration = null;
+        }
         OpenCollectionDialog.this.dispose();
         }
 
-        Gatherer.collectDirectoryHasChanged(Gatherer.getCollectDirectoryPath(), 
+        if(result == OK_OPTION) {
+        Gatherer.collectDirectoryHasChanged(Gatherer.getCollectDirectoryPath(), 
                 newCollectPath, Gatherer.g_man.getContentPane()); 
             // will tell the server that the collect directory has changed and that
             // the workspace needs to be refreshed (Documents in Greenstone Collections)
+        }
     }
     }