X-Git-Url: http://git.indexdata.com/?p=yaz-moved-to-github.git;a=blobdiff_plain;f=src%2Fseshigh.c;h=999d1ba4fd6d5d38e5055780574ec068d871a651;hp=5394cc4b6dfe5d776f5594cf830fa570649741ed;hb=3ebf9c87afb52af8cc6e696ffbb040aeca68b3f4;hpb=8d691989077a0addcbd840d769dce6700f3d9622

diff --git a/src/seshigh.c b/src/seshigh.c
index 5394cc4..999d1ba 100644
--- a/src/seshigh.c
+++ b/src/seshigh.c
@@ -2,7 +2,7 @@
  * Copyright (C) 1995-2007, Index Data ApS
  * See the file LICENSE for details.
  *
- * $Id: seshigh.c,v 1.108 2007-01-03 08:42:15 adam Exp $
+ * $Id: seshigh.c,v 1.121 2007-05-30 21:56:59 adam Exp $
  */
 /**
  * \file seshigh.c
@@ -62,7 +62,7 @@
 #include "session.h"
 #include "mime.h"
 #include <yaz/proto.h>
-#include <yaz/oid.h>
+#include <yaz/oid_db.h>
 #include <yaz/log.h>
 #include <yaz/logrpn.h>
 #include <yaz/querytowrbuf.h>
@@ -72,6 +72,7 @@
 #include <yaz/otherinfo.h>
 #include <yaz/yaz-util.h>
 #include <yaz/pquery.h>
+#include <yaz/oid_db.h>
 
 #include <yaz/srw.h>
 #include <yaz/backend.h>
@@ -495,6 +496,8 @@ static void assoc_init_reset(association *assoc)
     assoc->init->implementation_version = 0;
     assoc->init->implementation_id = 0;
     assoc->init->implementation_name = 0;
+    assoc->init->query_charset = 0;
+    assoc->init->records_in_same_charset = 0;
     assoc->init->bend_sort = NULL;
     assoc->init->bend_search = NULL;
     assoc->init->bend_present = NULL;
@@ -531,14 +534,15 @@ static int srw_bend_init(association *assoc, Z_SRW_diagnostic **d, int *num, Z_S
         
         if (sr->username)
         {
-            Z_IdAuthentication *auth = odr_malloc(assoc->decode, sizeof(*auth));
+            Z_IdAuthentication *auth = (Z_IdAuthentication *)
+                odr_malloc(assoc->decode, sizeof(*auth));
             int len;
 
             len = strlen(sr->username) + 1;
             if (sr->password) 
                 len += strlen(sr->password) + 2;
             auth->which = Z_IdAuthentication_open;
-            auth->u.open = odr_malloc(assoc->decode, len);
+            auth->u.open = (char *) odr_malloc(assoc->decode, len);
             strcpy(auth->u.open, sr->username);
             if (sr->password && *sr->password)
             {
@@ -580,13 +584,13 @@ static int retrieve_fetch(association *assoc, bend_fetch_rr *rr)
 #if YAZ_HAVE_XML2
     yaz_record_conv_t rc = 0;
     const char *match_schema = 0;
-    int *match_syntax = 0;
+    Odr_oid *match_syntax = 0;
 
     if (assoc->server)
     {
         int r;
         const char *input_schema = yaz_get_esn(rr->comp);
-        Odr_oid *input_syntax_raw = rr->request_format_raw;
+        Odr_oid *input_syntax_raw = rr->request_format;
         
         const char *backend_schema = 0;
         Odr_oid *backend_syntax = 0;
@@ -612,7 +616,8 @@ static int retrieve_fetch(association *assoc, bend_fetch_rr *rr)
         else if (r == 1 || r == 3)
         {
             const char *details = input_schema;
-            rr->errcode =  YAZ_BIB1_ELEMENT_SET_NAMES_UNSUPP;
+            rr->errcode =
+                YAZ_BIB1_SPECIFIED_ELEMENT_SET_NAME_NOT_VALID_FOR_SPECIFIED_;
             if (details)
                 rr->errstring = odr_strdup(rr->stream, details);
             return -1;
@@ -623,26 +628,17 @@ static int retrieve_fetch(association *assoc, bend_fetch_rr *rr)
             if (input_syntax_raw)
             {
                 char oidbuf[OID_STR_MAX];
-                oid_to_dotstring(input_syntax_raw, oidbuf);
+                oid_oid_to_dotstring(input_syntax_raw, oidbuf);
                 rr->errstring = odr_strdup(rr->stream, oidbuf);
             }
             return -1;
         }
         if (backend_schema)
         {
-            yaz_set_esn(&rr->comp, backend_schema, rr->stream->mem);
+            yaz_set_esn(&rr->comp, backend_schema, odr_getmem(rr->stream));
         }
         if (backend_syntax)
-        {
-            oident *oident_syntax = oid_getentbyoid(backend_syntax);
-
-            rr->request_format_raw = backend_syntax;
-            
-            if (oident_syntax)
-                rr->request_format = oident_syntax->value;
-            else
-                rr->request_format = VAL_NONE;
-        }
+            rr->request_format = backend_syntax;
     }
     (*assoc->init->bend_fetch)(assoc->backend, rr);
     if (rc && rr->record && rr->errcode == 0 && rr->len > 0)
@@ -659,23 +655,20 @@ static int retrieve_fetch(association *assoc, bend_fetch_rr *rr)
         else
         {
             rr->len = wrbuf_len(output_record);
-            rr->record = odr_malloc(rr->stream, rr->len);
+            rr->record = (char *) odr_malloc(rr->stream, rr->len);
             memcpy(rr->record, wrbuf_buf(output_record), rr->len);
         }
-        wrbuf_free(output_record, 1);
+        wrbuf_destroy(output_record);
     }
     if (match_syntax)
-    {
-        struct oident *oi = oid_getentbyoid(match_syntax);
-        rr->output_format = oi ? oi->value : VAL_NONE;
-        rr->output_format_raw = match_syntax;
-    }
+        rr->output_format = match_syntax;
     if (match_schema)
         rr->schema = odr_strdup(rr->stream, match_schema);
     return 0;
 #else
     (*assoc->init->bend_fetch)(assoc->backend, rr);
 #endif
+    return 0;
 }
 
 static int srw_bend_fetch(association *assoc, int pos,
@@ -689,10 +682,8 @@ static int srw_bend_fetch(association *assoc, int pos,
     rr.setname = "default";
     rr.number = pos;
     rr.referenceId = 0;
-    rr.request_format = VAL_TEXT_XML;
-    rr.request_format_raw = yaz_oidval_to_z3950oid(assoc->decode,
-                                                   CLASS_RECSYN,
-                                                   VAL_TEXT_XML);
+    rr.request_format = odr_oiddup(assoc->decode, yaz_oid_recsyn_xml);
+
     rr.comp = (Z_RecordComposition *)
             odr_malloc(assoc->decode, sizeof(*rr.comp));
     rr.comp->which = Z_RecordComp_complex;
@@ -752,7 +743,7 @@ static int srw_bend_fetch(association *assoc, int pos,
         if (rr.errstring)
             len += strlen(rr.errstring);
 
-        record->recordData_buf = odr_malloc(o, len);
+        record->recordData_buf = (char *) odr_malloc(o, len);
         
         sprintf(record->recordData_buf, "<diagnostic "
                 "xmlns=\"http://www.loc.gov/zing/srw/diagnostic/\">\n"
@@ -884,6 +875,8 @@ static void srw_bend_search(association *assoc, request *req,
         rr.srw_sortKeys = 0;
         rr.srw_setname = 0;
         rr.srw_setnameIdleTime = 0;
+        rr.estimated_hit_count = 0;
+        rr.partial_resultset = 0;
         rr.query = (Z_Query *) odr_malloc (assoc->decode, sizeof(*rr.query));
         rr.query->u.type_1 = 0;
         
@@ -1019,7 +1012,6 @@ static void srw_bend_search(association *assoc, request *req,
                         bprr->setname = "default";
                         bprr->start = start;
                         bprr->number = number;
-                        bprr->format = VAL_TEXT_XML;
                         if (srw_req->recordSchema)
                         {
                             bprr->comp = (Z_RecordComposition *) odr_malloc(assoc->decode,
@@ -1105,6 +1097,15 @@ static void srw_bend_search(association *assoc, request *req,
                             srw_res->records = 0;
                     }
                 }
+                if (rr.estimated_hit_count || rr.partial_resultset)
+                {
+                    yaz_add_srw_diagnostic(
+                        assoc->encode,
+                        &srw_res->diagnostics,
+                        &srw_res->num_diagnostics,
+                        YAZ_SRW_RESULT_SET_CREATED_WITH_VALID_PARTIAL_RESULTS_AVAILABLE,
+                        0);
+                }
             }
         }
     }
@@ -1143,15 +1144,15 @@ static void srw_bend_search(association *assoc, request *req,
                       srw_res->resultSetId : "-"),
                      (srw_req->startRecord ? *srw_req->startRecord : 1), 
                      srw_res->num_records);
-        yaz_log(log_request, "%s %s: %s", wrbuf_buf(wr), querytype, querystr);
-        wrbuf_free(wr, 1);
+        yaz_log(log_request, "%s %s: %s", wrbuf_cstr(wr), querytype, querystr);
+        wrbuf_destroy(wr);
     }
 }
 
 static char *srw_bend_explain_default(void *handle, bend_explain_rr *rr)
 {
 #if YAZ_HAVE_XML2
-    xmlNodePtr ptr = rr->server_node_ptr;
+    xmlNodePtr ptr = (xmlNode *) rr->server_node_ptr;
     if (!ptr)
         return 0;
     for (ptr = ptr->children; ptr; ptr = ptr->next)
@@ -1263,12 +1264,14 @@ static void srw_bend_scan(association *assoc, request *req,
         bsrr->print = assoc->print;
         bsrr->step_size = odr_intdup(assoc->decode, 0);
         bsrr->entries = 0;
+        bsrr->setname = 0;
 
         if (bsrr->num_entries > 0) 
         {
             int i;
-            bsrr->entries = odr_malloc(assoc->decode, sizeof(*bsrr->entries) *
-                                       bsrr->num_entries);
+            bsrr->entries = (struct scan_entry *) 
+                odr_malloc(assoc->decode, sizeof(*bsrr->entries) *
+                           bsrr->num_entries);
             for (i = 0; i<bsrr->num_entries; i++)
             {
                 bsrr->entries[i].term = 0;
@@ -1283,20 +1286,11 @@ static void srw_bend_scan(association *assoc, request *req,
         if (srw_req->query_type == Z_SRW_query_type_pqf &&
             assoc->init->bend_scan)
         {
-            Odr_oid *scan_attributeSet = 0;
-            oident *attset;
             YAZ_PQF_Parser pqf_parser = yaz_pqf_create();
             
             bsrr->term = yaz_pqf_scan(pqf_parser, assoc->decode,
-                                      &scan_attributeSet, 
+                                      &bsrr->attributeset, 
                                       srw_req->scanClause.pqf); 
-            if (scan_attributeSet &&
-                (attset = oid_getentbyoid(scan_attributeSet)) &&
-                (attset->oclass == CLASS_ATTSET ||
-                 attset->oclass == CLASS_GENERAL))
-                bsrr->attributeset = attset->value;
-            else
-                bsrr->attributeset = VAL_NONE;
             yaz_pqf_destroy(pqf_parser);
             bsrr->scanClause = 0;
             ((int (*)(void *, bend_scan_rr *))
@@ -1308,8 +1302,9 @@ static void srw_bend_scan(association *assoc, request *req,
         {
             int srw_error;
             bsrr->scanClause = 0;
-            bsrr->attributeset = VAL_NONE;
-            bsrr->term = odr_malloc(assoc->decode, sizeof(*bsrr->term));
+            bsrr->attributeset = 0;
+            bsrr->term = (Z_AttributesPlusTerm *)
+                odr_malloc(assoc->decode, sizeof(*bsrr->term));
             srw_error = cql2pqf_scan(assoc->encode,
                                      srw_req->scanClause.cql,
                                      assoc->server->cql_transform,
@@ -1328,7 +1323,7 @@ static void srw_bend_scan(association *assoc, request *req,
                  && assoc->init->bend_srw_scan)
         {
             bsrr->term = 0;
-            bsrr->attributeset = VAL_NONE;
+            bsrr->attributeset = 0;
             bsrr->scanClause = srw_req->scanClause.cql;
             ((int (*)(void *, bend_scan_rr *))
              (*assoc->init->bend_srw_scan))(assoc->backend, bsrr);
@@ -1421,8 +1416,8 @@ static void srw_bend_scan(association *assoc, request *req,
                       *srw_req->maximumTerms : 1));
         /* there is no step size in SRU/W ??? */
         wrbuf_printf(wr, "%s: %s ", querytype, querystr);
