Changeset 13390 for trunk/gli

Timestamp:

2006-12-01T11:24:14+13:00 (17 years ago)

Author:

mdewsnip

Message:

(Remote building) Now includes the archives.inf file in the collection archives zip file, to prevent a completely empty zip file if no files were imported.

File:

• trunk/gli/src/org/greenstone/gatherer/remote/ZipCollectionArchives.java (modified) (1 diff)

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

@@ -50 +50 @@
     public boolean shouldIncludeFile(String relative_file_path)
     {
-        // Only doc.xml files are included
-        return (relative_file_path.equals("doc.xml") || relative_file_path.endsWith(File.separator + "doc.xml"));
+        // Only doc.xml files are strictly required, but we include archives.inf as well to prevent
+        //   errors when zipping up the archives of a collection where no files were imported
+        //   (in this case the zip file would contain nothing at all)
+        return (relative_file_path.equals("archives.inf") || relative_file_path.endsWith(File.separator + "archives.inf") || relative_file_path.equals("doc.xml") || relative_file_path.endsWith(File.separator + "doc.xml"));
     }