Changeset 7421

Timestamp:

2004-05-25T12:16:24+12:00 (20 years ago)

Author:

mdewsnip

Message:

(Human Info) Use ++here instead of here++ for iterators, use g_EmptyText instead of "" for text_ts, and delete char* variables using delete []variable instead of delete variable.

File:

• trunk/gsdl/src/recpt/receptionist.cpp (modified) (28 diffs)

trunk/gsdl/src/recpt/receptionist.cpp

@@ -113 +113 @@
   ainfo.multiplechar = true;
   ainfo.defaultstatus = cgiarginfo::good;
-  ainfo.argdefault = "";
+  ainfo.argdefault = g_EmptyText;
   ainfo.savedarginfo = cgiarginfo::mustnot;
   argsinfo.addarginfo (NULL, ainfo);
@@ -121 +121 @@
   ainfo.multiplechar = true;
   ainfo.defaultstatus = cgiarginfo::none;
-  ainfo.argdefault = "";
+  ainfo.argdefault = g_EmptyText;
   ainfo.savedarginfo = cgiarginfo::must;
   argsinfo.addarginfo (NULL, ainfo);
@@ -130 +130 @@
   ainfo.multiplechar = true;
   ainfo.defaultstatus = cgiarginfo::none;
-  ainfo.argdefault = "";
+  ainfo.argdefault = g_EmptyText;
   ainfo.savedarginfo = cgiarginfo::must;
   argsinfo.addarginfo (NULL, ainfo);
@@ -138 +138 @@
   ainfo.multiplechar = true;
   ainfo.defaultstatus = cgiarginfo::none;
-  ainfo.argdefault = "";
+  ainfo.argdefault = g_EmptyText;
   ainfo.savedarginfo = cgiarginfo::mustnot;
   argsinfo.addarginfo (NULL, ainfo);
@@ -146 +146 @@
   ainfo.multiplechar = true;
   ainfo.defaultstatus = cgiarginfo::none;
-  ainfo.argdefault = "";
+  ainfo.argdefault = g_EmptyText;
   ainfo.savedarginfo = cgiarginfo::must;
   argsinfo.addarginfo (NULL, ainfo);
@@ -173 +173 @@
   ainfo.multiplechar = true;
   ainfo.defaultstatus = cgiarginfo::none;
-  ainfo.argdefault = "";
+  ainfo.argdefault = g_EmptyText;
   ainfo.savedarginfo = cgiarginfo::mustnot;
   argsinfo.addarginfo (NULL, ainfo);
@@ -380 +380 @@
       (*actionhere).second.a->configure(key, cfgline);
 
-    actionhere++;
+    ++actionhere;
   }
 
@@ -496 +496 @@
     if (((*actionhere).second.a == NULL) || 
     !(*actionhere).second.a->init(logout)) return false;
-    actionhere++;
+    ++actionhere;
   }
 
@@ -611 +611 @@
     return false;
     }
-    actionhere++;
+    ++actionhere;
   }
 
@@ -723 +723 @@
   if (fd == -1) {
     logout << "Error: Couldn't open file " << lfile << "\n";
-    delete lfile;
+    delete []lfile;
     return false;
   }
@@ -740 +740 @@
     write(fd, buffer, num_chars);
     GSDL_UNLOCK_FILE (fd);
-    delete buffer;
+    delete []buffer;
   } else {
     logout << "Error: Couldn't lock file " << lfile << "\n";
     close(fd);
-    delete lfile;
+    delete []lfile;
     return false;
   }
@@ -750 +750 @@
   close(fd);
         
-  delete lfile;
+  delete []lfile;
   return true;
 }
@@ -761 +761 @@
   action *a = actions.getaction (args["a"]);
   prepare_page (a, args, text_t2ascii, logout);
-  disp.expandstring ("Global", astring, outstring);
+  disp.expandstring (displayclass::defaultpackage, astring, outstring);
   return outstring;
 }
@@ -832 +832 @@
     if (latest<file_info.st_mtime) latest=file_info.st_mtime;
       }
-      delete buildcfg_ptr;
-      delete collectcfg_ptr;
+      delete []buildcfg_ptr;
+      delete []collectcfg_ptr;
 
       if (latest>0) {
@@ -1051 +1051 @@
     return compressed_args;
 
-  return "";
+  return g_EmptyText;
 }
 
@@ -1084 +1084 @@
       maindirs.insert (gsdlmacrodir);
     }
-    colhere ++;
+    ++colhere;
   }
 
@@ -1116 +1116 @@
       foundfile = true;
     }
-    dirhere ++;
+    ++dirhere;
       }
     }
@@ -1140 +1140 @@
       return false;
     }
-    arrhere++;
+    ++arrhere;
   }
 
@@ -1182 +1182 @@
       }
       
-      arrhere++;
+      ++arrhere;
     }
   }
@@ -1249 +1249 @@
              first = false;
           }
-          col_here ++;
+          ++col_here;
         }
       }
@@ -1334 +1334 @@
     }
     
-    params_here++;
+    ++params_here;
   }
   
