projects
/
yaz-moved-to-github.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
ZOOM dumps BER if decoding fails and loglevel zoom is set
[yaz-moved-to-github.git]
/
src
/
cql.y
diff --git
a/src/cql.y
b/src/cql.y
index
b5077d3
..
414feb8
100644
(file)
--- a/
src/cql.y
+++ b/
src/cql.y
@@
-1,6
+1,6
@@
-/* $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.14 2007-06-28 07:58:07 adam Exp $
+ Copyright (C) 2002-2006
+ Index Data ApS
This file is part of the YAZ toolkit.
This file is part of the YAZ toolkit.
@@
-135,13
+135,12
@@
searchClause:
/* unary NOT search TERM here .. */
boolean:
/* 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,
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;
mod->u.st.modifiers = $1.cql;
$$.cql = mod;
@@
-286,13
+285,12
@@
int yylex(YYSTYPE *lval, void *vp)
}
else
{
}
else
{
- putb(lval, cp, c);
- while ((c = cp->getbyte(cp->client_data)) != 0 &&
- !strchr(" \n()=<>/", c))
+ while (c != 0 && !strchr(" \n()=<>/", c))
{
if (c == '\\')
c = cp->getbyte(cp->client_data);
putb(lval, cp, c);
{
if (c == '\\')
c = cp->getbyte(cp->client_data);
putb(lval, cp, c);
+ c = cp->getbyte(cp->client_data);
}
#if YYDEBUG
printf ("got %s\n", lval->buf);
}
#if YYDEBUG
printf ("got %s\n", lval->buf);
@@
-300,13
+298,25
@@
int yylex(YYSTYPE *lval, void *vp)
if (c != 0)
cp->ungetbyte(c, cp->client_data);
if (!cql_strcmp(lval->buf, "and"))
if (c != 0)
cp->ungetbyte(c, cp->client_data);
if (!cql_strcmp(lval->buf, "and"))
+ {
+ lval->buf = "and";
return AND;
return AND;
+ }
if (!cql_strcmp(lval->buf, "or"))
if (!cql_strcmp(lval->buf, "or"))
+ {
+ lval->buf = "or";
return OR;
return OR;
+ }
if (!cql_strcmp(lval->buf, "not"))
if (!cql_strcmp(lval->buf, "not"))
+ {
+ lval->buf = "not";
return NOT;
return NOT;
+ }
if (!cql_strcmp(lval->buf, "prox"))
if (!cql_strcmp(lval->buf, "prox"))
+ {
+ lval->buf = "prox";
return PROX;
return PROX;
+ }
}
return TERM;
}
}
return TERM;
}