Changeset 34283 for main/trunk/gli/src/org/greenstone/gatherer/gui/GUIManager.java

Timestamp:

2020-07-23T13:41:08+12:00 (4 years ago)

Author:

ak19

Message:

Incorporating Kathy & Dr Bainbridge's improvements to the recently added export to meta CSV features: 1. Move meta to CSV now called Convert meta to CSV launch. 2. Launch Export Meta JChooser dialog in collection dir not import dir, but Convert Meta still launched in importDir as before. Also upload any metadata.csv created in collection dir to remote server if client-GLI, not just if meta.csv was created in importDir. 3. Labels of JChooser confirm button and dialog title corrected. 4. Updates to dictionary string names and values.

File:

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

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

@@ -199 +199 @@
         eap = null;
     }
-    else if (esrc == menu_bar.file_exportmeta || esrc == menu_bar.file_movemeta) {
+    else if (esrc == menu_bar.file_exportmeta || esrc == menu_bar.file_convertmeta) {
         String currCollName = Gatherer.c_man.getCollection().getName();
         String collection_directory_path = CollectionManager.getCollectionDirectoryPath(currCollName);
         
         String importDir = collection_directory_path + "import";
-        File csvFile = MetadataToCSV.chooseMetaCSVFile(importDir, this);
+
+        boolean convertMode = false;
+        String startDir = collection_directory_path;
+        if(esrc == menu_bar.file_convertmeta) {
+        startDir = importDir;
+        convertMode = true;
+        }
+        
+        File csvFile = MetadataToCSV.chooseMetaCSVFile(startDir, convertMode, this);
         if(csvFile != null) {
         MetadataToCSV toCSV = new MetadataToCSV(collection_directory_path, csvFile);
         
         boolean success = false;
-        if(esrc == menu_bar.file_movemeta) {
-            success = toCSV.moveMetaXMLToCSV(csvFile, this);
+        if(esrc == menu_bar.file_convertmeta) {
+            success = toCSV.convertMetaXMLToCSV(csvFile, this);
         } else {
             success = toCSV.exportMetaXMLToCSV(csvFile);
@@ -216 +224 @@
 
         // refresh coll view if meta.csv was created somewhere inside this coll's import folder
-        // And for remote case, also upload any new file that's inside import dir to server
-        if(success && csvFile.exists() && csvFile.getAbsolutePath().startsWith(importDir)) {
+        // And for remote case, also upload any new file that's inside collection dir
+        // (especially import dir) to server
+        if(success && csvFile.exists() && csvFile.getAbsolutePath().startsWith(collection_directory_path)) {
             if(Gatherer.isGsdlRemote) {
             Gatherer.remoteGreenstoneServer.uploadFilesIntoCollection(currCollName, new File[] {csvFile}, csvFile.getParentFile());