X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=client%2Fclient.c;h=ee278ee442faa157b7f8613f361c479763fad32c;hb=ad3b14dd33d6ce41c79e3b39d176b4a18dff42fb;hp=619f963cf8c188a4ed9c7d8a6ce011c8816fed36;hpb=1e49cc7bdcdeb5cb9e7b2e709c5322acccec90df;p=yaz-moved-to-github.git

diff --git a/client/client.c b/client/client.c
index 619f963..ee278ee 100644
--- a/client/client.c
+++ b/client/client.c
@@ -2,7 +2,7 @@
  * Copyright (C) 1995-2007, Index Data ApS
  * See the file LICENSE for details.
  *
- * $Id: client.c,v 1.339 2007-05-23 11:54:46 adam Exp $
+ * $Id: client.c,v 1.356 2007-12-27 13:27:40 adam Exp $
  */
 /** \file client.c
  *  \brief yaz-client program
@@ -63,6 +63,7 @@
 #include <yaz/diagbib1.h>
 #include <yaz/otherinfo.h>
 #include <yaz/charneg.h>
+#include <yaz/query-charset.h>
 
 #include <yaz/pquery.h>
 #include <yaz/sortspec.h>
@@ -89,7 +90,8 @@
 
 static file_history_t file_history = 0;
 
-static char *sru_method = "soap";
+static char sru_method[10] = "soap";
+static char sru_version[10] = "1.2";
 static char *codeset = 0;               /* character set for output */
 static int hex_dump = 0;
 static char *dump_file_prefix = 0;
@@ -133,6 +135,7 @@ static int  negotiationCharsetRecords = 1;
 static int  negotiationCharsetVersion = 3;
 static char *outputCharset = 0;
 static char *marcCharset = 0;
+static char *queryCharset = 0;
 static char* yazLang = 0;
 
 static char last_cmd[32] = "?";
@@ -169,9 +172,6 @@ static cql_transform_t cqltrans = 0; /* CQL context-set handle */
 int rl_attempted_completion_over = 0;
 #endif
 
-/* set this one to 1, to avoid decode of unknown MARCs  */
-#define AVOID_MARC_DECODE 1
-
 #define maxOtherInfosSupported 10
 struct eoi {
     Odr_oid oid[OID_SIZE];
@@ -184,6 +184,7 @@ 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 void close_session (void);
 
@@ -361,6 +362,21 @@ static void send_initRequest(const char* type_and_host)
                                               negotiationCharsetRecords);
         }
     }
+    else 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, out, NULL, 0, 0)))
+        {
+            p0->which = Z_OtherInfo_externallyDefinedInfo;
+            p0->information.externallyDefinedInfo =
+                yaz_set_proposal_charneg(out, 0, 0, 0, 0, 0);
+        }
+
+    }
     if (send_apdu(apdu))
         printf("Sent initrequest.\n");
 }
@@ -452,27 +468,30 @@ static int process_initResponse(Z_InitResponse *res)
         Z_CharSetandLanguageNegotiation *p =
                 yaz_get_charneg_record(res->otherInfo);
 
-        if (p) {
-            
+        if (p) 
+        {
             char *charset=NULL, *lang=NULL;
             int selected;
             
             yaz_get_response_charneg(session_mem, p, &charset, &lang,
                                      &selected);
 
-            printf("Accepted character set : %s\n", charset);
-            printf("Accepted code language : %s\n", lang ? lang : "none");
+            printf("Accepted character set : %s\n", charset ? charset:"none");
+            printf("Accepted code language : %s\n", lang ? lang:"none");
             printf("Accepted records in ...: %d\n", selected );
 
-            if (outputCharset && negotiationCharset) {
+            if (outputCharset && charset)
+            {
                 printf("Converting between %s and %s\n",
-                       outputCharset, negotiationCharset);
-                odr_set_charset (out, charset, outputCharset);
-                odr_set_charset (in, outputCharset, charset);
+                       outputCharset, charset);
+                odr_set_charset(out, charset, outputCharset);
+                odr_set_charset(in, outputCharset, charset);
+                cmd_querycharset(charset);
             }
-            else {
-                odr_set_charset (out, 0, 0);
-                odr_set_charset (in, 0, 0);
+            else
+            {
+                odr_set_charset(out, 0, 0);
+                odr_set_charset(in, 0, 0);
             }
         }
     }
@@ -579,29 +598,27 @@ static int set_base(const char *arg)
     return 1;
 }
 
