X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=server%2Fseshigh.c;h=f2a9bfb663cba7c9dc12e873ddbaa89429fb57ad;hb=bc9920b48da91d87e1c0e033a9151663998d6b6b;hp=ffed67f5c8d8394334dbf185b96a50d0d660ed50;hpb=6bffc65936ba634077acb9f42ace217bc4737539;p=yaz-moved-to-github.git

diff --git a/server/seshigh.c b/server/seshigh.c
index ffed67f..f2a9bfb 100644
--- a/server/seshigh.c
+++ b/server/seshigh.c
@@ -2,7 +2,7 @@
  * Copyright (c) 1995-2003, Index Data
  * See the file LICENSE for details.
  *
- * $Id: seshigh.c,v 1.151 2003-03-24 22:26:50 adam Exp $
+ * $Id: seshigh.c,v 1.155 2003-04-29 21:20:33 adam Exp $
  */
 
 /*
@@ -515,6 +515,7 @@ static int srw_bend_fetch(association *assoc, int pos,
     rr.errcode = 0;
     rr.errstring = 0;
     rr.surrogate_flag = 0;
+    rr.schema = srw_req->recordSchema;
 
     if (!assoc->init->bend_fetch)
         return 1;
@@ -526,9 +527,10 @@ static int srw_bend_fetch(association *assoc, int pos,
         record->recordData_buf = rr.record;
         record->recordData_len = rr.len;
         record->recordPosition = odr_intdup(o, pos);
-        record->recordSchema = 0;
-        if (srw_req->recordSchema)
-            record->recordSchema = odr_strdup(o, srw_req->recordSchema);
+        if (rr.schema)
+            record->recordSchema = odr_strdup(o, rr.schema);
+        else
+            record->recordSchema = 0;
     }
     return rr.errcode;
 }
@@ -651,7 +653,7 @@ static void srw_bend_search(association *assoc, request *req,
                        yaz_diag_bib1_to_srw (rr.errcode));
         srw_res->diagnostics[0].details = rr.errstring;
         yaz_log(LOG_DEBUG, "srw_bend_search returned SRW error %d",
-                srw_res->diagnostics[0].code);
+                *srw_res->diagnostics[0].code);
                 
     }
     else
@@ -816,18 +818,18 @@ static void process_http_request(association *assoc, request *req)
 
     if (!strcmp(hreq->method, "GET"))
     {
-        char *charset = 0;
-        int ret = -1;
-        Z_SOAP *soap_package = 0;
         char *db = "Default";
         const char *p0 = hreq->path, *p1;
-        static Z_SOAP_Handler soap_handlers[2] = {
 #if HAVE_XML2
+        int ret = -1;
+        char *charset = 0;
+        Z_SOAP *soap_package = 0;
+        static Z_SOAP_Handler soap_handlers[2] = {
             {"http://www.loc.gov/zing/srw/v1.0/", 0,
              (Z_SOAP_fun) yaz_srw_codec},
-#endif
             {0, 0, 0}
         };
+#endif
         
         if (*p0 == '/')
             p0++;
@@ -840,6 +842,7 @@ static void process_http_request(association *assoc, request *req)
             memcpy (db, p0, p1 - p0);
             db[p1 - p0] = '\0';
         }
+#if HAVE_XML2
         if (p1 && *p1 == '?' && p1[1])
         {
             Z_SRW_PDU *res = yaz_srw_get(o, Z_SRW_searchRetrieve_response);
@@ -865,6 +868,8 @@ static void process_http_request(association *assoc, request *req)
             }
             sr->u.request->recordSchema = uri_val(p1, "recordSchema", o);
             sr->u.request->recordPacking = uri_val(p1, "recordPacking", o);
+            if (!sr->u.request->recordPacking)
+                sr->u.request->recordPacking = "xml";
             uri_val_int(p1, "maximumRecords", o, 
                         &sr->u.request->maximumRecords);
             uri_val_int(p1, "startRecord", o,
@@ -943,6 +948,7 @@ static void process_http_request(association *assoc, request *req)
                 }
             }
         }
+#endif
 #ifdef DOCDIR
 	if (strlen(hreq->path) >= 5 && strlen(hreq->path) < 80 &&
 			 !memcmp(hreq->path, "/doc/", 5))
@@ -1749,8 +1755,8 @@ static Z_Records *pack_records(association *a, char *setname, int start,
 	freq.output_format_raw = 0;
 	freq.stream = a->encode;
 	freq.print = a->print;
-	freq.surrogate_flag = 0;
 	freq.referenceId = referenceId;
+        freq.schema = 0;
 	(*a->init->bend_fetch)(a->backend, &freq);
 	/* backend should be able to signal whether error is system-wide
 	   or only pertaining to current record */
@@ -2099,6 +2105,7 @@ static Z_APDU *process_scanRequest(association *assoc, request *reqb, int *fd)
     oident *attset;
     bend_scan_rr *bsrr = (bend_scan_rr *)
         odr_malloc (assoc->encode, sizeof(*bsrr));
+    struct scan_entry *save_entries;
 
     yaz_log(LOG_LOG, "Got ScanRequest");
 
@@ -2136,6 +2143,28 @@ static Z_APDU *process_scanRequest(association *assoc, request *reqb, int *fd)
     bsrr->stream = assoc->encode;
     bsrr->print = assoc->print;
     bsrr->step_size = res->stepSize;
+    bsrr->entries = 0;
+    /* Note that version 2.0 of YAZ and older did not set entries .. 
+       We do now. And when we do it's easier to extend the scan entry 
+       We know that if the scan handler did set entries, it will
+       not know of new member display_term.
+    */
+    if (bsrr->num_entries > 0) 
+    {
+        int i;
+        bsrr->entries = odr_malloc(assoc->decode, sizeof(*bsrr->entries) *
+                                   bsrr->num_entries);
+        for (i = 0; i<bsrr->num_entries; i++)
+        {
+            bsrr->entries[i].term = 0;
+            bsrr->entries[i].occurrences = 0;
+            bsrr->entries[i].errcode = 0;
+            bsrr->entries[i].errstring = 0;
+            bsrr->entries[i].display_term = 0;
+        }
+    }
+    save_entries = bsrr->entries;  /* save it so we can compare later */
+
     if (req->attributeSet &&
         (attset = oid_getentbyoid(req->attributeSet)) &&
         (attset->oclass == CLASS_ATTSET || attset->oclass == CLASS_GENERAL))
@@ -2177,6 +2206,16 @@ static Z_APDU *process_scanRequest(association *assoc, request *reqb, int *fd)
                     odr_malloc(assoc->encode, sizeof(*t));
                 t->suggestedAttributes = 0;
                 t->displayTerm = 0;
+                if (save_entries == bsrr->entries && 
+                    bsrr->entries[i].display_term)
+                {
+                    /* the entries was NOT set by the handler. So it's
+                       safe to test for new member display_term. It is
+                       NULL'ed by us.
+                    */
+                    t->displayTerm = odr_strdup(assoc->encode,
+                                                bsrr->entries[i].display_term);
+                }
                 t->alternativeTerm = 0;
                 t->byAttributes = 0;
                 t->otherTermInfo = 0;