Changeset 13705

Timestamp:

2007-01-19T16:03:51+13:00 (17 years ago)

Author:

mdewsnip

Message:

Changed the "uploadModifiedMetadataXMLFiles" function to "saveMetadataXMLFiles", as it is soon to do a little more than the remote greenstone stuff.

Location:

trunk/gli/src/org/greenstone/gatherer

Files:

• gui/EnrichPane.java (modified) (1 diff)
• metadata/MetadataXMLFileManager.java (modified) (2 diffs)

trunk/gli/src/org/greenstone/gatherer/gui/EnrichPane.java

@@ -193 +193 @@
     metadata_value_table_pane.stopEditingAndRebuild(file_nodes);
 
-    // Upload the modified metadata.xml files to the server now, if we're using one
-    MetadataXMLFileManager.uploadModifiedMetadataXMLFiles();
+    // Make sure all the metadata has been saved to file
+    MetadataXMLFileManager.saveMetadataXMLFiles();
 
     // Remove the collection tree and filter from this pane so it can be added to the Gather pane

trunk/gli/src/org/greenstone/gatherer/metadata/MetadataXMLFileManager.java

@@ -353 +353 @@
 
 
+    /** Ensures that all the metadata is written to metadata.xml files. */
+    static public void saveMetadataXMLFiles()
+    {
+    // If the collection is stored on a remote server, upload all the modified files now
+    if (Gatherer.isGsdlRemote) {
+        if (modified_metadata_xml_files.isEmpty()) {
+        DebugStream.println("No modified metadata.xml files to upload.");
+        return;
+        }
+
+        // Upload the files modified since last time, then reset the list
+        RemoteGreenstoneServer.uploadCollectionFiles(CollectionManager.getLoadedCollectionName(), (File[]) modified_metadata_xml_files.toArray(new File[0]));
+        modified_metadata_xml_files.clear();
+    }
+    }
+
+
     static public void unloadMetadataXMLFile(File metadata_xml_file_file)
     {
@@ -366 +383 @@
     }
     }
-
-
-    static public void uploadModifiedMetadataXMLFiles()
-    {
-    // This is only necessary when the collection is stored on a remote server
-    if (Gatherer.isGsdlRemote) {
-        if (modified_metadata_xml_files.isEmpty()) {
-        DebugStream.println("No modified metadata.xml files to upload.");
-        return;
-        }
-
-        // Upload the files modified since last time, then reset the list
-        RemoteGreenstoneServer.uploadCollectionFiles(CollectionManager.getLoadedCollectionName(), (File[]) modified_metadata_xml_files.toArray(new File[0]));
-        modified_metadata_xml_files.clear();
-    }
-    }
 }