X-Git-Url: http://git.indexdata.com/?p=yaz-moved-to-github.git;a=blobdiff_plain;f=client%2Fclient.c;h=cacc274162d5bea10913edd4a88dc2f9affe0b9c;hp=a2899cf5a644db801c9b42c08fb7965e99a7fe1d;hb=8dc67a9430644549801c18ec7e3a725e5a4ef782;hpb=b732890efcff9d226dc30b5338fdfa8d8fa2a83c diff --git a/client/client.c b/client/client.c index a2899cf..cacc274 100644 --- a/client/client.c +++ b/client/client.c @@ -1,12 +1,29 @@ /* - * Copyright (c) 1995-2002, Index Data + * Copyright (c) 1995-2004, Index Data * See the file LICENSE for details. * - * $Id: client.c,v 1.172 2002-10-04 19:05:36 adam Exp $ + * $Id: client.c,v 1.239 2004-04-28 12:10:51 adam Exp $ */ #include #include +#include +#if HAVE_LOCALE_H +#include +#endif + +#if HAVE_LANGINFO_H +#include +#endif + +#if HAVE_OPENSSL_SSL_H +#include +#include +#include +#include +#include +#endif + #include #include @@ -30,8 +47,9 @@ #include #include - +#include #include +#include #if HAVE_READLINE_READLINE_H #include @@ -43,14 +61,21 @@ #include - #include "admin.h" #include "tabcomplete.h" #define C_PROMPT "Z> " +static char *codeset = 0; /* character set for output */ +static int hex_dump = 0; +static char *dump_file_prefix = 0; static ODR out, in, print; /* encoding and decoding streams */ +#if HAVE_XML2 +static ODR srw_sr_odr_out = 0; +static Z_SRW_PDU *srw_sr = 0; +#endif 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]; @@ -64,35 +89,46 @@ 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 *record_schema = 0; static int sent_close = 0; static NMEM session_mem = NULL; /* memory handle for init-response */ static Z_InitResponse *session = 0; /* session parameters */ 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; +/* ### How can I set this path to use wherever YAZ is installed? */ +static char cql_fields[512] = "/usr/local/share/yaz/etc/pqf.properties"; +static char *esPackageName = 0; +static char *yazProxy = 0; static int kilobytes = 1024; -static char* yazCharset = 0; +static char *negotiationCharset = 0; +static char *outputCharset = 0; +static char *marcCharset = 0; static char* yazLang = 0; - +static char* http_version = "1.1"; static char last_cmd[32] = "?"; -static FILE *marcdump = 0; +static FILE *marc_file = 0; static char *refid = NULL; static char *last_open_command = NULL; static int auto_reconnect = 0; +static Odr_bitmask z3950_options; +static int z3950_version = 3; + +static char cur_host[200]; typedef enum { QueryType_Prefix, QueryType_CCL, - QueryType_CCL2RPN + QueryType_CCL2RPN, + QueryType_CQL, + QueryType_CQL2RPN } QueryType; static QueryType queryType = QueryType_Prefix; static CCL_bibset bibset; /* CCL bibset handle */ +static cql_transform_t cqltrans; /* CQL context-set handle */ #if HAVE_READLINE_COMPLETION_OVER @@ -104,12 +140,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; @@ -121,7 +151,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() { @@ -134,30 +166,45 @@ const char* query_type_as_string(QueryType 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)"; + case QueryType_CQL2RPN: return "CQL -> RPN (RPN sent to server)"; default: return "unknown Query type internal yaz-client error"; } } - -void do_hex_dump(char* buf,int len) +static void do_hex_dump(const char* buf, int len) { -#if 0 - int i,x; - for( i=0; iu.initRequest; + int i; - ODR_MASK_SET(req->options, Z_Options_search); - ODR_MASK_SET(req->options, Z_Options_present); - ODR_MASK_SET(req->options, Z_Options_namedResultSets); - ODR_MASK_SET(req->options, Z_Options_triggerResourceCtrl); - ODR_MASK_SET(req->options, Z_Options_scan); - ODR_MASK_SET(req->options, Z_Options_sort); - ODR_MASK_SET(req->options, Z_Options_extendedServices); - ODR_MASK_SET(req->options, Z_Options_delSet); + req->options = &z3950_options; - ODR_MASK_SET(req->protocolVersion, Z_ProtocolVersion_1); - ODR_MASK_SET(req->protocolVersion, Z_ProtocolVersion_2); - ODR_MASK_SET(req->protocolVersion, Z_ProtocolVersion_3); + ODR_MASK_ZERO(req->protocolVersion); + for (i = 0; iprotocolVersion, i); *req->maximumRecordSize = 1024*kilobytes; *req->preferredMessageSize = 1024*kilobytes; @@ -259,41 +305,58 @@ static void send_initRequest(const char* type_and_host) req->referenceId = set_refid (out); - if (yazProxy) + if (yazProxy && type_and_host) yaz_oi_set_string_oidval(&req->otherInfo, out, VAL_PROXY, 1, type_and_host); - 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))) { - 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); + ODR_MASK_SET(req->options, Z_Options_negotiationModel); + + p0->which = Z_OtherInfo_externallyDefinedInfo; + p0->information.externallyDefinedInfo = + yaz_set_proposal_charneg( + out, + (const char**)&negotiationCharset, + negotiationCharset ? 1 : 0, + (const char**)&yazLang, yazLang ? 1 : 0, 1); } } - send_apdu(apdu); - printf("Sent initrequest.\n"); + if (send_apdu(apdu)) + printf("Sent initrequest.\n"); +} + + +/* These two are used only from process_initResponse() */ +static void render_initUserInfo(Z_OtherInformation *ui1); +static void render_diag(Z_DiagnosticFormat *diag); + +static void pr_opt(const char *opt, void *clientData) +{ + printf (" %s", opt); } static int process_initResponse(Z_InitResponse *res) { + int ver = 0; /* save session parameters for later use */ session_mem = odr_extract_mem(in); session = res; + for (ver = 0; ver < 8; 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,61 +365,32 @@ static int process_initResponse(Z_InitResponse *res) printf("Version: %s\n", res->implementationVersion); if (res->userInformationField) { - printf("UserInformationfield:\n"); - if (!z_External(print, (Z_External**)&res-> userInformationField, - 0, 0)) - { - odr_perror(print, "Printing userinfo\n"); - odr_reset(print); - } - if (res->userInformationField->which == Z_External_octet) - { - printf("Guessing visiblestring:\n"); - printf("'%s'\n", res->userInformationField->u. octet_aligned->buf); - } - odr_reset (print); + Z_External *uif = res->userInformationField; + if (uif->which == Z_External_userInfo1) { + render_initUserInfo(uif->u.userInfo1); + } else { + printf("UserInformationfield:\n"); + if (!z_External(print, (Z_External**)&uif, 0, 0)) { + odr_perror(print, "Printing userinfo\n"); + odr_reset(print); + } + if (uif->which == Z_External_octet) { + printf("Guessing visiblestring:\n"); + printf("'%s'\n", uif->u. octet_aligned->buf); + } else if (uif->which == Z_External_single) { + /* Peek at any private Init-diagnostic APDUs */ + Odr_any *sat = uif->u.single_ASN1_type; + printf("### NAUGHTY: External is '%s'\n", sat->buf); + } + odr_reset (print); + } } printf ("Options:"); - if (ODR_MASK_GET(res->options, Z_Options_search)) - printf (" search"); - if (ODR_MASK_GET(res->options, Z_Options_present)) - printf (" present"); - if (ODR_MASK_GET(res->options, Z_Options_delSet)) - printf (" delSet"); - if (ODR_MASK_GET(res->options, Z_Options_resourceReport)) - printf (" resourceReport"); - if (ODR_MASK_GET(res->options, Z_Options_resourceCtrl)) - printf (" resourceCtrl"); - if (ODR_MASK_GET(res->options, Z_Options_accessCtrl)) - printf (" accessCtrl"); - if (ODR_MASK_GET(res->options, Z_Options_scan)) - printf (" scan"); - if (ODR_MASK_GET(res->options, Z_Options_sort)) - printf (" sort"); - if (ODR_MASK_GET(res->options, Z_Options_extendedServices)) - printf (" extendedServices"); - if (ODR_MASK_GET(res->options, Z_Options_level_1Segmentation)) - printf (" level1Segmentation"); - if (ODR_MASK_GET(res->options, Z_Options_level_2Segmentation)) - printf (" level2Segmentation"); - if (ODR_MASK_GET(res->options, Z_Options_concurrentOperations)) - printf (" concurrentOperations"); + yaz_init_opt_decode(res->options, pr_opt, 0); + printf ("\n"); + if (ODR_MASK_GET(res->options, Z_Options_namedResultSets)) - { - printf (" namedResultSets"); setnumber = 0; - } - if (ODR_MASK_GET(res->options, Z_Options_encapsulation)) - printf (" encapsulation"); - if (ODR_MASK_GET(res->options, Z_Options_resultCount)) - printf (" resultCount"); - if (ODR_MASK_GET(res->options, Z_Options_negotiationModel)) - printf (" negotiationModel"); - if (ODR_MASK_GET(res->options, Z_Options_duplicateDetection)) - printf (" duplicateDetection"); - if (ODR_MASK_GET(res->options, Z_Options_queryType104)) - printf (" queryType104"); - printf ("\n"); if (ODR_MASK_GET(res->options, Z_Options_negotiationModel)) { @@ -370,6 +404,15 @@ static int process_initResponse(Z_InitResponse *res) yaz_get_response_charneg(session_mem, p, &charset, &lang, &selected); + + if (outputCharset && negotiationCharset) { + odr_set_charset (out, charset, outputCharset); + odr_set_charset (in, outputCharset, charset); + } + else { + odr_set_charset (out, 0, 0); + odr_set_charset (in, 0, 0); + } printf("Accepted character set : %s\n", charset); printf("Accepted code language : %s\n", lang ? lang : "none"); @@ -380,16 +423,65 @@ static int process_initResponse(Z_InitResponse *res) return 0; } -static int cmd_base(char *arg) -{ + +static void render_initUserInfo(Z_OtherInformation *ui1) { int i; - char *cp; + printf("Init response contains %d otherInfo unit%s:\n", + ui1->num_elements, ui1->num_elements == 1 ? "" : "s"); + + for (i = 0; i < ui1->num_elements; i++) { + Z_OtherInformationUnit *unit = ui1->list[i]; + printf(" %d: otherInfo unit contains ", i+1); + if (unit->which == Z_OtherInfo_externallyDefinedInfo && + unit->information.externallyDefinedInfo->which == + Z_External_diag1) { + render_diag(unit->information.externallyDefinedInfo->u.diag1); + } else { + printf("unsupported otherInfo unit type %d\n", unit->which); + } + } +} - if (!*arg) - { - printf("Usage: base ...\n"); - return 0; + +/* ### should this share code with display_diagrecs()? */ +static void render_diag(Z_DiagnosticFormat *diag) { + int i; + + printf("%d diagnostic%s:\n", diag->num, diag->num == 1 ? "" : "s"); + for (i = 0; i < diag->num; i++) { + Z_DiagnosticFormat_s *ds = diag->elements[i]; + printf(" %d: ", i+1); + switch (ds->which) { + case Z_DiagnosticFormat_s_defaultDiagRec: { + Z_DefaultDiagFormat *dd = ds->u.defaultDiagRec; + /* ### should check `dd->diagnosticSetId' */ + printf("code=%d (%s)", *dd->condition, + diagbib1_str(*dd->condition)); + /* Both types of addinfo are the same, so use type-pun */ + if (dd->u.v2Addinfo != 0) + printf(",\n\taddinfo='%s'", dd->u.v2Addinfo); + break; + } + case Z_DiagnosticFormat_s_explicitDiagnostic: + printf("Explicit diagnostic (not supported)"); + break; + default: + printf("Unrecognised diagnostic type %d", ds->which); + break; + } + + if (ds->message != 0) + printf(", message='%s'", ds->message); + printf("\n"); } +} + + +static int set_base(const char *arg) +{ + int i; + const char *cp; + 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 HAVE_OPENSSL_SSL_H + SSL *ssl; +#endif if (conn) { - printf("Already connected.\n"); - cs_close (conn); conn = NULL; if (session_mem) @@ -442,69 +550,115 @@ 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) { 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 HAVE_OPENSSL_SSL_H + if ((ssl = (SSL *) cs_get_ssl(conn))) + { + X509 *server_cert = SSL_get_peer_certificate (ssl); + char *str; + if (server_cert) + { + printf ("Server certificate:\n"); + + str = X509_NAME_oneline (X509_get_subject_name (server_cert),0,0); + if (str) + { + printf ("\t subject: %s\n", str); + free (str); + } + str = X509_NAME_oneline (X509_get_issuer_name (server_cert),0,0); + if (str) + { + printf ("\t issuer: %s\n", str); + free (str); + } + X509_free (server_cert); + } + } +#endif + 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) +{ + 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]; @@ -520,14 +674,20 @@ int cmd_authentication(char *arg) r = sscanf (arg, "%39s %39s %39s", user, group, pass); if (r == 0) { - printf("Auth field set to null\n"); + printf("Authentication set to null\n"); auth = 0; } if (r == 1) { auth = &au; - au.which = Z_IdAuthentication_open; - au.u.open = user; + if (!strcmp(user, "-")) { + au.which = Z_IdAuthentication_anonymous; + printf("Authentication set to Anonymous\n"); + } else { + au.which = Z_IdAuthentication_open; + au.u.open = user; + printf("Authentication set to Open (%s)\n", user); + } } if (r == 2) { @@ -537,6 +697,7 @@ int cmd_authentication(char *arg) idPass.groupId = NULL; idPass.userId = user; idPass.password = group; + printf("Authentication set to User (%s), Pass (%s)\n", user, group); } if (r == 3) { @@ -546,6 +707,8 @@ int cmd_authentication(char *arg) idPass.groupId = group; idPass.userId = user; idPass.password = pass; + printf("Authentication set to User (%s), Group (%s), Pass (%s)\n", + user, group, pass); } return 1; } @@ -553,105 +716,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; @@ -684,7 +748,7 @@ static void display_record(Z_External *r) if (ent && r->which == Z_External_octet) { Z_ext_typeent *type = z_ext_getentbyref(ent->value); - void *rr; + char *rr; if (type) { @@ -693,14 +757,14 @@ static void display_record(Z_External *r) */ odr_setbuf(in, (char*)r->u.octet_aligned->buf, r->u.octet_aligned->len, 0); - if (!(*type->fun)(in, (char **)&rr, 0, 0)) + if (!(*type->fun)(in, &rr, 0, 0)) { odr_perror(in, "Decoding constructed record."); - fprintf(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 { @@ -713,16 +777,16 @@ static void display_record(Z_External *r) } } } - if (ent && ent->oclass != CLASS_RECSYN) - return; if (ent && ent->value == VAL_SOIF) print_record((const unsigned char *) r->u.octet_aligned->buf, r->u.octet_aligned->len); - else if (r->which == Z_External_octet && r->u.octet_aligned->len) + else if (r->which == Z_External_octet) { const char *octet_buf = (char*)r->u.octet_aligned->buf; - if (ent->value == VAL_TEXT_XML || ent->value == VAL_APPLICATION_XML || - ent->value == VAL_HTML) + if (ent->oclass == CLASS_RECSYN && + (ent->value == VAL_TEXT_XML || + ent->value == VAL_APPLICATION_XML || + ent->value == VAL_HTML)) { print_record((const unsigned char *) octet_buf, r->u.octet_aligned->len); @@ -746,13 +810,75 @@ 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")) + { + if (ent->value == VAL_USMARC) + { + if (octet_buf[9] == 'a') + from = "UTF-8"; + else + from = "MARC-8"; + } + else + from = "ISO-8859-1"; + } + else if (marcCharset) + from = marcCharset; + if (outputCharset && from) + { + cd = yaz_iconv_open(outputCharset, from); + printf ("convert from %s to %s", from, + outputCharset); + if (!cd) + printf (" unsupported\n"); + else + printf ("\n"); + } + if (!cd) + fwrite (result, 1, rlen, stdout); + else + { + char outbuf[6]; + size_t inbytesleft = rlen; + const char *inp = result; + + while (inbytesleft) + { + size_t outbytesleft = sizeof(outbuf); + char *outp = outbuf; + size_t r; + + 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 { @@ -760,8 +886,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) { @@ -774,12 +900,119 @@ 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 if ( /* OPAC display not complete yet .. */ + ent && ent->value == VAL_OPAC) + { + int i; + if (r->u.opac->bibliographicRecord) + display_record(r->u.opac->bibliographicRecord); + for (i = 0; iu.opac->num_holdingsData; i++) + { + Z_HoldingsRecord *h = r->u.opac->holdingsData[i]; + if (h->which == Z_HoldingsRecord_marcHoldingsRecord) + { + printf ("MARC holdings %d\n", i); + display_record(h->u.marcHoldingsRecord); + } + else if (h->which == Z_HoldingsRecord_holdingsAndCirc) + { + int j; + + Z_HoldingsAndCircData *data = h->u.holdingsAndCirc; + + printf ("Data holdings %d\n", i); + if (data->typeOfRecord) + printf ("typeOfRecord: %s\n", data->typeOfRecord); + if (data->encodingLevel) + printf ("encodingLevel: %s\n", data->encodingLevel); + if (data->receiptAcqStatus) + printf ("receiptAcqStatus: %s\n", data->receiptAcqStatus); + if (data->generalRetention) + printf ("generalRetention: %s\n", data->generalRetention); + if (data->completeness) + printf ("completeness: %s\n", data->completeness); + if (data->dateOfReport) + printf ("dateOfReport: %s\n", data->dateOfReport); + if (data->nucCode) + printf ("nucCode: %s\n", data->nucCode); + if (data->localLocation) + printf ("localLocation: %s\n", data->localLocation); + if (data->shelvingLocation) + printf ("shelvingLocation: %s\n", data->shelvingLocation); + if (data->callNumber) + printf ("callNumber: %s\n", data->callNumber); + if (data->shelvingData) + printf ("shelvingData: %s\n", data->shelvingData); + if (data->copyNumber) + printf ("copyNumber: %s\n", data->copyNumber); + if (data->publicNote) + printf ("publicNote: %s\n", data->publicNote); + if (data->reproductionNote) + printf ("reproductionNote: %s\n", data->reproductionNote); + if (data->termsUseRepro) + printf ("termsUseRepro: %s\n", data->termsUseRepro); + if (data->enumAndChron) + printf ("enumAndChron: %s\n", data->enumAndChron); + for (j = 0; jnum_volumes; j++) + { + printf ("volume %d\n", j); + if (data->volumes[j]->enumeration) + printf (" enumeration: %s\n", + data->volumes[j]->enumeration); + if (data->volumes[j]->chronology) + printf (" chronology: %s\n", + data->volumes[j]->chronology); + if (data->volumes[j]->enumAndChron) + printf (" enumAndChron: %s\n", + data->volumes[j]->enumAndChron); + } + for (j = 0; jnum_circulationData; j++) + { + printf ("circulation %d\n", j); + if (data->circulationData[j]->availableNow) + printf (" availableNow: %d\n", + *data->circulationData[j]->availableNow); + if (data->circulationData[j]->availablityDate) + printf (" availabiltyDate: %s\n", + data->circulationData[j]->availablityDate); + if (data->circulationData[j]->availableThru) + printf (" availableThru: %s\n", + data->circulationData[j]->availableThru); + if (data->circulationData[j]->restrictions) + printf (" restrictions: %s\n", + data->circulationData[j]->restrictions); + if (data->circulationData[j]->itemId) + printf (" itemId: %s\n", + data->circulationData[j]->itemId); + if (data->circulationData[j]->renewable) + printf (" renewable: %d\n", + *data->circulationData[j]->renewable); + if (data->circulationData[j]->onHold) + printf (" onHold: %d\n", + *data->circulationData[j]->onHold); + if (data->circulationData[j]->enumAndChron) + printf (" enumAndChron: %s\n", + data->circulationData[j]->enumAndChron); + if (data->circulationData[j]->midspine) + printf (" midspine: %s\n", + data->circulationData[j]->midspine); + if (data->circulationData[j]->temporaryLocation) + printf (" temporaryLocation: %s\n", + data->circulationData[j]->temporaryLocation); + } + } + } } else { @@ -858,7 +1091,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; @@ -895,7 +1128,138 @@ 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 = cur_host; + char *path = 0; + char ctype[50]; + Z_SOAP_Handler h[2] = { + {"http://www.loc.gov/zing/srw/", 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->version = http_version; + 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; + if (apdu_file) + { + if (!z_GDU(print, &gdu, 0, 0)) + printf ("Failed to print outgoing APDU\n"); + odr_reset(print); + } + buf_out = odr_getbuf(out, &len_out, 0); + + /* we don't odr_reset(out), since we may need the buffer again */ + + do_hex_dump(buf_out, len_out); + + 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); + + sr->u.request->maximumRecords = odr_intdup(out, 0); + + if (record_schema) + sr->u.request->recordSchema = record_schema; + if (recordsyntax == VAL_TEXT_XML) + sr->u.explain_request->recordPacking = "xml"; + return send_srw(sr); +} +#endif + +static int send_searchRequest(const char *arg) { Z_APDU *apdu = zget_APDU(out, Z_APDU_searchRequest); Z_SearchRequest *req = apdu->u.searchRequest; @@ -907,8 +1271,11 @@ static int send_searchRequest(char *arg) Z_RPNQuery *RPNquery; Odr_oct ccl_query; YAZ_PQF_Parser pqf_parser; + Z_External *ext; + QueryType myQueryType = queryType; + char pqfbuf[512]; - if (queryType == QueryType_CCL2RPN) + if (myQueryType == QueryType_CCL2RPN) { rpn = ccl_find_str(bibset, arg, &error, &pos); if (error) @@ -916,7 +1283,32 @@ static int send_searchRequest(char *arg) printf("CCL ERROR: %s\n", ccl_err_msg(error)); return 0; } + } else if (myQueryType == QueryType_CQL2RPN) { + /* ### All this code should be wrapped in a utility function */ + CQL_parser parser; + struct cql_node *node; + const char *addinfo; + if (cqltrans == 0) { + printf("Can't use CQL: no translation file. Try set_cqlfile\n"); + return 0; + } + parser = cql_parser_create(); + if ((error = cql_parser_string(parser, arg)) != 0) { + printf("Can't parse CQL: must be a syntax error\n"); + return 0; + } + node = cql_parser_result(parser); + if ((error = cql_transform_buf(cqltrans, node, pqfbuf, + sizeof pqfbuf)) != 0) { + error = cql_transform_error(cqltrans, &addinfo); + printf ("Can't convert CQL to PQF: %s (addinfo=%s)\n", + cql_strerror(error), addinfo); + return 0; + } + arg = pqfbuf; + myQueryType = QueryType_Prefix; } + req->referenceId = set_refid (out); if (!strcmp(arg, "@big")) /* strictly for troublemaking */ { @@ -956,7 +1348,7 @@ static int send_searchRequest(char *arg) req->query = &query; - switch (queryType) + switch (myQueryType) { case QueryType_Prefix: query.which = Z_Query_type_1; @@ -993,13 +1385,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; } @@ -1378,8 +1780,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; } @@ -1534,19 +1936,41 @@ 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_common(const char *arg, int version); + +static int cmd_update(const char *arg) +{ + return cmd_update_common(arg, 1); +} + +static int cmd_update0(const char *arg) +{ + return cmd_update_common(arg, 0); +} + +static int cmd_update_common(const char *arg, int version) { Z_APDU *apdu = zget_APDU(out, Z_APDU_extendedServicesRequest ); Z_ExtendedServicesRequest *req = apdu->u.extendedServicesRequest; Z_External *r; int oid[OID_SIZE]; - Z_IUOriginPartToKeep *toKeep; - Z_IUSuppliedRecords *notToKeep; oident update_oid; 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; @@ -1603,7 +2027,10 @@ static int cmd_update(char *arg) update_oid.proto = PROTO_Z3950; update_oid.oclass = CLASS_EXTSERV; - update_oid.value = VAL_DBUPDATE; + if (version == 0) + update_oid.value = VAL_DBUPDATE0; + else + update_oid.value = VAL_DBUPDATE; oid_ent_to_oid (&update_oid, oid); req->packageType = odr_oiddup(out,oid); req->packageName = esPackageName; @@ -1615,52 +2042,103 @@ static int cmd_update(char *arg) r->direct_reference = odr_oiddup(out,oid); r->indirect_reference = 0; r->descriptor = 0; - r->which = Z_External_update; - r->u.update = (Z_IUUpdate *) odr_malloc(out, sizeof(*r->u.update)); - r->u.update->which = Z_IUUpdate_esRequest; - r->u.update->u.esRequest = (Z_IUUpdateEsRequest *) - odr_malloc(out, sizeof(*r->u.update->u.esRequest)); - toKeep = r->u.update->u.esRequest->toKeep = (Z_IUOriginPartToKeep *) - odr_malloc(out, sizeof(*r->u.update->u.esRequest->toKeep)); - toKeep->databaseName = databaseNames[0]; - toKeep->schema = 0; - toKeep->elementSetName = 0; - toKeep->actionQualifier = 0; - toKeep->action = (int *) odr_malloc(out, sizeof(*toKeep->action)); - *toKeep->action = action_no; - - notToKeep = r->u.update->u.esRequest->notToKeep = (Z_IUSuppliedRecords *) - odr_malloc(out, sizeof(*r->u.update->u.esRequest->notToKeep)); - notToKeep->num = 1; - notToKeep->elements = (Z_IUSuppliedRecords_elem **) - odr_malloc(out, sizeof(*notToKeep->elements)); - notToKeep->elements[0] = (Z_IUSuppliedRecords_elem *) - odr_malloc(out, sizeof(**notToKeep->elements)); - notToKeep->elements[0]->which = Z_IUSuppliedRecords_elem_opaque; - if (*recid) - { - notToKeep->elements[0]->u.opaque = (Odr_oct *) - odr_malloc (out, sizeof(Odr_oct)); - notToKeep->elements[0]->u.opaque->buf = (unsigned char *) recid; - notToKeep->elements[0]->u.opaque->size = strlen(recid); - notToKeep->elements[0]->u.opaque->len = strlen(recid); + if (version == 0) + { + Z_IU0OriginPartToKeep *toKeep; + Z_IU0SuppliedRecords *notToKeep; + + r->which = Z_External_update0; + r->u.update0 = (Z_IU0Update *) odr_malloc(out, sizeof(*r->u.update0)); + r->u.update0->which = Z_IUUpdate_esRequest; + r->u.update0->u.esRequest = (Z_IU0UpdateEsRequest *) + odr_malloc(out, sizeof(*r->u.update0->u.esRequest)); + toKeep = r->u.update0->u.esRequest->toKeep = (Z_IU0OriginPartToKeep *) + odr_malloc(out, sizeof(*r->u.update0->u.esRequest->toKeep)); + + toKeep->databaseName = databaseNames[0]; + toKeep->schema = 0; + toKeep->elementSetName = 0; + + toKeep->action = (int *) odr_malloc(out, sizeof(*toKeep->action)); + *toKeep->action = action_no; + + notToKeep = r->u.update0->u.esRequest->notToKeep = (Z_IU0SuppliedRecords *) + odr_malloc(out, sizeof(*r->u.update0->u.esRequest->notToKeep)); + notToKeep->num = 1; + notToKeep->elements = (Z_IU0SuppliedRecords_elem **) + odr_malloc(out, sizeof(*notToKeep->elements)); + notToKeep->elements[0] = (Z_IU0SuppliedRecords_elem *) + odr_malloc(out, sizeof(**notToKeep->elements)); + notToKeep->elements[0]->which = Z_IUSuppliedRecords_elem_opaque; + if (*recid) + { + notToKeep->elements[0]->u.opaque = (Odr_oct *) + odr_malloc (out, sizeof(Odr_oct)); + notToKeep->elements[0]->u.opaque->buf = (unsigned char *) recid; + notToKeep->elements[0]->u.opaque->size = strlen(recid); + notToKeep->elements[0]->u.opaque->len = strlen(recid); + } + else + notToKeep->elements[0]->u.opaque = 0; + notToKeep->elements[0]->supplementalId = 0; + notToKeep->elements[0]->correlationInfo = 0; + notToKeep->elements[0]->record = record_this; } else - notToKeep->elements[0]->u.opaque = 0; - notToKeep->elements[0]->supplementalId = 0; - notToKeep->elements[0]->correlationInfo = 0; - notToKeep->elements[0]->record = record_this; + { + Z_IUOriginPartToKeep *toKeep; + Z_IUSuppliedRecords *notToKeep; + + r->which = Z_External_update; + r->u.update = (Z_IUUpdate *) odr_malloc(out, sizeof(*r->u.update)); + r->u.update->which = Z_IUUpdate_esRequest; + r->u.update->u.esRequest = (Z_IUUpdateEsRequest *) + odr_malloc(out, sizeof(*r->u.update->u.esRequest)); + toKeep = r->u.update->u.esRequest->toKeep = (Z_IUOriginPartToKeep *) + odr_malloc(out, sizeof(*r->u.update->u.esRequest->toKeep)); + + toKeep->databaseName = databaseNames[0]; + toKeep->schema = 0; + toKeep->elementSetName = 0; + toKeep->actionQualifier = 0; + toKeep->action = (int *) odr_malloc(out, sizeof(*toKeep->action)); + *toKeep->action = action_no; + + notToKeep = r->u.update->u.esRequest->notToKeep = (Z_IUSuppliedRecords *) + odr_malloc(out, sizeof(*r->u.update->u.esRequest->notToKeep)); + notToKeep->num = 1; + notToKeep->elements = (Z_IUSuppliedRecords_elem **) + odr_malloc(out, sizeof(*notToKeep->elements)); + notToKeep->elements[0] = (Z_IUSuppliedRecords_elem *) + odr_malloc(out, sizeof(**notToKeep->elements)); + notToKeep->elements[0]->which = Z_IUSuppliedRecords_elem_opaque; + if (*recid) + { + notToKeep->elements[0]->u.opaque = (Odr_oct *) + odr_malloc (out, sizeof(Odr_oct)); + notToKeep->elements[0]->u.opaque->buf = (unsigned char *) recid; + notToKeep->elements[0]->u.opaque->size = strlen(recid); + notToKeep->elements[0]->u.opaque->len = strlen(recid); + } + else + notToKeep->elements[0]->u.opaque = 0; + notToKeep->elements[0]->supplementalId = 0; + notToKeep->elements[0]->correlationInfo = 0; + 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; @@ -1670,61 +2148,145 @@ static int cmd_itemorder(char *arg) return 2; } -static int cmd_find(char *arg) +static void show_opt(const char *arg, void *clientData) +{ + printf ("%s ", arg); +} + +static int cmd_zversion(const char *arg) +{ + if (*arg && arg) + z3950_version = atoi(arg); + else + printf ("version is %d\n", z3950_version); + return 0; +} + +static int cmd_options(const char *arg) +{ + if (*arg) + { + int r; + int pos; + r = yaz_init_opt_encode(&z3950_options, arg, &pos); + } + else + { + yaz_init_opt_decode(&z3950_options, show_opt, 0); + printf ("\n"); + } + return 0; +} + +static int cmd_explain(const char *arg) +{ + if (protocol != PROTO_HTTP) + return 0; +#if HAVE_XML2 + if (!conn) + cmd_open(0); + if (conn) + { + Z_SRW_PDU *sr = 0; + + setno = 1; + + /* save this for later .. when fetching individual records */ + sr = yaz_srw_get(out, Z_SRW_explain_request); + if (recordsyntax == VAL_TEXT_XML) + sr->u.explain_request->recordPacking = "xml"; + send_srw(sr); + return 2; + } +#endif + return 0; +} + +static int cmd_init(const char *arg) +{ + if (!conn || protocol != PROTO_Z3950) + return 0; + send_initRequest(0); + return 2; +} + +static int cmd_find(const char *arg) { if (!*arg) { printf("Find what?\n"); return 0; } - if (!conn) + if (protocol == PROTO_HTTP) + { +#if HAVE_XML2 + if (!conn) + cmd_open(0); + if (!conn) + return 0; + if (!send_SRW_searchRequest(arg)) + return 0; +#else + return 0; +#endif + } + else { - try_reconnect(); - - if (!conn) { - printf("Not connected yet\n"); - return 0; - }; + if (!conn) + { + try_reconnect(); + + if (!conn) { + printf("Not connected yet\n"); + return 0; + } + } + if (!send_searchRequest(arg)) + 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); @@ -1732,7 +2294,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; @@ -1752,35 +2314,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; @@ -1789,13 +2362,13 @@ static int send_presentRequest(char *arg) req->preferredRecordSyntax = odr_oiddup (out, oid_ent_to_oid(&prefsyn, oid)); - if (schema != VAL_NONE) + if (record_schema) { oident prefschema; prefschema.proto = protocol; prefschema.oclass = CLASS_SCHEMA; - prefschema.value = schema; + prefschema.value = oid_getvalbyname(record_schema); req->recordComposition = &compo; compo.which = Z_RecordComp_complex; @@ -1807,13 +2380,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) @@ -1842,10 +2416,31 @@ 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 (record_schema) + sr->u.request->recordSchema = record_schema; + if (recordsyntax == VAL_TEXT_XML) + sr->u.request->recordPacking = "xml"; + return send_srw(sr); +} +#endif + static void close_session (void) { - cs_close (conn); + if (conn) + cs_close (conn); conn = 0; if (session_mem) { @@ -1853,6 +2448,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) @@ -1887,19 +2485,35 @@ 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 (!conn) + return 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 (""); @@ -1907,7 +2521,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 = @@ -1919,6 +2533,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"); @@ -1938,6 +2554,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; @@ -2000,7 +2618,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; @@ -2008,6 +2626,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 @@ -2037,7 +2657,9 @@ int send_sortrequest(char *arg, int newset) void display_term(Z_TermInfo *t) { - if (t->term->which == Z_Term_general) + if (t->displayTerm) + printf("%s", t->displayTerm); + else if (t->term->which == Z_Term_general) { printf("%.*s", t->term->u.general->len, t->term->u.general->buf); sprintf(last_scan_line, "%.*s", t->term->u.general->len, @@ -2121,13 +2743,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"); @@ -2142,26 +2766,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)) { @@ -2182,39 +2808,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(record_schema); + record_schema = 0; + if (arg && *arg) + record_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]; @@ -2231,7 +2852,7 @@ int cmd_elements(char *arg) return 1; } -int cmd_attributeset(char *arg) +int cmd_attributeset(const char *arg) { char what[100]; @@ -2249,7 +2870,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; @@ -2257,18 +2878,24 @@ int cmd_querytype (char *arg) queryType = QueryType_Prefix; else if (!strcmp (arg, "ccl2rpn") || !strcmp (arg, "cclrpn")) queryType = QueryType_CCL2RPN; + else if (!strcmp(arg, "cql")) + queryType = QueryType_CQL; + else if (!strcmp (arg, "cql2rpn") || !strcmp (arg, "cqlrpn")) + queryType = QueryType_CQL2RPN; else { printf ("Querytype must be one of:\n"); printf (" prefix - Prefix query\n"); printf (" ccl - CCL query\n"); printf (" ccl2rpn - CCL query converted to RPN\n"); + printf (" cql - CQL\n"); + printf (" cql2rpn - CQL query converted to RPN\n"); return 0; } return 1; } -int cmd_refid (char *arg) +int cmd_refid (const char *arg) { xfree (refid); refid = NULL; @@ -2280,12 +2907,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; @@ -2296,58 +2925,86 @@ 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); - if (*l2) + xfree (negotiationCharset); + negotiationCharset = NULL; + if (*l1 && strcmp(l1, "-")) { - odr_set_charset (out, l1, l2); - odr_set_charset (in, l2, l1); + negotiationCharset = xstrdup(l1); + printf ("Character set negotiation : %s\n", negotiationCharset); } + else + printf ("Character set negotiation disabled\n"); + if (*l2) + { + xfree (outputCharset); + outputCharset = 0; + if (!strcmp(l2, "auto") && codeset) + { + if (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"); + } + 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); @@ -2363,21 +3020,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; @@ -2410,7 +3058,7 @@ int cmd_source(char* arg) return 1; } -int cmd_subshell(char* args) +int cmd_subshell(const char* args) { if(strlen(args)) system(args); @@ -2421,42 +3069,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); @@ -2465,11 +3118,24 @@ int cmd_set_cclfile(char* arg) return 0; } +int cmd_set_cqlfile(const char* arg) +{ + cql_transform_t newcqltrans; + + if ((newcqltrans = cql_transform_open_fname(arg)) == 0) { + perror("unable to open CQL file"); + return 0; + } + if (cqltrans != 0) + cql_transform_close(cqltrans); + + cqltrans = newcqltrans; + strcpy(cql_fields, 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) { @@ -2489,36 +3155,21 @@ 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"); - } - 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(marc_file && marc_file != stderr) { /* don't close stdout*/ + fclose(marc_file); } - - return 1; -} -int cmd_set_proxy(char* arg) -{ - if(yazProxy) free(yazProxy); - yazProxy=NULL; - - if(strlen(arg) > 1) { - yazProxy=strdup(arg); + 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; } @@ -2526,7 +3177,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; @@ -2601,7 +3252,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) @@ -2658,7 +3309,9 @@ static void initialize(void) ccl_qual_file (bibset, inf); fclose (inf); } - cmd_base("Default"); + + cqltrans = cql_transform_open_fname(cql_fields); + /* If this fails, no problem: we detect cqltrans == 0 later */ #if HAVE_READLINE_READLINE_H rl_attempted_completion_function = (CPPFunction*)readline_completer; @@ -2677,52 +3330,201 @@ static void initialize(void) struct timeval tv_start, tv_end; #endif -void wait_and_handle_responce() +#if HAVE_XML2 +static void handle_srw_record(Z_SRW_record *rec) +{ + if (rec->recordPosition) + { + printf ("pos=%d", *rec->recordPosition); + setno = *rec->recordPosition + 1; + } + if (rec->recordSchema) + printf (" schema=%s", rec->recordSchema); + printf ("\n"); + if (rec->recordData_buf && rec->recordData_len) + fwrite(rec->recordData_buf, 1, rec->recordData_len, stdout); + else + printf ("No data!"); + printf("\n"); +} + +static void handle_srw_explain_response(Z_SRW_explainResponse *res) +{ + handle_srw_record(&res->record); +} + +static void handle_srw_response(Z_SRW_searchRetrieveResponse *res) { + int i; + + printf ("Received SRW SearchRetrieve Response\n"); + for (i = 0; inum_diagnostics; i++) + { + if (res->diagnostics[i].uri) + printf ("SRW diagnostic %s\n", + res->diagnostics[i].uri); + else + printf ("SRW diagnostic missing or could not be decoded\n"); + if (res->diagnostics[i].message) + printf ("Message: %s\n", res->diagnostics[i].message); + if (res->diagnostics[i].details) + printf ("Details: %s\n", res->diagnostics[i].details); + } + if (res->numberOfRecords) + printf ("Number of hits: %d\n", *res->numberOfRecords); + for (i = 0; inum_records; i++) + handle_srw_record(res->records + i); +} + +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/", 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 if (sr->which == Z_SRW_explain_response) + handle_srw_explain_response(sr->u.explain_response); + else + ret = -1; + } + else if (soap_package && (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); + if (soap_package->u.fault->details) + printf ("SOAP Details %s\n", + soap_package->u.fault->details); + } + 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(); + } + else + { + 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); + + do_hex_dump(buf_out, len_out); + + 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; + do_hex_dump(netbuffer, res); + 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); + odr_reset(print); + } + if (conn && cs_more(conn)) + continue; + 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: @@ -2770,7 +3572,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 @@ -2789,7 +3601,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; @@ -2817,7 +3629,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 +3655,6 @@ int cmd_set_otherinfo(char* args) 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); @@ -2856,7 +3667,7 @@ int cmd_set_otherinfo(char* args) return 0; } -int cmd_list_otherinfo(char* args) +int cmd_list_otherinfo(const char* args) { int i; @@ -2891,7 +3702,7 @@ int cmd_list_otherinfo(char* args) } -int cmd_list_all(char* args) { +int cmd_list_all(const char* args) { int i; /* connection options */ @@ -2926,7 +3737,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 : "); @@ -2935,6 +3747,7 @@ int cmd_list_all(char* args) { /* Query options */ printf("CCL file : %s\n",ccl_fields); + printf("CQL file : %s\n",cql_fields); printf("Query type : %s\n",query_type_as_string(queryType)); printf("Named Result Sets : %s\n",setnumber==-1?"off":"on"); @@ -2944,12 +3757,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",record_schema ? record_schema : "not set"); 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"); @@ -2958,7 +3771,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; @@ -2986,18 +3799,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}, @@ -3023,24 +3836,28 @@ static struct { {"refid", cmd_refid, "",NULL,0,NULL}, {"itemorder", cmd_itemorder, "ill|item ",NULL,0,NULL}, {"update", cmd_update, " []",NULL,0,NULL}, + {"update0", cmd_update0, " []",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_cqlfile", cmd_set_cqlfile," ",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}, @@ -3051,11 +3868,15 @@ static struct { {"adm-commit", cmd_adm_commit, "",NULL,0,NULL}, {"adm-shutdown", cmd_adm_shutdown, "",NULL,0,NULL}, {"adm-startup", cmd_adm_startup, "",NULL,0,NULL}, + {"explain", cmd_explain, "", NULL, 0, NULL}, + {"options", cmd_options, "", NULL, 0, NULL}, + {"zversion", cmd_zversion, "", NULL, 0, NULL}, {"help", cmd_help, "", NULL,0,NULL}, + {"init", cmd_init, "", NULL,0,NULL}, {0,0,0,0,0,0} }; -static int cmd_help (char *line) +static int cmd_help (const char *line) { int i; char topic[21]; @@ -3065,9 +3886,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"); @@ -3095,7 +3916,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; @@ -3107,31 +3928,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; @@ -3158,9 +3979,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)) { @@ -3171,15 +3991,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"); @@ -3190,12 +4009,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); } @@ -3205,10 +4024,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; @@ -3241,18 +4060,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; @@ -3266,11 +4084,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; } @@ -3322,6 +4140,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; @@ -3330,7 +4159,28 @@ 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 + if (codeset) + outputCharset = xstrdup(codeset); + + ODR_MASK_SET(&z3950_options, Z_Options_search); + ODR_MASK_SET(&z3950_options, Z_Options_present); + ODR_MASK_SET(&z3950_options, Z_Options_namedResultSets); + ODR_MASK_SET(&z3950_options, Z_Options_triggerResourceCtrl); + ODR_MASK_SET(&z3950_options, Z_Options_scan); + ODR_MASK_SET(&z3950_options, Z_Options_sort); + ODR_MASK_SET(&z3950_options, Z_Options_extendedServices); + ODR_MASK_SET(&z3950_options, Z_Options_delSet); + + while ((ret = options("k:c:q:a:b:m:v:p:u:t:Vxd:", argv, argc, &arg)) != -2) { switch (ret) { @@ -3342,29 +4192,48 @@ int main(int argc, char **argv) strcat (open_command, arg); } break; + case 'd': + dump_file_prefix = arg; + break; case 'k': 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 'q': + strncpy (cql_fields, arg, sizeof(cql_fields)-1); + cql_fields[sizeof(cql_fields)-1] = '\0'; + break; + case 'b': + if (!strcmp(arg, "-")) + ber_file=stderr; + else + ber_file=fopen(arg, "a"); + break; case 'a': if (!strcmp(arg, "-")) apdu_file=stderr; else apdu_file=fopen(arg, "a"); break; - case 'p': - yazProxy=strdup(arg); - break; + case 'x': + hex_dump = 1; + break; + case 'p': + yazProxy=strdup(arg); + break; case 'u': if (!auth_command) { @@ -3374,12 +4243,16 @@ 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" + "[-q cqlfields] [-p ] [-u ] " + "[-k size] [-d dump] [-V] []\n", prog); exit (1); }