Moving to v3.

[yaz-moved-to-github.git] / server / seshigh.c

diff --git a/server/seshigh.c b/server/seshigh.c
index 130716b..6811402 100644 (file)
--- a/server/seshigh.c
+++ b/server/seshigh.c
@@ -4,7 +4,22 @@
  * Sebastian Hammer, Adam Dickmeiss
  *
  * $Log: seshigh.c,v $
- * Revision 1.30  1995-06-05 10:53:32  quinn
+ * Revision 1.35  1995-06-15 07:45:14  quinn
+ * Moving to v3.
+ *
+ * Revision 1.34  1995/06/14  15:26:46  quinn
+ * *** empty log message ***
+ *
+ * Revision 1.33  1995/06/06  14:57:05  quinn
+ * Better diagnostics.
+ *
+ * Revision 1.32  1995/06/06  08:41:44  quinn
+ * Better diagnostics.
+ *
+ * Revision 1.31  1995/06/06  08:15:37  quinn
+ * Cosmetic.
+ *
+ * Revision 1.30  1995/06/05  10:53:32  quinn
  * Added a better SCAN.
  *
  * Revision 1.29  1995/06/01  11:25:03  quinn
@@ -141,7 +156,6 @@
 #include <oid.h>
 #include <log.h>
 #include <statserv.h>
-#include "../version.h"
 
 #include <backend.h>
 
@@ -293,6 +307,7 @@ void ir_session(IOCHAN h, int event)
                iochan_setevent(h, EVENT_INPUT);
                
            /* we got a complete PDU. Let's decode it */
+           logf(LOG_DEBUG, "Got PDU, %d bytes", res);
            req = request_get(); /* get a new request structure */
            odr_reset(assoc->decode);
            odr_setbuf(assoc->decode, assoc->input_buffer, res, 0);
@@ -340,6 +355,7 @@ void ir_session(IOCHAN h, int event)
                iochan_destroy(h);
                break;
            case 0: /* all sent - release the request structure */
+               logf(LOG_DEBUG, "Wrote PDU, %d bytes", req->len_response);
                odr_release_mem(req->request_mem);
                request_deq(&assoc->outgoing);
                request_release(req);
@@ -568,8 +584,13 @@ static Z_Records *diagrec(oid_proto proto, int error, char *addinfo)
 {
     static Z_Records rec;
     oident bib1;
-    static Z_DiagRec dr;
     static int err;
+#ifdef Z_95
+    static Z_DiagRec drec;
+    static Z_DefaultDiagFormat dr;
+#else
+    static Z_DiagRec dr;
+#endif
 
     bib1.proto = proto;
     bib1.class = CLASS_DIAGSET;
@@ -579,7 +600,13 @@ static Z_Records *diagrec(oid_proto proto, int error, char *addinfo)
        "NULL");
     err = error;
     rec.which = Z_Records_NSD;
+#ifdef Z_95
+    rec.u.nonSurrogateDiagnostic = &drec;
+    drec.which = Z_DiagRec_defaultFormat;
+    drec.u.defaultFormat = &dr;
+#else
     rec.u.nonSurrogateDiagnostic = &dr;
+#endif
     dr.diagnosticSetId = oid_getoidbyent(&bib1);
     dr.condition = &err;
     dr.addinfo = addinfo ? addinfo : "";
