X-Git-Url: http://git.indexdata.com/?p=yaz-moved-to-github.git;a=blobdiff_plain;f=client%2Fclient.c;h=25c719ce6455e66c10941ef6b23e8c71682ab473;hp=1632254356bd31015ac24788751cb44e25447a1d;hb=b436ce38e1e619d2225c7c75c1f0de841aa13bad;hpb=97e81740fd91d912d75ff85fefc61b1d19cbc611 diff --git a/client/client.c b/client/client.c index 1632254..25c719c 100644 --- a/client/client.c +++ b/client/client.c @@ -1,10 +1,105 @@ /* - * Copyright (c) 1995, Index Data. + * Copyright (c) 1995-1998, Index Data. * See the file LICENSE for details. * Sebastian Hammer, Adam Dickmeiss * * $Log: client.c,v $ - * Revision 1.35 1996-06-03 09:45:50 quinn + * Revision 1.64 1998-03-31 11:07:44 adam + * Furhter work on UNIverse resource report. + * Added Extended Services handling in frontend server. + * + * Revision 1.63 1998/03/05 08:05:10 adam + * Added a few casts to make C++ happy. + * + * Revision 1.62 1998/02/11 11:53:33 adam + * Changed code so that it compiles as C++. + * + * Revision 1.61 1998/02/10 11:03:06 adam + * Implemented command refid. Client prints reference-ID's, when present, + * in responses. + * + * Revision 1.60 1998/01/29 14:08:52 adam + * Better sort diagnostics. + * + * Revision 1.59 1998/01/29 13:17:56 adam + * Added sort. + * + * Revision 1.58 1998/01/07 13:51:45 adam + * Minor change. + * + * Revision 1.57 1998/01/07 12:58:22 adam + * Using fgets instead of gets. + * + * Revision 1.56 1997/11/05 09:18:31 adam + * The client handles records with no associated syntax. + * + * Revision 1.55 1997/10/31 12:20:08 adam + * Improved memory debugging for xmalloc/nmem.c. References to NMEM + * instead of ODR in n ESPEC-1 handling in source d1_espec.c. + * Bug fix: missing fclose in data1_read_espec1. + * + * Revision 1.54 1997/10/27 13:52:46 adam + * Header yaz-util includes all YAZ utility header files. + * + * Revision 1.53 1997/09/29 13:18:59 adam + * Added function, oid_ent_to_oid, to replace the function + * oid_getoidbyent, which is not thread safe. + * + * Revision 1.52 1997/09/29 07:20:31 adam + * Client code uses nmem_init. + * + * Revision 1.51 1997/09/26 09:41:55 adam + * Updated client to handle multiple diagnostics. + * + * Revision 1.50 1997/09/17 12:10:29 adam + * YAZ version 1.4. + * + * Revision 1.49 1997/09/04 13:45:17 adam + * Added UNImarc to list of available syntaxes. + * + * Revision 1.48 1997/09/01 08:48:44 adam + * New windows NT/95 port using MSV5.0. Only a few changes made + * to avoid warnings. Sub project created: client.dsp. + * + * Revision 1.47 1997/07/01 13:49:56 adam + * Take care of case when invalid target is specified on command line. + * + * Revision 1.46 1997/06/23 10:30:18 adam + * Added call to ccl_rpn_delete in search. Added ODR stream "out" + * as parameter to ccl_rpn_query to release RPN query. + * + * Revision 1.45 1997/05/14 06:53:29 adam + * C++ support. + * + * Revision 1.44 1997/05/05 11:20:35 adam + * Client uses "options" utility and marc dump filename may be specified + * as an option (-m ). + * + * Revision 1.43 1996/11/08 11:03:26 adam + * Client accepts multiple database names. + * + * Revision 1.42 1996/10/08 10:44:57 quinn + * Resolved conflicts. + * + * Revision 1.41 1996/10/07 15:29:03 quinn + * Work + * + * Revision 1.40 1996/08/29 14:19:34 quinn + * Fixed conflict (CVS) + * + * Revision 1.39 1996/08/27 10:43:22 quinn + * Made select() optional + * + * Revision 1.38 1996/08/12 14:09:11 adam + * Default prefix query attribute set defined by using p_query_attset. + * + * Revision 1.37 1996/07/06 19:58:29 quinn + * System headerfiles gathered in yconfig + * + * Revision 1.36 1996/06/10 08:53:47 quinn + * Added Summary + * + * Revision 1.35 1996/06/03 09:45:50 quinn * Added display of OIDs in the GRS routine. * * Revision 1.34 1996/05/09 07:26:49 quinn @@ -120,15 +215,10 @@ #include #include -#ifdef WINDOWS #include -#else -#include -#endif #include -#ifdef _AIX -#include -#endif + +#include #include #include @@ -151,7 +241,8 @@ static ODR out, in, print; /* encoding and decoding streams */ static COMSTACK conn = 0; /* our z-association */ static Z_IdAuthentication *auth = 0; /* our current auth definition */ -static char database[512] = "Default"; /* Database name */ +static char *databaseNames[128]; +static int num_databaseNames = 0; static int setnumber = 0; /* current result set number */ static int smallSetUpperBound = 0; static int largeSetLowerBound = 1; @@ -165,9 +256,8 @@ static ODR_MEM session_mem; /* memory handle for init-response */ static Z_InitResponse *session = 0; /* session parameters */ static char last_scan[512] = "0"; static char last_cmd[100] = "?"; -static oid_value attributeset = VAL_BIB1; static FILE *marcdump = 0; -static char marcdump_file[512] = "marc.out"; +static char *refid = NULL; typedef enum { QueryType_Prefix, @@ -192,14 +282,34 @@ static void send_apdu(Z_APDU *a) exit(1); } buf = odr_getbuf(out, &len, 0); - odr_reset(out); /* release the APDU structure */ if (cs_put(conn, buf, len) < 0) { fprintf(stderr, "cs_put: %s", cs_errmsg(cs_errno(conn))); exit(1); } + odr_reset(out); /* release the APDU structure */ } +static void print_refid (Z_ReferenceId *id) +{ + if (id) + { + printf ("ReferenceId: '%.*s'\n", id->len, id->buf); + } +} + +static Z_ReferenceId *set_refid (ODR out) +{ + Z_ReferenceId *id; + if (!refid) + 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); + memcpy (id->buf, refid, id->len); + return id; +} + /* INIT SERVICE ------------------------------- */ static void send_initRequest() @@ -212,6 +322,8 @@ static void send_initRequest() 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->protocolVersion, Z_ProtocolVersion_1); ODR_MASK_SET(req->protocolVersion, Z_ProtocolVersion_2); @@ -275,39 +387,34 @@ int cmd_open(char *arg) fprintf(stderr, "Usage: open (osi|tcp) ':' [tsel '/']host[':'port]\n"); return 0; } + if (!strcmp(type, "tcp")) + { + t = tcpip_type; + protocol = PROTO_Z3950; + } + else #ifdef USE_XTIMOSI if (!strcmp(type, "osi")) { - if (!(add = mosi_strtoaddr(addr))) - { - perror(arg); - return 0; - } t = mosi_type; protocol = PROTO_SR; } else #endif - if (!strcmp(type, "tcp")) { - if (!(add = tcpip_strtoaddr(addr))) - { - perror(arg); - return 0; - } - t = tcpip_type; - protocol = PROTO_Z3950; - } - else - { - fprintf(stderr, "Bad type: %s\n", type); - return 0; + 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))) + { + perror(arg); + return 0; + } printf("Connecting..."); fflush(stdout); if (cs_connect(conn, add) < 0) @@ -348,7 +455,7 @@ 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]->class, + 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); @@ -445,7 +552,6 @@ static void display_record(Z_DatabaseRecord *p) odr_reset(print); } } - /* Check if this is a known, ASN.1 type tucked away in an octet string */ if (ent && r->which == Z_External_octet) { @@ -459,7 +565,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, &rr, 0)) + if (!(*type->fun)(in, (char **)&rr, 0)) { odr_perror(in, "Decoding constructed record."); fprintf(stderr, "[Near %d]\n", odr_offset(in)); @@ -473,13 +579,20 @@ static void display_record(Z_DatabaseRecord *p) * Note: we throw away the original, BER-encoded record here. * Do something else with it if you want to keep it. */ - r->u.sutrs = rr; /* we don't actually check the type here. */ + r->u.sutrs = (Odr_oct *)rr; /* we don't actually check the type here. */ r->which = type->what; } } - if (r->which == Z_External_octet && p->u.octet_aligned->len) - marc_display ((char*)p->u.octet_aligned->buf, stdout); - else if (ent->value == VAL_SUTRS) + if (ent && ent->value == VAL_SOIF) + printf("%.*s", r->u.octet_aligned->len, r->u.octet_aligned->buf); + else if (r->which == Z_External_octet && p->u.octet_aligned->len) + { + const char *marc_buf = (char*)p->u.octet_aligned->buf; + marc_display (marc_buf, NULL); + if (marcdump) + fwrite (marc_buf, strlen (marc_buf), 1, marcdump); + } + else if (ent && ent->value == VAL_SUTRS) { if (r->which != Z_External_sutrs) { @@ -488,7 +601,7 @@ static void display_record(Z_DatabaseRecord *p) } printf("%.*s", r->u.sutrs->len, r->u.sutrs->buf); } - else if (ent->value == VAL_GRS1) + else if (ent && ent->value == VAL_GRS1) { if (r->which != Z_External_grs1) { @@ -508,41 +621,42 @@ static void display_record(Z_DatabaseRecord *p) } } -static void display_diagrec(Z_DiagRec *p) + +static void display_diagrecs(Z_DiagRec **pp, int num) { + int i; oident *ent; -#ifdef Z_95 Z_DefaultDiagFormat *r; -#else - Z_DiagRec *r = p; -#endif - printf("Diagnostic message from database:\n"); -#ifdef Z_95 - if (p->which != Z_DiagRec_defaultFormat) + 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)); + if (r->addinfo && *r->addinfo) + printf(" -- '%s'\n", r->addinfo); + else + printf("\n"); } - else - r = p->u.defaultFormat; -#endif - 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)); - if (r->addinfo && *r->addinfo) - printf(" -- '%s'\n", r->addinfo); - else - printf("\n"); } + static void display_nameplusrecord(Z_NamePlusRecord *p) { if (p->databaseName) printf("[%s]", p->databaseName); if (p->which == Z_NamePlusRecord_surrogateDiagnostic) - display_diagrec(p->u.surrogateDiagnostic); + display_diagrecs(&p->u.surrogateDiagnostic, 1); else display_record(p->u.databaseRecord); } @@ -552,8 +666,11 @@ static void display_records(Z_Records *p) int i; if (p->which == Z_Records_NSD) - display_diagrec(p->u.nonSurrogateDiagnostic); - else + display_diagrecs (&p->u.nonSurrogateDiagnostic, 1); + else if (p->which == Z_Records_multipleNSD) + display_diagrecs (p->u.multipleNonSurDiagnostics->diagRecs, + p->u.multipleNonSurDiagnostics->num_diagRecs); + else { printf("Records: %d\n", p->u.databaseOrSurDiagnostics->num_records); for (i = 0; i < p->u.databaseOrSurDiagnostics->num_records; i++) @@ -565,8 +682,8 @@ static int send_searchRequest(char *arg) { Z_APDU *apdu = zget_APDU(out, Z_APDU_searchRequest); Z_SearchRequest *req = apdu->u.searchRequest; - char *databaseNames = database; Z_Query query; + int oid[OID_SIZE]; #if CCL2RPN struct ccl_rpn_node *rpn; int error, pos; @@ -587,7 +704,7 @@ static int send_searchRequest(char *arg) } } #endif - + req->referenceId = set_refid (out); if (!strcmp(arg, "@big")) /* strictly for troublemaking */ { static unsigned char big[2100]; @@ -599,7 +716,7 @@ static int send_searchRequest(char *arg) bigo.buf = big; req->referenceId = &bigo; } - + if (setnumber >= 0) { sprintf(setstring, "%d", ++setnumber); @@ -617,12 +734,12 @@ static int send_searchRequest(char *arg) prefsyn.oclass = CLASS_RECSYN; prefsyn.value = recordsyntax; req->preferredRecordSyntax = - odr_oiddup(out, oid_getoidbyent(&prefsyn)); + odr_oiddup(out, oid_ent_to_oid(&prefsyn, oid)); req->smallSetElementSetNames = req->mediumSetElementSetNames = elementSetNames; } - req->num_databaseNames = 1; - req->databaseNames = &databaseNames; + req->num_databaseNames = num_databaseNames; + req->databaseNames = databaseNames; req->query = &query; @@ -647,12 +764,13 @@ static int send_searchRequest(char *arg) #if CCL2RPN case QueryType_CCL2RPN: query.which = Z_Query_type_1; - assert((RPNquery = ccl_rpn_query(rpn))); + assert((RPNquery = ccl_rpn_query(out, rpn))); bib1.proto = protocol; bib1.oclass = CLASS_ATTSET; bib1.value = VAL_BIB1; - RPNquery->attributeSetId = oid_getoidbyent(&bib1); + RPNquery->attributeSetId = oid_ent_to_oid(&bib1, oid); query.u.type_1 = RPNquery; + ccl_rpn_delete (rpn); break; #endif default: @@ -667,6 +785,8 @@ static int send_searchRequest(char *arg) static int process_searchResponse(Z_SearchResponse *res) { + printf ("Received SearchResponse.\n"); + print_refid (res->referenceId); if (*res->searchStatus) printf("Search was a success.\n"); else @@ -681,6 +801,260 @@ static int process_searchResponse(Z_SearchResponse *res) return 0; } +static void print_level(int iLevel) +{ + int i; + for (i = 0; i < iLevel * 4; i++) + printf(" "); +} + +static void print_int(int iLevel, const char *pTag, int *pInt) +{ + if (pInt != NULL) + { + print_level(iLevel); + printf("%s: %d\n", pTag, *pInt); + } +} + +static void print_string(int iLevel, const char *pTag, const char *pString) +{ + if (pString != NULL) + { + print_level(iLevel); + printf("%s: %s\n", pTag, pString); + } +} + +static void print_oid(int iLevel, const char *pTag, Odr_oid *pOid) +{ + if (pOid != NULL) + { + int *pInt = pOid; + + print_level(iLevel); + printf("%s:", pTag); + for (; *pInt != -1; pInt++) + printf(" %d", *pInt); + printf("\n"); + } +} + +static void print_referenceId(int iLevel, Z_ReferenceId *referenceId) +{ + if (referenceId != NULL) + { + int i; + + print_level(iLevel); + printf("Ref Id (%d, %d): ", referenceId->len, referenceId->size); + for (i = 0; i < referenceId->len; i++) + printf("%c", referenceId->buf[i]); + printf("\n"); + } +} + +static void print_string_or_numeric(int iLevel, const char *pTag, Z_StringOrNumeric *pStringNumeric) +{ + if (pStringNumeric != NULL) + { + switch (pStringNumeric->which) + { + case Z_StringOrNumeric_string: + print_string(iLevel, pTag, pStringNumeric->u.string); + break; + + case Z_StringOrNumeric_numeric: + print_int(iLevel, pTag, pStringNumeric->u.numeric); + break; + + default: + print_level(iLevel); + printf("%s: valid type for Z_StringOrNumeric\n", pTag); + break; + } + } +} + +static void print_universe_report_duplicate(int iLevel, Z_UniverseReportDuplicate *pUniverseReportDuplicate) +{ + if (pUniverseReportDuplicate != NULL) + { + print_level(iLevel); + printf("Universe Report Duplicate: \n"); + iLevel++; + print_string_or_numeric(iLevel, "Hit No", pUniverseReportDuplicate->hitno); + } +} + +static void print_universe_report_hits(int iLevel, Z_UniverseReportHits *pUniverseReportHits) +{ + if (pUniverseReportHits != NULL) + { + print_level(iLevel); + printf("Universe Report Hits: \n"); + iLevel++; + print_string_or_numeric(iLevel, "Database", pUniverseReportHits->database); + print_string_or_numeric(iLevel, "Hits", pUniverseReportHits->hits); + } +} + +static void print_universe_report(int iLevel, Z_UniverseReport *pUniverseReport) +{ + if (pUniverseReport != NULL) + { + print_level(iLevel); + printf("Universe Report: \n"); + iLevel++; + print_int(iLevel, "Total Hits", pUniverseReport->totalHits); + switch (pUniverseReport->which) + { + case Z_UniverseReport_databaseHits: + print_universe_report_hits(iLevel, pUniverseReport->u.databaseHits); + break; + + case Z_UniverseReport_duplicate: + print_universe_report_duplicate(iLevel, pUniverseReport->u.duplicate); + break; + + default: + print_level(iLevel); + printf("Type: %d\n", pUniverseReport->which); + break; + } + } +} + +static void print_external(int iLevel, Z_External *pExternal) +{ + if (pExternal != NULL) + { + print_level(iLevel); + printf("External: \n"); + iLevel++; + print_oid(iLevel, "Direct Reference", pExternal->direct_reference); + print_int(iLevel, "InDirect Reference", pExternal->indirect_reference); + print_string(iLevel, "Descriptor", pExternal->descriptor); + switch (pExternal->which) + { + case Z_External_universeReport: + print_universe_report(iLevel, pExternal->u.universeReport); + break; + + default: + print_level(iLevel); + printf("Type: %d\n", pExternal->which); + break; + } + } +} + +static int process_resourceControlRequest (Z_ResourceControlRequest *req) +{ + printf ("Received ResourceControlRequest.\n"); + print_referenceId(1, req->referenceId); + print_int(1, "Suspended Flag", req->suspendedFlag); + print_int(1, "Partial Results Available", req->partialResultsAvailable); + print_int(1, "Response Required", req->responseRequired); + print_int(1, "Triggered Request Flag", req->triggeredRequestFlag); + print_external(1, req->resourceReport); + return 0; +} + +void process_ESResponse(Z_ExtendedServicesResponse *res) +{ + printf("process_ESResponse\n"); +} + +static Z_External *CreateItemOrderExternal(int itemno) +{ + Z_External *r = odr_malloc(out, sizeof(Z_External)); + oident ItemOrderRequest; + + ItemOrderRequest.proto = PROTO_Z3950; + ItemOrderRequest.oclass = CLASS_EXTSERV; + ItemOrderRequest.value = VAL_ITEMORDER; + + r->direct_reference = odr_oiddup(out,oid_getoidbyent(&ItemOrderRequest)); + r->indirect_reference = odr_malloc(out,sizeof(int)); + *r->indirect_reference = 0; + + r->descriptor = "Extended services item order"; + + r->which = Z_External_itemOrder; + + r->u.itemOrder = odr_malloc(out,sizeof(Z_ItemOrder)); + memset(r->u.itemOrder, 0, sizeof(Z_ItemOrder)); + r->u.itemOrder->which=Z_ItemOrder_esRequest; + + r->u.itemOrder->u.esRequest = odr_malloc(out,sizeof(Z_IORequest)); + memset(r->u.itemOrder->u.esRequest, 0, sizeof(Z_IORequest)); + + r->u.itemOrder->u.esRequest->toKeep = odr_malloc(out,sizeof(Z_IOOriginPartToKeep)); + memset(r->u.itemOrder->u.esRequest->toKeep, 0, sizeof(Z_IOOriginPartToKeep)); + r->u.itemOrder->u.esRequest->notToKeep = 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; + r->u.itemOrder->u.esRequest->toKeep->contact = NULL; + r->u.itemOrder->u.esRequest->toKeep->addlBilling = NULL; + + r->u.itemOrder->u.esRequest->notToKeep->resultSetItem = 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 = odr_malloc(out, sizeof(int)); + *r->u.itemOrder->u.esRequest->notToKeep->resultSetItem->item = itemno; + + r->u.itemOrder->u.esRequest->notToKeep->itemRequest = NULL; + return r; +} + +/* II : Added to do DALI Item Order Extended services request */ +static int send_itemorder(char *arg) +{ + 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 = 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; + + send_apdu(apdu); + return 0; +} + +/* II : Added to do DALI Item Order Extended services request */ +static int cmd_itemorder(char *arg) +{ + printf("Item order request\n"); + fflush(stdout); + + send_itemorder(arg); + return(1); +} + static int cmd_find(char *arg) { if (!*arg) @@ -729,12 +1103,30 @@ static int cmd_status(char *arg) static int cmd_base(char *arg) { + int i; + char *cp; + if (!*arg) { - printf("Usage: base \n"); + printf("Usage: base ...\n"); return 0; } - strcpy(database, arg); + for (i = 0; ireferenceId = set_refid (out); if ((p = strchr(arg, '+'))) { nos = atoi(p + 1); @@ -772,18 +1166,30 @@ static int send_presentRequest(char *arg) } if (*arg) setno = atoi(arg); - - if (setnumber >= 0) + if (p && (p=strchr(p+1, '+'))) + { + strcpy (setstring, p+1); + req->resultSetId = setstring; + } + else if (setnumber >= 0) { sprintf(setstring, "%d", setnumber); req->resultSetId = setstring; } +#if 0 + if (1) + { + static Z_Range range; + static Z_Range *rangep = ⦥ + req->num_ranges = 1; +#endif req->resultSetStartPoint = &setno; req->numberOfRecordsRequested = &nos; prefsyn.proto = protocol; prefsyn.oclass = CLASS_RECSYN; prefsyn.value = recordsyntax; - req->preferredRecordSyntax = oid_getoidbyent(&prefsyn); + req->preferredRecordSyntax = oid_ent_to_oid(&prefsyn, oid); + if (elementSetNames) { req->recordComposition = &compo; @@ -838,6 +1244,7 @@ int cmd_quit(char *arg) { printf("See you later, alligator.\n"); exit(0); + return 0; } int cmd_cancel(char *arg) @@ -845,7 +1252,7 @@ int cmd_cancel(char *arg) Z_APDU *apdu = zget_APDU(out, Z_APDU_triggerResourceControlRequest); Z_TriggerResourceControlRequest *req = apdu->u.triggerResourceControlRequest; - bool_t false = 0; + bool_t rfalse = 0; if (!session) { @@ -858,7 +1265,7 @@ int cmd_cancel(char *arg) return 0; } *req->requestedAction = Z_TriggerResourceCtrl_cancel; - req->resultSetWanted = &false; + req->resultSetWanted = &rfalse; send_apdu(apdu); printf("Sent cancel request\n"); @@ -869,10 +1276,10 @@ int send_scanrequest(char *string, int pp, int num) { Z_APDU *apdu = zget_APDU(out, Z_APDU_scanRequest); Z_ScanRequest *req = apdu->u.scanRequest; - char *db = database; - req->num_databaseNames = 1; - req->databaseNames = &db; + req->referenceId = set_refid (out); + req->num_databaseNames = num_databaseNames; + req->databaseNames = databaseNames; req->termListAndStartPoint = p_query_scan(out, protocol, &req->attributeSet, string); req->numberOfTermsRequested = # @@ -881,6 +1288,128 @@ int send_scanrequest(char *string, int pp, int num) return 2; } +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)); + char setstring[32]; + char sort_string[32], sort_flags[32]; + int off; + int oid[OID_SIZE]; + oident bib1; + + if (setnumber >= 0) + sprintf (setstring, "%d", setnumber); + else + sprintf (setstring, "default"); + + req->referenceId = set_refid (out); + + 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)); + req->inputResultSetNames->strings[0] = + (char *)odr_malloc (out, strlen(setstring)+1); + strcpy (req->inputResultSetNames->strings[0], setstring); + + if (newset && setnumber >= 0) + sprintf (setstring, "%d", ++setnumber); + + req->sortedResultSetName = (char *)odr_malloc (out, strlen(setstring)+1); + strcpy (req->sortedResultSetName, setstring); + + req->sortSequence = sksl; + sksl->num_specs = 0; + sksl->specs = (Z_SortKeySpec **)odr_malloc (out, sizeof(sksl->specs) * 20); + + bib1.proto = protocol; + bib1.oclass = CLASS_ATTSET; + bib1.value = VAL_BIB1; + while ((sscanf (arg, "%31s %31s%n", sort_string, 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, + 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; + + sks->missingValueAction = NULL; + + for (i = 0; sort_flags[i]; i++) + { + switch (sort_flags[i]) + { + case 'a': + case 'A': + case '>': + *sks->sortRelation = Z_SortRelation_ascending; + break; + case 'd': + case 'D': + case '<': + *sks->sortRelation = Z_SortRelation_descending; + 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; + } + send_apdu(apdu); + return 2; +} + void display_term(Z_TermInfo *t) { if (t->term->which == Z_Term_general) @@ -897,9 +1426,13 @@ void display_term(Z_TermInfo *t) void process_scanResponse(Z_ScanResponse *res) { int i; - - printf("SCAN: %d entries, position=%d\n", *res->numberOfEntriesReturned, - *res->positionOfTerm); + + printf("Received ScanResponse\n"); + print_refid (res->referenceId); + printf("%d entries", *res->numberOfEntriesReturned); + if (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) @@ -915,10 +1448,63 @@ void process_scanResponse(Z_ScanResponse *res) display_term(ent->entries[i]->u.termInfo); } else - display_diagrec(ent->entries[i]->u.surrogateDiagnostic); + display_diagrecs(&ent->entries[i]->u.surrogateDiagnostic, 1); } else - display_diagrec(res->entries->u.nonSurrogateDiagnostics->diagRecs[0]); + display_diagrecs(&res->entries-> + u.nonSurrogateDiagnostics->diagRecs[0], 1); +} + +void process_sortResponse(Z_SortResponse *res) +{ + printf("Received SortResponse: status="); + switch (*res->sortStatus) + { + case Z_SortStatus_success: + printf ("success"); break; + case Z_SortStatus_partial_1: + printf ("partial"); break; + case Z_SortStatus_failure: + printf ("failure"); break; + default: + printf ("unknown (%d)", *res->sortStatus); + } + printf ("\n"); + print_refid (res->referenceId); + if (res->diagnostics) + display_diagrecs(res->diagnostics->diagRecs, + res->diagnostics->num_diagRecs); +} + +int cmd_sort_generic(char *arg, int newset) +{ + if (!session) + { + printf("Session not initialized yet\n"); + return 0; + } + if (!ODR_MASK_GET(session->options, Z_Options_sort)) + { + printf("Target doesn't support sort\n"); + return 0; + } + if (*arg) + { + if (send_sortrequest(arg, newset) < 0) + return 0; + return 2; + } + return 0; +} + +int cmd_sort(char *arg) +{ + return cmd_sort_generic (arg, 0); +} + +int cmd_sort_newset (char *arg) +{ + return cmd_sort_generic (arg, 1); } int cmd_scan(char *arg) @@ -951,41 +1537,13 @@ int cmd_format(char *arg) printf("Usage: format \n"); return 0; } - if (!strcmp(arg, "sutrs")) - { - printf("Preferred format is SUTRS.\n"); - recordsyntax = VAL_SUTRS; - return 1; - } - else if (!strcmp(arg, "usmarc")) - { - printf("Preferred format is USMARC\n"); - recordsyntax = VAL_USMARC; - return 1; - } - else if (!strcmp(arg, "danmarc")) - { - printf("Preferred format is DANMARC\n"); - recordsyntax = VAL_DANMARC; - return 1; - } - else if (!strcmp(arg, "grs1")) - { - printf("Preferred format is GRS1\n"); - recordsyntax = VAL_GRS1; - return 1; - } - else if (!strcmp(arg, "explain")) - { - printf("Preferred format is Explain\n"); - recordsyntax = VAL_EXPLAIN; - return 1; - } - else + recordsyntax = oid_getvalbyname (arg); + if (recordsyntax == VAL_NONE) { - printf("Specify one of {sutrs,usmarc,danmarc,grs1}.\n"); + printf ("unknown record syntax\n"); return 0; } + return 1; } int cmd_elements(char *arg) @@ -1008,7 +1566,6 @@ int cmd_elements(char *arg) int cmd_attributeset(char *arg) { char what[100]; - oid_value v; if (!arg || !*arg) { @@ -1016,12 +1573,11 @@ int cmd_attributeset(char *arg) return 0; } sscanf(arg, "%s", what); - if ((v = oid_getvalbyname(what)) == VAL_NONE) + if (p_query_attset (what)) { printf("Unknown attribute set name\n"); return 0; } - attributeset = v; return 1; } @@ -1048,6 +1604,18 @@ int cmd_querytype (char *arg) return 1; } +int cmd_refid (char *arg) +{ + xfree (refid); + refid = NULL; + if (*arg) + { + refid = (char *) xmalloc (strlen(arg)+1); + strcpy (refid, arg); + } + return 1; +} + int cmd_close(char *arg) { Z_APDU *apdu = zget_APDU(out, Z_APDU_close); @@ -1065,7 +1633,7 @@ static void initialize(void) #if CCL2RPN FILE *inf; #endif - + nmem_init(); if (!(out = odr_createmem(ODR_ENCODE)) || !(in = odr_createmem(ODR_DECODE)) || !(print = odr_createmem(ODR_PRINT))) @@ -1086,7 +1654,7 @@ static void initialize(void) #endif } -static int client(void) +static int client(int wait) { static struct { char *cmd; @@ -1097,8 +1665,10 @@ static int client(void) {"quit", cmd_quit, ""}, {"find", cmd_find, ""}, {"base", cmd_base, ""}, - {"show", cmd_show, "['+'<#recs>]"}, + {"show", cmd_show, "['+'<#recs>['+']]"}, {"scan", cmd_scan, ""}, + {"sort", cmd_sort, " ..."}, + {"sort+", cmd_sort_newset, " ..."}, {"authentication", cmd_authentication, ""}, {"lslb", cmd_lslb, ""}, {"ssub", cmd_ssub, ""}, @@ -1111,6 +1681,8 @@ static int client(void) {"close", cmd_close, ""}, {"attributeset", cmd_attributeset, ""}, {"querytype", cmd_querytype, ""}, + {"refid", cmd_refid, ""}, + {"itemorder", cmd_itemorder, ""}, {0,0} }; char *netbuffer= 0; @@ -1121,9 +1693,12 @@ static int client(void) while (1) { int res; +#ifdef USE_SELECT fd_set input; +#endif char line[1024], word[1024], arg[1024]; - + +#ifdef USE_SELECT FD_ZERO(&input); FD_SET(0, &input); if (conn) @@ -1135,11 +1710,17 @@ static int client(void) } if (!res) continue; - if (FD_ISSET(0, &input)) - { + if (!wait && FD_ISSET(0, &input)) +#else + if (!wait) +#endif + { /* quick & dirty way to get a command line. */ - if (!gets(line)) - break; + char *end_p; + if (!fgets(line, 1023, stdin)) + break; + if ((end_p = strchr (line, '\n'))) + *end_p = '\0'; if ((res = sscanf(line, "%s %[^;]", word, arg)) <= 0) { strcpy(word, last_cmd); @@ -1163,9 +1744,15 @@ static int client(void) res = 1; } if (res < 2) + { printf(C_PROMPT); + continue; + } } + wait = 0; +#ifdef USE_SELECT if (conn && FD_ISSET(cs_fileno(conn), &input)) +#endif { do { @@ -1200,37 +1787,48 @@ static int client(void) #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: - printf("Received presentResponse.\n"); - setno += - *apdu->u.presentResponse->numberOfRecordsReturned; - if (apdu->u.presentResponse->records) - display_records(apdu->u.presentResponse->records); - else - printf("No records.\n"); - break; - case Z_APDU_close: - printf("Target has closed the association.\n"); - process_close(apdu->u.close); - break; - default: - printf("Received unknown APDU type (%d).\n", - apdu->which); - exit(1); + 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"); + 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; + default: + printf("Received unknown APDU type (%d).\n", + apdu->which); + exit(1); } - printf(C_PROMPT); - fflush(stdout); } while (cs_more(conn)); + printf(C_PROMPT); + fflush(stdout); } } return 0; @@ -1238,15 +1836,38 @@ static int client(void) int main(int argc, char **argv) { + char *prog = *argv; + char *arg; + int ret; + int opened = 0; + initialize(); - if (argc > 1) - cmd_open(argv[1]); - else - printf(C_PROMPT); - if (*marcdump_file && !(marcdump = fopen(marcdump_file, "a"))) + cmd_base("Default"); + + while ((ret = options("m:", argv, argc, &arg)) != -2) { - perror(marcdump_file); - exit(1); + switch (ret) + { + case 0: + if (cmd_open (arg) == 2) + opened = 1; + break; + case 'm': + if (!(marcdump = fopen (arg, "a"))) + { + perror (arg); + exit (1); + } + break; + default: + fprintf (stderr, "Usage: %s [-m ] []\n", + prog); + exit (1); + } } - return client(); + if (!opened) + printf (C_PROMPT); + return client (opened); } + +