Changeset 10374

Timestamp:

2005-08-01T14:31:31+12:00 (19 years ago)

Author:

mdewsnip

Message:

Now uploads collection images to the server, if using remote building.

Location:

trunk/gli/src/org/greenstone/gatherer

Files:

• cdm/GeneralManager.java (modified) (2 diffs)
• util/StaticStrings.java (modified) (1 diff)
• util/Utility.java (modified) (1 diff)

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

@@ -44 +44 @@
 import org.greenstone.gatherer.gui.OpenCollectionDialog;
 import org.greenstone.gatherer.gui.WarningDialog;
+import org.greenstone.gatherer.remote.RemoteGreenstoneServer;
 import org.greenstone.gatherer.util.StaticStrings;
 
@@ -500 +501 @@
                 // Copy the file
                 try {
-                Gatherer.f_man.getQueue().copyFile(file, new File(images_folder, file.getName()), null);
+                File collection_image_file = new File(images_folder, file.getName());
+                Gatherer.f_man.getQueue().copyFile(file, collection_image_file, null);
+
+                // If we're using a remote Greenstone server, upload the image
+                if (Gatherer.isGsdlRemote) {
+                    RemoteGreenstoneServer.uploadCollectionFile(collection_image_file);
+                }
                 }
                 catch(Exception exception) {

trunk/gli/src/org/greenstone/gatherer/util/StaticStrings.java

@@ -128 +128 @@
     static final public String HTM_FILE_EXTENSION                         = ".htm";
     static final public String IDENTIFIER_VALUE                           = "identifier";
-    static final public String IMAGES_FOLDER                              = "images";
-    static final public String IMAGES_PATH_RELATIVE_TO_COLLECTION_PREFIX  = "_httpcollection_/images/";
     static final public String IMAGES_PATH_RELATIVE_TO_GSDL_PREFIX        = "_httpprefix_/collect/<col_name>/images/";
     static final public String IMPORT_FOLDER                              = "import";

trunk/gli/src/org/greenstone/gatherer/util/Utility.java

@@ -77 +77 @@
     static final public String GLI_EXTENSION = ".col";
 
-    /** Definition of an important directory name, in this case the images directory for the collection. */
-    static final public String IMAGES_DIR = "images" + File.separator;
     /** Definition of an important directory name, in this case the import directory for the collection. */
     static final public String IMPORT_DIR = "import" + File.separator;