Changeset 17095 for gli

Timestamp:

2008-08-29T14:10:41+12:00 (16 years ago)

Author:

ak19

Message:

FLI exports a separate docMETS xml file representing a collection object for ingestion into Fedora. Though the gsdlsourcefilename of this collection object does not refer to the import directory, there's no need to print a warning about this as it is desired behaviour.

File:

• gli/trunk/src/org/greenstone/gatherer/metadata/DocXMLFile.java (modified) (1 diff)

gli/trunk/src/org/greenstone/gatherer/metadata/DocXMLFile.java

@@ -261 +261 @@
             }
 
-            // Warn about an odd gsdlsourcefilename, except if it is the Greenstone "tmp" directory
-            // or (as in the case of using FLI) if it is the etc/collect.cfg file
-            // This is true when the source files come from a zip file processed by ZIPPlug, for example
-            else if (gsdlsourcefilename_value.indexOf("tmp") == -1 && !gsdlsourcefilename_value.endsWith("collect.cfg")) {
+            // Warn about an odd gsdlsourcefilename, except if it is the Greenstone "tmp" directory or
+            // (as in the case of using FLI) if it is the etc/collect.cfg or etc/collectionConfig.xml file
+            // which are the gsdlsourcefilenames for the fedora digital object representing a collection.
+            // This (tmp dir) is true when the source files come from a zip file processed by ZIPPlug, for example
+            else if (gsdlsourcefilename_value.indexOf("tmp") == -1 
+                 && !gsdlsourcefilename_value.endsWith("collect.cfg")
+                 && !gsdlsourcefilename_value.endsWith("collectionConfig.xml")) {
             // We don't really know what is going on...
             System.err.println("Warning: Could not understand gsdlsourcefilename " + gsdlsourcefilename_value);