X-Git-Url: http://git.indexdata.com/?p=yaz-moved-to-github.git;a=blobdiff_plain;f=client%2Fclient.c;h=1632254356bd31015ac24788751cb44e25447a1d;hp=90438a6d6e958c7ab61fc7fcffe2535fd77f4b0b;hb=97e81740fd91d912d75ff85fefc61b1d19cbc611;hpb=f1bb2364c333c161a8197785e51348c70f31ca6b diff --git a/client/client.c b/client/client.c index 90438a6..1632254 100644 --- a/client/client.c +++ b/client/client.c @@ -4,7 +4,23 @@ * Sebastian Hammer, Adam Dickmeiss * * $Log: client.c,v $ - * Revision 1.30 1996-02-12 18:18:09 quinn + * 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 + * *** empty log message *** + * + * Revision 1.33 1996/05/09 07:25:22 quinn + * Small + * + * Revision 1.32 1996/03/15 11:05:33 adam + * The user can set the preferred query type (prefix, ccl, ..) with the + * querytype command. + * + * Revision 1.31 1996/02/20 12:51:54 quinn + * Fixed problems with EXTERNAL. + * + * Revision 1.30 1996/02/12 18:18:09 quinn * Fidgeting. * * Revision 1.29 1996/01/02 08:57:25 quinn @@ -124,13 +140,11 @@ #include #include -#ifdef RPN_QUERY -#ifdef PREFIX_QUERY #include -#else + +#if CCL2RPN #include #endif -#endif #define C_PROMPT "Z> " @@ -147,19 +161,25 @@ static int setno = 1; /* current set offset */ static int protocol = PROTO_Z3950; /* current app protocol */ static int recordsyntax = VAL_USMARC; static int sent_close = 0; -static ODR_MEM session_mem; /* memory handle for init-response */ -static Z_InitResponse *session = 0; /* session parameters */ +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"; -#ifdef RPN_QUERY -#ifndef PREFIX_QUERY +typedef enum { + QueryType_Prefix, + QueryType_CCL, + QueryType_CCL2RPN +} QueryType; + +static QueryType queryType = QueryType_Prefix; + +#if CCL2RPN static CCL_bibset bibset; /* CCL bibset handle */ #endif -#endif static void send_apdu(Z_APDU *a) { @@ -172,7 +192,7 @@ static void send_apdu(Z_APDU *a) exit(1); } buf = odr_getbuf(out, &len, 0); - odr_reset(out); /* release the APDU */ + odr_reset(out); /* release the APDU structure */ if (cs_put(conn, buf, len) < 0) { fprintf(stderr, "cs_put: %s", cs_errmsg(cs_errno(conn))); @@ -367,6 +387,21 @@ static void display_grs1(Z_GenericRecord *r, int level) 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) @@ -396,6 +431,9 @@ static void display_record(Z_DatabaseRecord *p) Z_External *r = (Z_External*) p; oident *ent = oid_getentbyoid(r->direct_reference); + /* + * Tell the user what we got. + */ if (r->direct_reference) { printf("Record type: "); @@ -407,30 +445,40 @@ static void display_record(Z_DatabaseRecord *p) odr_reset(print); } } - if (r->which == Z_External_octet && p->u.octet_aligned->len) - { -#if 0 - if (marcdump) - fwrite(p->u.octet_aligned->buf, p->u.octet_aligned->len, 1, - marcdump); -#endif - static count = 0; - FILE *f; - char buf[256]; - - sprintf(buf, "marc.%d", count++); - if (!(f = fopen(buf, "w"))) - { - perror(buf); - exit(1); - - } - fwrite(p->u.octet_aligned->buf, p->u.octet_aligned->len, 1, f); - fclose(f); + /* 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; - marc_display ((char*)p->u.octet_aligned->buf, stdout); + 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, &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 = 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 (r->which != Z_External_sutrs) @@ -484,7 +532,7 @@ static void display_diagrec(Z_DiagRec *p) 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); + printf(" -- '%s'\n", r->addinfo); else printf("\n"); } @@ -519,30 +567,26 @@ static int send_searchRequest(char *arg) Z_SearchRequest *req = apdu->u.searchRequest; char *databaseNames = database; Z_Query query; -#ifdef RPN_QUERY -#ifndef PREFIX_QUERY +#if CCL2RPN struct ccl_rpn_node *rpn; int error, pos; -#endif + oident bib1; #endif char setstring[100]; -#ifdef RPN_QUERY Z_RPNQuery *RPNquery; - oident bib1; -#else Odr_oct ccl_query; -#endif -#ifdef RPN_QUERY -#ifndef PREFIX_QUERY - rpn = ccl_find_str(bibset, arg, &error, &pos); - if (error) +#if CCL2RPN + if (queryType == QueryType_CCL2RPN) { - printf("CCL ERROR: %s\n", ccl_err_msg(error)); - return 0; + rpn = ccl_find_str(bibset, arg, &error, &pos); + if (error) + { + printf("CCL ERROR: %s\n", ccl_err_msg(error)); + return 0; + } } #endif -#endif if (!strcmp(arg, "@big")) /* strictly for troublemaking */ { @@ -572,7 +616,8 @@ static int send_searchRequest(char *arg) prefsyn.proto = protocol; prefsyn.oclass = CLASS_RECSYN; prefsyn.value = recordsyntax; - req->preferredRecordSyntax = odr_oiddup(out, oid_getoidbyent(&prefsyn)); + req->preferredRecordSyntax = + odr_oiddup(out, oid_getoidbyent(&prefsyn)); req->smallSetElementSetNames = req->mediumSetElementSetNames = elementSetNames; } @@ -581,31 +626,39 @@ static int send_searchRequest(char *arg) req->query = &query; -#ifdef RPN_QUERY - query.which = Z_Query_type_1; - -#ifndef PREFIX_QUERY - assert((RPNquery = ccl_rpn_query(rpn))); -#else - RPNquery = p_query_rpn (out, arg); - if (!RPNquery) + switch (queryType) { - printf("Prefix query error\n"); + case QueryType_Prefix: + query.which = Z_Query_type_1; + RPNquery = p_query_rpn (out, protocol, arg); + if (!RPNquery) + { + printf("Prefix query error\n"); + return 0; + } + query.u.type_1 = RPNquery; + break; + case QueryType_CCL: + query.which = Z_Query_type_2; + query.u.type_2 = &ccl_query; + ccl_query.buf = (unsigned char*) arg; + ccl_query.len = strlen(arg); + break; +#if CCL2RPN + case QueryType_CCL2RPN: + query.which = Z_Query_type_1; + assert((RPNquery = ccl_rpn_query(rpn))); + bib1.proto = protocol; + bib1.oclass = CLASS_ATTSET; + bib1.value = VAL_BIB1; + RPNquery->attributeSetId = oid_getoidbyent(&bib1); + query.u.type_1 = RPNquery; + break; +#endif + default: + printf ("Unsupported query type\n"); return 0; } -#endif - bib1.proto = protocol; - bib1.oclass = CLASS_ATTSET; - bib1.value = VAL_BIB1; - RPNquery->attributeSetId = oid_getoidbyent(&bib1); - query.u.type_1 = RPNquery; -#else - query.which = Z_Query_type_2; - query.u.type_2 = &ccl_query; - ccl_query.buf = (unsigned char*) arg; - ccl_query.len = strlen(arg); -#endif - send_apdu(apdu); setno = 1; printf("Sent searchRequest.\n"); @@ -817,15 +870,11 @@ 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; - oident attset; req->num_databaseNames = 1; req->databaseNames = &db; - attset.proto = protocol; - attset.oclass = CLASS_ATTSET; - attset.value = VAL_BIB1; - req->attributeSet = oid_getoidbyent(&attset); - req->termListAndStartPoint = p_query_scan(out, string); + req->termListAndStartPoint = p_query_scan(out, protocol, + &req->attributeSet, string); req->numberOfTermsRequested = # req->preferredPositionInResponse = &pp; send_apdu(apdu); @@ -976,6 +1025,29 @@ int cmd_attributeset(char *arg) return 1; } +int cmd_querytype (char *arg) +{ + if (!strcmp (arg, "ccl")) + queryType = QueryType_CCL; + else if (!strcmp (arg, "prefix")) + queryType = QueryType_Prefix; +#if CCL2RPN + else if (!strcmp (arg, "ccl2rpn") || !strcmp (arg, "cclrpn")) + queryType = QueryType_CCL2RPN; +#endif + else + { + printf ("Querytype must be one of:\n"); + printf (" prefix - Prefix query\n"); + printf (" ccl - CCL query\n"); +#if CCL2RPN + printf (" ccl2rpn - CCL query converted to RPN\n"); +#endif + return 0; + } + return 1; +} + int cmd_close(char *arg) { Z_APDU *apdu = zget_APDU(out, Z_APDU_close); @@ -990,11 +1062,9 @@ int cmd_close(char *arg) static void initialize(void) { -#ifdef RPN_QUERY -#ifndef PREFIX_QUERY +#if CCL2RPN FILE *inf; #endif -#endif if (!(out = odr_createmem(ODR_ENCODE)) || !(in = odr_createmem(ODR_DECODE)) || @@ -1005,8 +1075,7 @@ static void initialize(void) } setvbuf(stdout, 0, _IONBF, 0); -#ifdef RPN_QUERY -#ifndef PREFIX_QUERY +#if CCL2RPN bibset = ccl_qual_mk (); inf = fopen ("default.bib", "r"); if (inf) @@ -1015,7 +1084,6 @@ static void initialize(void) fclose (inf); } #endif -#endif } static int client(void) @@ -1025,13 +1093,13 @@ static int client(void) int (*fun)(char *arg); char *ad; } cmd[] = { - {"open", cmd_open, "('tcp'|'osi')':'['/'][':']"}, + {"open", cmd_open, "('tcp'|'osi')':'['/'][':']"}, {"quit", cmd_quit, ""}, - {"find", cmd_find, ""}, - {"base", cmd_base, ""}, - {"show", cmd_show, "['+'<#RECS>]"}, - {"scan", cmd_scan, ""}, - {"authentication", cmd_authentication, ""}, + {"find", cmd_find, ""}, + {"base", cmd_base, ""}, + {"show", cmd_show, "['+'<#recs>]"}, + {"scan", cmd_scan, ""}, + {"authentication", cmd_authentication, ""}, {"lslb", cmd_lslb, ""}, {"ssub", cmd_ssub, ""}, {"mspn", cmd_mspn, ""}, @@ -1042,6 +1110,7 @@ static int client(void) {"elements", cmd_elements, ""}, {"close", cmd_close, ""}, {"attributeset", cmd_attributeset, ""}, + {"querytype", cmd_querytype, ""}, {0,0} }; char *netbuffer= 0;