Changeset 1738

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...

Location:

trunk/gsdl/src/recpt

Files:

• z3950proto.cpp (modified) (5 diffs)
• z3950server.cpp (modified) (8 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") 
     {

trunk/gsdl/src/recpt/z3950server.cpp

@@ -85 +85 @@
 
   z_initialize();
-
-  if (z_cmd_open(server_and_port.getcstr(),info->name.getcstr())==1)
+  char* serv_str=server_and_port.getcstr();
+  char* name_str=info->name.getcstr();
+  int retval=z_cmd_open(serv_str,name_str);
+  delete serv_str;
+  delete name_str;
+  if (retval==1)
     // we got a connection error
     return false;
@@ -110 +114 @@
   // This will require us to actually come up with a query syntax and 
   // a parser. For now, we'll just do an "AND" query for all terms
+  // But look at Common Command Language (CCL) query syntax (ISO 8777).
+
+  // need to remove " chars from the query. We should really tell the server
+  // to do a phrase search on the terms that are between the "s, but we
+  // can't (easily) tell if the server can do that or not, 
+  // so we'll currently just do a query and then post-process. (not yet
+  // implemented........)
 
   // we need to count number of terms separated by a space
@@ -116 +127 @@
   bool inword=false;
   int num_terms=0;
+
   for (int i=0;i<strlength;i++) {
+    if (*(ptr+i)=='"') { // convert " to SPACE...
+      *(ptr+i)=' '; 
+    }
     if (*(ptr+i)!=' ') {
       if (inword==false) {
@@ -128 +143 @@
   }
   
-  // set the field(s) to search on - main ones (that I've found) include:
+  // set the field(s) to search on - main ones include:
   //  1016  => Any
   //  1     => (Personal) Name
@@ -150 +165 @@
     parsed_query+="@and ";
   // append the actual query
-  parsed_query+=query;
-
+  parsed_query+=ptr;
+
+  delete ptr;
 }
 
@@ -196 +212 @@
   parseQuery(query,fields,expanded_query);
 
+  char* query_str=expanded_query.getcstr();
   // following functions defined in yaz_zclient.c
-  *nummatches=z_cmd_dosearch(expanded_query.getcstr()); // returns # found, -1 on err.
+  *nummatches=z_cmd_dosearch(query_str); // returns # found, -1 on err.
+  delete query_str;
   if (*nummatches<=0) {
     if (*nummatches==0) {
@@ -263 +281 @@
     parseQuery(query,fields,expanded_query);
 
-    int returned=z_cmd_dosearch(expanded_query.getcstr());
+    char* query_str=expanded_query.getcstr();
+    int returned=z_cmd_dosearch(query_str);
+    delete query_str;
     if (returned<=0) {
       // 0 => none.
@@ -308 +328 @@
   if (connect()==false) {
     z_initstr.setcstr("<H2>Server offline</H2>Error - could not connect to server <B>");
-    z_initstr += info->host.getcstr();
+    z_initstr += info->host;
     z_initstr += "</B> on port ";
     z_initstr += info->port;