Changeset 21973 for main/trunk/greenstone2/runtime-src/src/recpt/phindaction.cpp

Timestamp:

2010-04-28T11:51:37+12:00 (14 years ago)

Author:

kjdon

Message:

Need to convert query between unicode and utf8 for mgpp

File:

• main/trunk/greenstone2/runtime-src/src/recpt/phindaction.cpp (modified) (4 diffs)

main/trunk/greenstone2/runtime-src/src/recpt/phindaction.cpp

@@ -35 +35 @@
 #include "phindaction.h"
 #include "fileutil.h"
+#include "gsdlunicode.h"
 
 phindaction::phindaction () {
@@ -189 +190 @@
      *  DLConsulting 12-07-2004
      */
+    
     if(!find_phrase_number_from_word(basepath, word, result)) {
     output_error("phindaction: Fatal Error! Couldn't load index information in find_phrase_number_from_word()",
@@ -196 +198 @@
     
     if (result.empty()) {
-      output_error("phindaction: The search term does not occur in the collection",
+      output_error("phindaction: The search term ("+word+") does not occur in the collection",
            textout, outconvert, disp, logout, XMLmode);
       return true;
@@ -516 +518 @@
   // mode 1 = casefolded, unstemmed search
   UCArray ucquery;
-  toUCArray(query, ucquery);
+  // greenstone gives us the query encoded in unicode. We want utf8.
+  char* utf8querystring=to_utf8(query).getcstr();
+  SetCStr(ucquery, utf8querystring);
+  delete []utf8querystring;
+
+  //toUCArray(query, ucquery);
   QueryNode *queryTree = ParseQuery(ucquery, 1, 1, 4);