Changeset 18362 for gli/branches/rtl-gli/src/org/greenstone/gatherer/metadata/DocXMLFileManager.java

Timestamp:

2009-01-12T11:19:23+13:00 (15 years ago)

Author:

kjdon

Message:

updated the rtl-gli branch with files from trunk. Result of a merge 14807:18318

File:

• gli/branches/rtl-gli/src/org/greenstone/gatherer/metadata/DocXMLFileManager.java (modified) (3 diffs)

gli/branches/rtl-gli/src/org/greenstone/gatherer/metadata/DocXMLFileManager.java

@@ -60 +60 @@
 
 
-    static public void loadDocXMLFiles(File directory)
+    static public void loadDocXMLFiles(File directory, String filename_match)
     {
     // Make sure the directory (archives) exists
@@ -72 +72 @@
         File child_file = directory_files[i];
         if (child_file.isDirectory()) {
-        loadDocXMLFiles(child_file);
+        loadDocXMLFiles(child_file,filename_match); 
         }
-        else if (child_file.getName().equals("doc.xml")) {
-        loadDocXMLFile(child_file);
+        else if (child_file.getName().equals(filename_match)) {
+        // e.g. doc.xml (for regular Greenstone, docmets.xml for Fedora)
+
+        loadDocXMLFile(child_file,filename_match);
         }
     }
@@ -81 +83 @@
 
 
-    static private void loadDocXMLFile(File doc_xml_file_file)
+    static private void loadDocXMLFile(File doc_xml_file_file,String filename_match)
     {
-    DocXMLFile doc_xml_file = new DocXMLFile(doc_xml_file_file.getAbsolutePath());
-    try {
+    String file = doc_xml_file_file.getAbsolutePath();
+
+    // Need to do typecasts in the following to keep Java 1.4 happy
+    DocXMLFile doc_xml_file 
+        = (filename_match.equals("docmets.xml")) 
+        ? (DocXMLFile) new DocMetsXMLFile(file) 
+        : (DocXMLFile) new DocGAFile(file);
+
+    try {       
         doc_xml_file.skimFile();
         doc_xml_files.add(doc_xml_file);