-        yaz_log(log_request, "%s ", wrbuf_buf(wr) );
-        wrbuf_free(wr, 1);
+        yaz_log(log_request, "%s ", wrbuf_cstr(wr) );
+        wrbuf_destroy(wr);
     }
 
 }
@@ -1680,7 +1675,7 @@ static char *read_file(const char *fname, ODR o, int *sz)
     fseek(inf, 0L, SEEK_END);
     *sz = ftell(inf);
     rewind(inf);
-    buf = odr_malloc(o, *sz);
+    buf = (char *) odr_malloc(o, *sz);
     fread(buf, 1, *sz, inf);
     fclose(inf);
     return buf;     
@@ -2157,7 +2152,7 @@ static int process_z_response(association *assoc, request *req, Z_APDU *res)
 
 static char *get_vhost(Z_OtherInformation *otherInfo)
 {
-    return yaz_oi_get_string_oidval(&otherInfo, VAL_PROXY, 1, 0);
+    return yaz_oi_get_string_oid(&otherInfo, yaz_oid_userinfo_proxy, 1, 0);
 }
 
 /*
@@ -2228,7 +2223,8 @@ static Z_APDU *process_initRequest(association *assoc, request *reqb)
     else
     {
         /* no backend. return error */
-        binitres = odr_malloc(assoc->encode, sizeof(*binitres));
+        binitres = (bend_initresult *)
+            odr_malloc(assoc->encode, sizeof(*binitres));
         binitres->errstring = 0;
         binitres->errcode = YAZ_BIB1_PERMANENT_SYSTEM_ERROR;
         iochan_settimeout(assoc->client_chan, 10);
