Changeset 7430

Timestamp:

2004-05-25T15:14:38+12:00 (20 years ago)

Author:

mdewsnip

Message:

(Human Info) Replaced all "" with g_EmptyText, and delete char* variables with delete[] instead of delete.

File:

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

trunk/gsdl/src/recpt/collectoraction.cpp

@@ -90 +90 @@
   arg_ainfo.multiplechar = true;
   arg_ainfo.defaultstatus = cgiarginfo::weak;
-  arg_ainfo.argdefault = "";
+  arg_ainfo.argdefault = g_EmptyText;
   arg_ainfo.savedarginfo = cgiarginfo::must;
   argsinfo.addarginfo (NULL, arg_ainfo);
@@ -98 +98 @@
   arg_ainfo.multiplechar = true;
   arg_ainfo.defaultstatus = cgiarginfo::weak;
-  arg_ainfo.argdefault = "";
+  arg_ainfo.argdefault = g_EmptyText;
   arg_ainfo.savedarginfo = cgiarginfo::mustnot; // saved on disk
   argsinfo.addarginfo (NULL, arg_ainfo);
@@ -106 +106 @@
   arg_ainfo.multiplechar = true;
   arg_ainfo.defaultstatus = cgiarginfo::weak;
-  arg_ainfo.argdefault = "";
+  arg_ainfo.argdefault = g_EmptyText;
   arg_ainfo.savedarginfo = cgiarginfo::must;
   argsinfo.addarginfo (NULL, arg_ainfo);
@@ -114 +114 @@
   arg_ainfo.multiplechar = true;
   arg_ainfo.defaultstatus = cgiarginfo::weak;
-  arg_ainfo.argdefault = "";
+  arg_ainfo.argdefault = g_EmptyText;
   arg_ainfo.savedarginfo = cgiarginfo::mustnot; // saved on disk
   argsinfo.addarginfo (NULL, arg_ainfo);
@@ -122 +122 @@
   arg_ainfo.multiplechar = true;
   arg_ainfo.defaultstatus = cgiarginfo::weak;
-  arg_ainfo.argdefault = "";
+  arg_ainfo.argdefault = g_EmptyText;
   arg_ainfo.savedarginfo = cgiarginfo::mustnot; // saved on disk
   argsinfo.addarginfo (NULL, arg_ainfo);
@@ -138 +138 @@
   arg_ainfo.multiplechar = true;
   arg_ainfo.defaultstatus = cgiarginfo::weak;
-  arg_ainfo.argdefault = "";
+  arg_ainfo.argdefault = g_EmptyText;
   arg_ainfo.savedarginfo = cgiarginfo::mustnot; // saved on disk
   argsinfo.addarginfo (NULL, arg_ainfo);
@@ -175 +175 @@
   arg_ainfo.multiplechar = true;
   arg_ainfo.defaultstatus = cgiarginfo::weak;
-  arg_ainfo.argdefault = "";
+  arg_ainfo.argdefault = g_EmptyText;
   arg_ainfo.savedarginfo = cgiarginfo::mustnot;
   argsinfo.addarginfo (NULL, arg_ainfo);
@@ -220 +220 @@
   arg_ainfo.multiplevalue = true;
   arg_ainfo.defaultstatus = cgiarginfo::weak;
-  arg_ainfo.argdefault = "";
+  arg_ainfo.argdefault = g_EmptyText;
   arg_ainfo.savedarginfo = cgiarginfo::mustnot; // saved on disk
   argsinfo.addarginfo (NULL, arg_ainfo);
@@ -229 +229 @@
   arg_ainfo.multiplevalue = true;
   arg_ainfo.defaultstatus = cgiarginfo::weak;
-  arg_ainfo.argdefault = "";
+  arg_ainfo.argdefault = g_EmptyText;
   arg_ainfo.savedarginfo = cgiarginfo::mustnot; // saved on disk
   argsinfo.addarginfo (NULL, arg_ainfo);
@@ -245 +245 @@
 
 collectoraction::~collectoraction () {
-  if (gsdlosc != NULL) delete gsdlosc;
-  if (gsdlhomec != NULL) delete gsdlhomec;
-  if (pathc != NULL) delete pathc;
+  if (gsdlosc != NULL) delete []gsdlosc;
+  if (gsdlhomec != NULL) delete []gsdlhomec;
+  if (pathc != NULL) delete []pathc;
 }
 
@@ -344 +344 @@
     // update arguments that were saved to the harddrive
     text_tmap saved_args;
