Changeset 9045 for trunk/gli/src/org/greenstone/gatherer/cdm

Timestamp:

2005-02-15T15:39:48+13:00 (19 years ago)

Author:

mdewsnip

Message:

Made major rearrangements to the way path variables are calculated. This is to facilitate being able to specify a "-collectdir" argument to the GLI so one GLI installation can be used in a networked, multi-user situation. Hope I haven't broken anything!

Location:

trunk/gli/src/org/greenstone/gatherer/cdm

Files:

• CollectionDesignManager.java (modified) (1 diff)
• GeneralManager.java (modified) (1 diff)
• MetadataSetView.java (modified) (1 diff)
• SuperCollectionManager.java (modified) (1 diff)

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

@@ -216 +216 @@
         if (formats_changed && Gatherer.c_man.built()) {
         // upload etc/collect.cfg to server to reflect changes
-        Utility.zipup(collection_name, Utility.CONFIG_FILE);
+        Utility.zipup(Gatherer.getCollectDirectoryPath(), collection_name, Utility.CONFIG_FILE);
         GathererApplet.upload_url_zip(collection_name, "etc");
         }

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

@@ -473 +473 @@
         public void actionPerformed(ActionEvent event) {
         // Open an almost standard file browser to the images folder of the current collection
-        File images_folder = new File(Gatherer.c_man.getCollectionImages());
+        File images_folder = new File(Gatherer.c_man.getCollectionImagesDirectoryPath());
         // If images isn't already there, create it
         if(!images_folder.exists()) {

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

@@ -300 +300 @@
             // Re-read all the metadata.xml files to account for this case
             MetadataXMLFileManager.clearMetadataXMLFiles();
-            MetadataXMLFileManager.loadMetadataXMLFiles(new File(Gatherer.c_man.getCollectionImport()));
+            MetadataXMLFileManager.loadMetadataXMLFiles(new File(Gatherer.c_man.getCollectionImportDirectoryPath()));
         }
         }

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

@@ -196 +196 @@
         current_coll_name = Gatherer.c_man.getCollection().getName();
 
-        File gsdl_collection_directory;
-        if (Gatherer.GS3) {
-        gsdl_collection_directory = new File(Utility.getCollectDir(Configuration.gsdl3_path, Configuration.site_name));
-        }
-        else {
-        gsdl_collection_directory = new File(Utility.getCollectDir(Configuration.gsdl_path));
-        }
-
-        File[] possible_collections = gsdl_collection_directory.listFiles();
+        File collect_directory = new File(Gatherer.getCollectDirectoryPath());
+        File[] possible_collections = collect_directory.listFiles();
         for(int i = 0; possible_collections != null && i < possible_collections.length; i++) {
         File collect_cfg_file = new File(possible_collections[i], Utility.CONFIG_FILE);