Peter M. Groen / knowledgetree

Commit aec77e427a5fdcdd9549a3ed16ceb7ffba037371

Authored by Conrad Vermeulen
1 parent a76dea02

KTS-2417 

"the 'does contain' or 'does not contain' expression syntax does not work"
Fixed. There was a typo regarding the constant from phplemon.

Committed By: Conrad Vermeulen
Reviewed By: Kevin Fourie

git-svn-id: https://kt-dms.svn.sourceforge.net/svnroot/kt-dms/trunk@7278 c91229c3-7414-0410-bfa2-8a42b809f60b
Inline Side-by-side
Showing 2 changed files with 55 additions and 55 deletions
search2/search/SearchCommandParser.php
  View file @aec77e4
@@ -149,13 +149,13 @@ class SearchCommandParser#line 102 "SearchCommandParser.php" @@ -149,13 +149,13 @@ class SearchCommandParser#line 102 "SearchCommandParser.php"
149 const PAR_OPEN = 14; 149 const PAR_OPEN = 14;
150 const PAR_CLOSE = 15; 150 const PAR_CLOSE = 15;
151 const DOES = 16; 151 const DOES = 16;
152 - const COLON = 17;  
153 - const SQUARE_OPEN = 18;  
154 - const SQUARE_CLOSE = 19;  
155 - const TERMINAL = 20;  
156 - const VALUE = 21;  
157 - const COMMA = 22;  
158 - const CONTAINS = 23; 152 + const CONTAINS = 17;
  153 + const COLON = 18;
  154 + const SQUARE_OPEN = 19;
  155 + const SQUARE_CLOSE = 20;
  156 + const TERMINAL = 21;
  157 + const VALUE = 22;
  158 + const COMMA = 23;
