X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=client%2Fclient.c;h=1e7077fa567a5941bfe36b5829322c19896ebfd7;hb=a0e27aac0589d493172c73f6660b844fc6460d7c;hp=6be4576c8dd16a2fa6f423598a13ee956c6f796a;hpb=26bc83eeda2418e09c32f2ca4c9327901568fe98;p=yaz-moved-to-github.git diff --git a/client/client.c b/client/client.c index 6be4576..1e7077f 100644 --- a/client/client.c +++ b/client/client.c @@ -2,7 +2,7 @@ * Copyright (C) 1995-2005, Index Data ApS * See the file LICENSE for details. * - * $Id: client.c,v 1.296 2005-08-24 11:25:34 heikki Exp $ + * $Id: client.c,v 1.304 2006-04-21 10:28:06 adam Exp $ */ #include @@ -100,7 +100,10 @@ static int mediumSetPresentNumber = 0; static Z_ElementSetNames *elementSetNames = 0; static int setno = 1; /* current set offset */ static enum oid_proto protocol = PROTO_Z3950; /* current app protocol */ -static enum oid_value recordsyntax = VAL_USMARC; +#define RECORDSYNTAX_MAX 20 +static enum oid_value recordsyntax_list[RECORDSYNTAX_MAX] = { VAL_USMARC }; +static int recordsyntax_size = 1; + static char *record_schema = 0; static int sent_close = 0; static NMEM session_mem = NULL; /* memory handle for init-response */ @@ -338,12 +341,10 @@ static void send_initRequest(const char* type_and_host) p0->which = Z_OtherInfo_externallyDefinedInfo; p0->information.externallyDefinedInfo = - yaz_set_proposal_charneg( - out, - (const char**)&negotiationCharset, - negotiationCharset ? 1 : 0, - (const char**)&yazLang, yazLang ? 1 : 0, - negotiationCharsetRecords); + yaz_set_proposal_charneg_list(out, ",", + negotiationCharset, + yazLang, + negotiationCharsetRecords); } } @@ -879,7 +880,7 @@ static void display_record(Z_External *r) if (!(*type->fun)(in, &rr, 0, 0)) { odr_perror(in, "Decoding constructed record."); - fprintf(stdout, "[Near %d]\n", odr_offset(in)); + fprintf(stdout, "[Near %ld]\n", (long) odr_offset(in)); fprintf(stdout, "Packet dump:\n---------\n"); odr_dumpBER(stdout, (char*)r->u.octet_aligned->buf, r->u.octet_aligned->len); @@ -1448,7 +1449,7 @@ static int send_SRW_searchRequest(const char *arg) if (record_schema) sr->u.request->recordSchema = record_schema; - if (recordsyntax == VAL_TEXT_XML) + if (recordsyntax_size == 1 && recordsyntax_list[0] == VAL_TEXT_XML) sr->u.explain_request->recordPacking = "xml"; return send_srw(sr); } @@ -1527,9 +1528,9 @@ static int send_searchRequest(const char *arg) if (smallSetUpperBound > 0 || (largeSetLowerBound > 1 && mediumSetPresentNumber > 0)) { - req->preferredRecordSyntax = - yaz_oidval_to_z3950oid(out, CLASS_RECSYN, recordsyntax); - + if (recordsyntax_size > 0) + req->preferredRecordSyntax = + yaz_oidval_to_z3950oid(out, CLASS_RECSYN, recordsyntax_list[0]); req->smallSetElementSetNames = req->mediumSetElementSetNames = elementSetNames; } @@ -1549,7 +1550,8 @@ static int send_searchRequest(const char *arg) const char *pqf_msg; size_t off; int code = yaz_pqf_error (pqf_parser, &pqf_msg, &off); - printf("%*s^\n", off+4, ""); + int ioff = off; + printf("%*s^\n", ioff+4, ""); printf("Prefix query error: %s (code %d)\n", pqf_msg, code); yaz_pqf_destroy (pqf_parser); @@ -1596,10 +1598,11 @@ static int send_searchRequest(const char *arg) } /* display Query Expression as part of searchResult-1 */ -static void display_queryExpression (Z_QueryExpression *qe) +static void display_queryExpression (const char *lead, Z_QueryExpression *qe) { if (!qe) return; + printf(" %s=", lead); if (qe->which == Z_QueryExpression_term) { if (qe->u.term->queryTerm) @@ -1608,16 +1611,16 @@ static void display_queryExpression (Z_QueryExpression *qe) switch (term->which) { case Z_Term_general: - printf (" %.*s", term->u.general->len, term->u.general->buf); + printf ("%.*s", term->u.general->len, term->u.general->buf); break; case Z_Term_characterString: - printf (" %s", term->u.characterString); + printf ("%s", term->u.characterString); break; case Z_Term_numeric: - printf (" %d", *term->u.numeric); + printf ("%d", *term->u.numeric); break; case Z_Term_null: - printf (" null"); + printf ("null"); break; } } @@ -1643,16 +1646,20 @@ static void display_searchResult (Z_OtherInformation *o) printf ("SearchResult-1:"); for (j = 0; j < sr->num; j++) { + if (j) + printf(","); if (!sr->elements[j]->subqueryExpression) - printf (" %d", j); - display_queryExpression ( + printf("%d", j); + display_queryExpression("term", sr->elements[j]->subqueryExpression); - display_queryExpression ( + display_queryExpression("interpretation", sr->elements[j]->subqueryInterpretation); - display_queryExpression ( + display_queryExpression("recommendation", sr->elements[j]->subqueryRecommendation); if (sr->elements[j]->subqueryCount) - printf ("(%d)", *sr->elements[j]->subqueryCount); + printf(" cnt=%d", *sr->elements[j]->subqueryCount); + if (sr->elements[j]->subqueryId) + printf(" id=%s ", sr->elements[j]->subqueryId); } printf ("\n"); } @@ -2428,7 +2435,7 @@ static int cmd_explain(const char *arg) /* save this for later .. when fetching individual records */ sr = yaz_srw_get(out, Z_SRW_explain_request); - if (recordsyntax == VAL_TEXT_XML) + if (recordsyntax_size > 0 && recordsyntax_list[0] == VAL_TEXT_XML) sr->u.explain_request->recordPacking = "xml"; send_srw(sr); return 2; @@ -2594,10 +2601,11 @@ static int send_presentRequest(const char *arg) req->resultSetStartPoint = &setno; req->numberOfRecordsRequested = &nos; - req->preferredRecordSyntax = - yaz_oidval_to_z3950oid(out, CLASS_RECSYN, recordsyntax); + if (recordsyntax_size == 1) + req->preferredRecordSyntax = + yaz_oidval_to_z3950oid(out, CLASS_RECSYN, recordsyntax_list[0]); - if (record_schema) + if (record_schema || recordsyntax_size >= 2) { req->recordComposition = &compo; compo.which = Z_RecordComp_complex; @@ -2609,16 +2617,21 @@ static int send_presentRequest(const char *arg) compo.u.complex->generic = (Z_Specification *) odr_malloc(out, sizeof(*compo.u.complex->generic)); + compo.u.complex->generic->which = Z_Schema_oid; - - compo.u.complex->generic->schema.oid = - yaz_str_to_z3950oid(out, CLASS_SCHEMA, record_schema); - - if (!compo.u.complex->generic->schema.oid) + if (!record_schema) + compo.u.complex->generic->schema.oid = 0; + else { - /* OID wasn't a schema! Try record syntax instead. */ - compo.u.complex->generic->schema.oid = (Odr_oid *) - yaz_str_to_z3950oid(out, CLASS_RECSYN, record_schema); + compo.u.complex->generic->schema.oid = + yaz_str_to_z3950oid(out, CLASS_SCHEMA, record_schema); + + if (!compo.u.complex->generic->schema.oid) + { + /* OID wasn't a schema! Try record syntax instead. */ + compo.u.complex->generic->schema.oid = (Odr_oid *) + yaz_str_to_z3950oid(out, CLASS_RECSYN, record_schema); + } } if (!elementSetNames) compo.u.complex->generic->elementSpec = 0; @@ -2633,8 +2646,22 @@ static int send_presentRequest(const char *arg) } compo.u.complex->num_dbSpecific = 0; compo.u.complex->dbSpecific = 0; - compo.u.complex->num_recordSyntax = 0; - compo.u.complex->recordSyntax = 0; + if (recordsyntax_size >= 2) + { + int i; + compo.u.complex->num_recordSyntax = recordsyntax_size; + compo.u.complex->recordSyntax = (Odr_oid **) + odr_malloc(out, recordsyntax_size * sizeof(Odr_oid*)); + for (i = 0; i < recordsyntax_size; i++) + compo.u.complex->recordSyntax[i] = + yaz_oidval_to_z3950oid(out, CLASS_RECSYN, + recordsyntax_list[i]); + } + else + { + compo.u.complex->num_recordSyntax = 0; + compo.u.complex->recordSyntax = 0; + } } else if (elementSetNames) { @@ -2661,7 +2688,7 @@ static int send_SRW_presentRequest(const char *arg) sr->u.request->maximumRecords = odr_intdup(out, nos); if (record_schema) sr->u.request->recordSchema = record_schema; - if (recordsyntax == VAL_TEXT_XML) + if (recordsyntax_size == 1 && recordsyntax_list[0] == VAL_TEXT_XML) sr->u.request->recordPacking = "xml"; return send_srw(sr); } @@ -2753,7 +2780,11 @@ int cmd_cancel(const char *arg) Z_TriggerResourceControlRequest *req = apdu->u.triggerResourceControlRequest; bool_t rfalse = 0; - + char command[16]; + + *command = '\0'; + sscanf(arg, "%15s", command); + if (only_z3950()) return 0; if (session_initResponse && @@ -2769,7 +2800,9 @@ int cmd_cancel(const char *arg) send_apdu(apdu); printf("Sent cancel request\n"); - return 2; + if (!strcmp(command, "wait")) + return 2; + return 1; } @@ -2819,7 +2852,8 @@ int send_scanrequest(const char *query, int pp, int num, const char *term) const char *pqf_msg; size_t off; int code = yaz_pqf_error (pqf_parser, &pqf_msg, &off); - printf("%*s^\n", off+7, ""); + int ioff = off; + printf("%*s^\n", ioff+7, ""); printf("Prefix query error: %s (code %d)\n", pqf_msg, code); yaz_pqf_destroy (pqf_parser); return -1; @@ -3092,19 +3126,32 @@ int cmd_schema(const char *arg) int cmd_format(const char *arg) { - oid_value nsyntax; + const char *cp = arg; + int nor; + int idx = 0; + oid_value nsyntax[RECORDSYNTAX_MAX]; + char form_str[41]; if (!arg || !*arg) { printf("Usage: format \n"); return 0; } - nsyntax = oid_getvalbyname (arg); - if (strcmp(arg, "none") && nsyntax == VAL_NONE) + while (sscanf(cp, "%40s%n", form_str, &nor) >= 1 && nor > 0 + && idx < RECORDSYNTAX_MAX) { - printf ("unknown record syntax\n"); - return 0; + nsyntax[idx] = oid_getvalbyname(form_str); + if (!strcmp(form_str, "none")) + break; + if (nsyntax[idx] == VAL_NONE) + { + printf ("unknown record syntax: %s\n", form_str); + return 0; + } + cp += nor; + idx++; } - recordsyntax = nsyntax; + recordsyntax_size = idx; + memcpy(recordsyntax_list, nsyntax, idx * sizeof(*nsyntax)); return 1; } @@ -3203,8 +3250,8 @@ int cmd_packagename(const char* arg) int cmd_proxy(const char* arg) { - xfree (yazProxy); - yazProxy = NULL; + xfree(yazProxy); + yazProxy = 0; if (*arg) yazProxy = xstrdup (arg); return 1; @@ -3900,7 +3947,7 @@ void wait_and_handle_response(int one_response_only) { FILE *f = ber_file ? ber_file : stdout; odr_perror(in, "Decoding incoming APDU"); - fprintf(f, "[Near %d]\n", odr_offset(in)); + fprintf(f, "[Near %ld]\n", (long) odr_offset(in)); fprintf(f, "Packet dump:\n---------\n"); odr_dumpBER(f, netbuffer, res); fprintf(f, "---------\n"); @@ -4010,7 +4057,8 @@ int cmd_cclparse(const char* arg) rpn = ccl_find_str (bibset, arg, &error, &pos); if (error) { - printf ("%*s^ - ", 3+strlen(last_cmd)+1+pos, " "); + int ioff = 3+strlen(last_cmd)+1+pos; + printf ("%*s^ - ", ioff, " "); printf ("%s\n", ccl_err_msg (error)); } else @@ -4046,6 +4094,7 @@ int cmd_set_otherinfo(const char* args) extraOtherInfos[otherinfoNo].oidval = -1; if (extraOtherInfos[otherinfoNo].value) free(extraOtherInfos[otherinfoNo].value); + extraOtherInfos[otherinfoNo].value = 0; return 0; } if (sscan_res<3) { @@ -4174,7 +4223,10 @@ int cmd_list_all(const char* args) { printf("ssub/lslb/mspn : %d/%d/%d\n",smallSetUpperBound,largeSetLowerBound,mediumSetPresentNumber); /* print present related options */ - printf("Format : %s\n",yaz_z3950_oid_value_to_str(recordsyntax,CLASS_RECSYN)); + printf("Format : %s\n", + (recordsyntax_size > 0) ? + yaz_z3950_oid_value_to_str(recordsyntax_list[0], CLASS_RECSYN) : + "none"); printf("Schema : %s\n",record_schema ? record_schema : "not set"); printf("Elements : %s\n",elementSetNames?elementSetNames->u.generic:""); @@ -4245,7 +4297,6 @@ static struct { } cmd_array[] = { {"open", cmd_open, "('tcp'|'ssl')':[':'][/]",NULL,0,NULL}, {"quit", cmd_quit, "",NULL,0,NULL}, - {"exit", cmd_quit, "",NULL,0,NULL}, {"find", cmd_find, "",NULL,0,NULL}, {"delete", cmd_delete, "",NULL,0,NULL}, {"base", cmd_base, "",NULL,0,NULL}, @@ -4316,6 +4367,7 @@ static struct { {"zversion", cmd_zversion, "", NULL, 0, NULL}, {"help", cmd_help, "", NULL,0,NULL}, {"init", cmd_init, "", NULL,0,NULL}, + {"exit", cmd_quit, "",NULL,0,NULL}, {0,0,0,0,0,0} }; @@ -4699,7 +4751,7 @@ int main(int argc, char **argv) hex_dump = 1; break; case 'p': - yazProxy=strdup(arg); + yazProxy = xstrdup(arg); break; case 'u': if (!auth_command)