* Copyright (C) 1995-2007, Index Data ApS
* See the file LICENSE for details.
*
- * $Id: client.c,v 1.343 2007-06-03 08:06:31 adam Exp $
+ * $Id: client.c,v 1.355 2007-12-21 19:01:33 adam Exp $
*/
/** \file client.c
* \brief yaz-client program
static file_history_t file_history = 0;
-static char *sru_method = "soap";
+static char sru_method[10] = "soap";
+static char sru_version[10] = "1.2";
static char *codeset = 0; /* character set for output */
static int hex_dump = 0;
static char *dump_file_prefix = 0;
int rl_attempted_completion_over = 0;
#endif
-/* set this one to 1, to avoid decode of unknown MARCs */
-#define AVOID_MARC_DECODE 1
-
#define maxOtherInfosSupported 10
struct eoi {
Odr_oid oid[OID_SIZE];
return 1;
}
-static int parse_cmd_doc(const char **arg, ODR out, char **buf,
- int *len, int opt)
+static int parse_cmd_doc(const char **arg, ODR out, char **buf, int *len)
{
const char *sep;
while (**arg && strchr(" \t\n\r\f", **arg))
(*arg)++;
- if ((*arg)[0] == '\"' && (sep=strchr(*arg+1, '"')))
+ if (**arg == '\0')
{
- (*arg)++;
- *len = sep - *arg;
- *buf = odr_strdupn(out, *arg, *len);
- (*arg) = sep+1;
- return 1;
+ return 0;
}
- else if ((*arg)[0] && (*arg)[0] != '\"')
+ else if ((*arg)[0] == '<')
{
long fsize;
FILE *inf;
- const char *fname = *arg;
-
+ const char *fname;
+ const char *arg_start = ++(*arg);
+
while (**arg != '\0' && **arg != ' ')
(*arg)++;
+ fname = odr_strdupn(out, arg_start, *arg - arg_start);
+
inf = fopen(fname, "rb");
if (!inf)
{
return 0;
}
*len = fsize;
- *buf = (char *) odr_malloc(out, fsize);
+ *buf = (char *) odr_malloc(out, fsize+1);
+ (*buf)[fsize] = '\0';
if (fread(*buf, 1, fsize, inf) != fsize)
{
printf("Unable to read %s\n", fname);
return 0;
}
fclose(inf);
- return 1;
}
- else if (**arg == '\0')
+ else if ((*arg)[0] == '\"' && (sep=strchr(*arg+1, '"')))
{
- if (opt)
- {
- *len = 0;
- *buf = 0;
- return 1;
- }
- printf("Missing doc argument\n");
+ (*arg)++;
+ *len = sep - *arg;
+ *buf = odr_strdupn(out, *arg, *len);
+ (*arg) = sep+1;
}
else
- printf("Bad doc argument %s\n", *arg);
- return 0;
+ {
+ const char *arg_start = *arg;
+
+ while (**arg != '\0' && **arg != ' ')
+ (*arg)++;
+
+ *len = *arg - arg_start;
+ *buf = odr_strdupn(out, arg_start, *len);
+ }
+ return 1;
}
static int cmd_base(const char *arg)
au.which = Z_IdAuthentication_idPass;
au.u.idPass = &idPass;
idPass.groupId = NULL;
- idPass.userId = user;
- idPass.password = group;
+ idPass.userId = !strcmp(user, "-") ? 0 : user;
+ idPass.password = !strcmp(group, "-") ? 0 : group;
printf("Authentication set to User (%s), Pass (%s)\n", user, group);
}
if (r == 3)
gdu = z_get_HTTP_Request_host_path(out, host_port, path);
- if (!strcmp(sru_method, "get"))
+ if (!yaz_matchstr(sru_method, "get"))
{
yaz_sru_get_encode(gdu->u.HTTP_Request, sr, out, charset);
}
- else if (!strcmp(sru_method, "post"))
+ else if (!yaz_matchstr(sru_method, "post"))
{
yaz_sru_post_encode(gdu->u.HTTP_Request, sr, out, charset);
}
- else if (!strcmp(sru_method, "soap"))
+ else if (!yaz_matchstr(sru_method, "soap"))
{
yaz_sru_soap_encode(gdu->u.HTTP_Request, sr, out, charset);
}
Z_SRW_PDU *sr = 0;
/* regular requestse .. */
- sr = yaz_srw_get(out, Z_SRW_scan_request);
+ sr = yaz_srw_get_pdu(out, Z_SRW_scan_request, sru_version);
switch(queryType)
{
setno = 1;
/* save this for later .. when fetching individual records */
- srw_sr = yaz_srw_get(srw_sr_odr_out, Z_SRW_searchRetrieve_request);
+ srw_sr = yaz_srw_get_pdu(srw_sr_odr_out, Z_SRW_searchRetrieve_request,
+ sru_version);
/* regular request .. */
- sr = yaz_srw_get(out, Z_SRW_searchRetrieve_request);
+ sr = yaz_srw_get_pdu(out, Z_SRW_searchRetrieve_request, sru_version);
switch(queryType)
{
}
}
}
+ if (ext->which == Z_External_itemOrder)
+ {
+ Z_IOTaskPackage *otp = ext->u.itemOrder->u.taskPackage;
+ if (otp && otp->targetPart && otp->targetPart->itemRequest)
+ {
+ Z_External *ext = otp->targetPart->itemRequest;
+ if (ext->which == Z_External_octet)
+ {
+ Odr_oct *doc = ext->u.octet_aligned;
+ printf("Got itemRequest doc %.*s\n",
+ doc->len, doc->buf);
+ }
+ }
+ }
}
if (res->taskPackage && res->taskPackage->which == Z_External_octet)
{
static int cmd_update_common(const char *arg, int version)
{
- char action[20], recid_buf[20];
+ char *action_buf;
+ int action_len;
+ char *recid_buf;
+ int recid_len;
const char *recid = 0;
char *rec_buf;
int rec_len;
int action_no;
int noread = 0;
- *action = 0;
- *recid_buf = 0;
- sscanf (arg, "%19s %19s%n", action, recid_buf, &noread);
- if (noread == 0)
+ if (parse_cmd_doc(&arg, out, &action_buf, &action_len) == 0)
{
printf("Use: update action recid [fname]\n");
printf(" where action is one of insert,replace,delete.update\n");
return 0;
}
- if (!strcmp (action, "insert"))
+ if (parse_cmd_doc(&arg, out, &recid_buf, &recid_len) == 0)
+ {
+ printf("Missing recid\n");
+ return 0;
+ }
+
+ if (!strcmp(action_buf, "insert"))
action_no = Z_IUOriginPartToKeep_recordInsert;
- else if (!strcmp (action, "replace"))
+ else if (!strcmp(action_buf, "replace"))
action_no = Z_IUOriginPartToKeep_recordReplace;
- else if (!strcmp (action, "delete"))
+ else if (!strcmp(action_buf, "delete"))
action_no = Z_IUOriginPartToKeep_recordDelete;
- else if (!strcmp (action, "update"))
+ else if (!strcmp(action_buf, "update"))
action_no = Z_IUOriginPartToKeep_specialUpdate;
else
{
- printf ("Bad action: %s\n", action);
+ printf ("Bad action: %s\n", action_buf);
printf ("Possible values: insert, replace, delete, update\n");
return 0;
}
recid = recid_buf;
arg += noread;
- if (parse_cmd_doc(&arg, out, &rec_buf, &rec_len, 1) == 0)
+ if (parse_cmd_doc(&arg, out, &rec_buf, &rec_len) == 0)
return 0;
#if YAZ_HAVE_XML2
if (protocol == PROTO_HTTP)
- return cmd_update_SRW(action_no, recid, rec_buf, rec_len);
+ return cmd_update_SRW(action_no, recid_buf, rec_buf, rec_len);
#endif
- return cmd_update_Z3950(version, action_no, recid, rec_buf, rec_len);
+ return cmd_update_Z3950(version, action_no, recid_buf, rec_buf, rec_len);
}
#if YAZ_HAVE_XML2
toKeep->databaseName = databaseNames[0];
toKeep->schema = 0;
+ if (record_schema)
+ {
+ toKeep->schema = yaz_string_to_oid_odr(yaz_oid_std(),
+ CLASS_SCHEMA,
+ record_schema, out);
+ }
toKeep->elementSetName = 0;
toKeep->action = (int *) odr_malloc(out, sizeof(*toKeep->action));
toKeep->databaseName = databaseNames[0];
toKeep->schema = 0;
+ if (record_schema)
+ {
+ toKeep->schema = yaz_string_to_oid_odr(yaz_oid_std(),
+ CLASS_SCHEMA,
+ record_schema, out);
+ }
toKeep->elementSetName = 0;
toKeep->actionQualifier = 0;
toKeep->action = (int *) odr_malloc(out, sizeof(*toKeep->action));
}
arg += noread;
if (parse_cmd_doc(&arg, out, &asn_buf,
- &ext->u.single_ASN1_type->len, 0) == 0)
+ &ext->u.single_ASN1_type->len) == 0)
return 0;
ext->u.single_ASN1_type->buf = (unsigned char *) asn_buf;
if (!*arg)
{
printf("SRU method is: %s\n", sru_method);
+ printf("SRU version is: %s\n", sru_version);
}
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
+ int r;
+ r = sscanf(arg, "%9s %9s", sru_method, sru_version);
+ if (r >= 1)
{
- printf("Unknown SRU method: %s\n", arg);
- printf("Specify one of POST, GET, SOAP\n");
+ if (!yaz_matchstr(sru_method, "post"))
+ ;
+ else if (!yaz_matchstr(sru_method, "get"))
+ ;
+ else if (!yaz_matchstr(sru_method, "soap"))
+ ;
+ else
+ {
+ strcpy(sru_method, "soap");
+ printf("Unknown SRU method: %s\n", arg);
+ printf("Specify one of POST, GET, SOAP\n");
+ }
}
}
return 0;
if (t->displayTerm)
printf("%s", t->displayTerm);
else if (t->term->which == Z_Term_general)
- {
printf("%.*s", t->term->u.general->len, t->term->u.general->buf);
- sprintf(last_scan_line, "%.*s", t->term->u.general->len,
- t->term->u.general->buf);
- }
else
printf("Term (not general)");
+ if (t->term->which == Z_Term_general)
+ sprintf(last_scan_line, "%.*s", t->term->u.general->len,
+ t->term->u.general->buf);
+
if (t->globalOccurrences)
printf (" (%d)\n", *t->globalOccurrences);
else
return 1;
}
-void source_rcfile(void)
+void source_rc_file(const char *rc_file)
{
- /* Look for .yazclientrc and read it if it exists.
+ /* If rc_file != NULL, source that. Else
+ Look for .yazclientrc and read it if it exists.
If it does not exist, read $HOME/.yazclientrc instead */
struct stat statbuf;
- char fname[1000];
- strcpy(fname, ".yazclientrc");
- if (stat(fname, &statbuf)==0)
+ if (rc_file)
{
- cmd_source(fname, 0);
+ if (stat(rc_file, &statbuf) == 0)
+ cmd_source(rc_file, 0);
+ else
+ {
+ fprintf(stderr, "yaz_client: cannot source '%s'\n", rc_file);
+ exit(1);
+ }
}
else
{
- const char* homedir = getenv("HOME");
- if (homedir)
+ char fname[1000];
+ strcpy(fname, ".yazclientrc");
+ if (stat(fname, &statbuf)==0)
{
- sprintf(fname, "%.800s/%s", homedir, ".yazclientrc");
- if (stat(fname, &statbuf)==0)
- cmd_source(fname, 0);
+ cmd_source(fname, 0);
+ }
+ else
+ {
+ const char* homedir = getenv("HOME");
+ if (homedir)
+ {
+ sprintf(fname, "%.800s/%s", homedir, ".yazclientrc");
+ if (stat(fname, &statbuf)==0)
+ cmd_source(fname, 0);
+ }
}
}
}
#endif
}
-static void initialize(void)
+static void initialize(const char *rc_file)
{
FILE *inf;
int i;
cmd_format("usmarc");
- source_rcfile();
+ source_rc_file(rc_file);
file_history = file_history_new();
file_history_load(file_history);
const char *connection_head = z_HTTP_header_lookup(hres->headers,
"Connection");
if (!yaz_srw_check_content_type(hres))
- printf("Content type does not appear to be XML");
+ printf("Content type does not appear to be XML\n");
else
{
Z_SOAP *soap_package = 0;
{"zversion", cmd_zversion, "", NULL, 0, NULL},
{"help", cmd_help, "", NULL,0,NULL},
{"init", cmd_init, "", NULL,0,NULL},
- {"sru", cmd_sru, "", NULL,0,NULL},
+ {"sru", cmd_sru, "<method> <version>", NULL,0,NULL},
{"exit", cmd_quit, "",NULL,0,NULL},
{0,0,0,0,0,0}
};
char *open_command = 0;
char *auth_command = 0;
char *arg;
+ const char *rc_file = 0;
int ret;
#if HAVE_LOCALE_H
ODR_MASK_SET(&z3950_options, Z_Options_delSet);
ODR_MASK_SET(&z3950_options, Z_Options_negotiationModel);
- while ((ret = options("k:c:q:a:b:m:v:p:u:t:Vxd:", argv, argc, &arg)) != -2)
+ while ((ret = options("k:c:q:a:b:m:v:p:u:t:Vxd:f:", argv, argc, &arg)) != -2)
{
switch (ret)
{
exit(1);
}
break;
+ case 'a':
+ if (!strcmp(arg, "-"))
+ apdu_file=stderr;
+ else
+ apdu_file=fopen(arg, "a");
+ break;
+ case 'b':
+ if (!strcmp(arg, "-"))
+ ber_file=stderr;
+ else
+ ber_file=fopen(arg, "a");
+ break;
+ case 'c':
+ strncpy (ccl_fields, arg, sizeof(ccl_fields)-1);
+ ccl_fields[sizeof(ccl_fields)-1] = '\0';
+ break;
case 'd':
dump_file_prefix = arg;
break;
+ case 'f':
+ rc_file = arg;
+ break;
case 'k':
kilobytes = atoi(arg);
break;
exit (1);
}
break;
- case 't':
- outputCharset = xstrdup(arg);
- break;
- case 'c':
- strncpy (ccl_fields, arg, sizeof(ccl_fields)-1);
- ccl_fields[sizeof(ccl_fields)-1] = '\0';
+ case 'p':
+ yazProxy = xstrdup(arg);
break;
case 'q':
strncpy (cql_fields, arg, sizeof(cql_fields)-1);
cql_fields[sizeof(cql_fields)-1] = '\0';
break;
- case 'b':
- if (!strcmp(arg, "-"))
- ber_file=stderr;
- else
- ber_file=fopen(arg, "a");
- break;
- case 'a':
- if (!strcmp(arg, "-"))
- apdu_file=stderr;
- else
- apdu_file=fopen(arg, "a");
- break;
- case 'x':
- hex_dump = 1;
- break;
- case 'p':
- yazProxy = xstrdup(arg);
+ case 't':
+ outputCharset = xstrdup(arg);
break;
case 'u':
if (!auth_command)
case 'V':
show_version();
break;
+ case 'x':
+ hex_dump = 1;
+ break;
default:
fprintf (stderr, "Usage: %s "
- " [-a <apdulog>]"
+ " [-a apdulog]"
" [-b berdump]"
- " [-d dump]\n"
- " [-c cclfields]"
+ " [-c cclfile]"
+ " [-d dump]"
+ " [-f cmdfile]"
" [-k size]"
- " [-m <marclog>]\n"
- " [-p <proxy-addr>]"
- " [-q cqlfields]"
- " [-u <auth>]"
+ " [-m marclog]"
+ " [-p proxy-addr]"
+ " [-q cqlfile]"
+ " [-t dispcharset]"
+ " [-u auth]"
+ " [-v loglevel]"
" [-V]"
- " [<server-addr>]\n",
+ " [-x]"
+ " [server-addr]\n",
prog);
exit (1);
}
}
- initialize();
+ initialize(rc_file);
if (auth_command)
{
#ifdef HAVE_GETTIMEOFDAY