Changeset 1191 for branches

Timestamp:

2000-05-25T11:28:32+12:00 (24 years ago)

Author:

johnmcp

Message:

Checkpoint: z39.50 collections can now connect and query (and show query
results). Todo: get individual documents, and get working under fast-cgi.

Location:

branches/z3950-branch/gsdl/src/recpt

Files:

• parse.fl (modified) (3 diffs)
• z3950proto.cpp (modified) (20 diffs)
• z3950proto.h (modified) (2 diffs)
• z3950server.cpp (modified) (2 diffs)
• z3950server.h (modified) (2 diffs)
• zparse.y (modified) (3 diffs)

branches/z3950-branch/gsdl/src/recpt/parse.fl

@@ -28 +28 @@
     int string_len;
 
-{COMMENT}       lineno++;yylval.string=yytext;
+{COMMENT}       lineno++;/*yylval.string=yytext;*/yyleng=0;
 ,           return (',');
 :           return (':');
@@ -66 +66 @@
 \"          {string=NULL;BEGIN(STRINGCOND);}
 <STRINGCOND>{
-  ([^\"\\])*        {/* append this to our current string */
+  ([^\"\\\n])*      {/* append this to our current string EXC NEWLINE */
+            if (string==NULL) string_len=0; else
+            string_len=strlen(string);
+            string=realloc(string,string_len+strlen(yytext)+1);
+            /* +1 is for trailing \0 */
+            strcpy(string+string_len,yytext);
+            }
+  ([^\"\\])*\n      {/* append this to our current string - INC NEWLINE */
+            lineno++;
             if (string==NULL) string_len=0; else
             string_len=strlen(string);
@@ -88 +96 @@
             }
 }
-[[:alnum:]@\.]+     yylval.string=strdup(yytext);return (DATA);
+[[:alnum:]@\.-]+    yylval.string=strdup(yytext);return (DATA);
 (" "|\t)        ;
 (\n|\r)         lineno++;

branches/z3950-branch/gsdl/src/recpt/z3950proto.cpp

@@ -5 +5 @@
 #include "z3950proto.h"
 #include "comtypes.h"
-#include <stdio.h>
+#include "browsefilter.h"
+#include "queryfilter.h"
+#include "filter.h"
 // z39.50 yaz stuff
-
-
+#include <stdio.h> // for (FILE *) type for yyin and fopen.
 // config file parsing stuff
 #include "z3950cfg.h" // for reading in config files - 
@@ -17 +18 @@
 }
 
+
+
+
 z3950proto::z3950proto() {
   zserver_count=0;
@@ -24 +28 @@
 }
 
-void z3950proto::add_server (const z3950_server& zserver) {
+void z3950proto::add_server (z3950_server& zserver) {
 
   // append the new server
   zserver_count++;
-  zservers.push_back(zserver);
+  zservers.push_back(&zserver);
 }
 
@@ -67 +71 @@
     if (here->smallicon!=NULL)
       zserver->setMeta("iconcollectionsmall",here->smallicon);
-    if (0) {
-      cerr << "creating metadata:\n\tcolname is " << here->longname
-       << "\n\ticoncollection is " << here->icon
-       << "\n  and\ticoncollectionsmall is " << here->smallicon
-       << "\n";
-    }
+    
+    /*    filterclass *filter = new filterclass ();
+      zserver->add_filter (filter);
+      browsefilterclass *browsefilter = new browsefilterclass();
+      zserver->add_filter (browsefilter);
+      queryfilterclass *queryfilter = new queryfilterclass();
+      zserver->add_filter (queryfilter);
+    */
 
     // About list
@@ -80 +86 @@
 
       while (about_here!=NULL) {
-    // problem with default lang (null):
+    // problem with default lang (null): can't add ("",..)
     if (about_here->lang==NULL)
-      zserver->addAbout("en",about_here->text);
+      zserver->addcfgAbout("en",about_here->text);
     else
-      zserver->addAbout(about_here->lang, about_here->text);
+      zserver->addcfgAbout(about_here->lang, about_here->text);
     oldabout=about_here;
     about_here=about_here->next;
@@ -103 +109 @@
     free(oldhere);
 
-
     add_server(*zserver);
-    /* assume that the push_back operator creates a copy.
-       BUT: doesn't create copies of structures pointed to... only
-       creates a copy of the pointer (to the same location!) */
   } // end of while loop.
 
@@ -155 +157 @@
   z3950_server_array::iterator end = zservers.end();
   while (here != end) {
-    collist.push_back(here->getName());
+    collist.push_back((*here)->getName());
     //const ShortColInfo_t *info=here->getInfo();
     //collist.push_back(info->name);
@@ -167 +169 @@
   z3950_server_array::iterator end = zservers.end();
   while (here != end) {
-    if(here->getName()==collection) {
+    if((*here)->getName()==collection) {
       hascollection=true;
       return;
@@ -192 +194 @@
   z3950_server_array::iterator end = zservers.end();
   while (here != end) {
-    if(here->getName()==collection) {
+    if((*here)->getName()==collection) {
       break;
     }
@@ -208 +210 @@
   }
 
-  const ShortColInfo_t *colinfo=here->getInfo();
+  const ShortColInfo_t *colinfo=(*here)->getInfo();
   collectinfo.shortInfo.name=colinfo->name;
   collectinfo.shortInfo.host=colinfo->host;
@@ -219 +221 @@
   // leave ccsCols empty (no cross-coll. searching - for now)
   /*collectinfo.ccsCols=(text_tarray);*/ //not like this!!!
-  // This info is available from the config file -- johnmcp */
-  collectinfo.languages.push_back("en");
-  collectinfo.languages.push_back("fr");
+  // This info is available from the config file -- johnmcp
+  /*******collectinfo.languages.push_back("en");
+      collectinfo.languages.push_back("fr");********/
   collectinfo.numDocs=0;
   collectinfo.numWords=0;
@@ -227 +229 @@
   // copy the text maps over.
   //  collectinfo.collectionmeta; // text_tmap
-  collectinfo.collectionmeta=*(here->getMeta());
+  collectinfo.collectionmeta=*((*here)->getMeta());
   /* collectinfo.format; //text_tmap
     collectinfo.building; //text_tmap
@@ -239 +241 @@
 
 void z3950proto::get_filterinfo (const text_t &/*collection*/,
-                 InfoFiltersResponse_t &/*response*/,
+                 InfoFiltersResponse_t &response,
                  comerror_t &/*err*/, ostream &/*logout*/) {
-
+  // we'll fake it here, and say we have set up some filters
+  response.filterNames.insert("BrowseFilter");
+  response.filterNames.insert("QueryFilter");
+  response.filterNames.insert("NullFilter");
+
+}
+
+void z3950proto::get_filteroptions (const text_t &/*collection*/,
+                    const InfoFilterOptionsRequest_t &/*req*/,
+                    InfoFilterOptionsResponse_t &response, 
+                    comerror_t &err, ostream &/*logout*/) {
+  // for now, assume all servers have the same characteristics
+  /*  if (request.filterName=="QueryFilter") { } 
+      else if (request.filterName=="BrowseFilter") { } 
+      else if (request.filterName=="NullFilter") {  } */
+  response.filterOptions["Index"].type=FilterOption_t::stringt;
+  response.filterOptions["Index"].repeatable=FilterOption_t::onePerQuery;
+  response.filterOptions["Index"].defaultValue="any";
+  response.filterOptions["Index"].validValues.push_back(".any");
+  response.filterOptions["Index"].validValues.push_back(".title");
+  response.filterOptions["Index"].validValues.push_back(".author");
+  // and maybe ["Language"] option as well?
+  err=noError;
 }
 
@@ -262 +286 @@
 
   // cerr now goes to errout.txt in etc directory
+  err=noError;
 
   // get relevant "collection"
@@ -267 +292 @@
   z3950_server_array::iterator zend = zservers.end();
   while (zserver != zend) {
-    if(zserver->getName()==collection) {
+    if((*zserver)->getName()==collection) {
       break;
     }
@@ -276 +301 @@
   //  ColInfoResponse_t *info = new ColInfoResponse_t;
   ColInfoResponse_t info;
-  ResultDocInfo_t *docInfo=new ResultDocInfo_t;
+  ResultDocInfo_t *docInfo;
   
-
   // leave response.termInfo empty
-  // leave response.docInfo empty
-  /* got the following for first query:
-     request.filterResultOptions=FRmetadata;
-     request.getParents=getParents
-     request.fields=metadata
-     request.docSet (includes OID);
-  */
-
   // response.termInfo.push_back(""); ??????? (should be empty if not req.)
 
-
   // See if this is for a query action
-  /*** johnmcp **********
-       this is not enough, as FROID is set for the about action,
-       and furthermore, the number of docInfo's (+1?) seems to imply the number
-       of search methods. 
-       ** ABOUT ACTION
-       * OIDtools.get_children()
-       .   FRmetadata, FilterOptions ParentNode=''
-       * OIDtools.get_info()
-       .   FRmetadata 
-       ** QUERY ACTION
-       * OIDtools.get_info() <- receptionist.define_general_macros()
-       .    FRmetadata, no OptionValues
-       * queryaction.search_single_collection
-       .  FRmetadata | FROID | FRtermFreq, fltrOps Term/QueryType/Casefold/..
-  */
-  if (request.filterResultOptions & /*FROID*/FRtermFreq) {
-    // Pretty bad hack: this is assuming
-    // FRtermFreq is only set for query action, not about action.
-
-    //  what about:
-    // OptionValue_tarray filterOptions
-    // docSet
-    // requestParams
-    // refParams
-    // fields -- requested metadata fields.
-  /*
-    if (!request.requestParams.empty()) 
-    cout << "RequestParams: " << request.requestParams.getcstr() << "\n";
-    if (!request.refParams.empty()) 
-    cout << "RefParams: " << request.refParams.getcstr() << "\n";
-  */    OptionValue_tarray::iterator ov_here=request.filterOptions.begin();
-  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";
-    ov_here++;
-  }/*
-    cout << "end\n\n";
-  */
-
+  /*** johnmcp **** - could check filterName??????? ********/
+  /*    if (!request.requestParams.empty()) 
+    cout << "RequestParams: " << request.requestParams.getcstr() << "\n";
+    if (!request.refParams.empty()) 
+    cout << "RefParams: " << request.refParams.getcstr() << "\n";
+  */    
+  /* cout << "filterOptions:\n";
+     OptionValue_tarray::iterator ov_here=request.filterOptions.begin();
+     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";
+     ov_here++;
+     }*/
+  
+  // fields is type text_tset;
+  /* cout << "Fields:\n";
+     text_tset::iterator fields_h=request.fields.begin();
+     text_tset::iterator fields_e=request.fields.end();
+     while (fields_h != fields_e) {
+     cout << "Field: " << fields_h->getcstr() << "\n";
+     fields_h++;
+     }*/
+  
+
+  // if this is true, we assume query action.
+  //  if (request.filterResultOptions & /*FROID*/FRtermFreq) {
+  if (request.filterName=="QueryFilter") {
     /* Sample OptionValue pairs
       `StartResults'=`1'
@@ -342 +345 @@
       `Maxdocs'=`50'
      */
-    docInfo->metadata["Title"].values.push_back("dummy title");
-    docInfo->result_num=1;
+    // go through options
+    text_t opt_term;
+    int opt_start=1, opt_end=20; // default values
+    int nummatches=0, maxdocs=50; // default values
+    OptionValue_tarray::iterator ov_here=request.filterOptions.begin();
+    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";
+      if (ov_here->name=="Term") {
+    opt_term=ov_here->value;
+      } else if (ov_here->name=="StartResults") {
+    opt_start=ov_here->value.getint();
+      } else if (ov_here->name=="EndResults") {
+    opt_end=ov_here->value.getint();
+      } else if (ov_here->name=="Maxdocs") {
+    maxdocs=ov_here->value.getint();
+      }
+      ov_here++;
+    }
+    err=noError;
+    text_tarray *titles=(*zserver)->getbriefrecords(opt_term,
+                            opt_start,
+                            opt_end-opt_start, //count
+                            &nummatches,err);
+    if (err!=noError) {
+      // can we return an err msg in a response, or just use
+      // the more drastic Greenstone error mechanism?
+      docInfo=new ResultDocInfo_t;
+      response.docInfo.push_back(*docInfo);
+      logout << "z3950 filter query: error connecting to server\n";
+      return;
+    }
+    // check if (titles==NULL) - only happens on error?
+
+    text_tarray::iterator titles_here=titles->begin();
+    text_tarray::iterator titles_end=titles->end();
+    int counter=1;
+    while (titles_here!=titles_end) {
+     docInfo=new ResultDocInfo_t; 
+      docInfo->metadata["Title"].values.push_back(*titles_here);
+      docInfo->result_num=counter;
+      // we need to give some OID, so we'll just use counter for now...
+      // make it the number into the whole possible retrieved set.
+      docInfo->OID=counter+opt_start-1;
+      response.docInfo.push_back(*docInfo);
+      counter++;
+      titles_here++;
+    }
 
     if (request.filterResultOptions & FRtermFreq) {
-      response.numDocs=2;
-      response.isApprox=Exact; // Exact | Approximate | MoreThan
-    }
-
-  response.docInfo.push_back(*docInfo);
-  // create a 2nd dummy record
-  docInfo=new ResultDocInfo_t;
-  docInfo->metadata["Title"].values.push_back("another title");
-  docInfo->result_num=2;
-  response.docInfo.push_back(*docInfo);
-  
+      if (nummatches>maxdocs) {
+        response.numDocs=maxdocs; // eg "more than 50" (if Maxdocs==50)
+    response.isApprox=MoreThan;
+      } else {
+    response.numDocs=nummatches; // eg "36 documents"
+    response.isApprox=Exact; // Exact | Approximate | MoreThan
+      }
+    } // end of if (... & FRtermFreq)
+    
   } // end of if (... & FROID)
   else {
@@ -364 +412 @@
     request.filterOptions[0].name=="ParentNode") {
       // don't want to return anything
-      //delete (docInfo);
+      return;
+      /*    } else if (request.docSet.size() &&
+        request.docSet[0]!="collection") {
+        // documentaction
+        // if docSet is not empty, it is either "collection", or an array
+        // of OIDs 
+        docInfo=new ResultDocInfo_t;
+        response.docInfo.push_back(*docInfo);
+      */
     } else {
       // in case we need to return only metadata
+      docInfo=new ResultDocInfo_t;
       response.docInfo.push_back(*docInfo); 
     }
@@ -395 +452 @@
       if (it!=info.collectionmeta.end())
         docs_here->metadata[*fields_here].values.push_back((*it).second);
-      else {
+      else if (*fields_here=="Title") { 
+        text_t title;
+        int i;
+        // check that docSet isn't empty!!!@!!!
+        i=request.docSet[0].getint();
+        text_t doctext="unneeded";
+        (*zserver)->getfullrecord(i, title, doctext,err);
+        // check err value!
+        docInfo->metadata["Title"].values.push_back(title);     
+      } else {
         docs_here->metadata[*fields_here].values.push_back("");
         /////// cerr << " (not found)";
@@ -416 +482 @@
     colmeta_here++;
       }
-      // get data from target.
+
       // check if "collectionextra" metadata is set. If it isn't, we should
       // create connection to target to get it.
       if (info.collectionmeta.find("collectionextra")==colmeta_end) {
-    // it doesn't exist.
-    text_t *abouttext;
-    // this gets the server's name and id, plus MOTD, etc.
-    abouttext=zserver->connect_getAbout();
-    // add in the text we read in from config file.
+    // it hasn't been set yet...
+    text_t abouttext="<B>Server Online</B><br>\n";
+    abouttext+=(*zserver)->getzAbout();
+    // add in the "About" text we read in from config file.
     // how do we incorporate multi-lingual metadata?
-    (*abouttext)+="<P>\n";
-    (*abouttext)+=zserver->getAbout("en"); 
-    zserver->setMeta("collectionextra",*abouttext);
-    response.docInfo[0].metadata["collectionextra"].values.push_back(*abouttext);
-    delete (abouttext);
+    abouttext+="<P>\n";
+    text_t tmpabout;
+
+    if ((*zserver)->getcfgAbout("en", tmpabout)==true)
+      abouttext+=tmpabout;
+
+    (*zserver)->setMeta("collectionextra",abouttext);
+    response.docInfo[0].metadata["collectionextra"].values.push_back(abouttext);
       }
     } // end of else
-    
+
+    // do indices' names, regardless of whether asked for or not...
+    response.docInfo[0].metadata[".author"].values.push_back("author fields");
+    response.docInfo[0].metadata[".title"].values.push_back("title fields");
+    response.docInfo[0].metadata[".any"].values.push_back("any fields");
   } //end of  if (... & FRmetadata) ...
-
-
+}
+
+
+
+void z3950proto::get_document (const text_t &collection,
+                   const DocumentRequest_t &request,
+                   DocumentResponse_t &response,
+                   comerror_t &err, ostream &logout) {
 
   err=noError;
-}
-
-void z3950proto::get_document (const text_t &/*collection*/,
-                   const DocumentRequest_t &/*request*/,
-                   DocumentResponse_t &/*response*/,
-                   comerror_t &err, ostream &logout) {
-
+
+  // get relevant "collection"
+  z3950_server_array::iterator zserver = zservers.begin();
+  z3950_server_array::iterator zend = zservers.end();
+  while (zserver != zend) {
+    if((*zserver)->getName()==collection) {
+      break;
+    }
+    zserver++;
+  }
+  // now have collection in zserver.
+
+  /*  cout << "get document:\n\tOID: " << request.OID.getcstr()
+      << "\n\tdocType: " << request.docType.getcstr()
+      << "\n\tdocFormat: " << request.docFormat.getcstr() <<"\n";
+  */
+
+  /* docresponse consists of
+     text_t response.doc */
+  text_t title="unneeded";
+  text_t doctext;
+  (*zserver)->getfullrecord(request.OID.getint(),title,doctext,err);
+  // check return value of above? (false=>not connected) 
+  if (err==noError)
+    response.doc=doctext;
+  else {
+    // could print out different messages based on error type....
+    response.doc="<h2>Error</h2>There was an error while connecting to the ";
+    response.doc+="z39.50 server (ie target). Most likely this was a \n";
+    response.doc+="\"Connection Refused\" error.\n";
+
+  }
   if (0) {
     err=protocolError;

branches/z3950-branch/gsdl/src/recpt/z3950proto.h

@@ -20 +20 @@
   */
   
-  void add_server(const z3950_server& zserver);
+  void add_server(z3950_server& zserver);
 
   void read_config_file(const text_t &filename);
@@ -50 +50 @@
       FilterResponse_t &response, ostream &logout);
   */
+
+  void get_filteroptions (const text_t &collection,
+                          const InfoFilterOptionsRequest_t &request,
+                          InfoFilterOptionsResponse_t &response, 
+                          comerror_t &err, ostream &logout);
   
   void filter (const text_t &collection,

branches/z3950-branch/gsdl/src/recpt/z3950server.cpp

@@ -14 +14 @@
 z3950_server::z3950_server() {
   info=NULL;
+  connected=false;
+  titles=NULL;
+  // for now, assume that all records will have text associated with them.
+  meta["hastxt"]="1";
 }
 
@@ -28 +32 @@
 }
 
-void z3950_server::addAbout(const text_t &lang, const text_t &abouttext) {
+void z3950_server::addcfgAbout(const text_t &lang, const text_t &abouttext) {
     about[lang]=abouttext;
 }
 
-const text_t &z3950_server::getAbout(const text_t &lang) {
+bool z3950_server::getcfgAbout(const text_t &lang, text_t &abouttxt) {
   text_tmap::iterator it;
   it=about.find(lang);
-  return ((*it).second);
+  if (it==about.end()) return (false);
+  abouttxt=((*it).second);
+  return (true);
 }
 
-text_t *z3950_server::connect_getAbout() {
-  // Assume we have not yet connected, so that must be done here.
-  text_t *returned;
-  returned=new text_t;
+
+// now functions that actually talk over the tcp connection.
+
+// create a tcp connection to the associated target. Currently, this will
+// re-initialise if we are already connected.
+bool z3950_server::connect() {
+  text_t server_and_port;
+  char *zserverinfo;
+
+  server_and_port=info->host+":"+info->port;
+  // remember that info.name is the database name
 
   z_initialize();
-  text_t server_and_port;
-  server_and_port=info->host+":"+info->port;
-  // remember that info.name is the database name
-  if (z_cmd_open(server_and_port.getcstr(),info->name.getcstr())==1) {
+
+  if (z_cmd_open(server_and_port.getcstr(),info->name.getcstr())==1)
     // we got a connection error
-    returned->setcstr("<H2>Server offline</H2>Error - could not connect to server <B>");
-    (*returned) += info->host.getcstr();
-    (*returned) += "</B> on port ";
-    (*returned) += info->port;
-    (*returned) += "\n";
-    return (returned);
+    return false;
+
+  // get initialisation response.
+  z_getnextAPDU();
+  zserverinfo=z_get_initResponse();
+  if (zserverinfo!=NULL) {
+    z_initstr.appendcstr(zserverinfo);
+  }
+  free(zserverinfo);
+
+  connected=true;
+  return true;
+}
+
+text_tarray *z3950_server::getbriefrecords(const text_t &query, 
+                       int first, int count,
+                       int *nummatches, comerror_t &err) {
+  char **c_str_titles;
+  int i;
+  int last;
+  if (titles!=NULL) delete (titles);
+  titles=new text_tarray;
+
+  if (connected==false) 
+    if (connect()==false) {
+      // we could not connect.
+      err=protocolError;
+      return (NULL);
+    }
+  
+
+  // We need to format the query string into RPN - 
+  // by just passing it like this, it will only work for simple queries.
+  /* check if connected */
+  /*  titles->push_back("first dummy title");
+      titles->push_back("Second dummy title");
+      return titles;
+  */
+  // following functions defined in yaz_zclient.c
+  *nummatches=z_cmd_dosearch(query.getcstr()); // returns # found, -1 on err.
+  // could just check if (*nummatches)==0.
+
+  // could do a sort eventually, eg on date, title, etc.
+  // (non-existent function)    z_sort(field, asc|desc);
+  /* min of (count, first + (*nummatches) ) */
+  c_str_titles=z_getbriefrecords(first,count);
+  if (c_str_titles==NULL) {
+    // an error occurred. we need a logout/err as an arg
+    return (NULL);
+  }
+  if (c_str_titles[0]==0) {
+    // no matches.
+    return (NULL);
+  }
+  last=(int)c_str_titles[0];
+  for (i=1;i<=last;i++) {
+    titles->push_back(c_str_titles[i]);
+    free(c_str_titles[i]);
+  }
+  free(c_str_titles);
+  return (titles);
+  
+}
+
+bool z3950_server::getfullrecord(const int ID, text_t &rettitle, 
+                text_t &rettext, comerror_t &err) {
+  if (connected==false) {
+    if (connect()==false) {
+      // error connecting...
+      err=protocolError;
+      return (false);
+    }
+    // since we have just re-connected, we need to do the
+    // query again.
   }
 
-  z_getnextAPDU(0);
-  (*returned)+="Internet server: <b>";
-  (*returned)+=info->host;
-  (*returned)+="</b> on port ";
-  (*returned)+=info->port;
-  (*returned)+=".<br>\n";
-  (*returned)+=z_get_initResponse();
-  if (returned==NULL) {
-    cerr << "Null was returned\n";
+  if (rettitle!="unneeded") {
+    /*char **c_str_titles;
+      int dummy;
+      c_str_titles=z_getbriefrecords("the",ID,1,&dummy); // check this return value.
+      if (c_str_titles!=NULL && (int)c_str_titles[0]==1) {
+      rettitle.setcstr(c_str_titles[1]); // and check this 
+      free (c_str_titles);
+    */
+    //    rettitle=(*titles)[ID]; // this isn't quite right, as ID isn't the offset
+    rettitle="Dummy Title";
   }
-  // should close
-  z_cmd_close(0);
-  return (returned);
+  
+  if (rettext!="unneeded") {
+    // get the text
+    rettext="Dummy Text. This is here as a placeholder until I work out";
+    rettext+=" a way to get the query again when running in simple cgi\n";
+    rettext+="as after each page is completed, the connection is lost to the";
+    rettext+=" server, and we forget what the query was\n";
+  }
+  return (true);
 }
+
+text_t &z3950_server::getzAbout() {
+  text_t zserverresp;
+
+  // Assume we have not yet connected, so that must be done here.
+  if (connected==true)
+    return (z_initstr);
+  
+  // we need to create the tcp connection to the target (server)  
+  //  z_initstr=new text_t;
+  
+  if (connect()==false) {
+    z_initstr.setcstr("<H2>Server offline</H2>Error - could not connect to server <B>");
+    z_initstr += info->host.getcstr();
+    z_initstr += "</B> on port ";
+    z_initstr += info->port;
+    z_initstr += "\n";
+    return (z_initstr);
+  }
+  
+  // z_initstr currently contains the target's response. We want to
+  // PREPEND the following information.
+  zserverresp=z_initstr;
+  z_initstr="Internet server: <b>";
+  z_initstr+=info->host;
+  z_initstr+="</b> on port ";
+  z_initstr+=info->port;
+  z_initstr+=".<br>\n";
+  z_initstr+=zserverresp;
+
+  // should close /******* WHAT IF DOING A QUERY!??!?!? ********/
+  // z_cmd_close(0);
+  // connected=false;
+  return (z_initstr);
+}
+

branches/z3950-branch/gsdl/src/recpt/z3950server.h

@@ -8 +8 @@
  protected:
   text_t title;    // Descriptive name
+  text_t z_initstr; // a string returned when the connection is initialised.
   text_tmap meta;  // metadata for this collection (ie server/database pair)
   text_tmap about; // langauge/abouttext pair for collection.
   ShortColInfo_t *info; // has  (database) name, host and port
+  text_tarray *titles; 
+  bool connect();
+  bool connected; // tcp connection to the z39.50 server (target)
 
  public:
@@ -21 +25 @@
   void setInfo(ShortColInfo_t *newinfo) {info=newinfo;}
   const ShortColInfo_t *getInfo() {return info;}
-  void addAbout(const text_t &lang, const text_t &abouttext);
-  const text_t &getAbout(const text_t &lang);
-  // now the functions that actually talk to the target (ie zserver)
-  // over tcp
-  text_t *connect_getAbout();
+  void addcfgAbout(const text_t &lang, const text_t &abouttext);
+  bool getcfgAbout(const text_t &lang, text_t &abouttext);
+  // now the functions that actually talk to the target (ie zserver) over tcp
+  text_t &getzAbout(); // gets any name, id, MOTD, etc from server.
+  text_tarray *getbriefrecords(const text_t &query,
+                   const int first, const int count,
+                   int *nummatches, comerror_t &err);
+  /* only get one record at a time? (Eventually we could buffer them, but
+     for now... */
+  bool getfullrecord(const int ID, text_t &rettitle, 
+             text_t &rettext,comerror_t &err);
 };
 
-typedef  vector<z3950_server>  z3950_server_array;
+typedef  vector<z3950_server *>  z3950_server_array;
 
 #endif

branches/z3950-branch/gsdl/src/recpt/zparse.y

@@ -18 +18 @@
 /* defined in parse.fl */
 extern int lineno;
+
+#ifndef YYRECOVERING
+int YYRECOVERING=0; /* this is supposed to already be defined as a macro */
+#endif
 
 /* defined in z3950proto.cpp */
@@ -72 +76 @@
 %type <cfg>      zserver zserverlist
 %type <number>  port
-%type <string>   icon smallicon lang
+%type <string>   icon smallicon lang name
 %type <about>    about aboutLang aboutList
 %%
@@ -85 +89 @@
               | zserver ;
 
-zserver       : DATA DATA port DATA STRING icon smallicon about {
-             if(($$=malloc(sizeof(struct z3950cfg)))==NULL)
-               fprintf(stderr,"malloc failed\n");
-             $$->shortname=$1;
-             $$->hostname=$2;
-             $$->port=$3;
-             $$->dbname=$4;
-             $$->longname=$5;
-             $$->icon=$6;
-             $$->smallicon=$7;
-             $$->about=$8;
+zserver       : DATA DATA port DATA name icon smallicon about 
+                   {
+             if (YYRECOVERING)
+               {$$=NULL;YYRECOVERING=0;} 
+             else {
+               if(($$=malloc(sizeof(struct z3950cfg)))==NULL)
+             fprintf(stderr,"malloc failed\n");
+               $$->shortname=$1;
+               $$->hostname=$2;
+               $$->port=$3;
+               $$->dbname=$4;
+               $$->longname=$5;
+               $$->icon=$6;
+               $$->smallicon=$7;
+               $$->about=$8;
+             }
            }
-              | error {$$=NULL;}
+              | error {$$=NULL;printf("discarding zserver\n");}
               ;
+
+name          : STRING {;}
+              | {errormsg("Database name needs to be followed by a short "
+              "descriptive name (enclosed in \" marks)");
+             $$=NULL;
+             YYRECOVERING=1;} /* we should scrap this server */
 
 port          : ':' DATA {$$=atoi($2);}