Changeset 9620

Timestamp:

2005-04-11T11:32:00+12:00 (19 years ago)

Author:

kjdon

Message:

added some x++ -> ++x changes submitted by Emanuel Dejanu

Location:

trunk/gsdl/src

Files:

• colservr/browsefilter.cpp (modified) (7 diffs)
• colservr/collectserver.cpp (modified) (14 diffs)
• colservr/collectset.cpp (modified) (14 diffs)
• colservr/expat_resultset.cpp (modified) (1 diff)
• colservr/filter.cpp (modified) (8 diffs)
• colservr/gdbmsource.cpp (modified) (6 diffs)
• colservr/lucenequeryfilter.cpp (modified) (7 diffs)
• colservr/lucenesearch.cpp (modified) (4 diffs)
• colservr/maptools.cpp (modified) (8 diffs)
• colservr/mgppqueryfilter.cpp (modified) (7 diffs)
• colservr/mgppsearch.cpp (modified) (4 diffs)
• colservr/mgqueryfilter.cpp (modified) (10 diffs)
• colservr/mgsearch.cpp (modified) (4 diffs)
• colservr/phrasequeryfilter.cpp (modified) (1 diff)
• colservr/phrasesearch.cpp (modified) (7 diffs)
• colservr/querycache.cpp (modified) (2 diffs)
• colservr/queryfilter.cpp (modified) (1 diff)
• colservr/queryinfo.cpp (modified) (8 diffs)
• recpt/OIDtools.cpp (modified) (1 diff)
• recpt/argdb.cpp (modified) (2 diffs)
• recpt/authenaction.cpp (modified) (1 diff)
• recpt/browseactiontools.cpp (modified) (2 diffs)
• recpt/browsetools.cpp (modified) (8 diffs)
• recpt/cgiargs.cpp (modified) (4 diffs)
• recpt/cgiutils.cpp (modified) (12 diffs)
• recpt/cgiwrapper.cpp (modified) (9 diffs)
• recpt/collectoraction.cpp (modified) (23 diffs)
• recpt/comtypes.cpp (modified) (1 diff)
• recpt/configaction.cpp (modified) (2 diffs)
• recpt/datelistbrowserclass.cpp (modified) (2 diffs)
• recpt/documentaction.cpp (modified) (11 diffs)
• recpt/extlinkaction.cpp (modified) (4 diffs)
• recpt/formattools.cpp (modified) (24 diffs)
• recpt/highlighttext.cpp (modified) (9 diffs)
• recpt/historydb.cpp (modified) (4 diffs)
• recpt/hlistbrowserclass.cpp (modified) (2 diffs)
• recpt/htmlutils.cpp (modified) (2 diffs)
• recpt/infodbclass.cpp (modified) (1 diff)
• recpt/langaction.cpp (modified) (1 diff)
• recpt/pageaction.cpp (modified) (16 diffs)
• recpt/pagedbrowserclass.cpp (modified) (2 diffs)
• recpt/phindaction.cpp (modified) (17 diffs)
• recpt/queryaction.cpp (modified) (18 diffs)
• recpt/querytools.cpp (modified) (11 diffs)
• recpt/recptproto.cpp (modified) (1 diff)
• recpt/statusaction.cpp (modified) (21 diffs)
• recpt/string_pool.cpp (modified) (1 diff)
• recpt/summarise.cpp (modified) (12 diffs)
• recpt/userdb.cpp (modified) (4 diffs)
• recpt/usersaction.cpp (modified) (1 diff)
• recpt/vlistbrowserclass.cpp (modified) (2 diffs)
• recpt/z3950proto.cpp (modified) (11 diffs)
• recpt/z3950server.cpp (modified) (4 diffs)

trunk/gsdl/src/colservr/browsefilter.cpp

@@ -133 +133 @@
     }
 
-    options_here++;
+    ++options_here;
   }
 
@@ -169 +169 @@
     } else tmptext.push_back(*contains_here);
     
-    contains_here++;
+    ++contains_here;
       }
       // insert the last result in the set
@@ -204 +204 @@
             }
           
-          offset_here++;
+          ++offset_here;
         }
           // insert the last result in the set
@@ -223 +223 @@
           while (result_here != result_end) {
         offset_resultset.push_back("0");
-        result_here++;
+        ++result_here;
           }
         }
@@ -243 +243 @@
           intersect_offset_resultset.push_back (*offset_resultset_here);
         }
-          resultset_here ++;
-          offset_resultset_here ++;
+          ++resultset_here;
+          ++offset_resultset_here;
         }
         resultset = intersect_resultset;
@@ -262 +262 @@
       while (result_here != result_end) {
         offset_resultset.push_back("0");
-        result_here++;
+        ++result_here;
       }
     }
@@ -287 +287 @@
     }
 
-    resultnum++;
-    result_here++;
-    if (!md_type.empty()) offset_result_here++;
+    ++resultnum;
+    ++result_here;
+    if (!md_type.empty()) ++offset_result_here;
       }
     }

trunk/gsdl/src/colservr/collectserver.cpp

@@ -43 +43 @@
     if ((*source_here).s != NULL)
       delete (*source_here).s;
-    source_here++;
+    ++source_here;
   }
   sources.clear();
@@ -53 +53 @@
     if ((*filter_here).second.f != NULL) 
       delete (*filter_here).second.f;
-    filter_here++;
+    ++filter_here;
   }
   filters.clear();
@@ -154 +154 @@
 
         collectinfo.public_documents[*begin] = *begin;
-        begin++;
+        ++begin;
          }
        }
@@ -170 +170 @@
         
         collectinfo.private_documents[*begin] = *begin;
-        begin++;
+        ++begin;
          }
        }
@@ -183 +183 @@
       (*filter_here).second.f->configure(key, cfgline);
 
-    filter_here++;
+    ++filter_here;
   }
 
@@ -194 +194 @@
       (*source_here).s->configure(key, cfgline);
     
-    source_here++;
+    ++source_here;
   }
 }
@@ -234 +234 @@
     !(*filter_here).second.f->init(logout)) return false;
     
-    filter_here++;
+    ++filter_here;
   }
 
@@ -245 +245 @@
     !(*source_here).s->init(logout)) return false;
     
-    source_here++;
+    ++source_here;
   }
 
@@ -310 +310 @@
       break;
     }
-    source_here++;
+    ++source_here;
       }
       translatedOIDs.push_back (translatedOID);
@@ -316 +316 @@
       translatedOIDs.push_back (*doc_here);
     }
-    doc_here ++;
+    ++doc_here;
   }
   request.docSet = translatedOIDs;
@@ -347 +347 @@
         break;
       }
-      source_here++;
+      ++source_here;
     }
     if (!processed) {
@@ -353 +353 @@
       return;
     }
-    resultdoc_here++;
+    ++resultdoc_here;
       }
     }
@@ -380 +380 @@
       break;
     }
-    source_here++;
+    ++source_here;
   }
 }
@@ -396 +396 @@
       break;
     }
-    source_here++;
+    ++source_here;
   }
 }

trunk/gsdl/src/colservr/collectset.cpp

@@ -64 +64 @@
       // ignore the modelcol
       if (*thiscol == "modelcol") {
-        thiscol ++;
+        ++thiscol;
         continue;
       }
@@ -163 +163 @@
       cservers.addcollectserver (cserver);
 
-      thiscol ++;
+      ++thiscol;
     }
       }
@@ -178 +178 @@
       delete (*here).second.c;
     }
-    here ++;
+    ++here;
   }
   cservers.clear();
@@ -204 +204 @@
            << configinfo.collection << "\", gsdlhome=\""
            << configinfo.gsdlhome << "\"\n";
-    here ++;
+    ++here;
     continue;
       }
@@ -215 +215 @@
            << configinfo.collection << "\", gsdlhome=\"" 
            << configinfo.gsdlhome << "\"\n";
-    here ++;
+    ++here;
     continue;
       }
@@ -224 +224 @@
       (*here).second.c->configure("httpprefix",httpprefix);
     }
-    here++;
+    ++here;
   }
 
@@ -248 +248 @@
       // ignore the modelcol
       if (*thiscol == "modelcol") {
-    thiscol ++;
+    ++thiscol;
     continue;
       }
@@ -255 +255 @@
       this->add_collection (*thiscol, gsdlhome);
     
-      thiscol ++;
+      ++thiscol;
     }
   }
@@ -275 +275 @@
       break;
     }
-    here ++;
+    ++here;
   }
       
@@ -395 +395 @@
       delete (*here).second.c;
     }
-    here ++;
+    ++here;
   }
   cservers.clear();
@@ -426 +426 @@
       return;
     }
-    here ++;
+    ++here;
   }
   outconvertclass text_t2ascii;
@@ -453 +453 @@
     }
 
-    here++;
+    ++here;
   }
 }
@@ -468 +468 @@
       collist.push_back ((*here).second.c->get_collection_name());
     }
-    here++;
+    ++here;
   }
 }
@@ -485 +485 @@
     recpt.configure("collectinfo", colinfo);
 
-    here++;
-  }
-}
+    ++here;
+  }
+}

trunk/gsdl/src/colservr/expat_resultset.cpp

@@ -69 +69 @@
       queryresult_ptr->docs.docset[doc.docnum] = doc;
       queryresult_ptr->docs.docorder.push_back(doc.docnum);
-      qrpack_ptr->match_count++;
+      ++qrpack_ptr->match_count;
 
       free(id);

trunk/gsdl/src/colservr/filter.cpp

@@ -67 +67 @@
     (*filteroption_here).second.check_defaultValue ();
     
-    filteroption_here++;
+    ++filteroption_here;
   }
 
@@ -111 +111 @@
       response.docInfo.push_back(resultdoc);
 
-      here++;
+      ++here;
     }
   }
@@ -174 +174 @@
   while ((t1_here != t1_end) && (t2_here != t2_end)) {
     if (*t1_here != *t2_here) return 0; // unrelated
-    t1_here++;
-    t2_here++;
+    ++t1_here;
+    ++t2_here;
   }
 
