Support lt and gt integer comparisons
Change-Id: If17b7da35f43ecb9c3c69cb91f404cdc21db5392
diff --git a/dev/js/spec/vcSpec.js b/dev/js/spec/vcSpec.js
index 656a827..78a186e 100644
--- a/dev/js/spec/vcSpec.js
+++ b/dev/js/spec/vcSpec.js
@@ -401,6 +401,7 @@
});
expect(doc.toQuery()).toEqual('pubDate in 2014');
+ // Checks for integer values
doc = integerFactory.create();
expect(doc.toQuery()).toEqual('KED.nToks = 200');
@@ -421,7 +422,18 @@
});
expect(doc.toQuery()).toEqual('KED.nToks <= 100');
- // Check for numeric values
+ doc = integerFactory.create({
+ value : "100",
+ match : "match:gt"
+ });
+ expect(doc.toQuery()).toEqual('KED.nToks > 100');
+
+ doc = integerFactory.create({
+ value : "100",
+ match : "match:lt"
+ });
+ expect(doc.toQuery()).toEqual('KED.nToks < 100');
+
doc = integerFactory.create({
value : 100,
});
diff --git a/dev/js/src/vc.js b/dev/js/src/vc.js
index 9d91a62..25e1d97 100644
--- a/dev/js/src/vc.js
+++ b/dev/js/src/vc.js
@@ -74,7 +74,7 @@
KorAP._validUnspecMatchRE = new RegExp(
"^(?:eq|ne|contains(?:not)?|excludes)$");
KorAP._validStringMatchRE = new RegExp("^(?:eq|ne)$");
- KorAP._validIntegerMatchRE = new RegExp("^(?:[gl]?eq|ne)$");
+ KorAP._validIntegerMatchRE = new RegExp("^(?:[gl]?eq|ne|[gl]t)$");
KorAP._validTextMatchRE = KorAP._validUnspecMatchRE;
KorAP._validTextOnlyMatchRE = new RegExp(
"^(?:contains(?:not)?|excludes)$");
@@ -117,7 +117,9 @@
[ 'eq', null ],
[ 'ne', null ],
[ 'geq', null ],
- [ 'leq', null ]
+ [ 'leq', null ],
+ [ 'gt', null ],
+ [ 'lt', null ]
])
};
diff --git a/dev/js/src/vc/doc.js b/dev/js/src/vc/doc.js
index d504642..8202fb5 100644
--- a/dev/js/src/vc/doc.js
+++ b/dev/js/src/vc/doc.js
@@ -715,7 +715,13 @@
case "leq":
string += (this.type() == 'date') ? 'until' : '<=';
break;
- default:
+ case "lt":
+ string += '<';
+ break;
+ case "gt":
+ string += '>';
+ break;
+ default:
string += (this.type() == 'date') ? 'in' : '=';
break;
};