Changeset 10876

Timestamp:

2005-11-09T14:17:42+13:00 (18 years ago)

Author:

kjdon

Message:

added the macros directory to be uploaded along with images directory

Location:

branches/gsdl-2_62-distribution-branch/gli/src/org/greenstone/gatherer

Files:

• collection/CollectionManager.java (modified) (1 diff)
• shell/GShell.java (modified) (1 diff)

branches/gsdl-2_62-distribution-branch/gli/src/org/greenstone/gatherer/collection/CollectionManager.java

@@ -619 +619 @@
     {
     return getCollectionDirectoryPath() + "log" + File.separator;
+    }
+
+    /** Constructs the absolute filename of the collection's macros directory, which should resemble "$GSDLHOME/collect/<col_name>/macros/"
+     * @return A <strong>String</strong> containing the filename.
+     */
+    public String getCollectionMacrosDirectoryPath()
+    {
+    return getCollectionDirectoryPath() + "macros" + File.separator;
     }
 

branches/gsdl-2_62-distribution-branch/gli/src/org/greenstone/gatherer/shell/GShell.java

@@ -281 +281 @@
             System.err.println("collect_directory_path: " + collect_directory_path);
             System.err.println("col_name: " + col_name);
+        }
+        File macro_dir = new File(Gatherer.c_man.getCollectionMacrosDirectoryPath());
+        if (macro_dir.exists() && macro_dir.list().length > 0) {
+            // upload images/ directory to server
+            if(hasSignalledStop()) { return; }
+            ZipTools.zipup(collect_directory_path, col_name, "macros", this, "", "");
+
+            if(hasSignalledStop()) { return; }
+            RemoteGreenstoneServer.upload_url_zip(col_name, "macros", "", this);
+
         }