@@ -205 +205 @@
       // equal
       resultset.insert (*set1_here);
-      set1_here++;
-      set2_here++;
+      ++set1_here;
+      ++set2_here;
 
     } else if ((childcomp=child_compare(*set1_here, *set2_here)) != 0) {
@@ -212 +212 @@
     // set1_here is child
     resultset.insert (*set1_here);
-    set1_here++;
+    ++set1_here;
       } else {
     // set2_here is child
     resultset.insert (*set2_here);
-    set2_here++;
+    ++set2_here;
       }
 
     } else if (*set1_here < *set2_here) {
       // set1 is less
-      set1_here++;
+      ++set1_here;
 
     } else {
       // set2 is less
-      set2_here++;
+      ++set2_here;
     }
   }
@@ -241 +241 @@
     if (in_set (set2, *set1_here))
       resultset.push_back (*set1_here);
-    set1_here ++;
+    ++set1_here;
   }
   set1 = resultset;
@@ -255 +255 @@
     if (in_set (set2, *set1_here))
       resultset.push_back (*set1_here);
-    set1_here ++;
+    ++set1_here;
   }
   set1 = resultset;
@@ -303 +303 @@
     while (h != e) {
       if (*h == tryel) return true;
-      h++;
+      ++h;
     }
   } while (here != end);

trunk/gsdl/src/colservr/gdbmsource.cpp

@@ -205 +205 @@
 
     info_array.push_back(info);
-    this_OID ++;
+    ++this_OID;
   }
 
@@ -216 +216 @@
       if ((*t_info).first != "contains")
     tfields.insert ((*t_info).first);
-      t_info ++;
+      ++t_info;
     }
     tfields.insert ("hasnext");
@@ -270 +270 @@
         else hasprevious = true;
         
-        parentcontents_here++;
+        ++parentcontents_here;
         
         if (parentcontents_here == parentcontents.end()) hasnext = false;
@@ -278 +278 @@
           }  
           
-          parentcontents_here ++;
+          ++parentcontents_here;
         }
      
@@ -297 +297 @@
     tmetaptr->values.push_back("");
 
-      this_info ++;
+      ++this_info;
       if (this_info != end_info) {
     tmetaptr->parent = new MetadataInfo_t();
@@ -304 +304 @@
     }
     metadata[*fields_here] = this_metadata;
-    fields_here++;
+    ++fields_here;
   }
   return true;

trunk/gsdl/src/colservr/lucenequeryfilter.cpp

@@ -90 +90 @@
     }
       }
-      here++;
+      ++here;
     }
   } else if (key == "indexlevels") {
@@ -105 +105 @@
     filterOptions["Level"].validValues.push_back(*here);
       }
-      here ++;
+      ++here;
     }
   } else if (key == "textlevel") {
@@ -200 +200 @@
       }
       
-      resultnum++;
+      ++resultnum;
     }
       } // else
       
-      docorder_here++;
+      ++docorder_here;
     }
   } // if need matching docs
@@ -229 +229 @@
     while (termvariants_here != termvariants_end) {
       terminfo.matchTerms.push_back (*termvariants_here);
-      termvariants_here++;
+      ++termvariants_here;
     }
       }
@@ -236 +236 @@
       response.termInfo.push_back (terminfo);
 
-      terms_here++;
+      ++terms_here;
     }
   }
@@ -291 +291 @@
     response.termInfo.push_back (terminfo);
 
-    terms_here++;
+    ++terms_here;
   }
   
@@ -365 +365 @@
       while (termvar_here != termvar_end) {
     multiresults.termvariants.insert(*termvar_here);
-    termvar_here++;
+    ++termvar_here;
       }
     }
    
-    query_here++;
+    ++query_here;
   }
 

trunk/gsdl/src/colservr/lucenesearch.cpp

@@ -213 +213 @@
 
   docresultclass doc;
-  for (int i=0; i<(int)queryResult.docs.size(); i++) {
+  for (int i=0; i<(int)queryResult.docs.size(); ++i) {
     doc.clear();
     doc.docnum = (int)queryResult.levels[i];
@@ -224 +224 @@
   // term info
   termfreqclass term;
-  for (int k=0; k<(int)queryResult.termFreqs.size(); k++) {
+  for (int k=0; k<(int)queryResult.termFreqs.size(); ++k) {
     term.clear();
     char* termfreq_cstr=GetCStr(queryResult.termFreqs[k].term);
@@ -235 +235 @@
     queryresult.orgterms.push_back(term); // should this change??
     
-    for (int j=0; j<(int)queryResult.termFreqs[k].equivTerms.size(); j++) {
+    for (int j=0; j<(int)queryResult.termFreqs[k].equivTerms.size(); ++j) {
       char* equivterm_cstr=GetCStr(queryResult.termFreqs[k].equivTerms[j]);
       queryresult.termvariants.insert(to_uni(equivterm_cstr));
@@ -288 +288 @@
   // load results into term info
   termfreqclass term;
-  for (int i=0; i<(int)browseResult.termFreqs.size(); i++) {
+  for (int i=0; i<(int)browseResult.termFreqs.size(); ++i) {
     term.clear();
     char* term_cstr = GetCStr(browseResult.termFreqs[i].term);

trunk/gsdl/src/colservr/maptools.cpp

@@ -45 +45 @@
     fromorder.push_back (from);
     mapfrom[from] = to;
-    here++;
+    ++here;
   }
 }
@@ -64 +64 @@
     }
 
-    here++;
+    ++here;
   }
 }
@@ -84 +84 @@
       toarray.push_back((*toptr).second);
     }
-    here++;
+    ++here;
   }
 }
@@ -100 +100 @@
     toptr = mapfrom.find (*here);
     if (toptr != mapfrom.end() && (*toptr).second == to) return true;
-    here++;
+    ++here;
   }
   
@@ -129 +129 @@
       return true;
     }
-    here++;
+    ++here;
   }
   
@@ -149 +149 @@
   while (here != end) {
     if (*here == '-') {
-      here++;
+      ++here;
       if (here != end && *here == '>') {
-    here++;
+    ++here;
     break; // found "->"
       }
@@ -160 +160 @@
     } else {
       from.push_back(*here);
-      here++;
+      ++here;
     }
   }
@@ -167 +167 @@
   while (here != end) {
     to.push_back(*here);
-    here++;
+    ++here;
   }
 }

trunk/gsdl/src/colservr/mgppqueryfilter.cpp

@@ -90 +90 @@
     }
       }
-      here++;
+      ++here;
     }
     
@@ -107 +107 @@
     filterOptions["Level"].validValues.push_back(*here);
       }
-      here ++;
+      ++here;
     }
   } else if (key == "textlevel") {
@@ -203 +203 @@
       }
       
-      resultnum++;
+      ++resultnum;
     }
       } // else
       
-      docorder_here++;
+      ++docorder_here;
     }
   } // if need matching docs
@@ -232 +232 @@
     while (termvariants_here != termvariants_end) {
       terminfo.matchTerms.push_back (*termvariants_here);
-      termvariants_here++;
+      ++termvariants_here;
     }
       }
@@ -239 +239 @@
       response.termInfo.push_back (terminfo);
 
-      terms_here++;
+      ++terms_here;
     }
   }
@@ -294 +294 @@
     response.termInfo.push_back (terminfo);
 
-    terms_here++;
+    ++terms_here;
   }
   
@@ -368 +368 @@
       while (termvar_here != termvar_end) {
     multiresults.termvariants.insert(*termvar_here);
-    termvar_here++;
+    ++termvar_here;
       }
     }
    
-    query_here++;
+    ++query_here;
   }
 

trunk/gsdl/src/colservr/mgppsearch.cpp

@@ -167 +167 @@
 
   docresultclass doc;
-  for (int i=0; i<(int)queryResult.docs.size(); i++) {
+  for (int i=0; i<(int)queryResult.docs.size(); ++i) {
     doc.clear();
     doc.docnum = (int)queryResult.levels[i];
@@ -178 +178 @@
   // term info
   termfreqclass term;
-  for (int k=0; k<(int)queryResult.termFreqs.size(); k++) {
+  for (int k=0; k<(int)queryResult.termFreqs.size(); ++k) {
     term.clear();
     char* termfreq_cstr=GetCStr(queryResult.termFreqs[k].term);
@@ -189 +189 @@
     queryresult.orgterms.push_back(term); // should this change??
     
-    for (int j=0; j<(int)queryResult.termFreqs[k].equivTerms.size(); j++) {
+    for (int j=0; j<(int)queryResult.termFreqs[k].equivTerms.size(); ++j) {
       char* equivterm_cstr=GetCStr(queryResult.termFreqs[k].equivTerms[j]);
       queryresult.termvariants.insert(to_uni(equivterm_cstr));
@@ -246 +246 @@
   // load results into term info
   termfreqclass term;
-  for (int i=0; i<(int)browseResult.termFreqs.size(); i++) {
+  for (int i=0; i<(int)browseResult.termFreqs.size(); ++i) {
     term.clear();
     char* term_cstr = GetCStr(browseResult.termFreqs[i].term);

trunk/gsdl/src/colservr/mgqueryfilter.cpp

@@ -114 +114 @@
     if (!foundbreak && !start) {
       tmpterms.push_back (orgterms[termcount]);
-      termcount ++;
+      ++termcount;
     }
     if (tmpterms.size() > 1) {
@@ -128 +128 @@
     if (foundquote)
       tmpterms.push_back (orgterms[termcount]);
-    termcount ++;
+    ++termcount;
       }
       foundbreak = true;
@@ -135 +135 @@
       foundbreak = false;
     }      
-    here++;
+    ++here;
   }
 }
@@ -170 +170 @@
                  longindex, queryparams.collection, *this_phrase,
                  (*docs_here).second.docnum)) {
-        (*docs_here).second.num_phrase_match++;
+        ++docs_here->second.num_phrase_match;
       }
     
-      docs_here++;
-    }
-    this_phrase++;
+      ++docs_here;
+    }
+    ++this_phrase;
       }
     }
