* Copyright (C) 1995-2005, Index Data ApS
* See the file LICENSE for details.
*
- * $Id: pquery.c,v 1.7 2006-02-19 18:34:13 adam Exp $
+ * $Id: pquery.c,v 1.8 2006-04-01 11:45:23 adam Exp $
*/
/**
* \file pquery.c
char **attr_clist, oid_value *attr_set)
{
const char *cp;
+
if (!(cp = strchr (li->lex_buf, '=')) ||
(size_t) (cp-li->lex_buf) > li->lex_len)
{
else
attr_set[num_attr] = VAL_NONE;
}
+ if (*li->lex_buf < '0' || *li->lex_buf > '9')
+ {
+ li->error = YAZ_PQF_ERROR_BAD_INTEGER;
+ return 0;
+ }
attr_list[2*num_attr] = atoi(li->lex_buf);
- cp++;
+ cp++;
if (*cp >= '0' && *cp <= '9')
{
attr_list[2*num_attr+1] = atoi (cp);
p->exclusion = odr_intdup (o, 1);
else if (*li->lex_buf == '0')
p->exclusion = odr_intdup (o, 0);
- else
+ else if (*li->lex_buf == 'v' || *li->lex_buf == 'n')
p->exclusion = NULL;
+ else
+ {
+ li->error = YAZ_PQF_ERROR_PROXIMITY;
+ return NULL;
+ }
if (!lex (li))
{
li->error = YAZ_PQF_ERROR_MISSING;
return NULL;
}
- p->distance = odr_intdup (o, atoi(li->lex_buf));
+ if (*li->lex_buf >= '0' && *li->lex_buf <= '9')
+ p->distance = odr_intdup (o, atoi (li->lex_buf));
+ else
+ {
+ li->error = YAZ_PQF_ERROR_BAD_INTEGER;
+ return NULL;
+ }
if (!lex (li))
{
li->error = YAZ_PQF_ERROR_MISSING;
return NULL;
}
- p->ordered = odr_intdup (o, atoi (li->lex_buf));
+ if (*li->lex_buf == '1')
+ p->ordered = odr_intdup (o, 1);
+ else if (*li->lex_buf == '0')
+ p->ordered = odr_intdup (o, 0);
+ else
+ {
+ li->error = YAZ_PQF_ERROR_PROXIMITY;
+ return NULL;
+ }
if (!lex (li))
{
li->error = YAZ_PQF_ERROR_MISSING;
return NULL;
}
- p->relationType = odr_intdup (o, atoi (li->lex_buf));
+ if (*li->lex_buf >= '0' && *li->lex_buf <= '9')
+ p->relationType = odr_intdup (o, atoi (li->lex_buf));
+ else
+ {
+ li->error = YAZ_PQF_ERROR_BAD_INTEGER;
+ return NULL;
+ }
if (!lex (li))
{
else
p->which = atoi (li->lex_buf);
+ if (p->which != Z_ProximityOperator_known
+ && p->which != Z_ProximityOperator_private)
+ {
+ li->error = YAZ_PQF_ERROR_PROXIMITY;
+ return NULL;
+ }
+
if (!lex (li))
{
li->error = YAZ_PQF_ERROR_MISSING;
return NULL;
}
- p->u.known = odr_intdup (o, atoi(li->lex_buf));
+ if (*li->lex_buf >= '0' && *li->lex_buf <= '9')
+ p->u.known = odr_intdup (o, atoi(li->lex_buf));
+ else
+ {
+ li->error = YAZ_PQF_ERROR_BAD_INTEGER;
+ return NULL;
+ }
return p;
}
*msg = "bad attribute specification"; break;
case YAZ_PQF_ERROR_INTERNAL:
*msg = "internal error"; break;
+ case YAZ_PQF_ERROR_PROXIMITY:
+ *msg = "proximity error"; break;
+ case YAZ_PQF_ERROR_BAD_INTEGER:
+ *msg = "bad integer"; break;
default:
*msg = "unknown error"; break;
}
## Copyright (C) 1994-2006, Index Data
## All rights reserved.
-## $Id: Makefile.am,v 1.11 2006-01-27 17:33:15 adam Exp $
+## $Id: Makefile.am,v 1.12 2006-04-01 11:45:23 adam Exp $
check_PROGRAMS = tsticonv tstnmem tstmatchstr tstwrbuf tstodr tstccl tstlog \
- tstsoap1 tstsoap2 tstodrstack tstlogthread tstxmlquery
+ tstsoap1 tstsoap2 tstodrstack tstlogthread tstxmlquery tstpquery
check_SCRIPTS = tstcql.sh tstmarc.sh
TESTS = $(check_PROGRAMS) $(check_SCRIPTS)
tstsoap2_SOURCES = tstsoap2.c
tstlogthread_SOURCES = tstlogthread.c
tstxmlquery_SOURCES = tstxmlquery.c
+tstpquery_SOURCES = tstpquery.c
--- /dev/null
+/*
+ * Copyright (C) 1995-2005, Index Data ApS
+ * See the file LICENSE for details.
+ *
+ * $Id: tstpquery.c,v 1.1 2006-04-01 11:45:23 adam Exp $
+ */
+
+#include <stdlib.h>
+#include <stdio.h>
+
+#include <yaz/wrbuf.h>
+#include <yaz/querytowrbuf.h>
+#include <yaz/pquery.h>
+#include <yaz/test.h>
+
+int expect_pqf(const char *pqf, const char *expect_pqf, int expect_error)
+{
+ YAZ_PQF_Parser parser = yaz_pqf_create();
+ int res = 0;
+ ODR odr = odr_createmem(ODR_ENCODE);
+ Z_RPNQuery *rpn;
+
+ if (!parser)
+ return 0;
+
+ if (!odr)
+ return 0;
+
+ rpn = yaz_pqf_parse(parser, odr, pqf);
+
+ if (!rpn)
+ {
+ const char *msg;
+ size_t offset;
+ int got_error = yaz_pqf_error (parser, &msg, &offset);
+
+ if (expect_error == got_error)
+ res = 1;
+ }
+ else if (expect_error == YAZ_PQF_ERROR_NONE)
+ {
+ WRBUF wrbuf = wrbuf_alloc();
+
+ if (wrbuf)
+ {
+ yaz_rpnquery_to_wrbuf(wrbuf, rpn);
+
+ if (!strcmp(wrbuf_buf(wrbuf), expect_pqf))
+ res = 1;
+ wrbuf_free(wrbuf, 1);
+ }
+ }
+ yaz_pqf_destroy(parser);
+ odr_destroy(odr);
+ return res;
+}
+
+static void tst()
+{
+ YAZ_CHECK(expect_pqf("a", "@attrset Bib-1 a", YAZ_PQF_ERROR_NONE));
+ YAZ_CHECK(expect_pqf("@attr 1=4 a", "@attrset Bib-1 @attr 1=4 a", YAZ_PQF_ERROR_NONE));
+ YAZ_CHECK(expect_pqf("a b", "", YAZ_PQF_ERROR_EXTRA));
+ YAZ_CHECK(expect_pqf("@prox 0 0 0 0 k 0 a b",
+ "@attrset Bib-1 @prox 0 0 0 0 k 0 a b",
+ YAZ_PQF_ERROR_NONE));
+}
+
+int main (int argc, char **argv)
+{
+ YAZ_CHECK_INIT(argc, argv);
+ tst();
+ YAZ_CHECK_TERM;
+}
+
+/*
+ * Local variables:
+ * c-basic-offset: 4
+ * indent-tabs-mode: nil
+ * End:
+ * vim: shiftwidth=4 tabstop=8 expandtab
+ */
+