Changeset 9874 for trunk/gsdl3/src/java/org/greenstone/gsdl3/gs3build/indexers/MGPPIndexer.java

Timestamp:

2005-05-16T11:02:50+12:00 (19 years ago)

Author:

kjdon

Message:

merged from branch ant-install-branch: merge 1

File:

• trunk/gsdl3/src/java/org/greenstone/gsdl3/gs3build/indexers/MGPPIndexer.java (modified) (14 diffs)

trunk/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();
@@ -430 +432 @@
         System.out.println("Compressed dictionary successfully written");
         } else {
-        System.err.println("Error from mg_compression_dict: " + exit_value);
-        index.setError(true);
-        
+        System.err.println("Error from mgpp_compression_dict: " + exit_value);
+        //index.setError(true);
         return false;
         }
@@ -444 +445 @@
         } else {
         System.err.println("Unable to build the perfect hash");
-        index.setError(true);
+        //index.setError(true);
         return false;
         }
@@ -456 +457 @@
         } else {
         System.err.println("Unable to create weights file");
-        index.setError(true);
+        //index.setError(true);
         return false;
         }
@@ -466 +467 @@
         } else {
         System.out.println("Unable to create inverted dictionary file");
-        index.setError(true);
+        //index.setError(true);
         return false;
         }
@@ -476 +477 @@
         } else {
         System.out.println("Unable to create stemmed index 1");
-        index.setError(true);
+        //index.setError(true);
         return false;
         }
@@ -485 +486 @@
         } else {
         System.out.println("Unable to create stemmed index 2");
-        index.setError(true);
+        //index.setError(true);
         return false;
         }
@@ -493 +494 @@
         } else {
         System.out.println("Unable to create stemmed index 3");
-        index.setError(true);
+        //index.setError(true);
         return false;
         }
@@ -553 +554 @@
     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 +564 @@
     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 +582 @@
     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);