Changeset 12261

Timestamp:

2006-07-20T11:11:03+12:00 (18 years ago)

Author:

mdewsnip

Message:

Changed the way query terms are output. Also shows the number of query terms and displays the original query string rather than the rewritten string.

Location:

trunk

Files:

• gsdl/bin/java/LuceneWrap.jar (modified) ( previous)
• gsdl/src/java/org/nzdl/gsdl/LuceneWrap/GS2LuceneQuery.java (modified) (1 diff)
• indexers/lucene-gs/src/org/greenstone/LuceneWrapper/GS2LuceneQuery.java (modified) (1 diff)

trunk/gsdl/src/java/org/nzdl/gsdl/LuceneWrap/GS2LuceneQuery.java

@@ -57 +57 @@
         Hits hits = searcher.search(query);
         System.out.println("<ResultSet>");
-        System.out.println("  <QueryString>" + query.toString("TX")+"</QueryString>");
+        System.out.println("  <QueryString>" + query_string + "</QueryString>");
 
         // Return the list of expanded query terms and their frequencies
         HashSet terms = new HashSet();
         query.extractTerms(terms);
+        System.out.println("  <QueryTermsInfo num=\"" + terms.size() + "\"/>");
         Iterator iter = terms.iterator();
         while (iter.hasNext()) {
             Term term = (Term) iter.next();
-            System.out.println("  <Term freq=\"" + reader.docFreq(term) + "\">" + term.text() + "</Term>");
+            System.out.println("  <Term value=\"" + term.text() + "\" freq=\"" + reader.docFreq(term) + "\"/>");
         }
 

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

@@ -57 +57 @@
         Hits hits = searcher.search(query);
         System.out.println("<ResultSet>");
-        System.out.println("  <QueryString>" + query.toString("TX")+"</QueryString>");
+        System.out.println("  <QueryString>" + query_string + "</QueryString>");
 
         // Return the list of expanded query terms and their frequencies
         HashSet terms = new HashSet();
         query.extractTerms(terms);
+        System.out.println("  <QueryTermsInfo num=\"" + terms.size() + "\"/>");
         Iterator iter = terms.iterator();
         while (iter.hasNext()) {
             Term term = (Term) iter.next();
-            System.out.println("  <Term freq=\"" + reader.docFreq(term) + "\">" + term.text() + "</Term>");
+            System.out.println("  <Term value=\"" + term.text() + "\" freq=\"" + reader.docFreq(term) + "\"/>");
         }