projects
/
cql-java-moved-to-github.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Comment.
[cql-java-moved-to-github.git]
/
src
/
org
/
z3950
/
zing
/
cql
/
CQLParser.java
diff --git
a/src/org/z3950/zing/cql/CQLParser.java
b/src/org/z3950/zing/cql/CQLParser.java
index
85ee63b
..
da2af02
100644
(file)
--- a/
src/org/z3950/zing/cql/CQLParser.java
+++ b/
src/org/z3950/zing/cql/CQLParser.java
@@
-1,4
+1,4
@@
-// $Id: CQLParser.java,v 1.22 2002-11-20 01:15:15 mike Exp $
+// $Id: CQLParser.java,v 1.24 2007-06-06 12:22:01 mike Exp $
package org.z3950.zing.cql;
import java.io.IOException;
package org.z3950.zing.cql;
import java.io.IOException;
@@
-12,7
+12,7
@@
import java.io.FileNotFoundException;
/**
* Compiles CQL strings into parse trees of CQLNode subtypes.
*
/**
* Compiles CQL strings into parse trees of CQLNode subtypes.
*
- * @version $Id: CQLParser.java,v 1.22 2002-11-20 01:15:15 mike Exp $
+ * @version $Id: CQLParser.java,v 1.24 2007-06-06 12:22:01 mike Exp $
* @see <A href="http://zing.z3950.org/cql/index.html"
* >http://zing.z3950.org/cql/index.html</A>
*/
* @see <A href="http://zing.z3950.org/cql/index.html"
* >http://zing.z3950.org/cql/index.html</A>
*/
@@
-114,7
+114,9
@@
public class CQLParser {
break;
qualifier = word;
break;
qualifier = word;
- relation = new CQLRelation(lexer.render(lexer.ttype, false));
+ relation = new CQLRelation(lexer.ttype == lexer.TT_WORD ?
+ lexer.sval :
+ lexer.render(lexer.ttype, false));
match(lexer.ttype);
while (lexer.ttype == '/') {
match(lexer.ttype);
while (lexer.ttype == '/') {
@@
-122,9
+124,16
@@
public class CQLParser {
if (lexer.ttype != lexer.TT_RELEVANT &&
lexer.ttype != lexer.TT_FUZZY &&
lexer.ttype != lexer.TT_STEM &&
if (lexer.ttype != lexer.TT_RELEVANT &&
lexer.ttype != lexer.TT_FUZZY &&
lexer.ttype != lexer.TT_STEM &&
- lexer.ttype != lexer.TT_PHONETIC)
+ lexer.ttype != lexer.TT_PHONETIC &&
+ lexer.ttype != lexer.TT_WORD)
throw new CQLParseException("expected relation modifier, "
+ "got " + lexer.render());
throw new CQLParseException("expected relation modifier, "
+ "got " + lexer.render());
+ if (lexer.ttype == lexer.TT_WORD &&
+ lexer.sval.indexOf('.') == -1)
+ throw new CQLParseException("unknown first-class " +
+ "relation modifier: " +
+ lexer.sval);
+
relation.addModifier(lexer.sval.toLowerCase());
match(lexer.ttype);
}
relation.addModifier(lexer.sval.toLowerCase());
match(lexer.ttype);
}
@@
-216,14
+225,22
@@
public class CQLParser {
match(lexer.ttype);
}
match(lexer.ttype);
}
- private boolean isBaseRelation() {
+ private boolean isBaseRelation()
+ throws CQLParseException {
debug("isBaseRelation: checking ttype=" + lexer.ttype +
" (" + lexer.render() + ")");
debug("isBaseRelation: checking ttype=" + lexer.ttype +
" (" + lexer.render() + ")");
+
+ if (lexer.ttype == lexer.TT_WORD &&
+ lexer.sval.indexOf('.') == -1)
+ throw new CQLParseException("unknown first-class relation: " +
+ lexer.sval);
+
return (isProxRelation() ||
lexer.ttype == lexer.TT_ANY ||
lexer.ttype == lexer.TT_ALL ||
lexer.ttype == lexer.TT_EXACT ||
return (isProxRelation() ||
lexer.ttype == lexer.TT_ANY ||
lexer.ttype == lexer.TT_ALL ||
lexer.ttype == lexer.TT_EXACT ||
- lexer.ttype == lexer.TT_SCR);
+ lexer.ttype == lexer.TT_SCR ||
+ lexer.ttype == lexer.TT_WORD);
}
// Checks for a relation that may be used inside a prox operator
}
// Checks for a relation that may be used inside a prox operator
@@
-351,7
+368,7
@@
public class CQLParser {
char mode = 'x'; // x=XCQL, c=CQL, p=PQF
String pfile = null;
char mode = 'x'; // x=XCQL, c=CQL, p=PQF
String pfile = null;
- Vector argv = new Vector();
+ Vector<String> argv = new Vector<String>();
for (int i = 0; i < args.length; i++) {
argv.add(args[i]);
}
for (int i = 0; i < args.length; i++) {
argv.add(args[i]);
}