Changeset 9620
- Timestamp:
- 2005-04-11T11:32:00+12:00 (19 years ago)
- Location:
- trunk/gsdl/src
- Files:
-
- 53 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/gsdl/src/colservr/browsefilter.cpp
r2212 r9620 133 133 } 134 134 135 options_here++;135 ++options_here; 136 136 } 137 137 … … 169 169 } else tmptext.push_back(*contains_here); 170 170 171 contains_here++;171 ++contains_here; 172 172 } 173 173 // insert the last result in the set … … 204 204 } 205 205 206 offset_here++;206 ++offset_here; 207 207 } 208 208 // insert the last result in the set … … 223 223 while (result_here != result_end) { 224 224 offset_resultset.push_back("0"); 225 result_here++;225 ++result_here; 226 226 } 227 227 } … … 243 243 intersect_offset_resultset.push_back (*offset_resultset_here); 244 244 } 245 resultset_here ++;246 offset_resultset_here ++;245 ++resultset_here; 246 ++offset_resultset_here; 247 247 } 248 248 resultset = intersect_resultset; … … 262 262 while (result_here != result_end) { 263 263 offset_resultset.push_back("0"); 264 result_here++;264 ++result_here; 265 265 } 266 266 } … … 287 287 } 288 288 289 resultnum++;290 result_here++;291 if (!md_type.empty()) offset_result_here++;289 ++resultnum; 290 ++result_here; 291 if (!md_type.empty()) ++offset_result_here; 292 292 } 293 293 } -
trunk/gsdl/src/colservr/collectserver.cpp
r8453 r9620 43 43 if ((*source_here).s != NULL) 44 44 delete (*source_here).s; 45 source_here++;45 ++source_here; 46 46 } 47 47 sources.clear(); … … 53 53 if ((*filter_here).second.f != NULL) 54 54 delete (*filter_here).second.f; 55 filter_here++;55 ++filter_here; 56 56 } 57 57 filters.clear(); … … 154 154 155 155 collectinfo.public_documents[*begin] = *begin; 156 begin++;156 ++begin; 157 157 } 158 158 } … … 170 170 171 171 collectinfo.private_documents[*begin] = *begin; 172 begin++;172 ++begin; 173 173 } 174 174 } … … 183 183 (*filter_here).second.f->configure(key, cfgline); 184 184 185 filter_here++;185 ++filter_here; 186 186 } 187 187 … … 194 194 (*source_here).s->configure(key, cfgline); 195 195 196 source_here++;196 ++source_here; 197 197 } 198 198 } … … 234 234 !(*filter_here).second.f->init(logout)) return false; 235 235 236 filter_here++;236 ++filter_here; 237 237 } 238 238 … … 245 245 !(*source_here).s->init(logout)) return false; 246 246 247 source_here++;247 ++source_here; 248 248 } 249 249 … … 310 310 break; 311 311 } 312 source_here++;312 ++source_here; 313 313 } 314 314 translatedOIDs.push_back (translatedOID); … … 316 316 translatedOIDs.push_back (*doc_here); 317 317 } 318 doc_here ++;318 ++doc_here; 319 319 } 320 320 request.docSet = translatedOIDs; … … 347 347 break; 348 348 } 349 source_here++;349 ++source_here; 350 350 } 351 351 if (!processed) { … … 353 353 return; 354 354 } 355 resultdoc_here++;355 ++resultdoc_here; 356 356 } 357 357 } … … 380 380 break; 381 381 } 382 source_here++;382 ++source_here; 383 383 } 384 384 } … … 396 396 break; 397 397 } 398 source_here++;398 ++source_here; 399 399 } 400 400 } -
trunk/gsdl/src/colservr/collectset.cpp
r9030 r9620 64 64 // ignore the modelcol 65 65 if (*thiscol == "modelcol") { 66 thiscol ++;66 ++thiscol; 67 67 continue; 68 68 } … … 163 163 cservers.addcollectserver (cserver); 164 164 165 thiscol ++;165 ++thiscol; 166 166 } 167 167 } … … 178 178 delete (*here).second.c; 179 179 } 180 here ++;180 ++here; 181 181 } 182 182 cservers.clear(); … … 204 204 << configinfo.collection << "\", gsdlhome=\"" 205 205 << configinfo.gsdlhome << "\"\n"; 206 here ++;206 ++here; 207 207 continue; 208 208 } … … 215 215 << configinfo.collection << "\", gsdlhome=\"" 216 216 << configinfo.gsdlhome << "\"\n"; 217 here ++;217 ++here; 218 218 continue; 219 219 } … … 224 224 (*here).second.c->configure("httpprefix",httpprefix); 225 225 } 226 here++;226 ++here; 227 227 } 228 228 … … 248 248 // ignore the modelcol 249 249 if (*thiscol == "modelcol") { 250 thiscol ++;250 ++thiscol; 251 251 continue; 252 252 } … … 255 255 this->add_collection (*thiscol, gsdlhome); 256 256 257 thiscol ++;257 ++thiscol; 258 258 } 259 259 } … … 275 275 break; 276 276 } 277 here ++;277 ++here; 278 278 } 279 279 … … 395 395 delete (*here).second.c; 396 396 } 397 here ++;397 ++here; 398 398 } 399 399 cservers.clear(); … … 426 426 return; 427 427 } 428 here ++;428 ++here; 429 429 } 430 430 outconvertclass text_t2ascii; … … 453 453 } 454 454 455 here++;455 ++here; 456 456 } 457 457 } … … 468 468 collist.push_back ((*here).second.c->get_collection_name()); 469 469 } 470 here++;470 ++here; 471 471 } 472 472 } … … 485 485 recpt.configure("collectinfo", colinfo); 486 486 487 here++;488 } 489 } 487 ++here; 488 } 489 } -
trunk/gsdl/src/colservr/expat_resultset.cpp
r9406 r9620 69 69 queryresult_ptr->docs.docset[doc.docnum] = doc; 70 70 queryresult_ptr->docs.docorder.push_back(doc.docnum); 71 qrpack_ptr->match_count++;71 ++qrpack_ptr->match_count; 72 72 73 73 free(id); -
trunk/gsdl/src/colservr/filter.cpp
r5906 r9620 67 67 (*filteroption_here).second.check_defaultValue (); 68 68 69 filteroption_here++;69 ++filteroption_here; 70 70 } 71 71 … … 111 111 response.docInfo.push_back(resultdoc); 112 112 113 here++;113 ++here; 114 114 } 115 115 } … … 174 174 while ((t1_here != t1_end) && (t2_here != t2_end)) { 175 175 if (*t1_here != *t2_here) return 0; // unrelated 176 t1_here++;177 t2_here++;176 ++t1_here; 177 ++t2_here; 178 178 } 179 179 … … 205 205 // equal 206 206 resultset.insert (*set1_here); 207 set1_here++;208 set2_here++;207 ++set1_here; 208 ++set2_here; 209 209 210 210 } else if ((childcomp=child_compare(*set1_here, *set2_here)) != 0) { … … 212 212 // set1_here is child 213 213 resultset.insert (*set1_here); 214 set1_here++;214 ++set1_here; 215 215 } else { 216 216 // set2_here is child 217 217 resultset.insert (*set2_here); 218 set2_here++;218 ++set2_here; 219 219 } 220 220 221 221 } else if (*set1_here < *set2_here) { 222 222 // set1 is less 223 set1_here++;223 ++set1_here; 224 224 225 225 } else { 226 226 // set2 is less 227 set2_here++;227 ++set2_here; 228 228 } 229 229 } … … 241 241 if (in_set (set2, *set1_here)) 242 242 resultset.push_back (*set1_here); 243 set1_here ++;243 ++set1_here; 244 244 } 245 245 set1 = resultset; … … 255 255 if (in_set (set2, *set1_here)) 256 256 resultset.push_back (*set1_here); 257 set1_here ++;257 ++set1_here; 258 258 } 259 259 set1 = resultset; … … 303 303 while (h != e) { 304 304 if (*h == tryel) return true; 305 h++;305 ++h; 306 306 } 307 307 } while (here != end); -
trunk/gsdl/src/colservr/gdbmsource.cpp
r9345 r9620 205 205 206 206 info_array.push_back(info); 207 this_OID ++;207 ++this_OID; 208 208 } 209 209 … … 216 216 if ((*t_info).first != "contains") 217 217 tfields.insert ((*t_info).first); 218 t_info ++;218 ++t_info; 219 219 } 220 220 tfields.insert ("hasnext"); … … 270 270 else hasprevious = true; 271 271 272 parentcontents_here++;272 ++parentcontents_here; 273 273 274 274 if (parentcontents_here == parentcontents.end()) hasnext = false; … … 278 278 } 279 279 280 parentcontents_here ++;280 ++parentcontents_here; 281 281 } 282 282 … … 297 297 tmetaptr->values.push_back(""); 298 298 299 this_info ++;299 ++this_info; 300 300 if (this_info != end_info) { 301 301 tmetaptr->parent = new MetadataInfo_t(); … … 304 304 } 305 305 metadata[*fields_here] = this_metadata; 306 fields_here++;306 ++fields_here; 307 307 } 308 308 return true; -
trunk/gsdl/src/colservr/lucenequeryfilter.cpp
r9110 r9620 90 90 } 91 91 } 92 here++;92 ++here; 93 93 } 94 94 } else if (key == "indexlevels") { … … 105 105 filterOptions["Level"].validValues.push_back(*here); 106 106 } 107 here ++;107 ++here; 108 108 } 109 109 } else if (key == "textlevel") { … … 200 200 } 201 201 202 resultnum++;202 ++resultnum; 203 203 } 204 204 } // else 205 205 206 docorder_here++;206 ++docorder_here; 207 207 } 208 208 } // if need matching docs … … 229 229 while (termvariants_here != termvariants_end) { 230 230 terminfo.matchTerms.push_back (*termvariants_here); 231 termvariants_here++;231 ++termvariants_here; 232 232 } 233 233 } … … 236 236 response.termInfo.push_back (terminfo); 237 237 238 terms_here++;238 ++terms_here; 239 239 } 240 240 } … … 291 291 response.termInfo.push_back (terminfo); 292 292 293 terms_here++;293 ++terms_here; 294 294 } 295 295 … … 365 365 while (termvar_here != termvar_end) { 366 366 multiresults.termvariants.insert(*termvar_here); 367 termvar_here++;367 ++termvar_here; 368 368 } 369 369 } 370 370 371 query_here++;371 ++query_here; 372 372 } 373 373 -
trunk/gsdl/src/colservr/lucenesearch.cpp
r9218 r9620 213 213 214 214 docresultclass doc; 215 for (int i=0; i<(int)queryResult.docs.size(); i++) {215 for (int i=0; i<(int)queryResult.docs.size(); ++i) { 216 216 doc.clear(); 217 217 doc.docnum = (int)queryResult.levels[i]; … … 224 224 // term info 225 225 termfreqclass term; 226 for (int k=0; k<(int)queryResult.termFreqs.size(); k++) {226 for (int k=0; k<(int)queryResult.termFreqs.size(); ++k) { 227 227 term.clear(); 228 228 char* termfreq_cstr=GetCStr(queryResult.termFreqs[k].term); … … 235 235 queryresult.orgterms.push_back(term); // should this change?? 236 236 237 for (int j=0; j<(int)queryResult.termFreqs[k].equivTerms.size(); j++) {237 for (int j=0; j<(int)queryResult.termFreqs[k].equivTerms.size(); ++j) { 238 238 char* equivterm_cstr=GetCStr(queryResult.termFreqs[k].equivTerms[j]); 239 239 queryresult.termvariants.insert(to_uni(equivterm_cstr)); … … 288 288 // load results into term info 289 289 termfreqclass term; 290 for (int i=0; i<(int)browseResult.termFreqs.size(); i++) {290 for (int i=0; i<(int)browseResult.termFreqs.size(); ++i) { 291 291 term.clear(); 292 292 char* term_cstr = GetCStr(browseResult.termFreqs[i].term); -
trunk/gsdl/src/colservr/maptools.cpp
r1285 r9620 45 45 fromorder.push_back (from); 46 46 mapfrom[from] = to; 47 here++;47 ++here; 48 48 } 49 49 } … … 64 64 } 65 65 66 here++;66 ++here; 67 67 } 68 68 } … … 84 84 toarray.push_back((*toptr).second); 85 85 } 86 here++;86 ++here; 87 87 } 88 88 } … … 100 100 toptr = mapfrom.find (*here); 101 101 if (toptr != mapfrom.end() && (*toptr).second == to) return true; 102 here++;102 ++here; 103 103 } 104 104 … … 129 129 return true; 130 130 } 131 here++;131 ++here; 132 132 } 133 133 … … 149 149 while (here != end) { 150 150 if (*here == '-') { 151 here++;151 ++here; 152 152 if (here != end && *here == '>') { 153 here++;153 ++here; 154 154 break; // found "->" 155 155 } … … 160 160 } else { 161 161 from.push_back(*here); 162 here++;162 ++here; 163 163 } 164 164 } … … 167 167 while (here != end) { 168 168 to.push_back(*here); 169 here++;169 ++here; 170 170 } 171 171 } -
trunk/gsdl/src/colservr/mgppqueryfilter.cpp
r8483 r9620 90 90 } 91 91 } 92 here++;92 ++here; 93 93 } 94 94 … … 107 107 filterOptions["Level"].validValues.push_back(*here); 108 108 } 109 here ++;109 ++here; 110 110 } 111 111 } else if (key == "textlevel") { … … 203 203 } 204 204 205 resultnum++;205 ++resultnum; 206 206 } 207 207 } // else 208 208 209 docorder_here++;209 ++docorder_here; 210 210 } 211 211 } // if need matching docs … … 232 232 while (termvariants_here != termvariants_end) { 233 233 terminfo.matchTerms.push_back (*termvariants_here); 234 termvariants_here++;234 ++termvariants_here; 235 235 } 236 236 } … … 239 239 response.termInfo.push_back (terminfo); 240 240 241 terms_here++;241 ++terms_here; 242 242 } 243 243 } … … 294 294 response.termInfo.push_back (terminfo); 295 295 296 terms_here++;296 ++terms_here; 297 297 } 298 298 … … 368 368 while (termvar_here != termvar_end) { 369 369 multiresults.termvariants.insert(*termvar_here); 370 termvar_here++;370 ++termvar_here; 371 371 } 372 372 } 373 373 374 query_here++;374 ++query_here; 375 375 } 376 376 -
trunk/gsdl/src/colservr/mgppsearch.cpp
r4823 r9620 167 167 168 168 docresultclass doc; 169 for (int i=0; i<(int)queryResult.docs.size(); i++) {169 for (int i=0; i<(int)queryResult.docs.size(); ++i) { 170 170 doc.clear(); 171 171 doc.docnum = (int)queryResult.levels[i]; … … 178 178 // term info 179 179 termfreqclass term; 180 for (int k=0; k<(int)queryResult.termFreqs.size(); k++) {180 for (int k=0; k<(int)queryResult.termFreqs.size(); ++k) { 181 181 term.clear(); 182 182 char* termfreq_cstr=GetCStr(queryResult.termFreqs[k].term); … … 189 189 queryresult.orgterms.push_back(term); // should this change?? 190 190 191 for (int j=0; j<(int)queryResult.termFreqs[k].equivTerms.size(); j++) {191 for (int j=0; j<(int)queryResult.termFreqs[k].equivTerms.size(); ++j) { 192 192 char* equivterm_cstr=GetCStr(queryResult.termFreqs[k].equivTerms[j]); 193 193 queryresult.termvariants.insert(to_uni(equivterm_cstr)); … … 246 246 // load results into term info 247 247 termfreqclass term; 248 for (int i=0; i<(int)browseResult.termFreqs.size(); i++) {248 for (int i=0; i<(int)browseResult.termFreqs.size(); ++i) { 249 249 term.clear(); 250 250 char* term_cstr = GetCStr(browseResult.termFreqs[i].term); -
trunk/gsdl/src/colservr/mgqueryfilter.cpp
r8026 r9620 114 114 if (!foundbreak && !start) { 115 115 tmpterms.push_back (orgterms[termcount]); 116 termcount ++;116 ++termcount; 117 117 } 118 118 if (tmpterms.size() > 1) { … … 128 128 if (foundquote) 129 129 tmpterms.push_back (orgterms[termcount]); 130 termcount ++;130 ++termcount; 131 131 } 132 132 foundbreak = true; … … 135 135 foundbreak = false; 136 136 } 137 here++;137 ++here; 138 138 } 139 139 } … … 170 170 longindex, queryparams.collection, *this_phrase, 171 171 (*docs_here).second.docnum)) { 172 (*docs_here).second.num_phrase_match++;172 ++docs_here->second.num_phrase_match; 173 173 } 174 174 175 docs_here++;176 } 177 this_phrase++;175 ++docs_here; 176 } 177 ++this_phrase; 178 178 } 179 179 } … … 251 251 while (termvar_here != termvar_end) { 252 252 multiresults.termvariants.insert(*termvar_here); 253 termvar_here++;253 ++termvar_here; 254 254 } 255 255 } 256 256 257 query_here++;257 ++query_here; 258 258 } 259 259 … … 369 369 break; 370 370 } 371 numdocs ++;372 docorder_here ++;371 ++numdocs; 372 ++docorder_here; 373 373 } 374 374 } … … 405 405 } 406 406 407 resultnum++;407 ++resultnum; 408 408 } 409 409 } 410 410 411 docorder_here++;411 ++docorder_here; 412 412 } 413 413 } … … 431 431 while (termvariants_here != termvariants_end) { 432 432 terminfo.matchTerms.push_back (*termvariants_here); 433 termvariants_here++;433 ++termvariants_here; 434 434 } 435 435 } … … 438 438 response.termInfo.push_back (terminfo); 439 439 440 terms_here++;440 ++terms_here; 441 441 } 442 442 } … … 518 518 new_querystring.push_back (*here); 519 519 } 520 here ++;520 ++here; 521 521 } 522 522 (*query_here).querystring = new_querystring; 523 523 } 524 524 #endif 525 query_here ++;525 ++query_here; 526 526 } 527 527 } -
trunk/gsdl/src/colservr/mgsearch.cpp
r4193 r9620 86 86 while (len < maxstemlen && here != end) { 87 87 word_stem[len+1] = (unsigned char)(*here); 88 len++; here++;88 ++len; ++here; 89 89 } 90 90 word_stem[len+1] = '\0'; … … 155 155 while (len < maxstemlen && here != end) { 156 156 word_stem[len+1] = (unsigned char)(*here); 157 len++; here++;157 ++len; ++here; 158 158 } 159 159 word_stem[len+1] = '\0'; … … 470 470 (*ithere != '&') && (*ithere != '|') && (*ithere != '(') && 471 471 (*ithere != ')')) (*ithere) = ' '; 472 ithere++;472 ++ithere; 473 473 } 474 474 } … … 501 501 while (mgdoc_here < mgdoc_end) { 502 502 if (*mgdoc_here == '\x3') *mgdoc_here = ' '; 503 mgdoc_here++;503 ++mgdoc_here; 504 504 } 505 505 -
trunk/gsdl/src/colservr/phrasequeryfilter.cpp
r8025 r9620 51 51 longindex, queryparams.collection, queryresults.orgterms, 52 52 (*docs_here).second.docnum)) { 53 (*docs_here).second.num_phrase_match++;54 docs_here++;53 ++docs_here->second.num_phrase_match; 54 ++docs_here; 55 55 56 56 } else { 57 57 docresultmap::iterator this_doc_here = docs_here; 58 docs_here++;58 ++docs_here; 59 59 if (queryparams.match_mode == 1) { 60 60 // need to delete this element, there was no exact match -
trunk/gsdl/src/colservr/phrasesearch.cpp
r5141 r9620 55 55 // this is in a word 56 56 word.push_back(*here); 57 here++; c_len--;57 ++here; --c_len; 58 58 } 59 59 break; … … 71 71 while (c_len > 0) { 72 72 word.push_back(*here); 73 here++; c_len--;73 ++here; --c_len; 74 74 } 75 75 } … … 99 99 tmptext.clear(); 100 100 } else tmptext.push_back(*contains_here); 101 contains_here++;101 ++contains_here; 102 102 } 103 103 if (!tmptext.empty()) contains.push_back (tmptext); … … 107 107 while (here != end) { 108 108 get_all_docnums (gdbm, *here, docnum_list); 109 here ++;109 ++here; 110 110 } 111 111 } … … 147 147 (*phrase_here).utf8equivterms.end()) break; 148 148 149 phrase_here++;149 ++phrase_here; 150 150 } while (doc_here <= doc_end && phrase_here != phrase_end); 151 151 … … 209 209 fulldoc.appendcstr (doc); 210 210 } 211 this_docnum ++;211 ++this_docnum; 212 212 } 213 213 doc = fulldoc.getcstr(); … … 251 251 252 252 if (result) return true; 253 subvalue_here++;254 } 255 } 256 keyhere ++;253 ++subvalue_here; 254 } 255 } 256 ++keyhere; 257 257 } 258 258 return result; -
trunk/gsdl/src/colservr/querycache.cpp
r1285 r9620 59 59 int i; 60 60 61 for (i=0; i < maxcachesize; i++)61 for (i=0; i < maxcachesize; ++i) 62 62 { 63 63 if (resultcache[i].queryparameters == queryparams) … … 93 93 int minaccessi = 0; 94 94 95 for (i=0; i < maxcachesize; i++)95 for (i=0; i < maxcachesize; ++i) 96 96 { 97 97 if (resultcache[i].accessnum < minaccessnum) { -
trunk/gsdl/src/colservr/queryfilter.cpp
r8024 r9620 153 153 } 154 154 155 options_here++;155 ++options_here; 156 156 } 157 157 -
trunk/gsdl/src/colservr/queryinfo.cpp
r4217 r9620 248 248 while (here != end) { 249 249 docorder.push_back ((*here).first); 250 here++;250 ++here; 251 251 } 252 252 } … … 267 267 tempresults[(*found).first] = (*found).second; 268 268 } 269 d_here++;269 ++d_here; 270 270 } 271 271 … … 287 287 docset[(*d_here).first] = (*d_here).second; 288 288 } 289 d_here++;289 ++d_here; 290 290 } 291 291 } … … 300 300 found = docset.find((*d_here).first); 301 301 if (found != docset.end()) docset.erase (found); 302 d_here++;302 ++d_here; 303 303 } 304 304 } … … 361 361 seenterms.insert((*here).termstr); 362 362 } 363 here++;363 ++here; 364 364 } 365 365 … … 378 378 while (docshere != docsend) { 379 379 outs << (*docshere).second; 380 docshere++;380 ++docshere; 381 381 } 382 382 … … 386 386 while (orgtermshere != orgtermsend) { 387 387 outs << (*orgtermshere); 388 orgtermshere++;388 ++orgtermshere; 389 389 } 390 390 … … 394 394 while (termshere != termsend) { 395 395 outs << (*termshere); 396 termshere++;396 ++termshere; 397 397 } 398 398 -
trunk/gsdl/src/recpt/OIDtools.cpp
r7414 r9620 239 239 OID.pop_back(); 240 240 if (*here == '.') break; 241 here --;241 --here; 242 242 } 243 243 return OID; -
trunk/gsdl/src/recpt/argdb.cpp
r7424 r9620 49 49 info.setinfo((*here).first, (*here).second); 50 50 } 51 here ++;51 ++here; 52 52 } 53 53 … … 69 69 while (here != end) { 70 70 argmap[(*here).first] = info[(*here).first]; 71 here ++;71 ++here; 72 72 } 73 73 argdb.closedatabase(); -
trunk/gsdl/src/recpt/authenaction.cpp
r7432 r9620 332 332 "\" value=\"_cgiarg" + (*args_here).first + "_\">\n"; 333 333 } 334 args_here++;334 ++args_here; 335 335 } 336 336 -
trunk/gsdl/src/recpt/browseactiontools.cpp
r7427 r9620 44 44 if(!isspace(*here)){ 45 45 formatted.push_back(*here); 46 here++;46 ++here; 47 47 } 48 48 //else, if seeing spaces, check that there is following text and add 49 49 //the ncessary conjugation if there is. 50 50 else if(isspace(*here)){ 51 while(isspace(*here) && here!=end) here++;51 while(isspace(*here) && here!=end) ++here; 52 52 if(here!=end) formatted += conj; 53 53 } … … 116 116 else { 117 117 118 check ++;118 ++check; 119 119 120 120 } -
trunk/gsdl/src/recpt/browsetools.cpp
r8555 r9620 79 79 buttons.push_back ("_document:imageexpandtext_"); 80 80 } 81 here ++;81 ++here; 82 82 } 83 83 … … 88 88 if ((count != 0) && ((count % 2) == 0)) textout<< outconvert << "<br>\n"; 89 89 textout << outconvert << disp << *here; 90 count ++;91 here ++;90 ++count; 91 ++here; 92 92 } 93 93 } … … 231 231 formatlistptr, formatlistmap, formatinfo, browsermap, 232 232 tabcount, collectproto, disp, outconvert, textout, logout); 233 thisdoc ++;233 ++thisdoc; 234 234 } 235 235 } … … 343 343 while (here != end) { 344 344 delete (*here).second; 345 here ++;345 ++here; 346 346 } 347 347 } … … 396 396 cache.insert (childtype); 397 397 } 398 thisdoc ++;398 ++thisdoc; 399 399 } 400 400 } … … 445 445 disp, outconvert, textout, logout); 446 446 first = false; 447 thisparent ++;447 ++thisparent; 448 448 } 449 449 } … … 509 509 while (here != end) { 510 510 delete (*here).second; 511 here ++;511 ++here; 512 512 } 513 513 } … … 756 756 } 757 757 758 thissibling ++;758 ++thissibling; 759 759 } 760 760 } -
trunk/gsdl/src/recpt/cgiargs.cpp
r7429 r9620 122 122 outs << text_t2utf8 << " \"" << (*here).first << "\"=\"" << 123 123 (*here).second.value << "\"\n"; 124 here++;124 ++here; 125 125 } 126 126 outs << "\n"; … … 258 258 while (here != end) { 259 259 if (!addarginfo (logout, (*here).second)) return false; 260 here++;260 ++here; 261 261 } 262 262 … … 294 294 (*logout) << ("Invalid argument for cgiarg for " + argshortname + " (" + thisInfo->first + ")\n"); 295 295 } 296 thisInfo++;296 ++thisInfo; 297 297 } 298 298 return true; … … 305 305 while (thisArg != endArg) { 306 306 if (!addarginfo(logout, thisArg->first, thisArg->second)) return false; 307 thisArg++;307 ++thisArg; 308 308 } 309 309 return true; -
trunk/gsdl/src/recpt/cgiutils.cpp
r7432 r9620 89 89 text_t utf8=to_utf8(uni); 90 90 int last_byte=utf8.size()-1; 91 for (int i=0;i<last_byte; i++)91 for (int i=0;i<last_byte;++i) 92 92 *out++ = utf8[i]; 93 93 c=utf8[last_byte]; … … 103 103 } else *out = *in; 104 104 105 if (in != end) in++;106 out++;105 if (in != end) ++in; 106 ++out; 107 107 } 108 108 … … 163 163 if (*here == ',') outtext += "%2C"; 164 164 else outtext.push_back (*here); 165 here ++;165 ++here; 166 166 } 167 167 return outtext; … … 182 182 183 183 }else outtext.push_back (*here); 184 here ++;184 ++here; 185 185 } 186 186 return outtext; … … 197 197 if (*here == '-') outtext += "Zz-"; 198 198 else outtext.push_back (*here); 199 here ++;199 ++here; 200 200 } 201 201 outtext = cgi_safe (outtext); … … 244 244 } 245 245 246 here++;246 ++here; 247 247 } 248 248 … … 319 319 } 320 320 321 argsinfohere++;321 ++argsinfohere; 322 322 } 323 323 … … 347 347 } 348 348 349 argsinfohere++;349 ++argsinfohere; 350 350 } 351 351 … … 407 407 if (!((*sav == 'Z') && (*(sav+1) == 'z') && (*(sav+2) == '-')) && 408 408 !((*(sav-1) == 'Z') && (*sav == 'z') && (*(sav+1) == '-'))) argvalue.push_back (*sav); 409 sav ++;409 ++sav; 410 410 } 411 411 first = false; … … 416 416 } else { 417 417 args.setdefaultcarg (argname,*arg_ehere, cgiarg_t::compressed_arg); 418 arg_ehere++;418 ++arg_ehere; 419 419 } 420 420 } … … 439 439 (*argsinfohere).second.argdefault, cgiarg_t::default_arg); 440 440 } 441 argsinfohere++;441 ++argsinfohere; 442 442 } 443 443 } … … 532 532 } 533 533 534 here++;534 ++here; 535 535 } 536 536 } -
trunk/gsdl/src/recpt/cgiwrapper.cpp
r7438 r9620 79 79 if (other_ostream != NULL) { 80 80 char *thepbase=pbase(); 81 for (int i=0;i<out_waiting(); i++) (*other_ostream).put(thepbase[i]);81 for (int i=0;i<out_waiting();++i) (*other_ostream).put(thepbase[i]); 82 82 } 83 83 … … 336 336 if (spaces < 2) spaces = 2; 337 337 text_t outspaces; 338 for (int i = 0; i < spaces; i++) outspaces.push_back (' ');338 for (int i = 0; i < spaces; ++i) outspaces.push_back (' '); 339 339 cout << text_t2ascii << outspaces; 340 340 … … 361 361 cout << text_t2ascii << "NOT FOUND\n"; 362 362 363 this_mfile ++;363 ++this_mfile; 364 364 } 365 365 … … 403 403 if (spaces < 2) spaces = 2; 404 404 text_t outspaces; 405 for (int i = 0; i < spaces; i++) outspaces.push_back (' ');405 for (int i = 0; i < spaces; ++i) outspaces.push_back (' '); 406 406 cout << text_t2ascii << outspaces; 407 407 … … 421 421 cout << "\n"; 422 422 423 collist_here ++;423 ++collist_here; 424 424 } 425 425 } 426 426 is_z3950=false; 427 rprotolist_here ++;427 ++rprotolist_here; 428 428 } // end of while loop 429 429 … … 479 479 if (cin.eof()) break; 480 480 argstr.push_back (c); 481 content_length--;481 --content_length; 482 482 } while (content_length > 0); 483 483 } … … 586 586 if (c < 0) break; 587 587 argstr.push_back (c); 588 content_length--;588 --content_length; 589 589 } while (content_length > 0); 590 590 } … … 616 616 #ifdef USE_FASTCGI 617 617 if (isfastcgi) { 618 for(; *fcgienvp != NULL; fcgienvp++) {618 for(; *fcgienvp != NULL; ++fcgienvp) { 619 619 text_t fvalue = *fcgienvp; 620 620 text_t::const_iterator begin = fvalue.begin(); … … 697 697 #endif 698 698 699 numrequests++;699 ++numrequests; 700 700 } 701 701 -
trunk/gsdl/src/recpt/collectoraction.cpp
r7430 r9620 361 361 (*here).second = args[(*here).first]; 362 362 } 363 here++;363 ++here; 364 364 } 365 365 … … 384 384 args[(*here).first] = (*here).second; 385 385 } 386 here ++;386 ++here; 387 387 } 388 388 } … … 453 453 file_copy (filename_cat(clone_etc, *here), filename_cat(new_etc, *here)); 454 454 } 455 here ++;455 ++here; 456 456 } 457 457 } else { … … 612 612 while (this_line != end_line) { 613 613 write_cfg_line (fd, *this_line); 614 this_line ++;614 ++this_line; 615 615 } 616 616 GSDL_UNLOCK_FILE (fd); … … 788 788 comerror_t err = noError; 789 789 if ((*rprotolist_here).p->get_protocol_name (err) == "z3950proto") { 790 rprotolist_here ++;790 ++rprotolist_here; 791 791 continue; 792 792 } … … 822 822 selected_index = index; 823 823 } 824 index ++;824 ++index; 825 825 } 826 collist_here ++;826 ++collist_here; 827 827 } 828 828 } 829 829 } 830 rprotolist_here ++;830 ++rprotolist_here; 831 831 } 832 832 … … 841 841 fullnamemenu += "_collector:textdefaultstructure_\n"; 842 842 } 843 for (int i = 0; i < index; i ++) {843 for (int i = 0; i < index; ++i) { 844 844 // don't want write protected collections in list on "change existing 845 845 // collection" page … … 849 849 (is_selected && i == selected_index)) { 850 850 fullnamemenu += " selected"; 851 selected_index++;851 ++selected_index; 852 852 is_selected = false; 853 853 } … … 904 904 text_tarray::iterator b = inputvalues.begin(); 905 905 while ((*l).empty() && l >= b) { 906 l--;906 --l; 907 907 } 908 908 inputvalues.erase(l+1, inputvalues.end()); … … 917 917 text_t last = "file://"; 918 918 text_t rv; 919 for (int i = 0; i < numboxes; i++) {919 for (int i = 0; i < numboxes; ++i) { 920 920 rv += "<nobr><select name=\"bc1inputtype\">\n"; 921 921 rv += "<option value=\"file://\""; … … 1197 1197 if (*here == '\n') faillog += "<br>"; 1198 1198 faillog.push_back (*here); 1199 here ++;1199 ++here; 1200 1200 } 1201 1201 disp.setmacro ("faillog", "collector", dm_safe(faillog)); … … 1456 1456 if (sw == 0) { 1457 1457 if (*here == '\n') { 1458 if ((here+1) != end && *(here+1) == '\r') here ++;1458 if ((here+1) != end && *(here+1) == '\r') ++here; 1459 1459 outtext += "\\n"; 1460 1460 } else if (*here == '\r') { 1461 if ((here+1) != end && *(here+1) == '\n') here ++;1461 if ((here+1) != end && *(here+1) == '\n') ++here; 1462 1462 outtext += "\\n"; 1463 1463 } else { … … 1466 1466 } else if (*here == '\\' && (here+1) != end && *(here+1) == 'n') { 1467 1467 outtext.push_back ('\n'); 1468 here ++;1468 ++here; 1469 1469 } else { 1470 1470 outtext.push_back (*here); 1471 1471 } 1472 here ++;1472 ++here; 1473 1473 } 1474 1474 return outtext; … … 1493 1493 if (*here >= 'A' && *here <= 'Z') shortname.push_back (*here+32); 1494 1494 else if (*here == ' ') { 1495 while ((*(here+1)) == ' ') here ++;1495 while ((*(here+1)) == ' ') ++here; 1496 1496 shortname.push_back (*here); 1497 1497 } else shortname.push_back (*here); 1498 1498 } 1499 here ++;1499 ++here; 1500 1500 } 1501 1501 … … 1513 1513 unsigned int substr_len = 6 / use_words; 1514 1514 1515 for (int i = 0; i < use_words; i++) {1515 for (int i = 0; i < use_words; ++i) { 1516 1516 if (words[i].size() < substr_len) shortname += words[i]; 1517 1517 else shortname += substr (words[i].begin(), words[i].begin()+substr_len); … … 1526 1526 text_t newname; 1527 1527 do { 1528 version ++;1528 ++version; 1529 1529 newname = shortname; 1530 1530 newname.push_back ('v'); … … 1555 1555 text_t tmpname = "tbuild"; 1556 1556 while (directory_exists (filename_cat (gsdlhome, "tmp", tmpname + text_t(i)))) { 1557 i++;1557 ++i; 1558 1558 } 1559 1559 tmpname.appendint (i); … … 1703 1703 int numvalues = inputvalues.size(); 1704 1704 int numtypes = inputtypes.size(); 1705 for (int i = 0; i < numvalues; i++) {1705 for (int i = 0; i < numvalues; ++i) { 1706 1706 if (!inputvalues[i].empty()) { 1707 1707 text_t type = "file://"; // default … … 1811 1811 found = true; 1812 1812 } 1813 hp ++;1813 ++hp; 1814 1814 } 1815 1815 text_tset::const_iterator it = pluginset.find (pluginname); … … 1817 1817 pluginname.clear(); 1818 1818 } 1819 here ++;1819 ++here; 1820 1820 } 1821 1821 } … … 1847 1847 } 1848 1848 } 1849 rprotolist_here ++;1849 ++rprotolist_here; 1850 1850 } 1851 1851 … … 1869 1869 } 1870 1870 } 1871 rprotolist_here ++;1871 ++rprotolist_here; 1872 1872 } 1873 1873 … … 1917 1917 int numtypes = inputtypes.size(); 1918 1918 1919 for (int i = 0; i < numvalues; i++) {1919 for (int i = 0; i < numvalues; ++i) { 1920 1920 text_t value = format_url(decode_commas(inputvalues[i])); 1921 1921 text_t type = "file://"; // default -
trunk/gsdl/src/recpt/comtypes.cpp
r7422 r9620 108 108 while (here != end) { 109 109 if (*here == defaultValue) return; 110 here++;110 ++here; 111 111 } 112 112 -
trunk/gsdl/src/recpt/configaction.cpp
r7441 r9620 124 124 } 125 125 } 126 rprotolist_here ++;126 ++rprotolist_here; 127 127 } 128 128 … … 146 146 } 147 147 } 148 rprotolist_here ++;148 ++rprotolist_here; 149 149 } 150 150 -
trunk/gsdl/src/recpt/datelistbrowserclass.cpp
r7433 r9620 102 102 103 103 // bail on this document if it has no date 104 if (date.empty()) { thissection++; continue; }104 if (date.empty()) { ++thissection; continue; } 105 105 106 106 text_t::const_iterator datebegin = date.begin(); 107 107 int datesize = date.size(); 108 108 109 if (datesize < 4) { thissection++; continue; }109 if (datesize < 4) { ++thissection; continue; } 110 110 text_t thisyear = substr (datebegin, datebegin+4); 111 111 text_t thismonth = "00"; … … 159 159 textout << outconvert << "</tr>\n"; 160 160 161 thissection ++;161 ++thissection; 162 162 } 163 163 -
trunk/gsdl/src/recpt/documentaction.cpp
r8715 r9620 342 342 disp.expandstring ("document", "_defaultwidth_", width); 343 343 iwidth += width.getint(); 344 dochere ++;344 ++dochere; 345 345 } 346 346 if ((twidth - iwidth) < numc) swidth = 2; … … 425 425 } 426 426 } 427 dochere ++;427 ++dochere; 428 428 first = false; 429 429 } … … 467 467 } 468 468 navigationbar += ">" + title + "</option>\n"; 469 dochere++;469 ++dochere; 470 470 } 471 471 … … 627 627 628 628 // don't need to check current collection again 629 if (*col_here == args["c"]) { col_here ++; continue;}629 if (*col_here == args["c"]) {++col_here; continue;} 630 630 631 631 collectproto = protos->getrecptproto (*col_here, logout); … … 638 638 } 639 639 } 640 col_here ++;640 ++col_here; 641 641 } 642 642 } … … 684 684 formatinfo.formatstrings[(*format_here).first] = (*format_here).second; 685 685 686 format_here ++;686 ++format_here; 687 687 } 688 688 … … 890 890 while (a != b) { 891 891 if (*a == 46) collage = false; 892 a++;892 ++a; 893 893 } 894 894 … … 1166 1166 while (sechere != secend) { 1167 1167 int shastxt = (*sechere).metadata["hastxt"].values[0].getint(); 1168 if (shastxt == 1) seccount ++;1168 if (shastxt == 1) ++seccount; 1169 1169 if (seccount > 10) break; 1170 sechere ++;1170 ++sechere; 1171 1171 } 1172 1172 if (seccount > 10) { … … 1195 1195 (*sechere).OID, highlight, shastxt, wanttext, collection, 1196 1196 collectproto, browsers, disp, outconvert, textout, logout, args); 1197 count ++;1198 sechere ++;1197 ++count; 1198 ++sechere; 1199 1199 } 1200 1200 } … … 1261 1261 break; 1262 1262 } 1263 this_sibling++;1263 ++this_sibling; 1264 1264 first = false; 1265 1265 } 1266 1266 thisoid = get_parent(thisoid); 1267 parentcount--;1267 --parentcount; 1268 1268 } 1269 1269 … … 1281 1281 break; 1282 1282 } 1283 h++;1283 ++h; 1284 1284 } 1285 1285 } -
trunk/gsdl/src/recpt/extlinkaction.cpp
r7408 r9620 159 159 160 160 // don't need to check current collection again 161 if (*col_here == thiscollection) { col_here ++; continue;}161 if (*col_here == thiscollection) {++col_here; continue;} 162 162 163 163 recptproto *collectproto = protos->getrecptproto (*col_here, logout); 164 if (collectproto == NULL) { col_here ++; continue;}164 if (collectproto == NULL) {++col_here; continue;} 165 165 166 166 if (get_info (arg_href, *col_here, args["l"], metadata, false, collectproto, response, logout)) { … … 171 171 } 172 172 } 173 col_here ++;173 ++col_here; 174 174 } 175 175 } … … 214 214 215 215 // don't need to check current collection 216 if (*col_here == args["c"]) { col_here ++; continue;}216 if (*col_here == args["c"]) {++col_here; continue;} 217 217 218 218 recptproto *collectproto = protos->getrecptproto (*col_here, logout); … … 235 235 } 236 236 } 237 col_here ++;237 ++col_here; 238 238 } 239 239 } -
trunk/gsdl/src/recpt/formattools.cpp
r9401 r9620 110 110 } else return false; 111 111 } 112 here ++;112 ++here; 113 113 } 114 114 return false; … … 373 373 text_t::const_iterator end = link.end(); 374 374 375 here ++;375 ++here; 376 376 while (here != end) { 377 377 if (*here == '"') break; 378 378 href.push_back(*here); 379 here ++;379 ++here; 380 380 } 381 381 … … 436 436 text_tarray::const_iterator doc_data = relationdata.begin(); 437 437 text_t document_collection = *doc_data; 438 doc_data++; //increment to get next item in array (oid)438 ++doc_data; //increment to get next item in array (oid) 439 439 text_t document_OID = *doc_data; 440 440 … … 461 461 relation += " (" + document_collection + ")<br>"; 462 462 463 currDoc++;463 ++currDoc; 464 464 } 465 465 } … … 495 495 else if (inquotes) op.push_back (*here); 496 496 else com.push_back (*here); 497 here ++;497 ++here; 498 498 } 499 499 … … 530 530 else if (inquotes) op.push_back (*here); 531 531 else com.push_back (*here); 532 here ++;532 ++here; 533 533 } 534 534 … … 565 565 else if (inquotes) op.push_back (*here); 566 566 else com.push_back (*here); 567 here ++;567 ++here; 568 568 } 569 569 … … 694 694 695 695 if (*here == '\\') { 696 here ++;696 ++here; 697 697 if (here != end) text.push_back (*here); 698 698 … … 722 722 } 723 723 text_t meta; 724 here ++;724 ++here; 725 725 while (*here != ']') { 726 726 if (here == end) return false; 727 727 meta.push_back (*here); 728 here ++;728 ++here; 729 729 } 730 730 parse_meta (meta, formatlistptr, metadata, getParents); … … 735 735 text.push_back (*here); 736 736 737 if (here != end) here ++;737 if (here != end) ++here; 738 738 } 739 739 if (!text.empty()) { … … 757 757 here = findchar (it, end, '{'); 758 758 if (here == end) return false; 759 else here ++;759 else ++here; 760 760 761 761 if (com == "If" || com == "if" || com == "IF") formatlistptr->command = comIf; … … 838 838 text_t meta = substr (beginbracket+1, endbracket); 839 839 parse_meta (meta, formatlistptr->decision.meta, metadata, getParents); 840 commacount ++;840 ++commacount; 841 841 text.clear(); 842 842 } … … 855 855 formatlistptr->decision.command = dText; 856 856 formatlistptr->decision.text = text; 857 commacount ++;857 ++commacount; 858 858 text.clear(); 859 859 } … … 916 916 { 917 917 if (*here == '}') break; 918 commacount ++;918 ++commacount; 919 919 } 920 920 } … … 923 923 } else text.push_back(*here); 924 924 925 if (here != end) here ++;925 if (here != end) ++here; 926 926 } 927 927 … … 950 950 const int end_i = metainfo.values.size()-1; 951 951 952 for (int i=start_i; i<=end_i; i++) {952 for (int i=start_i; i<=end_i; ++i) { 953 953 if (!first) tmp += meta.functionoptions; 954 954 … … 1012 1012 else tmp += *here; 1013 1013 first = false; 1014 here ++;1014 ++here; 1015 1015 } 1016 1016 if (meta.metacommand & mCgiSafe) return cgi_safe (tmp); … … 1146 1146 break; 1147 1147 } 1148 pos++;1148 ++pos; 1149 1149 } 1150 1150 … … 1159 1159 break; 1160 1160 } 1161 pos--;1161 --pos; 1162 1162 } 1163 1163 … … 1172 1172 break; 1173 1173 } 1174 pos--;1174 --pos; 1175 1175 } 1176 1176 … … 1188 1188 break; 1189 1189 } 1190 pos--;1190 --pos; 1191 1191 } 1192 1192 … … 1200 1200 extracted_str.clear(); 1201 1201 1202 for (int pos=start_pos; pos<=end_pos; pos++) {1202 for (int pos=start_pos; pos<=end_pos; ++pos) { 1203 1203 extracted_str.push_back(outstring[pos]); 1204 1204 } … … 1277 1277 1278 1278 if ((potential_quote == '\'') || (potential_quote == '\"')) { 1279 rhs_end--;1279 --rhs_end; 1280 1280 rhs_start = rscan_for(outstring,rhs_end-1,potential_quote) +1; 1281 1281 quoted = true; … … 1431 1431 while (here != end) { 1432 1432 if (*here == '[') return true; 1433 here ++;1433 ++here; 1434 1434 } 1435 1435 -
trunk/gsdl/src/recpt/highlighttext.cpp
r7433 r9620 93 93 while (this_var != last_var) { 94 94 allterms[*this_var] = 1; 95 this_var ++;96 } 97 this_term ++;95 ++this_var; 96 } 97 ++this_term; 98 98 } 99 99 … … 106 106 // not word boundary 107 107 word.push_back(*here); 108 here++;108 ++here; 109 109 110 110 } else { … … 124 124 while ((here != end) && (*here != '>')) { 125 125 buffer.push_back(*here); 126 here++;126 ++here; 127 127 } 128 128 } 129 129 130 130 buffer.push_back(*here); 131 here++;131 ++here; 132 132 133 133 if (buffer.size() > 1024) { … … 159 159 while (this_var != last_var) { 160 160 allterms[*this_var] = 1; 161 this_var ++;161 ++this_var; 162 162 } 163 163 first = false; 164 this_term ++;164 ++this_term; 165 165 } 166 166 … … 174 174 // not word boundary 175 175 word.push_back(*here); 176 here++;176 ++here; 177 177 178 178 } else { … … 193 193 buffer.clear(); 194 194 } 195 phrasecount ++;195 ++phrasecount; 196 196 } else { 197 197 phrasecount = 0; … … 215 215 while ((here != end) && (*here != '>')) { 216 216 buffer.push_back(*here); 217 here++;217 ++here; 218 218 } 219 219 } 220 220 221 221 buffer.push_back(*here); 222 here++;222 ++here; 223 223 224 224 if (buffer.size() > 1024 && phrasecount == 0) { … … 252 252 } 253 253 } 254 here++;254 ++here; 255 255 } 256 256 … … 278 278 altered_string.push_back(*here); 279 279 } 280 here++;280 ++here; 281 281 } 282 282 -
trunk/gsdl/src/recpt/historydb.cpp
r7432 r9620 109 109 newhistoryresult += history; 110 110 newhistoryresult += "\n"; 111 for (int i=0; i<numentries; i++) {111 for (int i=0; i<numentries;++i) { 112 112 newhistoryresult += entries[i]+"\n"; 113 113 } … … 156 156 } 157 157 } 158 here++;158 ++here; 159 159 }// while 160 160 } … … 186 186 info[key]=value; 187 187 } 188 start++;188 ++start; 189 189 } 190 190 } … … 198 198 while (*begin >='0'&& *begin <='9') { // get the digits for numdocs 199 199 numdocs.push_back(*begin); 200 begin++;200 ++begin; 201 201 } 202 202 203 203 if (*begin == '+') { // get the + if there 204 204 numdocs.push_back(*begin); 205 begin++;205 ++begin; 206 206 } 207 207 if (*begin == ':') { // have the old format - previous bit was record number 208 208 numdocs.clear(); 209 begin++;209 ++begin; 210 210 211 211 while(*begin >='0' && *begin <='9') { // get the digits 212 212 numdocs.push_back(*begin); 213 begin++;213 ++begin; 214 214 } 215 215 if (*begin == '+') { // get the + if there 216 216 numdocs.push_back(*begin); 217 begin++;217 ++begin; 218 218 } 219 219 } -
trunk/gsdl/src/recpt/hlistbrowserclass.cpp
r7433 r9620 166 166 while (tmp_str<end_str) { 167 167 if (*tmp_str=='<') { // for html tags 168 while (*tmp_str!='>') tmp_str++;168 while (*tmp_str!='>') ++tmp_str; 169 169 } else if (*tmp_str=='&') { // for html entities 170 while (*tmp_str!=';') tmp_str++;171 num_chars++;172 } else num_chars++;173 tmp_str++;170 while (*tmp_str!=';') ++tmp_str; 171 ++num_chars; 172 } else ++num_chars; 173 ++tmp_str; 174 174 } 175 175 … … 180 180 181 181 textout << outconvert << "<td>" << disp << fmt_str << "</td>\n"; 182 tsibling ++;182 ++tsibling; 183 183 } 184 184 -
trunk/gsdl/src/recpt/htmlutils.cpp
r7388 r9620 38 38 else if (*here == '#') outstring += "#"; 39 39 else outstring.push_back(*here); 40 here ++;40 ++here; 41 41 } 42 42 return outstring; … … 53 53 else if (*here == '\'') outstring += "\\'"; 54 54 else outstring.push_back(*here); 55 here ++;55 ++here; 56 56 } 57 57 return outstring; -
trunk/gsdl/src/recpt/infodbclass.cpp
r7434 r9620 159 159 gdbmfile = gdbm_open (namebuffer, block_size, mode, 00664, NULL); 160 160 #endif 161 num_retrys--;161 --num_retrys; 162 162 } while (num_retrys>0 && gdbmfile==NULL && 163 163 (gdbm_errno==GDBM_CANT_BE_READER || gdbm_errno==GDBM_CANT_BE_WRITER)); -
trunk/gsdl/src/recpt/langaction.cpp
r8102 r9620 189 189 190 190 // Case fold both language codes, just in case 191 for (int i = 0; i < strlen(sourceabbr.getcstr()); i++) {191 for (int i = 0; i < strlen(sourceabbr.getcstr()); ++i) { 192 192 sourceabbr[i] = tolower(sourceabbr[i]); 193 193 } 194 for (int i = 0; i < strlen(targetabbr.getcstr()); i++) {194 for (int i = 0; i < strlen(targetabbr.getcstr()); ++i) { 195 195 targetabbr[i] = tolower(targetabbr[i]); 196 196 } -
trunk/gsdl/src/recpt/pageaction.cpp
r8030 r9620 203 203 search_types |= 1; 204 204 } 205 type_here ++;205 ++type_here; 206 206 } 207 207 coll_type += search_types; … … 258 258 } 259 259 260 collist_here ++;260 ++collist_here; 261 261 } 262 262 263 263 } 264 264 } 265 rprotolist_here ++;265 ++rprotolist_here; 266 266 } 267 267 … … 333 333 search_types |= 1; 334 334 } 335 type_here ++;335 ++type_here; 336 336 } 337 337 coll_type += search_types; … … 432 432 homeextra += "<td>" + link + collectionname + "</a></td>\n"; 433 433 434 count ++;434 ++count; 435 435 first = false; 436 436 } 437 437 } 438 collist_here ++;438 ++collist_here; 439 439 } 440 440 441 for (; count%configinfo.HomePageCols != 0; count ++) homeextra += "<td></td>\n";441 for (; count%configinfo.HomePageCols != 0; ++count) homeextra += "<td></td>\n"; 442 442 } 443 443 } 444 444 homeextra += "</td></tr>\n<tr>\n"; 445 rprotolist_here ++;445 ++rprotolist_here; 446 446 } 447 447 … … 477 477 if (cinfo->isPublic && (cinfo->buildDate > 0)) { 478 478 479 count ++;479 ++count; 480 480 481 481 text_t coll_type = "&ct="; … … 506 506 search_types |= 0x01; 507 507 } 508 type_here ++;508 ++type_here; 509 509 } 510 510 coll_type += search_types; … … 547 547 } 548 548 } 549 collist_here ++;549 ++collist_here; 550 550 } 551 551 } 552 552 } 553 rprotolist_here ++;553 ++rprotolist_here; 554 554 } 555 555 … … 640 640 while (thislang != endlang) { 641 641 languages[(*thislang).second.longname] = (*thislang).first; 642 thislang++;642 ++thislang; 643 643 } 644 644 text_tmap::iterator tlang = languages.begin(); … … 661 661 languageoption += ">" + (*tlang).first + "</option>\n"; 662 662 } 663 tlang ++;663 ++tlang; 664 664 } 665 665 } … … 672 672 if ((*tlang).second == arg_l) languageoption += " selected"; 673 673 languageoption += ">" + (*tlang).first + "</option>\n"; 674 tlang ++;674 ++tlang; 675 675 } 676 676 } … … 693 693 if ((*thisenc).second == arg_w) encodingoption += " selected"; 694 694 encodingoption += ">" + (*thisenc).first + "</option>\n"; 695 thisenc ++;695 ++thisenc; 696 696 } 697 697 … … 873 873 } else { 874 874 ColInfoResponse_t *this_cinfo = recpt->get_collectinfo_ptr (collectproto, *col_here, logout); 875 if (this_cinfo == NULL) { col_here ++; continue;}875 if (this_cinfo == NULL) {++col_here; continue;} 876 876 colname = this_cinfo->collectionmeta["collectionname"]; 877 877 } 878 878 879 count ++;879 ++count; 880 880 collectionoption += "<input type=checkbox name=\"cc\" value=\"" + 881 881 *col_here + "\" onClick=\"updatecc(\'" + *col_here + "\');\"> " + 882 882 colname + "<br>\n"; 883 col_here ++;883 ++col_here; 884 884 } 885 885 … … 946 946 while (here != end) { 947 947 948 classifiernumber++;948 ++classifiernumber; 949 949 text_t childtype = (*here).metadata["childtype"].values[0]; 950 950 if (childtype == "Collage" && arg_p == "about") { … … 954 954 collage = true; 955 955 } 956 here ++;956 ++here; 957 957 } 958 958 if (! collage) … … 977 977 } 978 978 979 here ++;979 ++here; 980 980 } 981 981 shorttext += "</ul>\n"; … … 998 998 } else { 999 999 ColInfoResponse_t *this_cinfo = recpt->get_collectinfo_ptr (collectproto, *here, logout); 1000 if (this_cinfo == NULL) { here ++; continue;}1000 if (this_cinfo == NULL) {++here; continue;} 1001 1001 if (!first) textsubcollections += "<br>"; 1002 1002 textsubcollections += "\n" + this_cinfo->collectionmeta["collectionname"] + "\n"; 1003 1003 } 1004 count ++;1004 ++count; 1005 1005 first = false; 1006 here ++;1006 ++here; 1007 1007 } 1008 1008 textsubcollections += "_textsubcols2_"; -
trunk/gsdl/src/recpt/pagedbrowserclass.cpp
r7618 r9620 77 77 break; 78 78 } 79 dochere ++;79 ++dochere; 80 80 } 81 81 … … 158 158 break; 159 159 } 160 thissection ++;160 ++thissection; 161 161 } 162 162 -
trunk/gsdl/src/recpt/phindaction.cpp
r7734 r9620 580 580 // Get the word 581 581 word.clear(); 582 for (; *next != ':'; next++) {582 for (; *next != ':'; ++next) { 583 583 word.push_back(*next); 584 584 } … … 586 586 // Get total frequency 587 587 tf = 0; 588 for ( next++; *next != ':'; next++) {588 for (++next; *next != ':'; ++next) { 589 589 tf *= 10; 590 590 tf += (*next - '0'); … … 593 593 // Get expansion frequency 594 594 ef = 0; 595 for ( next++; *next != ':'; next++) {595 for (++next; *next != ':'; ++next) { 596 596 ef *= 10; 597 597 ef += (*next - '0'); … … 600 600 // Get document frequency 601 601 df = 0; 602 for ( next++; *next != ':'; next++) {602 for (++next; *next != ':'; ++next) { 603 603 df *= 10; 604 604 df += (*next - '0'); … … 608 608 el.clear(); 609 609 unsigned long e = 0; 610 for ( next++; *next != ':'; next++) {610 for (++next; *next != ':'; ++next) { 611 611 if (*next == ',') { 612 612 el.push_back(e); … … 623 623 bool readnum = false; 624 624 unsigned long d = 0; 625 for ( next++; *next != ':'; next++) {625 for (++next; *next != ':'; ++next) { 626 626 if (*next == ',') { 627 627 docnum.push_back(d); … … 649 649 // link frequency 650 650 lf = 0; 651 for ( next++; *next != ':'; next++) {651 for (++next; *next != ':'; ++next) { 652 652 lf *= 10; 653 653 lf += (*next - '0'); … … 662 662 bool typedone = false; 663 663 unsigned long l = 0; 664 for ( next++; *next != ':'; next++) {664 for (++next; *next != ':'; ++next) { 665 665 666 666 if (!typedone) { … … 703 703 UCArray type, text; 704 704 705 for (unsigned long l = first; l < last; l++) {705 for (unsigned long l = first; l < last; ++l) { 706 706 707 707 // get the phrase data … … 769 769 // Get the word 770 770 word.clear(); 771 for (; *next != ':'; next++) {771 for (; *next != ':'; ++next) { 772 772 word.push_back(*next); 773 773 } … … 775 775 // Get total frequency 776 776 tf = 0; 777 for ( next++; *next != ':'; next++) {777 for (++next; *next != ':'; ++next) { 778 778 tf *= 10; 779 779 tf += (*next - '0'); … … 782 782 // Get expansion frequency 783 783 ef = 0; 784 for ( next++; *next != ':'; next++) {784 for (++next; *next != ':'; ++next) { 785 785 ef *= 10; 786 786 ef += (*next - '0'); … … 789 789 // Get document frequency 790 790 df = 0; 791 for ( next++; *next != ':'; next++) {791 for (++next; *next != ':'; ++next) { 792 792 df *= 10; 793 793 df += (*next - '0'); … … 816 816 toUCArray(body, ucbody); 817 817 818 for (unsigned long e = first; e < last; e++) {818 for (unsigned long e = first; e < last; ++e) { 819 819 820 820 phrase = elist[e]; … … 952 952 unsigned long freq, doc; 953 953 954 for (unsigned long d = first; d < last; d++) {954 for (unsigned long d = first; d < last; ++d) { 955 955 doc = docNums[d]; 956 956 freq = docFreq[d]; … … 1012 1012 // Get the document OID (hash) 1013 1013 hash.clear(); 1014 for (; *next != '\t'; next++) {1014 for (; *next != '\t'; ++next) { 1015 1015 hash.push_back(*next); 1016 1016 } … … 1019 1019 text.push_back('\n'); 1020 1020 title.clear(); 1021 for ( next++; *next != '\n'; next++) {1021 for (++next; *next != '\n'; ++next) { 1022 1022 title.push_back(*next); 1023 1023 } -
trunk/gsdl/src/recpt/queryaction.cpp
r8357 r9620 653 653 macrovalue += " selected"; 654 654 macrovalue += ">_" + *thisvalue + "_\n"; 655 thisvalue ++;655 ++thisvalue; 656 656 } 657 657 macrovalue += "</select>\n"; … … 749 749 break; 750 750 } 751 thisvalue++;751 ++thisvalue; 752 752 } 753 753 if (!has_paras) return; // there is no difference between the form selection and the normal one … … 777 777 macrovalue += ">_" + *thisvalue + "_\n"; 778 778 } 779 thisvalue ++;779 ++thisvalue; 780 780 } 781 781 macrovalue += "</select>\n"; … … 798 798 if (args["qf"] == "1") { // advanced form 799 799 form += "<tr>_firstadvformelement_</tr>\n"; 800 for (int i=1; i<argfqn; i++) {800 for (int i=1; i<argfqn; ++i) { 801 801 form += "<tr>_advformelement_</tr>\n"; 802 802 } … … 804 804 } 805 805 else { // simple form 806 for (int i=0; i<argfqn; i++) {806 for (int i=0; i<argfqn; ++i) { 807 807 form += "<tr>_regformelement_</tr>\n"; 808 808 } … … 839 839 historylist += "<form name=\"HistoryForm\"><table width=537>\n"; 840 840 841 for (int i=0; i<numrecords; i++) {841 for (int i=0; i<numrecords;++i) { 842 842 text_t query; 843 843 text_t numdocs; … … 938 938 if (!index.empty()) { 939 939 it = fresponse.filterOptions.find ("Index"); 940 if (it == end) { collist_here ++; continue;}940 if (it == end) {++collist_here; continue;} 941 941 text_tarray::const_iterator there = (*it).second.validValues.begin(); 942 942 text_tarray::const_iterator tend = (*it).second.validValues.end(); 943 943 while (there != tend) { 944 944 if (*there == index) break; 945 there ++;945 ++there; 946 946 } 947 if (there == tend) { collist_here++; continue;}947 if (there == tend) {++collist_here; continue;} 948 948 } 949 949 if (!subcollection.empty()) { 950 950 it = fresponse.filterOptions.find ("Subcollection"); 951 if (it == end) { collist_here++; continue;}951 if (it == end) {++collist_here; continue;} 952 952 text_tarray::const_iterator there = (*it).second.validValues.begin(); 953 953 text_tarray::const_iterator tend = (*it).second.validValues.end(); 954 954 while (there != tend) { 955 955 if (*there == subcollection) break; 956 there ++;956 ++there; 957 957 } 958 if (there == tend) { collist_here++; continue;}958 if (there == tend) {++collist_here; continue;} 959 959 } 960 960 if (!language.empty()) { 961 961 it = fresponse.filterOptions.find ("Language"); 962 if (it == end) { collist_here++; continue;}962 if (it == end) {++collist_here; continue;} 963 963 text_tarray::const_iterator there = (*it).second.validValues.begin(); 964 964 text_tarray::const_iterator tend = (*it).second.validValues.end(); 965 965 while (there != tend) { 966 966 if (*there == language) break; 967 there ++;967 ++there; 968 968 } 969 if (there == tend) { collist_here++; continue;}969 if (there == tend) {++collist_here; continue;} 970 970 } 971 971 … … 988 988 } 989 989 } 990 collist_here ++;990 ++collist_here; 991 991 } 992 992 } 993 993 } 994 rprotolist_here ++;994 ++rprotolist_here; 995 995 } 996 996 textout << outconvert << disp … … 1117 1117 logout << outconvert << "queryaction::search_multiple_collections: " << *col_here 1118 1118 << " collection has a NULL collectproto, ignoring\n"; 1119 col_here ++;1119 ++col_here; 1120 1120 continue; 1121 1121 } … … 1123 1123 if (cinfo == NULL) { 1124 1124 logout << "ERROR (query_action::search_multiple_collections): get_collectinfo_ptr returned NULL\n"; 1125 col_here ++;1125 ++col_here; 1126 1126 continue; 1127 1127 } … … 1175 1175 if ((this_term+1) != end_term) freqmsg += ", "; 1176 1176 } 1177 this_term ++;1177 ++this_term; 1178 1178 } 1179 1179 … … 1188 1188 thisresult.doc = *doc_here; 1189 1189 results.insert (thisresult); 1190 doc_here ++;1190 ++doc_here; 1191 1191 } 1192 1192 } 1193 col_here ++;1193 ++col_here; 1194 1194 } // for each coll 1195 1195 … … 1223 1223 // output results 1224 1224 while (res_here != res_end) { 1225 if (count < firstdoc) { count ++; res_here ++; continue;}1225 if (count < firstdoc) {++count; ++res_here; continue;} 1226 1226 if (count > thislast) break; 1227 1227 formatlistptr = colinfomap[(*res_here).collection].formatlistptr; … … 1234 1234 logout << outconvert << "queryaction::search_multiple_collections: " << (*res_here).collection 1235 1235 << " collection has a NULL collectproto, ignoring results\n"; 1236 res_here ++;1236 ++res_here; 1237 1237 continue; 1238 1238 } … … 1242 1242 collectproto, disp, outconvert, textout, logout); 1243 1243 // textout << outconvert << "(ranking: " << (*res_here).doc.ranking << ")\n"; 1244 res_here ++;1245 count ++;1244 ++res_here; 1245 ++count; 1246 1246 } 1247 1247 } … … 1253 1253 while (here != end) { 1254 1254 delete ((*here).second.formatlistptr); 1255 here ++;1255 ++here; 1256 1256 } 1257 1257 return true; … … 1515 1515 quotedquery += "\"" + *phere + "\""; 1516 1516 first = false; 1517 phere ++;1517 ++phere; 1518 1518 } 1519 1519 if (args.getintarg("s") && !quotedquery.empty()) quotedquery += "_textstemon_"; … … 1543 1543 if ((this_term + 1) != end_term) 1544 1544 freqmsg += ", "; 1545 this_term ++;1545 ++this_term; 1546 1546 } 1547 1547 } -
trunk/gsdl/src/recpt/querytools.cpp
r8715 r9620 192 192 formattedstring.push_back (*here); 193 193 } 194 here ++;194 ++here; 195 195 } 196 196 querystring = formattedstring; … … 214 214 } 215 215 else 216 here++;216 ++here; 217 217 } 218 218 //converting BCE dates … … 254 254 } 255 255 } 256 nextdate++;256 ++nextdate; 257 257 } 258 258 querystring.appendcstr(" )"); … … 284 284 if (foundquote) tmptext.push_back (*here); 285 285 } 286 here ++;286 ++here; 287 287 } 288 288 } … … 307 307 } 308 308 309 here++;309 ++here; 310 310 } 311 311 return escquery; … … 343 343 344 344 345 for (int i=0; i< values.size(); i++) {345 for (int i=0; i< values.size(); ++i) { 346 346 if (!values[i].empty()) { 347 347 if (ct == 1) { … … 395 395 splitchar(comb.begin(), comb.end(), ',', combs); 396 396 397 for(int i=0; i< values.size(); i++) {397 for(int i=0; i< values.size(); ++i) { 398 398 if (!values[i].empty()) { 399 399 if (i!=0) { … … 429 429 // not word boundary 430 430 word.push_back(*here); 431 here++;431 ++here; 432 432 } 433 433 else { … … 450 450 outtext.push_back(*here); 451 451 } 452 here++;452 ++here; 453 453 } 454 454 } … … 651 651 // not word boundary 652 652 word.push_back(*here); 653 here++;653 ++here; 654 654 } 655 655 else { … … 662 662 // everything else, we add into the query string 663 663 outtext.push_back(*here); 664 here++;664 ++here; 665 665 } 666 666 } -
trunk/gsdl/src/recpt/recptproto.cpp
r4774 r9620 168 168 } 169 169 170 here++;170 ++here; 171 171 } 172 172 -
trunk/gsdl/src/recpt/statusaction.cpp
r7381 r9620 119 119 120 120 textout << "</tr>\n"; 121 collist_here ++;121 ++collist_here; 122 122 } 123 123 } 124 124 } 125 rprotolist_here ++;125 ++rprotolist_here; 126 126 } 127 127 … … 162 162 macrofirst = false; 163 163 textout << outconvert << "\"" << *macrohere << "\""; 164 macrohere++;164 ++macrohere; 165 165 } 166 166 textout << outconvert << "</td></tr>\n"; … … 193 193 << (*params_here).second << "\""; 194 194 195 params_here++;195 ++params_here; 196 196 } 197 197 textout << outconvert << "</td></tr>\n"; … … 213 213 argsinfofirst = false; 214 214 textout << outconvert << "\"" << (*argsinfohere).second.shortname << "\""; 215 argsinfohere++;215 ++argsinfohere; 216 216 } 217 217 … … 234 234 textout << outconvert << "\"" << (*actionshere).second.a->get_action_name() << "\""; 235 235 } 236 actionshere++;236 ++actionshere; 237 237 } 238 238 … … 255 255 textout << outconvert << "\"" << (*browsershere).second.b->get_browser_name() << "\""; 256 256 } 257 browsershere++;257 ++browsershere; 258 258 } 259 259 … … 276 276 textout << outconvert << "\"" << (*protohere).p->get_protocol_name(err) << "\""; 277 277 } 278 protohere++;278 ++protohere; 279 279 } 280 280 … … 294 294 convertfirst = false; 295 295 textout << outconvert << "\"" << (*converthere).second.name << "\""; 296 converthere++;296 ++converthere; 297 297 } 298 298 … … 354 354 else textout << outconvert << "<td>\"" << *arg_value << "\"</td></tr>\n"; 355 355 356 argsinfohere ++;356 ++argsinfohere; 357 357 } 358 358 … … 393 393 aifirst = false; 394 394 textout << outconvert << (*argsinfohere).second.shortname; 395 argsinfohere++;395 ++argsinfohere; 396 396 } 397 397 398 398 textout << outconvert << "</td></tr>\n"; 399 399 } 400 actionshere++;400 ++actionshere; 401 401 } 402 402 } … … 431 431 << "</td></tr>\n"; 432 432 } 433 browsershere++;433 ++browsershere; 434 434 } 435 435 } … … 491 491 } 492 492 493 collist_here++;493 ++collist_here; 494 494 } 495 495 … … 503 503 } 504 504 505 rprotolist_here++;505 ++rprotolist_here; 506 506 } 507 507 … … 542 542 if (err == noError && hascollection) break; 543 543 } 544 rprotolist_here++;544 ++rprotolist_here; 545 545 } 546 546 … … 590 590 languages_first = false; 591 591 textout << outconvert << "\"" << *languages_here << "\""; 592 languages_here++;592 ++languages_here; 593 593 } 594 594 … … 599 599 textout << outconvert << "<tr><td>" << (*meta_here).first 600 600 << "</td><td>" << (*meta_here).second << "</td></tr>\n"; 601 meta_here ++;601 ++meta_here; 602 602 } 603 603 textout << "</table></td></tr>\n"; … … 609 609 textout << outconvert << "<tr><td>" << (*format_here).first 610 610 << "</td><td>" << html_safe((*format_here).second) << "</td></tr>\n"; 611 format_here ++;611 ++format_here; 612 612 } 613 613 textout << "</table></td></tr>\n"; … … 619 619 textout << outconvert << "<tr><td>" << (*building_here).first 620 620 << "</td><td>" << (*building_here).second << "</td></tr>\n"; 621 building_here ++;621 ++building_here; 622 622 } 623 623 textout << "</table></td></tr>\n"; … … 722 722 valid_first = false; 723 723 textout << outconvert << "\"" << *valid_here << "\""; 724 valid_here++;724 ++valid_here; 725 725 } 726 726 textout << outconvert 727 727 << "</td></tr>\n"; 728 728 729 filteropt_here++;729 ++filteropt_here; 730 730 } 731 731 … … 738 738 } 739 739 740 filternames_here++;740 ++filternames_here; 741 741 } 742 742 … … 1089 1089 while (macrohere != macroend) { 1090 1090 if (*macrohere == "status.dm") break; 1091 macrohere++;1091 ++macrohere; 1092 1092 } 1093 1093 if (macrohere == macroend) { -
trunk/gsdl/src/recpt/string_pool.cpp
r7348 r9620 34 34 while (here != end) { 35 35 delete(*here); 36 here ++;36 ++here; 37 37 } 38 38 } -
trunk/gsdl/src/recpt/summarise.cpp
r2971 r9620 106 106 // consider only non-empty terms 107 107 for(text_tarray::iterator term = allterms.begin(); 108 term < allterms.end(); term++) {108 term < allterms.end(); ++term) { 109 109 if(!(*term).empty()) 110 110 terms.push_back(*term); … … 125 125 // answersSize[0] is the combined size of sentences with 1 keyword, etc. 126 126 for(vector<int>::iterator size = answersSize.begin(); 127 size<answersSize.end(); size++)127 size<answersSize.end(); ++size) 128 128 *size = 0; // initialise sentence size 129 129 … … 140 140 *terms_current); 141 141 if(word!=sentence.end()) 142 { nFound++; totfound++; }143 terms_current++;142 { ++nFound; ++totfound; } 143 ++terms_current; 144 144 } 145 145 … … 152 152 text_t answer; 153 153 for(vector<text_tarray>::iterator sentarray = answers.end()-1; 154 sentarray>=answers.begin(); sentarray--)154 sentarray>=answers.begin(); --sentarray) 155 155 for(text_tarray::iterator sentence = (*sentarray).begin(); 156 sentence < (*sentarray).end(); sentence++) {156 sentence < (*sentarray).end(); ++sentence) { 157 157 answer.append(*sentence); 158 158 if(answer.size()>=summaryLength) … … 182 182 foundPunctuation = true; 183 183 while ((start<end) && (*start!='>')) 184 start++;185 if(start<end) start++;184 ++start; 185 if(start<end) ++start; 186 186 break; 187 187 case '.': … … 189 189 case '?': 190 190 sentence.push_back(*start); 191 start++;191 ++start; 192 192 if(start>=end || 193 193 (is_unicode_space(*start) && (*(start-2)<'A' || *(start-2)>'Z'))) { … … 197 197 default: 198 198 sentence.push_back(*start); 199 start++;199 ++start; 200 200 break; 201 201 } … … 219 219 case '>': // skip over rest of html tag 220 220 while ((start>end) && (*start!='<')) // backtrack to beginning of tag 221 start--;221 --start; 222 222 if(start>end) { 223 223 if(paragraph_tag(start) && has_unicode_letdig(sentence)) 224 224 found2ndPunctuation = true; 225 start--;225 --start; 226 226 } 227 227 break; … … 235 235 sentence.text_as_usvector().insert(sentence.text_as_usvector().begin(), 236 236 start,start+1); 237 start--;237 --start; 238 238 } else 239 239 if(has_unicode_letdig(sentence) || found1stPunctuation) … … 242 242 sentence.text_as_usvector().insert( 243 243 sentence.text_as_usvector().begin(),start,start+1); 244 start--;244 --start; 245 245 found1stPunctuation = true; 246 246 } … … 249 249 sentence.text_as_usvector().insert( 250 250 sentence.text_as_usvector().begin(),start,start+1); 251 start--;251 --start; 252 252 break; 253 253 } … … 260 260 bool paragraph_tag(text_t::iterator start) { 261 261 if(*start=='<') { 262 start++;262 ++start; 263 263 if(*start=='p' || *start=='P') { 264 start++;264 ++start; 265 265 if(is_unicode_space(*start) || *start=='>') 266 266 return true; -
trunk/gsdl/src/recpt/userdb.cpp
r7381 r9620 77 77 // ok 78 78 } else return false; 79 here++;79 ++here; 80 80 } 81 81 … … 95 95 // ok 96 96 } else return false; 97 here++;97 ++here; 98 98 } 99 99 … … 243 243 new_groups.push_back(*here); 244 244 } 245 here++;245 ++here; 246 246 } 247 247 return new_groups; … … 369 369 while (keys_here != keys_end) { 370 370 keydb.deletekey(*keys_here); 371 keys_here++;371 ++keys_here; 372 372 } 373 373 -
trunk/gsdl/src/recpt/usersaction.cpp
r7381 r9620 255 255 } 256 256 257 users_here++;257 ++users_here; 258 258 } 259 259 -
trunk/gsdl/src/recpt/vlistbrowserclass.cpp
r7433 r9620 165 165 166 166 while (thissection != endsection) { 167 item++;167 ++item; 168 168 get_link_icon (*thissection, args, collink, link, icon); 169 169 bool highlight = false; … … 191 191 } 192 192 textout << outconvert << "\n"; 193 thissection ++;193 ++thissection; 194 194 } 195 195 -
trunk/gsdl/src/recpt/z3950proto.cpp
r7607 r9620 57 57 58 58 // append the new server 59 zserver_count++;59 ++zserver_count; 60 60 zservers.push_back(&zserver); 61 61 } … … 192 192 while (here != end) { 193 193 collist.push_back((*here)->getName()); 194 here++;194 ++here; 195 195 } 196 196 } … … 205 205 return; 206 206 } 207 here++;207 ++here; 208 208 } 209 209 hascollection=false; … … 230 230 break; 231 231 } 232 here++;232 ++here; 233 233 } 234 234 … … 327 327 break; 328 328 } 329 zserver++;329 ++zserver; 330 330 } 331 331 // now have collection in zserver. … … 376 376 maxdocs=ov_here->value.getint(); 377 377 } 378 ov_here++;378 ++ov_here; 379 379 } 380 380 err=noError; … … 409 409 docInfo->OID=counter+opt_start-1; 410 410 response.docInfo.push_back(*docInfo); 411 counter++;412 titles_here++;411 ++counter; 412 ++titles_here; 413 413 } 414 414 } … … 502 502 } 503 503 } 504 opthere++;504 ++opthere; 505 505 } 506 506 (*zserver)->getfullrecord(query, querytype, field, i, doctitle, doctext, err); … … 510 510 docs_here->metadata[*fields_here].values.push_back(g_EmptyText); 511 511 } 512 fields_here++;512 ++fields_here; 513 513 } // end of inner while loop 514 docs_here++;514 ++docs_here; 515 515 } // end of outer while loop 516 516 } // end of if (!request.fields.empty()) … … 523 523 response.docInfo[0].metadata[(*colmeta_here).first]. 524 524 values.push_back((*colmeta_here).second); 525 colmeta_here++;525 ++colmeta_here; 526 526 } 527 527 … … 570 570 break; 571 571 } 572 zserver++;572 ++zserver; 573 573 } 574 574 // now have collection in zserver. -
trunk/gsdl/src/recpt/z3950server.cpp
r7381 r9620 130 130 131 131 132 for (int i=0;i<strlength; i++) {132 for (int i=0;i<strlength;++i) { 133 133 if (*(ptr+i)=='"') { // convert " to SPACE... 134 134 *(ptr+i)=' '; … … 137 137 if (inword==false) { 138 138 inword=true; 139 num_terms++;139 ++num_terms; 140 140 } 141 141 } … … 170 170 char *q_type; 171 171 if (querytype==1) q_type=or_str; else q_type=and_str; 172 for (int i=1;i<num_terms; i++)172 for (int i=1;i<num_terms;++i) 173 173 parsed_query+=q_type; 174 174 // append the actual query … … 253 253 } 254 254 last=(int)c_str_titles[0]; 255 for (i=1;i<=last; i++) {255 for (i=1;i<=last;++i) { 256 256 titles->push_back(c_str_titles[i]); 257 257 free(c_str_titles[i]);
Note:
See TracChangeset
for help on using the changeset viewer.