Skip to content

Commit

Permalink
Fix syntax errors on comparison & sorting queries
Browse files Browse the repository at this point in the history
  • Loading branch information
kriszyp committed Feb 9, 2010
1 parent bc58bf2 commit c4d0ac8
Showing 1 changed file with 6 additions and 6 deletions.
12 changes: 6 additions & 6 deletions lib/resource-query.js
Expand Up @@ -136,16 +136,16 @@ exports.executeQuery = function(query, options, target){
query = parseQuery(query, options && options.parameters); query = parseQuery(query, options && options.parameters);
} }
var functions = options.functions || exports.QueryFunctions.prototype; var functions = options.functions || exports.QueryFunctions.prototype;
var first = true; var inComparision = false;
var js = ""; var js = "";
query.forEach(function(term){ query.forEach(function(term){
if(term.type == "comparison"){ if(term.type == "comparison"){
if(!options){ if(!options){
throw new Error("Values must be set as parameters on the options argument, which was not provided"); throw new Error("Values must be set as parameters on the options argument, which was not provided");
} }
if(first){ if(!inComparision){
inComparision = true;
js += "target = target.filter(function(item){return "; js += "target = target.filter(function(item){return ";
first = false;
} }
else{ else{
js += term.logic + term.logic; js += term.logic + term.logic;
Expand All @@ -158,9 +158,9 @@ exports.executeQuery = function(query, options, target){


} }
else if(term.type == "call"){ else if(term.type == "call"){
if(!first){ if(inComparision){
js += "});"; js += "});";
first = false; inComparision = false;
} }
if(functions[term.name]){ if(functions[term.name]){
var index = (options.parameters = options.parameters || []).push(term.parameters); var index = (options.parameters = options.parameters || []).push(term.parameters);
Expand All @@ -174,7 +174,7 @@ exports.executeQuery = function(query, options, target){
throw new URIError("Invalid query syntax, unknown type"); throw new URIError("Invalid query syntax, unknown type");
} }
}); });
if(!first){ if(inComparision){
js += "});"; js += "});";
first = false; first = false;
} }
Expand Down

0 comments on commit c4d0ac8

Please sign in to comment.