X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=client%2Fclient.c;h=d82a8ffc5f12e13b5ab2e75d7f62e40f354a31f8;hb=32226dbfb020481e8589fad8f5f349eff63e3273;hp=1cd8151952ebcca9f370e0f43991aef3b603a3ee;hpb=1db60f5a7396b9b37560f6b6962be0b68240486c;p=yaz-moved-to-github.git diff --git a/client/client.c b/client/client.c index 1cd8151..d82a8ff 100644 --- a/client/client.c +++ b/client/client.c @@ -4,7 +4,25 @@ * Sebastian Hammer, Adam Dickmeiss * * $Log: client.c,v $ - * Revision 1.12 1995-06-15 07:44:57 quinn + * Revision 1.18 1995-08-28 12:21:27 quinn + * Client can now ask for simple element set names. + * + * Revision 1.17 1995/08/17 12:45:02 quinn + * Fixed minor problems with GRS-1. Added support in c&s. + * + * Revision 1.16 1995/08/15 12:00:04 quinn + * Updated External + * + * Revision 1.15 1995/06/22 09:28:03 quinn + * Fixed bug in SUTRS processing. + * + * Revision 1.14 1995/06/19 12:37:41 quinn + * Added BER dumper. + * + * Revision 1.13 1995/06/16 10:29:11 quinn + * *** empty log message *** + * + * Revision 1.12 1995/06/15 07:44:57 quinn * Moving to v3. * * Revision 1.11 1995/06/14 15:26:40 quinn @@ -63,8 +81,8 @@ #endif #include - #include +#include #ifdef RPN_QUERY #ifdef PREFIX_QUERY @@ -84,8 +102,10 @@ static int setnumber = 0; /* current result set number */ static int smallSetUpperBound = 0; static int largeSetLowerBound = 1; static int mediumSetPresentNumber = 0; +static Z_ElementSetNames *elementSetNames = 0; static int setno = 1; /* current set offset */ static int protocol = PROTO_Z3950; /* current app protocol */ +static int recordsyntax = VAL_USMARC; static ODR_MEM session_mem; /* memory handle for init-response */ static Z_InitResponse *session = 0; /* session parameters */ static char last_scan[512] = "0"; @@ -156,7 +176,7 @@ static int process_initResponse(Z_InitResponse *res) if (res->userInformationField) { printf("UserInformationfield:\n"); - if (!odr_external(print, (Odr_external**)&res-> userInformationField, + if (!z_External(print, (Z_External**)&res-> userInformationField, 0)) { odr_perror(print, "Printing userinfo\n"); @@ -254,14 +274,46 @@ int cmd_authentication(char *arg) /* SEARCH SERVICE ------------------------------ */ +void display_grs1(Z_GenericRecord *r, int level) +{ + int i; + + if (!r) + return; + for (i = 0; i < r->num_elements; i++) + { + Z_TaggedElement *t; + + printf("%*s", level * 4, ""); + t = r->elements[i]; + printf("("); + if (t->tagType) + printf("%d,", *t->tagType); + else + printf("?,"); + if (t->tagValue->which == Z_StringOrNumeric_numeric) + printf("%d) ", *t->tagValue->u.numeric); + else + printf("%s) ", t->tagValue->u.string); + if (t->content->which == Z_ElementData_subtree) + { + printf("\n"); + display_grs1(t->content->u.subtree, level+1); + } + else if (t->content->which == Z_ElementData_string) + printf("%s\n", t->content->u.string); + else + printf("??????\n"); + } +} + void display_record(Z_DatabaseRecord *p) { - Odr_external *r = (Odr_external*) p; + Z_External *r = (Z_External*) p; + oident *ent = oid_getentbyoid(r->direct_reference); if (r->direct_reference) { - oident *ent = oid_getentbyoid(r->direct_reference); - printf("Record type: "); if (ent) printf("%s\n", ent->desc); @@ -271,29 +323,35 @@ void display_record(Z_DatabaseRecord *p) odr_reset(print); } } -#if 1 if (r->which == ODR_EXTERNAL_octet && p->u.octet_aligned->len) - { -#if 1 marc_display ((char*)p->u.octet_aligned->buf, stdout); -#else - FILE *ofi = fopen("dump", "a"); - assert(ofi); - fwrite(p->u.octet_aligned->buf, 1, p->u.octet_aligned->len, ofi); - fclose(ofi); - printf("dumped record\n"); -#endif + else if (ent->value == VAL_SUTRS) + { + if (r->which != Z_External_sutrs) + { + printf("Expecting single SUTRS type for SUTRS.\n"); + return; + } + printf("%.*s", r->u.sutrs->len, r->u.sutrs->buf); } - else + else if (ent->value == VAL_GRS1) + { + if (r->which != Z_External_grs1) + { + printf("Expecting single GRS type for GRS.\n"); + return; + } + display_grs1(r->u.grs1, 0); + } + else { printf("Unknown record representation.\n"); - if (!odr_external(print, &r, 0)) + if (!z_External(print, &r, 0)) { odr_perror(print, "Printing external"); odr_reset(print); } } -#endif } static void display_diagrec(Z_DiagRec *p) @@ -305,7 +363,7 @@ static void display_diagrec(Z_DiagRec *p) Z_DiagRec *r = p; #endif - printf("Diagnostic message from database.\n"); + printf("Diagnostic message from database:\n"); #ifdef Z_95 if (p->which != Z_DiagRec_defaultFormat) { @@ -318,8 +376,11 @@ static void display_diagrec(Z_DiagRec *p) if (!(ent = oid_getentbyoid(r->diagnosticSetId)) || ent->class != CLASS_DIAGSET || ent->value != VAL_BIB1) printf("Missing or unknown diagset\n"); - printf("Error condition: %d", *r->condition); - printf(" -- %s\n", r->addinfo ? r->addinfo : ""); + 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) @@ -397,6 +458,18 @@ static int send_searchRequest(char *arg) *req->smallSetUpperBound = smallSetUpperBound; *req->largeSetLowerBound = largeSetLowerBound; *req->mediumSetPresentNumber = mediumSetPresentNumber; + if (smallSetUpperBound > 0 || (largeSetLowerBound > 1 && + mediumSetPresentNumber > 0)) + { + oident prefsyn; + + prefsyn.proto = protocol; + prefsyn.class = CLASS_RECSYN; + prefsyn.value = recordsyntax; + req->preferredRecordSyntax = odr_oiddup(out, oid_getoidbyent(&prefsyn)); + req->smallSetElementSetNames = + req->mediumSetElementSetNames = elementSetNames; + } req->num_databaseNames = 1; req->databaseNames = &databaseNames; @@ -527,6 +600,8 @@ static int send_presentRequest(char *arg) { Z_APDU *apdu = zget_APDU(out, Z_APDU_presentRequest); Z_PresentRequest *req = apdu->u.presentRequest; + Z_RecordComposition compo; + oident prefsyn; int nos = 1; char *p; char setstring[100]; @@ -546,6 +621,16 @@ static int send_presentRequest(char *arg) } req->resultSetStartPoint = &setno; req->numberOfRecordsRequested = &nos; + prefsyn.proto = protocol; + prefsyn.class = CLASS_RECSYN; + prefsyn.value = recordsyntax; + req->preferredRecordSyntax = oid_getoidbyent(&prefsyn); + if (elementSetNames) + { + req->recordComposition = &compo; + compo.which = Z_RecordComp_simple; + compo.u.simple = elementSetNames; + } send_apdu(apdu); printf("Sent presentRequest (%d+%d).\n", setno, nos); return 2; @@ -672,6 +757,61 @@ int cmd_scan(char *arg) return 2; } +int cmd_format(char *arg) +{ + if (!arg || !*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 + { + printf("Specify one of {sutrs,usmarc,danmarc,grs1}.\n"); + return 0; + } +} + +int cmd_elements(char *arg) +{ + static Z_ElementSetNames esn; + static char what[100]; + + if (!arg || !*arg) + { + printf("Usage: elements \n"); + return 0; + } + strcpy(what, arg); + esn.which = Z_ElementSetNames_generic; + esn.u.generic = what; + elementSetNames = &esn; + return 1; +} + static void initialize(void) { #ifdef RPN_QUERY @@ -722,6 +862,8 @@ static int client(void) {"status", cmd_status, ""}, {"setnames", cmd_setnames, ""}, {"cancel", cmd_cancel, ""}, + {"format", cmd_format, ""}, + {"elements", cmd_elements, ""}, {0,0} }; char *netbuffer= 0; @@ -795,6 +937,9 @@ static int client(void) if (!z_APDU(in, &apdu, 0)) { odr_perror(in, "Decoding incoming APDU"); + fprintf(stderr, "Packet dump:\n---------\n"); + odr_dumpBER(stderr, netbuffer, res); + fprintf(stderr, "---------\n"); exit(1); } #if 0