Changeset 19221 for gli

Timestamp:

2009-04-23T13:55:26+12:00 (15 years ago)

Author:

ak19

Message:

Correction for allowing the metadata directories of collections nested in collectiongroups to get zipped up. Ziptools now handles empty directories with a dummy file.

Location:

gli/trunk/src/org/greenstone/gatherer/remote

Files:

• ZipCollectionConfigurations.java (modified) (1 diff)
• ZipTools.java (modified) (1 diff)

gli/trunk/src/org/greenstone/gatherer/remote/ZipCollectionConfigurations.java

@@ -71 +71 @@
             // The "metadata" directory may not exist (non-GLI collections)
             String metadata_relative_path = relative_path + collection_directories[i].getName() + File.separator + "metadata";
-            File metadata_directory = new File(collect_directory.getAbsolutePath() + File.separator + metadata_relative_path);
+            File metadata_directory = new File(toplevel_path + File.separator + metadata_relative_path);
             if (metadata_directory.exists()) {
             ZipTools.addFileToZip(zos, toplevel_path, metadata_relative_path, collection_metadata_zip_filter);

gli/trunk/src/org/greenstone/gatherer/remote/ZipTools.java

@@ -76 +76 @@
             addFileToZip(zos, base_directory_path, relative_file_path + File.separator + child_files[i].getName(), zip_filter);
         }
+
+        // empty directory. Java zips don't allow empty dirs, so need to put some dummy file in there
+        if(child_files.length == 0) {
+            String rel_path = relative_file_path.replace('\\', '/') + File.separator + "empty";
+            System.err.println("Zipping empty dir requires dummy file: " + rel_path);
+            zos.putNextEntry(new ZipEntry(rel_path));
+        }
         }