Changeset 6505

Timestamp:

2004-01-15T11:32:08+13:00 (20 years ago)

Author:

cs025

Message:

Fixed use of startSeqNo in posting document text identifiers.

File:

• trunk/gsdl3/src/java/org/greenstone/gsdl3/gs3build/indexers/MGIndexer.java (modified) (9 diffs)

trunk/gsdl3/src/java/org/greenstone/gsdl3/gs3build/indexers/MGIndexer.java

@@ -98 +98 @@
   /**
    *  The output directory should be (collection)/building/text/ for
-   *  normal Greenstone builds.
+    *  normal Greenstone builds.
    *
    *  @param <code>String</code> the label to configure
@@ -160 +160 @@
     }
 
-    descriptive.addMetadata("gsdl3", "mgseqno", indexName + "." + Integer.toString(this.documentSeqNo));
+    descriptive.addMetadata("gsdl3", "mgseqno", indexName + "." + Integer.toString(this.sectionSeqNo));
     metsDoc.setModified(true);
-    //  System.out.println("Assigning " + this.documentSeqNo + " to " + metsDoc.getID() + " " + division.getLabel());
+    //  System.out.println("Assigning " + this.sectionSeqNo + " to " + metsDoc.getID() + " " + division.getLabel());
       }
       
       // append an 'end of section' marker
       textBuffer.append(END_OF_SECTION);
+      this.sectionSeqNo ++;
 
       // for document-level indexes, always append an 'end of document' tag at the
@@ -174 +175 @@
       if (this.level == null ||
       this.level.equals(IndexerInterface.DOCUMENT_LEVEL)) {
-    // extraBuffer.append(END_OF_DOCUMENT);
+    extraBuffer.append(END_OF_DOCUMENT);
       }
       else {
@@ -180 +181 @@
     this.documentSeqNo ++;
       }
-      this.sectionSeqNo ++;
 
       // produce the body here for metadata output of divisions - in the case of
@@ -231 +231 @@
       
       // recurse to child
-      this.recurseDOM(metsDoc, node, child, textBuffer, extraBuffer, indexName, namespace, field);
+      node = this.recurseDOM(metsDoc, node, child, textBuffer, extraBuffer, indexName, namespace, field);
     }
 
@@ -310 +310 @@
         if (valueIter.hasNext()) {
           textBuffer.append(END_OF_SECTION);
-          sectionSeqNo ++;
+          //          sectionSeqNo ++;
         }
       }
@@ -321 +321 @@
       sectionSeqNo ++;
     }
+
+    /*    if (this.pass == 0) {
+      System.err.println(docText);
+    }
+    */
 
     byte [] bytes = docText.getBytes();
@@ -366 +371 @@
     this.firstDocument = false;
     if (this.pass == 0) {
-      document.addDocumentMetadata("gsdl3", "mgseqno", "dtx."+Integer.toString(this.documentSeqNo));
-      //      System.out.println("Assigning " + startSeqNo + " to " + document.getID());
+      document.addDocumentMetadata("gsdl3", "mgseqno", "dtx."+Integer.toString(startSeqNo));
+      // System.out.println("Assigning " + startSeqNo + " to " + document.getID());
     }
     this.documentSeqNo += 1;
@@ -424 +429 @@
       else {
     this.field = "text";
-    this.level = "document";
+    this.level = "section";
     this.indexName = null;
       }