X-Git-Url: http://git.indexdata.com/?p=yaz-moved-to-github.git;a=blobdiff_plain;f=client%2Fclient.c;h=5791eac898aae2f9f3f5a5c4d2c4f3cb5304cc6f;hp=190616c9726d1b6c6a357799a36b4c77abb9fe46;hb=f4c095a042b1bcccb78136be87944e46412386aa;hpb=c80275992d29b4815dd25d9203e094ae2880f1ae

diff --git a/client/client.c b/client/client.c
index 190616c..5791eac 100644
--- a/client/client.c
+++ b/client/client.c
@@ -1,8 +1,8 @@
 /* 
- * Copyright (c) 1995-2003, Index Data
+ * Copyright (c) 1995-2004, Index Data
  * See the file LICENSE for details.
  *
- * $Id: client.c,v 1.210 2003-10-21 12:35:50 mike Exp $
+ * $Id: client.c,v 1.261 2004-12-13 14:21:54 heikki Exp $
  */
 
 #include <stdio.h>
@@ -16,6 +16,15 @@
 #include <langinfo.h>
 #endif
 
+#if HAVE_OPENSSL_SSL_H
+#include <openssl/bio.h>
+#include <openssl/crypto.h>
+#include <openssl/x509.h>
+#include <openssl/pem.h>
+#include <openssl/ssl.h>
+#include <openssl/err.h>
+#endif
+
 #include <time.h>
 #include <ctype.h>
 
@@ -42,6 +51,7 @@
 #include <yaz/srw.h>
 #include <yaz/yaz-ccl.h>
 #include <yaz/cql.h>
+#include <yaz/log.h>
 
 #if HAVE_READLINE_READLINE_H
 #include <readline/readline.h>
@@ -81,7 +91,7 @@ static Z_ElementSetNames *elementSetNames = 0;
 static int setno = 1;                   /* current set offset */
 static enum oid_proto protocol = PROTO_Z3950;      /* current app protocol */
 static enum oid_value recordsyntax = VAL_USMARC;
-static char *schema = 0;
+static char *record_schema = 0;
 static int sent_close = 0;
 static NMEM session_mem = NULL;         /* memory handle for init-response */
 static Z_InitResponse *session = 0;     /* session parameters */
@@ -97,12 +107,18 @@ static char *negotiationCharset = 0;
 static char *outputCharset = 0;
 static char *marcCharset = 0;
 static char* yazLang = 0;
+static char* http_version = "1.1";
 
 static char last_cmd[32] = "?";
 static FILE *marc_file = 0;
 static char *refid = NULL;
 static char *last_open_command = NULL;
 static int auto_reconnect = 0;
+static Odr_bitmask z3950_options;
+static int z3950_version = 3;
+static int scan_stepSize = 0;
+static int scan_position = 1;
+static char cur_host[200];
 
 typedef enum {
     QueryType_Prefix,
@@ -115,7 +131,7 @@ typedef enum {
 static QueryType queryType = QueryType_Prefix;
 
 static CCL_bibset bibset;               /* CCL bibset handle */
-static cql_transform_t cqltrans;	/* CQL qualifier-set handle */
+static cql_transform_t cqltrans;	/* CQL context-set handle */
 
 #if HAVE_READLINE_COMPLETION_OVER
 
@@ -277,19 +293,13 @@ static void send_initRequest(const char* type_and_host)
 {
     Z_APDU *apdu = zget_APDU(out, Z_APDU_initRequest);
     Z_InitRequest *req = apdu->u.initRequest;
+    int i;
 
-    ODR_MASK_SET(req->options, Z_Options_search);
-    ODR_MASK_SET(req->options, Z_Options_present);
-    ODR_MASK_SET(req->options, Z_Options_namedResultSets);
-    ODR_MASK_SET(req->options, Z_Options_triggerResourceCtrl);
-    ODR_MASK_SET(req->options, Z_Options_scan);
-    ODR_MASK_SET(req->options, Z_Options_sort);
-    ODR_MASK_SET(req->options, Z_Options_extendedServices);
-    ODR_MASK_SET(req->options, Z_Options_delSet);
+    req->options = &z3950_options;
 
-    ODR_MASK_SET(req->protocolVersion, Z_ProtocolVersion_1);
-    ODR_MASK_SET(req->protocolVersion, Z_ProtocolVersion_2);
-    ODR_MASK_SET(req->protocolVersion, Z_ProtocolVersion_3);
+    ODR_MASK_ZERO(req->protocolVersion);
+    for (i = 0; i<z3950_version; i++)
+	ODR_MASK_SET(req->protocolVersion, i);
 
     *req->maximumRecordSize = 1024*kilobytes;
     *req->preferredMessageSize = 1024*kilobytes;
@@ -298,7 +308,7 @@ static void send_initRequest(const char* type_and_host)
 
     req->referenceId = set_refid (out);
 
-    if (yazProxy) 
+    if (yazProxy && type_and_host) 
         yaz_oi_set_string_oidval(&req->otherInfo, out, VAL_PROXY,
         1, type_and_host);
     
@@ -309,15 +319,15 @@ static void send_initRequest(const char* type_and_host)
     	yaz_oi_APDU(apdu, &p);
     	
     	if ((p0=yaz_oi_update(p, out, NULL, 0, 0))) {
-    		ODR_MASK_SET(req->options, Z_Options_negotiationModel);
-    		
-    		p0->which = Z_OtherInfo_externallyDefinedInfo;
-    		p0->information.externallyDefinedInfo =
-    			yaz_set_proposal_charneg(
-                            out,
-                            (const char**)&negotiationCharset, 
-                            negotiationCharset ? 1 : 0,
-                            (const char**)&yazLang, yazLang ? 1 : 0, 1);
+	    ODR_MASK_SET(req->options, Z_Options_negotiationModel);
+	    
+	    p0->which = Z_OtherInfo_externallyDefinedInfo;
+	    p0->information.externallyDefinedInfo =
+		yaz_set_proposal_charneg(
+		    out,
+		    (const char**)&negotiationCharset, 
+		    negotiationCharset ? 1 : 0,
+		    (const char**)&yazLang, yazLang ? 1 : 0, 1);
     	}
     }
     
@@ -330,6 +340,11 @@ static void send_initRequest(const char* type_and_host)
 static void render_initUserInfo(Z_OtherInformation *ui1);
 static void render_diag(Z_DiagnosticFormat *diag);
 
+static void pr_opt(const char *opt, void *clientData)
+{
+    printf (" %s", opt);
+}
+
 static int process_initResponse(Z_InitResponse *res)
 {
     int ver = 0;
@@ -337,7 +352,7 @@ static int process_initResponse(Z_InitResponse *res)
     session_mem = odr_extract_mem(in);
     session = res;
 
-    for (ver = 0; ver<5; ver++)
+    for (ver = 0; ver < 8; ver++)
         if (!ODR_MASK_GET(res->protocolVersion, ver))
             break;
 
@@ -366,54 +381,35 @@ static int process_initResponse(Z_InitResponse *res)
 		printf("Guessing visiblestring:\n");
 		printf("'%s'\n", uif->u. octet_aligned->buf);
 	    } else if (uif->which == Z_External_single) {
-		/* Peek at any private Init-diagnostic APDUs */
 		Odr_any *sat = uif->u.single_ASN1_type;
-		printf("### NAUGHTY: External is '%s'\n", sat->buf);
+		oident *oid = oid_getentbyoid(uif->direct_reference);
+		if (oid->value == VAL_OCLCUI) {
+		    Z_OCLC_UserInformation *oclc_ui;
+		    ODR decode = odr_createmem(ODR_DECODE);
+		    odr_setbuf(decode, sat->buf, sat->len, 0);
+		    if (!z_OCLC_UserInformation(decode, &oclc_ui, 0, 0))
+			printf ("Bad OCLC UserInformation:\n");
+		    else
+			printf ("OCLC UserInformation:\n");
+		    if (!z_OCLC_UserInformation(print, &oclc_ui, 0, 0))
+			printf ("Bad OCLC UserInformation spec\n");
+		    odr_destroy(decode);
+		}
+		else
+		{
+		    /* Peek at any private Init-diagnostic APDUs */
+		    printf("### NAUGHTY: External is '%.*s'\n", sat->len, sat->buf);
+		}
 	    }
 	    odr_reset (print);
 	}
     }
     printf ("Options:");
