Changeset 9783

Timestamp:

2005-04-29T14:52:04+12:00 (19 years ago)

Author:

kjdon

Message:

fixed up the document:text index - stopped working after I rearranged the search/retrieve service classes??

File:

• branches/ant-install-branch/gsdl3/src/java/org/greenstone/gsdl3/gs3build/indexers/MGPPIndexer.java (modified) (7 diffs)

branches/ant-install-branch/gsdl3/src/java/org/greenstone/gsdl3/gs3build/indexers/MGPPIndexer.java

@@ -175 +175 @@
     {
     if (this.pass == 0) {
-        document.removeAllMetadata("gsdl3", "mgppseqno");
+        document.removeAllMetadata("gsdl3", "mgseqno");
     }
 
@@ -188 +188 @@
     String docText = null;
     
-    int startSeqNo = this.sectionSeqNo;
-    this.sectionSeqNo ++;
-    
+    //int startSeqNo = this.sectionSeqNo;
+    //this.sectionSeqNo ++;
+    int startSeqNo = this.documentSeqNo;
+
     Document domDocument = document.getDOMDocument();
     if (domDocument != null) {
@@ -288 +289 @@
 
     if (this.pass == 0) {    
-        document.addDocumentMetadata("gsdl3", "mgppseqno", "dtx."+Integer.toString(startSeqNo));
-    }
-    this.documentSeqNo += 1;
+        document.addDocumentMetadata("gsdl3", "mgseqno", "dtx."+Integer.toString(startSeqNo));
+    }
+    this.documentSeqNo++;
     
 //  try {
@@ -317 +318 @@
     this.firstDocument = true;
     this.documentSeqNo = 1;
-    
+    this.sectionSeqNo = 1;
+
     this.mgppPasses = new MGPPPassesWrapper();
     this.indexBuffer = new StringBuffer();
@@ -553 +555 @@
     Element default_index = doc.createElement("defaultIndex");
     default_index.setAttribute(GSXML.NAME_ATT, def_index);
+
     Element base_index_name = doc.createElement("baseIndexPrefix");
-    base_index_name.setAttribute(GSXML.NAME_ATT, "index");  //overallName);
+    base_index_name.setAttribute(GSXML.NAME_ATT, "dtx");  //overallName);
+
     Element index_stem = doc.createElement("indexStem");
     index_stem.setAttribute(GSXML.NAME_ATT, "index");
@@ -561 +565 @@
     Element retrieve_service_elem = doc.createElement(GSXML.SERVICE_CLASS_ELEM);
     Element default_level = doc.createElement("defaultLevel");
-    default_index.setAttribute(GSXML.NAME_ATT, "Document");
+    default_level.setAttribute(GSXML.NAME_ATT, "Document");
+
+    Element level_list = doc.createElement("levelList");
+    Element level = doc.createElement("level");
+    level.setAttribute(GSXML.NAME_ATT, "Document");
+    level_list.appendChild(level);
+
+    Element field_list = doc.createElement("fieldList");
+    Element field = doc.createElement("field");
+    field.setAttribute(GSXML.NAME_ATT, "ZZ");
+    field_list.appendChild(field);
+
     service_rack_list.appendChild(search_service_elem);
     service_rack_list.appendChild(retrieve_service_elem);
@@ -568 +583 @@
     search_service_elem.appendChild(index_list);
     search_service_elem.appendChild(default_index);
+    search_service_elem.appendChild(level_list);
     search_service_elem.appendChild(default_level);
+search_service_elem.appendChild(field_list); // do we need this??
     search_service_elem.appendChild(base_index_name);
     search_service_elem.appendChild(index_stem);