Changeset 10207

Timestamp:

2005-07-05T12:21:25+12:00 (19 years ago)

Author:

davidb

Message:

Minor changes to zipping and unzipping files to be compatible with Windows version of
applet

Location:

trunk/gli/src/org/greenstone/gatherer

Files:

• GathererApplet.java (modified) (4 diffs)
• util/Unzip.java (modified) (2 diffs)
• util/Utility.java (modified) (2 diffs)

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

@@ -109 +109 @@
         File gli_user_directory = Utility.setGLIUserFolder(windows_home);
     if (!gli_user_directory.exists()) {
-        gli_user_directory.mkdirs();
+        if (!gli_user_directory.mkdirs()) {
+            System.err.println("Warning: Unable to make directory: " + gli_user_directory.toString());
+        }
     }
 
@@ -165 +167 @@
         else {
         // Prepare an empty collect dir for general use
-        col_dir.mkdir();
+        if (!col_dir.mkdir()) {
+            System.err.println("Warning: Unable to make directory: " + col_dir.toString());
+        }
         }
         }
@@ -172 +176 @@
         File tmp_dir = new File(Utility.TMP_DIR);
         if (!tmp_dir.exists()) {
-            tmp_dir.mkdir();
+            if (!tmp_dir.mkdir()) {
+        System.err.println("Warning: Unable to make directory: " + tmp_dir.toString());
+        }
 
         String username = System.getProperty("user.name");
@@ -178 +184 @@
         File user_tmp_dir = new File(Utility.TMP_DIR + File.separator + username);
         if (!user_tmp_dir.exists()) {
-            user_tmp_dir.mkdir();
+            if (!user_tmp_dir.mkdir()) {
+            System.err.println("Warning: Unable to make directory: " + user_tmp_dir.toString());
+            }
         }
         }

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

@@ -70 +70 @@
 
     String gsdl_home = args[0];
+
+    if (!gsdl_home.endsWith(File.separator)) {
+        gsdl_home += File.separator;
+    }
+
     String col_dir = gsdl_home + "collect" + File.separator;
 
+    String zip_fname = args[1];
+
     try {
-        zipFile = new ZipFile(args[1]);
+        zipFile = new ZipFile(zip_fname);
 
         entries = zipFile.entries();
@@ -102 +109 @@
         zipFile.close();
     } 
+    catch (ZipException error) {
+        System.err.println("Error: Unable to open '"+zip_fname+"'");
+        System.err.println("This maybe caused by the zip file being empty.");
+        error.printStackTrace();
+    }
+
     catch (IOException ioe) {
-        System.err.println("Unhandled exception on " + args[1]);
+        System.err.println("Unhandled exception on " + gsdl_home + " " + zip_fname);
         ioe.printStackTrace();
         return;
     }
+
+    catch (Exception error) {
+        error.printStackTrace();
+    }
     }
 }

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

@@ -689 +689 @@
     int prefix_strip = col_dir.length();
     boolean encountered_file = false;
-
+    
     String zip_fname = col_dir + col_name + ".zip";
     String zip_dir_or_file = col_dir + col_name + File.separator + dir_or_file;
@@ -751 +751 @@
     try {
         File cfile = new File(zip_fname);
+        System.err.println("**** zip fname = " + cfile.toString());
+
         ZipFile zipfile = new ZipFile(cfile, zip_mode);