Changeset 2937


Ignore:
Timestamp:
2002-02-04T10:49:17+13:00 (20 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:
3 edited

Legend:

Unmodified
Added
Removed
  • trunk/gsdl/lib/gsdltools.cpp

    r2298 r2937  
    151151#else
    152152  text_t cmd = "perl -e 'exit 0'";
    153 #endif;
     153#endif
    154154  int i = gsdl_system (cmd, true, logout);
    155155  return (i == 0);
  • trunk/gsdl/src/colservr/phrasesearch.cpp

    r2146 r2937  
    188188  // note that we're treating indexes of type 'all' (i.e. text,Title,Creator)
    189189  // or other composite indexes that contain "text" as if they were simply 'text' indexes
    190   if (type == "text" || type == "all" || findword(type.begin(),type.end(),"text")) {
     190  if ((type == "text") || (type == "all") || (findword(type.begin(),type.end(),"text") != type.end())) {
    191191    char *doc = NULL;
    192192    int doclen = 0;
     
    238238    text_tarray::const_iterator subvalue_end = (*tarr_ptr).end();
    239239    while (subvalue_here != subvalue_end) {
    240       if (subvalue_here != NULL) {
    241     metadata = (to_utf8(*subvalue_here)).getcarr(metadata_len);
    242     result = doc_phrase_search ((unsigned char *)metadata, metadata_len, phrase);
    243     delete [] metadata;
    244 
    245     if (result) return true;
    246       }
    247      
     240      metadata = (to_utf8(*subvalue_here)).getcarr(metadata_len);
     241      result = doc_phrase_search ((unsigned char *)metadata, metadata_len, phrase);
     242      delete [] metadata;
     243
     244      if (result) return true;
    248245      subvalue_here++;
    249246    }
  • trunk/gsdl/src/recpt/receptionist.cpp

    r2773 r2937  
    456456  // be screwed up if maintainer is).
    457457  text_t::const_iterator maintainer_end = configinfo.maintainer.end ();
    458   text_t::const_iterator maintainer_here = findchar (configinfo.maintainer.begin(),
     458  text_t::const_iterator maintainer_here = findchar ((text_t::const_iterator)configinfo.maintainer.begin(),
    459459                             maintainer_end, '@');
    460460  if (maintainer_here == maintainer_end) {
     
    605605   
    606606  text_t::const_iterator end = cookiestring.end(); 
    607   text_t::const_iterator here = findchar (cookiestring.begin(), end, 'G');
     607  text_t::const_iterator here = findchar ((text_t::const_iterator)cookiestring.begin(), end, 'G');
    608608
    609609  while (here+9 < end) {
     
    613613      return true;
    614614    }
    615     here = findchar (cookiestring.begin(), end, 'G');
     615    here = findchar ((text_t::const_iterator)cookiestring.begin(), end, 'G');
    616616  }
    617617
     
    636636   
    637637    text_t::const_iterator end = cookiestring.end(); 
    638     text_t::const_iterator here = findchar (cookiestring.begin(), end, 'G');
     638    text_t::const_iterator here = findchar ((text_t::const_iterator)cookiestring.begin(), end, 'G');
    639639
    640640    while (here+9 < end) {
    641641      if (substr(here, here+8) == "GSDL_UID") return true;
    642       here = findchar (cookiestring.begin(), end, 'G');
     642      here = findchar ((text_t::const_iterator)cookiestring.begin(), end, 'G');
    643643    }
    644644  }
Note: See TracChangeset for help on using the changeset viewer.