159 const WITH = 24; 159 const WITH = 24;
160 const IS_NOT = 25; 160 const IS_NOT = 25;
161 const YY_NO_ACTION = 84; 161 const YY_NO_ACTION = 84;
@@ -214,70 +214,70 @@ class SearchCommandParser#line 102 "SearchCommandParser.php" @@ -214,70 +214,70 @@ class SearchCommandParser#line 102 "SearchCommandParser.php"
214 */ 214 */
215 const YY_SZ_ACTTAB = 70; 215 const YY_SZ_ACTTAB = 70;
216 static public $yy_action = array( 216 static public $yy_action = array(
217 - /* 0 */ 52, 15, 8, 7, 4, 23, 22, 37, 34, 54,  
218 - /* 10 */ 33, 3, 5, 16, 9, 2, 21, 83, 1, 13,  
219 - /* 20 */ 50, 32, 36, 3, 5, 44, 17, 26, 47, 1,  
220 - /* 30 */ 19, 39, 1, 41, 14, 46, 20, 1, 45, 38,  
221 - /* 40 */ 1, 6, 35, 10, 42, 27, 31, 12, 5, 24,  
222 - /* 50 */ 18, 53, 28, 52, 63, 63, 63, 30, 63, 63,  
223 - /* 60 */ 63, 49, 48, 29, 40, 43, 51, 63, 11, 25, 217 + /* 0 */ 52, 15, 3, 5, 39, 23, 22, 37, 34, 54,
  218 + /* 10 */ 33, 47, 4, 16, 50, 9, 44, 21, 83, 1,
  219 + /* 20 */ 8, 7, 36, 2, 3, 5, 6, 17, 13, 26,
  220 + /* 30 */ 32, 1, 35, 27, 19, 41, 1, 46, 14, 1,
  221 + /* 40 */ 20, 38, 45, 5, 1, 10, 12, 31, 42, 24,
  222 + /* 50 */ 53, 18, 28, 30, 52, 63, 49, 63, 63, 63,
  223 + /* 60 */ 63, 48, 29, 40, 63, 43, 51, 63, 11, 25,
224 ); 224 );
225 static public $yy_lookahead = array( 225 static public $yy_lookahead = array(
226 - /* 0 */ 3, 4, 6, 7, 3, 8, 9, 10, 11, 12,  
227 - /* 10 */ 13, 1, 2, 16, 17, 14, 27, 28, 29, 18,  
228 - /* 20 */ 23, 20, 25, 1, 2, 15, 14, 27, 33, 29,  
229 - /* 30 */ 27, 24, 29, 21, 30, 27, 32, 29, 27, 24,  
230 - /* 40 */ 29, 2, 19, 18, 15, 21, 19, 5, 2, 33,  
231 - /* 50 */ 22, 31, 31, 3, 34, 34, 34, 31, 34, 34,  
232 - /* 60 */ 34, 31, 31, 31, 31, 31, 31, 34, 32, 32, 226 + /* 0 */ 3, 4, 1, 2, 24, 8, 9, 10, 11, 12,
  227 + /* 10 */ 13, 33, 3, 16, 17, 18, 15, 27, 28, 29,
  228 + /* 20 */ 6, 7, 25, 14, 1, 2, 2, 14, 19, 27,
  229 + /* 30 */ 21, 29, 20, 22, 27, 22, 29, 27, 30, 29,
  230 + /* 40 */ 32, 24, 27, 2, 29, 19, 17, 20, 15, 33,
  231 + /* 50 */ 31, 23, 31, 31, 3, 34, 31, 34, 34, 34,
  232 + /* 60 */ 34, 31, 31, 31, 34, 31, 31, 34, 32, 32,
233 ); 233 );
234 - const YY_SHIFT_USE_DFLT = -5; 234 + const YY_SHIFT_USE_DFLT = -21;
235 const YY_SHIFT_MAX = 31; 235 const YY_SHIFT_MAX = 31;
236 static public $yy_shift_ofst = array( 236 static public $yy_shift_ofst = array(
237 - /* 0 */ 1, -3, 1, 1, 1, 1, 12, 12, 12, 12,  
238 - /* 10 */ 12, 12, 12, 12, 12, 50, 50, 24, 24, 10,  
239 - /* 20 */ -4, 22, 15, 7, 29, 42, 46, 28, 27, 39,  
240 - /* 30 */ 23, 25, 237 + /* 0 */ 9, -3, 9, 9, 9, 9, 13, 13, 13, 13,
  238 + /* 10 */ 13, 13, 13, 13, 13, 51, 51, 11, 11, 1,
  239 + /* 20 */ 14, 23, 17, -20, 33, 29, 41, 28, 27, 24,
  240 + /* 30 */ 12, 26,
241 ); 241 );
242 - const YY_REDUCE_USE_DFLT = -12; 242 + const YY_REDUCE_USE_DFLT = -23;
243 const YY_REDUCE_MAX = 18; 243 const YY_REDUCE_MAX = 18;
244 static public $yy_reduce_ofst = array( 244 static public $yy_reduce_ofst = array(
245 - /* 0 */ -11, 4, 3, 0, 8, 11, 31, 32, 33, 30,  
246 - /* 10 */ 26, 20, 35, 21, 34, 36, 37, 16, -5, 245 + /* 0 */ -10, 8, 7, 2, 10, 15, 30, 31, 32, 25,
  246 + /* 10 */ 22, 19, 35, 21, 34, 36, 37, 16, -22,
247 ); 247 );
248 static public $yyExpectedTokens = array( 248 static public $yyExpectedTokens = array(
249 - /* 0 */ array(3, 14, 18, 20, ),  
250 - /* 1 */ array(3, 4, 8, 9, 10, 11, 12, 13, 16, 17, 23, 25, ),  
251 - /* 2 */ array(3, 14, 18, 20, ),  
252 - /* 3 */ array(3, 14, 18, 20, ),  
253 - /* 4 */ array(3, 14, 18, 20, ),  
254 - /* 5 */ array(3, 14, 18, 20, ),  
255 - /* 6 */ array(14, 21, ),  
256 - /* 7 */ array(14, 21, ),  
257 - /* 8 */ array(14, 21, ),  
258 - /* 9 */ array(14, 21, ),  
259 - /* 10 */ array(14, 21, ),  
260 - /* 11 */ array(14, 21, ),  
261 - /* 12 */ array(14, 21, ),  
262 - /* 13 */ array(14, 21, ),  
263 - /* 14 */ array(14, 21, ), 249 + /* 0 */ array(3, 14, 19, 21, ),
  250 + /* 1 */ array(3, 4, 8, 9, 10, 11, 12, 13, 16, 17, 18, 25, ),
  251 + /* 2 */ array(3, 14, 19, 21, ),
  252 + /* 3 */ array(3, 14, 19, 21, ),
  253 + /* 4 */ array(3, 14, 19, 21, ),
  254 + /* 5 */ array(3, 14, 19, 21, ),
  255 + /* 6 */ array(14, 22, ),
  256 + /* 7 */ array(14, 22, ),
  257 + /* 8 */ array(14, 22, ),
  258 + /* 9 */ array(14, 22, ),
  259 + /* 10 */ array(14, 22, ),
  260 + /* 11 */ array(14, 22, ),
  261 + /* 12 */ array(14, 22, ),
  262 + /* 13 */ array(14, 22, ),
  263 + /* 14 */ array(14, 22, ),
264 /* 15 */ array(3, ), 264 /* 15 */ array(3, ),
265 /* 16 */ array(3, ), 265 /* 16 */ array(3, ),
266 - /* 17 */ array(21, ),  
267 - /* 18 */ array(21, ), 266 + /* 17 */ array(22, ),
  267 + /* 18 */ array(22, ),
268 /* 19 */ array(1, 2, 15, ), 268 /* 19 */ array(1, 2, 15, ),
269 /* 20 */ array(6, 7, ), 269 /* 20 */ array(6, 7, ),
270 /* 21 */ array(1, 2, ), 270 /* 21 */ array(1, 2, ),
271 /* 22 */ array(24, ), 271 /* 22 */ array(24, ),
272 /* 23 */ array(24, ), 272 /* 23 */ array(24, ),
273 /* 24 */ array(15, ), 273 /* 24 */ array(15, ),
274 - /* 25 */ array(5, ), 274 + /* 25 */ array(17, ),
275 /* 26 */ array(2, ), 275 /* 26 */ array(2, ),
276 - /* 27 */ array(22, ),  
277 - /* 28 */ array(19, ), 276 + /* 27 */ array(23, ),
  277 + /* 28 */ array(20, ),
278 /* 29 */ array(2, ), 278 /* 29 */ array(2, ),
279 - /* 30 */ array(19, ),  
280 - /* 31 */ array(18, ), 279 + /* 30 */ array(20, ),
  280 + /* 31 */ array(19, ),
281 /* 32 */ array(), 281 /* 32 */ array(),
282 /* 33 */ array(), 282 /* 33 */ array(),
283 /* 34 */ array(), 283 /* 34 */ array(),
@@ -415,8 +415,8 @@ static public $yy_action = array( @@ -415,8 +415,8 @@ static public $yy_action = array(
415 'IS', 'CONTAIN', 'LIKE', 'BETWEEN', 415 'IS', 'CONTAIN', 'LIKE', 'BETWEEN',
416 'START', 'END', 'GT', 'LE', 416 'START', 'END', 'GT', 'LE',
417 'LT', 'GE', 'PAR_OPEN', 'PAR_CLOSE', 417 'LT', 'GE', 'PAR_OPEN', 'PAR_CLOSE',
418 - 'DOES', 'COLON', 'SQUARE_OPEN', 'SQUARE_CLOSE',  
419 - 'TERMINAL', 'VALUE', 'COMMA', 'CONTAINS', 418 + 'DOES', 'CONTAINS', 'COLON', 'SQUARE_OPEN',
  419 + 'SQUARE_CLOSE', 'TERMINAL', 'VALUE', 'COMMA',
420 'WITH', 'IS_NOT', 'error', 'expr', 420 'WITH', 'IS_NOT', 'error', 'expr',
421 'cmdline', 'terminal', 'operator', 'value', 421 'cmdline', 'terminal', 'operator', 'value',
422 'notop', 'valuelist', 422 'notop', 'valuelist',
@@ -436,7 +436,7 @@ static public $yy_action = array( @@ -436,7 +436,7 @@ static public $yy_action = array(
436 /* 6 */ "expr ::= terminal notop BETWEEN value OPAND value", 436 /* 6 */ "expr ::= terminal notop BETWEEN value OPAND value",
437 /* 7 */ "expr ::= terminal notop LIKE value", 437 /* 7 */ "expr ::= terminal notop LIKE value",
438 /* 8 */ "expr ::= terminal IS notop value", 438 /* 8 */ "expr ::= terminal IS notop value",
439 - /* 9 */ "expr ::= terminal DOES notop CONTAIN value", 439 + /* 9 */ "expr ::= terminal DOES notop CONTAINS value",
440 /* 10 */ "expr ::= terminal COLON value", 440 /* 10 */ "expr ::= terminal COLON value",
441 /* 11 */ "notop ::=", 441 /* 11 */ "notop ::=",
442 /* 12 */ "notop ::= NOT", 442 /* 12 */ "notop ::= NOT",
search2/search/SearchCommandParser.y
  View file @aec77e4
@@ -112,7 +112,7 @@ expr(A) ::= terminal(B) IS notop(C) value(D). @@ -112,7 +112,7 @@ expr(A) ::= terminal(B) IS notop(C) value(D).
112 A=$expr; 112 A=$expr;
113 } 113 }
114 114
115 -expr(A) ::= terminal(B) DOES notop(C) CONTAIN value(D). 115 +expr(A) ::= terminal(B) DOES notop(C) CONTAINS value(D).
116 { 116 {
117 $expr = new OpExpr(B, ExprOp::CONTAINS, D); 117 $expr = new OpExpr(B, ExprOp::CONTAINS, D);
118 $expr->not(C); 118 $expr->not(C);