Changeset 6497

Timestamp:

2004-01-14T16:27:03+13:00 (20 years ago)

Author:

cs025

Message:

Minor fixes.

File:

• trunk/gsdl3/src/java/org/greenstone/gsdl3/gs3build/extractor/MetaXMLExtractor.java (modified) (4 diffs)

trunk/gsdl3/src/java/org/greenstone/gsdl3/gs3build/extractor/MetaXMLExtractor.java

@@ -39 +39 @@
     boolean      accumulate;
     DocumentList documentList;
+    List         documentIds;
+    List         documents;
 
     MetadataHandler(DocumentList documentList)
@@ -75 +77 @@
       else if (localName.equals("FileSet"))
       { // post the existing files item...
-      }
-      else if (localName.equals("Description"))
-      {
-      }
-      else if (localName.equals("Metadata"))
-      { List documentIds;
-
-        documentIds = this.documentList.findDocumentIdsUsingFiles(this.files, this.url.toString());
-    
-    MetaXMLExtractor.postMetadata(this.url, this.files, 
-                      this.label, this.value.toString(), 
-                      this.accumulate);
-    if (documentIds != null) {
-      Iterator iterator = documentIds.iterator();
-      while (iterator.hasNext()) {
-        System.out.println("Matches file " + iterator.next().toString());
-      }
-    }
+        this.documentIds = this.documentList.findDocumentIdsUsingFiles(this.files, this.url.toString());    
 
     if (documentIds != null && documentIds.size() > 0) {
-      List documents = new ArrayList();
+      this.documents = new ArrayList();
       
       Iterator idIterator = documentIds.iterator();
@@ -106 +91 @@
         }
       }
-
+    }
+      }
+      else if (localName.equals("Description"))
+      {
+    if (this.documents != null && documents.size() > 0) {
+      // write out the modified documents
+      // TODO: nicer/more generalised interface for this and related activity in
+      //       extractor manager (actually, enricher manager);
       Iterator docIterator = documents.iterator();
+      while (docIterator.hasNext()) {
+        DocumentInterface document = (DocumentInterface) docIterator.next();
+
+        //  System.out.println("Writing modified document " + document.getID());
+        documentList.modifiedDocument(document);
+      }
+    }
+      }
+      else if (localName.equals("Metadata"))
+      { MetaXMLExtractor.postMetadata(this.url, this.files, 
+                      this.label, this.value.toString(), 
+                      this.accumulate);
+    /*
+    if (documentIds != null) {
+      Iterator iterator = documentIds.iterator();
+      while (iterator.hasNext()) {
+        System.out.println("Matches file " + iterator.next().toString());
+      }
+    }
+    */
+    
+    if (documentIds != null && documentIds.size() > 0) {
+      Iterator docIterator = this.documents.iterator();
       while (docIterator.hasNext()) {
         DocumentInterface document = (DocumentInterface) docIterator.next();
@@ -114 +129 @@
         // TODO: tailor this to posting documents to *sections* as required...
         document.addDocumentMetadata(new MetadataLabel(this.label), this.value.toString());
-      }
+      } 
     }