Changeset 9942

Timestamp:

2005-05-24T16:39:35+12:00 (19 years ago)

Author:

davidb

Message:

Modifications to handling of zip files.

Location:

trunk/gli/src/org/greenstone/gatherer

Files:

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

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

@@ -144 +144 @@
 
     Utility.METADATA_DIR = Utility.BASE_DIR + "metadata" + File.separator;
+    Utility.TMP_DIR = Utility.BASE_DIR + "tmp" + File.separator;
 
     Configuration.TEMPLATE_CONFIG_XML = "xml/configRemote.xml";
@@ -293 +294 @@
 
         dl_dbis.close();
+        dl_bis.close();
+        dl_is.close();
+
         zip_bfos.close();
+        zip_fos.close();
 
     }
@@ -399 +404 @@
         dos.flush();
         dos.close();
-        
-        
+
+        // delete zip file
+        boolean file_deleted = file.delete();
+        if (file_deleted) {
+        System.err.println("Zip file " + file.toString() + " deleted");
+        }
+        else {
+        System.err.println("Zip file " + file.toString() + " NOT deleted");
+        }
     }
     catch (MalformedURLException ex) {

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

@@ -881 +881 @@
 
     String zip_fname = col_dir + col_name + ".zip";
-    int zip_mode = ZipFile.OPEN_READ | ZipFile.OPEN_DELETE;
+    // int zip_mode = ZipFile.OPEN_READ | ZipFile.OPEN_DELETE;
+    int zip_mode = ZipFile.OPEN_READ; 
 
     try {
-        ZipFile zipfile = new ZipFile(new File(zip_fname), zip_mode);
+        File cfile = new File(zip_fname);
+        ZipFile zipfile = new ZipFile(cfile, zip_mode);
         
         Enumeration e = zipfile.entries(); 
@@ -890 +892 @@
         ZipEntry zipentry = (ZipEntry) e.nextElement();
         String zentryname = col_dir + zipentry.getName();
-        File file = new File(zentryname);
+        File zfile = new File(zentryname);
         DebugStream.println("    Unzipping: " + zentryname);
 
         if (zipentry.isDirectory()) {
             // Create named directory, if it doesn't already exist
-            if (!file.exists() && !file.mkdirs()) {
-            System.err.println("Error: unable to create directory " + file);
+            if (!zfile.exists() && !zfile.mkdirs()) {
+            System.err.println("Error: unable to create directory " + zfile);
             }
         }
@@ -903 +905 @@
 
             //Make sure it's parent directory exists.
-            File dir = new File(file.getParent());
+            File dir = new File(zfile.getParent());
             dir.mkdirs();
 
@@ -922 +924 @@
             
             dbzis.close();
+            bzis.close();
+            zis.close();
+
             bfzos.close();
-        }
-        }
+            fzos.close();
+        }
+        }
+
+        zipfile.close();
+
+        // delete zip file
+        boolean file_deleted = cfile.delete();
+        if (file_deleted) {
+        System.err.println("Zip file " + cfile.toString() + " deleted");
+        }
+        else {
+        System.err.println("Zip file " + cfile.toString() + " NOT deleted");
+        }
+
+
     } 
     catch (ZipException error) {