Changeset 2937 for trunk/gsdl/src/colservr/phrasesearch.cpp

Timestamp:

2002-02-04T10:49:17+13:00 (22 years ago)

Author:

sjboddie

Message:

Fixed a few minor issues that surfaced when attempting to get compiling
under gcc-3.0 (note that mgpp still won't compile with gcc-3.0)

File:

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

trunk/gsdl/src/colservr/phrasesearch.cpp

@@ -188 +188 @@
   // note that we're treating indexes of type 'all' (i.e. text,Title,Creator)
   // or other composite indexes that contain "text" as if they were simply 'text' indexes
-  if (type == "text" || type == "all" || findword(type.begin(),type.end(),"text")) {
+  if ((type == "text") || (type == "all") || (findword(type.begin(),type.end(),"text") != type.end())) {
     char *doc = NULL;
     int doclen = 0;
@@ -238 +238 @@
     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;
-      }
-      
+      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++;
     }