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
fixed wrong token count when tokens disappear with ICU normalization
[yaz-moved-to-github.git]
/
src
/
cql.y
diff --git
a/src/cql.y
b/src/cql.y
index
f4293e7
..
414feb8
100644
(file)
--- a/
src/cql.y
+++ b/
src/cql.y
@@
-1,4
+1,4
@@
-/* $Id: cql.y,v 1.11 2006-10-05 16:19:16 adam Exp $
+/* $Id: cql.y,v 1.14 2007-06-28 07:58:07 adam Exp $
Copyright (C) 2002-2006
Index Data ApS
Copyright (C) 2002-2006
Index Data ApS
@@
-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;
@@
-299,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;
}