X-Git-Url: http://git.indexdata.com/?p=yaz-moved-to-github.git;a=blobdiff_plain;f=client%2Fclient.c;h=2d24363c988fb3f28ecbefc71c1fb9424e0b19a5;hp=0c67a8771cd97b6a929ab41175d701a9a8df8465;hb=a54c709b3e2feff5762bfa7dfa8ee653b429d369;hpb=27e67487d8100738feb98ae7315540846d6bfdf0 diff --git a/client/client.c b/client/client.c index 0c67a87..2d24363 100644 --- a/client/client.c +++ b/client/client.c @@ -1,20 +1,33 @@ -/* - * Copyright (c) 1995-2002, Index Data +/* + * Copyright (c) 1995-2003, Index Data * See the file LICENSE for details. * - * $Id: client.c,v 1.156 2002-06-02 21:34:45 adam Exp $ + * $Id: client.c,v 1.195 2003-05-20 20:33:29 adam Exp $ */ #include #include +#include +#if HAVE_LOCALE_H +#include +#endif + +#if HAVE_LANGINFO_H +#include +#endif + #include +#include + +#ifdef WIN32 +#include +#define S_ISREG(x) (x & _S_IFREG) +#define S_ISDIR(x) (x & _S_IFDIR) +#endif #include -#include -#ifdef USE_XTIMOSI -#include -#endif +#include #include #include @@ -26,11 +39,12 @@ #include #include - +#include #include #if HAVE_READLINE_READLINE_H #include +#include #endif #if HAVE_READLINE_HISTORY_H #include @@ -38,20 +52,24 @@ #include - #include "admin.h" #include "tabcomplete.h" #define C_PROMPT "Z> " +static char *codeset = 0; /* character set for output */ + static ODR out, in, print; /* encoding and decoding streams */ +static ODR srw_sr_odr_out = 0; +static Z_SRW_PDU *srw_sr = 0; static FILE *apdu_file = 0; +static FILE *ber_file = 0; static COMSTACK conn = 0; /* our z-association */ static Z_IdAuthentication *auth = 0; /* our current auth definition */ char *databaseNames[128]; int num_databaseNames = 0; static Z_External *record_last = 0; -static int setnumber = -1; /* current result set number */ +static int setnumber = -1; /* current result set number */ static int smallSetUpperBound = 0; static int largeSetLowerBound = 1; static int mediumSetPresentNumber = 0; @@ -59,27 +77,32 @@ 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 enum oid_value schema = VAL_NONE; +static char *schema = 0; static int sent_close = 0; -static NMEM session_mem = NULL; /* memory handle for init-response */ +static NMEM session_mem = NULL; /* memory handle for init-response */ static Z_InitResponse *session = 0; /* session parameters */ static char last_scan_line[512] = "0"; static char last_scan_query[512] = "0"; static char ccl_fields[512] = "default.bib"; -static char* esPackageName = 0; -static char* yazProxy = 0; +static char *esPackageName = 0; +static char *yazProxy = 0; static int kilobytes = 1024; -static char* yazCharset = 0; +static char *negotiationCharset = 0; +static char *outputCharset = 0; +static char *marcCharset = 0; static char* yazLang = 0; static char last_cmd[32] = "?"; -static FILE *marcdump = 0; +static FILE *marc_file = 0; static char *refid = NULL; +static char *last_open_command = NULL; +static int auto_reconnect = 0; typedef enum { QueryType_Prefix, QueryType_CCL, - QueryType_CCL2RPN + QueryType_CCL2RPN, + QueryType_CQL } QueryType; static QueryType queryType = QueryType_Prefix; @@ -96,28 +119,76 @@ int rl_attempted_completion_over = 0; /* set this one to 1, to avoid decode of unknown MARCs */ #define AVOID_MARC_DECODE 1 -/* nice helper macro as extensive tabbing gives spaces at the en of the args lines */ -#define REMOVE_TAILING_BLANKS(a) {\ - char* args_end=(a)+strlen(a)-1; \ - while(isspace(*args_end)) {*args_end=0;--args_end;}; \ - } - +#define maxOtherInfosSupported 10 +struct { + int oidval; + char* value; +} extraOtherInfos[maxOtherInfosSupported]; + void process_cmd_line(char* line); char ** readline_completer(char *text, int start, int end); char *command_generator(const char *text, int state); +char** curret_global_list=NULL; +int cmd_register_tab(const char* arg); +static void close_session (void); ODR getODROutputStream() { return out; } -void send_apdu(Z_APDU *a) +const char* query_type_as_string(QueryType 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)"; + case QueryType_CQL: return "CQL (CQL sent to server)"; + default: + return "unknown Query type internal yaz-client error"; + } +} + + +void do_hex_dump(char* buf,int len) +{ +#if 0 + int i,x; + for( i=0; i= 32) || strchr ("\n\r\t\f", buf[i])) - printf ("%c", buf[i]); - else - printf ("\\X%02X", buf[i]); + size_t i; + for (i = 0; i= 32) || strchr ("\n\r\t\f", buf[i])) + printf ("%c", buf[i]); + else + printf ("\\X%02X", buf[i]); } static void print_refid (Z_ReferenceId *id) @@ -201,37 +278,44 @@ static void send_initRequest(const char* type_and_host) yaz_oi_set_string_oidval(&req->otherInfo, out, VAL_PROXY, 1, type_and_host); - if (yazCharset || yazLang) { + if (negotiationCharset || yazLang) { Z_OtherInformation **p; Z_OtherInformationUnit *p0; yaz_oi_APDU(apdu, &p); - if (p0=yaz_oi_update(p, out, NULL, 0, 0)) { + 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**)&yazCharset, (yazCharset)?1:0, - (const char**)&yazLang, (yazLang)?1:0, 1); + yaz_set_proposal_charneg( + out, + (const char**)&negotiationCharset, + negotiationCharset ? 1 : 0, + (const char**)&yazLang, yazLang ? 1 : 0, 1); } } - send_apdu(apdu); - printf("Sent initrequest.\n"); + if (send_apdu(apdu)) + printf("Sent initrequest.\n"); } static int process_initResponse(Z_InitResponse *res) { + int ver = 0; /* save session parameters for later use */ session_mem = odr_extract_mem(in); session = res; + for (ver = 0; ver<5; ver++) + if (!ODR_MASK_GET(res->protocolVersion, ver)) + break; + if (!*res->result) - printf("Connection rejected by target.\n"); + printf("Connection rejected by v%d target.\n", ver); else - printf("Connection accepted by target.\n"); + printf("Connection accepted by v%d target.\n", ver); if (res->implementationId) printf("ID : %s\n", res->implementationId); if (res->implementationName) @@ -302,60 +386,84 @@ static int process_initResponse(Z_InitResponse *res) yaz_get_charneg_record(res->otherInfo); 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); - printf("Accepted records in ...: %d\n", selected ); + + 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 records in ...: %d\n", selected ); } } fflush (stdout); return 0; } -static int cmd_base(char *arg) +static int set_base(const char *arg) { int i; - char *cp; + const char *cp; - if (!*arg) - { - printf("Usage: base ...\n"); - return 0; - } for (i = 0; i ...\n"); + return 0; + } + return set_base(arg); +} + +void cmd_open_remember_last_open_command(const char* arg, char* new_open_command) +{ + if(last_open_command != arg) + { + if(last_open_command) xfree(last_open_command); + last_open_command = xstrdup(new_open_command); + } +} + +int session_connect(const char *arg) { void *add; - char type_and_host[101], base[101]; - CS_TYPE t; - + char type_and_host[101]; + const char *basep = 0; if (conn) { - printf("Already connected.\n"); - cs_close (conn); conn = NULL; if (session_mem) @@ -363,42 +471,92 @@ int cmd_open(char *arg) nmem_destroy (session_mem); session_mem = NULL; } - } - t = tcpip_type; - base[0] = '\0'; - if (sscanf (arg, "%100[^/]/%100s", type_and_host, base) < 1) - return 0; - - if(yazProxy) + } + cs_get_host_args(arg, &basep); + + strncpy(type_and_host, arg, sizeof(type_and_host)-1); + type_and_host[sizeof(type_and_host)-1] = '\0'; + + cmd_open_remember_last_open_command(arg,type_and_host); + + if (yazProxy) conn = cs_create_host(yazProxy, 1, &add); - else - conn = cs_create_host(type_and_host, 1, &add); - + else + conn = cs_create_host(arg, 1, &add); if (!conn) { printf ("Couldn't create comstack\n"); return 0; } +#if HAVE_XML2 +#else + if (conn->protocol == PROTO_HTTP) + { + printf ("SRW/HTTP not enabled in this YAZ\n"); + cs_close(conn); + conn = 0; + return 0; + } +#endif + protocol = conn->protocol; + if (conn->protocol == PROTO_HTTP) + set_base(""); + else + set_base("Default"); printf("Connecting..."); fflush(stdout); if (cs_connect(conn, add) < 0) { printf ("error = %s\n", cs_strerror(conn)); if (conn->cerrno == CSYSERR) - perror("system"); + { + char msg[256]; + yaz_strerror(msg, sizeof(msg)); + printf ("%s\n", msg); + } cs_close(conn); conn = 0; return 0; } - printf("Ok.\n"); - - send_initRequest(type_and_host); - if (*base) - cmd_base (base); - return 2; + printf("OK.\n"); + if (basep && *basep) + set_base (basep); + if (protocol == PROTO_Z3950) + { + send_initRequest(type_and_host); + return 2; + } + return 0; } -int cmd_authentication(char *arg) +int cmd_open(const char *arg) +{ + static char cur_host[200]; + if (arg) + { + strncpy (cur_host, arg, sizeof(cur_host)-1); + cur_host[sizeof(cur_host)-1] = 0; + } + return session_connect(cur_host); +} + +void try_reconnect() +{ + char* open_command; + + if(!( auto_reconnect && last_open_command) ) return ; + + open_command = (char *) xmalloc (strlen(last_open_command)+6); + strcpy (open_command, "open "); + + strcat (open_command, last_open_command); + + process_cmd_line(open_command); + + xfree(open_command); +} + +int cmd_authentication(const char *arg) { static Z_IdAuthentication au; static char user[40], group[40], pass[40]; @@ -423,6 +581,15 @@ int cmd_authentication(char *arg) au.which = Z_IdAuthentication_open; au.u.open = user; } + if (r == 2) + { + auth = &au; + au.which = Z_IdAuthentication_idPass; + au.u.idPass = &idPass; + idPass.groupId = NULL; + idPass.userId = user; + idPass.password = group; + } if (r == 3) { auth = &au; @@ -438,105 +605,6 @@ int cmd_authentication(char *arg) /* SEARCH SERVICE ------------------------------ */ static void display_record(Z_External *r); -static void display_variant(Z_Variant *v, int level) -{ - int i; - - for (i = 0; i < v->num_triples; i++) - { - printf("%*sclass=%d,type=%d", level * 4, "", *v->triples[i]->zclass, - *v->triples[i]->type); - if (v->triples[i]->which == Z_Triple_internationalString) - printf(",value=%s\n", v->triples[i]->value.internationalString); - else - printf("\n"); - } -} - -static void display_grs1(Z_GenericRecord *r, int level) -{ - int i; - - if (!r) - { - return; - } - for (i = 0; i < r->num_elements; i++) - { - Z_TaggedElement *t; - - printf("%*s", level * 4, ""); - t = r->elements[i]; - printf("("); - if (t->tagType) - printf("%d,", *t->tagType); - else - printf("?,"); - if (t->tagValue->which == Z_StringOrNumeric_numeric) - printf("%d) ", *t->tagValue->u.numeric); - else - printf("%s) ", t->tagValue->u.string); - if (t->content->which == Z_ElementData_subtree) - { - if (!t->content->u.subtree) - printf (" (no subtree)\n"); - else - { - printf("\n"); - display_grs1(t->content->u.subtree, level+1); - } - } - else if (t->content->which == Z_ElementData_string) - printf("%s\n", t->content->u.string); - else if (t->content->which == Z_ElementData_numeric) - printf("%d\n", *t->content->u.numeric); - else if (t->content->which == Z_ElementData_oid) - { - int *ip = t->content->u.oid; - oident *oent; - - if ((oent = oid_getentbyoid(t->content->u.oid))) - printf("OID: %s\n", oent->desc); - else - { - printf("{"); - while (ip && *ip >= 0) - printf(" %d", *(ip++)); - printf(" }\n"); - } - } - else if (t->content->which == Z_ElementData_noDataRequested) - printf("[No data requested]\n"); - else if (t->content->which == Z_ElementData_elementEmpty) - printf("[Element empty]\n"); - else if (t->content->which == Z_ElementData_elementNotThere) - printf("[Element not there]\n"); - else if (t->content->which == Z_ElementData_date) - printf("Date: %s\n", t->content->u.date); - else if (t->content->which == Z_ElementData_ext) - { - printf ("External\n"); - display_record (t->content->u.ext); - } - else - printf("? type = %d\n",t->content->which); - if (t->appliedVariant) - display_variant(t->appliedVariant, level+1); - if (t->metaData && t->metaData->supportedVariants) - { - int c; - - printf("%*s---- variant list\n", (level+1)*4, ""); - for (c = 0; c < t->metaData->num_supportedVariants; c++) - { - printf("%*svariant #%d\n", (level+1)*4, "", c); - display_variant(t->metaData->supportedVariants[c], level + 2); - } - } - } -} - - static void print_record(const unsigned char *buf, size_t len) { size_t i = len; @@ -581,27 +649,29 @@ static void display_record(Z_External *r) if (!(*type->fun)(in, (char **)&rr, 0, 0)) { odr_perror(in, "Decoding constructed record."); - fprintf(stderr, "[Near %d]\n", odr_offset(in)); - fprintf(stderr, "Packet dump:\n---------\n"); - odr_dumpBER(stderr, (char*)r->u.octet_aligned->buf, - r->u.octet_aligned->len); - fprintf(stderr, "---------\n"); - exit(1); + fprintf(stdout, "[Near %d]\n", odr_offset(in)); + fprintf(stdout, "Packet dump:\n---------\n"); + odr_dumpBER(stdout, (char*)r->u.octet_aligned->buf, + r->u.octet_aligned->len); + fprintf(stdout, "---------\n"); + + /* note just ignores the error ant print the bytes form the octet_aligned later */ + } else { + /* + * Note: we throw away the original, BER-encoded record here. + * Do something else with it if you want to keep it. + */ + r->u.sutrs = (Z_SUTRS *) rr; /* we don't actually check the type here. */ + r->which = type->what; } - /* - * Note: we throw away the original, BER-encoded record here. - * Do something else with it if you want to keep it. - */ - r->u.sutrs = (Z_SUTRS *) rr; /* we don't actually check the type here. */ - r->which = type->what; } } - if (ent && ent->oclass != CLASS_RECSYN) + 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 && 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 || @@ -629,13 +699,69 @@ static void display_record(Z_External *r) #endif ) { - if (marc_display_exl (octet_buf, NULL, 0 /* debug */, - r->u.octet_aligned->len) <= 0) + char *result; + int rlen; + yaz_iconv_t cd = 0; + yaz_marc_t mt = yaz_marc_create(); + + if (yaz_marc_decode_buf(mt, octet_buf,r->u.octet_aligned->len, + &result, &rlen)> 0) + { + char *from = 0; + if (marcCharset && strcmp(marcCharset, "auto")) + from = marcCharset; + else + { + if (ent->value == VAL_USMARC) + { + if (octet_buf[9] == 'a') + from = "UTF-8"; + else + from = "MARC8"; + } + else + from = "ISO-8859-1"; + } + if (outputCharset && from) + { + printf ("convert from %s to %s\n", from, + outputCharset); + cd = yaz_iconv_open(outputCharset, from); + } + if (!cd) + fwrite (result, 1, rlen, stdout); + else + { + char outbuf[12]; + size_t inbytesleft = rlen; + const char *inp = result; + + while (inbytesleft) + { + size_t outbytesleft = sizeof(outbuf); + char *outp = outbuf; + size_t r = yaz_iconv (cd, (char**) &inp, + &inbytesleft, + &outp, &outbytesleft); + if (r == (size_t) (-1)) + { + int e = yaz_iconv_error(cd); + if (e != YAZ_ICONV_E2BIG) + break; + } + fwrite (outbuf, outp - outbuf, 1, stdout); + } + } + } + else { printf ("bad MARC. Dumping as it is:\n"); print_record((const unsigned char*) octet_buf, - r->u.octet_aligned->len); - } + r->u.octet_aligned->len); + } + yaz_marc_destroy(mt); + if (cd) + yaz_iconv_close(cd); } else { @@ -643,8 +769,8 @@ static void display_record(Z_External *r) r->u.octet_aligned->len); } } - if (marcdump) - fwrite (octet_buf, 1, r->u.octet_aligned->len, marcdump); + if (marc_file) + fwrite (octet_buf, 1, r->u.octet_aligned->len, marc_file); } else if (ent && ent->value == VAL_SUTRS) { @@ -657,12 +783,16 @@ static void display_record(Z_External *r) } else if (ent && ent->value == VAL_GRS1) { + WRBUF w; if (r->which != Z_External_grs1) { printf("Expecting single GRS type for GRS.\n"); return; } - display_grs1(r->u.grs1, 0); + w = wrbuf_alloc(); + yaz_display_grs1(w, r->u.grs1, 0); + puts (wrbuf_buf(w)); + wrbuf_free(w, 1); } else { @@ -741,7 +871,7 @@ static void display_records(Z_Records *p) } } -static int send_deleteResultSetRequest(char *arg) +static int send_deleteResultSetRequest(const char *arg) { char names[8][32]; int i; @@ -778,7 +908,124 @@ static int send_deleteResultSetRequest(char *arg) return 2; } -static int send_searchRequest(char *arg) +#if HAVE_XML2 +static int send_srw(Z_SRW_PDU *sr) +{ + const char *charset = negotiationCharset; + const char *host_port = 0; + 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}, + {0, 0, 0} + }; + ODR o = odr_createmem(ODR_ENCODE); + int ret; + Z_SOAP *p = odr_malloc(o, sizeof(*p)); + Z_GDU *gdu; + + path = odr_malloc(out, strlen(databaseNames[0])+2); + *path = '/'; + strcpy(path+1, databaseNames[0]); + + gdu = z_get_HTTP_Request(out); + gdu->u.HTTP_Request->path = odr_strdup(out, path); + + if (host_port) + { + const char *cp0 = strstr(host_port, "://"); + const char *cp1 = 0; + if (cp0) + cp0 = cp0+3; + else + cp0 = host_port; + + cp1 = strchr(cp0, '/'); + if (!cp1) + cp1 = cp0+strlen(cp0); + + if (cp0 && cp1) + { + char *h = odr_malloc(out, cp1 - cp0 + 1); + memcpy (h, cp0, cp1 - cp0); + h[cp1-cp0] = '\0'; + z_HTTP_header_add(out, &gdu->u.HTTP_Request->headers, + "host", h); + } + } + + strcpy(ctype, "text/xml"); + if (charset && strlen(charset) < 20) + { + strcat(ctype, "; charset="); + strcat(ctype, charset); + } + z_HTTP_header_add(out, &gdu->u.HTTP_Request->headers, + "Content-Type", ctype); + z_HTTP_header_add(out, &gdu->u.HTTP_Request->headers, + "SOAPAction", "\"\""); + p->which = Z_SOAP_generic; + p->u.generic = odr_malloc(o, sizeof(*p->u.generic)); + p->u.generic->no = 0; + p->u.generic->ns = 0; + p->u.generic->p = sr; + p->ns = "http://schemas.xmlsoap.org/soap/envelope/"; + + ret = z_soap_codec_enc(o, &p, + &gdu->u.HTTP_Request->content_buf, + &gdu->u.HTTP_Request->content_len, h, + charset); + + if (z_GDU(out, &gdu, 0, 0)) + { + /* encode OK */ + char *buf_out; + int len_out; + int r; + buf_out = odr_getbuf(out, &len_out, 0); + + /* we don't odr_reset(out), since we may need the buffer again */ + + r = cs_put(conn, buf_out, len_out); + + odr_destroy(o); + + if (r >= 0) + return 2; + } + return 0; +} +#endif + +#if HAVE_XML2 +static int send_SRW_searchRequest(const char *arg) +{ + Z_SRW_PDU *sr = 0; + + if (!srw_sr) + { + assert(srw_sr_odr_out == 0); + srw_sr_odr_out = odr_createmem(ODR_ENCODE); + } + odr_reset(srw_sr_odr_out); + + 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); + + 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; + return send_srw(sr); +} +#endif + +static int send_searchRequest(const char *arg) { Z_APDU *apdu = zget_APDU(out, Z_APDU_searchRequest); Z_SearchRequest *req = apdu->u.searchRequest; @@ -789,6 +1036,8 @@ static int send_searchRequest(char *arg) char setstring[100]; Z_RPNQuery *RPNquery; Odr_oct ccl_query; + YAZ_PQF_Parser pqf_parser; + Z_External *ext; if (queryType == QueryType_CCL2RPN) { @@ -842,12 +1091,20 @@ static int send_searchRequest(char *arg) { case QueryType_Prefix: query.which = Z_Query_type_1; - RPNquery = p_query_rpn (out, protocol, arg); + pqf_parser = yaz_pqf_create (); + RPNquery = yaz_pqf_parse (pqf_parser, out, arg); if (!RPNquery) { - printf("Prefix query error\n"); + const char *pqf_msg; + size_t off; + int code = yaz_pqf_error (pqf_parser, &pqf_msg, &off); + printf("%*s^\n", off+4, ""); + printf("Prefix query error: %s (code %d)\n", pqf_msg, code); + + yaz_pqf_destroy (pqf_parser); return 0; } + yaz_pqf_destroy (pqf_parser); query.u.type_1 = RPNquery; break; case QueryType_CCL: @@ -867,13 +1124,23 @@ static int send_searchRequest(char *arg) query.u.type_1 = RPNquery; ccl_rpn_delete (rpn); break; + case QueryType_CQL: + query.which = Z_Query_type_104; + ext = (Z_External *) odr_malloc(out, sizeof(*ext)); + ext->direct_reference = odr_getoidbystr(out, "1.2.840.10003.16.2"); + ext->indirect_reference = 0; + ext->descriptor = 0; + ext->which = Z_External_CQL; + ext->u.cql = odr_strdup(out, arg); + query.u.type_104 = ext; + break; default: printf ("Unsupported query type\n"); return 0; } - send_apdu(apdu); + if (send_apdu(apdu)) + printf("Sent searchRequest.\n"); setno = 1; - printf("Sent searchRequest.\n"); return 2; } @@ -887,11 +1154,23 @@ static void display_queryExpression (Z_QueryExpression *qe) if (qe->u.term->queryTerm) { Z_Term *term = qe->u.term->queryTerm; - if (term->which == Z_Term_general) + switch (term->which) + { + case Z_Term_general: printf (" %.*s", term->u.general->len, term->u.general->buf); + break; + case Z_Term_characterString: + printf (" %s", term->u.characterString); + break; + case Z_Term_numeric: + printf (" %d", *term->u.numeric); + break; + case Z_Term_null: + printf (" null"); + break; + } } } - } /* see if we can find USR:SearchResult-1 */ @@ -1026,7 +1305,9 @@ static void print_string_or_numeric(int iLevel, const char *pTag, Z_StringOrNume } } -static void print_universe_report_duplicate(int iLevel, Z_UniverseReportDuplicate *pUniverseReportDuplicate) +static void print_universe_report_duplicate( + int iLevel, + Z_UniverseReportDuplicate *pUniverseReportDuplicate) { if (pUniverseReportDuplicate != NULL) { @@ -1038,9 +1319,9 @@ static void print_universe_report_duplicate(int iLevel, Z_UniverseReportDuplicat } } -static void -print_universe_report_hits(int iLevel, - Z_UniverseReportHits *pUniverseReportHits) +static void print_universe_report_hits( + int iLevel, + Z_UniverseReportHits *pUniverseReportHits) { if (pUniverseReportHits != NULL) { @@ -1064,11 +1345,13 @@ static void print_universe_report(int iLevel, Z_UniverseReport *pUniverseReport) switch (pUniverseReport->which) { case Z_UniverseReport_databaseHits: - print_universe_report_hits(iLevel, pUniverseReport->u.databaseHits); + print_universe_report_hits(iLevel, + pUniverseReport->u.databaseHits); break; case Z_UniverseReport_duplicate: - print_universe_report_duplicate(iLevel, pUniverseReport->u.duplicate); + print_universe_report_duplicate(iLevel, + pUniverseReport->u.duplicate); break; default: @@ -1236,7 +1519,8 @@ static Z_External *create_external_itemRequest() r->u.single_ASN1_type->size = item_request_size; memcpy (r->u.single_ASN1_type->buf, item_request_buf, item_request_size); - printf ("len = %d\n", item_request_size); + + do_hex_dump(item_request_buf,item_request_size); } return r; } @@ -1292,7 +1576,10 @@ static Z_External *create_external_ILL_APDU(int which) 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); +/* printf ("len = %d\n", ill_request_size); */ +/* do_hex_dump(ill_request_buf,ill_request_size); */ +/* printf("--- end of extenal\n"); */ + } return r; } @@ -1341,7 +1628,6 @@ static Z_External *create_ItemOrderExternal(const char *type, int itemno) (int *) odr_malloc(out, sizeof(int)); *r->u.itemOrder->u.esRequest->notToKeep->resultSetItem->item = itemno; -#if YAZ_MODULE_ill if (!strcmp (type, "item") || !strcmp(type, "2")) { printf ("using item-request\n"); @@ -1368,9 +1654,6 @@ static Z_External *create_ItemOrderExternal(const char *type, int itemno) else r->u.itemOrder->u.esRequest->notToKeep->itemRequest = 0; -#else - r->u.itemOrder->u.esRequest->notToKeep->itemRequest = 0; -#endif return r; } @@ -1392,7 +1675,17 @@ static int send_itemorder(const char *type, int itemno) return 0; } -static int cmd_update(char *arg) +static int only_z3950() +{ + if (protocol == PROTO_HTTP) + { + printf ("Not supported by SRW\n"); + return 1; + } + return 0; +} + +static int cmd_update(const char *arg) { Z_APDU *apdu = zget_APDU(out, Z_APDU_extendedServicesRequest ); Z_ExtendedServicesRequest *req = apdu->u.extendedServicesRequest; @@ -1401,11 +1694,66 @@ static int cmd_update(char *arg) Z_IUOriginPartToKeep *toKeep; Z_IUSuppliedRecords *notToKeep; oident update_oid; - printf ("Update request\n"); - fflush(stdout); - - if (!record_last) + char action[20], recid[20], fname[80]; + int action_no; + Z_External *record_this = 0; + + if (only_z3950()) + return 0; + *action = 0; + *recid = 0; + *fname = 0; + sscanf (arg, "%19s %19s %79s", action, recid, fname); + + if (!strcmp (action, "insert")) + action_no = Z_IUOriginPartToKeep_recordInsert; + else if (!strcmp (action, "replace")) + action_no = Z_IUOriginPartToKeep_recordReplace; + else if (!strcmp (action, "delete")) + action_no = Z_IUOriginPartToKeep_recordDelete; + else if (!strcmp (action, "update")) + action_no = Z_IUOriginPartToKeep_specialUpdate; + else + { + printf ("Bad action: %s\n", action); + printf ("Possible values: insert, replace, delete, update\n"); return 0; + } + + if (*fname) + { + FILE *inf; + struct stat status; + stat (fname, &status); + if (S_ISREG(status.st_mode) && (inf = fopen(fname, "r"))) + { + size_t len = status.st_size; + char *buf = (char *) xmalloc (len); + + fread (buf, 1, len, inf); + + fclose (inf); + + record_this = z_ext_record (out, VAL_TEXT_XML, buf, len); + + xfree (buf); + } + else + { + printf ("File %s doesn't exist\n", fname); + return 0; + } + } + else + { + if (!record_last) + { + printf ("No last record (update ignored)\n"); + return 0; + } + record_this = record_last; + } + update_oid.proto = PROTO_Z3950; update_oid.oclass = CLASS_EXTSERV; update_oid.value = VAL_DBUPDATE; @@ -1432,7 +1780,7 @@ static int cmd_update(char *arg) toKeep->elementSetName = 0; toKeep->actionQualifier = 0; toKeep->action = (int *) odr_malloc(out, sizeof(*toKeep->action)); - *toKeep->action = Z_IUOriginPartToKeep_recordInsert; + *toKeep->action = action_no; notToKeep = r->u.update->u.esRequest->notToKeep = (Z_IUSuppliedRecords *) odr_malloc(out, sizeof(*r->u.update->u.esRequest->notToKeep)); @@ -1441,21 +1789,33 @@ static int cmd_update(char *arg) odr_malloc(out, sizeof(*notToKeep->elements)); notToKeep->elements[0] = (Z_IUSuppliedRecords_elem *) odr_malloc(out, sizeof(**notToKeep->elements)); - notToKeep->elements[0]->u.number = 0; + 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]->supplementalId = 0; notToKeep->elements[0]->correlationInfo = 0; - notToKeep->elements[0]->record = record_last; + notToKeep->elements[0]->record = record_this; send_apdu(apdu); return 2; } -static int cmd_itemorder(char *arg) +static int cmd_itemorder(const char *arg) { char type[12]; int itemno; - + + if (only_z3950()) + return 0; if (sscanf (arg, "%10s %d", type, &itemno) != 2) return 0; @@ -1465,57 +1825,81 @@ static int cmd_itemorder(char *arg) return 2; } -static int cmd_find(char *arg) +static int cmd_find(const char *arg) { if (!*arg) { printf("Find what?\n"); return 0; } - if (!conn) + if (protocol == PROTO_HTTP) { - printf("Not connected yet\n"); - return 0; - } - if (!send_searchRequest(arg)) +#if HAVE_XML2 + if (!conn) + cmd_open(0); + if (!send_SRW_searchRequest(arg)) + return 0; +#else return 0; +#endif + } + else + { + if (!conn) + { + try_reconnect(); + + if (!conn) { + printf("Not connected yet\n"); + return 0; + } + } + if (!send_searchRequest(arg)) + return 0; + } return 2; } -static int cmd_delete(char *arg) +static int cmd_delete(const char *arg) { if (!conn) { printf("Not connected yet\n"); return 0; } + if (only_z3950()) + return 0; if (!send_deleteResultSetRequest(arg)) return 0; return 2; } -static int cmd_ssub(char *arg) +static int cmd_ssub(const char *arg) { if (!(smallSetUpperBound = atoi(arg))) return 0; return 1; } -static int cmd_lslb(char *arg) +static int cmd_lslb(const char *arg) { + if (only_z3950()) + return 0; if (!(largeSetLowerBound = atoi(arg))) return 0; return 1; } -static int cmd_mspn(char *arg) +static int cmd_mspn(const char *arg) { + if (only_z3950()) + return 0; if (!(mediumSetPresentNumber = atoi(arg))) return 0; return 1; } -static int cmd_status(char *arg) +static int cmd_status(const char *arg) { printf("smallSetUpperBound: %d\n", smallSetUpperBound); printf("largeSetLowerBound: %d\n", largeSetLowerBound); @@ -1523,7 +1907,7 @@ static int cmd_status(char *arg) return 1; } -static int cmd_setnames(char *arg) +static int cmd_setnames(const char *arg) { if (*arg == '1') /* enable ? */ setnumber = 0; @@ -1543,35 +1927,46 @@ static int cmd_setnames(char *arg) /* PRESENT SERVICE ----------------------------- */ -static int send_presentRequest(char *arg) +static void parse_show_args(const char *arg_c, char *setstring, + int *start, int *number) { - 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 arg[40]; char *p; - char setstring[100]; - req->referenceId = set_refid (out); + strncpy(arg, arg_c, sizeof(arg)-1); + arg[sizeof(arg)-1] = '\0'; + if ((p = strchr(arg, '+'))) { - nos = atoi(p + 1); - *p = 0; + *number = atoi(p + 1); + *p = '\0'; } if (*arg) - setno = atoi(arg); + *start = atoi(arg); if (p && (p=strchr(p+1, '+'))) - { strcpy (setstring, p+1); - req->resultSetId = setstring; - } else if (setnumber >= 0) - { sprintf(setstring, "%d", setnumber); + else + *setstring = '\0'; +} + +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); + + parse_show_args(arg, setstring, &setno, &nos); + if (*setstring) req->resultSetId = setstring; - } + req->resultSetStartPoint = &setno; req->numberOfRecordsRequested = &nos; prefsyn.proto = protocol; @@ -1580,13 +1975,13 @@ static int send_presentRequest(char *arg) req->preferredRecordSyntax = odr_oiddup (out, oid_ent_to_oid(&prefsyn, oid)); - if (schema != VAL_NONE) + if (schema) { oident prefschema; prefschema.proto = protocol; prefschema.oclass = CLASS_SCHEMA; - prefschema.value = schema; + prefschema.value = oid_getvalbyname(schema); req->recordComposition = &compo; compo.which = Z_RecordComp_complex; @@ -1598,13 +1993,14 @@ static int send_presentRequest(char *arg) compo.u.complex->generic = (Z_Specification *) odr_malloc(out, sizeof(*compo.u.complex->generic)); - compo.u.complex->generic->schema = (Odr_oid *) + 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)); - if (!compo.u.complex->generic->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 = (Odr_oid *) + compo.u.complex->generic->schema.oid = (Odr_oid *) odr_oiddup(out, oid_ent_to_oid(&prefschema, oid)); } if (!elementSetNames) @@ -1633,10 +2029,29 @@ static int send_presentRequest(char *arg) printf("Sent presentRequest (%d+%d).\n", setno, nos); return 2; } - + +#if HAVE_XML2 +static int send_SRW_presentRequest(const char *arg) +{ + char setstring[100]; + int nos = 1; + Z_SRW_PDU *sr = srw_sr; + + if (!sr) + return 0; + 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; + return send_srw(sr); +} +#endif + static void close_session (void) { - cs_close (conn); + if (conn) + cs_close (conn); conn = 0; if (session_mem) { @@ -1644,6 +2059,9 @@ static void close_session (void) session_mem = NULL; } sent_close = 0; + odr_reset(out); + odr_reset(in); + odr_reset(print); } void process_close(Z_Close *req) @@ -1678,19 +2096,33 @@ void process_close(Z_Close *req) } } -static int cmd_show(char *arg) +static int cmd_show(const char *arg) { - if (!conn) + if (protocol == PROTO_HTTP) { - printf("Not connected yet\n"); +#if HAVE_XML2 + if (!conn) + cmd_open(0); + if (!send_SRW_presentRequest(arg)) + return 0; +#else return 0; +#endif + } + else + { + if (!conn) + { + printf("Not connected yet\n"); + return 0; + } + if (!send_presentRequest(arg)) + return 0; } - if (!send_presentRequest(arg)) - return 0; return 2; } -int cmd_quit(char *arg) +int cmd_quit(const char *arg) { printf("See you later, alligator.\n"); xmalloc_trav (""); @@ -1698,7 +2130,7 @@ int cmd_quit(char *arg) return 0; } -int cmd_cancel(char *arg) +int cmd_cancel(const char *arg) { Z_APDU *apdu = zget_APDU(out, Z_APDU_triggerResourceControlRequest); Z_TriggerResourceControlRequest *req = @@ -1710,6 +2142,8 @@ int cmd_cancel(char *arg) printf("Session not initialized yet\n"); return 0; } + if (only_z3950()) + return 0; if (!ODR_MASK_GET(session->options, Z_Options_triggerResourceCtrl)) { printf("Target doesn't support cancel (trigger resource ctrl)\n"); @@ -1727,10 +2161,10 @@ 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 use_rpn = 1; -#if YAZ_MODULE_ccl int oid[OID_SIZE]; + if (only_z3950()) + return 0; if (queryType == QueryType_CCL2RPN) { oident bib1; @@ -1743,7 +2177,6 @@ int send_scanrequest(const char *query, int pp, int num, const char *term) printf("CCL ERROR: %s\n", ccl_err_msg(error)); return -1; } - use_rpn = 0; bib1.proto = PROTO_Z3950; bib1.oclass = CLASS_ATTSET; bib1.value = VAL_BIB1; @@ -1755,12 +2188,22 @@ int send_scanrequest(const char *query, int pp, int num, const char *term) } ccl_rpn_delete (rpn); } -#endif - if (use_rpn && !(req->termListAndStartPoint = - p_query_scan(out, protocol, &req->attributeSet, query))) + else { - printf("Prefix query error\n"); - return -1; + YAZ_PQF_Parser pqf_parser = yaz_pqf_create (); + + if (!(req->termListAndStartPoint = + yaz_pqf_scan(pqf_parser, out, &req->attributeSet, query))) + { + const char *pqf_msg; + size_t off; + int code = yaz_pqf_error (pqf_parser, &pqf_msg, &off); + printf("%*s^\n", off+7, ""); + printf("Prefix query error: %s (code %d)\n", pqf_msg, code); + yaz_pqf_destroy (pqf_parser); + return -1; + } + yaz_pqf_destroy (pqf_parser); } if (term && *term) { @@ -1784,7 +2227,7 @@ int send_scanrequest(const char *query, int pp, int num, const char *term) return 2; } -int send_sortrequest(char *arg, int newset) +int send_sortrequest(const char *arg, int newset) { Z_APDU *apdu = zget_APDU(out, Z_APDU_sortRequest); Z_SortRequest *req = apdu->u.sortRequest; @@ -1792,6 +2235,8 @@ int send_sortrequest(char *arg, int newset) odr_malloc (out, sizeof(*sksl)); char setstring[32]; + if (only_z3950()) + return 0; if (setnumber >= 0) sprintf (setstring, "%d", setnumber); else @@ -1905,13 +2350,15 @@ void process_deleteResultSetResponse (Z_DeleteResultSetResponse *res) } } -int cmd_sort_generic(char *arg, int newset) +int cmd_sort_generic(const char *arg, int newset) { if (!conn) { printf("Session not initialized yet\n"); return 0; } + if (only_z3950()) + return 0; if (!ODR_MASK_GET(session->options, Z_Options_sort)) { printf("Target doesn't support sort\n"); @@ -1926,22 +2373,28 @@ int cmd_sort_generic(char *arg, int newset) return 0; } -int cmd_sort(char *arg) +int cmd_sort(const char *arg) { return cmd_sort_generic (arg, 0); } -int cmd_sort_newset (char *arg) +int cmd_sort_newset (const char *arg) { return cmd_sort_generic (arg, 1); } -int cmd_scan(char *arg) +int cmd_scan(const char *arg) { + if (only_z3950()) + return 0; if (!conn) { - printf("Session not initialized yet\n"); - return 0; + try_reconnect(); + + if (!conn) { + printf("Session not initialized yet\n"); + return 0; + } } if (!ODR_MASK_GET(session->options, Z_Options_scan)) { @@ -1962,39 +2415,34 @@ int cmd_scan(char *arg) return 2; } -int cmd_schema(char *arg) +int cmd_schema(const char *arg) { - if (!arg || !*arg) - { - schema = VAL_NONE; - return 1; - } - schema = oid_getvalbyname (arg); - if (schema == VAL_NONE) - { - printf ("unknown schema\n"); - return 0; - } + xfree(schema); + schema = 0; + if (arg && *arg) + schema = xstrdup(arg); return 1; } -int cmd_format(char *arg) +int cmd_format(const char *arg) { + oid_value nsyntax; if (!arg || !*arg) { printf("Usage: format \n"); return 0; } - recordsyntax = oid_getvalbyname (arg); - if (recordsyntax == VAL_NONE) + nsyntax = oid_getvalbyname (arg); + if (strcmp(arg, "none") && nsyntax == VAL_NONE) { printf ("unknown record syntax\n"); return 0; } + recordsyntax = nsyntax; return 1; } -int cmd_elements(char *arg) +int cmd_elements(const char *arg) { static Z_ElementSetNames esn; static char what[100]; @@ -2011,7 +2459,7 @@ int cmd_elements(char *arg) return 1; } -int cmd_attributeset(char *arg) +int cmd_attributeset(const char *arg) { char what[100]; @@ -2029,30 +2477,29 @@ int cmd_attributeset(char *arg) return 1; } -int cmd_querytype (char *arg) +int cmd_querytype (const char *arg) { if (!strcmp (arg, "ccl")) queryType = QueryType_CCL; else if (!strcmp (arg, "prefix") || !strcmp(arg, "rpn")) queryType = QueryType_Prefix; -#if YAZ_MODULE_ccl else if (!strcmp (arg, "ccl2rpn") || !strcmp (arg, "cclrpn")) queryType = QueryType_CCL2RPN; -#endif + else if (!strcmp(arg, "cql")) + queryType = QueryType_CQL; else { printf ("Querytype must be one of:\n"); printf (" prefix - Prefix query\n"); printf (" ccl - CCL query\n"); -#if YAZ_MODULE_ccl printf (" ccl2rpn - CCL query converted to RPN\n"); -#endif + printf (" cql - CQL\n"); return 0; } return 1; } -int cmd_refid (char *arg) +int cmd_refid (const char *arg) { xfree (refid); refid = NULL; @@ -2064,12 +2511,14 @@ int cmd_refid (char *arg) return 1; } -int cmd_close(char *arg) +int cmd_close(const char *arg) { Z_APDU *apdu; Z_Close *req; if (!conn) return 0; + if (only_z3950()) + return 0; apdu = zget_APDU(out, Z_APDU_close); req = apdu->u.close; @@ -2080,51 +2529,95 @@ int cmd_close(char *arg) return 2; } -int cmd_packagename(char* arg) +int cmd_packagename(const char* arg) { xfree (esPackageName); esPackageName = NULL; if (*arg) - { - esPackageName = (char *) xmalloc (strlen(arg)+1); - strcpy (esPackageName, arg); - } + esPackageName = xstrdup(arg); return 1; } -int cmd_proxy(char* arg) +int cmd_proxy(const char* arg) { - if (*arg == '\0') { - printf("Current proxy is `%s'\n", (yazCharset)?yazProxy:NULL); - return 1; - } xfree (yazProxy); yazProxy = NULL; if (*arg) - { - yazProxy = (char *) xmalloc (strlen(arg)+1); - strcpy (yazProxy, arg); - } + yazProxy = xstrdup (arg); return 1; } -int cmd_charset(char* arg) +int cmd_marccharset(const char *arg) { - if (*arg == '\0') { - printf("Current character set is `%s'\n", (yazCharset)?yazCharset:NULL); + char l1[30]; + + *l1 = 0; + if (sscanf(arg, "%29s", l1) < 1) + return 1; + xfree (marcCharset); + marcCharset = 0; + if (strcmp(l1, "-")) + marcCharset = xstrdup(l1); + return 1; +} + +int cmd_charset(const char* arg) +{ + char l1[30], l2[30]; + + *l1 = *l2 = 0; + if (sscanf(arg, "%29s %29s", l1, l2) < 1) + { + printf("Current negotiation character set is `%s'\n", + negotiationCharset ? negotiationCharset: "none"); + printf("Current output character set is `%s'\n", + outputCharset ? outputCharset: "none"); return 1; } - xfree (yazCharset); - yazCharset = NULL; - if (*arg) + 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) { - yazCharset = (char *) xmalloc (strlen(arg)+1); - strcpy (yazCharset, arg); + xfree (outputCharset); + outputCharset = 0; + if (!strcmp(l2, "auto") && codeset) + { + if (codeset) + { + printf ("output charset: %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"); } + if (outputCharset && negotiationCharset) + { + odr_set_charset (out, negotiationCharset, outputCharset); + odr_set_charset (in, outputCharset, negotiationCharset); + } + else + { + odr_set_charset (out, 0, 0); + odr_set_charset (in, 0, 0); + } return 1; } -int cmd_lang(char* arg) +int cmd_lang(const char* arg) { if (*arg == '\0') { printf("Current language is `%s'\n", (yazLang)?yazLang:NULL); @@ -2140,21 +2633,12 @@ int cmd_lang(char* arg) return 1; } -int cmd_source(char* arg) +int cmd_source(const char* arg) { /* first should open the file and read one line at a time.. */ FILE* includeFile; char line[1024], *cp; - { - char* args_end=(arg)+strlen(arg)-1; - while(isspace(*args_end)) - {*args_end=0; - --args_end;}; - } - - REMOVE_TAILING_BLANKS(arg); - if(strlen(arg)<1) { fprintf(stderr,"Error in source command use a filename\n"); return -1; @@ -2187,7 +2671,7 @@ int cmd_source(char* arg) return 1; } -int cmd_subshell(char* args) +int cmd_subshell(const char* args) { if(strlen(args)) system(args); @@ -2198,81 +2682,100 @@ int cmd_subshell(char* args) return 1; } -int cmd_set_apdufile(char* arg) +int cmd_set_berfile(const char *arg) { - REMOVE_TAILING_BLANKS(arg); - - if(apdu_file && apdu_file != stderr) { /* don't close stdout*/ - perror("unable to close apdu log file"); - } - apdu_file=NULL; - - if(strlen(arg)<1) { - return 1; - } - - if(!strcmp(arg,"-")) - apdu_file=stderr; - else - apdu_file=fopen(arg, "a"); - - if(!apdu_file) { - perror("unable to open apdu log file no apdu log loaded"); - } else { - odr_setprint(print, apdu_file); + if (ber_file && ber_file != stdout && ber_file != stderr) + fclose(ber_file); + if (!strcmp(arg, "")) + ber_file = 0; + else if (!strcmp(arg, "-")) + ber_file = stdout; + else + ber_file = fopen(arg, "a"); + return 1; +} + +int cmd_set_apdufile(const char *arg) +{ + if(apdu_file && apdu_file != stderr && apdu_file != stderr) + fclose(apdu_file); + if (!strcmp(arg, "")) + apdu_file = 0; + else if (!strcmp(arg, "-")) + apdu_file = stderr; + else + { + apdu_file = fopen(arg, "a"); + if (!apdu_file) + perror("unable to open apdu log file"); } - + if (apdu_file) + odr_setprint(print, apdu_file); return 1; } -int cmd_set_cclfields(char* arg) +int cmd_set_cclfile(const char* arg) { -#if YAZ_MODULE_ccl FILE *inf; - REMOVE_TAILING_BLANKS(arg); - bibset = ccl_qual_mk (); inf = fopen (arg, "r"); - if (inf) + if (!inf) + perror("unable to open CCL file"); + else { ccl_qual_file (bibset, inf); fclose (inf); } -#else - fprintf(stderr,"Not compiled with the yaz ccl module\n"); -#endif - - return 1; + strcpy(ccl_fields,arg); + return 0; } -int cmd_set_marcdump(char* arg) -{ - if(marcdump && marcdump != stderr) { /* don't close stdout*/ - perror("unable to close apdu log file"); +int cmd_set_auto_reconnect(const char* arg) +{ + if(strlen(arg)==0) { + auto_reconnect = ! auto_reconnect; + } else if(strcmp(arg,"on")==0) { + auto_reconnect = 1; + } else if(strcmp(arg,"off")==0) { + auto_reconnect = 0; + } else { + printf("Error use on or off\n"); + return 1; } - marcdump=NULL; - if(strlen(arg)<1) { - return 1; + if (auto_reconnect) + printf("Set auto reconnect enabled.\n"); + else + printf("Set auto reconnect disabled.\n"); + + return 0; +} + +int cmd_set_marcdump(const char* arg) +{ + if(marc_file && marc_file != stderr) { /* don't close stdout*/ + fclose(marc_file); } - - if(!strcmp(arg,"-")) - marcdump=stderr; - else - marcdump=fopen(arg, "a"); - - if(!marcdump) { - perror("unable to open apdu marcdump file no marcdump done\n"); + + if (!strcmp(arg, "")) + marc_file = 0; + else if (!strcmp(arg, "-")) + marc_file = stderr; + else + { + marc_file = fopen(arg, "a"); + if (!marc_file) + perror("unable to open marc log file"); } - return 1; } -int cmd_set_proxy(char* arg) { +int cmd_set_proxy(const char* arg) +{ if(yazProxy) free(yazProxy); yazProxy=NULL; - + if(strlen(arg) > 1) { yazProxy=strdup(arg); } @@ -2281,8 +2784,8 @@ int cmd_set_proxy(char* arg) { /* this command takes 3 arge {name class oid} - */ -int cmd_register_oid(char* args) { +*/ +int cmd_register_oid(const char* args) { static struct { char* className; oid_class oclass; @@ -2302,7 +2805,7 @@ int cmd_register_oid(char* args) { {"schema",CLASS_SCHEMA}, {"tagset",CLASS_TAGSET}, {"general",CLASS_GENERAL}, - {0,0} + {0,(enum oid_class) 0} }; char oname_str[101], oclass_str[101], oid_str[101]; char* name; @@ -2329,7 +2832,7 @@ int cmd_register_oid(char* args) { printf("Unknonwn oid class %s\n",oclass_str); return 0; } - + i = 0; name = oid_str; val = 0; @@ -2357,7 +2860,8 @@ int cmd_register_oid(char* args) { return 1; } -int cmd_push_command(char* arg) { +int cmd_push_command(const char* arg) +{ #if HAVE_READLINE_HISTORY_H if(strlen(arg)>1) add_history(arg); @@ -2367,11 +2871,13 @@ int cmd_push_command(char* arg) { return 1; } -void source_rcfile() { +void source_rcfile() +{ /* Look for a $HOME/.yazclientrc and source it if it exists */ struct stat statbuf; char buffer[1000]; char* homedir=getenv("HOME"); + if(!homedir) return; sprintf(buffer,"%s/.yazclientrc",homedir); @@ -2388,9 +2894,9 @@ void source_rcfile() { static void initialize(void) { -#if YAZ_MODULE_ccl FILE *inf; -#endif + int i; + if (!(out = odr_createmem(ODR_ENCODE)) || !(in = odr_createmem(ODR_DECODE)) || !(print = odr_createmem(ODR_PRINT))) @@ -2399,12 +2905,11 @@ static void initialize(void) exit(1); } oid_init(); - + setvbuf(stdout, 0, _IONBF, 0); if (apdu_file) odr_setprint(print, apdu_file); -#if YAZ_MODULE_ccl bibset = ccl_qual_mk (); inf = fopen (ccl_fields, "r"); if (inf) @@ -2412,13 +2917,15 @@ static void initialize(void) ccl_qual_file (bibset, inf); fclose (inf); } -#endif - cmd_base("Default"); - #if HAVE_READLINE_READLINE_H rl_attempted_completion_function = (CPPFunction*)readline_completer; #endif - + + + for(i=0; inum_diagnostics; i++) + { + printf ("SRW diagnostic %d %s\n", + *res->diagnostics[i].code, + yaz_diag_srw_str(*res->diagnostics[i].code)); + + 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; inum_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"); + } + } +} + +static void http_response(Z_HTTP_Response *hres) +{ + int ret = -1; + const char *content_type = z_HTTP_header_lookup(hres->headers, + "Content-Type"); + const char *connection_head = z_HTTP_header_lookup(hres->headers, + "Connection"); + if (content_type && !yaz_strcmp_del("text/xml", content_type, "; ")) + { + 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, + (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 && + soap_package->u.generic->no == 0) + { + Z_SRW_PDU *sr = soap_package->u.generic->p; + if (sr->which == Z_SRW_searchRetrieve_response) + handle_srw_response(sr->u.response); + else + ret = -1; + } + else if (!ret && (soap_package->which == Z_SOAP_fault + || soap_package->which == Z_SOAP_error)) + { + printf ("HTTP Error Status=%d\n", hres->code); + printf ("SOAP Fault code %s\n", + soap_package->u.fault->fault_code); + printf ("SOAP Fault string %s\n", + soap_package->u.fault->fault_string); + } + else + ret = -1; + odr_destroy(o); + } + if (ret) + { + if (hres->code != 200) + { + printf ("HTTP Error Status=%d\n", hres->code); + } + else + { + printf ("Decoding of SRW package failed\n"); + } + 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 + +void wait_and_handle_response() +{ + int reconnect_ok = 1; int res; char *netbuffer= 0; int netbufferlen = 0; - Z_APDU *apdu; - + Z_GDU *gdu; - if (conn) + while(conn) { - do + res = cs_get(conn, &netbuffer, &netbufferlen); + if (reconnect_ok && res <= 0 && protocol == PROTO_HTTP) { - if ((res = cs_get(conn, &netbuffer, &netbufferlen)) < 0) - { - printf("Target closed connection\n"); - close_session (); - break; - } - if (!res) - { - printf("Target closed connection.\n"); - close_session (); - break; - } - odr_reset(in); /* release APDU from last round */ - record_last = 0; - odr_setbuf(in, netbuffer, res, 0); - if (!z_APDU(in, &apdu, 0, 0)) - { - odr_perror(in, "Decoding incoming APDU"); - fprintf(stderr, "[Near %d]\n", odr_offset(in)); - fprintf(stderr, "Packet dump:\n---------\n"); - odr_dumpBER(stderr, netbuffer, res); - fprintf(stderr, "---------\n"); - if (apdu_file) - z_APDU(print, &apdu, 0, 0); - close_session (); - break; - } - if (apdu_file && !z_APDU(print, &apdu, 0, 0)) + cs_close(conn); + conn = 0; + cmd_open(0); + reconnect_ok = 0; + if (conn) { - odr_perror(print, "Failed to print incoming APDU"); - odr_reset(print); + char *buf_out; + int len_out; + + buf_out = odr_getbuf(out, &len_out, 0); + + cs_put(conn, buf_out, len_out); + + odr_reset(out); continue; } + } + else if (res <= 0) + { + printf("Target closed connection\n"); + close_session(); + break; + } + odr_reset(out); + odr_reset(in); /* release APDU from last round */ + record_last = 0; + odr_setbuf(in, netbuffer, res, 0); + + if (!z_GDU(in, &gdu, 0, 0)) + { + FILE *f = ber_file ? ber_file : stdout; + odr_perror(in, "Decoding incoming APDU"); + fprintf(f, "[Near %d]\n", odr_offset(in)); + fprintf(f, "Packet dump:\n---------\n"); + odr_dumpBER(f, netbuffer, res); + fprintf(f, "---------\n"); + if (apdu_file) + z_GDU(print, &gdu, 0, 0); + close_session (); + break; + } + if (ber_file) + odr_dumpBER(ber_file, netbuffer, res); + if (apdu_file && !z_GDU(print, &gdu, 0, 0)) + { + odr_perror(print, "Failed to print incoming APDU"); + odr_reset(print); + continue; + } + if (gdu->which == Z_GDU_Z3950) + { + Z_APDU *apdu = gdu->u.z3950; switch(apdu->which) { case Z_APDU_initResponse: @@ -2520,7 +3152,17 @@ void wait_and_handle_responce() close_session (); } } - while (conn && cs_more(conn)); +#if HAVE_XML2 + else if (gdu->which == Z_GDU_HTTP_Response) + { + http_response(gdu->u.HTTP_Response); + } +#endif + if (conn && !cs_more(conn)) + break; + } + if (conn) + { #if HAVE_GETTIMEOFDAY gettimeofday (&tv_end, 0); #if 0 @@ -2539,66 +3181,276 @@ void wait_and_handle_responce() } -static int cmd_help (char *line); +int cmd_cclparse(const char* arg) +{ + int error, pos; + struct ccl_rpn_node *rpn=NULL; + + + rpn = ccl_find_str (bibset, arg, &error, &pos); + + if (error) { + printf ("%*s^ - ", 3+strlen(last_cmd)+1+pos, " "); + printf ("%s\n", ccl_err_msg (error)); + } + else + { + if (rpn) + { + ccl_pr_tree(rpn, stdout); + } + } + if (rpn) + ccl_rpn_delete(rpn); + + printf ("\n"); + + return 0; +} + + +int cmd_set_otherinfo(const char* args) +{ + char oid[101], otherinfoString[101]; + int otherinfoNo; + int sscan_res; + int oidval; + + sscan_res = sscanf (args, "%d %100[^ ] %100s", &otherinfoNo, oid, otherinfoString); + if(sscan_res==1) { + /* reset this otherinfo */ + if(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); + return 0; + } + if (sscan_res<3) { + printf("Error in set_otherinfo command \n"); + return 0; + } + + 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); + return 0; + } + extraOtherInfos[otherinfoNo].oidval = oidval; + if(extraOtherInfos[otherinfoNo].value) free(extraOtherInfos[otherinfoNo].value); + extraOtherInfos[otherinfoNo].value = strdup(otherinfoString); + + return 0; +} + +int cmd_list_otherinfo(const char* args) +{ + int i; + + if(strlen(args)>0) { + i = atoi(args); + if( i >= maxOtherInfosSupported ) { + printf("Error otherinfo index to large (%d>%d)\n",i,maxOtherInfosSupported); + return 0; + } + + if(extraOtherInfos[i].oidval != -1) + printf(" otherinfo %d %s %s\n", + i, + yaz_z3950_oid_value_to_str( + (enum oid_value) extraOtherInfos[i].oidval, + CLASS_RECSYN), + extraOtherInfos[i].value); + + } else { + for(i=0; iwhich) { + case Z_IdAuthentication_idPass: + printf("Authentication : IdPass\n"); + printf(" Login User : %s\n",auth->u.idPass->userId?auth->u.idPass->userId:""); + printf(" Login Group : %s\n",auth->u.idPass->groupId?auth->u.idPass->groupId:""); + printf(" Password : %s\n",auth->u.idPass->password?auth->u.idPass->password:""); + break; + case Z_IdAuthentication_open: + printf("Authentication : psOpen\n"); + printf(" Open string : %s\n",auth->u.open); + break; + default: + printf("Authentication : Unknown\n"); + } + } + if (negotiationCharset) + printf("Neg. Character set : `%s'\n", negotiationCharset); + + /* bases */ + printf("Bases : "); + for (i = 0; iu.generic:""); + + /* loging options */ + printf("APDU log : %s\n",apdu_file?"on":"off"); + printf("Record log : %s\n",marc_file?"on":"off"); + + /* other infos */ + printf("Other Info: \n"); + cmd_list_otherinfo(""); + + return 0; +} + +int cmd_clear_otherinfo(const char* args) +{ + if(strlen(args)>0) { + int otherinfoNo; + otherinfoNo = atoi(args); + if( otherinfoNo >= maxOtherInfosSupported ) { + printf("Error otherinfo index to large (%d>%d)\n",otherinfoNo,maxOtherInfosSupported); + return 0; + } + + if(extraOtherInfos[otherinfoNo].oidval != -1) { + /* only clear if set. */ + extraOtherInfos[otherinfoNo].oidval=-1; + free(extraOtherInfos[otherinfoNo].value); + } + } else { + int i; + + for(i=0; i[':'][/]",NULL,0}, - {"quit", cmd_quit, "",NULL,0}, - {"find", cmd_find, "",NULL,0}, - {"delete", cmd_delete, "",NULL,0}, - {"base", cmd_base, "",NULL,0}, - {"show", cmd_show, "['+'<#recs>['+']]",NULL,0}, - {"scan", cmd_scan, "",NULL,0}, - {"sort", cmd_sort, " ...",NULL,0}, - {"sort+", cmd_sort_newset, " ...",NULL,0}, - {"authentication", cmd_authentication, "",NULL,0}, - {"lslb", cmd_lslb, "",NULL,0}, - {"ssub", cmd_ssub, "",NULL,0}, - {"mspn", cmd_mspn, "",NULL,0}, - {"status", cmd_status, "",NULL,0}, - {"setnames", cmd_setnames, "",NULL,0}, - {"cancel", cmd_cancel, "",NULL,0}, - {"format", cmd_format, "",complete_format,0}, - {"schema", cmd_schema, "",complete_schema,0}, - {"elements", cmd_elements, "",NULL,0}, - {"close", cmd_close, "",NULL,0}, - {"attributeset", cmd_attributeset, "",complete_attributeset,0}, - {"querytype", cmd_querytype, "",complete_querytype,0}, - {"refid", cmd_refid, "",NULL,0}, - {"itemorder", cmd_itemorder, "ill|item ",NULL,0}, - {"update", cmd_update, "",NULL,0}, - {"packagename", cmd_packagename, "",NULL,0}, - {"proxy", cmd_proxy, "[('tcp'|'ssl')][':']",NULL,0}, - {"charset", cmd_charset, "",NULL,0}, - {"lang", cmd_lang, "",NULL,0}, - {".", cmd_source, "",NULL,1}, - {"!", cmd_subshell, "Subshell command",NULL,0}, - {"set_apdufile", cmd_set_apdufile, "",NULL,0}, - {"set_marcdump", cmd_set_marcdump," ",NULL,0}, - {"set_cclfields", cmd_set_cclfields,"",NULL,1}, - {"register_oid",cmd_register_oid," ",NULL,0}, - {"push_command",cmd_push_command,"",command_generator,0}, + char **local_tabcompletes; +} cmd_array[] = { + {"open", cmd_open, "('tcp'|'ssl')':[':'][/]",NULL,0,NULL}, + {"quit", cmd_quit, "",NULL,0,NULL}, + {"find", cmd_find, "",NULL,0,NULL}, + {"delete", cmd_delete, "",NULL,0,NULL}, + {"base", cmd_base, "",NULL,0,NULL}, + {"show", cmd_show, "['+'<#recs>['+']]",NULL,0,NULL}, + {"scan", cmd_scan, "",NULL,0,NULL}, + {"sort", cmd_sort, " ...",NULL,0,NULL}, + {"sort+", cmd_sort_newset, " ...",NULL,0,NULL}, + {"authentication", cmd_authentication, "",NULL,0,NULL}, + {"lslb", cmd_lslb, "",NULL,0,NULL}, + {"ssub", cmd_ssub, "",NULL,0,NULL}, + {"mspn", cmd_mspn, "",NULL,0,NULL}, + {"status", cmd_status, "",NULL,0,NULL}, + {"setnames", cmd_setnames, "",NULL,0,NULL}, + {"cancel", cmd_cancel, "",NULL,0,NULL}, + {"format", cmd_format, "",complete_format,0,NULL}, + {"schema", cmd_schema, "",complete_schema,0,NULL}, + {"elements", cmd_elements, "",NULL,0,NULL}, + {"close", cmd_close, "",NULL,0,NULL}, + {"attributeset", cmd_attributeset, "",complete_attributeset,0,NULL}, + {"querytype", cmd_querytype, "",complete_querytype,0,NULL}, + {"refid", cmd_refid, "",NULL,0,NULL}, + {"itemorder", cmd_itemorder, "ill|item ",NULL,0,NULL}, + {"update", cmd_update, " []",NULL,0,NULL}, + {"packagename", cmd_packagename, "",NULL,0,NULL}, + {"proxy", cmd_proxy, "[('tcp'|'ssl')][':']",NULL,0,NULL}, + {"charset", cmd_charset, " ",NULL,0,NULL}, + {"marccharset", cmd_marccharset, "",NULL,0,NULL}, + {"lang", cmd_lang, "",NULL,0,NULL}, + {".", cmd_source, "",NULL,1,NULL}, + {"!", cmd_subshell, "Subshell command",NULL,1,NULL}, + {"set_apdufile", cmd_set_apdufile, "",NULL,1,NULL}, + {"set_berfile", cmd_set_berfile, "",NULL,1,NULL}, + {"set_marcdump", cmd_set_marcdump," ",NULL,1,NULL}, + {"set_cclfile", cmd_set_cclfile," ",NULL,1,NULL}, + {"set_auto_reconnect", cmd_set_auto_reconnect," on|off",complete_auto_reconnect,1,NULL}, + {"set_otherinfo", cmd_set_otherinfo," ",NULL,0,NULL}, + {"register_oid", cmd_register_oid," ",NULL,0,NULL}, + {"push_command", cmd_push_command,"",command_generator,0,NULL}, + {"register_tab", cmd_register_tab," ",command_generator,0,NULL}, + {"cclparse", cmd_cclparse,"",NULL,0,NULL}, + {"list_otherinfo",cmd_list_otherinfo,"[otherinfoinddex]",NULL,0,NULL}, + {"list_all",cmd_list_all,"",NULL,0,NULL}, + {"clear_otherinfo",cmd_clear_otherinfo,"",NULL,0,NULL}, /* Server Admin Functions */ - {"adm-reindex", cmd_adm_reindex, "",NULL,0}, - {"adm-truncate", cmd_adm_truncate, "('database'|'index')",NULL,0}, - {"adm-create", cmd_adm_create, "",NULL,0}, - {"adm-drop", cmd_adm_drop, "('database'|'index')",NULL,0}, - {"adm-import", cmd_adm_import, " ",NULL,0}, - {"adm-refresh", cmd_adm_refresh, "",NULL,0}, - {"adm-commit", cmd_adm_commit, "",NULL,0}, - {"adm-shutdown", cmd_adm_shutdown, "",NULL,0}, - {"adm-startup", cmd_adm_startup, "",NULL,0}, - {"help", cmd_help, "", NULL}, - {0,0,0,0,0} + {"adm-reindex", cmd_adm_reindex, "",NULL,0,NULL}, + {"adm-truncate", cmd_adm_truncate, "('database'|'index')",NULL,0,NULL}, + {"adm-create", cmd_adm_create, "",NULL,0,NULL}, + {"adm-drop", cmd_adm_drop, "('database'|'index')",NULL,0,NULL}, + {"adm-import", cmd_adm_import, " ",NULL,0,NULL}, + {"adm-refresh", cmd_adm_refresh, "",NULL,0,NULL}, + {"adm-commit", cmd_adm_commit, "",NULL,0,NULL}, + {"adm-shutdown", cmd_adm_shutdown, "",NULL,0,NULL}, + {"adm-startup", cmd_adm_startup, "",NULL,0,NULL}, + {"help", cmd_help, "", NULL,0,NULL}, + {0,0,0,0,0,0} }; -static int cmd_help (char *line) +static int cmd_help (const char *line) { int i; char topic[21]; @@ -2608,9 +3460,9 @@ static int cmd_help (char *line) if (*topic == 0) printf("Commands:\n"); - for (i = 0; cmd[i].cmd; i++) - if (*topic == 0 || strcmp (topic, cmd[i].cmd) == 0) - printf(" %s %s\n", cmd[i].cmd, cmd[i].ad); + for (i = 0; cmd_array[i].cmd; i++) + if (*topic == 0 || strcmp (topic, cmd_array[i].cmd) == 0) + printf(" %s %s\n", cmd_array[i].cmd, cmd_array[i].ad); if (strcmp (topic, "find") == 0) { printf ("RPN:\n"); @@ -2638,6 +3490,49 @@ static int cmd_help (char *line) return 1; } +int cmd_register_tab(const char* arg) { + + char command[101], tabargument[101]; + int i; + int num_of_tabs; + char** tabslist; + + 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))) { + break; + } + } + + if(!cmd_array[i].cmd) { + fprintf(stderr,"Unknown command %s\n",command); + return 1; + } + + + if(!cmd_array[i].local_tabcompletes) + cmd_array[i].local_tabcompletes = (char **) calloc(1,sizeof(char**)); + + num_of_tabs=0; + + tabslist = cmd_array[i].local_tabcompletes; + for(;tabslist && *tabslist;tabslist++) { + num_of_tabs++; + } + + cmd_array[i].local_tabcompletes = (char **) + realloc(cmd_array[i].local_tabcompletes,(num_of_tabs+2)*sizeof(char**)); + tabslist=cmd_array[i].local_tabcompletes; + tabslist[num_of_tabs]=strdup(tabargument); + tabslist[num_of_tabs+1]=NULL; + return 1; +} + + void process_cmd_line(char* line) { int i,res; @@ -2658,9 +3553,8 @@ void process_cmd_line(char* line) /* removed tailing spaces from the arg command */ { - char* p; + char* p = arg; char* lastnonspace=NULL; - p = arg; for(;*p; ++p) { if(!isspace(*p)) { @@ -2671,30 +3565,30 @@ void process_cmd_line(char* line) *(++lastnonspace) = 0; } - - for (i = 0; cmd[i].cmd; i++) - if (!strncmp(cmd[i].cmd, word, strlen(word))) + for (i = 0; cmd_array[i].cmd; i++) + if (!strncmp(cmd_array[i].cmd, word, strlen(word))) { - res = (*cmd[i].fun)(arg); + res = (*cmd_array[i].fun)(arg); break; } - - if (!cmd[i].cmd) /* dump our help-screen */ + + if (!cmd_array[i].cmd) /* dump our help-screen */ { printf("Unknown command: %s.\n", word); - cmd_help (""); + printf("use help for list of commands\n"); + /* cmd_help (""); */ res = 1; } - + if(apdu_file) fflush(apdu_file); if (res >= 2) - wait_and_handle_responce(); - + wait_and_handle_response(); + if(apdu_file) fflush(apdu_file); - if(marcdump) - fflush(marcdump); + if(marc_file) + fflush(marc_file); } @@ -2704,10 +3598,10 @@ char *command_generator(const char *text, int state) if (state==0) { idx = 0; } - for( ; cmd[idx].cmd; ++idx) { - if (!strncmp(cmd[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[idx-1].cmd); + return strdup(cmd_array[idx-1].cmd); } } return NULL; @@ -2720,6 +3614,8 @@ char *command_generator(const char *text, int state) char ** readline_completer(char *text, int start, int end) { #if HAVE_READLINE_READLINE_H + completerFunctionType completerToUse; + if(start == 0) { #if HAVE_READLINE_RL_COMPLETION_MATCHES char** res=rl_completion_matches(text, @@ -2737,34 +3633,37 @@ char ** readline_completer(char *text, int start, int end) { rl_attempted_completion_over = 1; return NULL; } - - if(start != strlen(word) +1 ) { - rl_attempted_completion_over = 1; - return 0; - } - for (i = 0; cmd[i].cmd; i++) { - if (!strncmp(cmd[i].cmd, word, strlen(word))) { + + for (i = 0; cmd_array[i].cmd; i++) { + if (!strncmp(cmd_array[i].cmd, word, strlen(word))) { break; } } - - - if(!cmd[i].complete_filenames) - rl_attempted_completion_over = 1; - if(cmd[i].rl_completerfunction) { + + if(!cmd_array[i].cmd) return NULL; + + curret_global_list = cmd_array[i].local_tabcompletes; + + completerToUse = cmd_array[i].rl_completerfunction; + if(completerToUse==NULL) /* if no pr. command completer is defined use the default completer */ + completerToUse = default_completer; + + if(completerToUse) { #ifdef HAVE_READLINE_RL_COMPLETION_MATCHES char** res= rl_completion_matches(text, - cmd[i].rl_completerfunction); + completerToUse); #else char** res= completion_matches(text, - (CPFunction*)cmd[i].rl_completerfunction); + (CPFunction*)completerToUse); #endif - rl_attempted_completion_over = 1; + if(!cmd_array[i].complete_filenames) + rl_attempted_completion_over = 1; return res; } else { - rl_attempted_completion_over = 1; + if(!cmd_array[i].complete_filenames) + rl_attempted_completion_over = 1; return 0; } } @@ -2815,6 +3714,17 @@ static void client(void) } } +static void show_version(void) +{ + char vstr[20]; + + yaz_version(vstr, 0); + printf ("YAZ version: %s\n", YAZ_VERSION); + if (strcmp(vstr, YAZ_VERSION)) + printf ("YAZ DLL/SO: %s\n", vstr); + exit(0); +} + int main(int argc, char **argv) { char *prog = *argv; @@ -2823,7 +3733,17 @@ int main(int argc, char **argv) char *arg; int ret; - while ((ret = options("k:c:a:m:v:p:u:", argv, argc, &arg)) != -2) +#if HAVE_LOCALE_H + if (!setlocale(LC_CTYPE, "")) + fprintf (stderr, "setlocale failed\n"); +#endif +#if HAVE_LANGINFO_H +#ifdef CODESET + codeset = nl_langinfo(CODESET); +#endif +#endif + + while ((ret = options("k:c:a:b:m:v:p:u:t:V", argv, argc, &arg)) != -2) { switch (ret) { @@ -2839,25 +3759,34 @@ int main(int argc, char **argv) kilobytes = atoi(arg); break; case 'm': - if (!(marcdump = fopen (arg, "a"))) + if (!(marc_file = fopen (arg, "a"))) { perror (arg); exit (1); } break; - case 'c': - strncpy (ccl_fields, arg, sizeof(ccl_fields)-1); - ccl_fields[sizeof(ccl_fields)-1] = '\0'; - break; + case 't': + outputCharset = xstrdup(arg); + break; + case 'c': + strncpy (ccl_fields, arg, sizeof(ccl_fields)-1); + ccl_fields[sizeof(ccl_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 'p': - yazProxy=strdup(arg); - break; + case 'p': + yazProxy=strdup(arg); + break; case 'u': if (!auth_command) { @@ -2867,12 +3796,15 @@ int main(int argc, char **argv) } break; case 'v': - yaz_log_init (yaz_log_mask_str(arg), "", NULL); + yaz_log_init(yaz_log_mask_str(arg), "", 0); + break; + case 'V': + show_version(); break; default: fprintf (stderr, "Usage: %s [-m ] [ -a ] " - "[-c cclfields]\n [-p ] [-u ] " - "[-k size] []\n", + "[-b berdump] [-c cclfields]\n [-p ] [-u ] " + "[-k size] [-V] []\n", prog); exit (1); } @@ -2904,10 +3836,11 @@ int main(int argc, char **argv) exit (0); } - /* * Local variables: - * tab-width: 4 + * tab-width: 8 * c-basic-offset: 4 * End: + * vim600: sw=4 ts=8 fdm=marker + * vim<600: sw=4 ts=8 */