X-Git-Url: http://git.indexdata.com/?p=yaz-moved-to-github.git;a=blobdiff_plain;f=client%2Fclient.c;h=2d24363c988fb3f28ecbefc71c1fb9424e0b19a5;hp=85e54b683da70158adee9437dce38e8ff833ebda;hb=a54c709b3e2feff5762bfa7dfa8ee653b429d369;hpb=ac286ae76051058c8e340bf84eb98391340b7d22 diff --git a/client/client.c b/client/client.c index 85e54b6..2d24363 100644 --- a/client/client.c +++ b/client/client.c @@ -2,11 +2,12 @@ * Copyright (c) 1995-2003, Index Data * See the file LICENSE for details. * - * $Id: client.c,v 1.181 2003-02-14 18:49:23 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 @@ -38,7 +39,7 @@ #include #include - +#include #include #if HAVE_READLINE_READLINE_H @@ -51,7 +52,6 @@ #include - #include "admin.h" #include "tabcomplete.h" @@ -60,7 +60,10 @@ 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]; @@ -74,22 +77,23 @@ 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 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; @@ -115,12 +119,6 @@ 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; @@ -132,7 +130,9 @@ 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(char* arg); +int cmd_register_tab(const char* arg); + +static void close_session (void); ODR getODROutputStream() { @@ -177,11 +177,12 @@ void add_otherInfos(Z_APDU *a) for(i=0; iotherInfo, out, VAL_PROXY, 1, type_and_host); - if (yazCharset || yazLang) { + if (negotiationCharset || yazLang) { Z_OtherInformation **p; Z_OtherInformationUnit *p0; @@ -284,26 +289,33 @@ static void send_initRequest(const char* type_and_host) 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) @@ -390,16 +402,11 @@ static int process_initResponse(Z_InitResponse *res) 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); } -int cmd_open(char *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]; - + char type_and_host[101]; + const char *basep = 0; if (conn) { - printf("Already connected.\n"); - cs_close (conn); conn = NULL; if (session_mem) @@ -452,30 +472,37 @@ int cmd_open(char *arg) session_mem = NULL; } } + cs_get_host_args(arg, &basep); - if (strncmp (arg, "unix:", 5) == 0) - { - base[0] = '\0'; - conn = cs_create_host(arg, 1, &add); - cmd_open_remember_last_open_command(arg,arg); - } + 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 - { - base[0] = '\0'; - if (sscanf (arg, "%100[^/]/%100s", type_and_host, base) < 1) - return 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); - } + 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) @@ -491,34 +518,45 @@ int cmd_open(char *arg) 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_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; + char* open_command; - if(!( auto_reconnect && last_open_command) ) return ; + if(!( auto_reconnect && last_open_command) ) return ; - open_command = (char *) xmalloc (strlen(last_open_command)+6); - strcpy (open_command, "open "); + open_command = (char *) xmalloc (strlen(last_open_command)+6); + strcpy (open_command, "open "); - strcat (open_command, last_open_command); + strcat (open_command, last_open_command); - process_cmd_line(open_command); + process_cmd_line(open_command); - xfree(open_command); + xfree(open_command); } -int cmd_authentication(char *arg) +int cmd_authentication(const char *arg) { static Z_IdAuthentication au; static char user[40], group[40], pass[40]; @@ -611,11 +649,11 @@ 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, + 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(stderr, "---------\n"); + fprintf(stdout, "---------\n"); /* note just ignores the error ant print the bytes form the octet_aligned later */ } else { @@ -670,20 +708,25 @@ static void display_record(Z_External *r) &result, &rlen)> 0) { char *from = 0; - if (ent->value == VAL_USMARC) + if (marcCharset && strcmp(marcCharset, "auto")) + from = marcCharset; + else { - if (octet_buf[9] == 'a') - from = "UTF-8"; + if (ent->value == VAL_USMARC) + { + if (octet_buf[9] == 'a') + from = "UTF-8"; + else + from = "MARC8"; + } else - from = "MARC8"; + from = "ISO-8859-1"; } - else - from = "ISO-8859-1"; - - if (codeset && from) + if (outputCharset && from) { - printf ("convert from %s to %s\n", from, codeset); - cd = yaz_iconv_open(codeset, from); + printf ("convert from %s to %s\n", from, + outputCharset); + cd = yaz_iconv_open(outputCharset, from); } if (!cd) fwrite (result, 1, rlen, stdout); @@ -726,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) { @@ -828,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; @@ -865,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; @@ -978,9 +1138,9 @@ static int send_searchRequest(char *arg) 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; } @@ -1359,8 +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); - - do_hex_dump(item_request_buf,item_request_size); + + do_hex_dump(item_request_buf,item_request_size); } return r; } @@ -1515,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; @@ -1528,6 +1698,8 @@ static int cmd_update(char *arg) int action_no; Z_External *record_this = 0; + if (only_z3950()) + return 0; *action = 0; *recid = 0; *fname = 0; @@ -1637,11 +1809,13 @@ static int cmd_update(char *arg) 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; @@ -1651,61 +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) { - try_reconnect(); - - if (!conn) { - 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); @@ -1713,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; @@ -1733,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; @@ -1770,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; @@ -1788,14 +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->which = Z_Specification_oid; - compo.u.complex->generic->u.oid = (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->u.oid) + if (!compo.u.complex->generic->schema.oid) { /* OID wasn't a schema! Try record syntax instead. */ prefschema.oclass = CLASS_RECSYN; - compo.u.complex->generic->u.oid = (Odr_oid *) + compo.u.complex->generic->schema.oid = (Odr_oid *) odr_oiddup(out, oid_ent_to_oid(&prefschema, oid)); } if (!elementSetNames) @@ -1824,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) { @@ -1835,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) @@ -1869,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 (""); @@ -1889,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 = @@ -1901,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"); @@ -1920,6 +2163,8 @@ int send_scanrequest(const char *query, int pp, int num, const char *term) Z_ScanRequest *req = apdu->u.scanRequest; int oid[OID_SIZE]; + if (only_z3950()) + return 0; if (queryType == QueryType_CCL2RPN) { oident bib1; @@ -1982,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; @@ -1990,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 @@ -2103,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"); @@ -2124,26 +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) { - try_reconnect(); - - 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)) { @@ -2164,23 +2415,16 @@ 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) @@ -2198,7 +2442,7 @@ int cmd_format(char *arg) return 1; } -int cmd_elements(char *arg) +int cmd_elements(const char *arg) { static Z_ElementSetNames esn; static char what[100]; @@ -2215,7 +2459,7 @@ int cmd_elements(char *arg) return 1; } -int cmd_attributeset(char *arg) +int cmd_attributeset(const char *arg) { char what[100]; @@ -2233,7 +2477,7 @@ 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; @@ -2255,7 +2499,7 @@ int cmd_querytype (char *arg) return 1; } -int cmd_refid (char *arg) +int cmd_refid (const char *arg) { xfree (refid); refid = NULL; @@ -2267,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; @@ -2283,58 +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') { - xfree (yazProxy); - yazProxy = NULL; - - } xfree (yazProxy); yazProxy = NULL; if (*arg) - { - yazProxy = (char *) xmalloc (strlen(arg)+1); - strcpy (yazProxy, arg); - } + yazProxy = xstrdup (arg); + return 1; +} + +int cmd_marccharset(const char *arg) +{ + 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(char* arg) +int cmd_charset(const char* arg) { char l1[30], l2[30]; *l1 = *l2 = 0; if (sscanf(arg, "%29s %29s", l1, l2) < 1) { - printf("Current character set is `%s'\n", (yazCharset) ? yazCharset:NULL); + 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 (*l1) - yazCharset = xstrdup(l1); + 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) { - odr_set_charset (out, l1, l2); - odr_set_charset (in, l2, l1); + 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); @@ -2350,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; @@ -2397,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); @@ -2408,42 +2682,47 @@ 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_cclfile(char* arg) +int cmd_set_cclfile(const char* arg) { 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); @@ -2452,11 +2731,8 @@ int cmd_set_cclfile(char* arg) return 0; } - -int cmd_set_auto_reconnect(char* arg) +int cmd_set_auto_reconnect(const char* arg) { - REMOVE_TAILING_BLANKS(arg); - if(strlen(arg)==0) { auto_reconnect = ! auto_reconnect; } else if(strcmp(arg,"on")==0) { @@ -2476,30 +2752,26 @@ int cmd_set_auto_reconnect(char* arg) return 0; } -int cmd_set_marcdump(char* arg) +int cmd_set_marcdump(const char* arg) { - if(marcdump && marcdump != stderr) { /* don't close stdout*/ - perror("unable to close apdu log file"); + if(marc_file && marc_file != stderr) { /* don't close stdout*/ + fclose(marc_file); } - marcdump=NULL; - - if(strlen(arg)<1) { - return 1; - } - - 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; @@ -2513,7 +2785,7 @@ 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; @@ -2588,7 +2860,7 @@ 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) @@ -2645,8 +2917,6 @@ static void initialize(void) ccl_qual_file (bibset, inf); fclose (inf); } - cmd_base("Default"); - #if HAVE_READLINE_READLINE_H rl_attempted_completion_function = (CPPFunction*)readline_completer; #endif @@ -2664,52 +2934,177 @@ static void initialize(void) struct timeval tv_start, tv_end; #endif -void wait_and_handle_responce() +#if HAVE_XML2 +static void handle_srw_response(Z_SRW_searchRetrieveResponse *res) { + int i; + + printf ("Received SRW SearchRetrieve Response\n"); + 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)) + cs_close(conn); + conn = 0; + cmd_open(0); + reconnect_ok = 0; + if (conn) { - 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)) - { - 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: @@ -2757,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 @@ -2776,7 +3181,7 @@ void wait_and_handle_responce() } -int cmd_cclparse(char* arg) +int cmd_cclparse(const char* arg) { int error, pos; struct ccl_rpn_node *rpn=NULL; @@ -2804,7 +3209,7 @@ int cmd_cclparse(char* arg) } -int cmd_set_otherinfo(char* args) +int cmd_set_otherinfo(const char* args) { char oid[101], otherinfoString[101]; int otherinfoNo; @@ -2843,7 +3248,7 @@ int cmd_set_otherinfo(char* args) return 0; } -int cmd_list_otherinfo(char* args) +int cmd_list_otherinfo(const char* args) { int i; @@ -2878,7 +3283,7 @@ int cmd_list_otherinfo(char* args) } -int cmd_list_all(char* args) { +int cmd_list_all(const char* args) { int i; /* connection options */ @@ -2913,7 +3318,8 @@ int cmd_list_all(char* args) { printf("Authentication : Unknown\n"); } } - if ( yazCharset ) printf("Character set : `%s'\n", (yazCharset) ? yazCharset:NULL); + if (negotiationCharset) + printf("Neg. Character set : `%s'\n", negotiationCharset); /* bases */ printf("Bases : "); @@ -2931,12 +3337,12 @@ int cmd_list_all(char* args) { /* print present related options */ printf("Format : %s\n",yaz_z3950_oid_value_to_str(recordsyntax,CLASS_RECSYN)); - printf("Schema : %s\n",yaz_z3950_oid_value_to_str(schema,CLASS_SCHEMA)); + printf("Schema : %s\n",schema); printf("Elements : %s\n",elementSetNames?elementSetNames->u.generic:""); /* loging options */ printf("APDU log : %s\n",apdu_file?"on":"off"); - printf("Record log : %s\n",marcdump?"on":"off"); + printf("Record log : %s\n",marc_file?"on":"off"); /* other infos */ printf("Other Info: \n"); @@ -2945,7 +3351,7 @@ int cmd_list_all(char* args) { return 0; } -int cmd_clear_otherinfo(char* args) +int cmd_clear_otherinfo(const char* args) { if(strlen(args)>0) { int otherinfoNo; @@ -2973,18 +3379,18 @@ int cmd_clear_otherinfo(char* args) return 0; } -static int cmd_help (char *line); +static int cmd_help (const char *line); typedef char *(*completerFunctionType)(const char *text, int state); static struct { char *cmd; - int (*fun)(char *arg); + int (*fun)(const char *arg); char *ad; completerFunctionType rl_completerfunction; int complete_filenames; char **local_tabcompletes; -} cmd[] = { +} cmd_array[] = { {"open", cmd_open, "('tcp'|'ssl')':[':'][/]",NULL,0,NULL}, {"quit", cmd_quit, "",NULL,0,NULL}, {"find", cmd_find, "",NULL,0,NULL}, @@ -3012,22 +3418,24 @@ static struct { {"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}, + {"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}, + {"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,NULL}, {"adm-truncate", cmd_adm_truncate, "('database'|'index')",NULL,0,NULL}, @@ -3042,7 +3450,7 @@ static struct { {0,0,0,0,0,0} }; -static int cmd_help (char *line) +static int cmd_help (const char *line) { int i; char topic[21]; @@ -3052,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"); @@ -3082,7 +3490,7 @@ static int cmd_help (char *line) return 1; } -int cmd_register_tab(char* arg) { +int cmd_register_tab(const char* arg) { char command[101], tabargument[101]; int i; @@ -3094,31 +3502,31 @@ int cmd_register_tab(char* arg) { } /* locate the amdn in the list */ - for (i = 0; cmd[i].cmd; i++) { - if (!strncmp(cmd[i].cmd, command, strlen(command))) { + for (i = 0; cmd_array[i].cmd; i++) { + if (!strncmp(cmd_array[i].cmd, command, strlen(command))) { break; } } - if(!cmd[i].cmd) { + if(!cmd_array[i].cmd) { fprintf(stderr,"Unknown command %s\n",command); return 1; } - if(!cmd[i].local_tabcompletes) - cmd[i].local_tabcompletes = (char **) calloc(1,sizeof(char**)); + if(!cmd_array[i].local_tabcompletes) + cmd_array[i].local_tabcompletes = (char **) calloc(1,sizeof(char**)); num_of_tabs=0; - tabslist = cmd[i].local_tabcompletes; + tabslist = cmd_array[i].local_tabcompletes; for(;tabslist && *tabslist;tabslist++) { num_of_tabs++; } - cmd[i].local_tabcompletes = (char **) - realloc(cmd[i].local_tabcompletes,(num_of_tabs+2)*sizeof(char**)); - tabslist=cmd[i].local_tabcompletes; + 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; @@ -3145,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)) { @@ -3158,15 +3565,14 @@ 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); printf("use help for list of commands\n"); @@ -3177,12 +3583,12 @@ void process_cmd_line(char* line) 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); } @@ -3192,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; @@ -3228,18 +3634,17 @@ char ** readline_completer(char *text, int start, int end) { return NULL; } - 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].cmd) return NULL; + if(!cmd_array[i].cmd) return NULL; + curret_global_list = cmd_array[i].local_tabcompletes; - curret_global_list = cmd[i].local_tabcompletes; - - completerToUse = cmd[i].rl_completerfunction; + completerToUse = cmd_array[i].rl_completerfunction; if(completerToUse==NULL) /* if no pr. command completer is defined use the default completer */ completerToUse = default_completer; @@ -3253,11 +3658,11 @@ char ** readline_completer(char *text, int start, int end) { completion_matches(text, (CPFunction*)completerToUse); #endif - if(!cmd[i].complete_filenames) + if(!cmd_array[i].complete_filenames) rl_attempted_completion_over = 1; return res; } else { - if(!cmd[i].complete_filenames) + if(!cmd_array[i].complete_filenames) rl_attempted_completion_over = 1; return 0; } @@ -3309,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; @@ -3322,10 +3738,12 @@ int main(int argc, char **argv) fprintf (stderr, "setlocale failed\n"); #endif #if HAVE_LANGINFO_H +#ifdef CODESET codeset = nl_langinfo(CODESET); #endif +#endif - while ((ret = options("k:c:a:m:v:p:u:t:", argv, argc, &arg)) != -2) + while ((ret = options("k:c:a:b:m:v:p:u:t:V", argv, argc, &arg)) != -2) { switch (ret) { @@ -3341,19 +3759,25 @@ 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 't': - codeset = arg; + 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; @@ -3372,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); }