Changeset 10511

Timestamp:

2005-08-15T16:59:44+12:00 (19 years ago)

Author:

mdewsnip

Message:

Changed the names of some functions in RemoteGreenstoneServer and made almost all of the functions take the collection name as an argument (needed for authentication).

Location:

trunk/gli/src/org/greenstone/gatherer

Files:

• cdm/GeneralManager.java (modified) (1 diff)
• collection/CollectionManager.java (modified) (2 diffs)
• file/FileManager.java (modified) (1 diff)
• metadata/MetadataXMLFileManager.java (modified) (1 diff)

trunk/gli/src/org/greenstone/gatherer/cdm/GeneralManager.java

@@ -506 +506 @@
                 // If we're using a remote Greenstone server, upload the image
                 if (Gatherer.isGsdlRemote) {
-                    RemoteGreenstoneServer.uploadCollectionFile(collection_image_file);
+                    RemoteGreenstoneServer.uploadCollectionFile(Gatherer.c_man.getCollection().getName(), collection_image_file);
                 }
                 }

trunk/gli/src/org/greenstone/gatherer/collection/CollectionManager.java

@@ -721 +721 @@
         // If we're using a remote Greenstone server, upload the metadata file
         if (Gatherer.isGsdlRemote) {
-            RemoteGreenstoneServer.uploadCollectionFile(metadata_set_file);
+            RemoteGreenstoneServer.uploadCollectionFile(collection.getName(), metadata_set_file);
         }
         }
@@ -1109 +1109 @@
         if (Gatherer.isGsdlRemote) {
         String relative_metadata_set_file_path = RemoteGreenstoneServer.getPathRelativeToDirectory(metadata_set_file.getAbsolutePath(), Gatherer.getGLIUserDirectoryPath());
-        RemoteGreenstoneServer.sendDeleteFileCommand(relative_metadata_set_file_path);
+        RemoteGreenstoneServer.deleteCollectionFile(collection.getName(), relative_metadata_set_file_path);
         }
     }

trunk/gli/src/org/greenstone/gatherer/file/FileManager.java

@@ -149 +149 @@
         // ... but only if it is inside the collection and we haven't already downloaded it
         if (file.getAbsolutePath().startsWith(Gatherer.getCollectDirectoryPath()) && file.length() == 0) {
-        RemoteGreenstoneServer.downloadCollectionFile(file);
+        RemoteGreenstoneServer.downloadCollectionFile(Gatherer.c_man.getCollection().getName(), file);
         }
     }

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

@@ -384 +384 @@
 
         // Upload the files modified since last time, then reset the list
-        RemoteGreenstoneServer.uploadCollectionFiles((File[]) modified_metadata_xml_files.toArray(new File[0]));
+        RemoteGreenstoneServer.uploadCollectionFiles(Gatherer.c_man.getCollection().getName(), (File[]) modified_metadata_xml_files.toArray(new File[0]));
         modified_metadata_xml_files.clear();
     }