Changeset 16015 for indexers

Timestamp:

2008-06-16T11:58:51+12:00 (16 years ago)

Author:

davidb

Message:

Printing to standard out (used as the communication mechanism back to Perl script is now wrapped up in a UTF-8 PrintWriter. Testing showed that it was important to 'flush' output each time a message is printed

File:

• indexers/trunk/lucene-gs/src/org/greenstone/LuceneWrapper/GS2LuceneQuery.java (modified) (8 diffs)

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

@@ -75 +75 @@
     private Searcher searcher = null;
     private IndexReader reader = null;
+
+    static private PrintWriter utf8out = null;
+
+    static
+    {
+    try {
+        OutputStreamWriter osw = new OutputStreamWriter(System.out, "UTF-8");
+        utf8out = new PrintWriter(osw, true);
+    }
+        catch (UnsupportedEncodingException e) { 
+        System.out.println(e); 
+    }
+    }
+
     
     public GS2LuceneQuery() {
@@ -88 +102 @@
 
         if (full_indexdir==null || full_indexdir.length()==-1){
-        System.out.println("Index directory is not indicated ");
+        utf8out.println("Index directory is not indicated ");
+        utf8out.flush();
         return false;
         }
@@ -107 +122 @@
     
     if (query_string == null || query_string.equals("")) {
-        System.out.println("The query word is not indicated ");
+        utf8out.println("The query word is not indicated ");
+        utf8out.flush();
         return null;
     }
@@ -407 +423 @@
     }
 
+
+    protected void finalize() throws Throwable 
+    {
+    try {
+        utf8out.flush(); 
+    } finally {
+        super.finalize();
+    }
+    }
+
     
     /** command line program and auxiliary methods */
@@ -413 +439 @@
     static private boolean query_result_caching_enabled = false;
 
+
     static public void main (String args[])
     {
+
+
     if (args.length == 0) {
         System.out.println("Usage: GS2LuceneQuery <index directory> [-fuzziness value] [-filter filter_string] [-sort sort_field] [-dco AND|OR] [-startresults number -endresults number] [query]");
@@ -495 +524 @@
             break;
             }
+
             runQueryCaching(index_directory, queryer, query_string);
             
@@ -542 +572 @@
         String query_results_xml_string = query_results_xml.toString();
         query_results_xml_string = query_results_xml_string.replaceFirst("cached=\"false\"", "cached=\"true\"");
-        System.out.print(query_results_xml_string);
+
+        utf8out.print(query_results_xml_string);
+        utf8out.flush();
+
         return;
         }
@@ -568 +601 @@
     query_results_xml.append("</ResultSet>\n");
 
-    System.out.print(query_results_xml);
+    utf8out.print(query_results_xml);
+    utf8out.flush();
+
+    try {
+        /*
+        Writer output = null;
+        File file = new File("/tmp/lucenequery.txt");
+        output = new BufferedWriter(new FileWriter(file,"UTF-8"));
+        output.write(query_results_xml.toString());
+        output.close();
+        */
+
+        FileOutputStream fos = new FileOutputStream("/tmp/lucenequery.txt");
+       
+        OutputStreamWriter osw2 = new OutputStreamWriter(fos, "UTF-8");
+
+        osw2.write("Query string = " + query_string + "\n");
+        osw2.write(query_results_xml.toString());
+        osw2.close();
+    }
+    catch (Exception e) {
+        e.printStackTrace();
+    }
+
+
 
     // Cache this query result, if desired