@@ -1350 +1350 @@
       (*actionhere).second.a->define_external_macros (disp, args, &protocols, logout);
     }
-    actionhere++;
+    ++actionhere;
   }
 
@@ -1371 +1371 @@
   text_t &collection = args["c"];
 
-  disp.setmacro ("gsdlhome", "Global", dm_safe(configinfo.gsdlhome));
-  disp.setmacro ("gwcgi", "Global", configinfo.gwcgi);
-  disp.setmacro ("httpimg", "Global", configinfo.httpimg);
-  disp.setmacro ("httpprefix", "Global", configinfo.httpprefix);
+  disp.setmacro ("gsdlhome", displayclass::defaultpackage, dm_safe(configinfo.gsdlhome));
+  disp.setmacro ("gwcgi", displayclass::defaultpackage, configinfo.gwcgi);
+  disp.setmacro ("httpimg", displayclass::defaultpackage, configinfo.httpimg);
+  disp.setmacro ("httpprefix", displayclass::defaultpackage, configinfo.httpprefix);
 
   if (!collection.empty()) {
@@ -1385 +1385 @@
       if (!cinfo.httpdomain.empty()) httpcollection = "http://";
       httpcollection += cinfo.httpdomain + cinfo.httpprefix + "/collect/" + collection; 
-      disp.setmacro ("httpcollection", "Global", httpcollection); 
+      disp.setmacro ("httpcollection", displayclass::defaultpackage, httpcollection); 
     }
   }
 
   text_t compressedoptions = get_compressed_arg(args, logout);
-  disp.setmacro ("compressedoptions", "Global", dm_safe(compressedoptions));
+  disp.setmacro ("compressedoptions", displayclass::defaultpackage, dm_safe(compressedoptions));
   // need a decoded version of compressedoptions for use within forms
   // as browsers encode values from forms before sending to server
   // (e.g. %25 becomes %2525)
   decode_cgi_arg (compressedoptions);
-  disp.setmacro ("decodedcompressedoptions", "Global", dm_safe(compressedoptions));
+  disp.setmacro ("decodedcompressedoptions", displayclass::defaultpackage, dm_safe(compressedoptions));
 
 #if defined (__WIN32__)
-  disp.setmacro ("win32", "Global", "1");
+  disp.setmacro ("win32", displayclass::defaultpackage, "1");
 #endif
 
@@ -1415 +1415 @@
       // need to escape special characters from query string
       disp.setmacro ("cgiarg" + (*argshere).first, 
-             "Global", html_safe((*argshere).second.value));
+             displayclass::defaultpackage, html_safe((*argshere).second.value));
     else if ((*argshere).first == "hp") {
-      disp.setmacro ("cgiarg" + (*argshere).first, "Global", (*argshere).second.value);
+      disp.setmacro ("cgiarg" + (*argshere).first, displayclass::defaultpackage, (*argshere).second.value);
     } else {
-      disp.setmacro ("cgiarg" + (*argshere).first, "Global", dm_safe((*argshere).second.value));
-    }
-    argshere ++;
+      disp.setmacro ("cgiarg" + (*argshere).first, displayclass::defaultpackage, dm_safe((*argshere).second.value));
+    }
+    ++argshere;
   }
 
   // display text right to left if language is arabic/farsi (and if browser can support it)
   if (args["l"] == "ar" || args["l"] == "fa")
-    disp.setmacro ("htmlextra", "Global", " dir=rtl");
+    disp.setmacro ("htmlextra", displayclass::defaultpackage, " dir=rtl");
 
   // set collection specific macros
@@ -1444 +1444 @@
           ((*here).first != "hasprevious")) {
         // check for args in form name:lang
-        text_t name = "";
-        text_t lang = "";
+        text_t name = g_EmptyText;
+        text_t lang = g_EmptyText;
         bool colonfound=false;
         text_t::const_iterator a = (*here).first.begin();
@@ -1458 +1458 @@
         else name.push_back(*a);
           }
-          a++;
+          ++a;
         }
         if (!lang.empty()) {
           if (args["l"]==lang) {
-        disp.setmacro (name, "Global", (*here).second.values[0]);
+        disp.setmacro (name, displayclass::defaultpackage, (*here).second.values[0]);
           }
         }
         else { // the default one
-          disp.setmacro ((*here).first, "Global", (*here).second.values[0]);
+          disp.setmacro ((*here).first, displayclass::defaultpackage, (*here).second.values[0]);
         }
       }
-      here ++;
+      ++here;
     }
       }
 
       text_t iconcollection;
-      disp.expandstring ("Global", "_iconcollection_", iconcollection);
+      disp.expandstring (displayclass::defaultpackage, "_iconcollection_", iconcollection);
       if (!iconcollection.empty())
     {
@@ -1484 +1484 @@
           // local but with full path
           iconcollection = "http://" + cinfo.httpdomain + iconcollection;
-          disp.setmacro("iconcollection", "Global", iconcollection);
+          disp.setmacro("iconcollection", displayclass::defaultpackage, iconcollection);
         }
     }