* Copyright (c) 1995-2002, Index Data
* See the file LICENSE for details.
*
- * $Id: client.c,v 1.143 2002-02-18 12:54:02 adam Exp $
+ * $Id: client.c,v 1.156 2002-06-02 21:34:45 adam Exp $
*/
#include <stdio.h>
#include <yaz/marcdisp.h>
#include <yaz/diagbib1.h>
#include <yaz/otherinfo.h>
+#include <yaz/charneg.h>
#include <yaz/pquery.h>
#include <yaz/sortspec.h>
-#if YAZ_MODULE_ill
#include <yaz/ill.h>
-#endif
-#if YAZ_MODULE_ccl
#include <yaz/yaz-ccl.h>
-#endif
#if HAVE_READLINE_READLINE_H
#include <readline/readline.h>
static char* esPackageName = 0;
static char* yazProxy = 0;
static int kilobytes = 1024;
+static char* yazCharset = 0;
+static char* yazLang = 0;
static char last_cmd[32] = "?";
static FILE *marcdump = 0;
static QueryType queryType = QueryType_Prefix;
-#if YAZ_MODULE_ccl
static CCL_bibset bibset; /* CCL bibset handle */
-#endif
+#if HAVE_READLINE_COMPLETION_OVER
+
+#else
+/* readline doesn't have this var. Define it ourselves. */
+int rl_attempted_completion_over = 0;
+#endif
/* set this one to 1, to avoid decode of unknown MARCs */
#define AVOID_MARC_DECODE 1
size_t i;
for (i = 0; i<len; i++)
if ((buf[i] <= 126 && buf[i] >= 32) || strchr ("\n\r\t\f", buf[i]))
- fputc (buf[i], stdout);
+ printf ("%c", buf[i]);
else
printf ("\\X%02X", buf[i]);
}
yaz_oi_set_string_oidval(&req->otherInfo, out, VAL_PROXY,
1, type_and_host);
+ if (yazCharset || yazLang) {
+ Z_OtherInformation **p;
+ Z_OtherInformationUnit *p0;
+
+ yaz_oi_APDU(apdu, &p);
+
+ if (p0=yaz_oi_update(p, out, NULL, 0, 0)) {
+ ODR_MASK_SET(req->options, Z_Options_negotiationModel);
+
+ p0->which = Z_OtherInfo_externallyDefinedInfo;
+ p0->information.externallyDefinedInfo =
+ yaz_set_proposal_charneg(out,
+ (const char**)&yazCharset, (yazCharset)?1:0,
+ (const char**)&yazLang, (yazLang)?1:0, 1);
+ }
+ }
+
send_apdu(apdu);
printf("Sent initrequest.\n");
}
if (ODR_MASK_GET(res->options, Z_Options_queryType104))
printf (" queryType104");
printf ("\n");
+
+ if (ODR_MASK_GET(res->options, Z_Options_negotiationModel)) {
+
+ Z_CharSetandLanguageNegotiation *p =
+ yaz_get_charneg_record(res->otherInfo);
+
+ if (p) {
+
+ char *charset=NULL, *lang=NULL;
+ int selected;
+
+ yaz_get_response_charneg(session_mem, p, &charset, &lang, &selected);
+
+ printf("Accepted character set : `%s'\n", charset);
+ printf("Accepted code language : `%s'\n", lang);
+ printf("Accepted records in ...: %d\n", selected );
+ }
+ }
fflush (stdout);
return 0;
}
return 1;
}
-
int cmd_open(char *arg)
{
void *add;
char type_and_host[101], base[101];
CS_TYPE t;
-
+
if (conn)
{
printf("Already connected.\n");
-
+
cs_close (conn);
conn = NULL;
if (session_mem)
base[0] = '\0';
if (sscanf (arg, "%100[^/]/%100s", type_and_host, base) < 1)
return 0;
-
+
if(yazProxy)
- conn = cs_create_host(yazProxy, 1, &add);
+ conn = cs_create_host(yazProxy, 1, &add);
else
- conn = cs_create_host(type_and_host, 1, &add);
+ conn = cs_create_host(type_and_host, 1, &add);
if (!conn)
{
- printf ("Couldn't create comstack\n");
- return 0;
+ printf ("Couldn't create comstack\n");
+ return 0;
}
printf("Connecting...");
fflush(stdout);
if (cs_connect(conn, add) < 0)
{
- printf ("error = %s\n", cs_strerror(conn));
- if (conn->cerrno == CSYSERR)
- perror("system");
+ printf ("error = %s\n", cs_strerror(conn));
+ if (conn->cerrno == CSYSERR)
+ perror("system");
cs_close(conn);
conn = 0;
return 0;
}
printf("Ok.\n");
-
+
send_initRequest(type_and_host);
if (*base)
cmd_base (base);
}
/* SEARCH SERVICE ------------------------------ */
+static void display_record(Z_External *r);
static void display_variant(Z_Variant *v, int level)
{
int i;
if (!r)
+ {
return;
+ }
for (i = 0; i < r->num_elements; i++)
{
Z_TaggedElement *t;
printf("%s) ", t->tagValue->u.string);
if (t->content->which == Z_ElementData_subtree)
{
- printf("\n");
- display_grs1(t->content->u.subtree, level+1);
+ if (!t->content->u.subtree)
+ printf (" (no subtree)\n");
+ else
+ {
+ printf("\n");
+ display_grs1(t->content->u.subtree, level+1);
+ }
}
else if (t->content->which == Z_ElementData_string)
printf("%s\n", t->content->u.string);
{
int *ip = t->content->u.oid;
oident *oent;
-
+
if ((oent = oid_getentbyoid(t->content->u.oid)))
printf("OID: %s\n", oent->desc);
else
printf("[Element empty]\n");
else if (t->content->which == Z_ElementData_elementNotThere)
printf("[Element not there]\n");
+ else if (t->content->which == Z_ElementData_date)
+ printf("Date: %s\n", t->content->u.date);
+ else if (t->content->which == Z_ElementData_ext)
+ {
+ printf ("External\n");
+ display_record (t->content->u.ext);
+ }
else
- printf("??????\n");
+ printf("? type = %d\n",t->content->which);
if (t->appliedVariant)
display_variant(t->appliedVariant, level+1);
if (t->metaData && t->metaData->supportedVariants)
print_stringn (buf, len);
/* add newline if not already added ... */
if (i <= 0 || buf[i-1] != '\n')
- fputc ('\n', stdout);
+ printf ("\n");
}
static void display_record(Z_External *r)
r->which = type->what;
}
}
+ if (ent && ent->oclass != CLASS_RECSYN)
+ return;
if (ent && ent->value == VAL_SOIF)
print_record((const unsigned char *) r->u.octet_aligned->buf,
r->u.octet_aligned->len);
#if AVOID_MARC_DECODE
/* primitive check for a marc OID 5.1-29 except 16 */
ent->oidsuffix[0] == 5 && ent->oidsuffix[1] < 30 &&
- ent->oidsuffix[1] != 16)
+ ent->oidsuffix[1] != 16
#else
- 1
+ 1
#endif
- )
- {
+ )
+ {
if (marc_display_exl (octet_buf, NULL, 0 /* debug */,
r->u.octet_aligned->len) <= 0)
{
}
}
-
static void display_diagrecs(Z_DiagRec **pp, int num)
{
int i;
Z_SearchRequest *req = apdu->u.searchRequest;
Z_Query query;
int oid[OID_SIZE];
-#if YAZ_MODULE_ccl
struct ccl_rpn_node *rpn = NULL;
int error, pos;
-#endif
char setstring[100];
Z_RPNQuery *RPNquery;
Odr_oct ccl_query;
-#if YAZ_MODULE_ccl
if (queryType == QueryType_CCL2RPN)
{
rpn = ccl_find_str(bibset, arg, &error, &pos);
return 0;
}
}
-#endif
req->referenceId = set_refid (out);
if (!strcmp(arg, "@big")) /* strictly for troublemaking */
{
ccl_query.buf = (unsigned char*) arg;
ccl_query.len = strlen(arg);
break;
-#if YAZ_MODULE_ccl
case QueryType_CCL2RPN:
query.which = Z_Query_type_1;
RPNquery = ccl_rpn_query(out, rpn);
query.u.type_1 = RPNquery;
ccl_rpn_delete (rpn);
break;
-#endif
default:
printf ("Unsupported query type\n");
return 0;
return 2;
}
+/* display Query Expression as part of searchResult-1 */
+static void display_queryExpression (Z_QueryExpression *qe)
+{
+ if (!qe)
+ return;
+ if (qe->which == Z_QueryExpression_term)
+ {
+ if (qe->u.term->queryTerm)
+ {
+ Z_Term *term = qe->u.term->queryTerm;
+ if (term->which == Z_Term_general)
+ printf (" %.*s", term->u.general->len, term->u.general->buf);
+ }
+ }
+
+}
+
+/* see if we can find USR:SearchResult-1 */
+static void display_searchResult (Z_OtherInformation *o)
+{
+ int i;
+ if (!o)
+ return ;
+ for (i = 0; i < o->num_elements; i++)
+ {
+ if (o->list[i]->which == Z_OtherInfo_externallyDefinedInfo)
+ {
+ Z_External *ext = o->list[i]->information.externallyDefinedInfo;
+
+ if (ext->which == Z_External_searchResult1)
+ {
+ int j;
+ Z_SearchInfoReport *sr = ext->u.searchResult1;
+ printf ("SearchResult-1:");
+ for (j = 0; j < sr->num; j++)
+ {
+ if (!sr->elements[j]->subqueryExpression)
+ printf (" %d", j);
+ display_queryExpression (
+ sr->elements[j]->subqueryExpression);
+ display_queryExpression (
+ sr->elements[j]->subqueryInterpretation);
+ display_queryExpression (
+ sr->elements[j]->subqueryRecommendation);
+ if (sr->elements[j]->subqueryCount)
+ printf ("(%d)", *sr->elements[j]->subqueryCount);
+ }
+ printf ("\n");
+ }
+ }
+ }
+}
+
static int process_searchResponse(Z_SearchResponse *res)
{
printf ("Received SearchResponse.\n");
printf("Number of hits: %d", *res->resultCount);
if (setnumber >= 0)
printf (", setno %d", setnumber);
- printf("\nrecords returned: %d\n",
- *res->numberOfRecordsReturned);
+ printf ("\n");
+ display_searchResult (res->additionalSearchInfo);
+ printf("records returned: %d\n",
+ *res->numberOfRecordsReturned);
setno += *res->numberOfRecordsReturned;
if (res->records)
display_records(res->records);
{
switch (pStringNumeric->which)
{
- case Z_StringOrNumeric_string:
- print_string(iLevel, pTag, pStringNumeric->u.string);
- break;
-
- case Z_StringOrNumeric_numeric:
- print_int(iLevel, pTag, pStringNumeric->u.numeric);
- break;
-
- default:
- print_level(iLevel);
- printf("%s: valid type for Z_StringOrNumeric\n", pTag);
- break;
+ case Z_StringOrNumeric_string:
+ print_string(iLevel, pTag, pStringNumeric->u.string);
+ break;
+
+ case Z_StringOrNumeric_numeric:
+ print_int(iLevel, pTag, pStringNumeric->u.numeric);
+ break;
+
+ default:
+ print_level(iLevel);
+ printf("%s: valid type for Z_StringOrNumeric\n", pTag);
+ break;
}
}
}
print_level(iLevel);
printf("Universe Report Duplicate: \n");
iLevel++;
- print_string_or_numeric(iLevel, "Hit No", pUniverseReportDuplicate->hitno);
+ print_string_or_numeric(iLevel, "Hit No",
+ pUniverseReportDuplicate->hitno);
}
}
-static void print_universe_report_hits(int iLevel, Z_UniverseReportHits *pUniverseReportHits)
+static void
+print_universe_report_hits(int iLevel,
+ Z_UniverseReportHits *pUniverseReportHits)
{
if (pUniverseReportHits != NULL)
{
print_level(iLevel);
printf("Universe Report Hits: \n");
iLevel++;
- print_string_or_numeric(iLevel, "Database", pUniverseReportHits->database);
+ print_string_or_numeric(iLevel, "Database",
+ pUniverseReportHits->database);
print_string_or_numeric(iLevel, "Hits", pUniverseReportHits->hits);
}
}
print_int(iLevel, "Total Hits", pUniverseReport->totalHits);
switch (pUniverseReport->which)
{
- case Z_UniverseReport_databaseHits:
- print_universe_report_hits(iLevel, pUniverseReport->u.databaseHits);
- break;
-
- case Z_UniverseReport_duplicate:
- print_universe_report_duplicate(iLevel, pUniverseReport->u.duplicate);
- break;
-
- default:
- print_level(iLevel);
- printf("Type: %d\n", pUniverseReport->which);
- break;
+ case Z_UniverseReport_databaseHits:
+ print_universe_report_hits(iLevel, pUniverseReport->u.databaseHits);
+ break;
+
+ case Z_UniverseReport_duplicate:
+ print_universe_report_duplicate(iLevel, pUniverseReport->u.duplicate);
+ break;
+
+ default:
+ print_level(iLevel);
+ printf("Type: %d\n", pUniverseReport->which);
+ break;
}
}
}
print_string(iLevel, "Descriptor", pExternal->descriptor);
switch (pExternal->which)
{
- case Z_External_universeReport:
- print_universe_report(iLevel, pExternal->u.universeReport);
- break;
-
- default:
- print_level(iLevel);
- printf("Type: %d\n", pExternal->which);
- break;
+ case Z_External_universeReport:
+ print_universe_report(iLevel, pExternal->u.universeReport);
+ break;
+
+ default:
+ print_level(iLevel);
+ printf("Type: %d\n", pExternal->which);
+ break;
}
}
}
}
}
-#if YAZ_MODULE_ill
-
const char *get_ill_element (void *clientData, const char *element)
{
return 0;
ctl.odr = out;
ctl.clientData = 0;
ctl.f = get_ill_element;
-
+
req = ill_get_ItemRequest(&ctl, "ill", 0);
if (!req)
printf ("ill_get_ItemRequest failed\n");
}
return r;
}
-#endif
-#ifdef YAZ_MODULE_ill
static Z_External *create_external_ILL_APDU(int which)
{
struct ill_get_ctl ctl;
}
return r;
}
-#endif
static Z_External *create_ItemOrderExternal(const char *type, int itemno)
oident update_oid;
printf ("Update request\n");
fflush(stdout);
-
+
if (!record_last)
return 0;
update_oid.proto = PROTO_Z3950;
return 2;
}
-/* II : Added to do DALI Item Order Extended services request */
static int cmd_itemorder(char *arg)
{
char type[12];
int itemno;
-
+
if (sscanf (arg, "%10s %d", type, &itemno) != 2)
return 0;
printf("Item order request\n");
fflush(stdout);
send_itemorder(type, itemno);
- return(2);
+ return 2;
}
static int cmd_find(char *arg)
sprintf(setstring, "%d", setnumber);
req->resultSetId = setstring;
}
-#if 0
- if (1)
- {
- static Z_Range range;
- static Z_Range *rangep = ⦥
- req->num_ranges = 1;
-#endif
req->resultSetStartPoint = &setno;
req->numberOfRecordsRequested = &nos;
prefsyn.proto = protocol;
printf("Sent presentRequest (%d+%d).\n", setno, nos);
return 2;
}
+
+static void close_session (void)
+{
+ cs_close (conn);
+ conn = 0;
+ if (session_mem)
+ {
+ nmem_destroy (session_mem);
+ session_mem = NULL;
+ }
+ sent_close = 0;
+}
void process_close(Z_Close *req)
{
printf("Reason: %s, message: %s\n", reasons[*req->closeReason],
req->diagnosticInformation ? req->diagnosticInformation : "NULL");
if (sent_close)
- {
- cs_close (conn);
- conn = NULL;
- if (session_mem)
- {
- nmem_destroy (session_mem);
- session_mem = NULL;
- }
- sent_close = 0;
- }
+ close_session ();
else
{
*res->closeReason = Z_Close_finished;
int cmd_proxy(char* arg)
{
+ if (*arg == '\0') {
+ printf("Current proxy is `%s'\n", (yazCharset)?yazProxy:NULL);
+ return 1;
+ }
xfree (yazProxy);
yazProxy = NULL;
if (*arg)
return 1;
}
+int cmd_charset(char* arg)
+{
+ if (*arg == '\0') {
+ printf("Current character set is `%s'\n", (yazCharset)?yazCharset:NULL);
+ return 1;
+ }
+ xfree (yazCharset);
+ yazCharset = NULL;
+ if (*arg)
+ {
+ yazCharset = (char *) xmalloc (strlen(arg)+1);
+ strcpy (yazCharset, arg);
+ }
+ return 1;
+}
+
+int cmd_lang(char* arg)
+{
+ if (*arg == '\0') {
+ printf("Current language is `%s'\n", (yazLang)?yazLang:NULL);
+ return 1;
+ }
+ xfree (yazLang);
+ yazLang = NULL;
+ if (*arg)
+ {
+ yazLang = (char *) xmalloc (strlen(arg)+1);
+ strcpy (yazLang, arg);
+ }
+ return 1;
+}
+
int cmd_source(char* arg)
{
/* first should open the file and read one line at a time.. */
if(apdu_file && apdu_file != stderr) { /* don't close stdout*/
perror("unable to close apdu log file");
- };
+ }
apdu_file=NULL;
if(strlen(arg)<1) {
{
if(marcdump && marcdump != stderr) { /* don't close stdout*/
perror("unable to close apdu log file");
- };
+ }
marcdump=NULL;
if(strlen(arg)<1) {
{
if ((res = cs_get(conn, &netbuffer, &netbufferlen)) < 0)
{
- perror("cs_get");
- exit(1);
+ printf("Target closed connection\n");
+ close_session ();
+ break;
}
if (!res)
{
printf("Target closed connection.\n");
- exit(1);
+ close_session ();
+ break;
}
odr_reset(in); /* release APDU from last round */
record_last = 0;
fprintf(stderr, "---------\n");
if (apdu_file)
z_APDU(print, &apdu, 0, 0);
- exit(1);
+ close_session ();
+ break;
}
if (apdu_file && !z_APDU(print, &apdu, 0, 0))
{
default:
printf("Received unknown APDU type (%d).\n",
apdu->which);
- exit(1);
+ close_session ();
}
}
while (conn && cs_more(conn));
}
+static int cmd_help (char *line);
+
static struct {
char *cmd;
int (*fun)(char *arg);
{"update", cmd_update, "<item>",NULL,0},
{"packagename", cmd_packagename, "<packagename>",NULL,0},
{"proxy", cmd_proxy, "[('tcp'|'ssl')]<host>[':'<port>]",NULL,0},
+ {"charset", cmd_charset, "<charset_name>",NULL,0},
+ {"lang", cmd_lang, "<language_code>",NULL,0},
{".", cmd_source, "<filename>",NULL,1},
{"!", cmd_subshell, "Subshell command",NULL,0},
{"set_apdufile", cmd_set_apdufile, "<filename>",NULL,0},
{"adm-commit", cmd_adm_commit, "",NULL,0},
{"adm-shutdown", cmd_adm_shutdown, "",NULL,0},
{"adm-startup", cmd_adm_startup, "",NULL,0},
+ {"help", cmd_help, "", NULL},
{0,0,0,0,0}
};
+static int cmd_help (char *line)
+{
+ int i;
+ char topic[21];
+
+ *topic = 0;
+ sscanf (line, "%20s", topic);
+
+ if (*topic == 0)
+ printf("Commands:\n");
+ for (i = 0; cmd[i].cmd; i++)
+ if (*topic == 0 || strcmp (topic, cmd[i].cmd) == 0)
+ printf(" %s %s\n", cmd[i].cmd, cmd[i].ad);
+ if (strcmp (topic, "find") == 0)
+ {
+ printf ("RPN:\n");
+ printf (" \"term\" Simple Term\n");
+ printf (" @attr [attset] type=value op Attribute\n");
+ printf (" @and opl opr And\n");
+ printf (" @or opl opr Or\n");
+ printf (" @not opl opr And-Not\n");
+ printf (" @set set Result set\n");
+ printf ("\n");
+ printf ("Bib-1 attribute types\n");
+ printf ("1=Use: ");
+ printf ("4=Title 7=ISBN 8=ISSN 30=Date 62=Abstract 1003=Author 1016=Any\n");
+ printf ("2=Relation: ");
+ printf ("1< 2<= 3= 4>= 5> 6!= 102=Relevance\n");
+ printf ("3=Position: ");
+ printf ("1=First in Field 2=First in subfield 3=Any position\n");
+ printf ("4=Structure: ");
+ printf ("1=Phrase 2=Word 3=Key 4=Year 5=Date 6=WordList\n");
+ printf ("5=Truncation: ");
+ printf ("1=Right 2=Left 3=L&R 100=No 101=# 102=Re-1 103=Re-2\n");
+ printf ("6=Completeness:");
+ printf ("1=Incomplete subfield 2=Complete subfield 3=Complete field\n");
+ }
+ return 1;
+}
+
void process_cmd_line(char* line)
{
int i,res;
res = (*cmd[i].fun)(arg);
break;
}
+
if (!cmd[i].cmd) /* dump our help-screen */
{
printf("Unknown command: %s.\n", word);
- printf("Currently recognized commands:\n");
- for (i = 0; cmd[i].cmd; i++)
- printf(" %s %s\n", cmd[i].cmd, cmd[i].ad);
- return;
+ cmd_help ("");
+ res = 1;
}
if(apdu_file) fflush(apdu_file);
char *command_generator(const char *text, int state)
{
- static idx; // index is the last used the last time command_generator was called
+ static int idx;
if (state==0) {
idx = 0;
}
if (!strncmp(cmd[idx].cmd,text,strlen(text))) {
++idx; /* skip this entry on the next run */
return strdup(cmd[idx-1].cmd);
- };
+ }
}
return NULL;
}
#if HAVE_READLINE_READLINE_H
if(start == 0) {
-#ifdef RL_READLINE_VERSION
+#if HAVE_READLINE_RL_COMPLETION_MATCHES
char** res=rl_completion_matches(text,
command_generator);
#else
if ((res = sscanf(rl_line_buffer, "%31s %1023[^;]", word, arg)) <= 0) {
rl_attempted_completion_over = 1;
return NULL;
- };
+ }
if(start != strlen(word) +1 ) {
rl_attempted_completion_over = 1;
if(!cmd[i].complete_filenames)
rl_attempted_completion_over = 1;
if(cmd[i].rl_completerfunction) {
-#ifdef RL_READLINE_VERSION
+#ifdef HAVE_READLINE_RL_COMPLETION_MATCHES
char** res=
rl_completion_matches(text,
cmd[i].rl_completerfunction);
} else {
rl_attempted_completion_over = 1;
return 0;
- };
- };
+ }
+ }
#else
return 0;
#endif
-};
+}
static void client(void)
}
-
-
/*
* Local variables:
* tab-width: 4
projects / yaz-moved-to-github.git / blobdiff