-static int parse_cmd_doc(const char **arg, ODR out, char **buf,
-                         int *len, int opt)
+static int parse_cmd_doc(const char **arg, ODR out, char **buf, int *len)
 {
     const char *sep;
     while (**arg && strchr(" \t\n\r\f", **arg))
         (*arg)++;
-    if ((*arg)[0] == '\"' && (sep=strchr(*arg+1, '"')))
+    if (**arg == '\0')
     {
-        (*arg)++;
-        *len = sep - *arg;
-        *buf = odr_strdupn(out, *arg, *len);
-        (*arg) = sep+1;
-        return 1;
+        return 0;
     }
-    else if ((*arg)[0] && (*arg)[0] != '\"')
+    else if ((*arg)[0] == '<')
     {
         long fsize;
         FILE *inf;
-        const char *fname = *arg;
-        
+        const char *fname;
+        const char *arg_start = ++(*arg);
+    
         while (**arg != '\0' && **arg != ' ')
             (*arg)++;
             
+        fname = odr_strdupn(out, arg_start, *arg - arg_start);
+
         inf = fopen(fname, "rb");
         if (!inf)
         {
@@ -622,7 +639,8 @@ static int parse_cmd_doc(const char **arg, ODR out, char **buf,
             return 0;
         }
         *len = fsize;
-        *buf = (char *) odr_malloc(out, fsize);
+        *buf = (char *) odr_malloc(out, fsize+1);
+        (*buf)[fsize] = '\0';
         if (fread(*buf, 1, fsize, inf) != fsize)
         {
             printf("Unable to read %s\n", fname);
@@ -630,21 +648,25 @@ static int parse_cmd_doc(const char **arg, ODR out, char **buf,
             return 0;
         }
         fclose(inf);
-        return 1;
     }
-    else if (**arg == '\0')
+    else if ((*arg)[0] == '\"' && (sep=strchr(*arg+1, '"')))
     {
-        if (opt)
-        {
-            *len = 0;
-            *buf = 0;
-            return 1;
-        }
-        printf("Missing doc argument\n");
+        (*arg)++;
+        *len = sep - *arg;
+        *buf = odr_strdupn(out, *arg, *len);
+        (*arg) = sep+1;
     }
     else
-        printf("Bad doc argument %s\n", *arg);
-    return 0;
+    {
+        const char *arg_start = *arg;
+
+        while (**arg != '\0' && **arg != ' ')
+            (*arg)++;
+
+        *len = *arg - arg_start;
+        *buf = odr_strdupn(out, arg_start, *len);
+    }
+    return 1;
 }
 
 static int cmd_base(const char *arg)
@@ -702,8 +724,6 @@ int session_connect(const char *arg)
         return 0;
     }
 #if YAZ_HAVE_XML2
-    if (conn->protocol == PROTO_HTTP)
-        queryType = QueryType_CQL;
 #else
     if (conn->protocol == PROTO_HTTP)
     {
@@ -764,12 +784,16 @@ int session_connect(const char *arg)
 
 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;
     }
-    return session_connect(cur_host);
+    r = session_connect(cur_host);
+    if (conn && conn->protocol == PROTO_HTTP)
+        queryType = QueryType_CQL;
+    return r;
 }
 
 void try_reconnect(void)
@@ -825,8 +849,8 @@ int cmd_authentication(const char *arg)
         au.which = Z_IdAuthentication_idPass;
         au.u.idPass = &idPass;
         idPass.groupId = NULL;
-        idPass.userId = user;
-        idPass.password = group;
+        idPass.userId = !strcmp(user, "-") ? 0 : user;
+        idPass.password = !strcmp(group, "-") ? 0 : group;
         printf("Authentication set to User (%s), Pass (%s)\n", user, group);
     }
     if (r == 3)
@@ -1255,15 +1279,15 @@ static int send_srw(Z_SRW_PDU *sr)
 
     gdu = z_get_HTTP_Request_host_path(out, host_port, path);
 
-    if (!strcmp(sru_method, "get"))
+    if (!yaz_matchstr(sru_method, "get"))
     {
         yaz_sru_get_encode(gdu->u.HTTP_Request, sr, out, charset);
     }
