Changeset 34263

Timestamp:

2020-07-11T23:32:49+12:00 (4 years ago)

Author:

ak19

Message:

Option in GLI file menu to Export collection meta to CSV (new CSV file or add to existing). Uses apache commons CSV, so had to include the csv subfolder of commons into apache.jar, where all other apache jars used by GLI are bundled into. Updated the gli/lib/README about this.

Location:

main/trunk/gli

Files:

• classes/dictionary.properties (modified) (2 diffs)
• lib/README.txt (modified) (2 diffs)
• lib/apache.jar (modified) ( previous)
• src/org/greenstone/gatherer/gui/GUIManager.java (modified) (2 diffs)
• src/org/greenstone/gatherer/gui/MenuBar.java (modified) (3 diffs)
• src/org/greenstone/gatherer/metadata/MetadataToCSV.java (added)

main/trunk/gli/classes/dictionary.properties

@@ -532 +532 @@
 ExportAsPrompt.MappingXML_Tooltip:Use a mapping file for converting the exported files.
 #
+#***** Export Metadata to CSV *****
+ExportMeta.ChooseMetaCSVFile: Export metadata from GLI to a new CSV file or add to existing
+#
 #***** Inherited Metadata *****
 ExtractedMetadata.Message:The selected file or folder contains extracted metadata, but it is currently hidden. To view extracted metadata go to the "File" menu and select "Preferences". In the "General" properties sheet select "View Extracted Metadata", then click "Ok".
@@ -781 +784 @@
 Menu.File_Exit:Exit
 Menu.File_ExportAs:Export...
+Menu.File_ExportMeta:Export metadata...
 Menu.File_New:New...
 Menu.File_Open:Open...

main/trunk/gli/lib/README.txt

@@ -37 +37 @@
             - logging: appears to be from commons-logging.
             - not sure where the 4 other subfolders of commons (beanutils, collections, digester, httpclient) are from. See commit message of http://trac.greenstone.org/log/gli/trunk/lib/apache.jar?rev=14319 for ideas.
-        
+            - csv: ADDED 11/07/2020 from commons-csv-1.8.jar
 
 Essentially, in commit 29729, the entire contents of GS3 web-lib's xml-apis.jar and xercesImpl.jar have been added to apache.jar after unzipping it, replacing earlier versions already present. The "javax" and "licence" toplevel folders of apache.jar are proper additions, deriving from xml-apis.jar. All other contents of apache.jar have been left as they were.
@@ -45 +45 @@
 UPDATING apache.jar
 ---------------------------
+Create a folder in gli/lib called apache.
+Copy apache.jar from gli/lib into gli/lib/apache.
+Then go into the new apache folder and unjar (unzip) the apache.jar there:
+> cd apache
+> jar -xvf apache.jar
 
-After unzipping apache.jar, its contents were updated to use the later xerces and xml-apis as described above.
+
+After unzipping apache.jar, its contents were updated to use the later xerces and xml-apis as described in the sections above.
 
 How to recreate the apache.jar:
 > cd gli/lib/apache
 > jar -cvf apache.jar *
+> jar -tvf apache.jar
+  (to check the contents of the jar file just created)
 
-The apache.jar file gets generated inside gli/lib/apache, move it into gli/lib. Then commit it.
+The apache.jar file gets generated inside gli/lib/apache, move it into gli/lib replacing any older versions. Then commit it.
 
 Further changes to makejar.sh/bat, to mention the new javax subfolder, since it may also need to be unzipped from apache.jar along with the other contained libraries, so that xml-apis' javax too can be included in GLI.jar when this is generated, in case there is any dependence on javax in the rest of xml-apis' classes.

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

@@ -67 +67 @@
 import org.greenstone.gatherer.util.Utility;
 
+import org.greenstone.gatherer.metadata.MetadataToCSV;
      
 /** The GUIManager is in charge of creating the Gatherer window frame then filling it with the goodness of the view panes. GUIManager not only creates these panes, but allows some messaging between them. Furthermore GUIManager includes functionality from menu driven choices, simply as it was easier to put it here once and have it accessible from all pane children. */
@@ -197 +198 @@
         eap.destroy();
         eap = null;
+    }
+    else if (esrc == menu_bar.file_exportmeta) {
+        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"));
+        }
     }
     else if (esrc == menu_bar.file_exit) {

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

@@ -69 +69 @@
     public JMenuItem file_exit       = null;
     public JMenuItem file_exportas   = null;
+    public JMenuItem file_exportmeta = null;
     public JMenuItem file_new        = null;
     public JMenuItem file_open       = null;
@@ -122 +123 @@
     file_exportas.setEnabled(!Gatherer.isGsdlRemote);
     file_exportas.setComponentOrientation(Dictionary.getOrientation());
+
+    file_exportmeta = new JMenuItem(Dictionary.get("Menu.File_ExportMeta"));
+    file_exportmeta.addActionListener(Gatherer.g_man);
+    file_exportmeta.setEnabled(!Gatherer.isGsdlRemote);
+    file_exportmeta.setComponentOrientation(Dictionary.getOrientation());
         
     file_new = new JMenuItem(Dictionary.get("Menu.File_New"));
@@ -148 +154 @@
     file.add(file_delete);
     file.add(file_exportas);
+    file.add(file_exportmeta);
     // these currently don't work. better to just disable them?
     if (!Gatherer.GS3) {