X-Git-Url: http://git.indexdata.com/?p=yaz-moved-to-github.git;a=blobdiff_plain;f=client%2Fclient.c;h=7fe8df2a6e77e2b29f745786a64358e33de5b638;hp=1016778a17eac4819891f8c74a549ee02b7ec8e8;hb=7057699040b614f56be178f3672b4a2b95301d5f;hpb=c066a043f79860daf37234db3509156a3fc9205f diff --git a/client/client.c b/client/client.c index 1016778..7fe8df2 100644 --- a/client/client.c +++ b/client/client.c @@ -1,10 +1,148 @@ /* - * Copyright (c) 1995-1999, Index Data. + * Copyright (c) 1995-2001, Index Data * See the file LICENSE for details. - * Sebastian Hammer, Adam Dickmeiss * * $Log: client.c,v $ - * Revision 1.76 1999-03-11 11:12:07 adam + * Revision 1.120 2001-04-06 12:26:46 adam + * Optional CCL module. Moved atoi_n to marcdisp.h from yaz-util.h. + * + * Revision 1.119 2001/04/05 13:08:48 adam + * New configure options: --enable-module. + * + * Revision 1.118 2001/03/27 14:48:06 adam + * Fixed scan for bad CCL. + * + * Revision 1.117 2001/03/25 21:55:12 adam + * Added odr_intdup. Ztest server returns TaskPackage for ItemUpdate. + * + * Revision 1.116 2001/03/21 12:43:36 adam + * Implemented cs_create_host. Better error reporting for SSL comstack. + * + * Revision 1.115 2001/03/13 18:10:58 adam + * Added option -c to set CCL config file. + * + * Revision 1.114 2001/02/21 13:46:53 adam + * C++ fixes. + * + * Revision 1.113 2001/02/21 09:41:15 adam + * Fixed problem with old codecs. + * + * Revision 1.112 2001/02/20 11:25:32 adam + * Added ill_get_APDU and ill_get_Cancel. + * + * Revision 1.111 2001/01/30 15:52:48 ja7 + * added command for setting packageName in ES packages! + * command is named packagename default is NULL for server suplyed package name + * + * Revision 1.110 2001/01/29 11:19:05 adam + * Clients prints options in InitResponse. + * + * Revision 1.109 2001/01/22 10:41:47 adam + * Multiple attribute may be specified for sorging. + * + * Revision 1.108 2000/11/23 10:58:32 adam + * SSL comstack support. Separate POSIX thread support library. + * + * Revision 1.107 2000/11/16 13:11:07 adam + * Changed because ccl_rpn_query sets attribute set. + * + * Revision 1.106 2000/11/13 09:44:59 adam + * Work on SCAN: RPN2CCL conversion and proper "next" scan. + * + * Revision 1.105 2000/10/02 11:07:44 adam + * Added peer_name member for bend_init handler. Changed the YAZ + * client so that tcp: can be avoided in target spec. + * + * Revision 1.104 2000/09/04 08:58:15 adam + * Added prefix yaz_ for most logging utility functions. + * + * Revision 1.103 2000/08/10 08:41:26 adam + * Fixes for ILL. + * + * Revision 1.102 2000/05/18 11:57:04 adam + * Client display time elapsed. + * + * Revision 1.101 2000/04/05 07:39:54 adam + * Added shared library support (libtool). + * + * Revision 1.100 2000/03/20 19:29:59 adam + * Minor change. + * + * Revision 1.99 2000/03/20 19:06:25 adam + * Added Segment request for fronend server. Work on admin for client. + * + * Revision 1.98 2000/03/16 13:55:49 ian + * Added commands for sending shutdown and startup admin requests via the admin ES. + * + * Revision 1.97 2000/03/14 14:06:04 ian + * Minor change to order of debugging output for send_apdu, + * fixed encoding of admin request. + * + * Revision 1.96 2000/03/14 09:27:07 ian + * Added code to enable sending of admin extended service requests + * + * Revision 1.95 2000/02/28 11:20:05 adam + * Using autoconf. New definitions: YAZ_BEGIN_CDECL/YAZ_END_CDECL. + * + * Revision 1.94 2000/01/31 13:15:21 adam + * Removed uses of assert(3). Cleanup of ODR. CCL parser update so + * that some characters are not surrounded by spaces in resulting term. + * ILL-code updates. + * + * Revision 1.93 2000/01/15 09:39:50 adam + * Implemented ill_get_ILLRequest. More ILL testing for client. + * + * Revision 1.92 1999/12/21 16:24:48 adam + * More robust ISO2709 handling (in case of real bad formats). + * + * Revision 1.91 1999/12/16 23:36:19 adam + * Implemented ILL protocol. Minor updates ASN.1 compiler. + * + * Revision 1.90 1999/11/30 13:47:11 adam + * Improved installation. Moved header files to include/yaz. + * + * Revision 1.89 1999/11/04 14:58:44 adam + * Added status elements for backend delete result set handler. + * Updated delete result result set command for client. + * + * Revision 1.88 1999/10/11 10:00:29 adam + * Modified printing of records. + * + * Revision 1.87 1999/08/27 09:40:32 adam + * Renamed logf function to yaz_log. Removed VC++ project files. + * + * Revision 1.86 1999/07/06 12:13:35 adam + * Added "schema" command. + * + * Revision 1.85 1999/06/16 11:55:24 adam + * Added APDU log to client. + * + * Revision 1.84 1999/06/01 14:29:11 adam + * Work on Extended Services. + * + * Revision 1.83 1999/05/26 15:24:26 adam + * Fixed minor bugs regarding DB Update (introduced by previous commit). + * + * Revision 1.82 1999/05/26 13:49:12 adam + * DB Update implemented in client (very basic). + * + * Revision 1.81 1999/04/20 09:56:48 adam + * Added 'name' paramter to encoder/decoder routines (typedef Odr_fun). + * Modified all encoders/decoders to reflect this change. + * + * Revision 1.80 1999/03/31 11:18:24 adam + * Implemented odr_strdup. Added Reference ID to backend server API. + * + * Revision 1.79 1999/03/23 14:14:25 adam + * Yet another fix. + * + * Revision 1.78 1999/03/18 12:57:18 adam + * Minor fix. + * + * Revision 1.77 1999/03/11 15:26:51 adam + * Fixed bug (introduced by previous commit). + * + * Revision 1.76 1999/03/11 11:12:07 adam * Added GNU readline support. HTML display in client. * * Revision 1.75 1999/02/01 15:37:32 adam @@ -255,24 +393,26 @@ #include #include #include -#include -#include +#include -#include -#include +#include #ifdef USE_XTIMOSI -#include +#include #endif -#include -#include -#include +#include +#include +#include + +#include -#include +#if YAZ_MODULE_ill +#include +#endif -#if CCL2RPN -#include +#if YAZ_MODULE_ccl +#include #endif #if HAVE_READLINE_READLINE_H @@ -282,13 +422,17 @@ #include #endif +#include "admin.h" + #define C_PROMPT "Z> " static ODR out, in, print; /* encoding and decoding streams */ +static FILE *apdu_file = 0; static COMSTACK conn = 0; /* our z-association */ static Z_IdAuthentication *auth = 0; /* our current auth definition */ -static char *databaseNames[128]; -static int num_databaseNames = 0; +char *databaseNames[128]; +int num_databaseNames = 0; +static Z_External *record_last = 0; static int setnumber = 0; /* current result set number */ static int smallSetUpperBound = 0; static int largeSetLowerBound = 1; @@ -297,10 +441,15 @@ 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 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[512] = "0"; +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 last_cmd[100] = "?"; static FILE *marcdump = 0; static char *refid = NULL; @@ -313,21 +462,32 @@ typedef enum { static QueryType queryType = QueryType_Prefix; -#if CCL2RPN +#if YAZ_MODULE_ccl static CCL_bibset bibset; /* CCL bibset handle */ #endif -static void send_apdu(Z_APDU *a) +ODR getODROutputStream() +{ + return out; +} + +void send_apdu(Z_APDU *a) { char *buf; int len; - if (!z_APDU(out, &a, 0)) + if (apdu_file) + { + z_APDU(print, &a, 0, 0); + odr_reset(print); + } + if (!z_APDU(out, &a, 0, 0)) { odr_perror(out, "Encoding APDU"); exit(1); } buf = odr_getbuf(out, &len, 0); + /* printf ("sending APDU of size %d\n", len); */ if (cs_put(conn, buf, len) < 0) { fprintf(stderr, "cs_put: %s", cs_errmsg(cs_errno(conn))); @@ -340,7 +500,7 @@ static void print_refid (Z_ReferenceId *id) { if (id) { - printf ("ReferenceId: '%.*s'\n", id->len, id->buf); + printf ("ReferenceId: '%.*s'\n", id->len, id->buf); } } @@ -348,7 +508,7 @@ static Z_ReferenceId *set_refid (ODR out) { Z_ReferenceId *id; if (!refid) - return 0; + return 0; id = (Z_ReferenceId *) odr_malloc (out, sizeof(*id)); id->size = id->len = strlen(refid); id->buf = (unsigned char *) odr_malloc (out, id->len); @@ -377,6 +537,7 @@ static void send_initRequest() ODR_MASK_SET(req->protocolVersion, Z_ProtocolVersion_3); *req->maximumRecordSize = 1024*1024; + *req->preferredMessageSize = 1024*1024; req->idAuthentication = auth; @@ -404,7 +565,7 @@ static int process_initResponse(Z_InitResponse *res) { printf("UserInformationfield:\n"); if (!z_External(print, (Z_External**)&res-> userInformationField, - 0)) + 0, 0)) { odr_perror(print, "Printing userinfo\n"); odr_reset(print); @@ -414,8 +575,37 @@ static int process_initResponse(Z_InitResponse *res) printf("Guessing visiblestring:\n"); printf("'%s'\n", res->userInformationField->u. octet_aligned->buf); } - odr_reset (print); - } + 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"); + if (ODR_MASK_GET(res->options, Z_Options_namedResultSets)) + printf (" namedResultSets"); + printf ("\n"); + fflush (stdout); return 0; } @@ -452,68 +642,47 @@ static int cmd_base(char *arg) int cmd_open(char *arg) { void *add; - char type[100], addr[100], base[100]; + char type_and_host[101], base[101]; CS_TYPE t; if (conn) { printf("Already connected.\n"); - cs_close (conn); - conn = NULL; - if (session_mem) - { - nmem_destroy (session_mem); - session_mem = NULL; - } + cs_close (conn); + conn = NULL; + if (session_mem) + { + nmem_destroy (session_mem); + session_mem = NULL; + } } + t = tcpip_type; base[0] = '\0'; - if (!*arg || sscanf(arg, "%[^:]:%[^/]/%s", type, addr, base) < 2) - { - fprintf(stderr, "Usage: open (osi|tcp) ':' [tsel '/']host[':'port]\n"); + if (sscanf (arg, "%100[^/]/%100s", type_and_host, base) < 1) return 0; - } - if (*base) - cmd_base (base); - if (!strcmp(type, "tcp")) - { - t = tcpip_type; - protocol = PROTO_Z3950; - } - else -#ifdef USE_XTIMOSI - if (!strcmp(type, "osi")) - { - t = mosi_type; - protocol = PROTO_SR; - } - else -#endif - { - fprintf(stderr, "Bad type: %s\n", type); - return 0; - } - if (!(conn = cs_create(t, 1, protocol))) - { - perror("cs_create"); - return 0; - } - if (!(add = cs_straddr(conn, addr))) + + conn = cs_create_host(type_and_host, 1, &add); + if (!conn) { - perror(arg); + printf ("Couldn't create comstack\n"); return 0; } printf("Connecting..."); fflush(stdout); if (cs_connect(conn, add) < 0) { - perror("connect"); + printf ("error = %s\n", cs_strerror(conn)); + if (conn->cerrno == CSYSERR) + perror("system"); cs_close(conn); conn = 0; return 0; } printf("Ok.\n"); send_initRequest(); + if (*base) + cmd_base (base); return 2; } @@ -543,12 +712,12 @@ static void display_variant(Z_Variant *v, int level) 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"); + 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"); } } @@ -581,51 +750,65 @@ static void display_grs1(Z_GenericRecord *r, int level) 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 + 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 printf("??????\n"); - 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); - } - } + 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; + for (i = 0; i= 32) || strchr ("\n\r\t\f", buf[i])) + fputc (buf[i], stdout); + else + printf ("\\X%02X", buf[i]); + /* add newline if not already added ... */ + if (i <= 0 || buf[i-1] != '\n') + fputc ('\n', stdout); +} + static void display_record(Z_DatabaseRecord *p) { Z_External *r = (Z_External*) p; oident *ent = oid_getentbyoid(r->direct_reference); + record_last = r; /* * Tell the user what we got. */ @@ -634,7 +817,7 @@ static void display_record(Z_DatabaseRecord *p) printf("Record type: "); if (ent) printf("%s\n", ent->desc); - else if (!odr_oid(print, &r->direct_reference, 0)) + else if (!odr_oid(print, &r->direct_reference, 0, 0)) { odr_perror(print, "print oid"); odr_reset(print); @@ -643,52 +826,52 @@ static void display_record(Z_DatabaseRecord *p) /* Check if this is a known, ASN.1 type tucked away in an octet string */ if (ent && r->which == Z_External_octet) { - Z_ext_typeent *type = z_ext_getentbyref(ent->value); - void *rr; - - if (type) - { - /* - * Call the given decoder to process the record. - */ - odr_setbuf(in, (char*)p->u.octet_aligned->buf, - p->u.octet_aligned->len, 0); - if (!(*type->fun)(in, (char **)&rr, 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*)p->u.octet_aligned->buf, - p->u.octet_aligned->len); - fprintf(stderr, "---------\n"); - exit(1); - } - /* - * Note: we throw away the original, BER-encoded record here. - * Do something else with it if you want to keep it. - */ - r->u.sutrs = (Z_SUTRS *) rr; /* we don't actually check the type here. */ - r->which = type->what; - } + Z_ext_typeent *type = z_ext_getentbyref(ent->value); + void *rr; + + if (type) + { + /* + * Call the given decoder to process the record. + */ + odr_setbuf(in, (char*)p->u.octet_aligned->buf, + p->u.octet_aligned->len, 0); + 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*)p->u.octet_aligned->buf, + p->u.octet_aligned->len); + fprintf(stderr, "---------\n"); + exit(1); + } + /* + * Note: we throw away the original, BER-encoded record here. + * Do something else with it if you want to keep it. + */ + r->u.sutrs = (Z_SUTRS *) rr; /* we don't actually check the type here. */ + r->which = type->what; + } } if (ent && ent->value == VAL_SOIF) - printf("%.*s", r->u.octet_aligned->len, r->u.octet_aligned->buf); + print_record((const unsigned char *) r->u.octet_aligned->buf, r->u.octet_aligned->len); else if (r->which == Z_External_octet && p->u.octet_aligned->len) { const char *octet_buf = (char*)p->u.octet_aligned->buf; - if (ent->value == VAL_TEXT_XML || ent->value == VAL_APPLICATION_XML || + if (ent->value == VAL_TEXT_XML || ent->value == VAL_APPLICATION_XML || ent->value == VAL_HTML) - { - int i; - for (i = 0; iu.octet_aligned->len; i++) - if (octet_buf[i] > 126 || octet_buf[i] < 7) - printf ("<%02X>", octet_buf[i]); - else - fputc (octet_buf[i], stdout); - printf ("\n"); + print_record((const unsigned char *) octet_buf, + p->u.octet_aligned->len); + else + { + if (marc_display (octet_buf, NULL) <= 0) + { + printf ("ISO2709 decoding failed, dumping record as is:\n"); + print_record((const unsigned char*) octet_buf, + p->u.octet_aligned->len); + } } - else - marc_display (octet_buf, NULL); if (marcdump) fwrite (octet_buf, 1, p->u.octet_aligned->len, marcdump); } @@ -699,7 +882,7 @@ static void display_record(Z_DatabaseRecord *p) printf("Expecting single SUTRS type for SUTRS.\n"); return; } - printf("%.*s", r->u.sutrs->len, r->u.sutrs->buf); + print_record(r->u.sutrs->buf, r->u.sutrs->len); } else if (ent && ent->value == VAL_GRS1) { @@ -713,7 +896,7 @@ static void display_record(Z_DatabaseRecord *p) else { printf("Unknown record representation.\n"); - if (!z_External(print, &r, 0)) + if (!z_External(print, &r, 0, 0)) { odr_perror(print, "Printing external"); odr_reset(print); @@ -731,33 +914,33 @@ static void display_diagrecs(Z_DiagRec **pp, int num) printf("Diagnostic message(s) from database:\n"); for (i = 0; iwhich != Z_DiagRec_defaultFormat) - { - printf("Diagnostic record not in default format.\n"); - return; - } - else - r = p->u.defaultFormat; - if (!(ent = oid_getentbyoid(r->diagnosticSetId)) || - ent->oclass != CLASS_DIAGSET || ent->value != VAL_BIB1) - printf("Missing or unknown diagset\n"); - printf(" [%d] %s", *r->condition, diagbib1_str(*r->condition)); + Z_DiagRec *p = pp[i]; + if (p->which != Z_DiagRec_defaultFormat) + { + printf("Diagnostic record not in default format.\n"); + return; + } + else + r = p->u.defaultFormat; + if (!(ent = oid_getentbyoid(r->diagnosticSetId)) || + ent->oclass != CLASS_DIAGSET || ent->value != VAL_BIB1) + printf("Missing or unknown diagset\n"); + printf(" [%d] %s", *r->condition, diagbib1_str(*r->condition)); #ifdef ASN_COMPILED - switch (r->which) - { - case Z_DefaultDiagFormat_v2Addinfo: - printf (" -- v2 addinfo '%s'\n", r->u.v2Addinfo); - break; - case Z_DefaultDiagFormat_v3Addinfo: - printf (" -- v3 addinfo '%s'\n", r->u.v3Addinfo); - break; - } + switch (r->which) + { + case Z_DefaultDiagFormat_v2Addinfo: + printf (" -- v2 addinfo '%s'\n", r->u.v2Addinfo); + break; + case Z_DefaultDiagFormat_v3Addinfo: + printf (" -- v3 addinfo '%s'\n", r->u.v3Addinfo); + break; + } #else - if (r->addinfo && *r->addinfo) - printf(" -- '%s'\n", r->addinfo); - else - printf("\n"); + if (r->addinfo && *r->addinfo) + printf(" -- '%s'\n", r->addinfo); + else + printf("\n"); #endif } } @@ -769,7 +952,7 @@ static void display_nameplusrecord(Z_NamePlusRecord *p) printf("[%s]", p->databaseName); if (p->which == Z_NamePlusRecord_surrogateDiagnostic) display_diagrecs(&p->u.surrogateDiagnostic, 1); - else + else if (p->which == Z_NamePlusRecord_databaseRecord) display_record(p->u.databaseRecord); } @@ -780,17 +963,17 @@ static void display_records(Z_Records *p) if (p->which == Z_Records_NSD) { #ifdef ASN_COMPILED - Z_DiagRec dr, *dr_p = &dr; - dr.which = Z_DiagRec_defaultFormat; - dr.u.defaultFormat = p->u.nonSurrogateDiagnostic; - display_diagrecs (&dr_p, 1); + Z_DiagRec dr, *dr_p = &dr; + dr.which = Z_DiagRec_defaultFormat; + dr.u.defaultFormat = p->u.nonSurrogateDiagnostic; + display_diagrecs (&dr_p, 1); #else - display_diagrecs (&p->u.nonSurrogateDiagnostic, 1); + display_diagrecs (&p->u.nonSurrogateDiagnostic, 1); #endif } else if (p->which == Z_Records_multipleNSD) - display_diagrecs (p->u.multipleNonSurDiagnostics->diagRecs, - p->u.multipleNonSurDiagnostics->num_diagRecs); + display_diagrecs (p->u.multipleNonSurDiagnostics->diagRecs, + p->u.multipleNonSurDiagnostics->num_diagRecs); else { printf("Records: %d\n", p->u.databaseOrSurDiagnostics->num_records); @@ -801,18 +984,35 @@ static void display_records(Z_Records *p) static int send_deleteResultSetRequest(char *arg) { + char names[8][32]; + int i; + Z_APDU *apdu = zget_APDU(out, Z_APDU_deleteResultSetRequest); Z_DeleteResultSetRequest *req = apdu->u.deleteResultSetRequest; req->referenceId = set_refid (out); - req->num_resultSetList = 1; - req->resultSetList = (char **) - odr_malloc (out, sizeof(*req->resultSetList)); - *req->resultSetList = arg; + req->num_resultSetList = + sscanf (arg, "%30s %30s %30s %30s %30s %30s %30s %30s", + names[0], names[1], names[2], names[3], + names[4], names[5], names[6], names[7]); + req->deleteFunction = (int *) - odr_malloc (out, sizeof(*req->deleteFunction)); - *req->deleteFunction = Z_DeleteRequest_list; + odr_malloc (out, sizeof(*req->deleteFunction)); + if (req->num_resultSetList > 0) + { + *req->deleteFunction = Z_DeleteRequest_list; + req->resultSetList = (char **) + odr_malloc (out, sizeof(*req->resultSetList)* + req->num_resultSetList); + for (i = 0; inum_resultSetList; i++) + req->resultSetList[i] = names[i]; + } + else + { + *req->deleteFunction = Z_DeleteRequest_all; + req->resultSetList = 0; + } send_apdu(apdu); printf("Sent deleteResultSetRequest.\n"); @@ -825,16 +1025,15 @@ static int send_searchRequest(char *arg) Z_SearchRequest *req = apdu->u.searchRequest; Z_Query query; int oid[OID_SIZE]; -#if CCL2RPN +#if YAZ_MODULE_ccl struct ccl_rpn_node *rpn = NULL; int error, pos; - oident bib1; #endif char setstring[100]; Z_RPNQuery *RPNquery; Odr_oct ccl_query; -#if CCL2RPN +#if YAZ_MODULE_ccl if (queryType == QueryType_CCL2RPN) { rpn = ccl_find_str(bibset, arg, &error, &pos); @@ -902,15 +1101,15 @@ static int send_searchRequest(char *arg) ccl_query.buf = (unsigned char*) arg; ccl_query.len = strlen(arg); break; -#if CCL2RPN +#if YAZ_MODULE_ccl case QueryType_CCL2RPN: query.which = Z_Query_type_1; RPNquery = ccl_rpn_query(out, rpn); - assert(RPNquery); - bib1.proto = protocol; - bib1.oclass = CLASS_ATTSET; - bib1.value = VAL_BIB1; - RPNquery->attributeSetId = oid_ent_to_oid(&bib1, oid); + if (!RPNquery) + { + printf ("Couldn't convert from CCL to RPN\n"); + return 0; + } query.u.type_1 = RPNquery; ccl_rpn_delete (rpn); break; @@ -1105,10 +1304,148 @@ static int process_resourceControlRequest (Z_ResourceControlRequest *req) void process_ESResponse(Z_ExtendedServicesResponse *res) { - printf("process_ESResponse\n"); + printf("process_ESResponse status="); + switch (*res->operationStatus) + { + case Z_ExtendedServicesResponse_done: + printf ("done\n"); + break; + case Z_ExtendedServicesResponse_accepted: + printf ("accepted\n"); + break; + case Z_ExtendedServicesResponse_failure: + printf ("failure\n"); + display_diagrecs(res->diagnostics, res->num_diagnostics); + break; + } +} + +#if YAZ_MODULE_ill + +const char *get_ill_element (void *clientData, const char *element) +{ + printf ("%s\n", element); + return 0; } -static Z_External *CreateItemOrderExternal(int itemno) +static Z_External *create_external_itemRequest() +{ + struct ill_get_ctl ctl; + ILL_ItemRequest *req; + Z_External *r = 0; + int item_request_size = 0; + char *item_request_buf = 0; + + ctl.odr = out; + ctl.clientData = 0; + ctl.f = get_ill_element; + + req = ill_get_ItemRequest(&ctl, "ill", 0); + if (!req) + printf ("ill_get_ItemRequest failed\n"); + + if (!ill_ItemRequest (out, &req, 0, 0)) + { + if (apdu_file) + { + ill_ItemRequest(print, &req, 0, 0); + odr_reset(print); + } + item_request_buf = odr_getbuf (out, &item_request_size, 0); + if (item_request_buf) + odr_setbuf (out, item_request_buf, item_request_size, 1); + printf ("Couldn't encode ItemRequest, size %d\n", item_request_size); + return 0; + } + else + { + oident oid; + + item_request_buf = odr_getbuf (out, &item_request_size, 0); + oid.proto = PROTO_GENERAL; + oid.oclass = CLASS_GENERAL; + oid.value = VAL_ISO_ILL_1; + + r = (Z_External *) odr_malloc (out, sizeof(*r)); + r->direct_reference = odr_oiddup(out,oid_getoidbyent(&oid)); + r->indirect_reference = 0; + r->descriptor = 0; + r->which = Z_External_single; + + r->u.single_ASN1_type = (Odr_oct *) + odr_malloc (out, sizeof(*r->u.single_ASN1_type)); + r->u.single_ASN1_type->buf = (unsigned char *) + odr_malloc (out, item_request_size); + r->u.single_ASN1_type->len = item_request_size; + r->u.single_ASN1_type->size = item_request_size; + memcpy (r->u.single_ASN1_type->buf, item_request_buf, + item_request_size); + printf ("len = %d\n", item_request_size); + } + return r; +} +#endif + +#ifdef YAZ_MODULE_ill +static Z_External *create_external_ILL_APDU(int which) +{ + struct ill_get_ctl ctl; + ILL_APDU *ill_apdu; + Z_External *r = 0; + int ill_request_size = 0; + char *ill_request_buf = 0; + + ctl.odr = out; + ctl.clientData = 0; + ctl.f = get_ill_element; + + ill_apdu = ill_get_APDU(&ctl, "ill", 0); + + if (!ill_APDU (out, &ill_apdu, 0, 0)) + { + if (apdu_file) + { + printf ("-------------------\n"); + ill_APDU(print, &ill_apdu, 0, 0); + odr_reset(print); + printf ("-------------------\n"); + } + ill_request_buf = odr_getbuf (out, &ill_request_size, 0); + if (ill_request_buf) + odr_setbuf (out, ill_request_buf, ill_request_size, 1); + printf ("Couldn't encode ILL-Request, size %d\n", ill_request_size); + return 0; + } + else + { + oident oid; + ill_request_buf = odr_getbuf (out, &ill_request_size, 0); + + oid.proto = PROTO_GENERAL; + oid.oclass = CLASS_GENERAL; + oid.value = VAL_ISO_ILL_1; + + r = (Z_External *) odr_malloc (out, sizeof(*r)); + r->direct_reference = odr_oiddup(out,oid_getoidbyent(&oid)); + r->indirect_reference = 0; + r->descriptor = 0; + r->which = Z_External_single; + + r->u.single_ASN1_type = (Odr_oct *) + odr_malloc (out, sizeof(*r->u.single_ASN1_type)); + r->u.single_ASN1_type->buf = (unsigned char *) + odr_malloc (out, ill_request_size); + r->u.single_ASN1_type->len = ill_request_size; + r->u.single_ASN1_type->size = ill_request_size; + memcpy (r->u.single_ASN1_type->buf, ill_request_buf, ill_request_size); + printf ("len = %d\n", ill_request_size); + } + return r; +} +#endif + + +static Z_External *create_ItemOrderExternal(const char *type, int itemno) { Z_External *r = (Z_External *) odr_malloc(out, sizeof(Z_External)); oident ItemOrderRequest; @@ -1118,10 +1455,8 @@ static Z_External *CreateItemOrderExternal(int itemno) ItemOrderRequest.value = VAL_ITEMORDER; r->direct_reference = odr_oiddup(out,oid_getoidbyent(&ItemOrderRequest)); - r->indirect_reference = (int *) odr_malloc(out,sizeof(int)); - *r->indirect_reference = 0; - - r->descriptor = "Extended services item order"; + r->indirect_reference = 0; + r->descriptor = 0; r->which = Z_External_itemOrder; @@ -1134,14 +1469,14 @@ static Z_External *CreateItemOrderExternal(int itemno) #endif r->u.itemOrder->u.esRequest = (Z_IORequest *) - odr_malloc(out,sizeof(Z_IORequest)); + odr_malloc(out,sizeof(Z_IORequest)); memset(r->u.itemOrder->u.esRequest, 0, sizeof(Z_IORequest)); r->u.itemOrder->u.esRequest->toKeep = (Z_IOOriginPartToKeep *) - odr_malloc(out,sizeof(Z_IOOriginPartToKeep)); + odr_malloc(out,sizeof(Z_IOOriginPartToKeep)); memset(r->u.itemOrder->u.esRequest->toKeep, 0, sizeof(Z_IOOriginPartToKeep)); r->u.itemOrder->u.esRequest->notToKeep = (Z_IOOriginPartNotToKeep *) - odr_malloc(out,sizeof(Z_IOOriginPartNotToKeep)); + odr_malloc(out,sizeof(Z_IOOriginPartNotToKeep)); memset(r->u.itemOrder->u.esRequest->notToKeep, 0, sizeof(Z_IOOriginPartNotToKeep)); r->u.itemOrder->u.esRequest->toKeep->supplDescription = NULL; @@ -1149,60 +1484,134 @@ static Z_External *CreateItemOrderExternal(int itemno) r->u.itemOrder->u.esRequest->toKeep->addlBilling = NULL; r->u.itemOrder->u.esRequest->notToKeep->resultSetItem = - (Z_IOResultSetItem *) odr_malloc(out, sizeof(Z_IOResultSetItem)); + (Z_IOResultSetItem *) odr_malloc(out, sizeof(Z_IOResultSetItem)); memset(r->u.itemOrder->u.esRequest->notToKeep->resultSetItem, 0, sizeof(Z_IOResultSetItem)); r->u.itemOrder->u.esRequest->notToKeep->resultSetItem->resultSetId = "1"; r->u.itemOrder->u.esRequest->notToKeep->resultSetItem->item = - (int *) odr_malloc(out, sizeof(int)); + (int *) odr_malloc(out, sizeof(int)); *r->u.itemOrder->u.esRequest->notToKeep->resultSetItem->item = itemno; - r->u.itemOrder->u.esRequest->notToKeep->itemRequest = NULL; +#if YAZ_MODULE_ill + if (!strcmp (type, "item") || !strcmp(type, "2")) + { + printf ("using item-request\n"); + r->u.itemOrder->u.esRequest->notToKeep->itemRequest = + create_external_itemRequest(); + } + else if (!strcmp(type, "ill") || !strcmp(type, "1")) + { + printf ("using ILL-request\n"); + r->u.itemOrder->u.esRequest->notToKeep->itemRequest = + create_external_ILL_APDU(ILL_APDU_ILL_Request); + } + else if (!strcmp(type, "xml") || !strcmp(type, "3")) + { + const char *xml_buf = + "\n" + " request\n" + " 000200\n" + " 1212 \n" + ""; + r->u.itemOrder->u.esRequest->notToKeep->itemRequest = + z_ext_record (out, VAL_TEXT_XML, xml_buf, strlen(xml_buf)); + } + else + r->u.itemOrder->u.esRequest->notToKeep->itemRequest = 0; + +#else + r->u.itemOrder->u.esRequest->notToKeep->itemRequest = 0; +#endif return r; } -/* II : Added to do DALI Item Order Extended services request */ -static int send_itemorder(char *arg) +static int send_itemorder(const char *type, int itemno) { - int itemno = -1; - Z_APDU *apdu = zget_APDU(out, Z_APDU_extendedServicesRequest ); + Z_APDU *apdu = zget_APDU(out, Z_APDU_extendedServicesRequest); Z_ExtendedServicesRequest *req = apdu->u.extendedServicesRequest; oident ItemOrderRequest; - if (*arg) - itemno = atoi(arg); - - /* Set up item order request */ - - /* Function being performed by this extended services request */ - req->function = (int *) odr_malloc(out, sizeof(int)); - *req->function = Z_ExtendedServicesRequest_create; - - /* Package type, Using protocol ILL ( But that's not in the oid.h file yet */ - /* create an object of class Extended Service, value Item Order */ ItemOrderRequest.proto = PROTO_Z3950; ItemOrderRequest.oclass = CLASS_EXTSERV; ItemOrderRequest.value = VAL_ITEMORDER; req->packageType = odr_oiddup(out,oid_getoidbyent(&ItemOrderRequest)); - req->packageName = "1.Extendedserveq"; - - /* ** taskSpecificParameters ** */ - req->taskSpecificParameters = CreateItemOrderExternal(itemno); + req->packageName = esPackageName; - /* waitAction - Create the ILL request and that's it */ - *req->waitAction = Z_ExtendedServicesRequest_wait; + req->taskSpecificParameters = create_ItemOrderExternal(type, itemno); send_apdu(apdu); return 0; } +static int cmd_update(char *arg) +{ + 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; + printf ("Update request\n"); + fflush(stdout); + + if (!record_last) + return 0; + update_oid.proto = PROTO_Z3950; + update_oid.oclass = CLASS_EXTSERV; + update_oid.value = VAL_DBUPDATE; + oid_ent_to_oid (&update_oid, oid); + req->packageType = odr_oiddup(out,oid); + req->packageName = esPackageName; + + r = req->taskSpecificParameters = (Z_External *) + odr_malloc (out, sizeof(*r)); + 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 = Z_IUOriginPartToKeep_recordInsert; + + 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]->u.number = 0; + notToKeep->elements[0]->supplementalId = 0; + notToKeep->elements[0]->correlationInfo = 0; + notToKeep->elements[0]->record = record_last; + + send_apdu(apdu); + + return 2; +} + /* II : Added to do DALI Item Order Extended services request */ static int cmd_itemorder(char *arg) { + char type[12]; + int itemno; + + if (sscanf (arg, "%10s %d", type, &itemno) != 2) + return 0; + printf("Item order request\n"); fflush(stdout); - - send_itemorder(arg); + send_itemorder(type, itemno); return(2); } @@ -1225,11 +1634,6 @@ static int cmd_find(char *arg) static int cmd_delete(char *arg) { - if (!*arg) - { - printf("Delete what?\n"); - return 0; - } if (!conn) { printf("Not connected yet\n"); @@ -1318,8 +1722,8 @@ static int send_presentRequest(char *arg) #if 0 if (1) { - static Z_Range range; - static Z_Range *rangep = ⦥ + static Z_Range range; + static Z_Range *rangep = ⦥ req->num_ranges = 1; #endif req->resultSetStartPoint = &setno; @@ -1327,9 +1731,53 @@ static int send_presentRequest(char *arg) prefsyn.proto = protocol; prefsyn.oclass = CLASS_RECSYN; prefsyn.value = recordsyntax; - req->preferredRecordSyntax = oid_ent_to_oid(&prefsyn, oid); + req->preferredRecordSyntax = + odr_oiddup (out, oid_ent_to_oid(&prefsyn, oid)); - if (elementSetNames) + if (schema != VAL_NONE) + { + oident prefschema; + + prefschema.proto = protocol; + prefschema.oclass = CLASS_SCHEMA; + prefschema.value = schema; + + req->recordComposition = &compo; + compo.which = Z_RecordComp_complex; + compo.u.complex = (Z_CompSpec *) + odr_malloc(out, sizeof(*compo.u.complex)); + compo.u.complex->selectAlternativeSyntax = (bool_t *) + odr_malloc(out, sizeof(bool_t)); + *compo.u.complex->selectAlternativeSyntax = 0; + + compo.u.complex->generic = (Z_Specification *) + odr_malloc(out, sizeof(*compo.u.complex->generic)); + compo.u.complex->generic->schema = (Odr_oid *) + odr_oiddup(out, oid_ent_to_oid(&prefschema, oid)); + if (!compo.u.complex->generic->schema) + { + /* OID wasn't a schema! Try record syntax instead. */ + prefschema.oclass = CLASS_RECSYN; + compo.u.complex->generic->schema = (Odr_oid *) + odr_oiddup(out, oid_ent_to_oid(&prefschema, oid)); + } + if (!elementSetNames) + compo.u.complex->generic->elementSpec = 0; + else + { + compo.u.complex->generic->elementSpec = (Z_ElementSpec *) + odr_malloc(out, sizeof(Z_ElementSpec)); + compo.u.complex->generic->elementSpec->which = + Z_ElementSpec_elementSetName; + compo.u.complex->generic->elementSpec->u.elementSetName = + elementSetNames->u.generic; + } + compo.u.complex->num_dbSpecific = 0; + compo.u.complex->dbSpecific = 0; + compo.u.complex->num_recordSyntax = 0; + compo.u.complex->recordSyntax = 0; + } + else if (elementSetNames) { req->recordComposition = &compo; compo.which = Z_RecordComp_simple; @@ -1363,21 +1811,21 @@ void process_close(Z_Close *req) req->diagnosticInformation ? req->diagnosticInformation : "NULL"); if (sent_close) { - cs_close (conn); - conn = NULL; - if (session_mem) - { - nmem_destroy (session_mem); - session_mem = NULL; - } - sent_close = 0; + cs_close (conn); + conn = NULL; + if (session_mem) + { + nmem_destroy (session_mem); + session_mem = NULL; + } + sent_close = 0; } else { - *res->closeReason = Z_Close_finished; - send_apdu(apdu); - printf("Sent response.\n"); - sent_close = 1; + *res->closeReason = Z_Close_finished; + send_apdu(apdu); + printf("Sent response.\n"); + sent_close = 1; } } @@ -1425,16 +1873,57 @@ int cmd_cancel(char *arg) return 2; } -int send_scanrequest(char *string, int pp, int num) +int send_scanrequest(const char *query, int pp, int num, const char *term) { Z_APDU *apdu = zget_APDU(out, Z_APDU_scanRequest); Z_ScanRequest *req = apdu->u.scanRequest; + int use_rpn = 1; +#if YAZ_MODULE_ccl + int oid[OID_SIZE]; - if (!(req->termListAndStartPoint = - p_query_scan(out, protocol, &req->attributeSet, string))) + if (queryType == QueryType_CCL2RPN) + { + oident bib1; + int error, pos; + struct ccl_rpn_node *rpn; + + rpn = ccl_find_str (bibset, query, &error, &pos); + if (error) + { + printf("CCL ERROR: %s\n", ccl_err_msg(error)); + return -1; + } + use_rpn = 0; + bib1.proto = PROTO_Z3950; + bib1.oclass = CLASS_ATTSET; + bib1.value = VAL_BIB1; + req->attributeSet = oid_ent_to_oid (&bib1, oid); + if (!(req->termListAndStartPoint = ccl_scan_query (out, rpn))) + { + printf("Couldn't convert CCL to Scan term\n"); + return -1; + } + ccl_rpn_delete (rpn); + } +#endif + if (use_rpn && !(req->termListAndStartPoint = + p_query_scan(out, protocol, &req->attributeSet, query))) + { + printf("Prefix query error\n"); + return -1; + } + if (term && *term) { - printf("Prefix query error\n"); - return -1; + if (req->termListAndStartPoint->term && + req->termListAndStartPoint->term->which == Z_Term_general && + req->termListAndStartPoint->term->u.general) + { + req->termListAndStartPoint->term->u.general->buf = + (unsigned char *) odr_strdup(out, term); + req->termListAndStartPoint->term->u.general->len = + req->termListAndStartPoint->term->u.general->size = + strlen(term); + } } req->referenceId = set_refid (out); req->num_databaseNames = num_databaseNames; @@ -1449,43 +1938,40 @@ int send_sortrequest(char *arg, int newset) { Z_APDU *apdu = zget_APDU(out, Z_APDU_sortRequest); Z_SortRequest *req = apdu->u.sortRequest; - Z_SortKeySpecList *sksl = (Z_SortKeySpecList *)odr_malloc (out, sizeof(*sksl)); + Z_SortKeySpecList *sksl = (Z_SortKeySpecList *) + odr_malloc (out, sizeof(*sksl)); char setstring[32]; - char sort_string[32], sort_flags[32]; + char sort_string_buf[32], sort_flags[32]; int off; int oid[OID_SIZE]; oident bib1; if (setnumber >= 0) - sprintf (setstring, "%d", setnumber); + sprintf (setstring, "%d", setnumber); else - sprintf (setstring, "default"); + sprintf (setstring, "default"); req->referenceId = set_refid (out); #ifdef ASN_COMPILED req->num_inputResultSetNames = 1; req->inputResultSetNames = (Z_InternationalString **) - odr_malloc (out, sizeof(*req->inputResultSetNames)); - req->inputResultSetNames[0] = (char *) - odr_malloc (out, strlen(setstring)+1); - strcpy (req->inputResultSetNames[0], setstring); + odr_malloc (out, sizeof(*req->inputResultSetNames)); + req->inputResultSetNames[0] = odr_strdup (out, setstring); #else req->inputResultSetNames = - (Z_StringList *)odr_malloc (out, sizeof(*req->inputResultSetNames)); + (Z_StringList *)odr_malloc (out, sizeof(*req->inputResultSetNames)); req->inputResultSetNames->num_strings = 1; req->inputResultSetNames->strings = - (char **)odr_malloc (out, sizeof(*req->inputResultSetNames->strings)); + (char **)odr_malloc (out, sizeof(*req->inputResultSetNames->strings)); req->inputResultSetNames->strings[0] = - (char *)odr_malloc (out, strlen(setstring)+1); - strcpy (req->inputResultSetNames->strings[0], setstring); + odr_strdup (out, setstring); #endif if (newset && setnumber >= 0) - sprintf (setstring, "%d", ++setnumber); + sprintf (setstring, "%d", ++setnumber); - req->sortedResultSetName = (char *)odr_malloc (out, strlen(setstring)+1); - strcpy (req->sortedResultSetName, setstring); + req->sortedResultSetName = odr_strdup (out, setstring); req->sortSequence = sksl; sksl->num_specs = 0; @@ -1494,88 +1980,101 @@ int send_sortrequest(char *arg, int newset) bib1.proto = protocol; bib1.oclass = CLASS_ATTSET; bib1.value = VAL_BIB1; - while ((sscanf (arg, "%31s %31s%n", sort_string, sort_flags, &off)) == 2 + while ((sscanf (arg, "%31s %31s%n", sort_string_buf, sort_flags, &off)) == 2 && off > 1) { - int i; - char *sort_string_sep; - Z_SortKeySpec *sks = (Z_SortKeySpec *)odr_malloc (out, sizeof(*sks)); - Z_SortKey *sk = (Z_SortKey *)odr_malloc (out, sizeof(*sk)); - - arg += off; - sksl->specs[sksl->num_specs++] = sks; - sks->sortElement = (Z_SortElement *)odr_malloc (out, sizeof(*sks->sortElement)); - sks->sortElement->which = Z_SortElement_generic; - sks->sortElement->u.generic = sk; - - if ((sort_string_sep = strchr (sort_string, '='))) - { - Z_AttributeElement *el = (Z_AttributeElement *)odr_malloc (out, sizeof(*el)); - sk->which = Z_SortKey_sortAttributes; - sk->u.sortAttributes = - (Z_SortAttributes *)odr_malloc (out, sizeof(*sk->u.sortAttributes)); - sk->u.sortAttributes->id = oid_ent_to_oid(&bib1, oid); - sk->u.sortAttributes->list = - (Z_AttributeList *)odr_malloc (out, sizeof(*sk->u.sortAttributes->list)); - sk->u.sortAttributes->list->num_attributes = 1; - sk->u.sortAttributes->list->attributes = - (Z_AttributeElement **)odr_malloc (out, + int i; + char *sort_string_sep; + char *sort_string = sort_string_buf; + Z_SortKeySpec *sks = (Z_SortKeySpec *)odr_malloc (out, sizeof(*sks)); + Z_SortKey *sk = (Z_SortKey *)odr_malloc (out, sizeof(*sk)); + + arg += off; + sksl->specs[sksl->num_specs++] = sks; + sks->sortElement = (Z_SortElement *)odr_malloc (out, sizeof(*sks->sortElement)); + sks->sortElement->which = Z_SortElement_generic; + sks->sortElement->u.generic = sk; + + if ((sort_string_sep = strchr (sort_string, '='))) + { + int i = 0; + sk->which = Z_SortKey_sortAttributes; + sk->u.sortAttributes = + (Z_SortAttributes *)odr_malloc (out, sizeof(*sk->u.sortAttributes)); + sk->u.sortAttributes->id = oid_ent_to_oid(&bib1, oid); + sk->u.sortAttributes->list = + (Z_AttributeList *)odr_malloc (out, sizeof(*sk->u.sortAttributes->list)); + sk->u.sortAttributes->list->attributes = + (Z_AttributeElement **) + odr_malloc (out, 10 * sizeof(*sk->u.sortAttributes->list->attributes)); - sk->u.sortAttributes->list->attributes[0] = el; - el->attributeSet = 0; - el->attributeType = (int *)odr_malloc (out, sizeof(*el->attributeType)); - *el->attributeType = atoi (sort_string); - el->which = Z_AttributeValue_numeric; - el->value.numeric = (int *)odr_malloc (out, sizeof(*el->value.numeric)); - *el->value.numeric = atoi (sort_string_sep + 1); - } - else - { - sk->which = Z_SortKey_sortField; - sk->u.sortField = (char *)odr_malloc (out, strlen(sort_string)+1); - strcpy (sk->u.sortField, sort_string); - } - sks->sortRelation = (int *)odr_malloc (out, sizeof(*sks->sortRelation)); - *sks->sortRelation = Z_SortRelation_ascending; - sks->caseSensitivity = (int *)odr_malloc (out, sizeof(*sks->caseSensitivity)); - *sks->caseSensitivity = Z_SortCase_caseSensitive; + while (i < 10 && sort_string && sort_string_sep) + { + Z_AttributeElement *el = (Z_AttributeElement *) + odr_malloc (out, sizeof(*el)); + sk->u.sortAttributes->list->attributes[i] = el; + el->attributeSet = 0; + el->attributeType = (int *)odr_malloc (out, sizeof(*el->attributeType)); + *el->attributeType = atoi (sort_string); + el->which = Z_AttributeValue_numeric; + el->value.numeric = (int *)odr_malloc (out, sizeof(*el->value.numeric)); + *el->value.numeric = atoi (sort_string_sep + 1); + i++; + sort_string = strchr(sort_string, ','); + if (sort_string) + { + sort_string++; + sort_string_sep = strchr (sort_string, '='); + } + } + sk->u.sortAttributes->list->num_attributes = i; + } + else + { + sk->which = Z_SortKey_sortField; + sk->u.sortField = odr_strdup (out, sort_string); + } + sks->sortRelation = (int *)odr_malloc (out, sizeof(*sks->sortRelation)); + *sks->sortRelation = Z_SortRelation_ascending; + sks->caseSensitivity = (int *)odr_malloc (out, sizeof(*sks->caseSensitivity)); + *sks->caseSensitivity = Z_SortCase_caseSensitive; #ifdef ASN_COMPILED - sks->which = Z_SortKeySpec_null; - sks->u.null = odr_nullval (); + sks->which = Z_SortKeySpec_null; + sks->u.null = odr_nullval (); #else - sks->missingValueAction = NULL; + sks->missingValueAction = NULL; #endif - for (i = 0; sort_flags[i]; i++) - { - switch (sort_flags[i]) - { - case 'a': - case 'A': - case '>': - *sks->sortRelation = Z_SortRelation_descending; - break; - case 'd': - case 'D': - case '<': - *sks->sortRelation = Z_SortRelation_ascending; - break; - case 'i': - case 'I': - *sks->caseSensitivity = Z_SortCase_caseInsensitive; - break; - case 'S': - case 's': - *sks->caseSensitivity = Z_SortCase_caseSensitive; - break; - } - } + for (i = 0; sort_flags[i]; i++) + { + switch (sort_flags[i]) + { + case 'a': + case 'A': + case '>': + *sks->sortRelation = Z_SortRelation_descending; + break; + case 'd': + case 'D': + case '<': + *sks->sortRelation = Z_SortRelation_ascending; + break; + case 'i': + case 'I': + *sks->caseSensitivity = Z_SortCase_caseInsensitive; + break; + case 'S': + case 's': + *sks->caseSensitivity = Z_SortCase_caseSensitive; + break; + } + } } if (!sksl->num_specs) { printf ("Missing sort specifications\n"); - return -1; + return -1; } send_apdu(apdu); return 2; @@ -1585,13 +2084,16 @@ void display_term(Z_TermInfo *t) { if (t->term->which == Z_Term_general) { - printf("%.*s (%d)\n", t->term->u.general->len, t->term->u.general->buf, - t->globalOccurrences ? *t->globalOccurrences : -1); - sprintf(last_scan, "%.*s", t->term->u.general->len, + printf("%.*s", t->term->u.general->len, t->term->u.general->buf); + sprintf(last_scan_line, "%.*s", t->term->u.general->len, t->term->u.general->buf); } else - printf("Term type not general.\n"); + printf("Term (not general)"); + if (t->globalOccurrences) + printf (" (%d)\n", *t->globalOccurrences); + else + printf ("\n"); } void process_scanResponse(Z_ScanResponse *res) @@ -1604,28 +2106,28 @@ void process_scanResponse(Z_ScanResponse *res) print_refid (res->referenceId); printf("%d entries", *res->numberOfEntriesReturned); if (res->positionOfTerm) - printf (", position=%d", *res->positionOfTerm); + printf (", position=%d", *res->positionOfTerm); printf ("\n"); if (*res->scanStatus != Z_Scan_success) printf("Scan returned code %d\n", *res->scanStatus); if (!res->entries) return; if ((entries = res->entries->entries)) - num_entries = res->entries->num_entries; + num_entries = res->entries->num_entries; for (i = 0; i < num_entries; i++) { int pos_term = res->positionOfTerm ? *res->positionOfTerm : -1; - if (entries[i]->which == Z_Entry_termInfo) - { - printf("%c ", i + 1 == pos_term ? '*' : ' '); - display_term(entries[i]->u.termInfo); - } - else - display_diagrecs(&entries[i]->u.surrogateDiagnostic, 1); + if (entries[i]->which == Z_Entry_termInfo) + { + printf("%c ", i + 1 == pos_term ? '*' : ' '); + display_term(entries[i]->u.termInfo); + } + else + display_diagrecs(&entries[i]->u.surrogateDiagnostic, 1); } if (res->entries->nonsurrogateDiagnostics) - display_diagrecs (res->entries->nonsurrogateDiagnostics, - res->entries->num_nonsurrogateDiagnostics); + display_diagrecs (res->entries->nonsurrogateDiagnostics, + res->entries->num_nonsurrogateDiagnostics); } void process_sortResponse(Z_SortResponse *res) @@ -1634,27 +2136,42 @@ void process_sortResponse(Z_SortResponse *res) switch (*res->sortStatus) { case Z_SortStatus_success: - printf ("success"); break; + printf ("success"); break; case Z_SortStatus_partial_1: - printf ("partial"); break; + printf ("partial"); break; case Z_SortStatus_failure: - printf ("failure"); break; + printf ("failure"); break; default: - printf ("unknown (%d)", *res->sortStatus); + printf ("unknown (%d)", *res->sortStatus); } printf ("\n"); print_refid (res->referenceId); #ifdef ASN_COMPILED if (res->diagnostics) display_diagrecs(res->diagnostics, - res->num_diagnostics); + res->num_diagnostics); #else if (res->diagnostics) display_diagrecs(res->diagnostics->diagRecs, - res->diagnostics->num_diagRecs); + res->diagnostics->num_diagRecs); #endif } +void process_deleteResultSetResponse (Z_DeleteResultSetResponse *res) +{ + printf("Got deleteResultSetResponse status=%d\n", + *res->deleteOperationStatus); + if (res->deleteListStatuses) + { + int i; + for (i = 0; i < res->deleteListStatuses->num; i++) + { + printf ("%s status=%d\n", res->deleteListStatuses->elements[i]->id, + *res->deleteListStatuses->elements[i]->status); + } + } +} + int cmd_sort_generic(char *arg, int newset) { if (!conn) @@ -1671,7 +2188,7 @@ int cmd_sort_generic(char *arg, int newset) { if (send_sortrequest(arg, newset) < 0) return 0; - return 2; + return 2; } return 0; } @@ -1700,15 +2217,34 @@ int cmd_scan(char *arg) } if (*arg) { - if (send_scanrequest(arg, 1, 20) < 0) + strcpy (last_scan_query, arg); + if (send_scanrequest(arg, 1, 20, 0) < 0) return 0; } else - if (send_scanrequest(last_scan, 1, 20) < 0) + { + if (send_scanrequest(last_scan_query, 1, 20, last_scan_line) < 0) return 0; + } return 2; } +int cmd_schema(char *arg) +{ + if (!arg || !*arg) + { + schema = VAL_NONE; + return 1; + } + schema = oid_getvalbyname (arg); + if (schema == VAL_NONE) + { + printf ("unknown schema\n"); + return 0; + } + return 1; +} + int cmd_format(char *arg) { if (!arg || !*arg) @@ -1732,8 +2268,8 @@ int cmd_elements(char *arg) if (!arg || !*arg) { - printf("Usage: elements \n"); - return 0; + elementSetNames = 0; + return 1; } strcpy(what, arg); esn.which = Z_ElementSetNames_generic; @@ -1748,14 +2284,14 @@ int cmd_attributeset(char *arg) if (!arg || !*arg) { - printf("Usage: attributeset \n"); - return 0; + printf("Usage: attributeset \n"); + return 0; } sscanf(arg, "%s", what); if (p_query_attset (what)) { - printf("Unknown attribute set name\n"); - return 0; + printf("Unknown attribute set name\n"); + return 0; } return 1; } @@ -1764,9 +2300,9 @@ int cmd_querytype (char *arg) { if (!strcmp (arg, "ccl")) queryType = QueryType_CCL; - else if (!strcmp (arg, "prefix")) + else if (!strcmp (arg, "prefix") || !strcmp(arg, "rpn")) queryType = QueryType_Prefix; -#if CCL2RPN +#if YAZ_MODULE_ccl else if (!strcmp (arg, "ccl2rpn") || !strcmp (arg, "cclrpn")) queryType = QueryType_CCL2RPN; #endif @@ -1775,7 +2311,7 @@ int cmd_querytype (char *arg) printf ("Querytype must be one of:\n"); printf (" prefix - Prefix query\n"); printf (" ccl - CCL query\n"); -#if CCL2RPN +#if YAZ_MODULE_ccl printf (" ccl2rpn - CCL query converted to RPN\n"); #endif return 0; @@ -1789,8 +2325,8 @@ int cmd_refid (char *arg) refid = NULL; if (*arg) { - refid = (char *) xmalloc (strlen(arg)+1); - strcpy (refid, arg); + refid = (char *) xmalloc (strlen(arg)+1); + strcpy (refid, arg); } return 1; } @@ -1800,7 +2336,7 @@ int cmd_close(char *arg) Z_APDU *apdu; Z_Close *req; if (!conn) - return 0; + return 0; apdu = zget_APDU(out, Z_APDU_close); req = apdu->u.close; @@ -1811,9 +2347,20 @@ int cmd_close(char *arg) return 2; } +int cmd_packagename(char* arg) { + xfree (esPackageName); + esPackageName = NULL; + if (*arg) + { + esPackageName = (char *) xmalloc (strlen(arg)+1); + strcpy (esPackageName, arg); + } + return 1; +}; + static void initialize(void) { -#if CCL2RPN +#if YAZ_MODULE_ccl FILE *inf; #endif nmem_init(); @@ -1825,10 +2372,12 @@ static void initialize(void) exit(1); } setvbuf(stdout, 0, _IONBF, 0); + if (apdu_file) + odr_setprint(print, apdu_file); -#if CCL2RPN +#if YAZ_MODULE_ccl bibset = ccl_qual_mk (); - inf = fopen ("default.bib", "r"); + inf = fopen (ccl_fields, "r"); if (inf) { ccl_qual_file (bibset, inf); @@ -1848,12 +2397,12 @@ static int client(int wait) {"open", cmd_open, "('tcp'|'osi')':'['/'][':']"}, {"quit", cmd_quit, ""}, {"find", cmd_find, ""}, - {"delete", cmd_delete, ""}, + {"delete", cmd_delete, ""}, {"base", cmd_base, ""}, {"show", cmd_show, "['+'<#recs>['+']]"}, {"scan", cmd_scan, ""}, - {"sort", cmd_sort, " ..."}, - {"sort+", cmd_sort_newset, " ..."}, + {"sort", cmd_sort, " ..."}, + {"sort+", cmd_sort_newset, " ..."}, {"authentication", cmd_authentication, ""}, {"lslb", cmd_lslb, ""}, {"ssub", cmd_ssub, ""}, @@ -1862,18 +2411,37 @@ static int client(int wait) {"setnames", cmd_setnames, ""}, {"cancel", cmd_cancel, ""}, {"format", cmd_format, ""}, + {"schema", cmd_schema, ""}, {"elements", cmd_elements, ""}, {"close", cmd_close, ""}, - {"attributeset", cmd_attributeset, ""}, + {"attributeset", cmd_attributeset, ""}, {"querytype", cmd_querytype, ""}, - {"refid", cmd_refid, ""}, - {"itemorder", cmd_itemorder, ""}, + {"refid", cmd_refid, ""}, + {"itemorder", cmd_itemorder, "ill|item "}, + {"update", cmd_update, ""}, + {"packagename", cmd_packagename, ""}, +#ifdef ASN_COMPILED + /* Server Admin Functions */ + {"adm-reindex", cmd_adm_reindex, ""}, + {"adm-truncate", cmd_adm_truncate, "('database'|'index')"}, + {"adm-create", cmd_adm_create, ""}, + {"adm-drop", cmd_adm_drop, "('database'|'index')"}, + {"adm-import", cmd_adm_import, " "}, + {"adm-refresh", cmd_adm_refresh, ""}, + {"adm-commit", cmd_adm_commit, ""}, + {"adm-shutdown", cmd_adm_shutdown, ""}, + {"adm-startup", cmd_adm_startup, ""}, +#endif {0,0} }; char *netbuffer= 0; int netbufferlen = 0; int i; Z_APDU *apdu; +#if HAVE_GETTIMEOFDAY + struct timeval tv_start, tv_end; + gettimeofday (&tv_start, 0); +#endif while (1) { @@ -1882,7 +2450,7 @@ static int client(int wait) fd_set input; #endif char line[1024], word[1024], arg[1024]; - + #ifdef USE_SELECT FD_ZERO(&input); FD_SET(0, &input); @@ -1897,27 +2465,33 @@ static int client(int wait) continue; if (!wait && FD_ISSET(0, &input)) #else - if (!wait) + if (!wait) #endif - { + { #if HAVE_READLINE_READLINE_H - char* line_in; - line_in=readline(C_PROMPT); + char* line_in; + line_in=readline(C_PROMPT); + if (!line_in) + break; #if HAVE_READLINE_HISTORY_H - if (*line_in) - add_history(line_in); + if (*line_in) + add_history(line_in); #endif - strcpy(line,line_in); + strcpy(line,line_in); free (line_in); #else - char *end_p; + char *end_p; printf (C_PROMPT); - fflush(stdout); - if (!fgets(line, 1023, stdin)) - break; - if ((end_p = strchr (line, '\n'))) - *end_p = '\0'; + fflush(stdout); + if (!fgets(line, 1023, stdin)) + break; + if ((end_p = strchr (line, '\n'))) + *end_p = '\0'; #endif +#if HAVE_GETTIMEOFDAY + gettimeofday (&tv_start, 0); +#endif + if ((res = sscanf(line, "%s %[^;]", word, arg)) <= 0) { strcpy(word, last_cmd); @@ -1941,14 +2515,16 @@ static int client(int wait) res = 1; } if (res < 2) - { - continue; - } + { + continue; + } } - wait = 0; + wait = 0; + if (conn #ifdef USE_SELECT - if (conn && FD_ISSET(cs_fileno(conn), &input)) + && FD_ISSET(cs_fileno(conn), &input) #endif + ) { do { @@ -1963,73 +2539,82 @@ static int client(int wait) exit(1); } odr_reset(in); /* release APDU from last round */ + record_last = 0; odr_setbuf(in, netbuffer, res, 0); - if (!z_APDU(in, &apdu, 0)) + if (!z_APDU(in, &apdu, 0, 0)) { odr_perror(in, "Decoding incoming APDU"); - fprintf(stderr, "[Near %d]\n", odr_offset(in)); + 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); exit(1); } -#if 0 - if (!z_APDU(print, &apdu, 0)) + if (apdu_file && !z_APDU(print, &apdu, 0, 0)) { odr_perror(print, "Failed to print incoming APDU"); odr_reset(print); continue; } -#endif switch(apdu->which) { - case Z_APDU_initResponse: - process_initResponse(apdu->u.initResponse); - break; - case Z_APDU_searchResponse: - process_searchResponse(apdu->u.searchResponse); - break; - case Z_APDU_scanResponse: - process_scanResponse(apdu->u.scanResponse); - break; - case Z_APDU_presentResponse: + case Z_APDU_initResponse: + process_initResponse(apdu->u.initResponse); + break; + case Z_APDU_searchResponse: + process_searchResponse(apdu->u.searchResponse); + break; + case Z_APDU_scanResponse: + process_scanResponse(apdu->u.scanResponse); + break; + case Z_APDU_presentResponse: print_refid (apdu->u.presentResponse->referenceId); - setno += - *apdu->u.presentResponse->numberOfRecordsReturned; - if (apdu->u.presentResponse->records) - display_records(apdu->u.presentResponse->records); - else - printf("No records.\n"); + setno += + *apdu->u.presentResponse->numberOfRecordsReturned; + if (apdu->u.presentResponse->records) + display_records(apdu->u.presentResponse->records); + else + printf("No records.\n"); printf ("nextResultSetPosition = %d\n", - *apdu->u.presentResponse->nextResultSetPosition); - break; - case Z_APDU_sortResponse: - process_sortResponse(apdu->u.sortResponse); - break; + *apdu->u.presentResponse->nextResultSetPosition); + break; + case Z_APDU_sortResponse: + process_sortResponse(apdu->u.sortResponse); + break; case Z_APDU_extendedServicesResponse: printf("Got extended services response\n"); process_ESResponse(apdu->u.extendedServicesResponse); break; - case Z_APDU_close: - printf("Target has closed the association.\n"); - process_close(apdu->u.close); - break; - case Z_APDU_resourceControlRequest: - process_resourceControlRequest - (apdu->u.resourceControlRequest); - break; - case Z_APDU_deleteResultSetResponse: - printf("Got deleteResultSetResponse status=%d\n", - *apdu->u.deleteResultSetResponse-> - deleteOperationStatus); - break; - default: - printf("Received unknown APDU type (%d).\n", - apdu->which); - exit(1); + case Z_APDU_close: + printf("Target has closed the association.\n"); + process_close(apdu->u.close); + break; + case Z_APDU_resourceControlRequest: + process_resourceControlRequest + (apdu->u.resourceControlRequest); + break; + case Z_APDU_deleteResultSetResponse: + process_deleteResultSetResponse(apdu->u. + deleteResultSetResponse); + break; + default: + printf("Received unknown APDU type (%d).\n", + apdu->which); + exit(1); } } while (conn && cs_more(conn)); +#if HAVE_GETTIMEOFDAY + gettimeofday (&tv_end, 0); + if (1) + { + printf ("Elapsed: %.6f\n", (double) tv_end.tv_usec / + 1e6 + tv_end.tv_sec - + ((double) tv_start.tv_usec / 1e6 + tv_start.tv_sec)); + } +#endif } } return 0; @@ -2042,17 +2627,17 @@ int main(int argc, char **argv) int ret; int opened = 0; - while ((ret = options("m:v:", argv, argc, &arg)) != -2) + while ((ret = options("c:a:m:v:", argv, argc, &arg)) != -2) { switch (ret) { case 0: if (!opened) - { - initialize (); - if (cmd_open (arg) == 2) - opened = 1; - } + { + initialize (); + if (cmd_open (arg) == 2) + opened = 1; + } break; case 'm': if (!(marcdump = fopen (arg, "a"))) @@ -2061,18 +2646,27 @@ int main(int argc, char **argv) exit (1); } break; - case 'v': - log_init (log_mask_str(arg), "", NULL); + case 'c': + strncpy (ccl_fields, arg, sizeof(ccl_fields)-1); + ccl_fields[sizeof(ccl_fields)-1] = '\0'; break; + case 'a': + if (!strcmp(arg, "-")) + apdu_file=stderr; + else + apdu_file=fopen(arg, "a"); + break; + case 'v': + yaz_log_init (yaz_log_mask_str(arg), "", NULL); + break; default: - fprintf (stderr, "Usage: %s [-m ] []\n", + fprintf (stderr, "Usage: %s [-m ] [ -a ] " + "[-c cclfields] []\n", prog); exit (1); } } if (!opened) - initialize (); + initialize (); return client (opened); } - -