-/* $Id: cql.y,v 1.9 2005-06-27 22:03:59 adam Exp $
- Copyright (C) 2002-2004
- Index Data Aps
+/* $Id: cql.y,v 1.15 2007-10-31 21:58:07 adam Exp $
+ Copyright (C) 2002-2006
+ Index Data ApS
This file is part of the YAZ toolkit.
/* unary NOT search TERM here .. */
boolean:
- AND | OR | NOT | PROX
- ;
+ AND | OR | NOT | PROX ;
modifiers: modifiers '/' searchTerm
{
struct cql_node *mod = cql_node_mk_sc(((CQL_parser)parm)->nmem,
- $3.buf, "=", 0);
+ $3.buf, 0, 0);
mod->u.st.modifiers = $1.cql;
$$.cql = mod;
while ((c = cp->getbyte(cp->client_data)) != 0 && c != '"')
{
if (c == '\\')
+ {
+ putb(lval, cp, c);
c = cp->getbyte(cp->client_data);
- putb(lval, cp, c);
+ if (!c)
+ break;
+ }
+ putb(lval, cp, c);
}
putb(lval, cp, 0);
}
else
{
- putb(lval, cp, c);
- while ((c = cp->getbyte(cp->client_data)) != 0 &&
- !strchr(" \n()=<>/", c))
+ while (c != 0 && !strchr(" \n()=<>/", c))
{
if (c == '\\')
+ {
+ putb(lval, cp, c);
c = cp->getbyte(cp->client_data);
+ if (!c)
+ break;
+ }
putb(lval, cp, c);
+ c = cp->getbyte(cp->client_data);
}
+ putb(lval, cp, 0);
#if YYDEBUG
printf ("got %s\n", lval->buf);
#endif
if (c != 0)
cp->ungetbyte(c, cp->client_data);
if (!cql_strcmp(lval->buf, "and"))
+ {
+ lval->buf = "and";
return AND;
+ }
if (!cql_strcmp(lval->buf, "or"))
+ {
+ lval->buf = "or";
return OR;
+ }
if (!cql_strcmp(lval->buf, "not"))
+ {
+ lval->buf = "not";
return NOT;
+ }
if (!cql_strcmp(lval->buf, "prox"))
+ {
+ lval->buf = "prox";
return PROX;
+ }
}
return TERM;
}