X-Git-Url: http://git.indexdata.com/?p=yaz-moved-to-github.git;a=blobdiff_plain;f=client%2Fclient.c;h=596b76ad9fe0c4ad8075c5ef0945e5eeae8c7c51;hp=23313072bda7831d10c9227ef58f2c042414bfeb;hb=c753bab9ac07a09f1bd7ba1dc363e58310e307a7;hpb=247e4e69c61f39e8af636bd64cd09001ab4c0488

diff --git a/client/client.c b/client/client.c
index 2331307..596b76a 100644
--- a/client/client.c
+++ b/client/client.c
@@ -1,16 +1,18 @@
 /* This file is part of the YAZ toolkit.
- * Copyright (C) 1995-2010 Index Data
+ * Copyright (C) Index Data
  * See the file LICENSE for details.
  */
 /** \file client.c
  *  \brief yaz-client program
  */
+#if HAVE_CONFIG_H
+#include <config.h>
+#endif
 
 #include <stdio.h>
 #include <stdlib.h>
 #include <assert.h>
 #include <time.h>
-#include <ctype.h>
 #ifndef WIN32
 #include <signal.h>
 #endif
@@ -46,7 +48,6 @@
 #include <yaz/comstack.h>
 
 #include <yaz/oid_db.h>
-#define NO_OID 1
 #include <yaz/proto.h>
 #include <yaz/marcdisp.h>
 #include <yaz/diagbib1.h>
@@ -63,6 +64,7 @@
 #include <yaz/cql.h>
 #include <yaz/log.h>
 #include <yaz/facet.h>
+#include <yaz/cookie.h>
 
 #if HAVE_READLINE_READLINE_H
 #include <readline/readline.h>
@@ -82,6 +84,7 @@ static file_history_t file_history = 0;
 
 static char sru_method[10] = "soap";
 static char sru_version[10] = "1.2";
+static char sru_recordPacking[10] = "";
 static char *codeset = 0;               /* character set for output */
 static int hex_dump = 0;
 static char *dump_file_prefix = 0;
@@ -101,11 +104,12 @@ char *databaseNames[128];
 int num_databaseNames = 0;
 static Z_External *record_last = 0;
 static int setnumber = -1;              /* current result set number */
-static int smallSetUpperBound = 0;
-static int largeSetLowerBound = 1;
-static int mediumSetPresentNumber = 0;
+static Odr_int smallSetUpperBound = 0;
+static Odr_int largeSetLowerBound = 1;
+static Odr_int mediumSetPresentNumber = 0;
 static Z_ElementSetNames *elementSetNames = 0;
 static Z_FacetList *facet_list = 0;
+static ODR facet_odr = 0;
 static Odr_int setno = 1;                   /* current set offset */
 static enum oid_proto protocol = PROTO_Z3950;      /* current app protocol */
 #define RECORDSYNTAX_MAX 20
@@ -123,7 +127,7 @@ static char ccl_fields[512] = "default.bib";
 static char cql_fields[512] = "/usr/local/share/yaz/etc/pqf.properties";
 static char *esPackageName = 0;
 static char *yazProxy = 0;
-static int kilobytes = 1024;
+static int kilobytes = 64 * 1024;
 static char *negotiationCharset = 0;
 static int  negotiationCharsetRecords = 1;
 static int  negotiationCharsetVersion = 3;
@@ -140,10 +144,13 @@ static int auto_wait = 1;
 static Odr_bitmask z3950_options;
 static int z3950_version = 3;
 static int scan_stepSize = 0;
-static int scan_position = 1;
+static char scan_position[64];
 static int scan_size = 20;
-static char cur_host[200];
+static WRBUF cur_host = 0;
 static Odr_int last_hit_count = 0;
+static int pretty_xml = 0;
+static Odr_int sru_maximumRecords = 0;
+static yaz_cookies_t yaz_cookies = 0;
 
 typedef enum {
     QueryType_Prefix,
@@ -171,13 +178,13 @@ struct eoi {
     char* value;
 } extraOtherInfos[maxOtherInfosSupported];
 
-void process_cmd_line(char* line);
+static void process_cmd_line(char* line);
 #if HAVE_READLINE_READLINE_H
-char **readline_completer(char *text, int start, int end);
+static char **readline_completer(char *text, int start, int end);
 #endif
 static char *command_generator(const char *text, int state);
-int cmd_register_tab(const char* arg);
-int cmd_querycharset(const char *arg);
+static int cmd_register_tab(const char* arg);
+static int cmd_querycharset(const char *arg);
 
 static void close_session(void);
 
@@ -191,9 +198,10 @@ ODR getODROutputStream(void)
     return out;
 }
 
