-/* $Id: cql.y,v 1.17 2008-01-06 16:22:02 adam Exp $
- Copyright (C) 2002-2006
- Index Data ApS
-
-This file is part of the YAZ toolkit.
-
-See the file LICENSE.
-
- bison parser for CQL grammar.
-*/
+/* This file is part of the YAZ toolkit.
+ * Copyright (C) 1995-2011 Index Data
+ * See the file LICENSE for details.
+ */
+/* bison parser for CQL grammar. */
%{
/**
* \file cql.c
* This is a YACC parser, but since it must be reentrant, Bison is required.
* The original source file is cql.y.
*/
+#if HAVE_CONFIG_H
+#include <config.h>
+#endif
#include <stdio.h>
#include <stdlib.h>
#include <string.h>
-#include <ctype.h>
+#include <yaz/yaz-iconv.h>
#include <yaz/xmalloc.h>
#include <yaz/nmem.h>
#include <yaz/cql.h>
%}
%pure_parser
-%token DOTTERM TERM AND OR NOT PROX GE LE NE EXACT
+%token PREFIX_NAME SIMPLE_STRING AND OR NOT PROX GE LE NE EXACT SORTBY
%%
$$.rel = cql_node_mk_sc(((CQL_parser) parm)->nmem,
"cql.serverChoice", "=", 0);
((CQL_parser) parm)->top = 0;
-} cqlQuery1 {
+} cqlQuery1 sortby {
cql_node_destroy($$.rel);
- ((CQL_parser) parm)->top = $2.cql;
+ if ($3.cql)
+ {
+ $3.cql->u.sort.search = $2.cql;
+ ((CQL_parser) parm)->top = $3.cql;
+ } else {
+ ((CQL_parser) parm)->top = $2.cql;
+ }
}
;
+sortby: /* empty */
+ { $$.cql = 0; }
+| SORTBY sortSpec {
+ $$.cql = $2.cql;
+ };
+
+sortSpec: sortSpec singleSpec {
+ $$.cql = $1.cql;
+ $$.cql->u.sort.next = $2.cql;
+ }
+| singleSpec
+{
+ $$.cql = $1.cql;
+};
+
+singleSpec: index modifiers {
+ $$.cql = cql_node_mk_sort(((CQL_parser) parm)->nmem, $1.buf, $2.cql);
+ }
+;
+
cqlQuery1: cqlQuery
| cqlQuery error {
cql_node_destroy($1.cql);
;
extraTerms:
-extraTerms TERM {
+extraTerms SIMPLE_STRING {
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;
;
-/* unary NOT search TERM here .. */
+/* unary NOT search SIMPLE_STRING here .. */
boolean:
AND | OR | NOT | PROX ;
$$.cql = mod;
}
|
-modifiers '/' searchTerm mrelation searchTerm
+modifiers '/' searchTerm relation_symbol searchTerm
{
struct cql_node *mod = cql_node_mk_sc(((CQL_parser)parm)->nmem,
$3.buf, $4.buf, $5.buf);
}
;
-mrelation:
- '='
-| '>'
-| '<'
-| GE
-| LE
-| NE
-| EXACT
-;
+relation: PREFIX_NAME | relation_symbol;
-relation:
+relation_symbol:
'='
| '>'
| '<'
| LE
| NE
| EXACT
-| DOTTERM
;
index:
searchTerm;
searchTerm:
- TERM
-| DOTTERM
+ SIMPLE_STRING
+| PREFIX_NAME
| AND
| OR
| NOT
| PROX
+| SORTBY
;
%%
return 0;
if (c == '\n')
return 0;
- } while (isspace(c));
+ } while (yaz_isspace(c));
if (strchr("()=></", c))
{
int c1;
putb(lval, cp, c);
}
putb(lval, cp, 0);
- return TERM;
+ return SIMPLE_STRING;
}
else
{
lval->buf = "prox";
return PROX;
}
+ if (!cql_strcmp(lval->buf, "sortby"))
+ {
+ lval->buf = "sortby";
+ return SORTBY;
+ }
if (!cql_strcmp(lval->buf, "all"))
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 DOTTERM;
+ return PREFIX_NAME;
}
- return TERM;
+ return SIMPLE_STRING;
}
cp->getbyte = getbyte;
cp->ungetbyte = ungetbyte;
cp->client_data = client_data;
- if (cp->top)
- cql_node_destroy(cp->top);
+ cql_node_destroy(cp->top);
cql_parse(cp);
if (cp->top)
return 0;
{
return cp->top;
}
+
+/*
+ * Local variables:
+ * c-basic-offset: 4
+ * c-file-style: "Stroustrup"
+ * indent-tabs-mode: nil
+ * End:
+ * vim: shiftwidth=4 tabstop=8 expandtab
+ */