-    saved_args["bc1fullname"] = "";
-    saved_args["bc1contactemail"] = "";
-    saved_args["bc1aboutdesc"] = "";
-    saved_args["bc1clone"] = "";
-    saved_args["bc1clonecol"] = "";
-    saved_args["bc1inputnum"] = "";
-    saved_args["bc1input"] = "";
-    saved_args["bc1inputtype"] = "";
+    saved_args["bc1fullname"] = g_EmptyText;
+    saved_args["bc1contactemail"] = g_EmptyText;
+    saved_args["bc1aboutdesc"] = g_EmptyText;
+    saved_args["bc1clone"] = g_EmptyText;
+    saved_args["bc1clonecol"] = g_EmptyText;
+    saved_args["bc1inputnum"] = g_EmptyText;
+    saved_args["bc1input"] = g_EmptyText;
+    saved_args["bc1inputtype"] = g_EmptyText;
 
     // update the argdb database with any arguments that were set
@@ -485 +485 @@
     current_page = "bildfail";
       }
-      delete fbldc;
+      delete []fbldc;
     }
   }
@@ -582 +582 @@
       } else if (clone && (cfgline[1] == "iconcollection" ||
                    cfgline[1] == "iconcollectionsmall")) {
-        cfgline[2] = "";
+        cfgline[2] = g_EmptyText;
       }
     }
@@ -630 +630 @@
   }
 
-  delete cfgfilec;
+  delete []cfgfilec;
 }
 
@@ -674 +674 @@
       GSDL_UNLOCK_FILE (fd);
       close(fd);
-      delete buffer;
+      delete []buffer;
       
       // now that we've written the file we'll read it back again and
@@ -707 +707 @@
   }
 
-  delete cfgfilec;
+  delete []cfgfilec;
 }
 
@@ -733 +733 @@
   if ((color != "green" && color != "grey" && color != "yellow") ||
       (type != "info" && type != "srce" && type != "conf" && type != "bild" && type != "view"))
-    return "";
+    return g_EmptyText;
 
   text_t prefix = "gc";
@@ -807 +807 @@
           // get collection name from the collection cfg file
           collectionname = cinfo->collectionmeta["collectionname"];
-        } else if (get_info ("collection", *collist_here, metadata, false, 
+        } else if (get_info ("collection", *collist_here, args["l"], metadata, false, 
                  (*rprotolist_here).p, response, logout)) {
           // get collection name from gdbm file
@@ -1009 +1009 @@
     message = "tmpfail";
   }    
-  delete cfgfilec;
+  delete []cfgfilec;
 }
 
@@ -1293 +1293 @@
       char *cfgfilec = cfgfile.getcstr();
       ifstream cfg_in (cfgfilec);
-      delete cfgfilec;
+      delete []cfgfilec;
       if (cfg_in) {
     text_tarray cfgline;
@@ -1333 +1333 @@
     char *eventlogt = eventlog.getcstr();
     ofstream eventl (eventlogt, ios::app);
-    delete eventlogt;
+    delete []eventlogt;
 
     if (eventl) {
@@ -1364 +1364 @@
     char *tmpmailfilec = tmpmailfile.getcstr();
     ofstream tmpfile (tmpmailfilec);
-    delete tmpmailfilec;
+    delete []tmpmailfilec;
     if (tmpfile) {
       tmpfile << outconvert << "[Collector Event]\n"
@@ -1600 +1600 @@
   char *optionfilec = optionfile.getcstr();
   ofstream ofile_out (optionfilec);
-  delete optionfilec;
+  delete []optionfilec;
   if (!ofile_out) {
     message = "tmpfail";
@@ -1623 +1623 @@
     char *createfilec = createfile.getcstr();
     ofstream cfile_out (createfilec);
-    delete createfilec;
+    delete []createfilec;
     if (cfile_out) {
       cfile_out << "collection created\n";
@@ -1660 +1660 @@
     char *buildfilec = buildfile.getcstr();
     ofstream bfile_out (buildfilec);
-    delete buildfilec;
+    delete []buildfilec;
     if (bfile_out) {
       bfile_out << "collection building\n";
@@ -1729 +1729 @@
   char *optionfilec = optionfile.getcstr();
   ofstream ofile_out (optionfilec);
-  delete optionfilec;
+  delete []optionfilec;
   if (!ofile_out) {
     message = "tmpfail";
@@ -1770 +1770 @@
 }
 
-text_t collectoraction::get_collectdir (cgiargsclass &args) {
-
+text_t collectoraction::get_collectdir (cgiargsclass &args)
+{
   if ((args["bc1econf"] == 1) || (args["bc1esrce"] == 1)) {
     // we're adding to a collection in place
     return filename_cat(gsdlhome, "collect");  
-
-  } else {
+  }
+  else {
     return filename_cat (gsdlhome, "tmp", args["bc1tmp"]);
   }
@@ -1881 +1881 @@
   char *filenamec = filename.getcstr();
   ofstream eheadfile (filenamec);
-  delete filenamec;
+  delete []filenamec;
 
   if (eheadfile) {