* Copyright (C) 1995-2005, Index Data ApS
* See the file LICENSE for details.
*
- * $Id: client.c,v 1.276 2005-04-20 12:59:51 adam Exp $
+ * $Id: client.c,v 1.279 2005-05-08 22:53:59 adam Exp $
*/
#include <stdio.h>
#endif
#if HAVE_XML2
+static char *encode_SRW_term(ODR o, const char *q)
+{
+ const char *in_charset = "ISO-8859-1";
+ WRBUF w = wrbuf_alloc();
+ yaz_iconv_t cd;
+ char *res;
+ if (outputCharset)
+ in_charset = outputCharset;
+ cd = yaz_iconv_open("UTF-8", in_charset);
+ if (!cd)
+ {
+ wrbuf_free(w, 1);
+ return odr_strdup(o, q);
+ }
+ wrbuf_iconv_write(w, cd, q, strlen(q));
+ if (wrbuf_len(w))
+ {
+ int len = wrbuf_len(w);
+ res = odr_strdupn(o, wrbuf_buf(w), len);
+ }
+ else
+ res = odr_strdup(o, q);
+ yaz_iconv_close(cd);
+ wrbuf_free(w, 1);
+ return res;
+}
+
+
static int send_SRW_scanRequest(const char *arg, int pos, int num)
{
Z_SRW_PDU *sr = 0;
{
case QueryType_CQL:
sr->u.scan_request->query_type = Z_SRW_query_type_cql;
- sr->u.scan_request->scanClause.cql = odr_strdup(out, arg);
+ sr->u.scan_request->scanClause.cql = encode_SRW_term(out, arg);
break;
case QueryType_Prefix:
sr->u.scan_request->query_type = Z_SRW_query_type_pqf;
- sr->u.scan_request->scanClause.pqf = odr_strdup(out, arg);
+ sr->u.scan_request->scanClause.pqf = encode_SRW_term(out, arg);
break;
default:
printf ("Only CQL and PQF supported in SRW\n");
{
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);
+ srw_sr->u.request->query.cql = encode_SRW_term(srw_sr_odr_out, arg);
sr->u.request->query_type = Z_SRW_query_type_cql;
- sr->u.request->query.cql = odr_strdup(out, arg);
+ sr->u.request->query.cql = encode_SRW_term(srw_sr_odr_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);
+ srw_sr->u.request->query.pqf = encode_SRW_term(srw_sr_odr_out, arg);
sr->u.request->query_type = Z_SRW_query_type_pqf;
- sr->u.request->query.pqf = odr_strdup(out, arg);
+ sr->u.request->query.pqf = encode_SRW_term(srw_sr_odr_out, arg);
break;
default:
printf ("Only CQL and PQF supported in SRW\n");
for (i = 0; cmd_array[i].cmd; i++)
if (*topic == 0 || strcmp (topic, cmd_array[i].cmd) == 0)
printf(" %s %s\n", cmd_array[i].cmd, cmd_array[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");
+ if (!strcmp(topic, "find"))
+ {
+ 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(" @prox exl dist ord rel uc ut Proximity. Use help prox\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");
+ }
+ if (!strcmp(topic, "prox"))
+ {
+ printf("Proximity:\n");
+ printf(" @prox exl dist ord rel uc ut\n");
+ printf(" exl: exclude flag . 0=include, 1=exclude.\n");
+ printf(" dist: distance integer.\n");
+ printf(" ord: order flag. 0=unordered, 1=ordered.\n");
+ printf(" rel: relation integer. 1< 2<= 3= 4>= 5> 6!= .\n");
+ printf(" uc: unit class. k=known, p=private.\n");
+ printf(" ut: unit type. 1=character, 2=word, 3=sentence,\n");
+ printf(" 4=paragraph, 5=section, 6=chapter, 7=document,\n");
+ printf(" 8=element, 9=subelement, 10=elementType, 11=byte.\n");
+ printf("\nExamples:\n");
+ printf(" Search for a and b in-order at most 3 words apart:\n");
+ printf(" @prox 0 3 1 2 k 2\n");
+ printf(" Search for any order of a and b next to each other:\n");
+ printf(" @prox 0 1 0 3 k 2\n");
}
return 1;
}
if (!cmd_array[i].cmd) /* dump our help-screen */
{
printf("Unknown command: %s.\n", word);
- printf("use help for list of commands\n");
- /* cmd_help (""); */
+ printf("Type 'help' for list of commands\n");
res = 1;
}
projects / yaz-moved-to-github.git / blobdiff