-    if (ODR_MASK_GET(res->options, Z_Options_search))
-        printf (" search");
-    if (ODR_MASK_GET(res->options, Z_Options_present))
-        printf (" present");
-    if (ODR_MASK_GET(res->options, Z_Options_delSet))
-        printf (" delSet");
-    if (ODR_MASK_GET(res->options, Z_Options_resourceReport))
-        printf (" resourceReport");
-    if (ODR_MASK_GET(res->options, Z_Options_resourceCtrl))
-        printf (" resourceCtrl");
-    if (ODR_MASK_GET(res->options, Z_Options_accessCtrl))
-        printf (" accessCtrl");
-    if (ODR_MASK_GET(res->options, Z_Options_scan))
-        printf (" scan");
-    if (ODR_MASK_GET(res->options, Z_Options_sort))
-        printf (" sort");
-    if (ODR_MASK_GET(res->options, Z_Options_extendedServices))
-        printf (" extendedServices");
-    if (ODR_MASK_GET(res->options, Z_Options_level_1Segmentation))
-        printf (" level1Segmentation");
-    if (ODR_MASK_GET(res->options, Z_Options_level_2Segmentation))
-        printf (" level2Segmentation");
-    if (ODR_MASK_GET(res->options, Z_Options_concurrentOperations))
-        printf (" concurrentOperations");
+    yaz_init_opt_decode(res->options, pr_opt, 0);
+    printf ("\n");
+
     if (ODR_MASK_GET(res->options, Z_Options_namedResultSets))
