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
Bump to 3.0.27.
[yaz-moved-to-github.git]
/
src
/
cql.y
diff --git
a/src/cql.y
b/src/cql.y
index
8daf2cb
..
2670216
100644
(file)
--- a/
src/cql.y
+++ b/
src/cql.y
@@
-1,4
+1,4
@@
-/* $Id: cql.y,v 1.16 2008-01-06 13:08:09 adam Exp $
+/* $Id: cql.y,v 1.17 2008-01-06 16:22:02 adam Exp $
Copyright (C) 2002-2006
Index Data ApS
Copyright (C) 2002-2006
Index Data ApS
@@
-121,8
+121,9
@@
searchClause:
$$.cql = $3.cql;
}
|
$$.cql = $3.cql;
}
|
- searchTerm {
- struct cql_node *st = cql_node_dup (((CQL_parser) parm)->nmem, $0.rel);
+searchTerm extraTerms {
+ struct cql_node *st = cql_node_dup(((CQL_parser) parm)->nmem, $0.rel);
+ st->u.st.extra_terms = $2.cql;
st->u.st.term = nmem_strdup(((CQL_parser)parm)->nmem, $1.buf);
$$.cql = st;
}
st->u.st.term = nmem_strdup(((CQL_parser)parm)->nmem, $1.buf);
$$.cql = st;
}
@@
-136,6
+137,18
@@
searchClause:
}
;
}
;
+extraTerms:
+extraTerms TERM {
+ struct cql_node *st = cql_node_mk_sc(((CQL_parser) parm)->nmem,
+ /* index */ 0, /* rel */ 0, $2.buf);
+ st->u.st.extra_terms = $1.cql;
+ $$.cql = st;
+}
+|
+{ $$.cql = 0; }
+;
+
+
/* unary NOT search TERM here .. */
boolean:
/* unary NOT search TERM here .. */
boolean:
@@
-164,11
+177,6
@@
modifiers '/' searchTerm mrelation searchTerm
}
;
}
;
-/*
-extraTerms:
- extraTerms TERM | ;
-*/
-
mrelation:
'='
| '>'
mrelation:
'='
| '>'