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
Test for solr sort specs
[yaz-moved-to-github.git]
/
src
/
cql.y
diff --git
a/src/cql.y
b/src/cql.y
index
abafa28
..
cf6995e
100644
(file)
--- a/
src/cql.y
+++ b/
src/cql.y
@@
-162,10
+162,10
@@
searchTerm extraTerms {
;
extraTerms:
;
extraTerms:
-extraTerms SIMPLE_STRING {
+SIMPLE_STRING extraTerms {
struct cql_node *st = cql_node_mk_sc(((CQL_parser) parm)->nmem,
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;
+ /* index */ 0, /* rel */ 0, $1.buf);
+ st->u.st.extra_terms = $2.cql;
$$.cql = st;
}
|
$$.cql = st;
}
|
@@
-245,7
+245,7
@@
static void putb(YYSTYPE *lval, CQL_parser cp, int c)
{
char *nb = (char *)
nmem_malloc(cp->nmem, (lval->size = lval->len * 2 + 20));
{
char *nb = (char *)
nmem_malloc(cp->nmem, (lval->size = lval->len * 2 + 20));
- memcpy (nb, lval->buf, lval->len);
+ memcpy(nb, lval->buf, lval->len);
lval->buf = nb;
}
if (c)
lval->buf = nb;
}
if (c)
@@
-388,6
+388,8
@@
int yylex(YYSTYPE *lval, void *vp)
relation_like = 1;
if (!cql_strcmp(lval->buf, "any"))
relation_like = 1;
relation_like = 1;
if (!cql_strcmp(lval->buf, "any"))
relation_like = 1;
+ if (!cql_strcmp(lval->buf, "adj"))
+ relation_like = 1;
if (relation_like)
return PREFIX_NAME;
}
if (relation_like)
return PREFIX_NAME;
}
@@
-413,7
+415,7
@@
int cql_parser_stream(CQL_parser cp,
CQL_parser cql_parser_create(void)
{
CQL_parser cql_parser_create(void)
{
- CQL_parser cp = (CQL_parser) xmalloc (sizeof(*cp));
+ CQL_parser cp = (CQL_parser) xmalloc(sizeof(*cp));
cp->top = 0;
cp->getbyte = 0;
cp->top = 0;
cp->getbyte = 0;