@@ -2293,26 +2289,34 @@ static Z_APDU *process_initRequest(association *assoc, request *reqb)
         ODR_MASK_SET(resp->options, Z_Options_sort);
         strcat(options, " sort");
     }
-
-    if (ODR_MASK_GET(req->options, Z_Options_negotiationModel)
-        && assoc->init->charneg_response)
+    
+    if (ODR_MASK_GET(req->options, Z_Options_negotiationModel))
     {
-        Z_OtherInformation **p;
         Z_OtherInformationUnit *p0;
-        
-        yaz_oi_APDU(apdu, &p);
-        
-        if ((p0=yaz_oi_update(p, assoc->encode, NULL, 0, 0))) {
-            ODR_MASK_SET(resp->options, Z_Options_negotiationModel);
-            
+
+        if (!assoc->init->charneg_response)
+        {
+            if (assoc->init->query_charset)
+            {
+                assoc->init->charneg_response = yaz_set_response_charneg(
+                    assoc->encode, assoc->init->query_charset, 0, 
+                    assoc->init->records_in_same_charset);
+            }
+            else
+            {
+                yaz_log(YLOG_WARN, "default query_charset not defined by backend");
+            }
+        }
+        if (assoc->init->charneg_response
+            && (p0=yaz_oi_update(&resp->otherInfo, assoc->encode, NULL, 0, 0)))
+        {
             p0->which = Z_OtherInfo_externallyDefinedInfo;
             p0->information.externallyDefinedInfo =
                 assoc->init->charneg_response;
+            ODR_MASK_SET(resp->options, Z_Options_negotiationModel);
+            strcat(options, " negotiation");
         }
-        ODR_MASK_SET(resp->options, Z_Options_negotiationModel);
-        strcat(options, " negotiation");
     }
-        
     if (ODR_MASK_GET(req->options, Z_Options_triggerResourceCtrl))
         ODR_MASK_SET(resp->options, Z_Options_triggerResourceCtrl);
 
@@ -2351,7 +2355,7 @@ static Z_APDU *process_initRequest(association *assoc, request *reqb)
                 assoc->init->implementation_name,
                 odr_prepend(assoc->encode, "GFS", resp->implementationName));
 
