Skip to content

uri encoded query strings fail to find converters #22

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

uri encoded query strings fail to find converters #22

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 5 additions & 5 deletions parser.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -179,6 +179,7 @@ exports.commonOperatorMap = {
"gt" : ">"
}
function stringToValue(string, parameters){
string = decodeURIComponent(string);
var converter = exports.converters['default'];
if(string.charAt(0) === "$"){
var param_index = parseInt(string.substring(1)) - 1;
Expand Down Expand Up @@ -215,7 +216,6 @@ exports.converters = {
if (isoDate) {
date = new Date(Date.UTC(+isoDate[1], +isoDate[2] - 1, +isoDate[3], +isoDate[4], +isoDate[5], +isoDate[6], +isoDate[7] || 0));
}*/
string = decodeURIComponent(string);
if(exports.jsonQueryCompatible){
if(string.charAt(0) == "'" && string.charAt(string.length-1) == "'"){
return JSON.parse('"' + string.substring(1,string.length-1) + '"');
Expand Down Expand Up @@ -263,16 +263,16 @@ exports.converters = {
return x === "true";
},
string: function(string){
return decodeURIComponent(string);
return string;
},
re: function(x){
return new RegExp(decodeURIComponent(x), 'i');
return new RegExp(x, 'i');
},
RE: function(x){
return new RegExp(decodeURIComponent(x));
return new RegExp(x);
},
glob: function(x){
var s = decodeURIComponent(x).replace(/([\\|\||\(|\)|\[|\{|\^|\$|\*|\+|\?|\.|\<|\>])/g, function(x){return '\\'+x;}).replace(/\\\*/g,'.*').replace(/\\\?/g,'.?');
var s = x.replace(/([\\|\||\(|\)|\[|\{|\^|\$|\*|\+|\?|\.|\<|\>])/g, function(x){return '\\'+x;}).replace(/\\\*/g,'.*').replace(/\\\?/g,'.?');
if (s.substring(0,2) !== '.*') s = '^'+s; else s = s.substring(2);
if (s.substring(s.length-2) !== '.*') s = s+'$'; else s = s.substring(0, s.length-2);
return new RegExp(s, 'i');
Expand Down
3 changes: 3 additions & 0 deletions test/query.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -121,6 +121,9 @@ define(function (require) {
{ name: 'or', args: [{ name: 'eq', args: [ 'a', 'b' ]}, { name: 'eq', args: [ 'c', 'd' ]}]},
{ name: 'or', args: [{ name: 'eq', args: [ 'e', 'f' ]}, { name: 'eq', args: [ 'g', 1 ]}]}
]}
},
'uri encoding': {
'a(number%3A1)': {name: 'and', args: [{ name: 'a', args: [ 1 ]}]}
}
},
testParsing = (function () {
Expand Down