* Copyright (c) 1995-2004, Index Data
* See the file LICENSE for details.
*
- * $Id: client.c,v 1.242 2004-05-03 09:00:29 adam Exp $
+ * $Id: client.c,v 1.256 2004-11-18 15:18:10 heikki Exp $
*/
#include <stdio.h>
#include <yaz/srw.h>
#include <yaz/yaz-ccl.h>
#include <yaz/cql.h>
+#include <yaz/ylog.h>
#if HAVE_READLINE_READLINE_H
#include <readline/readline.h>
static int auto_reconnect = 0;
static Odr_bitmask z3950_options;
static int z3950_version = 3;
-
+static int scan_stepSize = 0;
+static int scan_position = 1;
static char cur_host[200];
typedef enum {
printf("Guessing visiblestring:\n");
printf("'%s'\n", uif->u. octet_aligned->buf);
} else if (uif->which == Z_External_single) {
- /* Peek at any private Init-diagnostic APDUs */
Odr_any *sat = uif->u.single_ASN1_type;
- printf("### NAUGHTY: External is '%s'\n", sat->buf);
+ oident *oid = oid_getentbyoid(uif->direct_reference);
+ if (oid->value == VAL_OCLCUI) {
+ Z_OCLC_UserInformation *oclc_ui;
+ ODR decode = odr_createmem(ODR_DECODE);
+ odr_setbuf(decode, sat->buf, sat->len, 0);
+ if (!z_OCLC_UserInformation(decode, &oclc_ui, 0, 0))
+ printf ("Bad OCLC UserInformation:\n");
+ else
+ printf ("OCLC UserInformation:\n");
+ if (!z_OCLC_UserInformation(print, &oclc_ui, 0, 0))
+ printf ("Bad OCLC UserInformation spec\n");
+ odr_destroy(decode);
+ }
+ else
+ {
+ /* Peek at any private Init-diagnostic APDUs */
+ printf("### NAUGHTY: External is '%.*s'\n", sat->len, sat->buf);
+ }
}
odr_reset (print);
}
return 0;
}
#if HAVE_XML2
+ if (conn->protocol == PROTO_HTTP)
+ queryType = QueryType_CQL;
#else
if (conn->protocol == PROTO_HTTP)
{
/* add newline if not already added ... */
if (i <= 0 || buf[i-1] != '\n')
printf ("\n");
+ if (marc_file)
+ fwrite (buf, 1, len, marc_file);
}
static void display_record(Z_External *r)
odr_malloc (out, sizeof(*req->deleteFunction));
if (req->num_resultSetList > 0)
{
- *req->deleteFunction = Z_DeleteRequest_list;
+ *req->deleteFunction = Z_DeleteResultSetRequest_list;
req->resultSetList = (char **)
odr_malloc (out, sizeof(*req->resultSetList)*
req->num_resultSetList);
}
else
{
- *req->deleteFunction = Z_DeleteRequest_all;
+ *req->deleteFunction = Z_DeleteResultSetRequest_all;
req->resultSetList = 0;
}
setno = 1;
/* save this for later .. when fetching individual records */
- srw_sr = sr = yaz_srw_get(srw_sr_odr_out, Z_SRW_searchRetrieve_request);
- sr->u.request->query_type = Z_SRW_query_type_cql;
- sr->u.request->query.cql = odr_strdup(srw_sr_odr_out, arg);
-
+ srw_sr = yaz_srw_get(srw_sr_odr_out, Z_SRW_searchRetrieve_request);
+
+ /* regular request .. */
sr = yaz_srw_get(out, Z_SRW_searchRetrieve_request);
- sr->u.request->query_type = Z_SRW_query_type_cql;
- sr->u.request->query.cql = odr_strdup(out, arg);
+ switch(queryType)
+ {
+ case QueryType_CQL:
+ srw_sr->u.request->query_type = Z_SRW_query_type_cql;
+ srw_sr->u.request->query.cql = odr_strdup(srw_sr_odr_out, arg);
+
+ sr->u.request->query_type = Z_SRW_query_type_cql;
+ sr->u.request->query.cql = odr_strdup(out, arg);
+ break;
+ case QueryType_Prefix:
+ srw_sr->u.request->query_type = Z_SRW_query_type_pqf;
+ srw_sr->u.request->query.pqf = odr_strdup(srw_sr_odr_out, arg);
+
+ sr->u.request->query_type = Z_SRW_query_type_pqf;
+ sr->u.request->query.pqf = odr_strdup(out, arg);
+ break;
+ default:
+ printf ("Only CQL and PQF supported in SRW\n");
+ return 0;
+ }
sr->u.request->maximumRecords = odr_intdup(out, 0);
if (record_schema)
printf("Target doesn't support cancel (trigger resource ctrl)\n");
return 0;
}
- *req->requestedAction = Z_TriggerResourceCtrl_cancel;
+ *req->requestedAction = Z_TriggerResourceControlRequest_cancel;
req->resultSetWanted = &rfalse;
+ req->referenceId = set_refid (out);
send_apdu(apdu);
printf("Sent cancel request\n");
return 2;
}
+
+int cmd_cancel_find(const char *arg) {
+ int fres;
+ fres=cmd_find(arg);
+ if( fres > 0 ) {
+ return cmd_cancel("");
+ };
+ return fres;
+}
+
int send_scanrequest(const char *query, int pp, int num, const char *term)
{
Z_APDU *apdu = zget_APDU(out, Z_APDU_scanRequest);
req->databaseNames = databaseNames;
req->numberOfTermsRequested = #
req->preferredPositionInResponse = &pp;
+ req->stepSize = odr_intdup(out, scan_stepSize);
send_apdu(apdu);
return 2;
}
printf("Received SortResponse: status=");
switch (*res->sortStatus)
{
- case Z_SortStatus_success:
+ case Z_SortResponse_success:
printf ("success"); break;
- case Z_SortStatus_partial_1:
+ case Z_SortResponse_partial_1:
printf ("partial"); break;
- case Z_SortStatus_failure:
+ case Z_SortResponse_failure:
printf ("failure"); break;
default:
printf ("unknown (%d)", *res->sortStatus);
return cmd_sort_generic (arg, 1);
}
+int cmd_scanstep(const char *arg)
+{
+ scan_stepSize = atoi(arg);
+ return 0;
+}
+
+int cmd_scanpos(const char *arg)
+{
+ int r = sscanf(arg, "%d", &scan_position);
+ if (r == 0)
+ scan_position = 1;
+ return 0;
+}
+
int cmd_scan(const char *arg)
{
if (only_z3950())
if (*arg)
{
strcpy (last_scan_query, arg);
- if (send_scanrequest(arg, 1, 20, 0) < 0)
+ if (send_scanrequest(arg, scan_position, 20, 0) < 0)
return 0;
}
else
{
/* first should open the file and read one line at a time.. */
FILE* includeFile;
- char line[1024], *cp;
+ char line[102400], *cp;
if(strlen(arg)<1) {
fprintf(stderr,"Error in source command use a filename\n");
name = oid_str;
val = 0;
- while (isdigit (*name))
+ while (isdigit (*(unsigned char *) name))
{
val = val*10 + (*name - '0');
name++;
printf (" schema=%s", rec->recordSchema);
printf ("\n");
if (rec->recordData_buf && rec->recordData_len)
+ {
fwrite(rec->recordData_buf, 1, rec->recordData_len, stdout);
+ if (marc_file)
+ fwrite (rec->recordData_buf, 1, rec->recordData_len, marc_file);
+ }
else
printf ("No data!");
printf("\n");
return 0;
}
+int cmd_sleep(const char* args )
+{
+ int sec=atoi(args);
+ if( sec > 0 ) {
+#ifdef WIN32
+ Sleep(sec*1000);
+#else
+ sleep(sec);
+#endif
+ printf("Done sleeping %d seconds\n", sec);
+ }
+ return 1;
+}
+
int cmd_list_otherinfo(const char* args)
{
int i;
{"base", cmd_base, "<base-name>",NULL,0,NULL},
{"show", cmd_show, "<rec#>['+'<#recs>['+'<setname>]]",NULL,0,NULL},
{"scan", cmd_scan, "<term>",NULL,0,NULL},
+ {"scanstep", cmd_scanstep, "<size>",NULL,0,NULL},
+ {"scanpos", cmd_scanpos, "<size>",NULL,0,NULL},
{"sort", cmd_sort, "<sortkey> <flag> <sortkey> <flag> ...",NULL,0,NULL},
{"sort+", cmd_sort_newset, "<sortkey> <flag> <sortkey> <flag> ...",NULL,0,NULL},
{"authentication", cmd_authentication, "<acctstring>",NULL,0,NULL},
{"status", cmd_status, "",NULL,0,NULL},
{"setnames", cmd_setnames, "",NULL,0,NULL},
{"cancel", cmd_cancel, "",NULL,0,NULL},
+ {"cancel_find", cmd_cancel_find, "<query>",NULL,0,NULL},
{"format", cmd_format, "<recordsyntax>",complete_format,0,NULL},
{"schema", cmd_schema, "<schema>",complete_schema,0,NULL},
{"elements", cmd_elements, "<elementSetName>",NULL,0,NULL},
{"set_cclfile", cmd_set_cclfile," <filename>",NULL,1,NULL},
{"set_cqlfile", cmd_set_cqlfile," <filename>",NULL,1,NULL},
{"set_auto_reconnect", cmd_set_auto_reconnect," on|off",complete_auto_reconnect,1,NULL},
- {"set_otherinfo", cmd_set_otherinfo,"<otherinfoinddex> <oid> <string>",NULL,0,NULL},
+ {"set_otherinfo", cmd_set_otherinfo,"<otherinfoinddex> <oid> <string>",NULL,0,NULL},
+ {"sleep", cmd_sleep,"<seconds>",NULL,0,NULL},
{"register_oid", cmd_register_oid,"<name> <class> <oid>",NULL,0,NULL},
{"push_command", cmd_push_command,"<command>",command_generator,0,NULL},
{"register_tab", cmd_register_tab,"<commandname> <tab>",command_generator,0,NULL},
void process_cmd_line(char* line)
{
int i,res;
- char word[32], arg[1024];
+ char word[32], arg[10240];
#if HAVE_GETTIMEOFDAY
gettimeofday (&tv_start, 0);
#endif
- if ((res = sscanf(line, "%31s %1023[^;]", word, arg)) <= 0)
+ if ((res = sscanf(line, "%31s %10239[^;]", word, arg)) <= 0)
{
strcpy(word, last_cmd);
*arg = '\0';
char* lastnonspace=NULL;
for(;*p; ++p) {
- if(!isspace(*p)) {
+ if(!isspace(*(unsigned char *) p)) {
lastnonspace = p;
}
}
rl_attempted_completion_over = 1;
return res;
} else {
- char arg[1024],word[32];
+ char arg[10240],word[32];
int i=0 ,res;
- if ((res = sscanf(rl_line_buffer, "%31s %1023[^;]", word, arg)) <= 0) {
+ if ((res = sscanf(rl_line_buffer, "%31s %10239[^;]", word, arg)) <= 0) {
rl_attempted_completion_over = 1;
return NULL;
}
static void client(void)
{
- char line[1024];
+ char line[10240];
- line[1023] = '\0';
+ line[10239] = '\0';
#if HAVE_GETTIMEOFDAY
gettimeofday (&tv_start, 0);
if (*line_in)
add_history(line_in);
#endif
- strncpy(line, line_in, 1023);
+ strncpy(line, line_in, 10239);
free (line_in);
}
#endif
char *end_p;
printf (C_PROMPT);
fflush(stdout);
- if (!fgets(line, 1023, stdin))
+ if (!fgets(line, 10239, stdin))
break;
if ((end_p = strchr (line, '\n')))
*end_p = '\0';
projects / yaz-moved-to-github.git / blobdiff