Changeset 2937

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)

Location:

trunk/gsdl

Files:

• lib/gsdltools.cpp (modified) (1 diff)
• src/colservr/phrasesearch.cpp (modified) (2 diffs)
• src/recpt/receptionist.cpp (modified) (4 diffs)

trunk/gsdl/lib/gsdltools.cpp

@@ -151 +151 @@
 #else 
   text_t cmd = "perl -e 'exit 0'";
-#endif;
+#endif
   int i = gsdl_system (cmd, true, logout);
   return (i == 0);

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++;
     }

trunk/gsdl/src/recpt/receptionist.cpp

@@ -456 +456 @@
   // be screwed up if maintainer is).
   text_t::const_iterator maintainer_end = configinfo.maintainer.end ();
-  text_t::const_iterator maintainer_here = findchar (configinfo.maintainer.begin(),
+  text_t::const_iterator maintainer_here = findchar ((text_t::const_iterator)configinfo.maintainer.begin(),
                              maintainer_end, '@');
   if (maintainer_here == maintainer_end) {
@@ -605 +605 @@
     
   text_t::const_iterator end = cookiestring.end();  
-  text_t::const_iterator here = findchar (cookiestring.begin(), end, 'G');
+  text_t::const_iterator here = findchar ((text_t::const_iterator)cookiestring.begin(), end, 'G');
 
   while (here+9 < end) { 
@@ -613 +613 @@
       return true;
     }
-    here = findchar (cookiestring.begin(), end, 'G');
+    here = findchar ((text_t::const_iterator)cookiestring.begin(), end, 'G');
   }
 
@@ -636 +636 @@
     
     text_t::const_iterator end = cookiestring.end();  
-    text_t::const_iterator here = findchar (cookiestring.begin(), end, 'G');
+    text_t::const_iterator here = findchar ((text_t::const_iterator)cookiestring.begin(), end, 'G');
 
     while (here+9 < end) { 
       if (substr(here, here+8) == "GSDL_UID") return true;
-      here = findchar (cookiestring.begin(), end, 'G');
+      here = findchar ((text_t::const_iterator)cookiestring.begin(), end, 'G');
     }
   }