-const char* query_type_as_string(QueryType q)
+static const char* query_type_as_string(QueryType q)
 {
-    switch (q) {
+    switch (q)
+    {
     case QueryType_Prefix: return "prefix (RPN sent to server)";
     case QueryType_CCL: return "CCL (CCL sent to server) ";
     case QueryType_CCL2RPN: return "CCL -> RPN (RPN sent to server)";
@@ -213,7 +221,7 @@ static void do_hex_dump(const char* buf, size_t len)
         for (i = 0; i < len ; i = i+16 )
         {
             printf(" %4.4ld ", (long) i);
-            for(x=0 ; i+x<len && x<16; ++x)
+            for (x = 0 ; i+x < len && x < 16; ++x)
             {
                 printf("%2.2X ",(unsigned int)((unsigned char)buf[i+x]));
             }
@@ -242,17 +250,18 @@ static void do_hex_dump(const char* buf, size_t len)
     }
 }
 
-void add_otherInfos(Z_APDU *a)
+static void add_otherInfos(Z_APDU *a)
 {
     Z_OtherInformation **oi;
-    int i = 0;
+    int i;
 
-    yaz_oi_APDU(a, &oi);
-    if (facet_list) {
-        yaz_oi_set_facetlist_oid(oi, out, yaz_oid_userinfo_facet_1, 1, facet_list);
-        i++;
+    if (facet_list && a->which == Z_APDU_searchRequest)
+    {
+        oi = &a->u.searchRequest->additionalSearchInfo;
+        yaz_oi_set_facetlist(oi, out, facet_list);
     }
-    for(; i<maxOtherInfosSupported; ++i)
+    yaz_oi_APDU(a, &oi);
+    for (i = 0; i < maxOtherInfosSupported; ++i)
     {
         if (oid_oidlen(extraOtherInfos[i].oid) > 0)
             yaz_oi_set_string_oid(oi, out, extraOtherInfos[i].oid,
@@ -281,11 +290,10 @@ int send_apdu(Z_APDU *a)
     buf = odr_getbuf(out, &len, 0);
     if (ber_file)
         odr_dumpBER(ber_file, buf, len);
-    /* printf ("sending APDU of size %d\n", len); */
     do_hex_dump(buf, len);
     if (cs_put(conn, buf, len) < 0)
     {
-        fprintf(stderr, "cs_put: %s", cs_errmsg(cs_errno(conn)));
+        fprintf(stderr, "cs_put: %s\n", cs_errmsg(cs_errno(conn)));
         close_session();
         return 0;
     }
@@ -315,19 +323,14 @@ static void print_refid(Z_ReferenceId *id)
 
 static Z_ReferenceId *set_refid(ODR out)
 {
-    Z_ReferenceId *id;
     if (!refid)
         return 0;
-    id = (Z_ReferenceId *) odr_malloc(out, sizeof(*id));
-    id->size = id->len = strlen(refid);
-    id->buf = (unsigned char *) odr_malloc(out, id->len);
-    memcpy(id->buf, refid, id->len);
-    return id;
+    return odr_create_Odr_oct(out, refid, strlen(refid));
 }
 
 /* INIT SERVICE ------------------------------- */
 
-static void send_initRequest(const char* type_and_host)
+static void send_Z3950_initRequest(const char* type_and_host)
 {
     Z_APDU *apdu = zget_APDU(out, Z_APDU_initRequest);
     Z_InitRequest *req = apdu->u.initRequest;
@@ -352,7 +355,8 @@ static void send_initRequest(const char* type_and_host)
                               1, type_and_host);
     }
 
-    if (negotiationCharset || yazLang) {
+    if (negotiationCharset || yazLang)
+    {
         Z_OtherInformation **p;
         Z_OtherInformationUnit *p0;
 
@@ -375,7 +379,6 @@ static void send_initRequest(const char* type_and_host)
 }
 
 
-/* These two are used only from process_initResponse() */
 static void render_initUserInfo(Z_OtherInformation *ui1);
 static void render_diag(Z_DiagnosticFormat *diag);
 
@@ -384,7 +387,7 @@ static void pr_opt(const char *opt, void *clientData)
     printf(" %s", opt);
 }
 
-static int process_initResponse(Z_InitResponse *res)
+static int process_Z3950_initResponse(Z_InitResponse *res)
 {
     int ver = 0;
     /* save session parameters for later use */
@@ -408,16 +411,18 @@ static int process_initResponse(Z_InitResponse *res)
     if (res->userInformationField)
     {
         Z_External *uif = res->userInformationField;
-        if (uif->which == Z_External_userInfo1) {
+        if (uif->which == Z_External_userInfo1)
             render_initUserInfo(uif->u.userInfo1);
-        } else {
+        else
+        {
             printf("UserInformationfield:\n");
             if (!z_External(print, (Z_External**)&uif, 0, 0))
             {
                 odr_perror(print, "Printing userinfo\n");
                 odr_reset(print);
             }
-            if (uif->which == Z_External_octet) {
+            if (uif->which == Z_External_octet)
+            {
                 printf("Guessing visiblestring:\n");
                 printf("'%.*s'\n", uif->u.octet_aligned->len,
                        uif->u.octet_aligned->buf);
@@ -456,8 +461,8 @@ static int process_initResponse(Z_InitResponse *res)
     if (ODR_MASK_GET(res->options, Z_Options_namedResultSets))
         setnumber = 0;
 
-    if (ODR_MASK_GET(res->options, Z_Options_negotiationModel)) {
-
+    if (ODR_MASK_GET(res->options, Z_Options_negotiationModel))
+    {
         Z_CharSetandLanguageNegotiation *p =
                 yaz_get_charneg_record(res->otherInfo);
 
@@ -493,18 +498,21 @@ static int process_initResponse(Z_InitResponse *res)
 }
 
 
-static void render_initUserInfo(Z_OtherInformation *ui1) {
+static void render_initUserInfo(Z_OtherInformation *ui1)
+{
     int i;
     printf("Init response contains %d otherInfo unit%s:\n",
            ui1->num_elements, ui1->num_elements == 1 ? "" : "s");
 
-    for (i = 0; i < ui1->num_elements; i++) {
+    for (i = 0; i < ui1->num_elements; i++)
+    {
         Z_OtherInformationUnit *unit = ui1->list[i];
         printf("  %d: otherInfo unit contains ", i+1);
         if (unit->which == Z_OtherInfo_externallyDefinedInfo &&
             unit->information.externallyDefinedInfo &&
             unit->information.externallyDefinedInfo->which ==
-            Z_External_diag1) {
+            Z_External_diag1)
+        {
             render_diag(unit->information.externallyDefinedInfo->u.diag1);
         }
         else if (unit->which != Z_OtherInfo_externallyDefinedInfo)
@@ -522,14 +530,17 @@ static void render_initUserInfo(Z_OtherInformation *ui1) {
 
 
 /* ### should this share code with display_diagrecs()? */
-static void render_diag(Z_DiagnosticFormat *diag) {
+static void render_diag(Z_DiagnosticFormat *diag)
+{
     int i;
 
     printf("%d diagnostic%s:\n", diag->num, diag->num == 1 ? "" : "s");
-    for (i = 0; i < diag->num; i++) {
+    for (i = 0; i < diag->num; i++)
+    {
         Z_DiagnosticFormat_s *ds = diag->elements[i];
         printf("    %d: ", i+1);
-        switch (ds->which) {
+        switch (ds->which)
+        {
         case Z_DiagnosticFormat_s_defaultDiagRec: {
             Z_DefaultDiagFormat *dd = ds->u.defaultDiagRec;
             /* ### should check `dd->diagnosticSetId' */
@@ -692,10 +703,7 @@ static int session_connect_base(const char *arg, const char **basep)
     strncpy(type_and_host, arg, sizeof(type_and_host)-1);
     type_and_host[sizeof(type_and_host)-1] = '\0';
 
-    if (yazProxy)
-        conn = cs_create_host(yazProxy, 1, &add);
-    else
-        conn = cs_create_host(arg, 1, &add);
+    conn = cs_create_host_proxy(arg, 1, &add, yazProxy);
     if (!conn)
     {
         printf("Could not resolve address %s\n", arg);
@@ -725,18 +733,21 @@ static int session_connect_base(const char *arg, const char **basep)
     cs_print_session_info(conn);
     if (protocol == PROTO_Z3950)
     {
-        send_initRequest(type_and_host);
+        send_Z3950_initRequest(type_and_host);
         return 2;
     }
     return 0;
 }
 
-static int session_connect(const char *arg)
+static int session_connect(void)
 {
     int r;
     const char *basep = 0;
 
-    r = session_connect_base(arg, &basep);
+    yaz_cookies_destroy(yaz_cookies);
+    yaz_cookies = yaz_cookies_create();
+
+    r = session_connect_base(wrbuf_cstr(cur_host), &basep);
     if (basep && *basep)
         set_base(basep);
     else if (protocol == PROTO_Z3950)
@@ -744,28 +755,25 @@ static int session_connect(const char *arg)
     return r;
 }
 
-int cmd_open(const char *arg)
+static int cmd_open(const char *arg)
 {
     int r;
     if (arg)
     {
-        strncpy(cur_host, arg, sizeof(cur_host)-1);
-        cur_host[sizeof(cur_host)-1] = 0;
+        wrbuf_rewind(cur_host);
+        if (!strstr(arg, "://") && strcmp(sru_method, "soap"))
+            wrbuf_puts(cur_host, "http://");
+        wrbuf_puts(cur_host, arg);
     }
-    /* TODO Make facet definition survive the open command without crashing */
-    /* TODO Fix deallocation */
-    facet_list = 0;
-
     set_base("");
-    r = session_connect(cur_host);
+    r = session_connect();
     if (conn && conn->protocol == PROTO_HTTP)
         queryType = QueryType_CQL;
 
-
     return r;
 }
 
-int cmd_authentication(const char *arg)
+static int cmd_authentication(const char *arg)
 {
     char **args;
     int r;
@@ -839,6 +847,75 @@ static void print_record(const char *buf, size_t len)
         printf("\n");
 }
 
+static void print_mab_record(const char *buf, size_t len)
+{
+    size_t i;
+    size_t last_linebreak = 0;
+    size_t last_subfield  = 0;
+    for (i = 0; i < len; i++)
+    {
+        // line break after header
+        if ( i == 24 )
+        {
+            printf("\n");
+            last_linebreak = i - 1;
+        }
+
+        // space between field and content
+        if ( i > 24 && i - last_linebreak == 5 )
+            printf(" ");
+
+        // space after subfield
+        if ( last_subfield != 0 && i - last_subfield == 2 )
+            printf(" ");
+
+        if ((buf[i] <= 126 && buf[i] >= 32) || strchr("\n\r\t\f", buf[i]))
+            printf("%c", buf[i]);
+        else if ( buf[i] == 29 ) // record separator
+            printf("\n");
+        else if ( buf[i] == 30 ) // field separator
+        {
+            printf("\n");
+            last_linebreak = i;
+        }
+        else if ( buf[i] == 31 ) // subfield
+        {
+            // space before subfields; except first one
+            if ( i > 24 && i - last_linebreak > 5 )
+                printf(" ");
+            printf("$");
+            last_subfield = i;
+        }
+        else
+            printf("\\X%02X", ((const unsigned char *)buf)[i]);
+    }
+}
+
+static void print_xml_record(const char *buf, size_t len)
+{
+    int has_printed = 0;
+#if YAZ_HAVE_XML2
+    if (pretty_xml)
+    {
+        xmlDocPtr doc;
+        xmlKeepBlanksDefault(0); /* get get xmlDocFormatMemory to work! */
+        doc = xmlParseMemory(buf, len);
+        if (doc)
+        {
+            xmlChar *xml_mem;
+            int xml_size;
+            xmlDocDumpFormatMemory(doc, &xml_mem, &xml_size, 1);
+            fwrite(xml_mem, 1, xml_size, stdout);
+            xmlFree(xml_mem);
+            xmlFreeDoc(doc);
+            has_printed = 1;
+        }
+    }
+#endif
+    if (!has_printed)
+        fwrite(buf, 1, len, stdout);
+}
+
 static void display_record(Z_External *r)
 {
     const Odr_oid *oid = r->direct_reference;
@@ -895,12 +972,16 @@ static void display_record(Z_External *r)
         const char *octet_buf = (const char*)r->u.octet_aligned->buf;
         size_t octet_len = r->u.octet_aligned->len;
         if (!oid_oidcmp(oid, yaz_oid_recsyn_xml)
-            || !oid_oidcmp(oid, yaz_oid_recsyn_xml)
+            || !oid_oidcmp(oid, yaz_oid_recsyn_application_xml)
             || !oid_oidcmp(oid, yaz_oid_recsyn_html))
         {
-            fwrite(octet_buf, 1, octet_len, stdout);
+            print_xml_record(octet_buf, octet_len);
         }
-        else if (yaz_oid_is_iso2709(oid))
+        else if (!oid_oidcmp(oid, yaz_oid_recsyn_mab))
+        {
+            print_mab_record(octet_buf, octet_len);
+        }
+        else
         {
             const char *result;
             size_t rlen;
@@ -946,17 +1027,14 @@ static void display_record(Z_External *r)
             }
             else
             {
-                printf("bad MARC. Dumping as it is:\n");
+                if (yaz_oid_is_iso2709(oid))
+                     printf("bad MARC. Dumping as it is:\n");
                 print_record(octet_buf, octet_len);
             }
             yaz_marc_destroy(mt);
             if (cd)
                 yaz_iconv_close(cd);
         }
-        else
-        {
-            print_record(octet_buf, octet_len);
-        }
         marc_file_write(octet_buf, r->u.octet_aligned->len);
     }
     else if (oid && !oid_oidcmp(oid, yaz_oid_recsyn_sutrs))
@@ -1171,7 +1249,7 @@ static void display_records(Z_Records *p)
     }
 }
 
-static int send_deleteResultSetRequest(const char *arg)
+static int send_Z3950_deleteResultSetRequest(const char *arg)
 {
     char names[8][32];
     int i;
@@ -1275,50 +1353,31 @@ static int send_srw_host_path(Z_SRW_PDU *sr, const char *host_port,
     {
         yaz_sru_soap_encode(gdu->u.HTTP_Request, sr, out, charset);
     }
+    else if (!yaz_matchstr(sru_method, "solr"))
+    {
+        yaz_solr_encode_request(gdu->u.HTTP_Request, sr, out, charset);
+    }
+
     return send_gdu(gdu);
 }
 
 static int send_srw(Z_SRW_PDU *sr)
 {
     char *path = yaz_encode_sru_dbpath_odr(out, databaseNames[0]);
-    return send_srw_host_path(sr, cur_host, path);
+    return send_srw_host_path(sr, wrbuf_cstr(cur_host), path);
 }
 
-static int send_SRW_redirect(const char *uri, Z_HTTP_Response *cookie_hres)
+static int send_SRW_redirect(const char *uri)
 {
     const char *username = 0;
     const char *password = 0;
-    struct Z_HTTP_Header *h;
-    char *combined_cookies = 0;
-    int combined_cookies_len = 0;
     Z_GDU *gdu = get_HTTP_Request_url(out, uri);
 
     gdu->u.HTTP_Request->method = odr_strdup(out, "GET");
     z_HTTP_header_add(out, &gdu->u.HTTP_Request->headers, "Accept",
                       "text/xml");
 
-    for (h = cookie_hres->headers; h; h = h->next)
-    {
-        if (!strcmp(h->name, "Set-Cookie")) {
-            char *cp;
-
-            if (!(cp = strchr(h->value, ';')))
-                cp = h->value + strlen(h->value);
-            if (cp - h->value >= 1) {
-                combined_cookies = xrealloc(combined_cookies, combined_cookies_len + cp - h->value + 3);
-                memcpy(combined_cookies+combined_cookies_len, h->value, cp - h->value);
-                combined_cookies[combined_cookies_len + cp - h->value] = '\0';
-                strcat(combined_cookies,"; ");
-                combined_cookies_len = strlen(combined_cookies);
-            }
-        }
-    }
-    if (combined_cookies_len)
-    {
-        z_HTTP_header_add(out, &gdu->u.HTTP_Request->headers, "Cookie", combined_cookies);
-        xfree(combined_cookies);
-    }
-
+    yaz_cookies_request(yaz_cookies, out, gdu->u.HTTP_Request);
     if (auth)
     {
         if (auth->which == Z_IdAuthentication_open)
@@ -1374,28 +1433,28 @@ static char *encode_SRW_term(ODR o, const char *q)
 }
 
 
-static int send_SRW_scanRequest(const char *arg, int pos, int num)
+static int send_SRW_scanRequest(const char *arg, Odr_int *pos, int num)
 {
     Z_SRW_PDU *sr = 0;
 
     /* regular requestse .. */
     sr = yaz_srw_get_pdu(out, Z_SRW_scan_request, sru_version);
 
-    switch(queryType)
+    switch (queryType)
     {
     case QueryType_CQL:
-        sr->u.scan_request->query_type = Z_SRW_query_type_cql;
-        sr->u.scan_request->scanClause.cql = encode_SRW_term(out, arg);
+        sr->u.scan_request->queryType = "cql";
+        sr->u.scan_request->scanClause = encode_SRW_term(out, arg);
         break;
     case QueryType_Prefix:
-        sr->u.scan_request->query_type = Z_SRW_query_type_pqf;
-        sr->u.scan_request->scanClause.pqf = encode_SRW_term(out, arg);
+        sr->u.scan_request->queryType = "pqf";
+        sr->u.scan_request->scanClause = encode_SRW_term(out, arg);
         break;
     default:
         printf("Only CQL and PQF supported in SRW\n");
         return 0;
     }
-    sr->u.scan_request->responsePosition = odr_intdup(out, pos);
+    sr->u.scan_request->responsePosition = pos;
     sr->u.scan_request->maximumTerms = odr_intdup(out, num);
     return send_srw(sr);
 }
@@ -1420,30 +1479,32 @@ static int send_SRW_searchRequest(const char *arg)
     /* regular request .. */
     sr = yaz_srw_get_pdu(out, Z_SRW_searchRetrieve_request, sru_version);
 
-    switch(queryType)
+    switch (queryType)
     {
     case QueryType_CQL:
-        srw_sr->u.request->query_type = Z_SRW_query_type_cql;
-        srw_sr->u.request->query.cql = encode_SRW_term(srw_sr_odr_out, arg);
+        srw_sr->u.request->queryType = "cql";
+        srw_sr->u.request->query = encode_SRW_term(srw_sr_odr_out, arg);
 
-        sr->u.request->query_type = Z_SRW_query_type_cql;
-        sr->u.request->query.cql = encode_SRW_term(srw_sr_odr_out, arg);
+        sr->u.request->queryType = "cql";
+        sr->u.request->query = encode_SRW_term(srw_sr_odr_out, arg);
         break;
     case QueryType_Prefix:
-        srw_sr->u.request->query_type = Z_SRW_query_type_pqf;
-        srw_sr->u.request->query.pqf = encode_SRW_term(srw_sr_odr_out, arg);
+        srw_sr->u.request->queryType = "pqf";
+        srw_sr->u.request->query = encode_SRW_term(srw_sr_odr_out, arg);
 
-        sr->u.request->query_type = Z_SRW_query_type_pqf;
-        sr->u.request->query.pqf = encode_SRW_term(srw_sr_odr_out, arg);
+        sr->u.request->queryType = "pqf";
+        sr->u.request->query = encode_SRW_term(srw_sr_odr_out, arg);
         break;
     default:
         printf("Only CQL and PQF supported in SRW\n");
         return 0;
     }
+    if (*sru_recordPacking)
+        sr->u.request->recordPacking = sru_recordPacking;
+    sru_maximumRecords = 0;
     sr->u.request->maximumRecords = odr_intdup(out, 0);
-
-    if (record_schema)
-        sr->u.request->recordSchema = record_schema;
+    sr->u.request->facetList = facet_list;
+    sr->u.request->recordSchema = record_schema;
     if (recordsyntax_size == 1 && !yaz_matchstr(recordsyntax_list[0], "xml"))
         sr->u.request->recordPacking = "xml";
     return send_srw(sr);
@@ -1466,7 +1527,7 @@ static void query_charset_convert(Z_RPNQuery *q)
     }
 }
 
-static int send_searchRequest(const char *arg)
+static int send_Z3950_searchRequest(const char *arg)
 {
     Z_APDU *apdu = zget_APDU(out, Z_APDU_searchRequest);
     Z_SearchRequest *req = apdu->u.searchRequest;
@@ -1489,23 +1550,28 @@ static int send_searchRequest(const char *arg)
             printf("CCL ERROR: %s\n", ccl_err_msg(error));
             return 0;
         }
-    } else if (myQueryType == QueryType_CQL2RPN) {
+    }
+    else if (myQueryType == QueryType_CQL2RPN)
+    {
         /* ### All this code should be wrapped in a utility function */
         CQL_parser parser;
         struct cql_node *node;
         const char *addinfo;
-        if (cqltrans == 0) {
+        if (cqltrans == 0)
+        {
             printf("Can't use CQL: no translation file.  Try set_cqlfile\n");
             return 0;
         }
         parser = cql_parser_create();
-        if ((error = cql_parser_string(parser, arg)) != 0) {
+        if ((error = cql_parser_string(parser, arg)) != 0)
+        {
             printf("Can't parse CQL: must be a syntax error\n");
             return 0;
         }
         node = cql_parser_result(parser);
         if ((error = cql_transform_buf(cqltrans, node, pqfbuf,
-                                       sizeof pqfbuf)) != 0) {
+                                       sizeof pqfbuf)) != 0)
+        {
             error = cql_transform_error(cqltrans, &addinfo);
             printf("Can't convert CQL to PQF: %s (addinfo=%s)\n",
                     cql_strerror(error), addinfo);
@@ -1518,12 +1584,12 @@ static int send_searchRequest(const char *arg)
     req->referenceId = set_refid(out);
     if (!strcmp(arg, "@big")) /* strictly for troublemaking */
     {
-        static unsigned char big[2100];
+        static char big[2100];
         static Odr_oct bigo;
 
         /* send a very big referenceid to test transport stack etc. */
         memset(big, 'A', 2100);
-        bigo.len = bigo.size = 2100;
+        bigo.len = 2100;
         bigo.buf = big;
         req->referenceId = &bigo;
     }
@@ -1577,7 +1643,7 @@ static int send_searchRequest(const char *arg)
     case QueryType_CCL:
         query.which = Z_Query_type_2;
         query.u.type_2 = &ccl_query;
-        ccl_query.buf = (unsigned char*) arg;
+        ccl_query.buf = (char *) arg;
         ccl_query.len = strlen(arg);
         break;
     case QueryType_CCL2RPN:
@@ -1612,20 +1678,21 @@ static int send_searchRequest(const char *arg)
     return 2;
 }
 
-static void display_term(Z_Term *term) {
+static void display_term(Z_Term *term)
+{
     switch (term->which)
     {
     case Z_Term_general:
-        printf("    %.*s", term->u.general->len, term->u.general->buf);
+        printf("%.*s", term->u.general->len, term->u.general->buf);
         break;
     case Z_Term_characterString:
-        printf("    %s", term->u.characterString);
+        printf("%s", term->u.characterString);
         break;
     case Z_Term_numeric:
-        printf("    " ODR_INT_PRINTF, *term->u.numeric);
+        printf(ODR_INT_PRINTF, *term->u.numeric);
         break;
     case Z_Term_null:
-        printf("    null");
+        printf("null");
         break;
     }
 }
@@ -1646,21 +1713,22 @@ static void display_queryExpression(const char *lead, Z_QueryExpression *qe)
     }
 }
 
-static void display_facet(Z_FacetField *facet) {
-    if (facet->attributes) {
+static void display_facet(Z_FacetField *facet)
+{
+    if (facet->attributes)
+    {
         Z_AttributeList *al = facet->attributes;
-        struct attrvalues attr_values;
-        attr_values.errcode = 0;
-        attr_values.limit = -1;
-        attr_values.useattr = 0;
-        attr_values.relation = "default";
-
-        facetattrs(al, &attr_values);
-        if (!attr_values.errcode) {
+        struct yaz_facet_attr attr_values;
+        yaz_facet_attr_init(&attr_values);
+        yaz_facet_attr_get_z_attributes(al, &attr_values);
+        if (!attr_values.errcode)
+        {
             int term_index;
-            printf("  %s (%d): \n", attr_values.useattr, /* attr_values.relation, attr_values.limit, */ facet->num_terms);
-            for (term_index = 0 ; term_index < facet->num_terms; term_index++) {
+            printf("  %s (%d): \n", attr_values.useattr, facet->num_terms);
+            for (term_index = 0 ; term_index < facet->num_terms; term_index++)
+            {
                 Z_FacetTerm *facetTerm = facet->terms[term_index];
+                printf("    ");
                 display_term(facetTerm->term);
                 printf(" (" NMEM_INT_PRINTF ")\n", *facetTerm->count);
             }
@@ -1674,7 +1742,8 @@ static void* display_facets(Z_FacetList *fl)
     int index;
     printf("Facets(%d): \n", fl->num);
 
-    for (index = 0; index < fl->num ; index++) {
+    for (index = 0; index < fl->num ; index++)
+    {
         display_facet(fl->elements[index]);
     }
     return 0;
@@ -1727,7 +1796,7 @@ static void display_searchResult(Z_OtherInformation *o)
     }
 }
 
-static int process_searchResponse(Z_SearchResponse *res)
+static int process_Z3950_searchResponse(Z_SearchResponse *res)
 {
     printf("Received SearchResponse.\n");
     print_refid(res->referenceId);
@@ -1743,7 +1812,7 @@ static int process_searchResponse(Z_SearchResponse *res)
     if (res->resultSetStatus)
     {
         printf("Result Set Status: ");
-        switch(*res->resultSetStatus)
+        switch (*res->resultSetStatus)
         {
         case Z_SearchResponse_subset:
             printf("subset"); break;
@@ -1822,7 +1891,7 @@ static void print_referenceId(int iLevel, Z_ReferenceId *referenceId)
         int i;
 
         print_level(iLevel);
-        printf("Ref Id (%d, %d): ", referenceId->len, referenceId->size);
+        printf("Ref Id (%d): ", referenceId->len);
         for (i = 0; i < referenceId->len; i++)
             printf("%c", referenceId->buf[i]);
         printf("\n");
@@ -1932,7 +2001,7 @@ static void print_external(int iLevel, Z_External *pExternal)
     }
 }
 
-static int process_resourceControlRequest(Z_ResourceControlRequest *req)
+static int process_Z3950_resourceControlRequest(Z_ResourceControlRequest *req)
 {
     printf("Received ResourceControlRequest.\n");
     print_referenceId(1, req->referenceId);
@@ -1944,7 +2013,7 @@ static int process_resourceControlRequest(Z_ResourceControlRequest *req)
     return 0;
 }
 
-void process_ESResponse(Z_ExtendedServicesResponse *res)
+static void process_Z3950_ESResponse(Z_ExtendedServicesResponse *res)
 {
     printf("Status: ");
     switch (*res->operationStatus)
@@ -1963,7 +2032,8 @@ void process_ESResponse(Z_ExtendedServicesResponse *res)
         printf("unknown\n");
     }
     if ( (*res->operationStatus != Z_ExtendedServicesResponse_failure) &&
-        (res->num_diagnostics != 0) ) {
+        (res->num_diagnostics != 0) )
+    {
         display_diagrecs(res->diagnostics, res->num_diagnostics);
     }
     print_refid (res->referenceId);
@@ -2041,7 +2111,7 @@ void process_ESResponse(Z_ExtendedServicesResponse *res)
     }
 }
 
-const char *get_ill_element(void *clientData, const char *element)
+static const char *get_ill_element(void *clientData, const char *element)
 {
     return 0;
 }
@@ -2077,21 +2147,14 @@ static Z_External *create_external_itemRequest(void)
     }
     else
     {
+        item_request_buf = odr_getbuf (out, &item_request_size, 0);
         r = (Z_External *) odr_malloc(out, sizeof(*r));
         r->direct_reference = odr_oiddup(out, yaz_oid_general_isoill_1);
         r->indirect_reference = 0;
         r->descriptor = 0;
         r->which = Z_External_single;
-
-        r->u.single_ASN1_type = (Odr_oct *)
-            odr_malloc(out, sizeof(*r->u.single_ASN1_type));
-        r->u.single_ASN1_type->buf = (unsigned char *)
-        odr_malloc(out, item_request_size);
-        r->u.single_ASN1_type->len = item_request_size;
-        r->u.single_ASN1_type->size = item_request_size;
-        memcpy(r->u.single_ASN1_type->buf, item_request_buf,
-                item_request_size);
-
+        r->u.single_ASN1_type =
+            odr_create_Odr_oct(out, item_request_buf, item_request_size);
         do_hex_dump(item_request_buf,item_request_size);
     }
     return r;
@@ -2135,18 +2198,8 @@ static Z_External *create_external_ILL_APDU(void)
         r->indirect_reference = 0;
         r->descriptor = 0;
         r->which = Z_External_single;
-
-        r->u.single_ASN1_type = (Odr_oct *)
-            odr_malloc(out, sizeof(*r->u.single_ASN1_type));
-        r->u.single_ASN1_type->buf = (unsigned char *)
-        odr_malloc(out, ill_request_size);
-        r->u.single_ASN1_type->len = ill_request_size;
-        r->u.single_ASN1_type->size = ill_request_size;
-        memcpy(r->u.single_ASN1_type->buf, ill_request_buf, ill_request_size);
-/*         printf("len = %d\n", ill_request_size); */
-/*              do_hex_dump(ill_request_buf,ill_request_size); */
-/*              printf("--- end of extenal\n"); */
-
+        r->u.single_ASN1_type = odr_create_Odr_oct(out, ill_request_buf,
+                                                   ill_request_size);
     }
     return r;
 }
@@ -2222,8 +2275,8 @@ static Z_External *create_ItemOrderExternal(const char *type, int itemno,
     return r;
 }
 
-static int send_itemorder(const char *type, int itemno,
-                          const char *xml_buf, int xml_len)
+static int send_Z3950_itemorder(const char *type, int itemno,
+                                const char *xml_buf, int xml_len)
 {
     Z_APDU *apdu = zget_APDU(out, Z_APDU_extendedServicesRequest);
     Z_ExtendedServicesRequest *req = apdu->u.extendedServicesRequest;
@@ -2266,11 +2319,11 @@ static int cmd_update0(const char *arg)
     return cmd_update_common(arg, 0);
 }
 
-static int cmd_update_Z3950(int version, int action_no, const char *recid,
+static int send_Z3950_update(int version, int action_no, const char *recid,
                             char *rec_buf, int rec_len);
 
 #if YAZ_HAVE_XML2
-static int cmd_update_SRW(int action_no, const char *recid,
+static int send_SRW_update(int action_no, const char *recid,
                           char *rec_buf, int rec_len);
 #endif
 
@@ -2325,17 +2378,17 @@ static int cmd_update_common(const char *arg, int version)
 
 #if YAZ_HAVE_XML2
     if (protocol == PROTO_HTTP)
-        return cmd_update_SRW(action_no, recid_buf, rec_buf, rec_len);
+        return send_SRW_update(action_no, recid, rec_buf, rec_len);
 #endif
-    return cmd_update_Z3950(version, action_no, recid_buf, rec_buf, rec_len);
+    return send_Z3950_update(version, action_no, recid, rec_buf, rec_len);
 }
 
 #if YAZ_HAVE_XML2
-static int cmd_update_SRW(int action_no, const char *recid,
-                          char *rec_buf, int rec_len)
+static int send_SRW_update(int action_no, const char *recid,
+                           char *rec_buf, int rec_len)
 {
     if (!conn)
-        session_connect(cur_host);
+        session_connect();
     if (!conn)
         return 0;
     else
@@ -2343,7 +2396,7 @@ static int cmd_update_SRW(int action_no, const char *recid,
         Z_SRW_PDU *srw = yaz_srw_get(out, Z_SRW_update_request);
         Z_SRW_updateRequest *sr = srw->u.update_request;
 
-        switch(action_no)
+        switch (action_no)
         {
         case Z_IUOriginPartToKeep_recordInsert:
             sr->operation = "info:srw/action/1/create";
@@ -2369,7 +2422,7 @@ static int cmd_update_SRW(int action_no, const char *recid,
 }
 #endif
 
-static int cmd_update_Z3950(int version, int action_no, const char *recid,
+static int send_Z3950_update(int version, int action_no, const char *recid,
                             char *rec_buf, int rec_len)
 {
     Z_APDU *apdu = zget_APDU(out, Z_APDU_extendedServicesRequest );
@@ -2435,16 +2488,8 @@ static int cmd_update_Z3950(int version, int action_no, const char *recid,
         notToKeep->elements[0] = (Z_IU0SuppliedRecords_elem *)
             odr_malloc(out, sizeof(**notToKeep->elements));
         notToKeep->elements[0]->which = Z_IUSuppliedRecords_elem_opaque;
-        if (recid)
-        {
-            notToKeep->elements[0]->u.opaque = (Odr_oct *)
-                odr_malloc(out, sizeof(Odr_oct));
-            notToKeep->elements[0]->u.opaque->buf = (unsigned char *) recid;
-            notToKeep->elements[0]->u.opaque->size = strlen(recid);
-            notToKeep->elements[0]->u.opaque->len = strlen(recid);
-        }
-        else
-            notToKeep->elements[0]->u.opaque = 0;
+        notToKeep->elements[0]->u.opaque = recid ?
+            odr_create_Odr_oct(out, recid, strlen(recid)) : 0;
         notToKeep->elements[0]->supplementalId = 0;
         notToKeep->elements[0]->correlationInfo = 0;
         notToKeep->elements[0]->record = record_this;
@@ -2482,16 +2527,8 @@ static int cmd_update_Z3950(int version, int action_no, const char *recid,
         notToKeep->elements[0] = (Z_IUSuppliedRecords_elem *)
             odr_malloc(out, sizeof(**notToKeep->elements));
         notToKeep->elements[0]->which = Z_IUSuppliedRecords_elem_opaque;
-        if (recid)
-        {
-            notToKeep->elements[0]->u.opaque = (Odr_oct *)
-                odr_malloc(out, sizeof(Odr_oct));
-            notToKeep->elements[0]->u.opaque->buf = (unsigned char *) recid;
-            notToKeep->elements[0]->u.opaque->size = strlen(recid);
-            notToKeep->elements[0]->u.opaque->len = strlen(recid);
-        }
-        else
-            notToKeep->elements[0]->u.opaque = 0;
+        notToKeep->elements[0]->u.opaque = recid ?
+            odr_create_Odr_oct(out, recid, strlen(recid)) : 0;
         notToKeep->elements[0]->supplementalId = 0;
         notToKeep->elements[0]->correlationInfo = 0;
         notToKeep->elements[0]->record = record_this;
@@ -2535,7 +2572,7 @@ static int cmd_xmles(const char *arg)
                           &ext->u.single_ASN1_type->len) == 0)
             return 0;
 
-        ext->u.single_ASN1_type->buf = (unsigned char *) asn_buf;
+        ext->u.single_ASN1_type->buf = asn_buf;
 
         oid = yaz_string_to_oid_odr(yaz_oid_std(),
                                     CLASS_EXTSERV, oid_str, out);
@@ -2571,7 +2608,7 @@ static int cmd_itemorder(const char *arg)
     parse_cmd_doc(&arg, out, &xml_buf, &xml_len);
 
     fflush(stdout);
-    send_itemorder(type, itemno, xml_buf, xml_len);
+    send_Z3950_itemorder(type, itemno, xml_buf, xml_len);
     return 2;
 }
 
@@ -2613,7 +2650,7 @@ static int cmd_explain(const char *arg)
         return 0;
 #if YAZ_HAVE_XML2
     if (!conn)
-        session_connect(cur_host);
+        session_connect();
     if (conn)
     {
         Z_SRW_PDU *sr = 0;
@@ -2621,7 +2658,7 @@ static int cmd_explain(const char *arg)
         setno = 1;
 
         /* save this for later .. when fetching individual records */
-        sr = yaz_srw_get(out, Z_SRW_explain_request);
+        sr = yaz_srw_get_pdu(out, Z_SRW_explain_request, sru_version);
         if (recordsyntax_size == 1
             && !yaz_matchstr(recordsyntax_list[0], "xml"))
             sr->u.explain_request->recordPacking = "xml";
@@ -2636,12 +2673,14 @@ static int cmd_init(const char *arg)
 {
     if (*arg)
     {
-        strncpy(cur_host, arg, sizeof(cur_host)-1);
-        cur_host[sizeof(cur_host)-1] = 0;
+        wrbuf_rewind(cur_host);
+        if (!strstr(arg, "://") && strcmp(sru_method, "soap"))
+            wrbuf_puts(cur_host, "http://");
+        wrbuf_puts(cur_host, arg);
     }
     if (only_z3950())
         return 1;
-    send_initRequest(cur_host);
+    send_Z3950_initRequest(wrbuf_cstr(cur_host));
     return 2;
 }
 
@@ -2778,8 +2817,8 @@ static int cmd_sru(const char *arg)
     }
     else
     {
-        int r;
-        r = sscanf(arg, "%9s %9s", sru_method, sru_version);
+        int r = sscanf(arg, "%9s %9s %9s", sru_method, sru_version,
+            sru_recordPacking);
         if (r >= 1)
         {
             if (!yaz_matchstr(sru_method, "post"))
@@ -2788,11 +2827,13 @@ static int cmd_sru(const char *arg)
                 ;
             else if (!yaz_matchstr(sru_method, "soap"))
                 ;
+            else if (!yaz_matchstr(sru_method, "solr"))
+                ;
             else
             {
                 strcpy(sru_method, "soap");
                 printf("Unknown SRU method: %s\n", arg);
-                printf("Specify one of POST, GET, SOAP\n");
+                printf("Specify one of POST, GET, SOAP, SOLR\n");
             }
         }
     }
@@ -2810,7 +2851,7 @@ static int cmd_find(const char *arg)
     {
 #if YAZ_HAVE_XML2
         if (!conn)
-            session_connect(cur_host);
+            session_connect();
         if (!conn)
             return 0;
         if (!send_SRW_searchRequest(arg))
@@ -2821,14 +2862,14 @@ static int cmd_find(const char *arg)
     }
     else
     {
-        if (*cur_host && auto_reconnect)
+        if (wrbuf_len(cur_host) && auto_reconnect)
         {
             int i = 0;
             for (;;)
             {
                 if (conn)
                 {
-                    if (!send_searchRequest(arg))
+                    if (!send_Z3950_searchRequest(arg))
                         return 0;
                     wait_and_handle_response(0);
                     if (conn)
@@ -2839,14 +2880,14 @@ static int cmd_find(const char *arg)
                     printf("Unable to reconnect\n");
                     break;
                 }
-                session_connect(cur_host);
+                session_connect();
                 wait_and_handle_response(0);
             }
             return 0;
         }
         else if (conn)
         {
-            if (!send_searchRequest(arg))
+            if (!send_Z3950_searchRequest(arg))
                 return 0;
         }
         else
@@ -2860,70 +2901,60 @@ static int cmd_find(const char *arg)
 
 static int cmd_facets(const char *arg)
 {
-    int size = 0;
+    if (!facet_odr)
+        facet_odr = odr_createmem(ODR_ENCODE);
+    odr_reset(facet_odr);
+
     if (!*arg)
     {
         facet_list = 0;
         printf("Facets cleared.\n");
         return 0;
     }
-    size = strlen(arg);
-    if (only_z3950())
+    facet_list = yaz_pqf_parse_facet_list(facet_odr, arg);
+    if (!facet_list)
     {
-        printf("Currently only supported for Z39.50.\n");
+        printf("Invalid facet list: %s", arg);
         return 0;
     }
-    else
-    {
-        /* TODO Wrong odr. Loosing memory */
-        ODR odr = odr_createmem(ODR_ENCODE);
-        facet_list = yaz_pqf_parse_facet_list(odr, arg);
-
-        if (!facet_list) {
-            printf("Invalid facet list: %s", arg);
-            return 0;
-        }
-        return 1;
-    }
-    return 2;
+    return 1;
 }
 
-
 static int cmd_delete(const char *arg)
 {
     if (only_z3950())
         return 0;
-    if (!send_deleteResultSetRequest(arg))
+    if (!send_Z3950_deleteResultSetRequest(arg))
         return 0;
     return 2;
 }
 
 static int cmd_ssub(const char *arg)
 {
-    if (!(smallSetUpperBound = atoi(arg)))
-        return 0;
+    smallSetUpperBound = odr_strtol(arg, 0, 10);
     return 1;
 }
 
 static int cmd_lslb(const char *arg)
 {
-    if (!(largeSetLowerBound = atoi(arg)))
-        return 0;
+    largeSetLowerBound = odr_strtol(arg, 0, 10);
     return 1;
 }
 
 static int cmd_mspn(const char *arg)
 {
-    if (!(mediumSetPresentNumber = atoi(arg)))
-        return 0;
+    mediumSetPresentNumber = odr_strtol(arg, 0, 10);
     return 1;
 }
 
 static int cmd_status(const char *arg)
 {
-    printf("smallSetUpperBound: %d\n", smallSetUpperBound);
-    printf("largeSetLowerBound: %d\n", largeSetLowerBound);
-    printf("mediumSetPresentNumber: %d\n", mediumSetPresentNumber);
+    printf("smallSetUpperBound: " ODR_INT_PRINTF "\n",
+           smallSetUpperBound);
+    printf("largeSetLowerBound: " ODR_INT_PRINTF "\n",
+           largeSetLowerBound);
+    printf("mediumSetPresentNumber: " ODR_INT_PRINTF "\n",
+           mediumSetPresentNumber);
     return 1;
 }
 
@@ -2947,21 +2978,50 @@ static int cmd_setnames(const char *arg)
 
 /* PRESENT SERVICE ----------------------------- */
 
+size_t check_token(const char *haystack, const char *token)
+{
+    size_t len = strlen(token);
+    size_t extra;
+    if (strncmp(haystack, token, len))
+        return 0;
+    for (extra = 0; haystack[extra + len] != '\0'; extra++)
+        if (!strchr(" \r\n\t", haystack[extra + len]))
+        {
+            if (extra)
+                break;
+            else
+                return 0;  /* no whitespace after token */
+        }
+    return extra + len;
+}
+
 static int parse_show_args(const char *arg_c, char *setstring,
                            Odr_int *start, Odr_int *number)
 {
     char *end_ptr;
     Odr_int start_position;
+    size_t token_len;
 
     if (setnumber >= 0)
         sprintf(setstring, "%d", setnumber);
     else
         *setstring = '\0';
 
-    if (!strcmp(arg_c, "all"))
+    token_len = check_token(arg_c, "format");
+    if (token_len)
+    {
+        pretty_xml = 1;
+        arg_c += token_len;
+    }
+    else
+        pretty_xml = 0;
+
+    token_len = check_token(arg_c, "all");
+    if (token_len)
     {
         *number = last_hit_count;
         *start = 1;
+        return 1;
     }
     start_position = odr_strtol(arg_c, &end_ptr, 10);
     if (end_ptr == arg_c)
@@ -2969,7 +3029,7 @@ static int parse_show_args(const char *arg_c, char *setstring,
     *start = start_position;
     if (*end_ptr == '\0')
         return 1;
-    while (isspace(*(unsigned char *)end_ptr))
+    while (yaz_isspace(*end_ptr))
         end_ptr++;
     if (*end_ptr != '+')
     {
@@ -2986,7 +3046,7 @@ static int parse_show_args(const char *arg_c, char *setstring,
     }
     if (*end_ptr == '\0')
         return 1;
-    while (isspace(*(unsigned char *)end_ptr))
+    while (yaz_isspace(*end_ptr))
         end_ptr++;
     if (*end_ptr != '+')
     {
@@ -2997,7 +3057,7 @@ static int parse_show_args(const char *arg_c, char *setstring,
     return 1;
 }
 
-static int send_presentRequest(const char *arg)
+static int send_Z3950_presentRequest(const char *arg)
 {
     Z_APDU *apdu = zget_APDU(out, Z_APDU_presentRequest);
     Z_PresentRequest *req = apdu->u.presentRequest;
@@ -3101,10 +3161,12 @@ static int send_SRW_presentRequest(const char *arg)
         return 0;
     if (!parse_show_args(arg, setstring, &setno, &nos))
         return 0;
+    if (*sru_recordPacking)
+        sr->u.request->recordPacking = sru_recordPacking;
     sr->u.request->startRecord = odr_intdup(out, setno);
+    sru_maximumRecords = nos;
     sr->u.request->maximumRecords = odr_intdup(out, nos);
-    if (record_schema)
-        sr->u.request->recordSchema = record_schema;
+    sr->u.request->recordSchema = record_schema;
     if (recordsyntax_size == 1 && !yaz_matchstr(recordsyntax_list[0], "xml"))
         sr->u.request->recordPacking = "xml";
     return send_srw(sr);
@@ -3123,7 +3185,7 @@ static void close_session(void)
     last_hit_count = 0;
 }
 
-void process_close(Z_Close *req)
+static void process_Z3950_close(Z_Close *req)
 {
     Z_APDU *apdu = zget_APDU(out, Z_APDU_close);
     Z_Close *res = apdu->u.close;
@@ -3161,7 +3223,7 @@ static int cmd_show(const char *arg)
     {
 #if YAZ_HAVE_XML2
         if (!conn)
-            session_connect(cur_host);
+            session_connect();
         if (!conn)
             return 0;
         if (!send_SRW_presentRequest(arg))
@@ -3177,21 +3239,27 @@ static int cmd_show(const char *arg)
             printf("Not connected yet\n");
             return 0;
         }
-        if (!send_presentRequest(arg))
+        if (!send_Z3950_presentRequest(arg))
             return 0;
     }
     return 2;
 }
 
-void exit_client(int code)
+static void exit_client(int code)
 {
+    odr_destroy(in);
+    odr_destroy(out);
+    odr_destroy(print);
+    ccl_qual_rm(&bibset);
+    yaz_cookies_destroy(yaz_cookies);
     file_history_save(file_history);
     file_history_destroy(&file_history);
     nmem_destroy(nmem_auth);
+    wrbuf_destroy(cur_host);
     exit(code);
 }
 
-int cmd_quit(const char *arg)
+static int cmd_quit(const char *arg)
 {
     printf("See you later, alligator.\n");
     xmalloc_trav("");
@@ -3199,55 +3267,64 @@ int cmd_quit(const char *arg)
     return 0;
 }
 
-int cmd_cancel(const char *arg)
+static int cmd_cancel(const char *arg)
 {
-    Z_APDU *apdu = zget_APDU(out, Z_APDU_triggerResourceControlRequest);
-    Z_TriggerResourceControlRequest *req =
-        apdu->u.triggerResourceControlRequest;
-    bool_t rfalse = 0;
-    char command[16];
-
-    *command = '\0';
-    sscanf(arg, "%15s", command);
-
     if (only_z3950())
         return 0;
-    if (session_initResponse &&
-        !ODR_MASK_GET(session_initResponse->options,
-                      Z_Options_triggerResourceCtrl))
+    else
     {
-        printf("Target doesn't support cancel (trigger resource ctrl)\n");
-        return 0;
-    }
-    *req->requestedAction = Z_TriggerResourceControlRequest_cancel;
-    req->resultSetWanted = &rfalse;
-    req->referenceId = set_refid(out);
+        Z_APDU *apdu = zget_APDU(out, Z_APDU_triggerResourceControlRequest);
+        Z_TriggerResourceControlRequest *req =
+            apdu->u.triggerResourceControlRequest;
+        bool_t rfalse = 0;
+        char command[16];
 
-    send_apdu(apdu);
-    printf("Sent cancel request\n");
-    if (!strcmp(command, "wait"))
-         return 2;
-    return 1;
-}
+        *command = '\0';
+        sscanf(arg, "%15s", command);
 
+        if (only_z3950())
+            return 0;
+        if (session_initResponse &&
+            !ODR_MASK_GET(session_initResponse->options,
+                          Z_Options_triggerResourceCtrl))
+        {
+            printf("Target doesn't support cancel (trigger resource ctrl)\n");
+            return 0;
+        }
+        *req->requestedAction = Z_TriggerResourceControlRequest_cancel;
+        req->resultSetWanted = &rfalse;
+        req->referenceId = set_refid(out);
 
-int cmd_cancel_find(const char *arg) {
+        send_apdu(apdu);
+        printf("Sent cancel request\n");
+        if (!strcmp(command, "wait"))
+            return 2;
+        return 1;
+    }
+}
+
+static int cmd_cancel_find(const char *arg)
+{
     int fres;
-    fres=cmd_find(arg);
-    if( fres > 0 ) {
+    if (only_z3950())
+        return 0;
+    fres = cmd_find(arg);
+    if (fres > 0)
+    {
         return cmd_cancel("");
     };
     return fres;
 }
 
-int send_scanrequest(const char *set,  const char *query,
-                     Odr_int pp, Odr_int num, const char *term)
+static int send_Z3950_scanrequest(const char *set,  const char *query,
+                                  Odr_int *pos, Odr_int num, const char *term)
 {
     Z_APDU *apdu = zget_APDU(out, Z_APDU_scanRequest);
     Z_ScanRequest *req = apdu->u.scanRequest;
 
     if (only_z3950())
         return 0;
+    printf("query: %s\n", query);
     if (queryType == QueryType_CCL2RPN)
     {
         int error, pos;
@@ -3307,17 +3384,15 @@ int send_scanrequest(const char *set,  const char *query,
             req->termListAndStartPoint->term->u.general)
         {
             req->termListAndStartPoint->term->u.general->buf =
-                (unsigned char *) odr_strdup(out, term);
-            req->termListAndStartPoint->term->u.general->len =
-                req->termListAndStartPoint->term->u.general->size =
-                strlen(term);
+                odr_strdup(out, term);
+            req->termListAndStartPoint->term->u.general->len = strlen(term);
         }
     }
     req->referenceId = set_refid(out);
     req->num_databaseNames = num_databaseNames;
     req->databaseNames = databaseNames;
     req->numberOfTermsRequested = &num;
-    req->preferredPositionInResponse = &pp;
+    req->preferredPositionInResponse = pos;
     req->stepSize = odr_intdup(out, scan_stepSize);
 
     if (set)
@@ -3328,7 +3403,7 @@ int send_scanrequest(const char *set,  const char *query,
     return 2;
 }
 
-int send_sortrequest(const char *arg, int newset)
+static int send_sortrequest(const char *arg, int newset)
 {
     Z_APDU *apdu = zget_APDU(out, Z_APDU_sortRequest);
     Z_SortRequest *req = apdu->u.sortRequest;
@@ -3365,7 +3440,7 @@ int send_sortrequest(const char *arg, int newset)
     return 2;
 }
 
-void display_term_info(Z_TermInfo *t)
+static void display_term_info(Z_TermInfo *t)
 {
     if (t->displayTerm)
         printf("%s", t->displayTerm);
@@ -3383,7 +3458,7 @@ void display_term_info(Z_TermInfo *t)
         printf("\n");
 }
 
-void process_scanResponse(Z_ScanResponse *res)
+static void process_Z3950_scanResponse(Z_ScanResponse *res)
 {
     int i;
     Z_Entry **entries = NULL;
@@ -3417,7 +3492,7 @@ void process_scanResponse(Z_ScanResponse *res)
                           res->entries->num_nonsurrogateDiagnostics);
 }
 
-void process_sortResponse(Z_SortResponse *res)
+static void process_Z3950_sortResponse(Z_SortResponse *res)
 {
     printf("Received SortResponse: status=");
     switch (*res->sortStatus)
@@ -3438,7 +3513,8 @@ void process_sortResponse(Z_SortResponse *res)
                          res->num_diagnostics);
 }
 
-void process_deleteResultSetResponse(Z_DeleteResultSetResponse *res)
+static void process_Z3950_deleteResultSetResponse(
+    Z_DeleteResultSetResponse *res)
 {
     printf("Got deleteResultSetResponse status=" ODR_INT_PRINTF "\n",
            *res->deleteOperationStatus);
@@ -3454,7 +3530,7 @@ void process_deleteResultSetResponse(Z_DeleteResultSetResponse *res)
     }
 }
 
-int cmd_sort_generic(const char *arg, int newset)
+static int cmd_sort_generic(const char *arg, int newset)
 {
     if (only_z3950())
         return 0;
@@ -3473,31 +3549,39 @@ int cmd_sort_generic(const char *arg, int newset)
     return 0;
 }
 
-int cmd_sort(const char *arg)
+static int cmd_sort(const char *arg)
 {
     return cmd_sort_generic(arg, 0);
 }
 
-int cmd_sort_newset(const char *arg)
+static int cmd_sort_newset(const char *arg)
 {
     return cmd_sort_generic(arg, 1);
 }
 
-int cmd_scanstep(const char *arg)
+static int cmd_scanstep(const char *arg)
 {
     scan_stepSize = atoi(arg);
     return 0;
 }
 
-int cmd_scanpos(const char *arg)
+static int cmd_scanpos(const char *arg)
 {
-    int r = sscanf(arg, "%d", &scan_position);
-    if (r == 0)
-        scan_position = 1;
+    if (!strcmp(arg, "none"))
+        strcpy(scan_position, "none");
+    else
+    {
+        int dummy;
+        int r = sscanf(arg, "%d", &dummy);
+        if (r == 1 && strlen(arg) < sizeof(scan_position)-1)
+            strcpy(scan_position, arg);
+        else
+            printf("specify number of none for scanpos\n");
+    }
     return 0;
 }
 
-int cmd_scansize(const char *arg)
+static int cmd_scansize(const char *arg)
 {
     int r = sscanf(arg, "%d", &scan_size);
     if (r == 0)
@@ -3507,23 +3591,37 @@ int cmd_scansize(const char *arg)
 
 static int cmd_scan_common(const char *set, const char *arg)
 {
+    Odr_int pos, *pos_p = 0;
+    const char *scan_term = 0;
+    const char *scan_query = 0;
+
+    if (!*arg)
+    {
+        pos = 1;
+        pos_p = &pos;
+        scan_query = last_scan_query;
+        scan_term = last_scan_line;
+    }
+    else
+    {
+        strcpy(last_scan_query, arg);
+        scan_query = arg;
+        if (strcmp(scan_position, "none"))
+        {
+            pos = odr_atoi(scan_position);
+            pos_p = &pos;
+        }
+    }
+
     if (protocol == PROTO_HTTP)
     {
 #if YAZ_HAVE_XML2
         if (!conn)
-            session_connect(cur_host);
+            session_connect();
         if (!conn)
             return 0;
-        if (*arg)
-        {
-            if (send_SRW_scanRequest(arg, scan_position, scan_size) < 0)
-                return 0;
-        }
-        else
-        {
-            if (send_SRW_scanRequest(last_scan_line, 1, scan_size) < 0)
-                return 0;
-        }
+        if (send_SRW_scanRequest(scan_query, pos_p, scan_size) < 0)
+            return 0;
         return 2;
 #else
         return 0;
@@ -3531,9 +3629,9 @@ static int cmd_scan_common(const char *set, const char *arg)
     }
     else
     {
-        if (*cur_host && !conn && auto_reconnect)
+        if (wrbuf_len(cur_host) && !conn && auto_reconnect)
         {
-            session_connect(cur_host);
+            session_connect();
             wait_and_handle_response(0);
         }
         if (!conn)
@@ -3544,29 +3642,19 @@ static int cmd_scan_common(const char *set, const char *arg)
             printf("Target doesn't support scan\n");
             return 0;
         }
-        if (*arg)
-        {
-            strcpy(last_scan_query, arg);
-            if (send_scanrequest(set, arg,
-                                 scan_position, scan_size, 0) < 0)
-                return 0;
-        }
-        else
-        {
-            if (send_scanrequest(set, last_scan_query,
-                                 1, scan_size, last_scan_line) < 0)
-                return 0;
-        }
+        if (send_Z3950_scanrequest(set, scan_query, pos_p,
+                                   scan_size, scan_term) < 0)
+            return 0;
         return 2;
     }
 }
 
-int cmd_scan(const char *arg)
+static int cmd_scan(const char *arg)
 {
     return cmd_scan_common(0, arg);
 }
 
-int cmd_setscan(const char *arg)
+static int cmd_setscan(const char *arg)
 {
     char setstring[100];
     int nor;
@@ -3578,7 +3666,7 @@ int cmd_setscan(const char *arg)
     return cmd_scan_common(setstring, arg + nor);
 }
 
-int cmd_schema(const char *arg)
+static int cmd_schema(const char *arg)
 {
     xfree(record_schema);
     record_schema = 0;
@@ -3587,7 +3675,7 @@ int cmd_schema(const char *arg)
     return 1;
 }
 
-int cmd_format(const char *arg)
+static int cmd_format(const char *arg)
 {
     const char *cp = arg;
     int nor;
@@ -3630,7 +3718,7 @@ int cmd_format(const char *arg)
     return 1;
 }
 
-int cmd_elements(const char *arg)
+static int cmd_elements(const char *arg)
 {
     static Z_ElementSetNames esn;
     static char what[100];
@@ -3647,7 +3735,7 @@ int cmd_elements(const char *arg)
     return 1;
 }
 
-int cmd_querytype(const char *arg)
+static int cmd_querytype(const char *arg)
 {
     if (!strcmp(arg, "ccl"))
         queryType = QueryType_CCL;
@@ -3672,7 +3760,7 @@ int cmd_querytype(const char *arg)
     return 1;
 }
 
-int cmd_refid(const char *arg)
+static int cmd_refid(const char *arg)
 {
     xfree(refid);
     refid = NULL;
@@ -3681,7 +3769,7 @@ int cmd_refid(const char *arg)
     return 1;
 }
 
-int cmd_close(const char *arg)
+static int cmd_close(const char *arg)
 {
     Z_APDU *apdu;
     Z_Close *req;
@@ -3705,7 +3793,7 @@ int cmd_packagename(const char* arg)
     return 1;
 }
 
-int cmd_proxy(const char* arg)
+static int cmd_proxy(const char* arg)
 {
     xfree(yazProxy);
     yazProxy = 0;
@@ -3714,7 +3802,7 @@ int cmd_proxy(const char* arg)
     return 1;
 }
 
-int cmd_marccharset(const char *arg)
+static int cmd_marccharset(const char *arg)
 {
     char l1[30];
 
@@ -3732,7 +3820,7 @@ int cmd_marccharset(const char *arg)
     return 1;
 }
 
-int cmd_querycharset(const char *arg)
+static int cmd_querycharset(const char *arg)
 {
     char l1[30];
 
@@ -3750,7 +3838,7 @@ int cmd_querycharset(const char *arg)
     return 1;
 }
 
-int cmd_displaycharset(const char *arg)
+static int cmd_displaycharset(const char *arg)
 {
     char l1[30];
 
@@ -3780,7 +3868,7 @@ int cmd_displaycharset(const char *arg)
     return 1;
 }
 
-int cmd_negcharset(const char *arg)
+static int cmd_negcharset(const char *arg)
 {
     char l1[30];
 
@@ -3810,7 +3898,7 @@ int cmd_negcharset(const char *arg)
     return 1;
 }
 
-int cmd_charset(const char* arg)
+static int cmd_charset(const char* arg)
 {
     char l1[30], l2[30], l3[30], l4[30];
 
@@ -3835,9 +3923,10 @@ int cmd_charset(const char* arg)
     return 1;
 }
 
-int cmd_lang(const char* arg)
+static int cmd_lang(const char* arg)
 {
-    if (*arg == '\0') {
+    if (*arg == '\0')
+    {
         printf("Current language is `%s'\n", yazLang ? yazLang : "none");
         return 1;
     }
@@ -3848,7 +3937,7 @@ int cmd_lang(const char* arg)
     return 1;
 }
 
-int cmd_source(const char* arg, int echo )
+static int cmd_source(const char* arg, int echo )
 {
     /* first should open the file and read one line at a time.. */
     FILE* includeFile;
@@ -3891,20 +3980,13 @@ int cmd_source(const char* arg, int echo )
     return 1;
 }
 
-int cmd_source_echo(const char* arg)
+static int cmd_source_echo(const char* arg)
 {
     cmd_source(arg, 1);
     return 1;
 }
 
-int cmd_source_noecho(const char* arg)
-{
-    cmd_source(arg, 0);
-    return 1;
-}
-
-
-int cmd_subshell(const char* args)
+static int cmd_subshell(const char* args)
 {
     int ret = system(strlen(args) ? args : getenv("SHELL"));
     printf("\n");
@@ -3915,7 +3997,7 @@ int cmd_subshell(const char* args)
     return 1;
 }
 
-int cmd_set_berfile(const char *arg)
+static int cmd_set_berfile(const char *arg)
 {
     if (ber_file && ber_file != stdout && ber_file != stderr)
         fclose(ber_file);
@@ -3928,9 +4010,9 @@ int cmd_set_berfile(const char *arg)
     return 1;
 }
 
-int cmd_set_apdufile(const char *arg)
+static int cmd_set_apdufile(const char *arg)
 {
-    if(apdu_file && apdu_file != stderr && apdu_file != stderr)
+    if (apdu_file && apdu_file != stderr && apdu_file != stderr)
         fclose(apdu_file);
     if (!strcmp(arg, ""))
         apdu_file = 0;
@@ -3947,7 +4029,7 @@ int cmd_set_apdufile(const char *arg)
     return 1;
 }
 
-int cmd_set_cclfile(const char* arg)
+static int cmd_set_cclfile(const char* arg)
 {
     FILE *inf;
 
@@ -3964,11 +4046,12 @@ int cmd_set_cclfile(const char* arg)
     return 0;
 }
 
-int cmd_set_cqlfile(const char* arg)
+static int cmd_set_cqlfile(const char* arg)
 {
     cql_transform_t newcqltrans;
 
-    if ((newcqltrans = cql_transform_open_fname(arg)) == 0) {
+    if ((newcqltrans = cql_transform_open_fname(arg)) == 0)
+    {
         perror("unable to open CQL file");
         return 0;
     }
@@ -3980,15 +4063,16 @@ int cmd_set_cqlfile(const char* arg)
     return 0;
 }
 
-int cmd_set_auto_reconnect(const char* arg)
+static int cmd_set_auto_reconnect(const char* arg)
 {
-    if(strlen(arg)==0) {
+    if (strlen(arg)==0)
         auto_reconnect = ! auto_reconnect;
-    } else if(strcmp(arg,"on")==0) {
+    else if (strcmp(arg,"on")==0)
         auto_reconnect = 1;
-    } else if(strcmp(arg,"off")==0) {
+    else if (strcmp(arg,"off")==0)
         auto_reconnect = 0;
-    } else {
+    else
+    {
         printf("Error use on or off\n");
         return 1;
     }
@@ -4001,16 +4085,16 @@ int cmd_set_auto_reconnect(const char* arg)
     return 0;
 }
 
-
-int cmd_set_auto_wait(const char* arg)
+static int cmd_set_auto_wait(const char* arg)
 {
-    if(strlen(arg)==0) {
+    if (strlen(arg)==0)
         auto_wait = ! auto_wait;
-    } else if(strcmp(arg,"on")==0) {
+    else if (strcmp(arg,"on")==0)
         auto_wait = 1;
-    } else if(strcmp(arg,"off")==0) {
+    else if (strcmp(arg,"off")==0)
         auto_wait = 0;
-    } else {
+    else
+    {
         printf("Error use on or off\n");
         return 1;
     }
@@ -4023,9 +4107,10 @@ int cmd_set_auto_wait(const char* arg)
     return 0;
 }
 
-int cmd_set_marcdump(const char* arg)
+static int cmd_set_marcdump(const char* arg)
 {
-    if(marc_file && marc_file != stderr) { /* don't close stdout*/
+    if (marc_file && marc_file != stderr)
+    { /* don't close stdout*/
         fclose(marc_file);
     }
 
@@ -4055,7 +4140,8 @@ static void marc_file_write(const char *buf, size_t sz)
 /*
    this command takes 3 arge {name class oid}
 */
-int cmd_register_oid(const char* args) {
+static int cmd_register_oid(const char* args)
+{
     static struct {
         char* className;
         oid_class oclass;
@@ -4083,12 +4169,14 @@ int cmd_register_oid(const char* args) {
     Odr_oid oid[OID_SIZE];
 
     if (sscanf(args, "%100[^ ] %100[^ ] %100s",
-                oname_str,oclass_str, oid_str) < 1) {
+                oname_str,oclass_str, oid_str) < 1)
+    {
         printf("Error in register command \n");
         return 0;
     }
 
-    for (i = 0; oid_classes[i].className; i++) {
+    for (i = 0; oid_classes[i].className; i++)
+    {
         if (!strcmp(oid_classes[i].className, oclass_str))
         {
             oidclass=oid_classes[i].oclass;
@@ -4096,7 +4184,8 @@ int cmd_register_oid(const char* args) {
         }
     }
 
-    if(!(oid_classes[i].className)) {
+    if (!(oid_classes[i].className))
+    {
         printf("Unknown oid class %s\n",oclass_str);
         return 0;
     }
@@ -4111,10 +4200,10 @@ int cmd_register_oid(const char* args) {
     return 1;
 }
 
-int cmd_push_command(const char* arg)
+static int cmd_push_command(const char* arg)
 {
 #if HAVE_READLINE_HISTORY_H
-    if(strlen(arg)>1)
+    if (strlen(arg) > 1)
         add_history(arg);
 #else
     fprintf(stderr,"Not compiled with the readline/history module\n");
@@ -4160,7 +4249,7 @@ void source_rc_file(const char *rc_file)
     }
 }
 
-void add_to_readline_history(void *client_data, const char *line)
+static void add_to_readline_history(void *client_data, const char *line)
 {
 #if HAVE_READLINE_HISTORY_H
     if (strlen(line))
@@ -4173,6 +4262,8 @@ static void initialize(const char *rc_file)
     FILE *inf;
     int i;
 
+    cur_host = wrbuf_alloc();
+
     if (!(out = odr_createmem(ODR_ENCODE)) ||
         !(in = odr_createmem(ODR_DECODE)) ||
         !(print = odr_createmem(ODR_PRINT)))
@@ -4181,6 +4272,8 @@ static void initialize(const char *rc_file)
         exit(1);
     }
 
+    strcpy(scan_position, "1");
+
     setvbuf(stdout, 0, _IONBF, 0);
     if (apdu_file)
         odr_setprint(print, apdu_file);
@@ -4200,7 +4293,8 @@ static void initialize(const char *rc_file)
     rl_attempted_completion_function =
         (char **(*)(const char *, int, int)) readline_completer;
 #endif
-    for(i = 0; i < maxOtherInfosSupported; ++i) {
+    for (i = 0; i < maxOtherInfosSupported; ++i)
+    {
         extraOtherInfos[i].oid[0] = -1;
         extraOtherInfos[i].value = 0;
     }
@@ -4224,16 +4318,13 @@ struct timeval tv_start;
 static void handle_srw_record(Z_SRW_record *rec)
 {
     if (rec->recordPosition)
-    {
         printf("pos=" ODR_INT_PRINTF, *rec->recordPosition);
-        setno = *rec->recordPosition + 1;
-    }
     if (rec->recordSchema)
         printf(" schema=%s", rec->recordSchema);
     printf("\n");
     if (rec->recordData_buf && rec->recordData_len)
     {
-        printf("%.*s", rec->recordData_len, rec->recordData_buf);
+        print_xml_record(rec->recordData_buf, rec->recordData_len);
         marc_file_write(rec->recordData_buf, rec->recordData_len);
     }
     else
@@ -4266,8 +4357,22 @@ static void handle_srw_response(Z_SRW_searchRetrieveResponse *res)
     }
     if (res->numberOfRecords)
         printf("Number of hits: " ODR_INT_PRINTF "\n", *res->numberOfRecords);
-    for (i = 0; i<res->num_records; i++)
+    if (res->facetList)
+        display_facets(res->facetList);
+    if (res->suggestions)
+        printf("Suggestions:\n%s\n", res->suggestions);
+    for (i = 0; i < res->num_records; i++)
+    {
+        if (i >= sru_maximumRecords)
+        {
+            printf("SRU server returns extra records. Skipping "
+                   ODR_INT_PRINTF " records.\n",
+                   res->num_records - sru_maximumRecords);
+            break;
+        }
         handle_srw_record(res->records + i);
+    }
+    setno += res->num_records;
 }
 
 static void handle_srw_scan_term(Z_SRW_scanTerm *term)
@@ -4317,7 +4422,6 @@ static void http_response(Z_HTTP_Response *hres)
     int ret = -1;
     const char *connection_head = z_HTTP_header_lookup(hres->headers,
                                                        "Connection");
-
     if (hres->code != 200)
     {
         printf("HTTP Error Status=%d\n", hres->code);
@@ -4327,51 +4431,73 @@ static void http_response(Z_HTTP_Response *hres)
         printf("Content type does not appear to be XML\n");
     else
     {
-        Z_SOAP *soap_package = 0;
-        ODR o = odr_createmem(ODR_DECODE);
-        Z_SOAP_Handler soap_handlers[3] = {
-            {YAZ_XMLNS_SRU_v1_1, 0, (Z_SOAP_fun) yaz_srw_codec},
-            {YAZ_XMLNS_UPDATE_v0_9, 0, (Z_SOAP_fun) yaz_ucp_codec},
-            {0, 0, 0}
-        };
-        ret = z_soap_codec(o, &soap_package,
-                           &hres->content_buf, &hres->content_len,
-                           soap_handlers);
-        if (!ret && soap_package->which == Z_SOAP_generic)
+        if (!yaz_matchstr(sru_method, "solr"))
         {
-            Z_SRW_PDU *sr = (Z_SRW_PDU *) soap_package->u.generic->p;
-            if (sr->which == Z_SRW_searchRetrieve_response)
+            Z_SRW_PDU *sr = 0;
+            ODR o = odr_createmem(ODR_DECODE);
+            ret = yaz_solr_decode_response(o, hres, &sr);
+
+            if (ret == 0 && sr->which == Z_SRW_searchRetrieve_response)
                 handle_srw_response(sr->u.response);
-            else if (sr->which == Z_SRW_explain_response)
-                handle_srw_explain_response(sr->u.explain_response);
-            else if (sr->which == Z_SRW_scan_response)
+            else if (ret == 0 && sr->which == Z_SRW_scan_response)
                 handle_srw_scan_response(sr->u.scan_response);
-            else if (sr->which == Z_SRW_update_response)
-                printf("Got update response. Status: %s\n",
-                       sr->u.update_response->operationStatus);
             else
             {
-                printf("Decoding of SRW package failed\n");
+                printf("Decoding of Solr package failed\n");
                 ret = -1;
             }
-        }
-        else if (soap_package && (soap_package->which == Z_SOAP_fault
-                                  || soap_package->which == Z_SOAP_error))
-        {
-            printf("SOAP Fault code %s\n",
-                    soap_package->u.fault->fault_code);
-            printf("SOAP Fault string %s\n",
-                    soap_package->u.fault->fault_string);
-            if (soap_package->u.fault->details)
-                printf("SOAP Details %s\n",
-                        soap_package->u.fault->details);
+            odr_destroy(o);
         }
         else
         {
-            printf("z_soap_codec failed. (no SOAP error)\n");
-            ret = -1;
+            Z_SOAP *soap_package = 0;
+            ODR o = odr_createmem(ODR_DECODE);
+            Z_SOAP_Handler soap_handlers[] = {
+                {YAZ_XMLNS_SRU_v2_mask, 0, (Z_SOAP_fun) yaz_srw_codec},
+                {YAZ_XMLNS_UPDATE_v0_9, 0, (Z_SOAP_fun) yaz_ucp_codec},
+                {YAZ_XMLNS_SRU_v1_response, 0, (Z_SOAP_fun) yaz_srw_codec},
+                {"searchRetrieveResponse", 0, (Z_SOAP_fun) yaz_srw_codec},
+                {0, 0, 0}
+            };
+            ret = z_soap_codec(o, &soap_package,
+                               &hres->content_buf, &hres->content_len,
+                               soap_handlers);
+            if (!ret && soap_package->which == Z_SOAP_generic)
+            {
+                Z_SRW_PDU *sr = (Z_SRW_PDU *) soap_package->u.generic->p;
+                if (sr->which == Z_SRW_searchRetrieve_response)
+                    handle_srw_response(sr->u.response);
+                else if (sr->which == Z_SRW_explain_response)
+                    handle_srw_explain_response(sr->u.explain_response);
+                else if (sr->which == Z_SRW_scan_response)
+                    handle_srw_scan_response(sr->u.scan_response);
+                else if (sr->which == Z_SRW_update_response)
+                    printf("Got update response. Status: %s\n",
+                           sr->u.update_response->operationStatus);
+                else
+                {
+                    printf("Decoding of SRW package failed\n");
+                    ret = -1;
+                }
+            }
+            else if (soap_package && (soap_package->which == Z_SOAP_fault
+                                      || soap_package->which == Z_SOAP_error))
+            {
+                printf("SOAP Fault code %s\n",
+                       soap_package->u.fault->fault_code);
+                printf("SOAP Fault string %s\n",
+                       soap_package->u.fault->fault_string);
+                if (soap_package->u.fault->details)
+                    printf("SOAP Details %s\n",
+                           soap_package->u.fault->details);
+            }
+            else
+            {
+                printf("z_soap_codec failed. (no SOAP error)\n");
+                ret = -1;
+            }
+            odr_destroy(o);
         }
-        odr_destroy(o);
     }
     if (ret)
         close_session(); /* close session on error */
@@ -4393,7 +4519,7 @@ static void http_response(Z_HTTP_Response *hres)
 }
 #endif
 
-#define max_HTTP_redirects 2
+#define max_HTTP_redirects 3
 
 static void wait_and_handle_response(int one_response_only)
 {
@@ -4415,7 +4541,7 @@ static void wait_and_handle_response(int one_response_only)
         {
             cs_close(conn);
             conn = 0;
-            session_connect(cur_host);
+            session_connect();
             reconnect_ok = 0;
             if (conn)
             {
@@ -4477,16 +4603,16 @@ static void wait_and_handle_response(int one_response_only)
         if (gdu->which == Z_GDU_Z3950)
         {
             Z_APDU *apdu = gdu->u.z3950;
-            switch(apdu->which)
+            switch (apdu->which)
             {
             case Z_APDU_initResponse:
-                process_initResponse(apdu->u.initResponse);
+                process_Z3950_initResponse(apdu->u.initResponse);
                 break;
             case Z_APDU_searchResponse:
-                process_searchResponse(apdu->u.searchResponse);
+                process_Z3950_searchResponse(apdu->u.searchResponse);
                 break;
             case Z_APDU_scanResponse:
-                process_scanResponse(apdu->u.scanResponse);
+                process_Z3950_scanResponse(apdu->u.scanResponse);
                 break;
             case Z_APDU_presentResponse:
                 print_refid(apdu->u.presentResponse->referenceId);
@@ -4500,23 +4626,23 @@ static void wait_and_handle_response(int one_response_only)
                         *apdu->u.presentResponse->nextResultSetPosition);
                 break;
             case Z_APDU_sortResponse:
-                process_sortResponse(apdu->u.sortResponse);
+                process_Z3950_sortResponse(apdu->u.sortResponse);
                 break;
             case Z_APDU_extendedServicesResponse:
                 printf("Got extended services response\n");
-                process_ESResponse(apdu->u.extendedServicesResponse);
+                process_Z3950_ESResponse(apdu->u.extendedServicesResponse);
                 break;
             case Z_APDU_close:
                 printf("Target has closed the association.\n");
-                process_close(apdu->u.close);
+                process_Z3950_close(apdu->u.close);
                 break;
             case Z_APDU_resourceControlRequest:
-                process_resourceControlRequest
-                    (apdu->u.resourceControlRequest);
+                process_Z3950_resourceControlRequest(
+                    apdu->u.resourceControlRequest);
                 break;
             case Z_APDU_deleteResultSetResponse:
-                process_deleteResultSetResponse(apdu->u.
-                                                deleteResultSetResponse);
+                process_Z3950_deleteResultSetResponse(
+                    apdu->u.deleteResultSetResponse);
                 break;
             default:
                 printf("Received unknown APDU type (%d).\n",
@@ -4530,17 +4656,23 @@ static void wait_and_handle_response(int one_response_only)
             Z_HTTP_Response *hres = gdu->u.HTTP_Response;
             int code = hres->code;
             const char *location = 0;
+
+            yaz_cookies_response(yaz_cookies, hres);
             if ((code == 301 || code == 302)
                 && no_redirects < max_HTTP_redirects
                 && !yaz_matchstr(sru_method, "get")
                 && (location = z_HTTP_header_lookup(hres->headers, "Location")))
             {
                 const char *base_tmp;
-                session_connect_base(location, &base_tmp);
+                int host_change = 0;
+                location = yaz_check_location(in, wrbuf_cstr(cur_host),
+                                              location, &host_change);
+                if (host_change)
+                    session_connect_base(location, &base_tmp);
                 no_redirects++;
                 if (conn)
                 {
-                    if (send_SRW_redirect(location, hres) == 2)
+                    if (send_SRW_redirect(location) == 2)
                         continue;
                 }
                 printf("Redirect failed\n");
@@ -4572,8 +4704,7 @@ static void wait_and_handle_response(int one_response_only)
     xfree(netbuffer);
 }
 
-
-int cmd_cclparse(const char* arg)
+static int cmd_cclparse(const char* arg)
 {
     int error, pos;
     struct ccl_rpn_node *rpn=NULL;
@@ -4581,7 +4712,8 @@ int cmd_cclparse(const char* arg)
 
     rpn = ccl_find_str(bibset, arg, &error, &pos);
 
-    if (error) {
+    if (error)
+    {
         int ioff = 3+strlen(last_cmd)+1+pos;
         printf("%*s^ - ", ioff, " ");
         printf("%s\n", ccl_err_msg(error));
@@ -4601,8 +4733,7 @@ int cmd_cclparse(const char* arg)
     return 0;
 }
 
-
-int cmd_set_otherinfo(const char* args)
+static int cmd_set_otherinfo(const char* args)
 {
     char oidstr[101], otherinfoString[101];
     int otherinfoNo;
@@ -4611,7 +4742,8 @@ int cmd_set_otherinfo(const char* args)
     sscan_res = sscanf(args, "%d %100[^ ] %100s",
                         &otherinfoNo, oidstr, otherinfoString);
 
-    if (sscan_res > 0 && otherinfoNo >= maxOtherInfosSupported) {
+    if (sscan_res > 0 && otherinfoNo >= maxOtherInfosSupported)
+    {
         printf("Error otherinfo index too large (%d>=%d)\n",
                otherinfoNo,maxOtherInfosSupported);
         return 0;
@@ -4626,7 +4758,8 @@ int cmd_set_otherinfo(const char* args)
         extraOtherInfos[otherinfoNo].value = 0;
         return 0;
     }
-    if (sscan_res != 3) {
+    if (sscan_res != 3)
+    {
         printf("Error in set_otherinfo command \n");
         return 0;
     }
@@ -4647,10 +4780,11 @@ int cmd_set_otherinfo(const char* args)
     return 0;
 }
 
-int cmd_sleep(const char* args )
+static int cmd_sleep(const char* args )
 {
-    int sec=atoi(args);
-    if( sec > 0 ) {
+    int sec = atoi(args);
+    if (sec > 0)
+    {
 #ifdef WIN32
         Sleep(sec*1000);
 #else
@@ -4661,7 +4795,7 @@ int cmd_sleep(const char* args )
     return 1;
 }
 
-int cmd_list_otherinfo(const char* args)
+static int cmd_list_otherinfo(const char* args)
 {
     int i;
 
@@ -4688,7 +4822,7 @@ int cmd_list_otherinfo(const char* args)
     }
     else
     {
-        for(i = 0; i < maxOtherInfosSupported; ++i)
+        for (i = 0; i < maxOtherInfosSupported; ++i)
         {
             if (extraOtherInfos[i].value)
             {
@@ -4706,15 +4840,15 @@ int cmd_list_otherinfo(const char* args)
     return 0;
 }
 
-
-int cmd_list_all(const char* args) {
+static int cmd_list_all(const char* args)
+{
     int i;
 
     /* connection options */
     if (conn)
-        printf("Connected to         : %s\n", cur_host);
-    else if (*cur_host)
-        printf("Not connected to     : %s\n", cur_host);
+        printf("Connected to         : %s\n", wrbuf_cstr(cur_host));
+    else if (cur_host && wrbuf_len(cur_host))
+        printf("Not connected to     : %s\n", wrbuf_cstr(cur_host));
     else
         printf("Not connected        : \n");
     if (yazProxy) printf("using proxy          : %s\n",yazProxy);
@@ -4722,10 +4856,12 @@ int cmd_list_all(const char* args) {
     printf("auto_reconnect       : %s\n",auto_reconnect?"on":"off");
     printf("auto_wait            : %s\n",auto_wait?"on":"off");
 
-    if (!auth) {
+    if (!auth)
         printf("Authentication       : none\n");
-    } else {
-        switch(auth->which) {
+    else
+    {
+        switch (auth->which)
+        {
         case Z_IdAuthentication_idPass:
             printf("Authentication       : IdPass\n");
             printf("    Login User       : %s\n",auth->u.idPass->userId?auth->u.idPass->userId:"");
@@ -4756,7 +4892,9 @@ int cmd_list_all(const char* args) {
     printf("Named Result Sets    : %s\n",setnumber==-1?"off":"on");
 
     /* piggy back options */
-    printf("ssub/lslb/mspn       : %d/%d/%d\n",smallSetUpperBound,largeSetLowerBound,mediumSetPresentNumber);
+    printf("ssub/lslb/mspn       : " ODR_INT_PRINTF "/" ODR_INT_PRINTF "/"
+           ODR_INT_PRINTF "\n",
+           smallSetUpperBound, largeSetLowerBound, mediumSetPresentNumber);
 
     /* print present related options */
     if (recordsyntax_size > 0)
@@ -4777,11 +4915,13 @@ int cmd_list_all(const char* args) {
     return 0;
 }
 
-int cmd_clear_otherinfo(const char* args)
+static int cmd_clear_otherinfo(const char* args)
 {
-    if(strlen(args)>0) {
+    if (strlen(args) > 0)
+    {
         int otherinfoNo = atoi(args);
-        if (otherinfoNo >= maxOtherInfosSupported) {
+        if (otherinfoNo >= maxOtherInfosSupported)
+        {
             printf("Error otherinfo index too large (%d>=%d)\n",
                    otherinfoNo, maxOtherInfosSupported);
             return 0;
@@ -4793,9 +4933,11 @@ int cmd_clear_otherinfo(const char* args)
             xfree(extraOtherInfos[otherinfoNo].value);
             extraOtherInfos[otherinfoNo].value = 0;
         }
-    } else {
+    }
+    else
+    {
         int i;
-        for(i = 0; i < maxOtherInfosSupported; ++i)
+        for (i = 0; i < maxOtherInfosSupported; ++i)
         {
             if (extraOtherInfos[i].value)
             {
@@ -4808,17 +4950,15 @@ int cmd_clear_otherinfo(const char* args)
     return 0;
 }
 
-int cmd_wait_response(const char *arg)
+static int cmd_wait_response(const char *arg)
 {
+    int i;
     int wait_for = atoi(arg);
-    int i=0;
-    if( wait_for < 1 ) {
+    if (wait_for < 1)
         wait_for = 1;
-    };
 
-    for( i=0 ; i < wait_for ; ++i ) {
+    for (i = 0 ; i < wait_for; ++i )
         wait_and_handle_response(1);
-    };
     return 0;
 }
 
@@ -4974,7 +5114,7 @@ static int cmd_help(const char *line)
     return 1;
 }
 
-int cmd_register_tab(const char* arg)
+static int cmd_register_tab(const char* arg)
 {
 #if HAVE_READLINE_READLINE_H
     char command[101], tabargument[101];
@@ -4982,18 +5122,20 @@ int cmd_register_tab(const char* arg)
     int num_of_tabs;
     const char** tabslist;
 
-    if (sscanf(arg, "%100s %100s", command, tabargument) < 1) {
+    if (sscanf(arg, "%100s %100s", command, tabargument) < 1)
+    {
         return 0;
     }
 
     /* locate the amdn in the list */
-    for (i = 0; cmd_array[i].cmd; i++) {
-        if (!strncmp(cmd_array[i].cmd, command, strlen(command))) {
+    for (i = 0; cmd_array[i].cmd; i++)
+    {
+        if (!strncmp(cmd_array[i].cmd, command, strlen(command)))
             break;
-        }
     }
 
-    if (!cmd_array[i].cmd) {
+    if (!cmd_array[i].cmd)
+    {
         fprintf(stderr,"Unknown command %s\n",command);
         return 1;
     }
@@ -5005,9 +5147,8 @@ int cmd_register_tab(const char* arg)
     num_of_tabs=0;
 
     tabslist = cmd_array[i].local_tabcompletes;
-    for(; tabslist && *tabslist; tabslist++) {
+    for (; tabslist && *tabslist; tabslist++)
         num_of_tabs++;
-    }
 
     cmd_array[i].local_tabcompletes = (const char **)
         realloc(cmd_array[i].local_tabcompletes,
@@ -5019,8 +5160,7 @@ int cmd_register_tab(const char* arg)
     return 1;
 }
 
-
-void process_cmd_line(char* line)
+static void process_cmd_line(char* line)
 {
     int i, res;
     char word[32], arg[10240];
@@ -5043,12 +5183,12 @@ void process_cmd_line(char* line)
         char* p = arg;
         char* lastnonspace=NULL;
 
-        for(;*p; ++p) {
-            if(!isspace(*(unsigned char *) p)) {
+        for (; *p; ++p)
+        {
+            if (!yaz_isspace(*p))
                 lastnonspace = p;
-            }
         }
-        if(lastnonspace)
+        if (lastnonspace)
             *(++lastnonspace) = 0;
     }
 
@@ -5066,14 +5206,15 @@ void process_cmd_line(char* line)
         res = 1;
     }
 
-    if(apdu_file) fflush(apdu_file);
+    if (apdu_file)
+        fflush(apdu_file);
 
     if (res >= 2 && auto_wait)
         wait_and_handle_response(0);
 
-    if(apdu_file)
+    if (apdu_file)
         fflush(apdu_file);
-    if(marc_file)
+    if (marc_file)
         fflush(marc_file);
 }
 
@@ -5081,11 +5222,12 @@ static char *command_generator(const char *text, int state)
 {
 #if HAVE_READLINE_READLINE_H
     static int idx;
-    if (state==0) {
+    if (state == 0)
         idx = 0;
-    }
-    for( ; cmd_array[idx].cmd; ++idx) {
-        if (!strncmp(cmd_array[idx].cmd, text, strlen(text))) {
+    for (; cmd_array[idx].cmd; ++idx)
+    {
+        if (!strncmp(cmd_array[idx].cmd, text, strlen(text)))
+        {
             ++idx;  /* skip this entry on the next run */
             return strdup(cmd_array[idx-1].cmd);
         }
@@ -5108,11 +5250,12 @@ static char* default_completer(const char* text, int state)
 /*
    This function only known how to complete on the first word
 */
-char **readline_completer(char *text, int start, int end)
+static char **readline_completer(char *text, int start, int end)
 {
     completerFunctionType completerToUse;
 
-    if(start == 0) {
+    if (start == 0)
+    {
 #if HAVE_READLINE_RL_COMPLETION_MATCHES
         char** res = rl_completion_matches(text, command_generator);
 #else
@@ -5121,10 +5264,13 @@ char **readline_completer(char *text, int start, int end)
 #endif
         rl_attempted_completion_over = 1;
         return res;
-    } else {
+    }
+    else
+    {
         char arg[10240],word[32];
-        int i=0 ,res;
-        if ((res = sscanf(rl_line_buffer, "%31s %10239[^;]", word, arg)) <= 0) {
+        int i ,res;
+        if ((res = sscanf(rl_line_buffer, "%31s %10239[^;]", word, arg)) <= 0)
+        {
             rl_attempted_completion_over = 1;
             return NULL;
         }
@@ -5133,7 +5279,7 @@ char **readline_completer(char *text, int start, int end)
             if (!strncmp(cmd_array[i].cmd, word, strlen(word)))
                 break;
 
-        if(!cmd_array[i].cmd)
+        if (!cmd_array[i].cmd)
             return NULL;
 
         default_completer_list = cmd_array[i].local_tabcompletes;
@@ -5143,7 +5289,8 @@ char **readline_completer(char *text, int start, int end)
         { /* if command completer is not defined use the default completer */
             completerToUse = default_completer;
         }
-        if (completerToUse) {
+        if (completerToUse)
+        {
 #ifdef HAVE_READLINE_RL_COMPLETION_MATCHES
             char** res=
                 rl_completion_matches(text, completerToUse);
@@ -5154,7 +5301,9 @@ char **readline_completer(char *text, int start, int end)
             if (!cmd_array[i].complete_filenames)
                 rl_attempted_completion_over = 1;
             return res;
-        } else {
+        }
+        else
+        {
             if (!cmd_array[i].complete_filenames)
                 rl_attempted_completion_over = 1;
             return 0;
@@ -5164,7 +5313,7 @@ char **readline_completer(char *text, int start, int end)
 #endif
 
 #ifndef WIN32
-void ctrl_c_handler(int x)
+static void ctrl_c_handler(int x)
 {
     exit_client(0);
 }