@@ -251 +251 @@
       while (termvar_here != termvar_end) {
     multiresults.termvariants.insert(*termvar_here);
-    termvar_here++;
+    ++termvar_here;
       }
     }
    
-    query_here++;
+    ++query_here;
   }
 
@@ -369 +369 @@
       break;
     }
-    numdocs ++;
-    docorder_here ++;
+    ++numdocs;
+    ++docorder_here;
       }
     }
@@ -405 +405 @@
       }
       
-      resultnum++;
+      ++resultnum;
     }
       }
       
-      docorder_here++;
+      ++docorder_here;
     }
   }
@@ -431 +431 @@
     while (termvariants_here != termvariants_end) {
       terminfo.matchTerms.push_back (*termvariants_here);
-      termvariants_here++;
+      ++termvariants_here;
     }
       }
@@ -438 +438 @@
       response.termInfo.push_back (terminfo);
 
-      terms_here++;
+      ++terms_here;
     }
   }
@@ -518 +518 @@
           new_querystring.push_back (*here);
         }
-        here ++;
+        ++here;
       }
       (*query_here).querystring = new_querystring;
     }
 #endif
-    query_here ++;
+    ++query_here;
   }
 }

trunk/gsdl/src/colservr/mgsearch.cpp

@@ -86 +86 @@
   while (len < maxstemlen && here != end) {
     word_stem[len+1] = (unsigned char)(*here);
-    len++; here++;
+    ++len; ++here;
   }
   word_stem[len+1] = '\0';
@@ -155 +155 @@
   while (len < maxstemlen && here != end) {
     word_stem[len+1] = (unsigned char)(*here);
-    len++; here++;
+    ++len; ++here;
   }
   word_stem[len+1] = '\0';
@@ -470 +470 @@
     (*ithere != '&') && (*ithere != '|') && (*ithere != '(') &&
     (*ithere != ')')) (*ithere) = ' ';
-    ithere++;
+    ++ithere;
   }
 }
@@ -501 +501 @@
   while (mgdoc_here < mgdoc_end) {
     if (*mgdoc_here == '\x3') *mgdoc_here = ' ';
-    mgdoc_here++;
+    ++mgdoc_here;
   }
 

trunk/gsdl/src/colservr/phrasequeryfilter.cpp

@@ -51 +51 @@
                  longindex, queryparams.collection, queryresults.orgterms,
                  (*docs_here).second.docnum)) {
-    (*docs_here).second.num_phrase_match++;
-    docs_here++;
+    ++docs_here->second.num_phrase_match;
+    ++docs_here;
 
       } else {
     docresultmap::iterator this_doc_here = docs_here;
-    docs_here++;
+    ++docs_here;
     if (queryparams.match_mode == 1) {
       // need to delete this element, there was no exact match

trunk/gsdl/src/colservr/phrasesearch.cpp

@@ -55 +55 @@
     // this is in a word
     word.push_back(*here);
-    here++; c_len--;
+    ++here; --c_len;
       }
       break;
@@ -71 +71 @@
     while (c_len > 0) {
       word.push_back(*here);
-      here++; c_len--;
+      ++here; --c_len;
     }
   }
@@ -99 +99 @@
       tmptext.clear();
     } else tmptext.push_back(*contains_here);
-    contains_here++;
+    ++contains_here;
   }
   if (!tmptext.empty()) contains.push_back (tmptext);
@@ -107 +107 @@
   while (here != end) {
     get_all_docnums (gdbm, *here, docnum_list);
-    here ++;
+    ++here;
   }
 }
@@ -147 +147 @@
       (*phrase_here).utf8equivterms.end()) break;
 
-      phrase_here++;
+      ++phrase_here;
     } while (doc_here <= doc_end && phrase_here != phrase_end);
 
@@ -209 +209 @@
       fulldoc.appendcstr (doc);
     }
-    this_docnum ++;
+    ++this_docnum;
       }
       doc = fulldoc.getcstr();
@@ -251 +251 @@
     
     if (result) return true;
-    subvalue_here++;
-      }
-    }
-    keyhere ++;
+    ++subvalue_here;
+      }
+    }
+    ++keyhere;
   }
   return result;

trunk/gsdl/src/colservr/querycache.cpp

@@ -59 +59 @@
   int i;
 
-  for (i=0; i < maxcachesize; i++)
+  for (i=0; i < maxcachesize; ++i)
     {
       if (resultcache[i].queryparameters == queryparams)
@@ -93 +93 @@
   int minaccessi = 0;
   
-  for (i=0; i < maxcachesize; i++)
+  for (i=0; i < maxcachesize; ++i)
     {
       if (resultcache[i].accessnum < minaccessnum) {

trunk/gsdl/src/colservr/queryfilter.cpp

@@ -153 +153 @@
     }
 
-    options_here++;
+    ++options_here;
   }
 

trunk/gsdl/src/colservr/queryinfo.cpp

@@ -248 +248 @@
   while (here != end) {
     docorder.push_back ((*here).first);
-    here++;
+    ++here;
   }
 }
@@ -267 +267 @@
       tempresults[(*found).first] = (*found).second;
     }
-    d_here++;
+    ++d_here;
   }
 
@@ -287 +287 @@
       docset[(*d_here).first] = (*d_here).second;
     }
-    d_here++;
+    ++d_here;
   }
 }
@@ -300 +300 @@
    found = docset.find((*d_here).first);
    if (found != docset.end()) docset.erase (found);
-   d_here++;
+   ++d_here;
  }
 }
@@ -361 +361 @@
       seenterms.insert((*here).termstr);
     }
-    here++;
+    ++here;
   }
 
@@ -378 +378 @@
   while (docshere != docsend) {
     outs << (*docshere).second;
-    docshere++;
+    ++docshere;
   }
 
@@ -386 +386 @@
   while (orgtermshere != orgtermsend) {
     outs << (*orgtermshere);
-    orgtermshere++;
+    ++orgtermshere;
   }
 
@@ -394 +394 @@
   while (termshere != termsend) {
     outs << (*termshere);
-    termshere++;
+    ++termshere;
   }
 

trunk/gsdl/src/recpt/OIDtools.cpp

@@ -239 +239 @@
     OID.pop_back();
     if (*here == '.') break;
-    here --;
+    --here;
   }
   return OID;

trunk/gsdl/src/recpt/argdb.cpp

@@ -49 +49 @@
       info.setinfo((*here).first, (*here).second);
     }
-    here ++;
+    ++here;
   }
 
@@ -69 +69 @@
   while (here != end) {
     argmap[(*here).first] = info[(*here).first];
-    here ++;
+    ++here;
   }
   argdb.closedatabase();

trunk/gsdl/src/recpt/authenaction.cpp

@@ -332 +332 @@
     "\" value=\"_cgiarg" + (*args_here).first + "_\">\n";
     }
-    args_here++;
+    ++args_here;
   }
 

trunk/gsdl/src/recpt/browseactiontools.cpp

@@ -44 +44 @@
     if(!isspace(*here)){
       formatted.push_back(*here);
-      here++;
+      ++here;
     }
     //else, if seeing spaces, check that there is following text and add
     //the ncessary conjugation if there is.
     else if(isspace(*here)){
-      while(isspace(*here) && here!=end) here++;
+      while(isspace(*here) && here!=end) ++here;
       if(here!=end) formatted += conj;
     }
@@ -116 +116 @@
     else {
      
-      check ++;
+      ++check;
      
     }

trunk/gsdl/src/recpt/browsetools.cpp

@@ -79 +79 @@
       buttons.push_back ("_document:imageexpandtext_");
       }
-      here ++;
+      ++here;
     }
     
@@ -88 +88 @@
       if ((count != 0) && ((count % 2) == 0)) textout<< outconvert << "<br>\n";
       textout << outconvert << disp << *here;
-      count ++;
-      here ++;
+      ++count;
+      ++here;
     }
   }
@@ -231 +231 @@
             formatlistptr, formatlistmap, formatinfo, browsermap, 
             tabcount, collectproto, disp, outconvert, textout, logout);
-      thisdoc ++;
+      ++thisdoc;
     }
   }
@@ -343 +343 @@
   while (here != end) {
     delete (*here).second;
-    here ++;
+    ++here;
   }
 }
@@ -396 +396 @@
       cache.insert (childtype);
     }
-    thisdoc ++;
+    ++thisdoc;
   }
 }
@@ -445 +445 @@
                         disp, outconvert, textout, logout);
     first = false;
-    thisparent ++;
+    ++thisparent;
   }
 }
@@ -509 +509 @@
     while (here != end) {
       delete (*here).second;
-      here ++;
+      ++here;
     }
   }
@@ -756 +756 @@
             }
 
-            thissibling ++;
+            ++thissibling;
         }
     }

trunk/gsdl/src/recpt/cgiargs.cpp

@@ -122 +122 @@
     outs << text_t2utf8 << " \"" << (*here).first << "\"=\"" << 
       (*here).second.value << "\"\n";
-    here++;
+    ++here;
   }
   outs << "\n";
@@ -258 +258 @@
   while (here != end) {
     if (!addarginfo (logout, (*here).second)) return false;
-    here++;
+    ++here;
   }
   
@@ -294 +294 @@
       (*logout) << ("Invalid argument for cgiarg for " + argshortname + " (" + thisInfo->first + ")\n");
     }
-    thisInfo++;
+    ++thisInfo;
   }
   return true;
@@ -305 +305 @@
   while (thisArg != endArg) {
     if (!addarginfo(logout, thisArg->first, thisArg->second)) return false;
-    thisArg++;
+    ++thisArg;
   }
   return true;

trunk/gsdl/src/recpt/cgiutils.cpp

@@ -89 +89 @@
       text_t utf8=to_utf8(uni);
       int last_byte=utf8.size()-1;
-      for (int i=0;i<last_byte;i++)
+      for (int i=0;i<last_byte;++i)
         *out++ = utf8[i];
       c=utf8[last_byte];
@@ -103 +103 @@
     } else *out = *in;
     
-    if (in != end) in++;
-    out++;
+    if (in != end) ++in;
+    ++out;
   }
   
