X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;ds=sidebyside;f=client%2Fclient.c;h=983b7b42ade2e65e4e06dad1bd7df97e0484e041;hb=ffb88e8bb97c6e24989b7f04b8bbf1a4203d2f72;hp=18d2cfcedfcb332f3214ea24c7edbb1f57936ed6;hpb=6517fa53d35512887780fd07de5667940da18a9e;p=yaz-moved-to-github.git diff --git a/client/client.c b/client/client.c index 18d2cfc..983b7b4 100644 --- a/client/client.c +++ b/client/client.c @@ -1,10 +1,40 @@ /* - * Copyright (c) 1995-1997, Index Data. + * Copyright (c) 1995-1998, Index Data. * See the file LICENSE for details. * Sebastian Hammer, Adam Dickmeiss * * $Log: client.c,v $ - * Revision 1.50 1997-09-17 12:10:29 adam + * 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 @@ -166,12 +196,13 @@ * to illustrate the use of the YAZ service-level API. */ -#include #include #include #include #include +#include + #include #include #ifdef USE_XTIMOSI @@ -181,7 +212,6 @@ #include #include #include -#include #include @@ -254,6 +284,7 @@ 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->protocolVersion, Z_ProtocolVersion_1); ODR_MASK_SET(req->protocolVersion, Z_ProtocolVersion_2); @@ -482,7 +513,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) { @@ -514,7 +544,7 @@ static void display_record(Z_DatabaseRecord *p) r->which = type->what; } } - if (ent->value == VAL_SOIF) + 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) { @@ -523,7 +553,7 @@ static void display_record(Z_DatabaseRecord *p) if (marcdump) fwrite (marc_buf, strlen (marc_buf), 1, marcdump); } - else if (ent->value == VAL_SUTRS) + else if (ent && ent->value == VAL_SUTRS) { if (r->which != Z_External_sutrs) { @@ -532,7 +562,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) { @@ -552,41 +582,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); } @@ -596,8 +627,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++) @@ -610,6 +644,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; @@ -660,7 +695,7 @@ 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; } @@ -694,7 +729,7 @@ static int send_searchRequest(char *arg) 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; @@ -824,6 +859,7 @@ static int send_presentRequest(char *arg) Z_RecordComposition compo; oident prefsyn; int nos = 1; + int oid[OID_SIZE]; char *p; char setstring[100]; @@ -834,14 +870,16 @@ 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) { @@ -854,7 +892,8 @@ static int send_presentRequest(char *arg) 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; @@ -909,7 +948,7 @@ int cmd_quit(char *arg) { printf("See you later, alligator.\n"); exit(0); - return 0; + return 0; } int cmd_cancel(char *arg) @@ -952,6 +991,122 @@ 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 = 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->inputResultSetNames = + odr_malloc (out, sizeof(*req->inputResultSetNames)); + req->inputResultSetNames->num_strings = 1; + req->inputResultSetNames->strings = + odr_malloc (out, sizeof(*req->inputResultSetNames->strings)); + req->inputResultSetNames->strings[0] = + odr_malloc (out, strlen(setstring)+1); + strcpy (req->inputResultSetNames->strings[0], setstring); + + if (newset && setnumber >= 0) + sprintf (setstring, "%d", ++setnumber); + + req->sortedResultSetName = odr_malloc (out, strlen(setstring)+1); + strcpy (req->sortedResultSetName, setstring); + + req->sortSequence = sksl; + sksl->num_specs = 0; + sksl->specs = 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) + { + int i; + char *sort_string_sep; + Z_SortKeySpec *sks = odr_malloc (out, sizeof(*sks)); + Z_SortKey *sk = odr_malloc (out, sizeof(*sk)); + + arg += off; + sksl->specs[sksl->num_specs++] = sks; + sks->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 = odr_malloc (out, sizeof(*el)); + sk->which = Z_SortKey_sortAttributes; + sk->u.sortAttributes = + odr_malloc (out, sizeof(*sk->u.sortAttributes)); + sk->u.sortAttributes->id = oid_ent_to_oid(&bib1, oid); + sk->u.sortAttributes->list = + odr_malloc (out, sizeof(*sk->u.sortAttributes->list)); + sk->u.sortAttributes->list->num_attributes = 1; + sk->u.sortAttributes->list->attributes = + odr_malloc (out, + sizeof(*sk->u.sortAttributes->list->attributes)); + sk->u.sortAttributes->list->attributes[0] = el; + el->attributeSet = 0; + el->attributeType = odr_malloc (out, sizeof(*el->attributeType)); + *el->attributeType = atoi (sort_string); + el->which = Z_AttributeValue_numeric; + el->value.numeric = odr_malloc (out, sizeof(*el->value.numeric)); + *el->value.numeric = atoi (sort_string_sep + 1); + } + else + { + sk->which = Z_SortKey_sortField; + sk->u.sortField = odr_malloc (out, strlen(sort_string)+1); + strcpy (sk->u.sortField, sort_string); + } + sks->sortRelation = odr_malloc (out, sizeof(*sks->sortRelation)); + *sks->sortRelation = Z_SortRelation_ascending; + sks->caseSensitivity = 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) + return 0; + send_apdu(apdu); + return 2; +} + void display_term(Z_TermInfo *t) { if (t->term->which == Z_Term_general) @@ -986,10 +1141,62 @@ 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("Sort: 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"); + 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) @@ -1022,65 +1229,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")) + recordsyntax = oid_getvalbyname (arg); + if (recordsyntax == VAL_NONE) { - 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, "unimarc")) - { - printf("Preferred format is UNIMARC\n"); - recordsyntax = VAL_UNIMARC; - return 1; - } - else if (!strcmp(arg, "grs1")) - { - 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,unimarc,grs1,summary,explain}.\n"); + printf ("unknown record syntax\n"); return 0; } + return 1; } int cmd_elements(char *arg) @@ -1158,7 +1313,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))) @@ -1190,8 +1345,10 @@ static int client(int wait) {"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, ""}, @@ -1218,7 +1375,7 @@ static int client(int wait) fd_set input; #endif char line[1024], word[1024], arg[1024]; - + #ifdef USE_SELECT FD_ZERO(&input); FD_SET(0, &input); @@ -1235,10 +1392,13 @@ static int client(int wait) #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); @@ -1304,32 +1464,34 @@ static int client(int wait) #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: + 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_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); } printf(C_PROMPT); fflush(stdout);