X-Git-Url: http://git.indexdata.com/?p=yaz-moved-to-github.git;a=blobdiff_plain;f=client%2Fclient.c;h=66dc48e131f9f82e9173053a7402befe40af3e6e;hp=5edf45746e526876b7d29abc578a083c61d5f70d;hb=79bf9f1b8b224b6b7323b280fca704591ac17324;hpb=6c5cedfce30df58be034fd3555ae6935b3023882 diff --git a/client/client.c b/client/client.c index 5edf457..66dc48e 100644 --- a/client/client.c +++ b/client/client.c @@ -1,10 +1,44 @@ /* - * Copyright (c) 1995-1996, Index Data. + * Copyright (c) 1995-1997, Index Data. * See the file LICENSE for details. * Sebastian Hammer, Adam Dickmeiss * * $Log: client.c,v $ - * Revision 1.43 1996-11-08 11:03:26 adam + * 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 @@ -157,6 +191,7 @@ #include #include #include +#include #include @@ -185,7 +220,6 @@ static Z_InitResponse *session = 0; /* session parameters */ static char last_scan[512] = "0"; static char last_cmd[100] = "?"; static FILE *marcdump = 0; -static char marcdump_file[512] = "marc.out"; typedef enum { QueryType_Prefix, @@ -293,39 +327,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) @@ -366,7 +395,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); @@ -498,7 +527,12 @@ static void display_record(Z_DatabaseRecord *p) if (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) - marc_display ((char*)p->u.octet_aligned->buf, stdout); + { + 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->value == VAL_SUTRS) { if (r->which != Z_External_sutrs) @@ -528,41 +562,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); } @@ -572,8 +607,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++) @@ -586,6 +624,7 @@ static int send_searchRequest(char *arg) Z_APDU *apdu = zget_APDU(out, Z_APDU_searchRequest); Z_SearchRequest *req = apdu->u.searchRequest; Z_Query query; + int oid[OID_SIZE]; #if CCL2RPN struct ccl_rpn_node *rpn; int error, pos; @@ -631,12 +670,13 @@ static int send_searchRequest(char *arg) mediumSetPresentNumber > 0)) { oident prefsyn; + int oid[OID_SIZE]; prefsyn.proto = protocol; 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; } @@ -666,12 +706,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: @@ -799,6 +840,7 @@ static int send_presentRequest(char *arg) Z_RecordComposition compo; oident prefsyn; int nos = 1; + int oid[OID_SIZE]; char *p; char setstring[100]; @@ -824,21 +866,13 @@ static int send_presentRequest(char *arg) 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; @@ -893,6 +927,7 @@ int cmd_quit(char *arg) { printf("See you later, alligator.\n"); exit(0); + return 0; } int cmd_cancel(char *arg) @@ -900,7 +935,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) { @@ -913,7 +948,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"); @@ -969,10 +1004,11 @@ 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); } int cmd_scan(char *arg) @@ -1005,59 +1041,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, "ukmarc")) - { - printf("Preferred format is UKMARC\n"); - recordsyntax = VAL_UKMARC; - return 1; - } - else if (!strcmp(arg, "grs1")) + recordsyntax = oid_getvalbyname (arg); + if (recordsyntax == VAL_NONE) { - printf("Preferred format is GRS1\n"); - recordsyntax = VAL_GRS1; - return 1; - } - else if (!strcmp(arg, "soif")) - { - printf("Preferred format is SOIF\n"); - recordsyntax = VAL_SOIF; - return 1; - } - else if (!strcmp(arg, "summary")) - { - printf("Preferred format is Summary\n"); - recordsyntax = VAL_SUMMARY; - return 1; - } - else if (!strcmp(arg, "explain")) - { - printf("Preferred format is Explain\n"); - recordsyntax = VAL_EXPLAIN; - return 1; - } - else - { - printf("Specify one of {sutrs,usmarc,danmarc,ukmarc,grs1,summary,explain}.\n"); + printf ("unknown record syntax\n"); return 0; } + return 1; } int cmd_elements(char *arg) @@ -1135,7 +1125,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))) @@ -1320,16 +1310,36 @@ static int client(int wait) int main(int argc, char **argv) { + char *prog = *argv; + char *arg; + int ret; + int opened = 0; + initialize(); cmd_base("Default"); - if (argc > 1) - cmd_open(argv[1]); - else - printf(C_PROMPT); - if (*marcdump_file && !(marcdump = fopen(marcdump_file, "a"))) + + 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((argc > 1)); + if (!opened) + printf (C_PROMPT); + return client (opened); }