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

Timestamp:

2020-07-12T02:51:45+12:00 (4 years ago)

Author:

ak19

Message:

1. Added moveMetaXMLToCSV 2. Both this and exportMetaAsCSV now also made to work for the remote case. 3. Bugfix to oversight in GUIManager that in the previous commit used to ignore user selected csvfile and always created a metdata.csv in import folder. 4. Tidied up MetaToCSV.java some more.

File:

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

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

@@ -199 +199 @@
         eap = null;
     }
-    else if (esrc == menu_bar.file_exportmeta) {
+    else if (esrc == menu_bar.file_exportmeta || esrc == menu_bar.file_movemeta) {
         String currCollName = Gatherer.c_man.getCollection().getName();
         String collection_directory_path = CollectionManager.getCollectionDirectoryPath(currCollName);
         
-        String importDir = collection_directory_path + File.separator + "import";
-        File selectedFile = MetadataToCSV.chooseMetaCSVFile(importDir, this);
-        if(selectedFile != null) {
-        MetadataToCSV toCSV = new MetadataToCSV(collection_directory_path, selectedFile);
-        //toCSV.printOrderedCollectionMeta();       
-        toCSV.exportGLIMetaToCSV(new File(importDir, "metadata.csv"));
-        }
+        String importDir = collection_directory_path + "import";
+        File csvFile = MetadataToCSV.chooseMetaCSVFile(importDir, 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);
+        } else {
+            success = toCSV.exportMetaXMLToCSV(csvFile);
+        }
+
+        // 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)) {
+            if(Gatherer.isGsdlRemote) {
+            Gatherer.remoteGreenstoneServer.uploadFilesIntoCollection(currCollName, new File[] {csvFile}, csvFile.getParentFile());
+            }
+            Gatherer.g_man.refreshCollectionTree(DragTree.COLLECTION_CONTENTS_CHANGED);
+        }
+        }
+        
     }
     else if (esrc == menu_bar.file_exit) {