Changeset 1617

Timestamp:

2000-10-26T19:40:20+13:00 (24 years ago)

Author:

jrm21

Message:

Added some flags so we don't connect to the z-server as often as we were...
z3950proto::filter is called 8 times for a get document request!!!!!
Actually, this also fixed a problem I was having connecting to a particular
zserver, as the server was returning an error on about the 7th call to filter()

Location:

trunk/gsdl/src/recpt

Files:

• z3950proto.cpp (modified) (1 diff)
• z3950server.cpp (modified) (5 diffs)
• z3950server.h (modified) (1 diff)

trunk/gsdl/src/recpt/z3950proto.cpp

@@ -34 +34 @@
 #include "z3950cfg.h" // for reading in config files - 
 // defines "struct z3950cfg *zserver_list" as the head of the list.
+
+// note! yyin is hash-defined in z3950cfg.h to something else, to avoid
+// name conflicts with "other" yyins.
 extern FILE *yyin;
 extern "C" {

trunk/gsdl/src/recpt/z3950server.cpp

@@ -41 +41 @@
   connected=false;
   titles=NULL;
+  gotsinglerecord=false;
   // for now, assume that all records will have text associated with them.
   meta["hastxt"]="1";
@@ -157 +158 @@
                        int first, int count,
                        int *nummatches, comerror_t &err) {
-  char **c_str_titles;
+  /* NOTE!!!!!! Because this code currently only works in cgi-bin mode,
+     we only ever do one request. Therefore, it is CURRENTLY OK to store
+     (cache) the retrieved titles, because if this function is ever called
+     more than once, the arguments will be the same each time.
+     (I think :)
+  */
+
+  char **c_str_titles; 
   int i;
   int last;
-  if (titles!=NULL) delete (titles);
+
+  if (gotsinglerecord==true) {
+    /* If true, then this whole execution was done to retrieve a single
+       document. Therefore, the list of titles of all records matching the
+       query isn't actually required. It's just that for some reason our
+       filter (z3950proto::filter) gets called at least 7 times, with the
+       7th being a "QueryFilter" for some reason... */
+    nummatches=0;
+    return NULL; /* shouldn't really return NULL, but nummatches is checked
+            first (I hope) */
+  }
+
+  //  if (titles!=NULL) delete (titles);
+  if (titles!=NULL) return titles;
   titles=new text_tarray;
 
@@ -218 +239 @@
                  text_t &rettitle, 
                  text_t &rettext, comerror_t &err) {
+
+  static char **c_str_titles=NULL;
+  static char *fulltext=NULL;
+  /* NOTE!!!!!! Because this code currently only works in cgi-bin mode,
+     we only ever do one request. Therefore, it is CURRENTLY OK to store
+     (cache) the retrieved titles, because if this function is ever called
+     more than once, the arguments will be the same each time.
+     (I think :)
+  */
+
+  gotsinglerecord=true; // well, not yet, but we've been called...
+
   if (connected==false) {
     if (connect()==false) {
@@ -239 +272 @@
   }
 
+  if (c_str_titles==NULL)
+    c_str_titles=z_getrecordTitles(ID,1); // check this return value.
+  
   if (rettitle!="unneeded") {
-    char **c_str_titles;
     //int dummy;
-    c_str_titles=z_getrecordTitles(ID,1); // 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="Dummy Title";
+      //////      free (c_str_titles); - we want to "cache" it
     } else {
       // we didn't get something....
@@ -253 +286 @@
   }
 
+  if (fulltext==NULL)
+    // get the text
+    fulltext=z_getfullRecord(ID);
+
   if (rettext!="unneeded") {
-    // get the text
-    rettext.setcstr(z_getfullRecord(ID));
+    rettext.setcstr(fulltext);
   }
   return (true);

trunk/gsdl/src/recpt/z3950server.h

@@ -41 +41 @@
   bool connect();
   bool connected; // tcp connection to the z39.50 server (target)
+  bool gotsinglerecord; // if we do, then we don't need all titles...
 
  public: