Changeset 9884 for trunk/gli

Timestamp:

2005-05-16T15:21:42+12:00 (19 years ago)

Author:

davidb

Message:

Extra functionality to support export to cd-rom image added back in.
Includes making sure a tmp directory exists top-level GSDLHOME and
the a leading slash on an upload or download directory means it is
relative to GSDLHOME rather than a collection.

Location:

trunk/gli/src/org/greenstone/gatherer

Files:

• GathererApplet.java (modified) (3 diffs)
• util/Utility.java (modified) (1 diff)

trunk/gli/src/org/greenstone/gatherer/GathererApplet.java

@@ -167 +167 @@
         }
 
-    /*
+    
         File tmp_dir = new File(Utility.TMP_DIR);
         if (!tmp_dir.exists()) {
             tmp_dir.mkdir();
         }
-    */
+
 
     File metadata_directory = new File(Utility.METADATA_DIR);
@@ -265 +265 @@
             
         // set up output stream for zip download
-        String collect_directory_path = Gatherer.getCollectDirectoryPath();
-        String zip_fname = collect_directory_path + col_name + ".zip";
+        String col_dir;
+        if (col_name.startsWith("/")) {
+        col_dir = Configuration.gsdl_path;
+        }
+        else {
+        col_dir = Gatherer.getCollectDirectoryPath();
+        }
+
+        String zip_fname = col_dir + col_name + ".zip";
         FileOutputStream zip_fos = new FileOutputStream(zip_fname);
         BufferedOutputStream zip_bfos = new BufferedOutputStream(zip_fos);
@@ -295 +302 @@
     final int maxBufferSize = 1024;
 
-    String collect_directory_path = Gatherer.getCollectDirectoryPath();
-    String zip_fname = collect_directory_path + col_name + ".zip";
+    String col_dir;
+    if (col_name.startsWith("/")) {
+        col_dir = Configuration.gsdl_path;
+    }
+    else {
+        col_dir = Gatherer.getCollectDirectoryPath();
+    }
+
+    String zip_fname = col_dir + col_name + ".zip";
     String upload_cgi = Gatherer.cgiBase + "upload";
 

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

@@ -95 +95 @@
     static final public String GLI_ARCHIVE = "GLI.jar";
     static final public String GLI_EXTENSION = ".col";
+
+    static public String TMP_DIR  = BASE_DIR + "tmp" + File.separator;
+
     /** Definition of an important directory name, in this case the images directory for the collection. */
     static final public String IMAGES_DIR = "images" + File.separator;