Changeset 9883

Timestamp:

2005-05-16T15:17:54+12:00 (19 years ago)

Author:

davidb

Message:

Support for collect.zip being in Jar file put back in. This lets the applet
version of GLI be seeded with interesting example collections to be based
on (e.g. the documented demo collections).

Location:

trunk/gli/src/org/greenstone/gatherer

Files:

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

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

@@ -152 +152 @@
     File col_dir = new File(Gatherer.getCollectDirectoryPath());
     if (!col_dir.exists()) {
-        col_dir.mkdir();
-    }
+
+        if (Utility.isInJar(Utility.COLLECT_ZIP)) {
+        // Dig out collect.zip from JAR file and unzip it (thereby
+        // creating collect directory and descendants.
+        //   This is done to seed gsdl home folder with config files
+        //   for documented example collections so "base this on
+        //   existing collection" works
+        Utility.unzipFromJar(Utility.COLLECT_ZIP,gli_user_directory.toString());
+        }
+        else {
+        // Prepare an empty collect dir for general use
+        col_dir.mkdir();
+        }
+        }
+
+    /*
+        File tmp_dir = new File(Utility.TMP_DIR);
+        if (!tmp_dir.exists()) {
+            tmp_dir.mkdir();
+        }
+    */
 
     File metadata_directory = new File(Utility.METADATA_DIR);
     if (!metadata_directory.exists()) {
-        // digout metadata.zip from JAR file and unzip it
+        // dig out metadata.zip from JAR file and unzip it
         Utility.unzipFromJar(Utility.METADATA_ZIP, gli_user_directory.toString());
     }

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

@@ -111 +111 @@
     /** Definition of an important zip file, in this case zipped up version of metadata file stored in JAR file */
     static final public String METADATA_ZIP = "metadata.zip";
+    static final public String COLLECT_ZIP = "collect.zip";
     /** The default name of the perl executable under unix. */
     static final public String PERL_EXECUTABLE_UNIX = "perl";
@@ -518 +519 @@
 
 
+    static public boolean isInJar(String filename) 
+    {
+    try {
+        InputStream fis = base.getResourceAsStream("/"+filename);
+            
+        fis.close();
+
+    }
+    catch (Exception error) {
+        System.err.println("**** collect.zip not there!");
+        error.printStackTrace();
+
+
+        return false;
+    }
+    return true;
+    }
+
+
+
     static public void extractFromJar(String filename, String dst_dir, boolean must_be_present) 
     {