From 066324901a18b5477f7a55b0a8c388b641c60efd Mon Sep 17 00:00:00 2001 From: ja7 Date: Thu, 29 Aug 2002 21:35:38 +0000 Subject: [PATCH] added new commands set_otherinfo list_otherinfo clear_otherinfo list_all set_autoreconect --- client/client.c | 345 ++++++++++++++++++++++++++++++++++++++++++++++++++----- 1 file changed, 319 insertions(+), 26 deletions(-) diff --git a/client/client.c b/client/client.c index 0cdb8e2..58f03f4 100644 --- a/client/client.c +++ b/client/client.c @@ -2,7 +2,7 @@ * Copyright (c) 1995-2002, Index Data * See the file LICENSE for details. * - * $Id: client.c,v 1.163 2002-08-26 12:15:35 adam Exp $ + * $Id: client.c,v 1.164 2002-08-29 21:35:38 ja7 Exp $ */ #include @@ -74,6 +74,8 @@ static char* yazLang = 0; static char last_cmd[32] = "?"; static FILE *marcdump = 0; static char *refid = NULL; +static char *last_open_command = NULL; +static int auto_reconnect = 0; typedef enum { QueryType_Prefix, @@ -101,6 +103,12 @@ int rl_attempted_completion_over = 0; while(isspace(*args_end)) {*args_end=0;--args_end;}; \ } +#define maxOtherInfosSupported 10 +struct { + int oidval; + char* value; +} extraOtherInfos[maxOtherInfosSupported]; + void process_cmd_line(char* line); char ** readline_completer(char *text, int start, int end); @@ -113,11 +121,56 @@ ODR getODROutputStream() return out; } +const char* query_type_as_string(QueryType q) +{ + switch (q) { + case QueryType_Prefix: return "prefix (RPN sent to server)"; + case QueryType_CCL: return "CCL (CCL sent to server) "; + case QueryType_CCL2RPN: return "CCL -> RPN (RPN sent to server)"; + default: + return "unknown Query type internal yaz-client error"; + }; +}; + + +void do_hex_dump(char* buf,int len) +{ +#if 0 + int i,x; + for( i=0; ioclass != CLASS_RECSYN) + if (ent && ent->oclass != CLASS_RECSYN) return; if (ent && ent->value == VAL_SOIF) print_record((const unsigned char *) r->u.octet_aligned->buf, @@ -1270,7 +1357,8 @@ static Z_External *create_external_itemRequest() r->u.single_ASN1_type->size = item_request_size; memcpy (r->u.single_ASN1_type->buf, item_request_buf, item_request_size); - printf ("len = %d\n", item_request_size); + + do_hex_dump(item_request_buf,item_request_size); } return r; } @@ -1326,7 +1414,10 @@ static Z_External *create_external_ILL_APDU(int which) r->u.single_ASN1_type->len = ill_request_size; r->u.single_ASN1_type->size = ill_request_size; memcpy (r->u.single_ASN1_type->buf, ill_request_buf, ill_request_size); - printf ("len = %d\n", ill_request_size); +/* printf ("len = %d\n", ill_request_size); */ +/* do_hex_dump(ill_request_buf,ill_request_size); */ +/* printf("--- end of extenal\n"); */ + } return r; } @@ -1504,8 +1595,12 @@ static int cmd_find(char *arg) } if (!conn) { - printf("Not connected yet\n"); - return 0; + try_reconnect(); + + if (!conn) { + printf("Not connected yet\n"); + return 0; + }; } if (!send_searchRequest(arg)) return 0; @@ -1968,8 +2063,12 @@ int cmd_scan(char *arg) { if (!conn) { - printf("Session not initialized yet\n"); - return 0; + try_reconnect(); + + if (!conn) { + printf("Session not initialized yet\n"); + return 0; + }; } if (!ODR_MASK_GET(session->options, Z_Options_scan)) { @@ -2119,8 +2218,9 @@ int cmd_packagename(char* arg) int cmd_proxy(char* arg) { if (*arg == '\0') { - printf("Current proxy is `%s'\n", (yazCharset)?yazProxy:NULL); - return 1; + xfree (yazProxy); + yazProxy = NULL; + } xfree (yazProxy); yazProxy = NULL; @@ -2139,8 +2239,7 @@ int cmd_charset(char* arg) *l1 = *l2 = 0; if (sscanf(arg, "%29s %29s", l1, l2) < 1) { - printf("Current character set is `%s'\n", (yazCharset) ? - yazCharset:NULL); + printf("Current character set is `%s'\n", (yazCharset) ? yazCharset:NULL); return 1; } xfree (yazCharset); @@ -2256,7 +2355,7 @@ int cmd_set_apdufile(char* arg) return 1; } -int cmd_set_cclfields(char* arg) +int cmd_set_cclfile(char* arg) { FILE *inf; @@ -2269,8 +2368,33 @@ int cmd_set_cclfields(char* arg) ccl_qual_file (bibset, inf); fclose (inf); } - - return 1; + + strcpy(ccl_fields,arg); + return 0; +} + + +int cmd_set_auto_reconnect(char* arg) +{ + REMOVE_TAILING_BLANKS(arg); + + if(strlen(arg)==0) { + auto_reconnect = ! auto_reconnect; + } else if(strcmp(arg,"on")==0) { + auto_reconnect = 1; + } else if(strcmp(arg,"off")==0) { + auto_reconnect = 0; + } else { + printf("Error use on or off\n"); + return 1; + }; + + if (auto_reconnect) + printf("Set auto reconnect enabled.\n"); + else + printf("Set auto reconnect disabled.\n"); + + return 0; } int cmd_set_marcdump(char* arg) @@ -2419,6 +2543,8 @@ void source_rcfile() static void initialize(void) { FILE *inf; + int i; + if (!(out = odr_createmem(ODR_ENCODE)) || !(in = odr_createmem(ODR_DECODE)) || !(print = odr_createmem(ODR_PRINT))) @@ -2445,7 +2571,12 @@ static void initialize(void) rl_attempted_completion_function = (CPPFunction*)readline_completer; #endif - source_rcfile(); + + for(i=0; i=maxOtherInfosSupported) { + printf("Error otherinfo index to large (%d>%d)\n",otherinfoNo,maxOtherInfosSupported); + }; + extraOtherInfos[otherinfoNo].oidval = -1; + if(extraOtherInfos[otherinfoNo].value) free(extraOtherInfos[otherinfoNo].value); + return 0; + }; + if (sscan_res<3) { + printf("Error in set_otherinfo command \n"); + return 0; + } + + if(otherinfoNo>=maxOtherInfosSupported) { + printf("Error otherinfo index to large (%d>%d)\n",otherinfoNo,maxOtherInfosSupported); + }; + + + oidval = oid_getvalbyname (oid); + if(oidval == -1 ) { + printf("Error in set_otherinfo command unknown oid %s \n",oid); + return 0; + }; + extraOtherInfos[otherinfoNo].oidval = oidval; + if(extraOtherInfos[otherinfoNo].value) free(extraOtherInfos[otherinfoNo].value); + extraOtherInfos[otherinfoNo].value = strdup(otherinfoString); + + return 0; +}; + +int cmd_list_otherinfo(char* args) +{ + int i; + + if(strlen(args)>0) { + i = atoi(args); + if( i >= maxOtherInfosSupported ) { + printf("Error otherinfo index to large (%d>%d)\n",i,maxOtherInfosSupported); + return 0; + }; + + if(extraOtherInfos[i].oidval != -1) + printf(" otherinfo %d %s %s\n",i,yaz_z3950_oid_value_to_str(extraOtherInfos[i].oidval,CLASS_RECSYN), extraOtherInfos[i].value); + + } else { + for(i=0; iwhich) { + case Z_IdAuthentication_idPass: + printf("Authentication : IdPass\n"); + printf(" Login : %s\n",auth->u.idPass->userId?auth->u.idPass->userId:""); + printf(" LoginGroup : %s\n",auth->u.idPass->groupId?auth->u.idPass->groupId:""); + printf(" PassWord : %s\n",auth->u.idPass->password?auth->u.idPass->password:""); + break; + case Z_IdAuthentication_open: + printf("Authentication : psOpen\n"); + printf(" Open string : %s\n",auth->u.open); + break; + default: + printf("Authentication : Unknown\n"); + }; + }; + if ( yazCharset ) printf("Character set : `%s'\n", (yazCharset) ? yazCharset:NULL); + + /* bases */ + printf("Bases : "); + for (i = 0; iu.generic:""); + + /* loging options */ + printf("Apdu log : %s\n",apdu_file?"on":"off"); + printf("Record log : %s\n",marcdump?"on":"off"); + + /* other infos */ + printf("Other Info: \n"); + cmd_list_otherinfo(""); + + return 0; +}; + +int cmd_clear_otherinfo(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); + return 0; + }; + + if(extraOtherInfos[otherinfoNo].oidval != -1) { + /* only clear if set. */ + extraOtherInfos[otherinfoNo].oidval=-1; + free(extraOtherInfos[otherinfoNo].value); + }; + } else { + int i; + + for(i=0; i",NULL,1,NULL}, {"set_marcdump", cmd_set_marcdump," ",NULL,1,NULL}, - {"set_cclfile", cmd_set_cclfields," ",NULL,1,NULL}, + {"set_cclfile", cmd_set_cclfile," ",NULL,1,NULL}, + {"set_auto_reconnect", cmd_set_auto_reconnect," on|off",complete_auto_reconnect,1,NULL}, + {"set_otherinfo", cmd_set_otherinfo," ",NULL,0,NULL}, {"register_oid", cmd_register_oid," ",NULL,0,NULL}, {"push_command", cmd_push_command,"",command_generator,0,NULL}, {"register_tab", cmd_register_tab," ",command_generator,0,NULL}, {"cclparse", cmd_cclparse,"",NULL,0,NULL}, + {"list_otherinfo",cmd_list_otherinfo,"[otherinfoinddex]",NULL,0,NULL}, + {"list_all",cmd_list_all,"",NULL,0,NULL}, + {"clear_otherinfo",cmd_clear_otherinfo,"",NULL,0,NULL}, /* Server Admin Functions */ {"adm-reindex", cmd_adm_reindex, "",NULL,0,NULL}, {"adm-truncate", cmd_adm_truncate, "('database'|'index')",NULL,0,NULL}, @@ -2784,7 +3080,8 @@ void process_cmd_line(char* line) if (!cmd[i].cmd) /* dump our help-screen */ { printf("Unknown command: %s.\n", word); - cmd_help (""); + printf("use help for list of commands\n"); + /* cmd_help (""); */ res = 1; } @@ -2842,10 +3139,6 @@ char ** readline_completer(char *text, int start, int end) { return NULL; } - if(start != strlen(word) +1 ) { - rl_attempted_completion_over = 1; - return 0; - } for (i = 0; cmd[i].cmd; i++) { if (!strncmp(cmd[i].cmd, word, strlen(word))) { break; -- 1.7.10.4