X-Git-Url: http://git.indexdata.com/?p=yaz-moved-to-github.git;a=blobdiff_plain;f=client%2Fclient.c;h=5492b84be767850ed8f312de2e6b326b7c13dc67;hp=cf8dfedfe9e684b185eda2045e88d85a26ad60ed;hb=73709d08e8f3c85cbca1c8d883aac65bd6ffe8d6;hpb=a598b7f4ca1ad3c0ffcd5924aea118abc3d36574 diff --git a/client/client.c b/client/client.c index cf8dfed..5492b84 100644 --- a/client/client.c +++ b/client/client.c @@ -1,8 +1,11 @@ /* - * Copyright (C) 1995-2005, Index Data ApS + * Copyright (C) 1995-2006, Index Data ApS * See the file LICENSE for details. * - * $Id: client.c,v 1.298 2005-09-26 09:15:27 adam Exp $ + * $Id: client.c,v 1.312 2006-08-15 13:30:00 adam Exp $ + */ +/** \file client.c + * \brief yaz-client program */ #include @@ -78,11 +81,12 @@ #define C_PROMPT "Z> " +static char *sru_method = "soap"; static char *codeset = 0; /* character set for output */ static int hex_dump = 0; static char *dump_file_prefix = 0; static ODR out, in, print; /* encoding and decoding streams */ -#if HAVE_XML2 +#if YAZ_HAVE_XML2 static ODR srw_sr_odr_out = 0; static Z_SRW_PDU *srw_sr = 0; #endif @@ -122,7 +126,6 @@ static int negotiationCharsetVersion = 3; static char *outputCharset = 0; static char *marcCharset = 0; static char* yazLang = 0; -static char* http_version = "1.1"; static char last_cmd[32] = "?"; static FILE *marc_file = 0; @@ -169,9 +172,10 @@ struct { void process_cmd_line(char* line); -char ** readline_completer(char *text, int start, int end); -char *command_generator(const char *text, int state); -char** curret_global_list=NULL; +#if HAVE_READLINE_READLINE_H +char **readline_completer(char *text, int start, int end); +#endif +static char *command_generator(const char *text, int state); int cmd_register_tab(const char* arg); static void close_session (void); @@ -341,12 +345,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); } } @@ -687,7 +689,7 @@ int session_connect(const char *arg) printf ("Couldn't create comstack\n"); return 0; } -#if HAVE_XML2 +#if YAZ_HAVE_XML2 if (conn->protocol == PROTO_HTTP) queryType = QueryType_CQL; #else @@ -882,7 +884,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); @@ -1255,74 +1257,32 @@ static int send_deleteResultSetRequest(const char *arg) return 2; } -#if HAVE_XML2 +#if YAZ_HAVE_XML2 static int send_srw(Z_SRW_PDU *sr) { const char *charset = negotiationCharset; const char *host_port = cur_host; - char *path = 0; - char ctype[50]; - Z_SOAP_Handler h[2] = { - {"http://www.loc.gov/zing/srw/", 0, (Z_SOAP_fun) yaz_srw_codec}, - {0, 0, 0} - }; - ODR o = odr_createmem(ODR_ENCODE); - int ret; - Z_SOAP *p = odr_malloc(o, sizeof(*p)); Z_GDU *gdu; + char *path = 0; - path = odr_malloc(out, strlen(databaseNames[0])+2); + path = odr_malloc(out, 2+strlen(databaseNames[0])); *path = '/'; strcpy(path+1, databaseNames[0]); - gdu = z_get_HTTP_Request(out); - gdu->u.HTTP_Request->version = http_version; - gdu->u.HTTP_Request->path = odr_strdup(out, path); + gdu = z_get_HTTP_Request_host_path(out, host_port, path); - if (host_port) + if (!strcmp(sru_method, "get")) { - const char *cp0 = strstr(host_port, "://"); - const char *cp1 = 0; - if (cp0) - cp0 = cp0+3; - else - cp0 = host_port; - - cp1 = strchr(cp0, '/'); - if (!cp1) - cp1 = cp0+strlen(cp0); - - if (cp0 && cp1) - { - char *h = odr_malloc(out, cp1 - cp0 + 1); - memcpy (h, cp0, cp1 - cp0); - h[cp1-cp0] = '\0'; - z_HTTP_header_add(out, &gdu->u.HTTP_Request->headers, - "Host", h); - } + yaz_sru_get_encode(gdu->u.HTTP_Request, sr, out, charset); } - - strcpy(ctype, "text/xml"); - if (charset && strlen(charset) < 20) + else if (!strcmp(sru_method, "post")) { - strcat(ctype, "; charset="); - strcat(ctype, charset); + yaz_sru_post_encode(gdu->u.HTTP_Request, sr, out, charset); + } + else if (!strcmp(sru_method, "soap")) + { + yaz_sru_soap_encode(gdu->u.HTTP_Request, sr, out, charset); } - z_HTTP_header_add(out, &gdu->u.HTTP_Request->headers, - "Content-Type", ctype); - z_HTTP_header_add(out, &gdu->u.HTTP_Request->headers, - "SOAPAction", "\"\""); - p->which = Z_SOAP_generic; - p->u.generic = odr_malloc(o, sizeof(*p->u.generic)); - p->u.generic->no = 0; - p->u.generic->ns = 0; - p->u.generic->p = sr; - p->ns = "http://schemas.xmlsoap.org/soap/envelope/"; - - ret = z_soap_codec_enc(o, &p, - &gdu->u.HTTP_Request->content_buf, - &gdu->u.HTTP_Request->content_len, h, - charset); if (z_GDU(out, &gdu, 0, 0)) { @@ -1333,7 +1293,7 @@ static int send_srw(Z_SRW_PDU *sr) if (apdu_file) { if (!z_GDU(print, &gdu, 0, 0)) - printf ("Failed to print outgoing APDU\n"); + printf ("Failed to print outgoing SRU package\n"); odr_reset(print); } buf_out = odr_getbuf(out, &len_out, 0); @@ -1344,8 +1304,6 @@ static int send_srw(Z_SRW_PDU *sr) r = cs_put(conn, buf_out, len_out); - odr_destroy(o); - if (r >= 0) return 2; } @@ -1353,7 +1311,7 @@ static int send_srw(Z_SRW_PDU *sr) } #endif -#if HAVE_XML2 +#if YAZ_HAVE_XML2 static char *encode_SRW_term(ODR o, const char *q) { const char *in_charset = "ISO-8859-1"; @@ -1530,7 +1488,7 @@ static int send_searchRequest(const char *arg) if (smallSetUpperBound > 0 || (largeSetLowerBound > 1 && mediumSetPresentNumber > 0)) { - if (recordsyntax_list > 0) + if (recordsyntax_size > 0) req->preferredRecordSyntax = yaz_oidval_to_z3950oid(out, CLASS_RECSYN, recordsyntax_list[0]); req->smallSetElementSetNames = @@ -1552,7 +1510,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); @@ -1599,10 +1558,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) @@ -1611,16 +1571,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; } } @@ -1646,16 +1606,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"); } @@ -2420,7 +2384,7 @@ static int cmd_explain(const char *arg) { if (protocol != PROTO_HTTP) return 0; -#if HAVE_XML2 +#if YAZ_HAVE_XML2 if (!conn) cmd_open(0); if (conn) @@ -2453,6 +2417,29 @@ static int cmd_init(const char *arg) return 2; } +static int cmd_sru(const char *arg) +{ + if (!*arg) + { + printf("SRU method is: %s\n", sru_method); + } + else + { + if (!yaz_matchstr(arg, "post")) + sru_method = "post"; + else if (!yaz_matchstr(arg, "get")) + sru_method = "get"; + else if (!yaz_matchstr(arg, "soap")) + sru_method = "soap"; + else + { + printf("Unknown SRU method: %s\n", arg); + printf("Specify one of POST, GET, SOAP\n"); + } + } + return 0; +} + static int cmd_find(const char *arg) { if (!*arg) @@ -2462,7 +2449,7 @@ static int cmd_find(const char *arg) } if (protocol == PROTO_HTTP) { -#if HAVE_XML2 +#if YAZ_HAVE_XML2 if (!conn) cmd_open(0); if (!conn) @@ -2670,7 +2657,7 @@ static int send_presentRequest(const char *arg) return 2; } -#if HAVE_XML2 +#if YAZ_HAVE_XML2 static int send_SRW_presentRequest(const char *arg) { char setstring[100]; @@ -2738,7 +2725,7 @@ static int cmd_show(const char *arg) { if (protocol == PROTO_HTTP) { -#if HAVE_XML2 +#if YAZ_HAVE_XML2 if (!conn) cmd_open(0); if (!conn) @@ -2848,7 +2835,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; @@ -3058,7 +3046,7 @@ int cmd_scan(const char *arg) { if (protocol == PROTO_HTTP) { -#if HAVE_XML2 +#if YAZ_HAVE_XML2 if (!conn) cmd_open(0); if (!conn) @@ -3245,8 +3233,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; @@ -3700,9 +3688,7 @@ static void initialize(void) #if HAVE_READLINE_READLINE_H rl_attempted_completion_function = (CPPFunction*)readline_completer; #endif - - - for(i=0; irecordPosition) @@ -3942,7 +3928,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"); @@ -4013,7 +3999,7 @@ void wait_and_handle_response(int one_response_only) close_session (); } } -#if HAVE_XML2 +#if YAZ_HAVE_XML2 else if (gdu->which == Z_GDU_HTTP_Response) { http_response(gdu->u.HTTP_Response); @@ -4052,7 +4038,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 @@ -4078,7 +4065,8 @@ int cmd_set_otherinfo(const char* args) int sscan_res; int oidval; - sscan_res = sscanf (args, "%d %100[^ ] %100s", &otherinfoNo, oidstr, otherinfoString); + sscan_res = sscanf (args, "%d %100[^ ] %100s", + &otherinfoNo, oidstr, otherinfoString); if (sscan_res==1) { /* reset this otherinfo */ if(otherinfoNo>=maxOtherInfosSupported) { @@ -4087,7 +4075,8 @@ int cmd_set_otherinfo(const char* args) } extraOtherInfos[otherinfoNo].oidval = -1; if (extraOtherInfos[otherinfoNo].value) - free(extraOtherInfos[otherinfoNo].value); + xfree(extraOtherInfos[otherinfoNo].value); + extraOtherInfos[otherinfoNo].value = 0; return 0; } if (sscan_res<3) { @@ -4096,18 +4085,20 @@ int cmd_set_otherinfo(const char* args) } if (otherinfoNo>=maxOtherInfosSupported) { - printf("Error otherinfo index to large (%d>%d)\n", + printf("Error otherinfo index too large (%d>=%d)\n", otherinfoNo,maxOtherInfosSupported); } oidval = oid_getvalbyname (oidstr); - if (oidval == -1 ) { + if (oidval == VAL_NONE) + { printf("Error in set_otherinfo command unknown oid %s \n",oidstr); return 0; } extraOtherInfos[otherinfoNo].oidval = oidval; - if(extraOtherInfos[otherinfoNo].value) free(extraOtherInfos[otherinfoNo].value); - extraOtherInfos[otherinfoNo].value = strdup(otherinfoString); + if (extraOtherInfos[otherinfoNo].value) + xfree(extraOtherInfos[otherinfoNo].value); + extraOtherInfos[otherinfoNo].value = xstrdup(otherinfoString); return 0; } @@ -4237,25 +4228,26 @@ int cmd_list_all(const char* args) { int cmd_clear_otherinfo(const char* args) { if(strlen(args)>0) { - int otherinfoNo; - otherinfoNo = atoi(args); - if( otherinfoNo >= maxOtherInfosSupported ) { - printf("Error otherinfo index to large (%d>%d)\n",otherinfoNo,maxOtherInfosSupported); + int otherinfoNo = atoi(args); + if (otherinfoNo >= maxOtherInfosSupported) { + printf("Error otherinfo index too large (%d>=%d)\n", + otherinfoNo, maxOtherInfosSupported); return 0; } - - if(extraOtherInfos[otherinfoNo].oidval != -1) { + if (extraOtherInfos[otherinfoNo].oidval != -1) + { /* only clear if set. */ - extraOtherInfos[otherinfoNo].oidval=-1; - free(extraOtherInfos[otherinfoNo].value); + extraOtherInfos[otherinfoNo].oidval = -1; + xfree(extraOtherInfos[otherinfoNo].value); } } else { int i; - - for(i=0; i[':'][/]",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}, @@ -4361,6 +4352,8 @@ static struct { {"zversion", cmd_zversion, "", NULL, 0, NULL}, {"help", cmd_help, "", NULL,0,NULL}, {"init", cmd_init, "", NULL,0,NULL}, + {"sru", cmd_sru, "", NULL,0,NULL}, + {"exit", cmd_quit, "",NULL,0,NULL}, {0,0,0,0,0,0} }; @@ -4423,8 +4416,9 @@ static int cmd_help (const char *line) return 1; } -int cmd_register_tab(const char* arg) { - +int cmd_register_tab(const char* arg) +{ +#if HAVE_READLINE_READLINE_H char command[101], tabargument[101]; int i; int num_of_tabs; @@ -4441,27 +4435,29 @@ int cmd_register_tab(const char* arg) { } } - if(!cmd_array[i].cmd) { + if (!cmd_array[i].cmd) { fprintf(stderr,"Unknown command %s\n",command); return 1; } - if(!cmd_array[i].local_tabcompletes) + if (!cmd_array[i].local_tabcompletes) cmd_array[i].local_tabcompletes = (char **) calloc(1,sizeof(char**)); num_of_tabs=0; tabslist = cmd_array[i].local_tabcompletes; - for(;tabslist && *tabslist;tabslist++) { + for(; tabslist && *tabslist; tabslist++) { num_of_tabs++; } - cmd_array[i].local_tabcompletes = (char **) - realloc(cmd_array[i].local_tabcompletes,(num_of_tabs+2)*sizeof(char**)); - tabslist=cmd_array[i].local_tabcompletes; - tabslist[num_of_tabs]=strdup(tabargument); - tabslist[num_of_tabs+1]=NULL; + cmd_array[i].local_tabcompletes = (char **) + realloc(cmd_array[i].local_tabcompletes, + (num_of_tabs+2)*sizeof(char**)); + tabslist = cmd_array[i].local_tabcompletes; + tabslist[num_of_tabs] = strdup(tabargument); + tabslist[num_of_tabs+1] = NULL; +#endif return 1; } @@ -4523,38 +4519,47 @@ void process_cmd_line(char* line) fflush(marc_file); } - -char *command_generator(const char *text, int state) +static char *command_generator(const char *text, int state) { +#if HAVE_READLINE_READLINE_H static int idx; if (state==0) { idx = 0; } for( ; cmd_array[idx].cmd; ++idx) { - if (!strncmp(cmd_array[idx].cmd,text,strlen(text))) { + if (!strncmp(cmd_array[idx].cmd, text, strlen(text))) { ++idx; /* skip this entry on the next run */ return strdup(cmd_array[idx-1].cmd); } } +#endif return NULL; } +#if HAVE_READLINE_READLINE_H +static char** default_completer_list = NULL; + +static char* default_completer(const char* text, int state) +{ + return complete_from_list(default_completer_list, text, state); +} +#endif + +#if HAVE_READLINE_READLINE_H /* This function only known how to complete on the first word */ -char ** readline_completer(char *text, int start, int end) { -#if HAVE_READLINE_READLINE_H - - completerFunctionType completerToUse; - +char **readline_completer(char *text, int start, int end) +{ + completerFunctionType completerToUse; + if(start == 0) { #if HAVE_READLINE_RL_COMPLETION_MATCHES - char** res=rl_completion_matches(text, - command_generator); + char** res = rl_completion_matches(text, command_generator); #else - char** res=completion_matches(text, - (CPFunction*)command_generator); + char** res = completion_matches(text, + (CPFunction*)command_generator); #endif rl_attempted_completion_over = 1; return res; @@ -4566,44 +4571,39 @@ char ** readline_completer(char *text, int start, int end) { return NULL; } - for (i = 0; cmd_array[i].cmd; i++) { - if (!strncmp(cmd_array[i].cmd, word, strlen(word))) { + for (i = 0; cmd_array[i].cmd; i++) + if (!strncmp(cmd_array[i].cmd, word, strlen(word))) break; - } - } - if(!cmd_array[i].cmd) return NULL; + if(!cmd_array[i].cmd) + return NULL; - curret_global_list = cmd_array[i].local_tabcompletes; + default_completer_list = cmd_array[i].local_tabcompletes; completerToUse = cmd_array[i].rl_completerfunction; - if(completerToUse==NULL) /* if no pr. command completer is defined use the default completer */ + if (!completerToUse) + { /* if command completer is not defined use the default completer */ completerToUse = default_completer; - - if(completerToUse) { + } + if (completerToUse) { #ifdef HAVE_READLINE_RL_COMPLETION_MATCHES char** res= - rl_completion_matches(text, - completerToUse); + rl_completion_matches(text, completerToUse); #else char** res= - completion_matches(text, - (CPFunction*)completerToUse); + completion_matches(text, (CPFunction*)completerToUse); #endif - if(!cmd_array[i].complete_filenames) + if (!cmd_array[i].complete_filenames) rl_attempted_completion_over = 1; return res; } else { - if(!cmd_array[i].complete_filenames) + if (!cmd_array[i].complete_filenames) rl_attempted_completion_over = 1; return 0; } } -#else - return 0; -#endif } - +#endif static void client(void) { @@ -4629,7 +4629,7 @@ static void client(void) add_history(line_in); #endif strncpy(line, line_in, 10239); - free (line_in); + free(line_in); } #endif if (!line_in) @@ -4744,7 +4744,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)