X-Git-Url: http://git.indexdata.com/?p=yaz-moved-to-github.git;a=blobdiff_plain;f=src%2Fcql1.2.y;h=3b80c8ce2a333f3dded03944f5ca3c5779f8f2af;hp=0a908ecdfc53ea6efda552bd60e4757e64b1057e;hb=d51b21c6f41a021f21078921a0de50106264d55e;hpb=2d82f5e172577a498d19396b210ca28553683310 diff --git a/src/cql1.2.y b/src/cql1.2.y index 0a908ec..3b80c8c 100644 --- a/src/cql1.2.y +++ b/src/cql1.2.y @@ -1,5 +1,5 @@ /* This file is part of the YAZ toolkit. - * Copyright (C) 1995-2010 Index Data + * Copyright (C) Index Data * See the file LICENSE for details. */ /* @@ -8,7 +8,7 @@ %term GE LE NE AND OR NOT PROX CHARSTRING1 CHARSTRING2 SORTBY %% -sortedQuery : prefixAssignment sortedQuery +sortedQuery : prefixAssignment sortedQuery | scopedClause | scopedClause SORTBY sortSpec; @@ -40,10 +40,10 @@ namedComparitor : identifier; modifierList : modifierList modifier | modifier; -modifier : '/' modifierName +modifier : '/' modifierName | '/' modifierName comparitorSymbol modifierValue ; - + prefix : term; uri : term;