-    else if (!strcmp(sru_method, "post"))
+    else if (!yaz_matchstr(sru_method, "post"))
     {
         yaz_sru_post_encode(gdu->u.HTTP_Request, sr, out, charset);
     }
-    else if (!strcmp(sru_method, "soap"))
+    else if (!yaz_matchstr(sru_method, "soap"))
     {
         yaz_sru_soap_encode(gdu->u.HTTP_Request, sr, out, charset);
     }
@@ -1326,7 +1350,7 @@ static int send_SRW_scanRequest(const char *arg, int pos, int num)
     Z_SRW_PDU *sr = 0;
     
     /* regular requestse .. */
-    sr = yaz_srw_get(out, Z_SRW_scan_request);
+    sr = yaz_srw_get_pdu(out, Z_SRW_scan_request, sru_version);
 
     switch(queryType)
     {
@@ -1361,10 +1385,11 @@ static int send_SRW_searchRequest(const char *arg)
     setno = 1;
 
     /* save this for later .. when fetching individual records */
-    srw_sr =  yaz_srw_get(srw_sr_odr_out, Z_SRW_searchRetrieve_request);
+    srw_sr =  yaz_srw_get_pdu(srw_sr_odr_out, Z_SRW_searchRetrieve_request,
+                              sru_version);
     
     /* regular request .. */
-    sr = yaz_srw_get(out, Z_SRW_searchRetrieve_request);
+    sr = yaz_srw_get_pdu(out, Z_SRW_searchRetrieve_request, sru_version);
 
     switch(queryType)
     {
@@ -1396,6 +1421,22 @@ static int send_SRW_searchRequest(const char *arg)
 }
 #endif
 
+static void query_charset_convert(Z_RPNQuery *q)
+{
+    if (queryCharset && outputCharset)
+    {
+        yaz_iconv_t cd = yaz_iconv_open(queryCharset, outputCharset);
+        if (!cd)
+        {
+            printf("Conversion from %s to %s unsupported\n",
+                   outputCharset, queryCharset);
+            return;
+        }
+        yaz_query_charset_convert_rpnquery(q, out, cd);
+        yaz_iconv_close(cd);
+    }
+}
+
 static int send_searchRequest(const char *arg)
 {
     Z_APDU *apdu = zget_APDU(out, Z_APDU_searchRequest);
@@ -1501,6 +1542,7 @@ static int send_searchRequest(const char *arg)
             return 0;
         }
         yaz_pqf_destroy (pqf_parser);
+        query_charset_convert(RPNquery);
         query.u.type_1 = RPNquery;
         break;
     case QueryType_CCL:
@@ -1517,6 +1559,7 @@ static int send_searchRequest(const char *arg)
             printf ("Couldn't convert from CCL to RPN\n");
             return 0;
         }
+        query_charset_convert(RPNquery);
         query.u.type_1 = RPNquery;
         ccl_rpn_delete (rpn);
         break;
@@ -1879,6 +1922,20 @@ void process_ESResponse(Z_ExtendedServicesResponse *res)
                 }
             }
         }
