X-Git-Url: http://git.indexdata.com/?p=yaz-moved-to-github.git;a=blobdiff_plain;f=client%2Fclient.c;h=a1134338261239f22e6b80e1a559107765273240;hp=79893e415765fb83ca0eefac1bb27e3915f43e20;hb=3b5d9ce6b714e69e96b8c738c4055196cb1f42b4;hpb=49e9b34058467505c371057cb01425e877d6df02 diff --git a/client/client.c b/client/client.c index 79893e4..a113433 100644 --- a/client/client.c +++ b/client/client.c @@ -1,10 +1,80 @@ /* - * Copyright (c) 1995-1998, Index Data. + * Copyright (c) 1995-2000, Index Data * See the file LICENSE for details. * Sebastian Hammer, Adam Dickmeiss * * $Log: client.c,v $ - * Revision 1.74 1999-02-01 15:35:21 adam + * 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 + * Fixed minor bug introduced by previous commit. + * + * Revision 1.74 1999/02/01 15:35:21 adam * Added XML display. * * Revision 1.73 1998/10/20 13:55:43 quinn @@ -249,32 +319,45 @@ #include #include #include -#include -#include +#include -#include -#include +#include #ifdef USE_XTIMOSI -#include +#include #endif -#include -#include -#include +#include +#include +#include + +#include -#include +#ifdef ASN_COMPILED +#include +#endif #if CCL2RPN -#include +#include +#endif + +#if HAVE_READLINE_READLINE_H +#include +#endif +#if HAVE_READLINE_HISTORY_H +#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 Z_External *record_last = 0; static int num_databaseNames = 0; static int setnumber = 0; /* current result set number */ static int smallSetUpperBound = 0; @@ -284,6 +367,7 @@ static Z_ElementSetNames *elementSetNames = 0; static int setno = 1; /* current set offset */ static enum oid_proto protocol = PROTO_Z3950; /* current app protocol */ static enum oid_value recordsyntax = VAL_USMARC; +static 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 */ @@ -304,17 +388,28 @@ static QueryType queryType = QueryType_Prefix; 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 (!z_APDU(out, &a, 0, 0)) { odr_perror(out, "Encoding APDU"); exit(1); } + if (apdu_file) + { + z_APDU(print, &a, 0, 0); + odr_reset(print); + } 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))); @@ -364,6 +459,7 @@ static void send_initRequest() ODR_MASK_SET(req->protocolVersion, Z_ProtocolVersion_3); *req->maximumRecordSize = 1024*1024; + *req->preferredMessageSize = 1024*1024; req->idAuthentication = auth; @@ -391,7 +487,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); @@ -608,11 +704,25 @@ static void display_grs1(Z_GenericRecord *r, int level) } } +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. */ @@ -621,7 +731,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); @@ -640,7 +750,7 @@ static void display_record(Z_DatabaseRecord *p) */ odr_setbuf(in, (char*)p->u.octet_aligned->buf, p->u.octet_aligned->len, 0); - if (!(*type->fun)(in, (char **)&rr, 0)) + if (!(*type->fun)(in, (char **)&rr, 0, 0)) { odr_perror(in, "Decoding constructed record."); fprintf(stderr, "[Near %d]\n", odr_offset(in)); @@ -659,17 +769,23 @@ static void display_record(Z_DatabaseRecord *p) } } 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 || VAL_APPLICATION_XML) - { - fwrite (octet_buf, 1, p->u.octet_aligned->len, stdout); - printf ("\n"); - } + if (ent->value == VAL_TEXT_XML || ent->value == VAL_APPLICATION_XML || + ent->value == VAL_HTML) + print_record((const unsigned char *) octet_buf, + p->u.octet_aligned->len); else - marc_display (octet_buf, NULL); + { + 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); + } + } if (marcdump) fwrite (octet_buf, 1, p->u.octet_aligned->len, marcdump); } @@ -680,7 +796,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) { @@ -694,7 +810,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); @@ -750,7 +866,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); } @@ -782,18 +898,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; + 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"); @@ -887,7 +1020,11 @@ static int send_searchRequest(char *arg) case QueryType_CCL2RPN: query.which = Z_Query_type_1; RPNquery = ccl_rpn_query(out, rpn); - assert(RPNquery); + if (!RPNquery) + { + printf ("Couldn't convert from CCL to RPN\n"); + return 0; + } bib1.proto = protocol; bib1.oclass = CLASS_ATTSET; bib1.value = VAL_BIB1; @@ -1086,10 +1223,158 @@ 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; + } } -static Z_External *CreateItemOrderExternal(int itemno) +#ifdef ASN_COMPILED + +const char *get_ill_element (void *clientData, const char *element) +{ + /* printf ("asking for %s\n", element); */ + if (!strcmp (element, "ill,transaction-id,transaction-group-qualifier")) + return "1"; + if (!strcmp (element, "ill,transaction-id,transaction-qualifier")) + return "1"; + return 0; +} + +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 (!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 = 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; +} +#else +static Z_External *create_external_itemRequest() +{ + return 0; +} +#endif + +#ifdef ASN_COMPILED +static Z_External *create_external_ILLRequest() +{ + struct ill_get_ctl ctl; + ILL_Request *req; + 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; + + req = ill_get_ILLRequest(&ctl, "ill", 0); + + if (!ill_Request (out, &req, 0, 0)) + { + if (apdu_file) + { + printf ("-------------------\n"); + ill_Request(print, &req, 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 = 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; +} +#else +static Z_External *create_external_ILLRequest() +{ + return 0; +} +#endif + + +static Z_External *create_ItemOrderExternal(const char *type, int itemno) { Z_External *r = (Z_External *) odr_malloc(out, sizeof(Z_External)); oident ItemOrderRequest; @@ -1099,10 +1384,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; @@ -1138,52 +1421,111 @@ static Z_External *CreateItemOrderExternal(int itemno) (int *) odr_malloc(out, sizeof(int)); *r->u.itemOrder->u.esRequest->notToKeep->resultSetItem->item = itemno; - r->u.itemOrder->u.esRequest->notToKeep->itemRequest = NULL; + switch (*type) + { + case '2': + printf ("using item-request\n"); + r->u.itemOrder->u.esRequest->notToKeep->itemRequest = + create_external_itemRequest(); + break; + case '1': + printf ("using ILL-request\n"); + r->u.itemOrder->u.esRequest->notToKeep->itemRequest = + create_external_ILLRequest(); + break; + default: + r->u.itemOrder->u.esRequest->notToKeep->itemRequest = 0; + } 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_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); - - /* 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 = "1.Extendedserveq"; + + 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); } @@ -1206,11 +1548,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"); @@ -1308,9 +1645,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); - - if (elementSetNames) + req->preferredRecordSyntax = + odr_oiddup (out, oid_ent_to_oid(&prefsyn, oid)); + + 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; @@ -1430,7 +1811,8 @@ 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]; int off; @@ -1448,9 +1830,7 @@ int send_sortrequest(char *arg, int newset) 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); + req->inputResultSetNames[0] = odr_strdup (out, setstring); #else req->inputResultSetNames = (Z_StringList *)odr_malloc (out, sizeof(*req->inputResultSetNames)); @@ -1458,15 +1838,13 @@ int send_sortrequest(char *arg, int newset) 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); - 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; @@ -1513,8 +1891,7 @@ int send_sortrequest(char *arg, int newset) else { sk->which = Z_SortKey_sortField; - sk->u.sortField = (char *)odr_malloc (out, strlen(sort_string)+1); - strcpy (sk->u.sortField, sort_string); + sk->u.sortField = odr_strdup (out, sort_string); } sks->sortRelation = (int *)odr_malloc (out, sizeof(*sks->sortRelation)); *sks->sortRelation = Z_SortRelation_ascending; @@ -1636,6 +2013,21 @@ void process_sortResponse(Z_SortResponse *res) #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) @@ -1690,6 +2082,22 @@ int cmd_scan(char *arg) 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) @@ -1713,8 +2121,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; @@ -1745,7 +2153,7 @@ 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 else if (!strcmp (arg, "ccl2rpn") || !strcmp (arg, "cclrpn")) @@ -1806,6 +2214,8 @@ static void initialize(void) exit(1); } setvbuf(stdout, 0, _IONBF, 0); + if (apdu_file) + odr_setprint(print, apdu_file); #if CCL2RPN bibset = ccl_qual_mk (); @@ -1843,12 +2253,22 @@ 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, ""}, {"querytype", cmd_querytype, ""}, {"refid", cmd_refid, ""}, - {"itemorder", cmd_itemorder, ""}, + {"itemorder", cmd_itemorder, "1|2 "}, + {"update", cmd_update, ""}, + /* Server Admin Functions */ + {"adm-reindex", cmd_adm_reindex, ""}, + {"adm-truncate", cmd_adm_truncate, "('database'|'index')"}, + {"adm-create", cmd_adm_create, ""}, + {"adm-delete", cmd_adm_delete, "('database'|'index')"}, + {"adm-import", cmd_adm_import, " "}, + {"adm-refresh", cmd_adm_refresh, ""}, + {"adm-commit", cmd_adm_commit, ""}, {0,0} }; char *netbuffer= 0; @@ -1880,13 +2300,27 @@ static int client(int wait) #else if (!wait) #endif - { - /* quick & dirty way to get a command line. */ - char *end_p; - if (!fgets(line, 1023, stdin)) - break; - if ((end_p = strchr (line, '\n'))) - *end_p = '\0'; + { +#if HAVE_READLINE_READLINE_H + char* line_in; + line_in=readline(C_PROMPT); + if (!line_in) + break; +#if HAVE_READLINE_HISTORY_H + if (*line_in) + add_history(line_in); +#endif + strcpy(line,line_in); + free (line_in); +#else + char *end_p; + printf (C_PROMPT); + fflush(stdout); + if (!fgets(line, 1023, stdin)) + break; + if ((end_p = strchr (line, '\n'))) + *end_p = '\0'; +#endif if ((res = sscanf(line, "%s %[^;]", word, arg)) <= 0) { strcpy(word, last_cmd); @@ -1911,7 +2345,6 @@ static int client(int wait) } if (res < 2) { - printf(C_PROMPT); continue; } } @@ -1933,24 +2366,25 @@ 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, "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: @@ -1989,9 +2423,8 @@ static int client(int wait) (apdu->u.resourceControlRequest); break; case Z_APDU_deleteResultSetResponse: - printf("Got deleteResultSetResponse status=%d\n", - *apdu->u.deleteResultSetResponse-> - deleteOperationStatus); + process_deleteResultSetResponse(apdu->u. + deleteResultSetResponse); break; default: printf("Received unknown APDU type (%d).\n", @@ -2000,8 +2433,6 @@ static int client(int wait) } } while (conn && cs_more(conn)); - printf(C_PROMPT); - fflush(stdout); } } return 0; @@ -2014,7 +2445,7 @@ int main(int argc, char **argv) int ret; int opened = 0; - while ((ret = options("m:v:", argv, argc, &arg)) != -2) + while ((ret = options("a:m:v:", argv, argc, &arg)) != -2) { switch (ret) { @@ -2033,20 +2464,24 @@ int main(int argc, char **argv) exit (1); } break; + case 'a': + if (!strcmp(arg, "-")) + apdu_file=stderr; + else + apdu_file=fopen(arg, "a"); + break; case 'v': log_init (log_mask_str(arg), "", NULL); break; default: - fprintf (stderr, "Usage: %s [-m ] []\n", + fprintf (stderr, "Usage: %s [-m ] [ -m ] " + "[]\n", prog); exit (1); } } if (!opened) - { initialize (); - printf (C_PROMPT); - } return client (opened); }