@@ -163 +163 @@
     if (*here == ',') outtext += "%2C";
     else outtext.push_back (*here);
-    here ++;
+    ++here;
   }
   return outtext;
@@ -182 +182 @@
       
     }else outtext.push_back (*here);
-    here ++;
+    ++here;
   }
   return outtext;
@@ -197 +197 @@
     if (*here == '-') outtext += "Zz-";
     else outtext.push_back (*here);
-    here ++;
+    ++here;
   }
   outtext = cgi_safe (outtext);
@@ -244 +244 @@
     }
     
-    here++;
+    ++here;
   }
   
@@ -319 +319 @@
     }
 
-    argsinfohere++;
+    ++argsinfohere;
   }
   
@@ -347 +347 @@
     }
 
-    argsinfohere++;
+    ++argsinfohere;
   }
   
@@ -407 +407 @@
           if (!((*sav == 'Z') && (*(sav+1) == 'z') && (*(sav+2) == '-')) &&
           !((*(sav-1) == 'Z') && (*sav == 'z') && (*(sav+1) == '-'))) argvalue.push_back (*sav);
-          sav ++;
+          ++sav;
         }
         first = false;
@@ -416 +416 @@
     } else {
       args.setdefaultcarg (argname,*arg_ehere, cgiarg_t::compressed_arg);
-      arg_ehere++;
+      ++arg_ehere;
     }
       }
@@ -439 +439 @@
               (*argsinfohere).second.argdefault, cgiarg_t::default_arg);
     }
-    argsinfohere++;
+    ++argsinfohere;
   }
 }
@@ -532 +532 @@
     }
     
-    here++;
+    ++here;
   }
 }

trunk/gsdl/src/recpt/cgiwrapper.cpp

@@ -79 +79 @@
   if (other_ostream != NULL) {
     char *thepbase=pbase();
-    for (int i=0;i<out_waiting();i++) (*other_ostream).put(thepbase[i]);
+    for (int i=0;i<out_waiting();++i) (*other_ostream).put(thepbase[i]);
   }
   
@@ -336 +336 @@
     if (spaces < 2) spaces = 2;
     text_t outspaces;
-    for (int i = 0; i < spaces; i++) outspaces.push_back (' ');
+    for (int i = 0; i < spaces; ++i) outspaces.push_back (' ');
     cout << text_t2ascii << outspaces;
 
@@ -361 +361 @@
       cout << text_t2ascii << "NOT FOUND\n";
 
-    this_mfile ++;
+    ++this_mfile;
   }
 
@@ -403 +403 @@
     if (spaces < 2) spaces = 2;
     text_t outspaces;
-    for (int i = 0; i < spaces; i++) outspaces.push_back (' ');
+    for (int i = 0; i < spaces; ++i) outspaces.push_back (' ');
     cout << text_t2ascii << outspaces;
     
@@ -421 +421 @@
       cout << "\n";
 
-      collist_here ++;
+      ++collist_here;
       }
     }
     is_z3950=false;
-    rprotolist_here ++;
+    ++rprotolist_here;
   } // end of while loop
 
@@ -479 +479 @@
       if (cin.eof()) break;
       argstr.push_back (c);
-      content_length--;
+      --content_length;
     } while (content_length > 0);
       }
@@ -586 +586 @@
         if (c < 0) break;
         argstr.push_back (c);
-        content_length--;
+        --content_length;
       } while (content_length > 0);
     }
@@ -616 +616 @@
 #ifdef USE_FASTCGI
     if (isfastcgi) {
-      for(; *fcgienvp != NULL; fcgienvp++) {
+      for(; *fcgienvp != NULL; ++fcgienvp) {
     text_t fvalue = *fcgienvp;
     text_t::const_iterator begin = fvalue.begin();
@@ -697 +697 @@
 #endif
 
-    numrequests++;
+    ++numrequests;
   }
 

trunk/gsdl/src/recpt/collectoraction.cpp

@@ -361 +361 @@
     (*here).second = args[(*here).first];
       }
-      here++;
+      ++here;
     }
 
@@ -384 +384 @@
     args[(*here).first] = (*here).second;
       }
-      here ++;
+      ++here;
     }
   }
@@ -453 +453 @@
         file_copy (filename_cat(clone_etc, *here), filename_cat(new_etc, *here));
       }
-      here ++;
+      ++here;
     }
       } else {
@@ -612 +612 @@
     while (this_line != end_line) {
       write_cfg_line (fd, *this_line);
-      this_line ++;
+      ++this_line;
     }
     GSDL_UNLOCK_FILE (fd);
@@ -788 +788 @@
       comerror_t err = noError;
       if ((*rprotolist_here).p->get_protocol_name (err) == "z3950proto") {
-    rprotolist_here ++;
+    ++rprotolist_here;
     continue;
       }
@@ -822 +822 @@
           selected_index = index;       
         }
-        index ++;
+        ++index;
       }
-      collist_here ++;
+      ++collist_here;
     }
       }
     }
-    rprotolist_here ++;
+    ++rprotolist_here;
   }
 
@@ -841 +841 @@
     fullnamemenu += "_collector:textdefaultstructure_\n";
   }
-  for (int i = 0; i < index; i ++) {
+  for (int i = 0; i < index; ++i) {
     // don't want write protected collections in list on "change existing
     // collection" page
@@ -849 +849 @@
     (is_selected && i == selected_index)) {
       fullnamemenu += " selected";
-      selected_index++;
+      ++selected_index;
       is_selected = false;
     }
@@ -904 +904 @@
     text_tarray::iterator b = inputvalues.begin();
     while ((*l).empty() && l >= b) {
-      l--;
+      --l;
     }
     inputvalues.erase(l+1, inputvalues.end());
@@ -917 +917 @@
   text_t last = "file://";
   text_t rv;
-  for (int i = 0; i < numboxes; i++) {
+  for (int i = 0; i < numboxes; ++i) {
     rv += "<nobr><select name=\"bc1inputtype\">\n";
     rv += "<option value=\"file://\"";
@@ -1197 +1197 @@
       if (*here == '\n') faillog += "<br>";
       faillog.push_back (*here);
-      here ++;
+      ++here;
     }
     disp.setmacro ("faillog", "collector", dm_safe(faillog));
@@ -1456 +1456 @@
     if (sw == 0) {
       if (*here == '\n') {
-    if ((here+1) != end && *(here+1) == '\r') here ++;
+    if ((here+1) != end && *(here+1) == '\r') ++here;
     outtext += "\\n";
       } else if (*here == '\r') {
-    if ((here+1) != end && *(here+1) == '\n') here ++;
+    if ((here+1) != end && *(here+1) == '\n') ++here;
     outtext += "\\n";
       } else {
@@ -1466 +1466 @@
     } else if (*here == '\\' && (here+1) != end && *(here+1) == 'n') {
       outtext.push_back ('\n');
-      here ++;
+      ++here;
     } else {
       outtext.push_back (*here);
     }
-    here ++;
+    ++here;
   }
   return outtext;
@@ -1493 +1493 @@
     if (*here >= 'A' && *here <= 'Z') shortname.push_back (*here+32);
     else if (*here == ' ') {
-      while ((*(here+1)) == ' ') here ++;
+      while ((*(here+1)) == ' ') ++here;
       shortname.push_back (*here);
     } else shortname.push_back (*here);
       }
-      here ++;
+      ++here;
     }
 
@@ -1513 +1513 @@
       unsigned int substr_len = 6 / use_words;
       
-      for (int i = 0; i < use_words; i++) {
+      for (int i = 0; i < use_words; ++i) {
     if (words[i].size() < substr_len) shortname += words[i];
     else shortname += substr (words[i].begin(), words[i].begin()+substr_len);
@@ -1526 +1526 @@
     text_t newname;
     do {
-      version ++;
+      ++version;
       newname = shortname;
       newname.push_back ('v');
@@ -1555 +1555 @@
   text_t tmpname = "tbuild";
   while (directory_exists (filename_cat (gsdlhome, "tmp", tmpname + text_t(i)))) {
-    i++;
+    ++i;
   }
   tmpname.appendint (i);
@@ -1703 +1703 @@
   int numvalues = inputvalues.size();
   int numtypes = inputtypes.size();
-  for (int i = 0; i < numvalues; i++) {
+  for (int i = 0; i < numvalues; ++i) {
     if (!inputvalues[i].empty()) {
       text_t type = "file://"; // default
@@ -1811 +1811 @@
         found = true;
       }
-      hp ++;
+      ++hp;
     }
     text_tset::const_iterator it = pluginset.find (pluginname);
@@ -1817 +1817 @@
     pluginname.clear();
       }
-      here ++;
+      ++here;
     }
   }
@@ -1847 +1847 @@
       }
     }
-    rprotolist_here ++;
+    ++rprotolist_here;
   }
 
@@ -1869 +1869 @@
       }
     }
-    rprotolist_here ++;
+    ++rprotolist_here;
   }
 
@@ -1917 +1917 @@
   int numtypes = inputtypes.size();
 
-  for (int i = 0; i < numvalues; i++) {
+  for (int i = 0; i < numvalues; ++i) {
     text_t value = format_url(decode_commas(inputvalues[i]));
     text_t type = "file://"; // default

trunk/gsdl/src/recpt/comtypes.cpp

@@ -108 +108 @@
     while (here != end) {
       if (*here == defaultValue) return;
-      here++;
+      ++here;
     }
     

trunk/gsdl/src/recpt/configaction.cpp

@@ -124 +124 @@
       }
     }
-    rprotolist_here ++;
+    ++rprotolist_here;
   }
 
@@ -146 +146 @@
       }
     }
-    rprotolist_here ++;
+    ++rprotolist_here;
   }
 

trunk/gsdl/src/recpt/datelistbrowserclass.cpp

@@ -102 +102 @@
 
     // bail on this document if it has no date
-    if (date.empty()) { thissection++; continue; }
+    if (date.empty()) { ++thissection; continue; }
 
     text_t::const_iterator datebegin = date.begin();
     int datesize = date.size();
     
