* Copyright (c) 1995-2004, Index Data
* See the file LICENSE for details.
*
- * $Id: client.c,v 1.245 2004-07-30 08:37:52 adam Exp $
+ * $Id: client.c,v 1.250 2004-09-21 16:28:17 adam Exp $
*/
#include <stdio.h>
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)
{
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)
name = oid_str;
val = 0;
- while (isdigit (*name))
+ while (isdigit (*(unsigned char *) name))
{
val = val*10 + (*name - '0');
name++;
char* lastnonspace=NULL;
for(;*p; ++p) {
- if(!isspace(*p)) {
+ if(!isspace(*(unsigned char *) p)) {
lastnonspace = p;
}
}