Changeset 9608

Timestamp:

2005-04-08T14:22:41+12:00 (19 years ago)

Author:

kjdon

Message:

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

Location:

trunk/gsdl/src/oaiservr

Files:

• abstractlistaction.cpp (modified) (13 diffs)
• identityaction.cpp (modified) (1 diff)
• listrecsaction.cpp (modified) (1 diff)
• listsetsaction.cpp (modified) (5 diffs)
• metaformat.cpp (modified) (2 diffs)
• metaformatsaction.cpp (modified) (3 diffs)
• metaformatters.cpp (modified) (1 diff)
• oaiaction.cpp (modified) (4 diffs)
• oaiargs.cpp (modified) (4 diffs)
• oaiconfig.cpp (modified) (5 diffs)
• oaidispatcher.cpp (modified) (1 diff)
• oaimain.cpp (modified) (1 diff)
• oaitools.cpp (modified) (1 diff)
• recordaction.cpp (modified) (1 diff)

trunk/gsdl/src/oaiservr/abstractlistaction.cpp

@@ -30 +30 @@
       }
     }
-    numArgs ++; // Increase valid args count
+    ++numArgs; // Increase valid args count
   }
 
@@ -45 +45 @@
       }
     }
-    numArgs ++; // Increase valid args count
+    ++numArgs; // Increase valid args count
   }
 
@@ -73 +73 @@
       }
     }
-    numArgs ++;
+    ++numArgs;
   }
 
@@ -83 +83 @@
       return false;
     }
-    numArgs ++;
+    ++numArgs;
   }
   
@@ -180 +180 @@
     text_t until        = params["until"];
 
-    for (long i = startDoc; i < cinfo.numDocs; i++) {
+    for (long i = startDoc; i < cinfo.numDocs; ++i) {
       if (errorCount > 3) { // If num errors reaches the cut-off value, bail.
     cerr << "Error: too many records(" << errorCount << ") in the " << gsdlCollect 
@@ -193 +193 @@
       
       if (gsdl_id == "") { // If the string is empty, then the document didn't have an oai_id, so
-    errorCount ++;     // increase error count
+    ++errorCount;     // increase error count
     continue;
       }
@@ -208 +208 @@
       // GRB: the above comment is no longer true; proper checks are made
       this->prevDocSeen = true;
-      this->outputDocs ++;
+      ++this->outputDocs;
     }
       }
@@ -236 +236 @@
   protocol->get_collection_list(collections, err, output); 
   
-  for(int current_col = 0; current_col < collections.size(); current_col++){
+  for(int current_col = 0; current_col < collections.size(); ++current_col){
     gsdlCollect = collections[current_col];
     this->output_content_for_col(output, protocol, gsdlCollect, cinfo, err, params);
@@ -342 +342 @@
 
       // seek forward; TODO: improve performance of this 
-      for (int c = 0; c < response.numDocs; c ++) {
+      for (int c = 0; c < response.numDocs; ++c) {
     if (response.docInfo[c].OID == nextNode) {
       startPos = c;
@@ -351 +351 @@
   }
   
-  for (int c = startPos; c < response.numDocs; c ++) {
+  for (int c = startPos; c < response.numDocs; ++c) {
     text_t child = response.docInfo[c].OID;
     
@@ -370 +370 @@
     if (this->output_document(output, protocol, collection, child, metadataPrefix)) {
       this->prevDocSeen = true;
-      this->outputDocs ++;
+      ++this->outputDocs;
     }
       }
@@ -396 +396 @@
   get_children(classifier, collection, metadata, false, protocol, response, logout);
 
-  for (int c = 0; c < response.numDocs; c ++) {
+  for (int c = 0; c < response.numDocs; ++c) {
     text_t child = response.docInfo[c].OID;
     
@@ -409 +409 @@
     if (childHead == "HASH") {
       this->output_document(output, protocol, collection, child, metadataPrefix);
-      this->outputDocs ++;
+      ++this->outputDocs;
       prevDocSeen = true;
     }

trunk/gsdl/src/oaiservr/identityaction.cpp

@@ -48 +48 @@
     output << "  <" << here->first << ">" << here->second;
     output << "  </" << here->first << ">" << endl;
-    here ++;
+    ++here;
   }
   

trunk/gsdl/src/oaiservr/listrecsaction.cpp

@@ -21 +21 @@
   }
   else {
-    numArgs++; // If it's there, increase arg count
+    ++numArgs; // If it's there, increase arg count
   }
   

trunk/gsdl/src/oaiservr/listsetsaction.cpp

@@ -26 +26 @@
     text_t collect = *here;
     this->output_content(output, protocol, params);
-    here ++;
+    ++here;
   }
   return true;
@@ -50 +50 @@
   }
 
-  for(int current_col = 0; current_col < collections.size(); current_col++) {
+  for(int current_col = 0; current_col < collections.size(); ++current_col) {
     // output the collection as a set, first, then its children
     text_t gsdlCollect = collections[current_col];
@@ -63 +63 @@
   
     // and send them to the "recurse_content" list
-    for (int c = 0; c < response.numDocs; c ++) {
+    for (int c = 0; c < response.numDocs; ++c) {
       this->recurse_content(output, protocol, gsdlCollect, response.docInfo[c].OID, gsdlCollect);
     }
@@ -116 +116 @@
     }
 
-    here ++;
+    ++here;
   }
 
@@ -140 +140 @@
   // get the children of this classifier and iterate them
   get_children(classifier, collection, "", metadata, false, protocol, response, logout);
-  for (int c = 0; c < response.numDocs; c ++) {
+  for (int c = 0; c < response.numDocs; ++c) {
     text_t child = response.docInfo[c].OID;
 

trunk/gsdl/src/oaiservr/metaformat.cpp

@@ -26 +26 @@
   }
 
-  for (int item = 0; item < values.size(); item ++) {
+  for (int item = 0; item < values.size(); ++item) {
     if (this->oaiConfigure->getOAIVersion() >= 200) { // TODO: GRB: This code may need to be subclassed by dc for 200 and later...
       output << "        <" << this->formatPrefix() << ":" << label << ">" << values[item] << "</" << this->formatPrefix() << ":" << label << ">\n";
@@ -90 +90 @@
     }
 
-    here ++;
+    ++here;
   }
 

trunk/gsdl/src/oaiservr/metaformatsaction.cpp

@@ -10 +10 @@
   // is given 
   if (params["identifier"] != "") {
-    numArgs++;
+    ++numArgs;
   }
 
@@ -84 +84 @@
     output << "  </metadataFormat>\n";
       }
-      here ++;
+      ++here;
     }
   }
@@ -99 +99 @@
   while (here != end) {    
     here->second.set_configuration((oaiconfig *) configuration);
-    here ++;
+    ++here;
   }
 }

trunk/gsdl/src/oaiservr/metaformatters.cpp

@@ -18 +18 @@
     {
       delete here->second;
-      here ++;
+      ++here;
     }
 }

trunk/gsdl/src/oaiservr/oaiaction.cpp

@@ -234 +234 @@
     requestURL += "=";
     requestURL += html_safe(here->second); // parse the argument to ensure it is URL-encoding compliant
-    here++;
+    ++here;
     
     while(here != end){
       requestURL +="&"; // Stick in the ampersand in URL encoding
       requestURL += (here->first + "=" + html_safe(here->second));
-      here++;
+      ++here;
     }
     requestURL += "</requestURL>\n";
@@ -255 +255 @@
     }
     requestURL = "  <request " + here->first + "=\"" + here->second + "\"";
-    here++;
+    ++here;
     while(here != end){
       requestURL += (" " + here->first + "=\"" + here->second + "\"");      
-      here++;
+      ++here;
     }
     requestURL += ">\n           " + httpdomain + "/oaimain</request>\n";
@@ -399 +399 @@
     oaiclassifier::toOAI(collection, oaiSet);
     output << "      <setSpec>" << oaiSet << "</setSpec>" << endl;
-    member ++;
+    ++member;
       }
     }
