Changeset 7381

Timestamp:

2004-05-24T15:34:40+12:00 (20 years ago)

Author:

mdewsnip

Message:

(Human Info) Now delete all char* variables from text_t.getcstr() function with delete[] variable, and all "" are now g_EmptyText (const text_t("")).

Location:

trunk/gsdl/src/recpt

Files:

• recptmain.cpp (modified) (1 diff)
• statusaction.cpp (modified) (7 diffs)
• userdb.cpp (modified) (3 diffs)
• usersaction.cpp (modified) (10 diffs)
• z3950proto.cpp (modified) (6 diffs)
• z3950server.cpp (modified) (6 diffs)

trunk/gsdl/src/recpt/recptmain.cpp

@@ -30 +30 @@
 int main () {
   receptionist recpt;
-  cgiwrapper (recpt, "");
+  cgiwrapper (recpt, g_EmptyText);
   return 0;
 }

trunk/gsdl/src/recpt/statusaction.cpp

@@ -794 +794 @@
 #endif
 
-  delete cerrfilename;
+  delete []cerrfilename;
   if (errin) {
     textout << outconvert << "<p>The error log, "
@@ -841 +841 @@
 #endif
 
-  delete gsdlsite_cfgc;
+  delete []gsdlsite_cfgc;
 
   if (gsdlsitein) {
@@ -915 +915 @@
       write(fd, buffer, num_chars);
       GSDL_UNLOCK_FILE (fd);
-      delete buffer;
+      delete []buffer;
       close (fd);
       textout << outconvert << disp << "_status:changemaincfgsuccess_";
@@ -923 +923 @@
     textout << outconvert << disp << "_status:changemaincfgfail_";
   }
-  delete cfgfilec;
+  delete []cfgfilec;
 }
 
@@ -973 +973 @@
   arg_ainfo.multiplechar = true;
   arg_ainfo.defaultstatus = cgiarginfo::none;
-  arg_ainfo.argdefault = "";
+  arg_ainfo.argdefault = g_EmptyText;
   arg_ainfo.savedarginfo = cgiarginfo::can;
   argsinfo.addarginfo (NULL, arg_ainfo);
@@ -981 +981 @@
   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);
@@ -1047 +1047 @@
       logout << "statusaction::define_internal_macros: couldn't open configuration file (" 
          << maincfgc << ") for reading\n";
-      disp.setmacro("maincfgfile", "status", "");
+      disp.setmacro("maincfgfile", "status", g_EmptyText);
     }    
-    delete maincfgc;
+    delete []maincfgc;
   }
 }

trunk/gsdl/src/recpt/userdb.cpp

@@ -48 +48 @@
   text_t crypt_password;
 
-  if (text.empty()) return "";
+  if (text.empty()) return g_EmptyText;
 
   // encrypt the password
   char *text_cstr = text.getcstr();
-  if (text_cstr == NULL) return "";
+  if (text_cstr == NULL) return g_EmptyText;
   crypt_password = crypt(text_cstr, salt);
-  delete text_cstr;
+  delete []text_cstr;
 
   return crypt_password;
@@ -236 +236 @@
 text_t format_user_groups(const text_t user_groups){
 
-  text_t new_groups = "";
+  text_t new_groups = g_EmptyText;
   text_t::const_iterator here = user_groups.begin();
   text_t::const_iterator end = user_groups.end();
@@ -287 +287 @@
 text_t generate_key (const text_t &keydbfile, const text_t &username) {
   gdbmclass keydb;
-  if (!keydb.opendatabase(keydbfile, GDBM_WRCREAT, 1000, true)) return "";
+  if (!keydb.opendatabase(keydbfile, GDBM_WRCREAT, 1000, true)) return g_EmptyText;
 
   text_t key = generate_key (keydb, username);

trunk/gsdl/src/recpt/usersaction.cpp

@@ -61 +61 @@
   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);
@@ -70 +70 @@
   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);
@@ -79 +79 @@
   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);
@@ -88 +88 @@
   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);
@@ -97 +97 @@
   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);
@@ -106 +106 @@
   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);
@@ -115 +115 @@
   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);
@@ -124 +124 @@
   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);
@@ -133 +133 @@
   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);
@@ -142 +142 @@
   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);

trunk/gsdl/src/recpt/z3950proto.cpp

@@ -76 +76 @@
     errfile=stderr;
   }
-  delete errf_str;
+  delete []errf_str;
   yyout=errfile;
 
@@ -86 +86 @@
   if (yyin==NULL) {
     cerr << "Could not open "<<filename_str<<" for reading.\n";
-    delete filename_str;
+    delete []filename_str;
     return;
   }
-  delete filename_str;
+  delete []filename_str;
   zconfigparse();
 
@@ -239 +239 @@
        << coll_str
        << endl;
-    delete coll_str;
+    delete []coll_str;
     return;
   }
@@ -335 +335 @@
   
   // leave response.termInfo empty
-  // response.termInfo.push_back(""); ??????? (should be empty if not req.)
+  // response.termInfo.push_back(g_EmptyText); ??????? (should be empty if not req.)
 
   // See if this is for a query action
@@ -484 +484 @@
            again in the request, so for now we'll take advantage of this.*/
 
-        int querytype=0; text_t field="";
+        int querytype=0; text_t field=g_EmptyText;
 
         // get the Query out of the filterOptions. (we need get the Title)
-        text_t query="";
+        text_t query=g_EmptyText;
         OptionValue_tarray::iterator opthere=request.filterOptions.begin();
         OptionValue_tarray::iterator opt_end=request.filterOptions.end();
@@ -508 +508 @@
         docs_here->metadata["Title"].values.push_back(doctitle);        
       } else {
-        docs_here->metadata[*fields_here].values.push_back("");
+        docs_here->metadata[*fields_here].values.push_back(g_EmptyText);
       }
       fields_here++;

trunk/gsdl/src/recpt/z3950server.cpp

@@ -45 +45 @@
   meta["hastxt"]="1";
   // for now, assume we don't want ANY DocumentButtons.
-  format["DocumentButtons"]="";
+  format["DocumentButtons"]=g_EmptyText;
 }
 
@@ -88 +88 @@
   char* name_str=info->name.getcstr();
   int retval=z_cmd_open(serv_str,name_str);
-  delete serv_str;
-  delete name_str;
+  delete []serv_str;
+  delete []name_str;
   if (retval==1)
     // we got a connection error
@@ -175 +175 @@
     parsed_query+=ptr;
   }
-  delete ptr;
+  delete []ptr;
 }
 
@@ -218 +218 @@
   
 
-  text_t expanded_query="";
+  text_t expanded_query=g_EmptyText;
   parseQuery(query,querytype,fields,expanded_query);
 
@@ -224 +224 @@
   // following functions defined in yaz_zclient.c
   *nummatches=z_cmd_dosearch(query_str); // returns # found, -1 on err.
-  delete query_str;
+  delete []query_str;
   if (*nummatches<=0) {
     if (*nummatches==0) {
@@ -289 +289 @@
     // query again.
 
-    text_t expanded_query="";
+    text_t expanded_query=g_EmptyText;
     parseQuery(query,querytype,fields,expanded_query);
 
     char* query_str=expanded_query.getcstr();
     int returned=z_cmd_dosearch(query_str);
-    delete query_str;
+    delete []query_str;
     if (returned<=0) {
       // 0 => none.