-    version = odr_strdup(assoc->encode, "$Revision: 1.108 $");
+    version = odr_strdup(assoc->encode, "$Revision: 1.121 $");
     if (strlen(version) > 10)   /* check for unexpanded CVS strings */
         version[strlen(version)-2] = '\0';
     resp->implementationVersion = odr_prepend(assoc->encode,
@@ -2414,8 +2418,8 @@ static Z_APDU *process_initRequest(association *assoc, request *reqb)
                      (req->implementationVersion ?
                       req->implementationVersion : "-")
             );
-        yaz_log(log_request, "%s", wrbuf_buf(wr));
-        wrbuf_free(wr, 1);
+        yaz_log(log_request, "%s", wrbuf_cstr(wr));
+        wrbuf_destroy(wr);
     }
     return apdu;
 }
@@ -2463,9 +2467,9 @@ static Z_NamePlusRecord *surrogatediagrec(association *assoc,
 
 static Z_Records *pack_records(association *a, char *setname, int start,
                                int *num, Z_RecordComposition *comp,
-                               int *next, int *pres, oid_value format,
+                               int *next, int *pres,
                                Z_ReferenceId *referenceId,
-                               int *oid, int *errcode)
+                               Odr_oid *oid, int *errcode)
 {
     int recno, total_length = 0, toget = *num, dumped_records = 0;
     Z_Records *records =
@@ -2507,10 +2511,8 @@ static Z_Records *pack_records(association *a, char *setname, int start,
         freq.surrogate_flag = 0;
         freq.number = recno;
         freq.comp = comp;
-        freq.request_format = format;
-        freq.request_format_raw = oid;
-        freq.output_format = format;
-        freq.output_format_raw = 0;
+        freq.request_format = oid;
+        freq.output_format = 0;
         freq.stream = a->encode;
         freq.print = a->print;
         freq.referenceId = referenceId;
@@ -2602,13 +2604,10 @@ static Z_Records *pack_records(association *a, char *setname, int start,
             thisrec->databaseName = 0;
         thisrec->which = Z_NamePlusRecord_databaseRecord;
 
-        if (freq.output_format_raw)
-        {
-            struct oident *ident = oid_getentbyoid(freq.output_format_raw);
-            freq.output_format = ident->value;
-        }
-        thisrec->u.databaseRecord = z_ext_record(a->encode, freq.output_format,
-                                                 freq.record, freq.len);
+        if (!freq.output_format)
+            freq.output_format = freq.request_format;
+        thisrec->u.databaseRecord = z_ext_record_oid(
+            a->encode, freq.output_format, freq.record, freq.len);
         if (!thisrec->u.databaseRecord)
             return 0;
         reclist->records[reclist->num_records] = thisrec;
@@ -2634,13 +2633,15 @@ static Z_APDU *process_searchRequest(association *assoc, request *reqb,
     bsrr->srw_sortKeys = 0;
     bsrr->srw_setname = 0;
     bsrr->srw_setnameIdleTime = 0;
+    bsrr->estimated_hit_count = 0;
+    bsrr->partial_resultset = 0;
 
     yaz_log (log_requestdetail, "ResultSet '%s'", req->resultSetName);
     if (req->databaseNames)
     {
         int i;
         for (i = 0; i < req->num_databaseNames; i++)
-            yaz_log (log_requestdetail, "Database '%s'", req->databaseNames[i]);
+            yaz_log(log_requestdetail, "Database '%s'", req->databaseNames[i]);
     }
 
     yaz_log_zquery_level(log_requestdetail,req->query);
@@ -2653,7 +2654,7 @@ static Z_APDU *process_searchRequest(association *assoc, request *reqb,
         bsrr->basenames = req->databaseNames;
         bsrr->query = req->query;
         bsrr->stream = assoc->encode;
-        nmem_transfer(bsrr->stream->mem, reqb->request_mem);
+        nmem_transfer(odr_getmem(bsrr->stream), reqb->request_mem);
         bsrr->decode = assoc->decode;
         bsrr->print = assoc->print;
         bsrr->hits = 0;
@@ -2702,10 +2703,9 @@ static Z_APDU *response_searchRequest(association *assoc, request *reqb,
     Z_SearchResponse *resp = (Z_SearchResponse *)
         odr_malloc (assoc->encode, sizeof(*resp));
     int *nulint = odr_intdup (assoc->encode, 0);
-    bool_t *sr = odr_intdup(assoc->encode, 1);
     int *next = odr_intdup(assoc->encode, 0);
     int *none = odr_intdup(assoc->encode, Z_SearchResponse_none);
-    int returnedrecs=0;
+    int returnedrecs = 0;
 
     apdu->which = Z_APDU_searchResponse;
     apdu->u.searchResponse = resp;
@@ -2730,8 +2730,8 @@ static Z_APDU *response_searchRequest(association *assoc, request *reqb,
     }
     else
     {
+        bool_t *sr = odr_intdup(assoc->encode, 1);
         int *toget = odr_intdup(assoc->encode, 0);
-        int *presst = odr_intdup(assoc->encode, 0);
         Z_RecordComposition comp, *compp = 0;
 
         yaz_log (log_requestdetail, "resultCount: %d", bsrt->hits);
@@ -2760,14 +2760,7 @@ static Z_APDU *response_searchRequest(association *assoc, request *reqb,
 
         if (*toget && !resp->records)
         {
-            oident *prefformat;
-            oid_value form;
-
-            if (!(prefformat = oid_getentbyoid(req->preferredRecordSyntax)))
-                form = VAL_NONE;
-            else
-                form = prefformat->value;
-
+            int *presst = odr_intdup(assoc->encode, 0);
             /* Call bend_present if defined */
             if (assoc->init->bend_present)
             {
@@ -2776,7 +2769,7 @@ static Z_APDU *response_searchRequest(association *assoc, request *reqb,
                 bprr->setname = req->resultSetName;
                 bprr->start = 1;
                 bprr->number = *toget;
-                bprr->format = form;
+                bprr->format = req->preferredRecordSyntax;
                 bprr->comp = compp;
                 bprr->referenceId = req->referenceId;
                 bprr->stream = assoc->encode;
@@ -2797,16 +2790,14 @@ static Z_APDU *response_searchRequest(association *assoc, request *reqb,
             }
 
             if (!resp->records)
-                resp->records = pack_records(assoc, req->resultSetName, 1,
-                                             toget, compp, next, presst, form, req->referenceId,
-                                             req->preferredRecordSyntax, NULL);
+                resp->records = pack_records(
+                    assoc, req->resultSetName, 1,
+                    toget, compp, next, presst, req->referenceId,
+                    req->preferredRecordSyntax, NULL);
             if (!resp->records)
                 return 0;
             resp->numberOfRecordsReturned = toget;
             returnedrecs = *toget;
-            resp->nextResultSetPosition = next;
-            resp->searchStatus = sr;
-            resp->resultSetStatus = 0;
             resp->presentStatus = presst;
         }
         else
@@ -2814,11 +2805,21 @@ static Z_APDU *response_searchRequest(association *assoc, request *reqb,
             if (*resp->resultCount)
                 *next = 1;
             resp->numberOfRecordsReturned = nulint;
-            resp->nextResultSetPosition = next;
-            resp->searchStatus = sr;
-            resp->resultSetStatus = 0;
             resp->presentStatus = 0;
         }
+        resp->nextResultSetPosition = next;
+        resp->searchStatus = sr;
+        resp->resultSetStatus = 0;
+        if (bsrt->estimated_hit_count)
+        {
+            resp->resultSetStatus = odr_intdup(assoc->encode, 
+                                               Z_SearchResponse_estimate);
+        }
+        else if (bsrt->partial_resultset)
+        {
+            resp->resultSetStatus = odr_intdup(assoc->encode, 
+                                               Z_SearchResponse_subset);
+        }
     }
     resp->additionalSearchInfo = bsrt->search_info;
 
@@ -2842,8 +2843,8 @@ static Z_APDU *response_searchRequest(association *assoc, request *reqb,
                      req->resultSetName, returnedrecs);
         yaz_query_to_wrbuf(wr, req->query);
         
-        yaz_log(log_request, "Search %s", wrbuf_buf(wr));
-        wrbuf_free(wr, 1);
+        yaz_log(log_request, "Search %s", wrbuf_cstr(wr));
+        wrbuf_destroy(wr);
     }
     return apdu;
 }
@@ -2867,8 +2868,6 @@ static Z_APDU *process_presentRequest(association *assoc, request *reqb,
                                       int *fd)
 {
     Z_PresentRequest *req = reqb->apdu_request->u.presentRequest;
-    oident *prefformat;
-    oid_value form;
     Z_APDU *apdu;
     Z_PresentResponse *resp;
     int *next;
@@ -2878,10 +2877,6 @@ static Z_APDU *process_presentRequest(association *assoc, request *reqb,
 
     yaz_log(log_requestdetail, "Got PresentRequest.");
 
-    if (!(prefformat = oid_getentbyoid(req->preferredRecordSyntax)))
-        form = VAL_NONE;
-    else
-        form = prefformat->value;
     resp = (Z_PresentResponse *)odr_malloc (assoc->encode, sizeof(*resp));
     resp->records = 0;
     resp->presentStatus = odr_intdup(assoc->encode, 0);
@@ -2892,7 +2887,7 @@ static Z_APDU *process_presentRequest(association *assoc, request *reqb,
         bprr->setname = req->resultSetId;
         bprr->start = *req->resultSetStartPoint;
         bprr->number = *req->numberOfRecordsRequested;
-        bprr->format = form;
+        bprr->format = req->preferredRecordSyntax;
         bprr->comp = req->recordComposition;
         bprr->referenceId = req->referenceId;
         bprr->stream = assoc->encode;
@@ -2929,7 +2924,7 @@ static Z_APDU *process_presentRequest(association *assoc, request *reqb,
             pack_records(assoc, req->resultSetId, *req->resultSetStartPoint,
                          num, req->recordComposition, next,
                          resp->presentStatus,
-                         form, req->referenceId, req->preferredRecordSyntax, 
+                         req->referenceId, req->preferredRecordSyntax, 
                          &errcode);
     }
     if (log_request)
@@ -2947,8 +2942,8 @@ static Z_APDU *process_presentRequest(association *assoc, request *reqb,
         wrbuf_printf(wr, " %s %d+%d ",
                 req->resultSetId, *req->resultSetStartPoint,
                 *req->numberOfRecordsRequested);
-        yaz_log(log_request, "%s", wrbuf_buf(wr) );
-        wrbuf_free(wr, 1);
+        yaz_log(log_request, "%s", wrbuf_cstr(wr) );
+        wrbuf_destroy(wr);
     }
     if (!resp->records)
         return 0;
@@ -2973,7 +2968,6 @@ static Z_APDU *process_scanRequest(association *assoc, request *reqb, int *fd)
     Z_ListEntries *ents = (Z_ListEntries *)
         odr_malloc (assoc->encode, sizeof(*ents));
     Z_DiagRecs *diagrecs_p = NULL;
-    oident *attset;
     bend_scan_rr *bsrr = (bend_scan_rr *)
         odr_malloc (assoc->encode, sizeof(*bsrr));
     struct scan_entry *save_entries;
@@ -3017,6 +3011,8 @@ 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->setname = yaz_oi_get_string_oid(&req->otherInfo, 
+                                          yaz_oid_userinfo_scan_set, 1, 0);
     bsrr->entries = 0;
     /* For YAZ 2.0 and earlier it was the backend handler that
        initialized entries (member display_term did not exist)
@@ -3028,8 +3024,9 @@ static Z_APDU *process_scanRequest(association *assoc, request *reqb, int *fd)
     if (bsrr->num_entries > 0) 
     {
         int i;
-        bsrr->entries = odr_malloc(assoc->decode, sizeof(*bsrr->entries) *
-                                   bsrr->num_entries);
+        bsrr->entries = (struct scan_entry *)
+            odr_malloc(assoc->decode, sizeof(*bsrr->entries) *
+                       bsrr->num_entries);
         for (i = 0; i<bsrr->num_entries; i++)
         {
             bsrr->entries[i].term = 0;
@@ -3041,12 +3038,7 @@ static Z_APDU *process_scanRequest(association *assoc, request *reqb, int *fd)
     }
     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))
-        bsrr->attributeset = attset->value;
-    else
-        bsrr->attributeset = VAL_NONE;
+    bsrr->attributeset = req->attributeSet;
     log_scan_term_level (log_requestdetail, req->termListAndStartPoint, 
             bsrr->attributeset);
     bsrr->term_position = req->preferredPositionInResponse ?
@@ -3134,39 +3126,36 @@ static Z_APDU *process_scanRequest(association *assoc, request *reqb, int *fd)
         int i;
         WRBUF wr = wrbuf_alloc();
         wrbuf_printf(wr, "Scan ");
-        for (i = 0 ; i < req->num_databaseNames; i++){
+        for (i = 0 ; i < req->num_databaseNames; i++)
+        {
             if (i)
                 wrbuf_printf(wr, "+");
             wrbuf_printf(wr, req->databaseNames[i]);
         }
+
         wrbuf_printf(wr, " ");
         
-        if (bsrr->errcode){
+        if (bsrr->errcode)
             wr_diag(wr, bsrr->errcode, bsrr->errstring);
-            wrbuf_printf(wr, " ");
-        }
-        else
-            wrbuf_printf(wr, "OK "); 
-        /* else if (*res->scanStatus == Z_Scan_success) */
-        /*    wrbuf_printf(wr, "OK "); */
-        /* else */
-        /* wrbuf_printf(wr, "Partial "); */
-
-        if (*res->numberOfEntriesReturned)
-            wrbuf_printf(wr, "%d - ", *res->numberOfEntriesReturned);
         else
-            wrbuf_printf(wr, "0 - ");
+            wrbuf_printf(wr, "OK"); 
 
-        wrbuf_printf(wr, "%d+%d+%d ",
+        wrbuf_printf(wr, " %d - %d+%d+%d",
+                     res->numberOfEntriesReturned ?
+                     *res->numberOfEntriesReturned : 0,
                      (req->preferredPositionInResponse ?
                       *req->preferredPositionInResponse : 1),
                      *req->numberOfTermsRequested,
                      (res->stepSize ? *res->stepSize : 1));
+        
+        if (bsrr->setname)
+            wrbuf_printf(wr, "+%s", bsrr->setname);
 
+        wrbuf_printf(wr, " ");
         yaz_scan_to_wrbuf(wr, req->termListAndStartPoint, 
                           bsrr->attributeset);
-        yaz_log(log_request, "%s", wrbuf_buf(wr) );
-        wrbuf_free(wr, 1);
+        yaz_log(log_request, "%s", wrbuf_cstr(wr) );
+        wrbuf_destroy(wr);
     }
     return apdu;
 }
@@ -3242,8 +3231,8 @@ static Z_APDU *process_sortRequest(association *assoc, request *reqb,
         }
         wrbuf_printf(wr, ")->%s ",req->sortedResultSetName);
 
-        yaz_log(log_request, "%s", wrbuf_buf(wr) );
-        wrbuf_free(wr, 1);
+        yaz_log(log_request, "%s", wrbuf_cstr(wr) );
+        wrbuf_destroy(wr);
     }
     return apdu;
 }
@@ -3326,8 +3315,8 @@ static Z_APDU *process_deleteRequest(association *assoc, request *reqb,
             wrbuf_printf(wr, "OK -");
         for (i = 0; i<req->num_resultSetList; i++)
             wrbuf_printf(wr, " %s ", req->resultSetList[i]);
-        yaz_log(log_request, "%s", wrbuf_buf(wr) );
-        wrbuf_free(wr, 1);
+        yaz_log(log_request, "%s", wrbuf_cstr(wr) );
+        wrbuf_destroy(wr);
     }
     return apdu;
 }
@@ -3513,16 +3502,19 @@ static Z_APDU *process_ESRequest(association *assoc, request *reqb, int *fd)
         {
             WRBUF wr = wrbuf_alloc();
             wrbuf_diags(wr, resp->num_diagnostics, resp->diagnostics);
-            yaz_log(log_request, "EsRequest %s", wrbuf_buf(wr) );
-            wrbuf_free(wr, 1);
+            yaz_log(log_request, "EsRequest %s", wrbuf_cstr(wr) );
+            wrbuf_destroy(wr);
         }
 
     }
     /* Do something with the members of bend_extendedservice */
     if (esrequest.taskPackage)
-        resp->taskPackage = z_ext_record (assoc->encode, VAL_EXTENDED,
-                                         (const char *)  esrequest.taskPackage,
-                                          -1);
+    {
+        resp->taskPackage = z_ext_record_oid(
+            assoc->encode, yaz_oid_recsyn_extended,
+            (const char *)  esrequest.taskPackage, -1
+            );
+    }
     yaz_log(YLOG_DEBUG,"Send the result apdu");
     return apdu;
 }