-    {
-        printf (" namedResultSets");
         setnumber = 0;
-    }
-    if (ODR_MASK_GET(res->options, Z_Options_encapsulation))
-        printf (" encapsulation");
-    if (ODR_MASK_GET(res->options, Z_Options_resultCount))
-        printf (" resultCount");
-    if (ODR_MASK_GET(res->options, Z_Options_negotiationModel))
-        printf (" negotiationModel");
-    if (ODR_MASK_GET(res->options, Z_Options_duplicateDetection))
-        printf (" duplicateDetection");
-    if (ODR_MASK_GET(res->options, Z_Options_queryType104))
-        printf (" queryType104");
-    printf ("\n");
     
     if (ODR_MASK_GET(res->options, Z_Options_negotiationModel)) {
     
@@ -478,10 +474,11 @@ static void render_diag(Z_DiagnosticFormat *diag) {
 	case Z_DiagnosticFormat_s_defaultDiagRec: {
 	    Z_DefaultDiagFormat *dd = ds->u.defaultDiagRec;
 	    /* ### should check `dd->diagnosticSetId' */
-	    printf("code=%d", *dd->condition);
+	    printf("code=%d (%s)", *dd->condition,
+		   diagbib1_str(*dd->condition));
 	    /* Both types of addinfo are the same, so use type-pun */
 	    if (dd->u.v2Addinfo != 0)
-		printf(", addinfo='%s'", dd->u.v2Addinfo);
+		printf(",\n\taddinfo='%s'", dd->u.v2Addinfo);
 	    break;
 	}
 	case Z_DiagnosticFormat_s_explicitDiagnostic:
@@ -559,6 +556,9 @@ int session_connect(const char *arg)
     void *add;
     char type_and_host[101];
     const char *basep = 0;
+#if HAVE_OPENSSL_SSL_H
+    SSL *ssl;
+#endif
     if (conn)
     {
         cs_close (conn);
@@ -586,6 +586,8 @@ int session_connect(const char *arg)
         return 0;
     }
 #if HAVE_XML2
+    if (conn->protocol == PROTO_HTTP)
+	queryType = QueryType_CQL;
 #else
     if (conn->protocol == PROTO_HTTP)
     {
@@ -616,6 +618,30 @@ int session_connect(const char *arg)
         return 0;
     }
     printf("OK.\n");
+#if HAVE_OPENSSL_SSL_H
+    if ((ssl = (SSL *) cs_get_ssl(conn)))
+    {
+	X509 *server_cert = SSL_get_peer_certificate (ssl);
+
+	if (server_cert)
+	{
+	    char *pem_buf;
+	    int pem_len;
+	    BIO *bio = BIO_new(BIO_s_mem());
+
+	    /* get PEM buffer in memory */
+	    PEM_write_bio_X509(bio, server_cert);
+	    pem_len = BIO_get_mem_data(bio, &pem_buf);
+	    fwrite(pem_buf, pem_len, 1, stdout);
+	
+	    /* print all info on screen .. */
+	    X509_print_fp(stdout, server_cert);
+	    BIO_free(bio);
+
+	    X509_free (server_cert);
+	}
+    }
+#endif
     if (basep && *basep)
         set_base (basep);
     if (protocol == PROTO_Z3950)
@@ -628,7 +654,6 @@ int session_connect(const char *arg)
 
 int cmd_open(const char *arg)
 {
-    static char cur_host[200];
     if (arg)
     {
         strncpy (cur_host, arg, sizeof(cur_host)-1);
@@ -718,6 +743,8 @@ static void print_record(const unsigned char *buf, size_t len)
     /* add newline if not already added ... */
     if (i <= 0 || buf[i-1] != '\n')
         printf ("\n");
+    if (marc_file)
+	fwrite (buf, 1, len, marc_file);
 }
 
 static void display_record(Z_External *r)
@@ -743,7 +770,7 @@ static void display_record(Z_External *r)
     if (ent && r->which == Z_External_octet)
     {
         Z_ext_typeent *type = z_ext_getentbyref(ent->value);
-        void *rr;
+        char *rr;
 
         if (type)
         {
@@ -752,7 +779,7 @@ static void display_record(Z_External *r)
              */
             odr_setbuf(in, (char*)r->u.octet_aligned->buf,
                 r->u.octet_aligned->len, 0);
-            if (!(*type->fun)(in, (char **)&rr, 0, 0))
+            if (!(*type->fun)(in, &rr, 0, 0))
             {
                 odr_perror(in, "Decoding constructed record.");
                 fprintf(stdout, "[Near %d]\n", odr_offset(in));
@@ -772,16 +799,16 @@ static void display_record(Z_External *r)
             }
         }
     }
-    if (ent && ent->oclass != CLASS_RECSYN) 
-        return;
     if (ent && ent->value == VAL_SOIF)
         print_record((const unsigned char *) r->u.octet_aligned->buf,
                      r->u.octet_aligned->len);
     else if (r->which == Z_External_octet)
     {
         const char *octet_buf = (char*)r->u.octet_aligned->buf;
-        if (ent->value == VAL_TEXT_XML || ent->value == VAL_APPLICATION_XML ||
-            ent->value == VAL_HTML)
+        if (ent->oclass == CLASS_RECSYN && 
+		(ent->value == VAL_TEXT_XML || 
+		 ent->value == VAL_APPLICATION_XML ||
+		 ent->value == VAL_HTML))
         {
             print_record((const unsigned char *) octet_buf,
                          r->u.octet_aligned->len);
@@ -947,6 +974,8 @@ static void display_record(Z_External *r)
 		    printf ("shelvingLocation: %s\n", data->shelvingLocation);
 		if (data->callNumber)
 		    printf ("callNumber: %s\n", data->callNumber);
+		if (data->shelvingData)
+		    printf ("shelvingData: %s\n", data->shelvingData);
 		if (data->copyNumber)
 		    printf ("copyNumber: %s\n", data->copyNumber);
 		if (data->publicNote)
@@ -1103,7 +1132,7 @@ static int send_deleteResultSetRequest(const char *arg)
         odr_malloc (out, sizeof(*req->deleteFunction));
     if (req->num_resultSetList > 0)
     {
-        *req->deleteFunction = Z_DeleteRequest_list;
+        *req->deleteFunction = Z_DeleteResultSetRequest_list;
         req->resultSetList = (char **)
             odr_malloc (out, sizeof(*req->resultSetList)*
                         req->num_resultSetList);
@@ -1112,7 +1141,7 @@ static int send_deleteResultSetRequest(const char *arg)
     }
     else
     {
-        *req->deleteFunction = Z_DeleteRequest_all;
+        *req->deleteFunction = Z_DeleteResultSetRequest_all;
         req->resultSetList = 0;
     }
     
@@ -1125,11 +1154,11 @@ static int send_deleteResultSetRequest(const char *arg)
 static int send_srw(Z_SRW_PDU *sr)
 {
     const char *charset = negotiationCharset;
-    const char *host_port = 0;
+    const char *host_port = cur_host;
     char *path = 0;
     char ctype[50];
     Z_SOAP_Handler h[2] = {
-        {"http://www.loc.gov/zing/srw/v1.0/", 0, (Z_SOAP_fun) yaz_srw_codec},
+        {"http://www.loc.gov/zing/srw/", 0, (Z_SOAP_fun) yaz_srw_codec},
         {0, 0, 0}
     };
     ODR o = odr_createmem(ODR_ENCODE);
@@ -1142,6 +1171,7 @@ static int send_srw(Z_SRW_PDU *sr)
     strcpy(path+1, databaseNames[0]);
 
     gdu = z_get_HTTP_Request(out);
+    gdu->u.HTTP_Request->version = http_version;
     gdu->u.HTTP_Request->path = odr_strdup(out, path);
 
     if (host_port)
@@ -1163,7 +1193,7 @@ static int send_srw(Z_SRW_PDU *sr)
             memcpy (h, cp0, cp1 - cp0);
             h[cp1-cp0] = '\0';
             z_HTTP_header_add(out, &gdu->u.HTTP_Request->headers,
-                              "host", h);
+                              "Host", h);
         }
     }
 
@@ -1195,6 +1225,12 @@ static int send_srw(Z_SRW_PDU *sr)
         char *buf_out;
         int len_out;
         int r;
+	if (apdu_file)
+	{
+	    if (!z_GDU(print, &gdu, 0, 0))
+		printf ("Failed to print outgoing APDU\n");
+	    odr_reset(print);
+	}
         buf_out = odr_getbuf(out, &len_out, 0);
         
         /* we don't odr_reset(out), since we may need the buffer again */
@@ -1227,15 +1263,37 @@ static int send_SRW_searchRequest(const char *arg)
     setno = 1;
 
     /* save this for later .. when fetching individual records */
-    srw_sr = sr = yaz_srw_get(srw_sr_odr_out, Z_SRW_searchRetrieve_request);
-    sr->u.request->query_type = Z_SRW_query_type_cql;
-    sr->u.request->query.cql = odr_strdup(srw_sr_odr_out, arg);
-
+    srw_sr =  yaz_srw_get(srw_sr_odr_out, Z_SRW_searchRetrieve_request);
+    
+    /* regular request .. */
     sr = yaz_srw_get(out, Z_SRW_searchRetrieve_request);
-    sr->u.request->query_type = Z_SRW_query_type_cql;
-    sr->u.request->query.cql = odr_strdup(out, arg);
-    if (schema)
-        sr->u.request->recordSchema = schema;
+
+    switch(queryType)
+    {
+    case QueryType_CQL:
+	srw_sr->u.request->query_type = Z_SRW_query_type_cql;
+	srw_sr->u.request->query.cql = odr_strdup(srw_sr_odr_out, arg);
+
+	sr->u.request->query_type = Z_SRW_query_type_cql;
+	sr->u.request->query.cql = odr_strdup(out, arg);
+	break;
+    case QueryType_Prefix:
+	srw_sr->u.request->query_type = Z_SRW_query_type_pqf;
+	srw_sr->u.request->query.pqf = odr_strdup(srw_sr_odr_out, arg);
+
+	sr->u.request->query_type = Z_SRW_query_type_pqf;
+	sr->u.request->query.pqf = odr_strdup(out, arg);
+	break;
+    default:
+	printf ("Only CQL and PQF supported in SRW\n");
+	return 0;
+    }
+    sr->u.request->maximumRecords = odr_intdup(out, 0);
+
+    if (record_schema)
+        sr->u.request->recordSchema = record_schema;
+    if (recordsyntax == VAL_TEXT_XML)
+        sr->u.explain_request->recordPacking = "xml";
     return send_srw(sr);
 }
 #endif
@@ -1245,7 +1303,6 @@ static int send_searchRequest(const char *arg)
     Z_APDU *apdu = zget_APDU(out, Z_APDU_searchRequest);
     Z_SearchRequest *req = apdu->u.searchRequest;
     Z_Query query;
-    int oid[OID_SIZE];
     struct ccl_rpn_node *rpn = NULL;
     int error, pos;
     char setstring[100];
@@ -1314,13 +1371,9 @@ static int send_searchRequest(const char *arg)
     if (smallSetUpperBound > 0 || (largeSetLowerBound > 1 &&
         mediumSetPresentNumber > 0))
     {
-        oident prefsyn;
-
-        prefsyn.proto = protocol;
-        prefsyn.oclass = CLASS_RECSYN;
-        prefsyn.value = recordsyntax;
         req->preferredRecordSyntax =
-            odr_oiddup(out, oid_ent_to_oid(&prefsyn, oid));
+            yaz_oidval_to_z3950oid(out, CLASS_RECSYN, recordsyntax);
+
         req->smallSetElementSetNames =
             req->mediumSetElementSetNames = elementSetNames;
     }
@@ -1944,8 +1997,6 @@ static int cmd_update_common(const char *arg, int version)
     Z_APDU *apdu = zget_APDU(out, Z_APDU_extendedServicesRequest );
     Z_ExtendedServicesRequest *req = apdu->u.extendedServicesRequest;
     Z_External *r;
-    int oid[OID_SIZE];
-    oident update_oid;
     char action[20], recid[20], fname[80];
     int action_no;
     Z_External *record_this = 0;
@@ -2006,21 +2057,17 @@ static int cmd_update_common(const char *arg, int version)
         record_this = record_last;
     }
 
-    update_oid.proto = PROTO_Z3950;
-    update_oid.oclass = CLASS_EXTSERV;
-    if (version == 0)
-	update_oid.value = VAL_DBUPDATE0;
-    else
-	update_oid.value = VAL_DBUPDATE;
-    oid_ent_to_oid (&update_oid, oid);
-    req->packageType = odr_oiddup(out,oid);
+    req->packageType =
+	yaz_oidval_to_z3950oid(out, CLASS_EXTSERV,
+			       version == 0 ? VAL_DBUPDATE0 : VAL_DBUPDATE);
+
     req->packageName = esPackageName;
     
     req->referenceId = set_refid (out);
 
     r = req->taskSpecificParameters = (Z_External *)
         odr_malloc (out, sizeof(*r));
-    r->direct_reference = odr_oiddup(out,oid);
+    r->direct_reference = req->packageType;
     r->indirect_reference = 0;
     r->descriptor = 0;
     if (version == 0)
@@ -2129,6 +2176,68 @@ static int cmd_itemorder(const char *arg)
     return 2;
 }
 
