Changeset 1738 for trunk/gsdl/src/recpt/z3950proto.cpp

Timestamp:

2000-12-04T17:08:12+13:00 (23 years ago)

Author:

jrm21

Message:

all calls to text_t.getcstr() now delete the returned ptr. Also, we
remove any " chars from the string as this may ruin the query. We don't
yet do any post-processing to filter for phrases...

File:

• trunk/gsdl/src/recpt/z3950proto.cpp (modified) (5 diffs)

trunk/gsdl/src/recpt/z3950proto.cpp

@@ -69 +69 @@
   //  FILE *errfile declared in z3950cfg.h, defined in zparse.y
 
-  if ((errfile=fopen(errf.getcstr(),"a"))==NULL) {
+  char *errf_str=errf.getcstr();
+  if ((errfile=fopen(errf_str,"a"))==NULL) {
     // what do we do if we can't open the error file?
     // this means that errors will go to stderr, which may stuff up 
@@ -75 +76 @@
     errfile=stderr;
   }
+  delete errf_str;
   yyout=errfile;
 
@@ -80 +82 @@
   // which is the bison output of zparse.y
   
-  yyin=fopen(filename.getcstr(),"r");
+  char *filename_str=filename.getcstr();
+  yyin=fopen(filename_str,"r");
   if (yyin==NULL) {
-    cerr << "Could not open "<<filename.getcstr()<<" for reading.\n";
+    cerr << "Could not open "<<filename_str<<" for reading.\n";
+    delete filename_str;
     return;
   }
+  delete filename_str;
   zconfigparse();
 
@@ -230 +235 @@
   if (here==end) {
     err=protocolError;
+    char *coll_str=collection.getcstr();
     logout << "z39.50: couldn't find collection" 
-       << collection.getcstr()
+       << coll_str
        << endl;
+    delete coll_str;
     return;
   }
@@ -350 +357 @@
     OptionValue_tarray::iterator ov_end=request.filterOptions.end();
     while (ov_here != ov_end) {
-      //      cout << "OV pair: `" << ov_here->name.getcstr() << "'=`" 
-      //   << ov_here->value.getcstr() << "'\n";
+      // cerr << "OV pair: `" << ov_here->name.getcstr() << "'=`" 
+      //      << ov_here->value.getcstr() << "'\n";
       if (ov_here->name=="Term") 
     {