Changeset 19736 for gli/trunk/src/org/greenstone/gatherer/util/UnzipTools.java

Timestamp:

2009-06-03T16:53:24+12:00 (15 years ago)

Author:

ak19

Message:

Upon unzipping need to delete the dummy 'empty' files which were inserted into EMPTY directories when ZipTools generated a zip. Without deleting these, we see ugly empty files in the CollectionView of GLI.

File:

• gli/trunk/src/org/greenstone/gatherer/util/UnzipTools.java (modified) (1 diff)

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

@@ -62 +62 @@
             dir.mkdirs();
 
-            // Set up input stream
-            InputStream zis = zip_file.getInputStream(zip_entry); 
-            BufferedInputStream bzis = new BufferedInputStream(zis); 
-            DataInputStream dbzis = new DataInputStream(bzis);
-
-            // Set up output stream
-            FileOutputStream fzos = new FileOutputStream(zip_entry_file);
-            BufferedOutputStream bfzos = new BufferedOutputStream(fzos);
-
-            byte[] buf = new byte[1024];
-            int len;
-            while ((len = dbzis.read(buf)) >= 0) {
-            bfzos.write(buf,0,len);
+            // Don't need to unzip files called empty which were created during the zipping process
+            // in order to be able to generate empty directories in a zip (see remote.ZipTools)
+            if(!zip_entry_file.getName().equals("empty")) {
+            // Set up input stream
+            InputStream zis = zip_file.getInputStream(zip_entry); 
+            BufferedInputStream bzis = new BufferedInputStream(zis); 
+            DataInputStream dbzis = new DataInputStream(bzis);
+            
+            // Set up output stream
+            FileOutputStream fzos = new FileOutputStream(zip_entry_file);
+            BufferedOutputStream bfzos = new BufferedOutputStream(fzos);
+            
+            byte[] buf = new byte[1024];
+            int len;
+            while ((len = dbzis.read(buf)) >= 0) {
+                bfzos.write(buf,0,len);
+            }
+            
+            dbzis.close();
+            bzis.close();
+            zis.close();
+            
+            bfzos.close();
+            fzos.close();
             }
-
-            dbzis.close();
-            bzis.close();
-            zis.close();
-
-            bfzos.close();
-            fzos.close();
         }
         }