* Copyright (c) 1995-2004, Index Data
* See the file LICENSE for details.
*
- * $Id: client.c,v 1.248 2004-09-03 18:55:59 adam Exp $
+ * $Id: client.c,v 1.252 2004-09-22 13:21:37 adam Exp $
*/
#include <stdio.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 {
return 0;
}
#if HAVE_XML2
+ if (conn->protocol == PROTO_HTTP)
+ queryType = QueryType_CQL;
#else
if (conn->protocol == PROTO_HTTP)
{
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)
req->databaseNames = databaseNames;
req->numberOfTermsRequested = #
req->preferredPositionInResponse = &pp;
+ req->stepSize = odr_intdup(out, scan_stepSize);
send_apdu(apdu);
return 2;
}
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
{"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},