X-Git-Url: http://jsfdemo.indexdata.com/?a=blobdiff_plain;f=src%2Forg%2Fz3950%2Fzing%2Fcql%2FCQLParser.java;h=da2af02dc0fe657c26a07a99ee9cf2ac28619eb3;hb=f3c88fe15ee06a671407a0368e449db991526802;hp=85ee63ba22abc249985f7dab27f939e5f79b8ed2;hpb=f744abfa23a7e569a156e4686e0e8e3cec242652;p=cql-java-moved-to-github.git

diff --git a/src/org/z3950/zing/cql/CQLParser.java b/src/org/z3950/zing/cql/CQLParser.java
index 85ee63b..da2af02 100644
--- 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;
@@ -12,7 +12,7 @@ import java.io.FileNotFoundException;
 /**
  * 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>
  */
@@ -114,7 +114,9 @@ public class CQLParser {
 		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 == '/') {
@@ -122,9 +124,16 @@ public class CQLParser {
 		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());
+		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);
 	    }
@@ -216,14 +225,22 @@ public class CQLParser {
 	match(lexer.ttype);
     }
 
-    private boolean isBaseRelation() {
+    private boolean isBaseRelation()
+	throws CQLParseException {
 	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 ||
-		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
@@ -351,7 +368,7 @@ public class CQLParser {
 	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]);
 	}