Changeset 2937
- Timestamp:
- 2002-02-04T10:49:17+13:00 (22 years ago)
- Location:
- trunk/gsdl
- Files:
-
- 3 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/gsdl/lib/gsdltools.cpp
r2298 r2937 151 151 #else 152 152 text_t cmd = "perl -e 'exit 0'"; 153 #endif ;153 #endif 154 154 int i = gsdl_system (cmd, true, logout); 155 155 return (i == 0); -
trunk/gsdl/src/colservr/phrasesearch.cpp
r2146 r2937 188 188 // note that we're treating indexes of type 'all' (i.e. text,Title,Creator) 189 189 // 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())) { 191 191 char *doc = NULL; 192 192 int doclen = 0; … … 238 238 text_tarray::const_iterator subvalue_end = (*tarr_ptr).end(); 239 239 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; 248 245 subvalue_here++; 249 246 } -
trunk/gsdl/src/recpt/receptionist.cpp
r2773 r2937 456 456 // be screwed up if maintainer is). 457 457 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(), 459 459 maintainer_end, '@'); 460 460 if (maintainer_here == maintainer_end) { … … 605 605 606 606 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'); 608 608 609 609 while (here+9 < end) { … … 613 613 return true; 614 614 } 615 here = findchar ( cookiestring.begin(), end, 'G');615 here = findchar ((text_t::const_iterator)cookiestring.begin(), end, 'G'); 616 616 } 617 617 … … 636 636 637 637 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'); 639 639 640 640 while (here+9 < end) { 641 641 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'); 643 643 } 644 644 }
Note:
See TracChangeset
for help on using the changeset viewer.