-    if (datesize < 4) { thissection++; continue; }
+    if (datesize < 4) { ++thissection; continue; }
     text_t thisyear = substr (datebegin, datebegin+4);
     text_t thismonth = "00";
@@ -159 +159 @@
     textout << outconvert << "</tr>\n";
     
-    thissection ++;
+    ++thissection;
   }
 

trunk/gsdl/src/recpt/documentaction.cpp

@@ -342 +342 @@
       disp.expandstring ("document", "_defaultwidth_", width);
     iwidth += width.getint();
-    dochere ++;
+    ++dochere;
   }
   if ((twidth - iwidth) < numc) swidth = 2;
@@ -425 +425 @@
         }
      }
-     dochere ++;
+     ++dochere;
      first = false;
       }
@@ -467 +467 @@
      }
      navigationbar += ">" + title + "</option>\n";
-     dochere++;
+     ++dochere;
       }
 
@@ -627 +627 @@
       
       // don't need to check current collection again
-      if (*col_here == args["c"]) {col_here ++; continue;}
+      if (*col_here == args["c"]) {++col_here; continue;}
       
       collectproto = protos->getrecptproto (*col_here, logout);
@@ -638 +638 @@
     }
       }
-      col_here ++;
+      ++col_here;
     }
   }
@@ -684 +684 @@
       formatinfo.formatstrings[(*format_here).first] = (*format_here).second;
     
-    format_here ++;
+    ++format_here;
   }
 
@@ -890 +890 @@
       while (a != b) {
         if (*a == 46) collage = false;
-        a++;
+        ++a;
       }
 
@@ -1166 +1166 @@
     while (sechere != secend) {
       int shastxt = (*sechere).metadata["hastxt"].values[0].getint();
-      if (shastxt == 1) seccount ++;
+      if (shastxt == 1) ++seccount;
       if (seccount > 10) break;
-      sechere ++;
+      ++sechere;
     }
     if (seccount > 10) {
@@ -1195 +1195 @@
                (*sechere).OID, highlight, shastxt, wanttext, collection, 
                collectproto, browsers, disp, outconvert, textout, logout, args);
-      count ++;
-      sechere ++;
+      ++count;
+      ++sechere;
     }
       }
@@ -1261 +1261 @@
     break;
       }
-      this_sibling++;
+      ++this_sibling;
       first = false;
     }
     thisoid = get_parent(thisoid);
-    parentcount--;
+    --parentcount;
   }
 
@@ -1281 +1281 @@
     break;
       }
-      h++;
+      ++h;
     }
   }

trunk/gsdl/src/recpt/extlinkaction.cpp

@@ -159 +159 @@
       
       // don't need to check current collection again
-      if (*col_here == thiscollection) {col_here ++; continue;}
+      if (*col_here == thiscollection) {++col_here; continue;}
       
       recptproto *collectproto = protos->getrecptproto (*col_here, logout);
-      if (collectproto == NULL) {col_here ++; continue;}
+      if (collectproto == NULL) {++col_here; continue;}
 
       if (get_info (arg_href, *col_here, args["l"], metadata, false, collectproto, response, logout)) {
@@ -171 +171 @@
         }
       }
-      col_here ++;
+      ++col_here;
     }
       }
@@ -214 +214 @@
     
     // don't need to check current collection
-    if (*col_here == args["c"]) {col_here ++; continue;}
+    if (*col_here == args["c"]) {++col_here; continue;}
     
     recptproto *collectproto = protos->getrecptproto (*col_here, logout);
@@ -235 +235 @@
       }
     }
-    col_here ++;
+    ++col_here;
       }
     }

trunk/gsdl/src/recpt/formattools.cpp

@@ -110 +110 @@
       } else return false;
     }
-    here ++;
+    ++here;
   }
   return false;
@@ -373 +373 @@
   text_t::const_iterator end = link.end();
   
-  here ++;
+  ++here;
   while (here != end) {
     if (*here == '"') break;
     href.push_back(*here);
-    here ++;
+    ++here;
   }
 
@@ -436 +436 @@
     text_tarray::const_iterator doc_data = relationdata.begin();
     text_t document_collection = *doc_data;
-    doc_data++; //increment to get next item in array (oid)
+    ++doc_data; //increment to get next item in array (oid)
     text_t document_OID = *doc_data;
     
@@ -461 +461 @@
     relation += "  (" + document_collection + ")<br>";
     
-    currDoc++;
+    ++currDoc;
       }
     }
@@ -495 +495 @@
     else if (inquotes) op.push_back (*here);
     else com.push_back (*here);
-    here ++;
+    ++here;
   }
 
@@ -530 +530 @@
     else if (inquotes) op.push_back (*here);
     else com.push_back (*here);
-    here ++;
+    ++here;
   }
 
@@ -565 +565 @@
     else if (inquotes) op.push_back (*here);
     else com.push_back (*here);
-    here ++;
+    ++here;
   }
 
@@ -694 +694 @@
 
     if (*here == '\\') {
-      here ++;
+      ++here;
       if (here != end) text.push_back (*here);
 
@@ -722 +722 @@
       }
       text_t meta;
-      here ++;
+      ++here;
       while (*here != ']') {
     if (here == end) return false;
     meta.push_back (*here);
-    here ++;
+    ++here;
       }
       parse_meta (meta, formatlistptr, metadata, getParents);
@@ -735 +735 @@
       text.push_back (*here);
 
-    if (here != end) here ++;
+    if (here != end) ++here;
   }
   if (!text.empty()) {
@@ -757 +757 @@
   here = findchar (it, end, '{');
   if (here == end) return false;
-  else here ++;
+  else ++here;
 
   if (com == "If" || com == "if" || com == "IF") formatlistptr->command = comIf;
@@ -838 +838 @@
         text_t meta = substr (beginbracket+1, endbracket);
         parse_meta (meta, formatlistptr->decision.meta, metadata, getParents);
-        commacount ++;
+        ++commacount;
         text.clear();
       } 
@@ -855 +855 @@
         formatlistptr->decision.command = dText;
         formatlistptr->decision.text = text;
-        commacount ++;
+        ++commacount;
         text.clear();
       }
@@ -916 +916 @@
         { 
           if (*here == '}') break;
-          commacount ++; 
+          ++commacount; 
         }
     }
@@ -923 +923 @@
     } else text.push_back(*here);
     
-    if (here != end) here ++;
+    if (here != end) ++here;
   }
 
@@ -950 +950 @@
   const int end_i = metainfo.values.size()-1;
     
-  for (int i=start_i; i<=end_i; i++) {
+  for (int i=start_i; i<=end_i; ++i) {
     if (!first) tmp += meta.functionoptions;
       
@@ -1012 +1012 @@
     else tmp += *here;
     first = false;
-    here ++;
+    ++here;
       }
       if (meta.metacommand & mCgiSafe) return cgi_safe (tmp);
@@ -1146 +1146 @@
       break;
     }
-    pos++;
+    ++pos;
   }
 
@@ -1159 +1159 @@
       break;
     }
-    pos--;
+    --pos;
   }
 
@@ -1172 +1172 @@
       break;
     }
-    pos--;
+    --pos;
   }
 
@@ -1188 +1188 @@
       break;
     }
-    pos--;
+    --pos;
   }
 
@@ -1200 +1200 @@
   extracted_str.clear();
 
-  for (int pos=start_pos; pos<=end_pos; pos++) {
+  for (int pos=start_pos; pos<=end_pos; ++pos) {
     extracted_str.push_back(outstring[pos]);
   }
@@ -1277 +1277 @@
 
   if ((potential_quote == '\'') || (potential_quote == '\"')) {
-    rhs_end--;
+    --rhs_end;
     rhs_start = rscan_for(outstring,rhs_end-1,potential_quote) +1;
     quoted = true;
@@ -1431 +1431 @@
   while (here != end) {
     if (*here == '[') return true;
-    here ++;
+    ++here;
   }
 

trunk/gsdl/src/recpt/highlighttext.cpp

@@ -93 +93 @@
     while (this_var != last_var) {
       allterms[*this_var] = 1;
-      this_var ++;
-    }
-    this_term ++;
+      ++this_var;
+    }
+    ++this_term;
   }
 
@@ -106 +106 @@
       // not word boundary
       word.push_back(*here);
-      here++;
+      ++here;
 
     } else {
@@ -124 +124 @@
     while ((here != end) && (*here != '>')) {
       buffer.push_back(*here);
-      here++;
+      ++here;
     }
       }
 
       buffer.push_back(*here);
-      here++;
+      ++here;
 
       if (buffer.size() > 1024) {
@@ -159 +159 @@
     while (this_var != last_var) {
       allterms[*this_var] = 1;
-      this_var ++;
+      ++this_var;
     }
     first = false;
-    this_term ++;
+    ++this_term;
   }
 
@@ -174 +174 @@
       // not word boundary
       word.push_back(*here);
-      here++;
+      ++here;
 
     } else {
@@ -193 +193 @@
           buffer.clear();
         }
-        phrasecount ++;
+        ++phrasecount;
       } else {
         phrasecount = 0;
@@ -215 +215 @@
     while ((here != end) && (*here != '>')) {
       buffer.push_back(*here);
-      here++;
+      ++here;
     }
       }
 
       buffer.push_back(*here);
-      here++;
+      ++here;
 
       if (buffer.size() > 1024 && phrasecount == 0) {
@@ -252 +252 @@
       }
     }
-    here++;
+    ++here;
   }
 
@@ -278 +278 @@
       altered_string.push_back(*here);
     }
-    here++;
+    ++here;
   }
 

trunk/gsdl/src/recpt/historydb.cpp

@@ -109 +109 @@
   newhistoryresult += history;
   newhistoryresult += "\n";
-  for (int i=0; i<numentries;i++) {
+  for (int i=0; i<numentries;++i) {
     newhistoryresult +=  entries[i]+"\n";
   }
@@ -156 +156 @@
       }
     }
-    here++;
+    ++here;
   }// while
 }
@@ -186 +186 @@
       info[key]=value;
     }
