Changeset 500 for trunk/gsdl/src

Timestamp:

1999-09-01T10:45:12+12:00 (25 years ago)

Author:

rjmcnab

Message:

fixed small problem

File:

• trunk/gsdl/src/colservr/phrasesearch.cpp (modified) (3 diffs)

trunk/gsdl/src/colservr/phrasesearch.cpp

@@ -12 +12 @@
 /*
    $Log$
+   Revision 1.5  1999/08/31 22:45:12  rjmcnab
+   fixed small problem
+
    Revision 1.4  1999/07/16 00:15:48  sjboddie
    changed to use termfreqclassarray type
@@ -40 +43 @@
   while (here <= end) {
     c_len = parse_utf8_char (here, end, &c);
+    if (c == '(') {
+      // found a note, look for '}'
+      while (here <= end && c != ')') {
+    c_len = parse_utf8_char (here, end, &c);
+    here += c_len;
+      }
+    }
+    if (c == '{') {
+      // found a composite character, look for '}'
+      while (here <= end && c != '}') {
+    c_len = parse_utf8_char (here, end, &c);
+    here += c_len;
+      }
+    }
     if (is_unicode_letdig(c)) {
       while (c_len > 0) {
+    // this is in a word
     word.push_back(*here);
     here++; c_len--;
@@ -159 +177 @@
   if (!gdbm.getinfo (OID, OID_info)) return false;
 
-  metadata = (to_utf8(OID_info[gran])).getcarr(metadata_len);
-  bool result = doc_phrase_search ((unsigned char *)metadata, metadata_len, phrase);
-  delete [] metadata;
-  
+  bool result = false;
+  text_tarray *tarr_ptr = OID_info.getmultinfo (gran);
+  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) {
+      if (subvalue_here != NULL) {
+    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++;
+    }
+  }
+
   return result;
 }