Changeset 16443

Timestamp:

2008-07-17T16:20:14+12:00 (15 years ago)

Author:

mdewsnip

Message:

Changed the "id" attributes of "<Match>" tags returned so they don't necessarily have to be integers, in preparation for changing to return Greenstone docOIDs instead of the Lucene nodeIDs (for efficiency and to allow incremental building).

Location:

indexers/trunk/lucene-gs/src/org/greenstone/LuceneWrapper

Files:

• GS2LuceneQuery.java (modified) (2 diffs)
• LuceneQueryResult.java (modified) (2 diffs)

indexers/trunk/lucene-gs/src/org/greenstone/LuceneWrapper/GS2LuceneQuery.java

@@ -187 +187 @@
         for (int i = start_results; i <= hits.length(); i++) {
             Document doc = hits.doc(i - 1);
-            lucene_query_result.addDoc(Long.parseLong(doc.get("nodeID").trim()), hits.score(i-1));
+            lucene_query_result.addDoc(doc.get("nodeID").trim(), hits.score(i-1));
         }
         }
@@ -203 +203 @@
         for (int i = start_results; (i <= hits.scoreDocs.length && i <= end_results); i++) {
             Document doc = reader.document(hits.scoreDocs[i - 1].doc);
-            lucene_query_result.addDoc(Long.parseLong(doc.get("nodeID").trim()), hits.scoreDocs[i-1].score);
+            lucene_query_result.addDoc(doc.get("nodeID").trim(), hits.scoreDocs[i-1].score);
         }
         }

indexers/trunk/lucene-gs/src/org/greenstone/LuceneWrapper/LuceneQueryResult.java

@@ -110 +110 @@
     }
 
-    public void addDoc(long doc, float rank) {
-    DocInfo doc_info = new DocInfo(doc, rank);
-    docs_.add(doc_info);
+    public void addDoc(String id, float rank)
+    {
+    docs_.add(new DocInfo(id, rank));
     }
     
@@ -220 +220 @@
     }
 
-    public class DocInfo {
-    
-    public long num_=0;
-    public float rank_=0;
-    
-    public DocInfo(long doc, float rank) {
-        num_=doc;
-        rank_=rank;
-    }
-    public String toString(){
-        return ""+num_+"("+rank_+")";
-    }
-    public String toXMLString() {
-        return "<Match id=\"" + num_ + "\" rank=\"" + rank_ +"\" />";
-    }
-    }
+
+    public class DocInfo
+    {
+    public String id_ = "";
+    public float rank_ = 0;
+
+    public DocInfo (String id, float rank)
+    {
+        id_ = id;
+        rank_ = rank;
+    }
+
+    public String toString()
+    {
+        return "" + id_ + " (" + rank_ + ")";
+    }
+
+    public String toXMLString()
+    {
+        return "<Match id=\"" + id_ + "\" rank=\"" + rank_ + "\" />";
+    }
+    }
+
 
     // where should this go???
-    
     public static String xmlSafe(String text) {
     text = text.replaceAll("&","&amp;amp;");