@@ -593,9 +620,14 @@ static Z_NamePlusRecord *surrogatediagrec(oid_proto proto, char *dbname,
                                            int error, char *addinfo)
 {
     static Z_NamePlusRecord rec;
-    static Z_DiagRec dr;
     static int err;
     oident bib1;
+#ifdef Z_95
+    static Z_DiagRec drec;
+    static Z_DefaultDiagFormat dr;
+#else
+    static Z_DiagRec dr;
+#endif
 
     bib1.proto = proto;
     bib1.class = CLASS_DIAGSET;
@@ -605,7 +637,13 @@ static Z_NamePlusRecord *surrogatediagrec(oid_proto proto, char *dbname,
     err = error;
     rec.databaseName = dbname;
     rec.which = Z_NamePlusRecord_surrogateDiagnostic;
+#ifdef Z_95
+    rec.u.surrogateDiagnostic = &drec;
+    drec.which = Z_DiagRec_defaultFormat;
+    drec.u.defaultFormat = &dr;
+#else
     rec.u.surrogateDiagnostic = &dr;
+#endif
     dr.diagnosticSetId = oid_getoidbyent(&bib1);
     dr.condition = &err;
     dr.addinfo = addinfo ? addinfo : "";
@@ -618,9 +656,14 @@ static Z_NamePlusRecord *surrogatediagrec(oid_proto proto, char *dbname,
 static Z_DiagRecs *diagrecs(oid_proto proto, int error, char *addinfo)
 {
     static Z_DiagRecs recs;
-    static Z_DiagRec *recp[1], rec;
     static int err;
     oident bib1;
+#ifdef Z_95
+    static Z_DiagRec *recp[1], drec;
+    static Z_DefaultDiagFormat rec;
+#else
+    static Z_DiagRec *recp[1], rec;
+#endif
 
     logf(LOG_DEBUG, "DiagRecs: %d -- %s", error, addinfo);
     bib1.proto = proto;
@@ -630,7 +673,13 @@ static Z_DiagRecs *diagrecs(oid_proto proto, int error, char *addinfo)
     err = error;
     recs.num_diagRecs = 1;
     recs.diagRecs = recp;
+#ifdef Z_95
+    recp[0] = &drec;
+    drec.which = Z_DiagRec_defaultFormat;
+    drec.u.defaultFormat = &rec;
+#else
     recp[0] = &rec;
+#endif
     rec.diagnosticSetId = oid_getoidbyent(&bib1);
     rec.condition = &err;
     rec.addinfo = addinfo ? addinfo : "";
@@ -802,6 +851,10 @@ static Z_APDU *response_searchRequest(association *assoc, request *reqb,
     apdu.which = Z_APDU_searchResponse;
     apdu.u.searchResponse = &resp;
     resp.referenceId = req->referenceId;
+#ifdef Z_95
+    resp.additionalSearchInfo = 0;
+    resp.otherInfo = 0;
+#endif
     *fd = -1;
     if (!bsrt && !(bsrt = bend_searchresponse(assoc->backend)))
     {
@@ -895,10 +948,13 @@ static Z_APDU *process_presentRequest(association *assoc, request *reqb,
     apdu.which = Z_APDU_presentResponse;
     apdu.u.presentResponse = &resp;
     resp.referenceId = req->referenceId;
+#ifdef Z_95
+    resp.otherInfo = 0;
+#endif
 
     num = *req->numberOfRecordsRequested;
     resp.records = pack_records(assoc, req->resultSetId,
-       *req->resultSetStartPoint, &num, req->elementSetNames, &next, &presst);
+       *req->resultSetStartPoint, &num, 0, &next, &presst);
     if (!resp.records)
        return 0;
     resp.numberOfRecordsReturned = &num;
@@ -937,6 +993,9 @@ static Z_APDU *process_scanRequest(association *assoc, request *reqb, int *fd)
     res.entries = &ents;
     ents.which = Z_ListEntries_nonSurrogateDiagnostics;
     res.attributeSet = 0;
+#ifdef Z_95
+    res.otherInfo = 0;
+#endif
 
     if (req->attributeSet && (!(attent = oid_getentbyoid(req->attributeSet)) ||
        attent->class != CLASS_ATTSET || attent->value != VAL_BIB1))
@@ -945,6 +1004,10 @@ static Z_APDU *process_scanRequest(association *assoc, request *reqb, int *fd)
        ents.u.nonSurrogateDiagnostics = diagrecs(assoc->proto, 205, 0);
     else
     {
+       if (req->termListAndStartPoint->term->which == Z_Term_general)
+           logf(LOG_DEBUG, " term: '%.*s'",
+               req->termListAndStartPoint->term->u.general->len,
+               req->termListAndStartPoint->term->u.general->buf);
        srq.num_bases = req->num_databaseNames;
        srq.basenames = req->databaseNames;
        srq.num_entries = *req->numberOfTermsRequested;
@@ -993,6 +1056,8 @@ static Z_APDU *process_scanRequest(association *assoc, request *reqb, int *fd)
                o->buf = odr_malloc(assoc->encode, o->len = o->size =
                    strlen(srs->entries[i].term));
                memcpy(o->buf, srs->entries[i].term, o->len);
+               logf(LOG_DEBUG, "  term #%d: '%s' (%d)", i,
+                   srs->entries[i].term, srs->entries[i].occurrences);
            }
            list.num_entries = i;
            res.numberOfEntriesReturned = &list.num_entries;