-    start++;
+    ++start;
   }
 }
@@ -198 +198 @@
   while (*begin >='0'&& *begin <='9') { // get the digits for numdocs
     numdocs.push_back(*begin);
-    begin++;
+    ++begin;
   }          
                  
   if (*begin == '+') {  // get the + if there
     numdocs.push_back(*begin);
-    begin++;
+    ++begin;
   }
   if (*begin == ':') { // have the old format - previous bit was record number
     numdocs.clear();
-    begin++;
+    ++begin;
 
     while(*begin >='0' && *begin <='9') { // get the digits
       numdocs.push_back(*begin);
-      begin++;
+      ++begin;
     }
     if (*begin == '+') { // get the + if there
       numdocs.push_back(*begin);
-      begin++;
+      ++begin;
     }
   }

trunk/gsdl/src/recpt/hlistbrowserclass.cpp

@@ -166 +166 @@
     while (tmp_str<end_str) {
       if (*tmp_str=='<') {    // for html tags
-    while (*tmp_str!='>') tmp_str++; 
+    while (*tmp_str!='>') ++tmp_str; 
       } else if (*tmp_str=='&') { // for html entities
-    while (*tmp_str!=';') tmp_str++; 
-    num_chars++;
-      } else num_chars++;
-      tmp_str++;
+    while (*tmp_str!=';') ++tmp_str; 
+    ++num_chars;
+      } else ++num_chars;
+      ++tmp_str;
     }
 
@@ -180 +180 @@
 
     textout << outconvert << "<td>" << disp << fmt_str << "</td>\n";
-    tsibling ++;
+    ++tsibling;
   }
 

trunk/gsdl/src/recpt/htmlutils.cpp

@@ -38 +38 @@
     else if (*here == '#') outstring += "#";
     else outstring.push_back(*here);
-    here ++;
+    ++here;
   }
   return outstring;
@@ -53 +53 @@
     else if (*here == '\'') outstring += "\\'";
     else outstring.push_back(*here);
-    here ++;
+    ++here;
   }
   return outstring;

trunk/gsdl/src/recpt/infodbclass.cpp

@@ -159 +159 @@
     gdbmfile = gdbm_open (namebuffer, block_size, mode, 00664, NULL);
 #endif
-    num_retrys--;
+    --num_retrys;
   } while (num_retrys>0 && gdbmfile==NULL &&
        (gdbm_errno==GDBM_CANT_BE_READER || gdbm_errno==GDBM_CANT_BE_WRITER));

trunk/gsdl/src/recpt/langaction.cpp

@@ -189 +189 @@
 
   // Case fold both language codes, just in case
-  for (int i = 0; i < strlen(sourceabbr.getcstr()); i++) {
+  for (int i = 0; i < strlen(sourceabbr.getcstr()); ++i) {
     sourceabbr[i] = tolower(sourceabbr[i]);
   }
-  for (int i = 0; i < strlen(targetabbr.getcstr()); i++) {
+  for (int i = 0; i < strlen(targetabbr.getcstr()); ++i) {
     targetabbr[i] = tolower(targetabbr[i]);
   }

trunk/gsdl/src/recpt/pageaction.cpp

@@ -203 +203 @@
               search_types |= 1;
             }
-            type_here ++;
+            ++type_here;
           }
           coll_type += search_types;
@@ -258 +258 @@
         }
 
-        collist_here ++;
+        ++collist_here;
         }
         
       }
       }
-    rprotolist_here ++;
+    ++rprotolist_here;
     }
     
@@ -333 +333 @@
               search_types |= 1;
             }
-            type_here ++;
+            ++type_here;
           }
           coll_type += search_types;
@@ -432 +432 @@
           homeextra += "<td>" + link + collectionname + "</a></td>\n";
           
-          count ++;
+          ++count;
           first = false;
         }
       }
-      collist_here ++;
+      ++collist_here;
     }
 
-    for (; count%configinfo.HomePageCols != 0; count ++) homeextra += "<td></td>\n";
+    for (; count%configinfo.HomePageCols != 0; ++count) homeextra += "<td></td>\n";
       }
     }
     homeextra += "</td></tr>\n<tr>\n";
-    rprotolist_here ++;
+    ++rprotolist_here;
   }
 
@@ -477 +477 @@
         if (cinfo->isPublic && (cinfo->buildDate > 0)) {
 
-          count ++;
+          ++count;
 
           text_t coll_type = "&ct=";
@@ -506 +506 @@
               search_types |= 0x01;
             }
-            type_here ++;
+            ++type_here;
           }
           coll_type += search_types;
@@ -547 +547 @@
         }
       }
-      collist_here ++;
+      ++collist_here;
     }
       }
     }
-    rprotolist_here ++;
+    ++rprotolist_here;
   }
 
@@ -640 +640 @@
   while (thislang != endlang) {
     languages[(*thislang).second.longname] = (*thislang).first;
-    thislang++;
+    ++thislang;
   }
   text_tmap::iterator tlang = languages.begin();
@@ -661 +661 @@
         languageoption += ">" + (*tlang).first + "</option>\n";
       }
-      tlang ++;
+      ++tlang;
     }
       }
@@ -672 +672 @@
       if ((*tlang).second == arg_l) languageoption += " selected";
       languageoption += ">" + (*tlang).first + "</option>\n";
-      tlang ++;
+      ++tlang;
     }
   }
@@ -693 +693 @@
       if ((*thisenc).second == arg_w) encodingoption += " selected";
       encodingoption += ">" + (*thisenc).first + "</option>\n";
-      thisenc ++;
+      ++thisenc;
     }
 
@@ -873 +873 @@
     } else {
       ColInfoResponse_t *this_cinfo = recpt->get_collectinfo_ptr (collectproto, *col_here, logout);
-      if (this_cinfo == NULL) {col_here ++; continue;}
+      if (this_cinfo == NULL) {++col_here; continue;}
       colname = this_cinfo->collectionmeta["collectionname"];
     }
 
-    count ++;
+    ++count;
     collectionoption += "<input type=checkbox name=\"cc\" value=\"" + 
       *col_here + "\" onClick=\"updatecc(\'" + *col_here + "\');\"> " +
       colname + "<br>\n";
-    col_here ++;
+    ++col_here;
       }
       
@@ -946 +946 @@
     while (here != end) {
       
-      classifiernumber++;
+      ++classifiernumber;
       text_t childtype = (*here).metadata["childtype"].values[0];
       if (childtype == "Collage" && arg_p == "about") {
@@ -954 +954 @@
     collage = true;
       }
-      here ++;
+      ++here;
     } 
     if (! collage)
@@ -977 +977 @@
       }
 
-      here ++;
+      ++here;
     }
     shorttext += "</ul>\n";
@@ -998 +998 @@
       } else {
         ColInfoResponse_t *this_cinfo = recpt->get_collectinfo_ptr (collectproto, *here, logout);
-        if (this_cinfo == NULL) {here ++; continue;}
+        if (this_cinfo == NULL) {++here; continue;}
         if (!first) textsubcollections += "<br>";
         textsubcollections += "\n" + this_cinfo->collectionmeta["collectionname"] + "\n";
       }
-      count ++;
+      ++count;
       first = false;
-      here ++;
+      ++here;
     }
     textsubcollections += "_textsubcols2_";

trunk/gsdl/src/recpt/pagedbrowserclass.cpp

@@ -77 +77 @@
         break;
       }
-      dochere ++;
+      ++dochere;
     }
 
@@ -158 +158 @@
       break;
     }
-    thissection ++;
+    ++thissection;
   }
 

trunk/gsdl/src/recpt/phindaction.cpp

@@ -580 +580 @@
   // Get the word
   word.clear();
