Changeset 17014 for gli/trunk

Timestamp:

2008-08-26T19:08:52+12:00 (16 years ago)

Author:

ak19

Message:

1. Made MetadataWrap and MetadataItem members final rather than static, now they are passed by subclasses to the superclass constructor (DocXMLFile). 2. Skip warning on gsdlsourcefilename etc/collect.cfg since this occurs when working with FLI and is not an error.

Location:

gli/trunk/src/org/greenstone/gatherer/metadata

Files:

• DocGAFile.java (modified) (1 diff)
• DocMetsXMLFile.java (modified) (1 diff)
• DocXMLFile.java (modified) (2 diffs)

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

@@ -41 +41 @@
     public DocGAFile(String doc_xml_file_path)
     {
-    super(doc_xml_file_path);
-    MetadataWrap = "Description";
-    MetadataItem = "Metadata";
+    super(doc_xml_file_path, "Description", "Metadata"); // metadataWrap and metadataItem
     }
 }

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

@@ -40 +40 @@
     public DocMetsXMLFile(String doc_xml_file_path)
     {
-    super(doc_xml_file_path);
-    MetadataWrap = "mets:xmlData";
-    MetadataItem = "ex:metadata";
-
+    super(doc_xml_file_path, "mets:xmlData", "ex:metadata"); // metadataWrap, metadataItem
     }
 }

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

@@ -41 +41 @@
     protected HashMap source_file_name_to_description_elements_mapping = new HashMap();
 
-    protected static String MetadataWrap = null;
-    protected static String MetadataItem = null;
-
-    public DocXMLFile(String doc_xml_file_path)
+    protected final String MetadataWrap;
+    protected final String MetadataItem;
+
+    public DocXMLFile(String doc_xml_file_path, String metaWrap, String metaItem)
     {
     super(doc_xml_file_path);
+    this.MetadataWrap = metaWrap;
+    this.MetadataItem = metaItem;
     }
 
@@ -260 +262 @@
 
             // 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) {
+            else if (gsdlsourcefilename_value.indexOf("tmp") == -1 && !gsdlsourcefilename_value.endsWith("collect.cfg")) {
             // We don't really know what is going on...
             System.err.println("Warning: Could not understand gsdlsourcefilename " + gsdlsourcefilename_value);