@@ -428 +428 @@
       }
     }
-    current++;
+    ++current;
   }  
 }

trunk/gsdl/src/oaiservr/oaiargs.cpp

@@ -37 +37 @@
 
       // move to the next character
-      here ++;
+      ++here;
 
       // and refill the buffer as necessary
@@ -56 +56 @@
     else {
       label.setcarr((char *) start, (int) equals - (int) start);
-      equals ++;
+      ++equals;
       value.setcarr((char *) equals, (int) here - (int) equals);
     }
@@ -77 +77 @@
     // inifinite loops above
     if (*here == '&') {
-      here ++;
+      ++here;
     }
   }
@@ -89 +89 @@
   while (*currentPtr != end) {
     *fill = **currentPtr;
-    *currentPtr ++;
+    ++*currentPtr;
   }
 

trunk/gsdl/src/oaiservr/oaiconfig.cpp

@@ -50 +50 @@
     while (here != end) {       
       this->configureCollection(gsdlhome, *here);
-      here ++;
+      ++here;
     }
   }
@@ -64 +64 @@
   while (here != end) {
     delete here->second;
-    here ++;
+    ++here;
   } 
 }
@@ -157 +157 @@
       exit(1);
     }
-    for (int c = 0; c < cfgline.size(); c ++) {
+    for (int c = 0; c < cfgline.size(); ++c) {
       this->collectList.push_back(cfgline[c]);
     }
@@ -198 +198 @@
       }
       else {
-    line ++;
+    ++line;
       }
     }
@@ -222 +222 @@
       }
       else {
-    line ++;
+    ++line;
       }
     }

trunk/gsdl/src/oaiservr/oaidispatcher.cpp

@@ -12 +12 @@
   while (here != end) {
     delete here->second;
-    here ++;
+    ++here;
   }
 }

trunk/gsdl/src/oaiservr/oaimain.cpp

@@ -74 +74 @@
       break;
     argstr.push_back (c);
-    content_length--;
+    --content_length;
       } while (content_length > 0);
     }

trunk/gsdl/src/oaiservr/oaitools.cpp

@@ -7 +7 @@
 void oaiclassifier::swapColonsAndPeriods(text_t &classifier)
 {
-  for (int i = 1; i <= classifier.size(); i ++) {
+  for (int i = 1; i <= classifier.size(); ++i) {
     if (classifier[i] == '.') {
       classifier[i] = ':';

trunk/gsdl/src/oaiservr/recordaction.cpp

@@ -23 +23 @@
   while (here != end) {
     here->second.clear();
-    here ++;
+    ++here;
   }
 }