-  for (; *next != ':'; next++) {
+  for (; *next != ':'; ++next) {
     word.push_back(*next);
   }
@@ -586 +586 @@
   // Get total frequency
   tf = 0;
-  for (next++; *next != ':'; next++) {
+  for (++next; *next != ':'; ++next) {
     tf *= 10;
     tf += (*next - '0');
@@ -593 +593 @@
   // Get expansion frequency
   ef = 0;
-  for (next++; *next != ':'; next++) {
+  for (++next; *next != ':'; ++next) {
     ef *= 10;
     ef += (*next - '0');
@@ -600 +600 @@
   // Get document frequency
   df = 0;
-  for (next++; *next != ':'; next++) {
+  for (++next; *next != ':'; ++next) {
     df *= 10;
     df += (*next - '0');
@@ -608 +608 @@
   el.clear();
   unsigned long e = 0;
-  for (next++; *next != ':'; next++) {
+  for (++next; *next != ':'; ++next) {
     if (*next == ',') {
       el.push_back(e);
@@ -623 +623 @@
   bool readnum = false;
   unsigned long d = 0;
-  for (next++; *next != ':'; next++) {
+  for (++next; *next != ':'; ++next) {
     if (*next == ',') {
       docnum.push_back(d);
@@ -649 +649 @@
   // link frequency
   lf = 0;
-  for (next++; *next != ':'; next++) {
+  for (++next; *next != ':'; ++next) {
     lf *= 10;
     lf += (*next - '0');
@@ -662 +662 @@
   bool typedone = false;
   unsigned long l = 0;
-  for (next++; *next != ':'; next++) {
+  for (++next; *next != ':'; ++next) {
     
     if (!typedone) {
@@ -703 +703 @@
   UCArray type, text;
   
-  for (unsigned long l = first; l < last; l++) {
+  for (unsigned long l = first; l < last; ++l) {
 
     // get the phrase data
@@ -769 +769 @@
   // Get the word
   word.clear();
-  for (; *next != ':'; next++) {
+  for (; *next != ':'; ++next) {
     word.push_back(*next);
   }
@@ -775 +775 @@
   // Get total frequency
   tf = 0;
-  for (next++; *next != ':'; next++) {
+  for (++next; *next != ':'; ++next) {
     tf *= 10;
     tf += (*next - '0');
@@ -782 +782 @@
   // Get expansion frequency
   ef = 0;
-  for (next++; *next != ':'; next++) {
+  for (++next; *next != ':'; ++next) {
     ef *= 10;
     ef += (*next - '0');
@@ -789 +789 @@
   // Get document frequency
   df = 0;
-  for (next++; *next != ':'; next++) {
+  for (++next; *next != ':'; ++next) {
     df *= 10;
     df += (*next - '0');
@@ -816 +816 @@
   toUCArray(body, ucbody);
 
-  for (unsigned long e = first; e < last; e++) {
+  for (unsigned long e = first; e < last; ++e) {
 
     phrase = elist[e];
@@ -952 +952 @@
   unsigned long freq, doc;
 
-  for (unsigned long d = first; d < last; d++) {
+  for (unsigned long d = first; d < last; ++d) {
     doc = docNums[d];
     freq = docFreq[d];
@@ -1012 +1012 @@
   // Get the document OID (hash)
   hash.clear();
-  for (; *next != '\t'; next++) {
+  for (; *next != '\t'; ++next) {
     hash.push_back(*next);
   }
@@ -1019 +1019 @@
   text.push_back('\n');
   title.clear();
-  for (next++; *next != '\n'; next++) {
+  for (++next; *next != '\n'; ++next) {
     title.push_back(*next);
   }

trunk/gsdl/src/recpt/queryaction.cpp

@@ -653 +653 @@
       macrovalue += " selected";
     macrovalue += ">_" + *thisvalue + "_\n";
-    thisvalue ++;
+    ++thisvalue;
   }
   macrovalue += "</select>\n";
@@ -749 +749 @@
       break;
     }
-    thisvalue++;
+    ++thisvalue;
   }
   if (!has_paras) return; // there is no difference between the form selection and the normal one
@@ -777 +777 @@
       macrovalue += ">_" + *thisvalue + "_\n";
     }
-    thisvalue ++;
+    ++thisvalue;
   }
   macrovalue += "</select>\n";
@@ -798 +798 @@
   if (args["qf"] == "1") { // advanced form
     form += "<tr>_firstadvformelement_</tr>\n";
-    for (int i=1; i<argfqn; i++) {      
+    for (int i=1; i<argfqn; ++i) {      
     form += "<tr>_advformelement_</tr>\n";
     }
@@ -804 +804 @@
   }
   else { // simple form
-    for (int i=0; i<argfqn; i++) {
+    for (int i=0; i<argfqn; ++i) {
       form += "<tr>_regformelement_</tr>\n"; 
     }
@@ -839 +839 @@
       historylist += "<form name=\"HistoryForm\"><table width=537>\n";
 
-      for (int i=0; i<numrecords;i++) {
+      for (int i=0; i<numrecords;++i) {
     text_t query;
     text_t numdocs;
@@ -938 +938 @@
           if (!index.empty()) {
         it = fresponse.filterOptions.find ("Index");
-        if (it == end) {collist_here ++; continue;}
+        if (it == end) {++collist_here; continue;}
         text_tarray::const_iterator there = (*it).second.validValues.begin();
         text_tarray::const_iterator tend = (*it).second.validValues.end();
         while (there != tend) {
           if (*there == index) break;
-          there ++;
+          ++there;
         }
-        if (there == tend) {collist_here++; continue;}
+        if (there == tend) {++collist_here; continue;}
           }
           if (!subcollection.empty()) {
         it = fresponse.filterOptions.find ("Subcollection");
-        if (it == end) {collist_here++; continue;}
+        if (it == end) {++collist_here; continue;}
         text_tarray::const_iterator there = (*it).second.validValues.begin();
         text_tarray::const_iterator tend = (*it).second.validValues.end();
         while (there != tend) {
           if (*there == subcollection) break;
-          there ++;
+          ++there;
         }
-        if (there == tend) {collist_here++; continue;}
+        if (there == tend) {++collist_here; continue;}
           }
           if (!language.empty()) {
         it = fresponse.filterOptions.find ("Language");
-        if (it == end) {collist_here++; continue;}
+        if (it == end) {++collist_here; continue;}
         text_tarray::const_iterator there = (*it).second.validValues.begin();
         text_tarray::const_iterator tend = (*it).second.validValues.end();
         while (there != tend) {
           if (*there == language) break;
-          there ++;
+          ++there;
         }
-        if (there == tend) {collist_here++; continue;}
+        if (there == tend) {++collist_here; continue;}
           }
         
@@ -988 +988 @@
         }
       }
-      collist_here ++;
+      ++collist_here;
     }
       }
     }
-    rprotolist_here ++;
+    ++rprotolist_here;
   }
   textout << outconvert << disp 
@@ -1117 +1117 @@
       logout << outconvert << "queryaction::search_multiple_collections: " << *col_here 
          << " collection has a NULL collectproto, ignoring\n";
-      col_here ++;
+      ++col_here;
       continue;
     }
@@ -1123 +1123 @@
     if (cinfo == NULL) {
       logout << "ERROR (query_action::search_multiple_collections): get_collectinfo_ptr returned NULL\n";
-      col_here ++;
+      ++col_here;
       continue;
     }
@@ -1175 +1175 @@
     if ((this_term+1) != end_term) freqmsg += ", ";
       }
-      this_term ++;
+      ++this_term;
     }
     
@@ -1188 +1188 @@
     thisresult.doc = *doc_here;
     results.insert (thisresult);
-    doc_here ++;
+    ++doc_here;
       }
     }
-    col_here ++;
+    ++col_here;
   } // for each coll
 
@@ -1223 +1223 @@
     // output results
     while (res_here != res_end) {
-      if (count < firstdoc) {count ++; res_here ++; continue;}
+      if (count < firstdoc) {++count; ++res_here; continue;}
       if (count > thislast) break;
       formatlistptr = colinfomap[(*res_here).collection].formatlistptr;
@@ -1234 +1234 @@
     logout << outconvert << "queryaction::search_multiple_collections: " << (*res_here).collection
            << " collection has a NULL collectproto, ignoring results\n";
-    res_here ++;
+    ++res_here;
     continue;
       }
@@ -1242 +1242 @@
                     collectproto, disp, outconvert, textout, logout);
       //    textout << outconvert << "(ranking: " << (*res_here).doc.ranking << ")\n";
-      res_here ++;
-      count ++;
+      ++res_here;
+      ++count;
     }
   }
@@ -1253 +1253 @@
   while (here != end) {
     delete ((*here).second.formatlistptr);
-    here ++;
+    ++here;
   }
   return true;
@@ -1515 +1515 @@
       quotedquery += "\"" + *phere + "\"";
       first = false;
-      phere ++;
+      ++phere;
     }
     if (args.getintarg("s") && !quotedquery.empty()) quotedquery += "_textstemon_";
@@ -1543 +1543 @@
       if ((this_term + 1) != end_term)
     freqmsg += ", ";
-      this_term ++;
+      ++this_term;
     }
   }

trunk/gsdl/src/recpt/querytools.cpp

@@ -192 +192 @@
       formattedstring.push_back (*here);
     }
-    here ++;
+    ++here;
   }
   querystring = formattedstring;
@@ -214 +214 @@
       }
       else
-        here++;
+        ++here;
     }
       //converting BCE dates
@@ -254 +254 @@
            }
          }
-         nextdate++;
+         ++nextdate;
        }
      querystring.appendcstr(" )");
@@ -284 +284 @@
       if (foundquote) tmptext.push_back (*here);
     }
-    here ++;
+    ++here;
       }
     }
@@ -307 +307 @@
     }
 
-    here++;
+    ++here;
   }
   return escquery;
@@ -343 +343 @@
 
 
-  for (int i=0; i< values.size(); i++) {
+  for (int i=0; i< values.size(); ++i) {
     if (!values[i].empty()) {
       if (ct == 1) {
@@ -395 +395 @@
   splitchar(comb.begin(), comb.end(), ',', combs);
   
-  for(int i=0; i< values.size(); i++) {
+  for(int i=0; i< values.size(); ++i) {
     if (!values[i].empty()) {
       if (i!=0) {
@@ -429 +429 @@
       // not word boundary
       word.push_back(*here);
-      here++;    
+      ++here;    
     }
     else {
@@ -450 +450 @@
     outtext.push_back(*here);
       }
-      here++;
+      ++here;
     }
   }
@@ -651 +651 @@
       // not word boundary
       word.push_back(*here);
-      here++;    
+      ++here;    
     }
     else {
@@ -662 +662 @@
       // everything else, we add into the query string
       outtext.push_back(*here);
-      here++;
+      ++here;
     }
   }

trunk/gsdl/src/recpt/recptproto.cpp

@@ -168 +168 @@
     }
     
-    here++;
+    ++here;
   }
   

trunk/gsdl/src/recpt/statusaction.cpp

@@ -119 +119 @@
 
       textout << "</tr>\n";
-      collist_here ++;
+      ++collist_here;
     }
       }
     }
-    rprotolist_here ++;
+    ++rprotolist_here;
   }
 
@@ -162 +162 @@
     macrofirst = false;
     textout << outconvert << "\"" << *macrohere << "\"";
-    macrohere++;
+    ++macrohere;
   }
   textout << outconvert << "</td></tr>\n";
@@ -193 +193 @@
         << (*params_here).second << "\"";
     
-    params_here++;
+    ++params_here;
   }
   textout << outconvert << "</td></tr>\n";
@@ -213 +213 @@
       argsinfofirst = false;
       textout << outconvert << "\"" << (*argsinfohere).second.shortname << "\"";
-      argsinfohere++;
+      ++argsinfohere;
     }
     
@@ -234 +234 @@
     textout << outconvert << "\"" << (*actionshere).second.a->get_action_name() << "\"";
       }
-      actionshere++;
+      ++actionshere;
     }
     
@@ -255 +255 @@
     textout << outconvert << "\"" << (*browsershere).second.b->get_browser_name() << "\"";
       }
-      browsershere++;
+      ++browsershere;
     }
     
@@ -276 +276 @@
     textout << outconvert << "\"" << (*protohere).p->get_protocol_name(err) << "\"";
       }
-      protohere++;
+      ++protohere;
     }
     
