Changeset 9631 for trunk/gsdl

Timestamp:

2005-04-12T09:08:04+12:00 (19 years ago)

Author:

kjdon

Message:

delete -> delete [] change submitted by Emanuel Dejanu

Location:

trunk/gsdl/src/colservr

Files:

• collectset.cpp (modified) (1 diff)
• colservrconfig.cpp (modified) (3 diffs)
• mgppsearch.cpp (modified) (8 diffs)
• mgsearch.cpp (modified) (3 diffs)
• phrasesearch.cpp (modified) (1 diff)

trunk/gsdl/src/colservr/collectset.cpp

@@ -303 +303 @@
     confin.close();
   }
-  delete build_cfgc;
+  delete []build_cfgc;
 
   collectserver *cserver = new collectserver();

trunk/gsdl/src/colservr/colservrconfig.cpp

@@ -28 +28 @@
 /*
    $Log$
+   Revision 1.5  2005/04/11 21:08:04  kjdon
+   delete -> delete [] change submitted by Emanuel Dejanu
+
    Revision 1.4  2001/01/25 18:26:44  cs025
    Included CORBA branch for first time
@@ -80 +83 @@
   char *cstr = filename.getcstr();
   ifstream confin (cstr);
-  delete cstr;
+  delete []cstr;
 
   if (confin) {
@@ -122 +125 @@
   char *cstr = filename.getcstr();
   ifstream confin (cstr);
-  delete cstr;
+  delete []cstr;
 
   if (confin) {

trunk/gsdl/src/colservr/mgppsearch.cpp

@@ -132 +132 @@
   char* utf8querystring=to_utf8(queryparams.querystring).getcstr();
   SetCStr(queryArray, utf8querystring);
-  delete utf8querystring;
+  delete []utf8querystring;
 
   // create the mgpp query tree
@@ -182 +182 @@
     char* termfreq_cstr=GetCStr(queryResult.termFreqs[k].term);
     term.termstr = to_uni(termfreq_cstr);
-    delete termfreq_cstr;
+    delete []termfreq_cstr;
     term.termstemstr = term.termstr;
     // we don't set term.utf8equivterms ?? - jrm21
@@ -192 +192 @@
       char* equivterm_cstr=GetCStr(queryResult.termFreqs[k].equivTerms[j]);
       queryresult.termvariants.insert(to_uni(equivterm_cstr));
-      delete equivterm_cstr;
+      delete []equivterm_cstr;
     }
 
   }
   // clean up
-  delete indexname;
+  delete []indexname;
   return true;
 
@@ -239 +239 @@
   char* utf8querystring=to_utf8(queryparams.querystring).getcstr();
   SetCStr(browseNode.term, utf8querystring);
-  delete utf8querystring;
+  delete []utf8querystring;
 
   // do the actual query
@@ -250 +250 @@
     char* term_cstr = GetCStr(browseResult.termFreqs[i].term);
     term.termstr = to_uni(term_cstr);
-    delete term_cstr;
+    delete []term_cstr;
     term.termstemstr = term.termstr;
     term.termfreq = browseResult.termFreqs[i].termFreq;
@@ -258 +258 @@
   }
   // clean up
-  delete indexname;
+  delete []indexname;
 
   return true;
@@ -301 +301 @@
   char* doctext_cstr = GetCStr(doctext);
   output = to_uni(doctext_cstr); // convert from utf-8 to unicode
-  delete doctext_cstr;
+  delete []doctext_cstr;
 
   // here need to remove the <Document>, <Section>, <Paragraph> tags
@@ -308 +308 @@
   //clean up
   textdata.UnloadData ();
-  delete textname;
+  delete []textname;
 
   return true;

trunk/gsdl/src/colservr/mgsearch.cpp

@@ -280 +280 @@
 
   // free up the c strings
-  delete ccollection;
-  delete idxsuffix;
-  delete txtsuffix;
-  delete ccollectdir;
+  delete []ccollection;
+  delete []idxsuffix;
+  delete []txtsuffix;
+  delete []ccollectdir;
 
   return databaseloaded;
@@ -408 +408 @@
 
   // destroy the temporary character array
-  delete querystring;
+  delete []querystring;
 }
 
@@ -529 +529 @@
 //    assert (ccollection != NULL);
 //    databaseloaded = load_text_database (ccollection);
-//    delete ccollection;
+//    delete []ccollection;
   
   // try and load the database

trunk/gsdl/src/colservr/phrasesearch.cpp

@@ -214 +214 @@
       doclen = fulldoc.size();
       bool rv = doc_phrase_search ((unsigned char *)doc, doclen, phrase);
-      delete doc;
+      delete []doc;
       return rv;