-// $Id: CQLLexer.java,v 1.10 2007-06-28 00:00:31 mike Exp $
+// $Id: CQLLexer.java,v 1.14 2007-07-03 13:30:42 mike Exp $
package org.z3950.zing.cql;
import java.io.StreamTokenizer;
static int TT_LE = 1000; // The "<=" relation
static int TT_GE = 1001; // The ">=" relation
static int TT_NE = 1002; // The "<>" relation
- static int TT_AND = 1003; // The "and" boolean
- static int TT_OR = 1004; // The "or" boolean
- static int TT_NOT = 1005; // The "not" boolean
- static int TT_PROX = 1006; // The "prox" boolean
- static int TT_pWORD = 1010; // The "word" proximity unit
- static int TT_SENTENCE = 1011; // The "sentence" proximity unit
- static int TT_PARAGRAPH = 1012; // The "paragraph" proximity unit
- static int TT_ELEMENT = 1013; // The "element" proximity unit
- static int TT_ORDERED = 1014; // The "ordered" proximity ordering
- static int TT_UNORDERED = 1015; // The "unordered" proximity ordering
+ static int TT_EQEQ = 1003; // The "==" relation
+ static int TT_AND = 1004; // The "and" boolean
+ static int TT_OR = 1005; // The "or" boolean
+ static int TT_NOT = 1006; // The "not" boolean
+ static int TT_PROX = 1007; // The "prox" boolean
+ static int TT_SORTBY = 1008; // The "sortby" operator
// Support for keywords. It would be nice to compile this linear
// list into a Hashtable, but it's hard to store ints as hash
new Keyword(TT_OR, "or"),
new Keyword(TT_NOT, "not"),
new Keyword(TT_PROX, "prox"),
- new Keyword(TT_pWORD, "word"),
- new Keyword(TT_SENTENCE, "sentence"),
- new Keyword(TT_PARAGRAPH, "paragraph"),
- new Keyword(TT_ELEMENT, "element"),
- new Keyword(TT_ORDERED, "ordered"),
- new Keyword(TT_UNORDERED, "unordered"),
+ new Keyword(TT_SORTBY, "sortby"),
};
// For halfDecentPushBack() and the code at the top of nextToken()
ttype = '>';
debug("AFTER: ttype is now " + ttype + " - " + render());
}
+ } else if (ttype == '=') {
+ debug("token starts with '=' ...");
+ underlyingNextToken();
+ if (ttype == '=') {
+ debug("token continues with '=' - it's '=='");
+ ttype = TT_EQEQ;
+ } else {
+ debug("next token is " + render() + " (pushed back)");
+ halfDecentPushBack();
+ ttype = '=';
+ debug("AFTER: ttype is now " + ttype + " - " + render());
+ }
}
debug("done nextToken(): ttype=" + ttype + ", " +
return ">=";
} else if (token == TT_NE) {
return "<>";
+ } else if (token == TT_EQEQ) {
+ return "==";
}
// Check whether its associated with one of the keywords