Skip to content

Commit a5f79e6

Browse files
committed
Support lt and gt integer comparisons
Change-Id: If17b7da35f43ecb9c3c69cb91f404cdc21db5392
1 parent 5d4f2e4 commit a5f79e6

File tree

3 files changed

+24
-4
lines changed

3 files changed

+24
-4
lines changed

dev/js/spec/vcSpec.js

Lines changed: 13 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -401,6 +401,7 @@ define([
401401
});
402402
expect(doc.toQuery()).toEqual('pubDate in 2014');
403403

404+
// Checks for integer values
404405
doc = integerFactory.create();
405406
expect(doc.toQuery()).toEqual('KED.nToks = 200');
406407

@@ -421,7 +422,18 @@ define([
421422
});
422423
expect(doc.toQuery()).toEqual('KED.nToks <= 100');
423424

424-
// Check for numeric values
425+
doc = integerFactory.create({
426+
value : "100",
427+
match : "match:gt"
428+
});
429+
expect(doc.toQuery()).toEqual('KED.nToks > 100');
430+
431+
doc = integerFactory.create({
432+
value : "100",
433+
match : "match:lt"
434+
});
435+
expect(doc.toQuery()).toEqual('KED.nToks < 100');
436+
425437
doc = integerFactory.create({
426438
value : 100,
427439
});

dev/js/src/vc.js

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -74,7 +74,7 @@ define([
7474
KorAP._validUnspecMatchRE = new RegExp(
7575
"^(?:eq|ne|contains(?:not)?|excludes)$");
7676
KorAP._validStringMatchRE = new RegExp("^(?:eq|ne)$");
77-
KorAP._validIntegerMatchRE = new RegExp("^(?:[gl]?eq|ne)$");
77+
KorAP._validIntegerMatchRE = new RegExp("^(?:[gl]?eq|ne|[gl]t)$");
7878
KorAP._validTextMatchRE = KorAP._validUnspecMatchRE;
7979
KorAP._validTextOnlyMatchRE = new RegExp(
8080
"^(?:contains(?:not)?|excludes)$");
@@ -117,7 +117,9 @@ define([
117117
[ 'eq', null ],
118118
[ 'ne', null ],
119119
[ 'geq', null ],
120-
[ 'leq', null ]
120+
[ 'leq', null ],
121+
[ 'gt', null ],
122+
[ 'lt', null ]
121123
])
122124
};
123125

dev/js/src/vc/doc.js

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -715,7 +715,13 @@ define([
715715
case "leq":
716716
string += (this.type() == 'date') ? 'until' : '<=';
717717
break;
718-
default:
718+
case "lt":
719+
string += '<';
720+
break;
721+
case "gt":
722+
string += '>';
723+
break;
724+
default:
719725
string += (this.type() == 'date') ? 'in' : '=';
720726
break;
721727
};

0 commit comments

Comments
 (0)