Changeset 5141

Timestamp:

2003-08-18T11:08:54+12:00 (21 years ago)

Author:

kjdon

Message:

fixed a bug in teh phrase searching - if the index had been built on more than one metadata field, eg Title,Subject, it would try to look up Title,Subject in the info record, and wouldnt find an entry, so the phrase wouldn't be found, even though it was there in say the Title entry

File:

• trunk/gsdl/src/colservr/phrasesearch.cpp (modified) (1 diff)

trunk/gsdl/src/colservr/phrasesearch.cpp

@@ -233 +233 @@
 
   bool result = false;
-  text_tarray *tarr_ptr = OID_info.getmultinfo (type);
-  if (tarr_ptr != NULL ) {
-    text_tarray::const_iterator subvalue_here = (*tarr_ptr).begin();
-    text_tarray::const_iterator subvalue_end = (*tarr_ptr).end();
-    while (subvalue_here != subvalue_end) {
-      metadata = (to_utf8(*subvalue_here)).getcarr(metadata_len);
-      result = doc_phrase_search ((unsigned char *)metadata, metadata_len, phrase);
-      delete [] metadata;
-
-      if (result) return true;
-      subvalue_here++;
-    }
-  }
-
+
+  // need to look through all the metadata values in the index
+  text_tarray keys;
+  splitchar(type.begin(), type.end(), ',', keys);
+
+  text_tarray::const_iterator keyhere = keys.begin();
+  text_tarray::const_iterator keyend = keys.end();
+  while (keyhere != keyend) {
+    text_tarray *tarr_ptr = OID_info.getmultinfo (*keyhere);
+    if (tarr_ptr != NULL ) {
+      text_tarray::const_iterator subvalue_here = (*tarr_ptr).begin();
+      text_tarray::const_iterator subvalue_end = (*tarr_ptr).end();
+      while (subvalue_here != subvalue_end) {
+    metadata = (to_utf8(*subvalue_here)).getcarr(metadata_len);
+    result = doc_phrase_search ((unsigned char *)metadata, metadata_len, phrase);
+    delete [] metadata;
+    
+    if (result) return true;
+    subvalue_here++;
+      }
+    }
+    keyhere ++;
+  }
   return result;
 }