+        if (ext->which == Z_External_itemOrder)
+        {
+            Z_IOTaskPackage *otp = ext->u.itemOrder->u.taskPackage;
+            if (otp && otp->targetPart && otp->targetPart->itemRequest)
+            {
+                Z_External *ext = otp->targetPart->itemRequest;
+                if (ext->which == Z_External_octet)
+                {
+                    Odr_oct *doc = ext->u.octet_aligned;
+                    printf("Got itemRequest doc %.*s\n",
+                           doc->len, doc->buf);
+                }
+            }
+        }
     }
     if (res->taskPackage && res->taskPackage->which == Z_External_octet)
     {
@@ -2115,17 +2172,17 @@ static int cmd_update_SRW(int action_no, const char *recid,
 
 static int cmd_update_common(const char *arg, int version)
 {
-    char action[20], recid_buf[20];
+    char *action_buf;
+    int action_len;
+    char *recid_buf;
+    int recid_len;
     const char *recid = 0;
     char *rec_buf;
     int rec_len;
     int action_no;
     int noread = 0;
 
-    *action = 0;
-    *recid_buf = 0;
-    sscanf (arg, "%19s %19s%n", action, recid_buf, &noread);
-    if (noread == 0)
+    if (parse_cmd_doc(&arg, out, &action_buf, &action_len) == 0)
     {
         printf("Use: update action recid [fname]\n");
         printf(" where action is one of insert,replace,delete.update\n");
@@ -2134,17 +2191,23 @@ static int cmd_update_common(const char *arg, int version)
         return 0;
     }
 
-    if (!strcmp (action, "insert"))
+    if (parse_cmd_doc(&arg, out, &recid_buf, &recid_len) == 0)
+    {
+        printf("Missing recid\n");
+        return 0;
+    }
+
+    if (!strcmp(action_buf, "insert"))
         action_no = Z_IUOriginPartToKeep_recordInsert;
-    else if (!strcmp (action, "replace"))
+    else if (!strcmp(action_buf, "replace"))
         action_no = Z_IUOriginPartToKeep_recordReplace;
-    else if (!strcmp (action, "delete"))
+    else if (!strcmp(action_buf, "delete"))
         action_no = Z_IUOriginPartToKeep_recordDelete;
-    else if (!strcmp (action, "update"))
+    else if (!strcmp(action_buf, "update"))
         action_no = Z_IUOriginPartToKeep_specialUpdate;
     else 
     {
-        printf ("Bad action: %s\n", action);
+        printf ("Bad action: %s\n", action_buf);
         printf ("Possible values: insert, replace, delete, update\n");
         return 0;
     }
@@ -2153,14 +2216,14 @@ static int cmd_update_common(const char *arg, int version)
         recid = recid_buf;
 
     arg += noread;
-    if (parse_cmd_doc(&arg, out, &rec_buf, &rec_len, 1) == 0)
+    if (parse_cmd_doc(&arg, out, &rec_buf, &rec_len) == 0)
         return 0;
 
 #if YAZ_HAVE_XML2
     if (protocol == PROTO_HTTP)
-        return cmd_update_SRW(action_no, recid, rec_buf, rec_len);
+        return cmd_update_SRW(action_no, recid_buf, rec_buf, rec_len);
 #endif
-    return cmd_update_Z3950(version, action_no, recid, rec_buf, rec_len);
+    return cmd_update_Z3950(version, action_no, recid_buf, rec_buf, rec_len);
 }
 
 #if YAZ_HAVE_XML2
@@ -2168,7 +2231,7 @@ static int cmd_update_SRW(int action_no, const char *recid,
                           char *rec_buf, int rec_len)
 {
     if (!conn)
-        cmd_open(0);
+        session_connect(cur_host);
     if (!conn)
         return 0;
     else
@@ -2250,6 +2313,12 @@ static int cmd_update_Z3950(int version, int action_no, const char *recid,
         
         toKeep->databaseName = databaseNames[0];
         toKeep->schema = 0;
+        if (record_schema)
+        {
+            toKeep->schema = yaz_string_to_oid_odr(yaz_oid_std(),
+                                                   CLASS_SCHEMA,
+                                                   record_schema, out);
+        }
         toKeep->elementSetName = 0;
 
         toKeep->action = (int *) odr_malloc(out, sizeof(*toKeep->action));
@@ -2292,6 +2361,12 @@ static int cmd_update_Z3950(int version, int action_no, const char *recid,
         
         toKeep->databaseName = databaseNames[0];
         toKeep->schema = 0;
+        if (record_schema)
+        {
+            toKeep->schema = yaz_string_to_oid_odr(yaz_oid_std(),
+                                                   CLASS_SCHEMA,
+                                                   record_schema, out);
+        }
         toKeep->elementSetName = 0;
         toKeep->actionQualifier = 0;
         toKeep->action = (int *) odr_malloc(out, sizeof(*toKeep->action));
@@ -2355,7 +2430,7 @@ static int cmd_xmles(const char *arg)
         }
         arg += noread;
         if (parse_cmd_doc(&arg, out, &asn_buf,
-                          &ext->u.single_ASN1_type->len, 0) == 0)
+                          &ext->u.single_ASN1_type->len) == 0)
             return 0;
 
         ext->u.single_ASN1_type->buf = (unsigned char *) asn_buf;
@@ -2432,7 +2507,7 @@ static int cmd_explain(const char *arg)
         return 0;
 #if YAZ_HAVE_XML2
     if (!conn)
-        cmd_open(0);
+        session_connect(cur_host);
     if (conn)
     {
         Z_SRW_PDU *sr = 0;
@@ -2469,19 +2544,26 @@ static int cmd_sru(const char *arg)
     if (!*arg)
     {
         printf("SRU method is: %s\n", sru_method);
+        printf("SRU version is: %s\n", sru_version);
     }
     else
     {
-        if (!yaz_matchstr(arg, "post"))
-            sru_method = "post";
-        else if (!yaz_matchstr(arg, "get"))
-            sru_method = "get";
-        else if (!yaz_matchstr(arg, "soap"))
-            sru_method = "soap";
-        else
+        int r;
+        r = sscanf(arg, "%9s %9s", sru_method, sru_version);
+        if (r >= 1)
         {
-            printf("Unknown SRU method: %s\n", arg);
-            printf("Specify one of POST, GET, SOAP\n");
+            if (!yaz_matchstr(sru_method, "post"))
+                ;
+            else if (!yaz_matchstr(sru_method, "get"))
+                ;
+            else if (!yaz_matchstr(sru_method, "soap"))
+                ;
+            else
+            {
+                strcpy(sru_method, "soap");
+                printf("Unknown SRU method: %s\n", arg);
+                printf("Specify one of POST, GET, SOAP\n");
+            }
         }
     }
     return 0;
@@ -2498,7 +2580,7 @@ static int cmd_find(const char *arg)
     {
 #if YAZ_HAVE_XML2
         if (!conn)
-            cmd_open(0);
+            session_connect(cur_host);
         if (!conn)
             return 0;
         if (!send_SRW_searchRequest(arg))
@@ -2775,7 +2857,7 @@ static int cmd_show(const char *arg)
     {
 #if YAZ_HAVE_XML2
         if (!conn)
-            cmd_open(0);
+            session_connect(cur_host);
         if (!conn)
             return 0;
         if (!send_SRW_presentRequest(arg))
@@ -2853,7 +2935,8 @@ int cmd_cancel_find(const char *arg) {
     return fres;
 }
 
-int send_scanrequest(const char *query, int pp, int num, const char *term)
+int send_scanrequest(const char *set,  const char *query,
+                     int pp, int num, const char *term)
 {
     Z_APDU *apdu = zget_APDU(out, Z_APDU_scanRequest);
     Z_ScanRequest *req = apdu->u.scanRequest;
@@ -2899,6 +2982,18 @@ int send_scanrequest(const char *query, int pp, int num, const char *term)
         }
         yaz_pqf_destroy (pqf_parser);
     }
+    if (queryCharset && outputCharset)
+    {
+        yaz_iconv_t cd = yaz_iconv_open(queryCharset, outputCharset);
+        if (!cd)
+        {
+            printf("Conversion from %s to %s unsupported\n",
+                   outputCharset, queryCharset);
+            return -1;
+        }
+        yaz_query_charset_convert_apt(req->termListAndStartPoint, out, cd);
+        yaz_iconv_close(cd);
+    }
     if (term && *term)
     {
         if (req->termListAndStartPoint->term &&
@@ -2918,6 +3013,11 @@ int send_scanrequest(const char *query, int pp, int num, const char *term)
     req->numberOfTermsRequested = &num;
     req->preferredPositionInResponse = &pp;
     req->stepSize = odr_intdup(out, scan_stepSize);
+
+    if (set)
+        yaz_oi_set_string_oid(&req->otherInfo, out,
+                              yaz_oid_userinfo_scan_set, 1, set);
+
     send_apdu(apdu);
     return 2;
 }
@@ -2964,13 +3064,13 @@ void display_term(Z_TermInfo *t)
     if (t->displayTerm)
         printf("%s", t->displayTerm);
     else if (t->term->which == Z_Term_general)
-    {
         printf("%.*s", t->term->u.general->len, t->term->u.general->buf);
-        sprintf(last_scan_line, "%.*s", t->term->u.general->len,
-            t->term->u.general->buf);
-    }
     else
         printf("Term (not general)");
+    if (t->term->which == Z_Term_general)
+        sprintf(last_scan_line, "%.*s", t->term->u.general->len,
+            t->term->u.general->buf);
+
     if (t->globalOccurrences)
         printf (" (%d)\n", *t->globalOccurrences);
     else
@@ -3098,13 +3198,13 @@ int cmd_scansize(const char *arg)
     return 0;
 }
 
-int cmd_scan(const char *arg)
+static int cmd_scan_common(const char *set, const char *arg)
 {
     if (protocol == PROTO_HTTP)
     {
 #if YAZ_HAVE_XML2
         if (!conn)
-            cmd_open(0);
+            session_connect(cur_host);
         if (!conn)
             return 0;
         if (*arg)
@@ -3142,18 +3242,37 @@ int cmd_scan(const char *arg)
         if (*arg)
         {
             strcpy (last_scan_query, arg);
-            if (send_scanrequest(arg, scan_position, scan_size, 0) < 0)
+            if (send_scanrequest(set, arg, 
+                                 scan_position, scan_size, 0) < 0)
                 return 0;
         }
         else
         {
-            if (send_scanrequest(last_scan_query, 1, scan_size, last_scan_line) < 0)
+            if (send_scanrequest(set, last_scan_query, 
+                                 1, scan_size, last_scan_line) < 0)
                 return 0;
         }
         return 2;
     }
 }
 
+int cmd_scan(const char *arg)
+{
+    return cmd_scan_common(0, arg);
+}
+
+int cmd_setscan(const char *arg)
+{
+    char setstring[100];
+    int nor;
+    if (sscanf(arg, "%99s%n", setstring, &nor) < 1)
+    {
+        printf("missing set for setscan\n");
+        return 0;
+    }
+    return cmd_scan_common(setstring, arg + nor);
+}
+
 int cmd_schema(const char *arg)
 {
     xfree(record_schema);
@@ -3291,11 +3410,29 @@ int cmd_marccharset(const char *arg)
     }
     xfree (marcCharset);
     marcCharset = 0;
-    if (strcmp(l1, "-"))
+    if (strcmp(l1, "-") && strcmp(l1, "none"))
         marcCharset = xstrdup(l1);
     return 1;
 }
 
+int cmd_querycharset(const char *arg)
+{
+    char l1[30];
+
+    *l1 = 0;
+    if (sscanf(arg, "%29s", l1) < 1)
+    {
+        printf("Query character set is `%s'\n", 
+               queryCharset ? queryCharset: "none");
+        return 1;
+    }
+    xfree (queryCharset);
+    queryCharset = 0;
+    if (strcmp(l1, "-") && strcmp(l1, "none"))
+        queryCharset = xstrdup(l1);
+    return 1;
+}
+
 int cmd_displaycharset(const char *arg)
 {
     char l1[30];
@@ -3334,11 +3471,14 @@ int cmd_negcharset(const char *arg)
     if (sscanf(arg, "%29s %d %d", l1, &negotiationCharsetRecords,
                &negotiationCharsetVersion) < 1)
     {
-        printf("Current negotiation character set is `%s'\n", 
+        printf("Negotiation character set `%s'\n", 
                negotiationCharset ? negotiationCharset: "none");  
-        printf("Records in charset %s\n", negotiationCharsetRecords ? 
-               "yes" : "no");
-        printf("Charneg version %d\n", negotiationCharsetVersion);
+        if (negotiationCharset)
+        {
+            printf("Records in charset %s\n", negotiationCharsetRecords ? 
+                   "yes" : "no");
+            printf("Charneg version %d\n", negotiationCharsetVersion);
+        }
     }
     else
     {
@@ -3355,14 +3495,15 @@ int cmd_negcharset(const char *arg)
 
 int cmd_charset(const char* arg)
 {
-    char l1[30], l2[30], l3[30];
+    char l1[30], l2[30], l3[30], l4[30];
 
-    *l1 = *l2 = *l3 = 0;
-    if (sscanf(arg, "%29s %29s %29s", l1, l2, l3) < 1)
+    *l1 = *l2 = *l3 = *l4 = '\0';
+    if (sscanf(arg, "%29s %29s %29s %29s", l1, l2, l3, l4) < 1)
     {
         cmd_negcharset("");
         cmd_displaycharset("");
         cmd_marccharset("");
+        cmd_querycharset("");
     }
     else
     {
@@ -3371,6 +3512,8 @@ int cmd_charset(const char* arg)
             cmd_displaycharset(l2);
         if (*l3)
             cmd_marccharset(l3);
+        if (*l4)
+            cmd_querycharset(l4);
     }
     return 1;
 }
@@ -3378,7 +3521,7 @@ int cmd_charset(const char* arg)
 int cmd_lang(const char* arg)
 {
     if (*arg == '\0') {
-        printf("Current language is `%s'\n", (yazLang)?yazLang:NULL);
+        printf("Current language is `%s'\n", yazLang ? yazLang : "none");
         return 1;
     }
     xfree (yazLang);
@@ -3650,19 +3793,42 @@ int cmd_push_command(const char* arg)
     return 1;
 }
 
-void source_rcfile(void)
+void source_rc_file(const char *rc_file)
 {
-    /*  Look for a $HOME/.yazclientrc and source it if it exists */
+    /*  If rc_file != NULL, source that. Else
+        Look for .yazclientrc and read it if it exists. 
+        If it does not exist, read  $HOME/.yazclientrc instead */
     struct stat statbuf;
-    char fname[1000];
-    char* homedir = getenv("HOME");
 
-    sprintf(fname, "%.500s%s%s", homedir ? homedir : "",
-            homedir ? "/" : "",
-            ".yazclientrc");
-
-    if (stat(fname,&statbuf)==0)
-        cmd_source(fname, 0 );
+    if (rc_file)
+    {
+        if (stat(rc_file, &statbuf) == 0)
+            cmd_source(rc_file, 0);
+        else
+        {
+            fprintf(stderr, "yaz_client: cannot source '%s'\n", rc_file);
+            exit(1);
+        }
+    }
+    else
+    {
+        char fname[1000];
+        strcpy(fname, ".yazclientrc");
+        if (stat(fname, &statbuf)==0)
+        {
+            cmd_source(fname, 0);
+        }
+        else
+        {
+            const char* homedir = getenv("HOME");
+            if (homedir)
+            {
+                sprintf(fname, "%.800s/%s", homedir, ".yazclientrc");
+                if (stat(fname, &statbuf)==0)
+                    cmd_source(fname, 0);
+            }
+        }
+    }
 }
 
 void add_to_readline_history(void *client_data, const char *line)
@@ -3673,7 +3839,7 @@ void add_to_readline_history(void *client_data, const char *line)
 #endif
 }
 
-static void initialize(void)
+static void initialize(const char *rc_file)
 {
     FILE *inf;
     int i;
@@ -3712,7 +3878,7 @@ static void initialize(void)
 
     cmd_format("usmarc");
     
-    source_rcfile();
+    source_rc_file(rc_file);
 
     file_history = file_history_new();
     file_history_load(file_history);
@@ -3823,7 +3989,7 @@ static void http_response(Z_HTTP_Response *hres)
     const char *connection_head = z_HTTP_header_lookup(hres->headers,
                                                        "Connection");
     if (!yaz_srw_check_content_type(hres))
-        printf("Content type does not appear to be XML");
+        printf("Content type does not appear to be XML\n");
     else
     {
         Z_SOAP *soap_package = 0;
@@ -3919,7 +4085,7 @@ void wait_and_handle_response(int one_response_only)
         {
             cs_close(conn);
             conn = 0;
-            cmd_open(0);
+            session_connect(cur_host);
             reconnect_ok = 0;
             if (conn)
             {
@@ -4328,6 +4494,7 @@ static struct {
     {"delete", cmd_delete, "<setname>",NULL,0,NULL},
     {"base", cmd_base, "<base-name>",NULL,0,NULL},
     {"show", cmd_show, "<rec#>['+'<#recs>['+'<setname>]]",NULL,0,NULL},
+    {"setscan", cmd_setscan, "<term>",NULL,0,NULL},
     {"scan", cmd_scan, "<term>",NULL,0,NULL},
     {"scanstep", cmd_scanstep, "<size>",NULL,0,NULL},
     {"scanpos", cmd_scanpos, "<size>",NULL,0,NULL},
@@ -4358,6 +4525,7 @@ static struct {
     {"negcharset", cmd_negcharset, "<nego_charset>",NULL,0,NULL},
     {"displaycharset", cmd_displaycharset, "<output_charset>",NULL,0,NULL},
     {"marccharset", cmd_marccharset, "<charset_name>",NULL,0,NULL},
+    {"querycharset", cmd_querycharset, "<charset_name>",NULL,0,NULL},
     {"lang", cmd_lang, "<language_code>",NULL,0,NULL},
     {"source", cmd_source_echo, "<filename>",NULL,1,NULL},
     {".", cmd_source_echo, "<filename>",NULL,1,NULL},
@@ -4394,7 +4562,7 @@ static struct {
     {"zversion", cmd_zversion, "", NULL, 0, NULL},
     {"help", cmd_help, "", NULL,0,NULL},
     {"init", cmd_init, "", NULL,0,NULL},
-    {"sru", cmd_sru, "", NULL,0,NULL},
+    {"sru", cmd_sru, "<method> <version>", NULL,0,NULL},
     {"exit", cmd_quit, "",NULL,0,NULL},
     {0,0,0,0,0,0}
 };
@@ -4718,6 +4886,7 @@ int main(int argc, char **argv)
     char *open_command = 0;
     char *auth_command = 0;
     char *arg;
+    const char *rc_file = 0;
     int ret;
     
 #if HAVE_LOCALE_H
@@ -4742,7 +4911,7 @@ int main(int argc, char **argv)
     ODR_MASK_SET(&z3950_options, Z_Options_delSet);
     ODR_MASK_SET(&z3950_options, Z_Options_negotiationModel);
 
-    while ((ret = options("k:c:q:a:b:m:v:p:u:t:Vxd:", argv, argc, &arg)) != -2)
+    while ((ret = options("k:c:q:a:b:m:v:p:u:t:Vxd:f:", argv, argc, &arg)) != -2)
     {
         switch (ret)
         {
@@ -4760,9 +4929,28 @@ int main(int argc, char **argv)
                 exit(1);
             }
             break;
+        case 'a':
+            if (!strcmp(arg, "-"))
+                apdu_file=stderr;
+            else
+                apdu_file=fopen(arg, "a");
+            break;
+        case 'b':
+            if (!strcmp(arg, "-"))
+                ber_file=stderr;
+            else
+                ber_file=fopen(arg, "a");
+            break;
+        case 'c':
+            strncpy (ccl_fields, arg, sizeof(ccl_fields)-1);
+            ccl_fields[sizeof(ccl_fields)-1] = '\0';
+            break;
         case 'd':
             dump_file_prefix = arg;
             break;
+        case 'f':
+            rc_file = arg;
+            break;
         case 'k':
             kilobytes = atoi(arg);
             break;
@@ -4773,34 +4961,15 @@ int main(int argc, char **argv)
                 exit (1);
             }
             break;
-        case 't':
-            outputCharset = xstrdup(arg);
-            break;
-        case 'c':
-            strncpy (ccl_fields, arg, sizeof(ccl_fields)-1);
-            ccl_fields[sizeof(ccl_fields)-1] = '\0';
+        case 'p':
+            yazProxy = xstrdup(arg);
             break;
         case 'q':
             strncpy (cql_fields, arg, sizeof(cql_fields)-1);
             cql_fields[sizeof(cql_fields)-1] = '\0';
             break;
-        case 'b':
-            if (!strcmp(arg, "-"))
-                ber_file=stderr;
-            else
-                ber_file=fopen(arg, "a");
-            break;
-        case 'a':
-            if (!strcmp(arg, "-"))
-                apdu_file=stderr;
-            else
-                apdu_file=fopen(arg, "a");
-            break;
-        case 'x':
-            hex_dump = 1;
-            break;
-        case 'p':
-            yazProxy = xstrdup(arg);
+        case 't':
+            outputCharset = xstrdup(arg);
             break;
         case 'u':
             if (!auth_command)
@@ -4816,24 +4985,31 @@ int main(int argc, char **argv)
         case 'V':
             show_version();
             break;
+        case 'x':
+            hex_dump = 1;
+            break;
         default:
             fprintf (stderr, "Usage: %s "
-                     " [-a <apdulog>]"
+                     " [-a apdulog]"
                      " [-b berdump]"
-                     " [-d dump]\n"
-                     " [-c cclfields]"
+                     " [-c cclfile]"
+                     " [-d dump]"
+                     " [-f cmdfile]"
                      " [-k size]"
-                     " [-m <marclog>]\n" 
-                     " [-p <proxy-addr>]"
-                     " [-q cqlfields]"
-                     " [-u <auth>]"
+                     " [-m marclog]" 
+                     " [-p proxy-addr]"
+                     " [-q cqlfile]"
+                     " [-t dispcharset]"
+                     " [-u auth]"
+                     " [-v loglevel]"
                      " [-V]"
-                     " [<server-addr>]\n",
+                     " [-x]"
+                     " [server-addr]\n",
                      prog);
             exit (1);
         }      
     }
-    initialize();
+    initialize(rc_file);
     if (auth_command)
     {
 #ifdef HAVE_GETTIMEOFDAY