Changeset 3150

Timestamp:

2002-06-17T15:25:05+12:00 (22 years ago)

Author:

jrm21

Message:

Text to/from the receptionist is encoded in unicode, so we convert to/from utf8 for mgpp.

File:

• trunk/gsdl/src/colservr/mgppsearch.cpp (modified) (8 diffs)

trunk/gsdl/src/colservr/mgppsearch.cpp

@@ -2 +2 @@
  *
  * mgppsearch.cpp -- 
- * Copyright (C) 1999  The New Zealand Digital Library Project
+ * Copyright (C) 1999-2002  The New Zealand Digital Library Project
  *
  * A component of the Greenstone digital library software
@@ -32 +32 @@
 #include "TextGet.h"
 #include "queryinfo.h"
-
+#include "gsdlunicode.h"
 
 
@@ -126 +126 @@
   
   UCArray queryArray;
-  SetCStr(queryArray, (queryparams.querystring.getcstr()));
-  
+  // greenstone gives us the query encoded in unicode. We want utf8.
+  char* utf8querystring=to_utf8(queryparams.querystring).getcstr();
+  SetCStr(queryArray, utf8querystring);
+  delete utf8querystring;
+
   // create the mgpp query tree
   QueryNode *queryTree = NULL;
@@ -171 +174 @@
   for (int k=0; k<(int)queryResult.termFreqs.size(); k++) {
     term.clear();
-    term.termstr = GetCStr(queryResult.termFreqs[k].term);
+    char* termfreq_cstr=GetCStr(queryResult.termFreqs[k].term);
+    term.termstr = to_uni(termfreq_cstr);
+    delete termfreq_cstr;
     term.termstemstr = term.termstr;
+    // we don't set term.utf8equivterms ?? - jrm21
     term.termfreq = queryResult.termFreqs[k].termFreq;
     queryresult.terms.push_back(term);
@@ -178 +184 @@
     
     for (int j=0; j<(int)queryResult.termFreqs[k].equivTerms.size(); j++) {
-      queryresult.termvariants.insert(GetCStr(queryResult.termFreqs[k].equivTerms[j]));
+      char* equivterm_cstr=GetCStr(queryResult.termFreqs[k].equivTerms[j]);
+      queryresult.termvariants.insert(to_uni(equivterm_cstr));
+      delete equivterm_cstr;
     }
 
@@ -222 +230 @@
 
   UCArrayClear(browseNode.term);
-  SetCStr(browseNode.term, (queryparams.querystring.getcstr()));
+  // greenstone gives us the query encoded in unicode. We want utf8.
+  char* utf8querystring=to_utf8(queryparams.querystring).getcstr();
+  SetCStr(browseNode.term, utf8querystring);
+  delete utf8querystring;
 
   // do the actual query
@@ -231 +242 @@
   for (int i=0; i<(int)browseResult.termFreqs.size(); i++) {
     term.clear();
-    term.termstr = GetCStr(browseResult.termFreqs[i].term);
+    char* term_cstr = GetCStr(browseResult.termFreqs[i].term);
+    term.termstr = to_uni(term_cstr);
+    delete term_cstr;
     term.termstemstr = term.termstr;
     term.termfreq = browseResult.termFreqs[i].termFreq;
@@ -280 +293 @@
   // convert UCArray to text_t
   output.clear();
-  output = GetCStr(doctext);
+  char* doctext_cstr = GetCStr(doctext);
+  output = doctext_cstr;
+  delete doctext_cstr;
 
   // here need to remove the <Document>, <Section>, <Paragraph> tags