@@ -294 +294 @@
       convertfirst = false;
       textout << outconvert << "\"" << (*converthere).second.name << "\"";
-      converthere++;
+      ++converthere;
     }
     
@@ -354 +354 @@
     else textout << outconvert << "<td>\"" << *arg_value << "\"</td></tr>\n";
     
-    argsinfohere ++;
+    ++argsinfohere;
   }
   
@@ -393 +393 @@
       aifirst = false;
       textout << outconvert << (*argsinfohere).second.shortname;
-      argsinfohere++;
+      ++argsinfohere;
     }
     
     textout << outconvert << "</td></tr>\n";
       }
-      actionshere++;
+      ++actionshere;
     }
   }
@@ -431 +431 @@
         << "</td></tr>\n";
       }
-      browsershere++;
+      ++browsershere;
     }
   }
@@ -491 +491 @@
       }
 
-      collist_here++;
+      ++collist_here;
     }
 
@@ -503 +503 @@
     }
 
-    rprotolist_here++;
+    ++rprotolist_here;
   }
 
@@ -542 +542 @@
       if (err == noError && hascollection) break;
     }
-    rprotolist_here++;
+    ++rprotolist_here;
   }
   
@@ -590 +590 @@
     languages_first = false;
     textout << outconvert << "\"" << *languages_here << "\"";
-    languages_here++;
+    ++languages_here;
       }
 
@@ -599 +599 @@
     textout << outconvert << "<tr><td>" << (*meta_here).first
         << "</td><td>" << (*meta_here).second << "</td></tr>\n";
-    meta_here ++;
+    ++meta_here;
       }
       textout << "</table></td></tr>\n";
@@ -609 +609 @@
     textout << outconvert << "<tr><td>" << (*format_here).first
         << "</td><td>" << html_safe((*format_here).second) << "</td></tr>\n";
-    format_here ++;
+    ++format_here;
       }
       textout << "</table></td></tr>\n";
@@ -619 +619 @@
     textout << outconvert << "<tr><td>" << (*building_here).first
         << "</td><td>" << (*building_here).second << "</td></tr>\n";
-    building_here ++;
+    ++building_here;
       }
       textout << "</table></td></tr>\n";
@@ -722 +722 @@
           valid_first = false;
           textout << outconvert << "\"" << *valid_here << "\"";
-          valid_here++;
+          ++valid_here;
         }
         textout << outconvert
             << "</td></tr>\n";
 
-        filteropt_here++;
+        ++filteropt_here;
       }
 
@@ -738 +738 @@
     }
 
-    filternames_here++;
+    ++filternames_here;
       }
 
@@ -1089 +1089 @@
   while (macrohere != macroend) {
     if (*macrohere == "status.dm") break;
-    macrohere++;
+    ++macrohere;
   }
   if (macrohere == macroend) {

trunk/gsdl/src/recpt/string_pool.cpp

@@ -34 +34 @@
   while (here != end) {
     delete(*here);
-    here ++;
+    ++here;
   }
 }

trunk/gsdl/src/recpt/summarise.cpp

@@ -106 +106 @@
   // consider only non-empty terms
   for(text_tarray::iterator term = allterms.begin();
-      term < allterms.end(); term++) {
+      term < allterms.end(); ++term) {
     if(!(*term).empty())
       terms.push_back(*term);
@@ -125 +125 @@
     // answersSize[0] is the combined size of sentences with 1 keyword, etc.
   for(vector<int>::iterator size = answersSize.begin();
-      size<answersSize.end(); size++)
+      size<answersSize.end(); ++size)
     *size = 0; // initialise sentence size
 
@@ -140 +140 @@
                        *terms_current);
       if(word!=sentence.end())
-    {        nFound++; totfound++; }
-      terms_current++;
+    {        ++nFound; ++totfound; }
+      ++terms_current;
     }
 
@@ -152 +152 @@
   text_t answer;
   for(vector<text_tarray>::iterator sentarray = answers.end()-1;
-      sentarray>=answers.begin(); sentarray--)
+      sentarray>=answers.begin(); --sentarray)
     for(text_tarray::iterator sentence = (*sentarray).begin(); 
-        sentence < (*sentarray).end(); sentence++) {
+        sentence < (*sentarray).end(); ++sentence) {
       answer.append(*sentence);
       if(answer.size()>=summaryLength)
@@ -182 +182 @@
         foundPunctuation = true;
       while ((start<end) && (*start!='>'))
-    start++;
-      if(start<end) start++;
+    ++start;
+      if(start<end) ++start;
       break;
     case '.':
@@ -189 +189 @@
     case '?':
       sentence.push_back(*start);
-      start++;
+      ++start;
       if(start>=end || 
          (is_unicode_space(*start) && (*(start-2)<'A' || *(start-2)>'Z'))) {
@@ -197 +197 @@
     default:
       sentence.push_back(*start);
-      start++;
+      ++start;
       break;
     }
@@ -219 +219 @@
     case '>': // skip over rest of html tag
       while ((start>end) && (*start!='<')) // backtrack to beginning of tag
-    start--;
+    --start;
       if(start>end) {
         if(paragraph_tag(start) && has_unicode_letdig(sentence))
           found2ndPunctuation = true;
-        start--;
+        --start;
       }
       break;
@@ -235 +235 @@
         sentence.text_as_usvector().insert(sentence.text_as_usvector().begin(),
           start,start+1);
-        start--;
+        --start;
       } else
         if(has_unicode_letdig(sentence) || found1stPunctuation)
@@ -242 +242 @@
           sentence.text_as_usvector().insert(
               sentence.text_as_usvector().begin(),start,start+1);
-          start--;
+          --start;
           found1stPunctuation = true;
         }
@@ -249 +249 @@
       sentence.text_as_usvector().insert(
         sentence.text_as_usvector().begin(),start,start+1);
-      start--;
+      --start;
       break;
     }
@@ -260 +260 @@
 bool paragraph_tag(text_t::iterator start) {
   if(*start=='<') {
-    start++;
+    ++start;
     if(*start=='p' || *start=='P') {
-      start++;
+      ++start;
       if(is_unicode_space(*start) || *start=='>')
         return true;

trunk/gsdl/src/recpt/userdb.cpp

@@ -77 +77 @@
       // ok
     } else return false;
-    here++;
+    ++here;
   }
 
@@ -95 +95 @@
       // ok
     } else return false;
-    here++;
+    ++here;
   }
 
@@ -243 +243 @@
       new_groups.push_back(*here);
     }
-    here++;
+    ++here;
   }
   return new_groups;
@@ -369 +369 @@
   while (keys_here != keys_end) {
     keydb.deletekey(*keys_here);
-    keys_here++;
+    ++keys_here;
   }
   

trunk/gsdl/src/recpt/usersaction.cpp

@@ -255 +255 @@
     }
     
-    users_here++;
+    ++users_here;
   }
 

trunk/gsdl/src/recpt/vlistbrowserclass.cpp

@@ -165 +165 @@
 
   while (thissection != endsection) {
-    item++;
+    ++item;
     get_link_icon (*thissection, args, collink, link, icon);
     bool highlight = false;
@@ -191 +191 @@
     }
     textout << outconvert << "\n";
-    thissection ++;
+    ++thissection;
   }
 

trunk/gsdl/src/recpt/z3950proto.cpp

@@ -57 +57 @@
 
   // append the new server
-  zserver_count++;
+  ++zserver_count;
   zservers.push_back(&zserver);
 }
@@ -192 +192 @@
   while (here != end) {
     collist.push_back((*here)->getName());
-    here++;
+    ++here;
   }
 }
@@ -205 +205 @@
       return;
     }
-    here++;
+    ++here;
   }
   hascollection=false;
@@ -230 +230 @@
       break;
     }
-    here++;
+    ++here;
   }
 
@@ -327 +327 @@
       break;
     }
-    zserver++;
+    ++zserver;
   }
   // now have collection in zserver.
@@ -376 +376 @@
     maxdocs=ov_here->value.getint();
       } 
-      ov_here++;
+      ++ov_here;
     }
     err=noError;
@@ -409 +409 @@
     docInfo->OID=counter+opt_start-1;
     response.docInfo.push_back(*docInfo);
-    counter++;
-    titles_here++;
+    ++counter;
+    ++titles_here;
       }
     }
@@ -502 +502 @@
         }
           }
-          opthere++;
+          ++opthere;
         }
         (*zserver)->getfullrecord(query, querytype, field, i, doctitle, doctext, err);
@@ -510 +510 @@
         docs_here->metadata[*fields_here].values.push_back(g_EmptyText);
       }
-      fields_here++;
+      ++fields_here;
     } // end of inner while loop
-    docs_here++;
+    ++docs_here;
       } // end of outer while loop
     } // end of if (!request.fields.empty())
@@ -523 +523 @@
     response.docInfo[0].metadata[(*colmeta_here).first].
       values.push_back((*colmeta_here).second);
-    colmeta_here++;
+    ++colmeta_here;
       }
 
@@ -570 +570 @@
       break;
     }
-    zserver++;
+    ++zserver;
   }
   // now have collection in zserver.

trunk/gsdl/src/recpt/z3950server.cpp

@@ -130 +130 @@
 
 
-  for (int i=0;i<strlength;i++) {
+  for (int i=0;i<strlength;++i) {
     if (*(ptr+i)=='"') { // convert " to SPACE...
       *(ptr+i)=' '; 
@@ -137 +137 @@
       if (inword==false) {
     inword=true;
-    num_terms++;
+    ++num_terms;
       }
     }
@@ -170 +170 @@
     char *q_type;
     if (querytype==1) q_type=or_str; else q_type=and_str;
-    for (int i=1;i<num_terms;i++)
+    for (int i=1;i<num_terms;++i)
       parsed_query+=q_type;
     // append the actual query
@@ -253 +253 @@
   }
   last=(int)c_str_titles[0];
-  for (i=1;i<=last;i++) {
+  for (i=1;i<=last;++i) {
     titles->push_back(c_str_titles[i]);
     free(c_str_titles[i]);