+static void show_opt(const char *arg, void *clientData)
+{
+    printf ("%s ", arg);
+}
+
+static int cmd_zversion(const char *arg)
+{
+    if (*arg && arg)
+	z3950_version = atoi(arg);
+    else
+	printf ("version is %d\n", z3950_version);
+    return 0;
+}
+
+static int cmd_options(const char *arg)
+{
+    if (*arg)
+    {
+	int r;
+	int pos;
+	r = yaz_init_opt_encode(&z3950_options, arg, &pos);
+    }
+    else
+    {
+	yaz_init_opt_decode(&z3950_options, show_opt, 0);
+	printf ("\n");
+    }
+    return 0;
+}
+
+static int cmd_explain(const char *arg)
+{
+    if (protocol != PROTO_HTTP)
+	return 0;
+#if HAVE_XML2
+    if (!conn)
+	cmd_open(0);
+    if (conn)
+    {
+	Z_SRW_PDU *sr = 0;
+	
+	setno = 1;
+	
+	/* save this for later .. when fetching individual records */
+	sr = yaz_srw_get(out, Z_SRW_explain_request);
+	if (recordsyntax == VAL_TEXT_XML)
+            sr->u.explain_request->recordPacking = "xml";
+	send_srw(sr);
+	return 2;
+    }
+#endif
+    return 0;
+}
+
+static int cmd_init(const char *arg)
+{
+    if (!conn || protocol != PROTO_Z3950)
+       return 0;
+    send_initRequest(0);
+    return 2;
+}
+
 static int cmd_find(const char *arg)
 {
     if (!*arg)
@@ -2141,6 +2250,8 @@ static int cmd_find(const char *arg)
 #if HAVE_XML2
         if (!conn)
             cmd_open(0);
+	if (!conn)
+	    return 0;
         if (!send_SRW_searchRequest(arg))
             return 0;
 #else
@@ -2260,9 +2371,7 @@ static int send_presentRequest(const char *arg)
     Z_APDU *apdu = zget_APDU(out, Z_APDU_presentRequest);
     Z_PresentRequest *req = apdu->u.presentRequest;
     Z_RecordComposition compo;
-    oident prefsyn;
     int nos = 1;
-    int oid[OID_SIZE];
     char setstring[100];
 
     req->referenceId = set_refid (out);
@@ -2273,20 +2382,12 @@ static int send_presentRequest(const char *arg)
 
     req->resultSetStartPoint = &setno;
     req->numberOfRecordsRequested = &nos;
-    prefsyn.proto = protocol;
-    prefsyn.oclass = CLASS_RECSYN;
-    prefsyn.value = recordsyntax;
+
     req->preferredRecordSyntax =
-        odr_oiddup (out, oid_ent_to_oid(&prefsyn, oid));
+        yaz_oidval_to_z3950oid(out, CLASS_RECSYN, recordsyntax);
 
-    if (schema)
+    if (record_schema)
     {
-        oident prefschema;
-
-        prefschema.proto = protocol;
-        prefschema.oclass = CLASS_SCHEMA;
-        prefschema.value = oid_getvalbyname(schema);
-
         req->recordComposition = &compo;
         compo.which = Z_RecordComp_complex;
         compo.u.complex = (Z_CompSpec *)
@@ -2298,14 +2399,15 @@ static int send_presentRequest(const char *arg)
         compo.u.complex->generic = (Z_Specification *)
             odr_malloc(out, sizeof(*compo.u.complex->generic));
         compo.u.complex->generic->which = Z_Schema_oid;
-        compo.u.complex->generic->schema.oid = (Odr_oid *)
-            odr_oiddup(out, oid_ent_to_oid(&prefschema, oid));
+
+        compo.u.complex->generic->schema.oid =
+	    yaz_str_to_z3950oid(out, CLASS_SCHEMA, record_schema);
+
         if (!compo.u.complex->generic->schema.oid)
         {
             /* OID wasn't a schema! Try record syntax instead. */
-            prefschema.oclass = CLASS_RECSYN;
             compo.u.complex->generic->schema.oid = (Odr_oid *)
-                odr_oiddup(out, oid_ent_to_oid(&prefschema, oid));
+		yaz_str_to_z3950oid(out, CLASS_RECSYN, record_schema);
         }
         if (!elementSetNames)
             compo.u.complex->generic->elementSpec = 0;
@@ -2346,8 +2448,10 @@ static int send_SRW_presentRequest(const char *arg)
     parse_show_args(arg, setstring, &setno, &nos);
     sr->u.request->startRecord = odr_intdup(out, setno);
     sr->u.request->maximumRecords = odr_intdup(out, nos);
-    if (schema)
-        sr->u.request->recordSchema = schema;
+    if (record_schema)
+        sr->u.request->recordSchema = record_schema;
+    if (recordsyntax == VAL_TEXT_XML)
+        sr->u.request->recordPacking = "xml";
     return send_srw(sr);
 }
 #endif
@@ -2407,6 +2511,8 @@ static int cmd_show(const char *arg)
 #if HAVE_XML2
         if (!conn)
             cmd_open(0);
+	if (!conn)
+	    return 0;
         if (!send_SRW_presentRequest(arg))
             return 0;
 #else
@@ -2453,25 +2559,34 @@ int cmd_cancel(const char *arg)
         printf("Target doesn't support cancel (trigger resource ctrl)\n");
         return 0;
     }
