Changeset 7292 for trunk

Timestamp:

2004-05-07T13:02:33+12:00 (20 years ago)

Author:

kjdon

Message:

made the directory parser recursive, and now it doesn't look at any namespaced metadata - only tries to extract non-namespaced, ie greenstone extracted, metadata

File:

• trunk/gli/src/org/greenstone/gatherer/msm/GreenstoneArchiveParser.java (modified) (4 diffs)

trunk/gli/src/org/greenstone/gatherer/msm/GreenstoneArchiveParser.java

@@ -76 +76 @@
         // Determine the collection archive directory.
         File archive_directory = new File(Gatherer.c_man.getCollectionArchive());
-        // For each of the hash coded directories within.
-        File document_directories[] = archive_directory.listFiles();
-        for(int i = 0; i < document_directories.length; i++) {
-        // Find the doc.xml file within
-        if(document_directories[i].isDirectory()) {
-            File document_file = new File(document_directories[i], "doc.xml");
-            // Then extract the metadata from it.
-            if(document_file.exists()) {
-            int count = extractMetadata(document_file);
-            // Display a pretty progress message.
-            String[] args = new String[2];
-            args[0] = document_directories[i].getName();
-            args[1] = String.valueOf(count);
-            shell.fireMessage(GShell.IMPORT, shell.typeAsString(GShell.IMPORT) + "> " + Dictionary.get("GShell.Extracted", args), GShell.OK, null);
-            args = null;
-            progress.increment();
-            }
-        }
-        }
+        // Start the extraction process
+        processDirectory(archive_directory, progress);
     }
     // All done. Outta here like a bald man.
+    }
+    
+    private void processDirectory(File directory, GShellProgressMonitor progress) {
+    // look for a doc.xml file here
+    File document_file = new File(directory, "doc.xml");
+    // Then extract the metadata from it.
+    if(document_file.exists()) {
+        int count = extractMetadata(document_file);
+        // Display a pretty progress message.
+        String[] args = new String[2];
+        args[0] = directory.getName();
+        args[1] = String.valueOf(count);
+        this.shell.fireMessage(GShell.IMPORT, shell.typeAsString(GShell.IMPORT) + "> " + Dictionary.get("GShell.Extracted", args), GShell.OK, null);
+        args = null;
+        progress.increment();
+    }
+    
+    // for each directory here, process it
+    File sub_directories[] = directory.listFiles();
+    for(int i = 0; i < sub_directories.length; i++) {
+        // Find the doc.xml file within
+        if(sub_directories[i].isDirectory()) {
+        processDirectory(sub_directories[i], progress);
+        }
+    }
     }
 
@@ -149 +157 @@
     {
     String name = metadata_element.getAttribute(StaticStrings.NAME_ATTRIBUTE);
-
     // There is also a special case when the metadata name is gsdlsourcefilename, as we use this to find the FileRecord we want to add metadata to.
     if (name.equals("gsdlsourcefilename")) {
@@ -161 +168 @@
         return false;
         }
+    }
+
+    // namespaced metadata, we don't extract at the moment
+    if (name.indexOf(MSMUtils.NS_SEP)!=-1) {
+        return false;
     }
 
@@ -197 +209 @@
         return false;
     }
-
     // Create a new metadata object.
     GValueModel value_tree = Gatherer.c_man.msm.getValueTree(element);