-    *req->requestedAction = Z_TriggerResourceCtrl_cancel;
+    *req->requestedAction = Z_TriggerResourceControlRequest_cancel;
     req->resultSetWanted = &rfalse;
+    req->referenceId = set_refid (out);
 
     send_apdu(apdu);
     printf("Sent cancel request\n");
     return 2;
 }
 
+
+int cmd_cancel_find(const char *arg) {
+    int fres;
+    fres=cmd_find(arg);
+    if( fres > 0 ) {
+	return cmd_cancel("");
+    };
+    return fres;
+}
+
 int send_scanrequest(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;
-    int oid[OID_SIZE];
     
     if (only_z3950())
 	return 0;
     if (queryType == QueryType_CCL2RPN)
     {
-        oident bib1;
         int error, pos;
         struct ccl_rpn_node *rpn;
 
@@ -2481,10 +2596,8 @@ int send_scanrequest(const char *query, int pp, int num, const char *term)
             printf("CCL ERROR: %s\n", ccl_err_msg(error));
             return -1;
         }
-        bib1.proto = PROTO_Z3950;
-        bib1.oclass = CLASS_ATTSET;
-        bib1.value = VAL_BIB1;
-        req->attributeSet = oid_ent_to_oid (&bib1, oid);
+        req->attributeSet =
+	    yaz_oidval_to_z3950oid(out, CLASS_ATTSET, VAL_BIB1);
         if (!(req->termListAndStartPoint = ccl_scan_query (out, rpn)))
         {
             printf("Couldn't convert CCL to Scan term\n");
@@ -2527,6 +2640,7 @@ int send_scanrequest(const char *query, int pp, int num, const char *term)
     req->databaseNames = databaseNames;
     req->numberOfTermsRequested = &num;
     req->preferredPositionInResponse = &pp;
+    req->stepSize = odr_intdup(out, scan_stepSize);
     send_apdu(apdu);
     return 2;
 }
@@ -2570,7 +2684,9 @@ int send_sortrequest(const char *arg, int newset)
 
 void display_term(Z_TermInfo *t)
 {
-    if (t->term->which == Z_Term_general)
+    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,
@@ -2623,11 +2739,11 @@ void process_sortResponse(Z_SortResponse *res)
     printf("Received SortResponse: status=");
     switch (*res->sortStatus)
     {
-    case Z_SortStatus_success:
+    case Z_SortResponse_success:
         printf ("success"); break;
-    case Z_SortStatus_partial_1:
+    case Z_SortResponse_partial_1:
         printf ("partial"); break;
-    case Z_SortStatus_failure:
+    case Z_SortResponse_failure:
         printf ("failure"); break;
     default:
         printf ("unknown (%d)", *res->sortStatus);
@@ -2687,6 +2803,20 @@ int cmd_sort_newset (const char *arg)
     return cmd_sort_generic (arg, 1);
 }
 
+int cmd_scanstep(const char *arg)
+{
+    scan_stepSize = atoi(arg);
+    return 0;
+}
+
+int cmd_scanpos(const char *arg)
+{
+    int r = sscanf(arg, "%d", &scan_position);
+    if (r == 0)
+        scan_position = 1;
+    return 0;
+}
+
 int cmd_scan(const char *arg)
 {
     if (only_z3950())
@@ -2708,7 +2838,7 @@ int cmd_scan(const char *arg)
     if (*arg)
     {
         strcpy (last_scan_query, arg);
-        if (send_scanrequest(arg, 1, 20, 0) < 0)
+        if (send_scanrequest(arg, scan_position, 20, 0) < 0)
             return 0;
     }
     else
@@ -2721,10 +2851,10 @@ int cmd_scan(const char *arg)
 
 int cmd_schema(const char *arg)
 {
-    xfree(schema);
-    schema = 0;
+    xfree(record_schema);
+    record_schema = 0;
     if (arg && *arg)
-        schema = xstrdup(arg);
+        record_schema = xstrdup(arg);
     return 1;
 }
 
@@ -2811,10 +2941,7 @@ int cmd_refid (const char *arg)
     xfree (refid);
     refid = NULL;
     if (*arg)
-    {
-        refid = (char *) xmalloc (strlen(arg)+1);
-        strcpy (refid, arg);
-    }
+        refid = xstrdup (arg);
     return 1;
 }
 
@@ -2860,7 +2987,11 @@ int cmd_marccharset(const char *arg)
 
     *l1 = 0;
     if (sscanf(arg, "%29s", l1) < 1)
+    {
+    	printf("MARC character set is `%s'\n", 
+               marcCharset ? marcCharset: "none");
         return 1;
+    }
     xfree (marcCharset);
     marcCharset = 0;
     if (strcmp(l1, "-"))
@@ -2868,50 +2999,76 @@ int cmd_marccharset(const char *arg)
     return 1;
 }
 
-int cmd_charset(const char* arg)
+int cmd_displaycharset(const char *arg)
 {
-    char l1[30], l2[30];
+    char l1[30];
 
-    *l1 = *l2 = 0;
-    if (sscanf(arg, "%29s %29s", l1, l2) < 1)
+    *l1 = 0;
+    if (sscanf(arg, "%29s", l1) < 1)
     {
-    	printf("Current negotiation character set is `%s'\n", 
-               negotiationCharset ? negotiationCharset: "none");
-    	printf("Current output character set is `%s'\n", 
+    	printf("Display character set is `%s'\n", 
                outputCharset ? outputCharset: "none");
-    	return 1;
-    }
-    xfree (negotiationCharset);
-    negotiationCharset = NULL;
-    if (*l1 && strcmp(l1, "-"))
-    {
-        negotiationCharset = xstrdup(l1);
-        printf ("Character set negotiation : %s\n", negotiationCharset);
     }
     else
-        printf ("Character set negotiation disabled\n");
-    if (*l2)
     {
         xfree (outputCharset);
         outputCharset = 0;
-        if (!strcmp(l2, "auto") && codeset)
+        if (!strcmp(l1, "auto") && codeset)
         {
             if (codeset)
             {
-                printf ("output charset: %s\n", codeset);
+                printf ("Display character set: %s\n", codeset);
                 outputCharset = xstrdup(codeset);
-
-
             }
             else
                 printf ("No codeset found on this system\n");
         }
-        else if (strcmp(l2, "-"))
-            outputCharset = xstrdup(l2);
-        else
-            printf ("Output charset conversion disabled\n");
+        else if (strcmp(l1, "-") && strcmp(l1, "none"))
+            outputCharset = xstrdup(l1);
     } 
+    return 1;
+}
+
+int cmd_negcharset(const char *arg)
+{
+    char l1[30];
 
+    *l1 = 0;
+    if (sscanf(arg, "%29s", l1) < 1)
+    {
+    	printf("Current negotiation character set is `%s'\n", 
+               negotiationCharset ? negotiationCharset: "none");
+    	return 1;
+    }
+    xfree (negotiationCharset);
+    negotiationCharset = NULL;
+    if (*l1 && strcmp(l1, "-") && strcmp(l1, "none"))
+    {
+        negotiationCharset = xstrdup(l1);
+        printf ("Character set negotiation : %s\n", negotiationCharset);
+    }
+    return 1;
+}
+
+int cmd_charset(const char* arg)
+{
+    char l1[30], l2[30], l3[30];
+
+    *l1 = *l2 = *l3 = 0;
+    if (sscanf(arg, "%29s %29s %29s", l1, l2, l3) < 1)
+    {
+	cmd_negcharset("");
+	cmd_displaycharset("");
+	cmd_marccharset("");
+    }
+    else
+    {
+	cmd_negcharset(l1);
+	if (*l2)
+	    cmd_displaycharset(l2);
+	if (*l3)
+	    cmd_marccharset(l3);
+    }
     return 1;
 }
 
@@ -2924,18 +3081,15 @@ int cmd_lang(const char* arg)
     xfree (yazLang);
     yazLang = NULL;
     if (*arg)
-    {
-        yazLang = (char *) xmalloc (strlen(arg)+1);
-        strcpy (yazLang, arg);
-    } 
+        yazLang = xstrdup(arg);
     return 1;
 }
 
-int cmd_source(const char* arg) 
+int cmd_source(const char* arg, int echo ) 
 {
     /* first should open the file and read one line at a time.. */
     FILE* includeFile;
-    char line[1024], *cp;
+    char line[102400], *cp;
 
     if(strlen(arg)<1) {
         fprintf(stderr,"Error in source command use a filename\n");
@@ -2958,7 +3112,10 @@ int cmd_source(const char* arg)
         
         if ((cp = strrchr (line, '\n')))
             *cp = '\0';
-        
+	
+	if( echo ) {
+	    printf( "processing line: %s\n",line );
+	};
         process_cmd_line(line);
     }
     
@@ -2969,6 +3126,19 @@ int cmd_source(const char* arg)
     return 1;
 }
 
+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)
 {
     if(strlen(args)) 
@@ -3119,7 +3289,7 @@ int cmd_register_oid(const char* args) {
     
     if (sscanf (args, "%100[^ ] %100[^ ] %100s",
                 oname_str,oclass_str, oid_str) < 1) {
-        printf("Error in regristrate command \n");
+        printf("Error in register command \n");
         return 0;
     }
     
@@ -3132,7 +3302,7 @@ int cmd_register_oid(const char* args) {
     }
     
     if(!(oid_classes[i].className)) {
-        printf("Unknonwn oid class %s\n",oclass_str);
+        printf("Unknown oid class %s\n",oclass_str);
         return 0;
     }
     
@@ -3140,7 +3310,7 @@ int cmd_register_oid(const char* args) {
     name = oid_str;
     val = 0;
     
-    while (isdigit (*name))
+    while (isdigit (*(unsigned char *) name))
     {
         val = val*10 + (*name - '0');
         name++;
@@ -3155,9 +3325,11 @@ int cmd_register_oid(const char* args) {
     oid[i] = val;
     oid[i+1] = -1;
     
-    new_oident=oid_addent (oid,PROTO_GENERAL,oidclass,oname_str,VAL_DYNAMIC);  
-    if(strcmp(new_oident->desc,oname_str)) {
-        fprintf(stderr,"oid is already named as %s, regristration faild\n",
+    new_oident = oid_addent (oid, PROTO_GENERAL, oidclass, oname_str,
+			     VAL_DYNAMIC);  
+    if(strcmp(new_oident->desc,oname_str))
+    {
+        fprintf(stderr,"oid is already named as %s, registration failed\n",
                 new_oident->desc);
     }
     return 1;  
@@ -3180,17 +3352,19 @@ void source_rcfile()
     struct stat statbuf;
     char buffer[1000];
     char* homedir=getenv("HOME");
-    
-    if(!homedir) return;
-    
-    sprintf(buffer,"%s/.yazclientrc",homedir);
-    
-    if(stat(buffer,&statbuf)==0) {
-        cmd_source(buffer);
-    }
+
+    if( homedir ) {
+	
+	sprintf(buffer,"%s/.yazclientrc",homedir);
+
+	if(stat(buffer,&statbuf)==0) {
+	    cmd_source(buffer, 0 );
+	}
+	
+    };
     
     if(stat(".yazclientrc",&statbuf)==0) {
-        cmd_source(".yazclientrc");
+        cmd_source(".yazclientrc", 0 );
     }
 }
 
@@ -3242,6 +3416,32 @@ struct timeval tv_start, tv_end;
 #endif
 
 #if HAVE_XML2
+static void handle_srw_record(Z_SRW_record *rec)
+{
+    if (rec->recordPosition)
+    {
+	printf ("pos=%d", *rec->recordPosition);
+	setno = *rec->recordPosition + 1;
+    }
+    if (rec->recordSchema)
+	printf (" schema=%s", rec->recordSchema);
+    printf ("\n");
+    if (rec->recordData_buf && rec->recordData_len)
+    {
+	fwrite(rec->recordData_buf, 1, rec->recordData_len, stdout);
+	if (marc_file)
+	    fwrite (rec->recordData_buf, 1, rec->recordData_len, marc_file);
+    }
+    else
+	printf ("No data!");
+    printf("\n");
+}
+
+static void handle_srw_explain_response(Z_SRW_explainResponse *res)
+{
+    handle_srw_record(&res->record);
+}
+
 static void handle_srw_response(Z_SRW_searchRetrieveResponse *res)
 {
     int i;
@@ -3250,33 +3450,20 @@ static void handle_srw_response(Z_SRW_searchRetrieveResponse *res)
     
     for (i = 0; i<res->num_diagnostics; i++)
     {
-        printf ("SRW diagnostic %d %s\n",
-                *res->diagnostics[i].code,
-                yaz_diag_srw_str(*res->diagnostics[i].code));
-
+	if (res->diagnostics[i].uri)
+	    printf ("SRW diagnostic %s\n",
+		    res->diagnostics[i].uri);
+	else
+	    printf ("SRW diagnostic missing or could not be decoded\n");
+	if (res->diagnostics[i].message)
+            printf ("Message: %s\n", res->diagnostics[i].message);
 	if (res->diagnostics[i].details)
             printf ("Details: %s\n", res->diagnostics[i].details);
     }
     if (res->numberOfRecords)
         printf ("Number of hits: %d\n", *res->numberOfRecords);
     for (i = 0; i<res->num_records; i++)
-    {
-        Z_SRW_record *rec = res->records + i;
-
-        if (rec->recordPosition)
-        {
-            printf ("pos=%d", *rec->recordPosition);
-            setno = *rec->recordPosition + 1;
-        }
-        if (rec->recordSchema)
-            printf (" schema=%s", rec->recordSchema);
-        printf ("\n");
-        if (rec->recordData_buf && rec->recordData_len)
-        {
-            fwrite(rec->recordData_buf, 1, rec->recordData_len, stdout);
-            printf ("\n");
-        }
-    }
+	handle_srw_record(res->records + i);
 }
 
 static void http_response(Z_HTTP_Response *hres)
@@ -3291,7 +3478,7 @@ static void http_response(Z_HTTP_Response *hres)
         Z_SOAP *soap_package = 0;
         ODR o = odr_createmem(ODR_DECODE);
         Z_SOAP_Handler soap_handlers[2] = {
-            {"http://www.loc.gov/zing/srw/v1.0/", 0,
+            {"http://www.loc.gov/zing/srw/", 0,
              (Z_SOAP_fun) yaz_srw_codec},
             {0, 0, 0}
         };
@@ -3304,10 +3491,12 @@ static void http_response(Z_HTTP_Response *hres)
             Z_SRW_PDU *sr = 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
                 ret = -1;
         }
-        else if (!ret && (soap_package->which == Z_SOAP_fault
+        else if (soap_package && (soap_package->which == Z_SOAP_fault
                           || soap_package->which == Z_SOAP_error))
         {
             printf ("HTTP Error Status=%d\n", hres->code);
@@ -3315,6 +3504,9 @@ static void http_response(Z_HTTP_Response *hres)
                     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
             ret = -1;
@@ -3332,17 +3524,20 @@ static void http_response(Z_HTTP_Response *hres)
         }
         close_session();
     }
-    if (!strcmp(hres->version, "1.0"))
-    {
-        /* HTTP 1.0: only if Keep-Alive we stay alive.. */
-        if (!connection_head || strcmp(connection_head, "Keep-Alive"))
-            close_session();
-    }
-    else 
+    else
     {
-        /* HTTP 1.1: only if no close we stay alive .. */
-        if (connection_head && !strcmp(connection_head, "close"))
-            close_session();
+	if (!strcmp(hres->version, "1.0"))
+	{
+	    /* HTTP 1.0: only if Keep-Alive we stay alive.. */
+	    if (!connection_head || strcmp(connection_head, "Keep-Alive"))
+		close_session();
+	}
+	else 
+	{
+	    /* HTTP 1.1: only if no close we stay alive .. */
+	    if (connection_head && !strcmp(connection_head, "close"))
+		close_session();
+	}
     }
 }
 #endif
@@ -3400,7 +3595,10 @@ void wait_and_handle_response()
             odr_dumpBER(f, netbuffer, res);
             fprintf(f, "---------\n");
             if (apdu_file)
+	    {
                 z_GDU(print, &gdu, 0, 0);
+		odr_reset(print);
+	    }
             if (conn && cs_more(conn))
                 continue;
 	    break;
@@ -3522,19 +3720,21 @@ int cmd_cclparse(const char* arg)
 
 int cmd_set_otherinfo(const char* args)
 {
-    char oid[101], otherinfoString[101];
+    char oidstr[101], otherinfoString[101];
     int otherinfoNo;
     int sscan_res;
     int oidval;
     
-    sscan_res = sscanf (args, "%d %100[^ ] %100s", &otherinfoNo, oid, otherinfoString);
-    if(sscan_res==1) {
+    sscan_res = sscanf (args, "%d %100[^ ] %100s", &otherinfoNo, oidstr, otherinfoString);
+    if (sscan_res==1) {
         /* reset this otherinfo */
         if(otherinfoNo>=maxOtherInfosSupported) {
-            printf("Error otherinfo index to large (%d>%d)\n",otherinfoNo,maxOtherInfosSupported);
+            printf("Error otherinfo index to large (%d>%d)\n",
+		   otherinfoNo,maxOtherInfosSupported);
         }
         extraOtherInfos[otherinfoNo].oidval = -1;
-        if(extraOtherInfos[otherinfoNo].value) free(extraOtherInfos[otherinfoNo].value);	 		
+        if (extraOtherInfos[otherinfoNo].value)
+	    free(extraOtherInfos[otherinfoNo].value);	 		
         return 0;
     }
     if (sscan_res<3) {
@@ -3542,14 +3742,14 @@ int cmd_set_otherinfo(const char* args)
         return 0;
     }
     
-    if(otherinfoNo>=maxOtherInfosSupported) {
-        printf("Error otherinfo index to large (%d>%d)\n",otherinfoNo,maxOtherInfosSupported);
+    if (otherinfoNo>=maxOtherInfosSupported) {
+        printf("Error otherinfo index to large (%d>%d)\n",
+	       otherinfoNo,maxOtherInfosSupported);
     }
     
-    
-    oidval = oid_getvalbyname (oid);
-    if(oidval == -1 ) {
-        printf("Error in set_otherinfo command unknown oid %s \n",oid);
+    oidval = oid_getvalbyname (oidstr);
+    if (oidval == -1 ) {
+        printf("Error in set_otherinfo command unknown oid %s \n",oidstr);
         return 0;
     }
     extraOtherInfos[otherinfoNo].oidval = oidval;
@@ -3559,6 +3759,20 @@ int cmd_set_otherinfo(const char* args)
     return 0;
 }
 
+int cmd_sleep(const char* args ) 
+{
+    int sec=atoi(args);
+    if( sec > 0 ) {
+#ifdef WIN32
+	Sleep(sec*1000);
+#else
+	sleep(sec);
+#endif
+	printf("Done sleeping %d seconds\n", sec);	
+    }
+    return 1;    
+}
+
 int cmd_list_otherinfo(const char* args)
 {
     int i;	   
@@ -3649,7 +3863,7 @@ int cmd_list_all(const char* args) {
     
     /* print present related options */
     printf("Format               : %s\n",yaz_z3950_oid_value_to_str(recordsyntax,CLASS_RECSYN));
-    printf("Schema               : %s\n",schema);
+    printf("Schema               : %s\n",record_schema ? record_schema : "not set");
     printf("Elements             : %s\n",elementSetNames?elementSetNames->u.generic:"");
     
     /* loging options */
@@ -3710,6 +3924,8 @@ static struct {
     {"base", cmd_base, "<base-name>",NULL,0,NULL},
     {"show", cmd_show, "<rec#>['+'<#recs>['+'<setname>]]",NULL,0,NULL},
     {"scan", cmd_scan, "<term>",NULL,0,NULL},
+    {"scanstep", cmd_scanstep, "<size>",NULL,0,NULL},
+    {"scanpos", cmd_scanpos, "<size>",NULL,0,NULL},
     {"sort", cmd_sort, "<sortkey> <flag> <sortkey> <flag> ...",NULL,0,NULL},
     {"sort+", cmd_sort_newset, "<sortkey> <flag> <sortkey> <flag> ...",NULL,0,NULL},
     {"authentication", cmd_authentication, "<acctstring>",NULL,0,NULL},
@@ -3719,6 +3935,7 @@ static struct {
     {"status", cmd_status, "",NULL,0,NULL},
     {"setnames", cmd_setnames, "",NULL,0,NULL},
     {"cancel", cmd_cancel, "",NULL,0,NULL},
+    {"cancel_find", cmd_cancel_find, "<query>",NULL,0,NULL},
     {"format", cmd_format, "<recordsyntax>",complete_format,0,NULL},
     {"schema", cmd_schema, "<schema>",complete_schema,0,NULL},
     {"elements", cmd_elements, "<elementSetName>",NULL,0,NULL},
@@ -3732,9 +3949,11 @@ static struct {
     {"packagename", cmd_packagename, "<packagename>",NULL,0,NULL},
     {"proxy", cmd_proxy, "[('tcp'|'ssl')]<host>[':'<port>]",NULL,0,NULL},
     {"charset", cmd_charset, "<nego_charset> <output_charset>",NULL,0,NULL},
+    {"negcharset", cmd_negcharset, "<nego_charset>",NULL,0,NULL},
+    {"displaycharset", cmd_displaycharset, "<output_charset>",NULL,0,NULL},
     {"marccharset", cmd_marccharset, "<charset_name>",NULL,0,NULL},
     {"lang", cmd_lang, "<language_code>",NULL,0,NULL},
-    {".", cmd_source, "<filename>",NULL,1,NULL},
+    {".", cmd_source_echo, "<filename>",NULL,1,NULL},
     {"!", cmd_subshell, "Subshell command",NULL,1,NULL},
     {"set_apdufile", cmd_set_apdufile, "<filename>",NULL,1,NULL},
     {"set_berfile", cmd_set_berfile, "<filename>",NULL,1,NULL},
@@ -3742,7 +3961,8 @@ static struct {
     {"set_cclfile", cmd_set_cclfile," <filename>",NULL,1,NULL},
     {"set_cqlfile", cmd_set_cqlfile," <filename>",NULL,1,NULL},
     {"set_auto_reconnect", cmd_set_auto_reconnect," on|off",complete_auto_reconnect,1,NULL},
-	{"set_otherinfo", cmd_set_otherinfo,"<otherinfoinddex> <oid> <string>",NULL,0,NULL},
+    {"set_otherinfo", cmd_set_otherinfo,"<otherinfoinddex> <oid> <string>",NULL,0,NULL},
+    {"sleep", cmd_sleep,"<seconds>",NULL,0,NULL},
     {"register_oid", cmd_register_oid,"<name> <class> <oid>",NULL,0,NULL},
     {"push_command", cmd_push_command,"<command>",command_generator,0,NULL},
     {"register_tab", cmd_register_tab,"<commandname> <tab>",command_generator,0,NULL},
@@ -3760,7 +3980,11 @@ static struct {
     {"adm-commit", cmd_adm_commit, "",NULL,0,NULL},
     {"adm-shutdown", cmd_adm_shutdown, "",NULL,0,NULL},
     {"adm-startup", cmd_adm_startup, "",NULL,0,NULL},
+    {"explain", cmd_explain, "", NULL, 0, NULL},
+    {"options", cmd_options, "", NULL, 0, NULL},
+    {"zversion", cmd_zversion, "", NULL, 0, NULL},
     {"help", cmd_help, "", NULL,0,NULL},
+    {"init", cmd_init, "", NULL,0,NULL},
     {0,0,0,0,0,0}
 };
 
@@ -3850,13 +4074,13 @@ int cmd_register_tab(const char* arg) {
 void process_cmd_line(char* line)
 {  
     int i,res;
-    char word[32], arg[1024];
+    char word[32], arg[10240];
     
 #if HAVE_GETTIMEOFDAY
     gettimeofday (&tv_start, 0);
 #endif
     
-    if ((res = sscanf(line, "%31s %1023[^;]", word, arg)) <= 0)
+    if ((res = sscanf(line, "%31s %10239[^;]", word, arg)) <= 0)
     {
         strcpy(word, last_cmd);
         *arg = '\0';
@@ -3871,7 +4095,7 @@ void process_cmd_line(char* line)
         char* lastnonspace=NULL;
         
         for(;*p; ++p) {
-            if(!isspace(*p)) {
+            if(!isspace(*(unsigned char *) p)) {
                 lastnonspace = p;
             }
         }
@@ -3941,9 +4165,9 @@ char ** readline_completer(char *text, int start, int end) {
         rl_attempted_completion_over = 1;
         return res;
     } else {
-        char arg[1024],word[32];
+        char arg[10240],word[32];
         int i=0 ,res;
-        if ((res = sscanf(rl_line_buffer, "%31s %1023[^;]", word, arg)) <= 0) {     
+        if ((res = sscanf(rl_line_buffer, "%31s %10239[^;]", word, arg)) <= 0) {     
             rl_attempted_completion_over = 1;
             return NULL;
         }
@@ -3989,9 +4213,9 @@ char ** readline_completer(char *text, int start, int end) {
 
 static void client(void)
 {
-    char line[1024];
+    char line[10240];
 
-    line[1023] = '\0';
+    line[10239] = '\0';
 
 #if HAVE_GETTIMEOFDAY
     gettimeofday (&tv_start, 0);
@@ -4010,7 +4234,7 @@ static void client(void)
             if (*line_in)
                 add_history(line_in);
 #endif
-            strncpy(line, line_in, 1023);
+            strncpy(line, line_in, 10239);
             free (line_in);
         }
 #endif 
@@ -4019,7 +4243,7 @@ static void client(void)
             char *end_p;
             printf (C_PROMPT);
             fflush(stdout);
-            if (!fgets(line, 1023, stdin))
+            if (!fgets(line, 10239, stdin))
                 break;
             if ((end_p = strchr (line, '\n')))
                 *end_p = '\0';
@@ -4058,6 +4282,15 @@ int main(int argc, char **argv)
 #endif
     if (codeset)
 	outputCharset = xstrdup(codeset);
+    
+    ODR_MASK_SET(&z3950_options, Z_Options_search);
+    ODR_MASK_SET(&z3950_options, Z_Options_present);
+    ODR_MASK_SET(&z3950_options, Z_Options_namedResultSets);
+    ODR_MASK_SET(&z3950_options, Z_Options_triggerResourceCtrl);
+    ODR_MASK_SET(&z3950_options, Z_Options_scan);
+    ODR_MASK_SET(&z3950_options, Z_Options_sort);
+    ODR_MASK_SET(&z3950_options, Z_Options_extendedServices);
+    ODR_MASK_SET(&z3950_options, Z_Options_delSet);
 
     while ((ret = options("k:c:q:a:b:m:v:p:u:t:Vxd:", argv, argc, &arg)) != -2)
     {