diff options
author | slomo <steve.harrison@gmx.net> | 2011-01-28 19:59:57 +0100 |
---|---|---|
committer | slomo <steve.harrison@gmx.net> | 2011-01-28 19:59:57 +0100 |
commit | 19a62867dda0885453c639e0efefd450721cfa72 (patch) | |
tree | f9db70ef688246dddff2c7189249c6b59e0344aa /src/nodejs/parse.js | |
parent | a5f78c6428089f756c45c7cb4101070af38e367a (diff) | |
download | osm-xapi-19a62867dda0885453c639e0efefd450721cfa72.tar.gz osm-xapi-19a62867dda0885453c639e0efefd450721cfa72.tar.xz osm-xapi-19a62867dda0885453c639e0efefd450721cfa72.zip |
parsing first try
Diffstat (limited to 'src/nodejs/parse.js')
-rw-r--r-- | src/nodejs/parse.js | 30 |
1 files changed, 21 insertions, 9 deletions
diff --git a/src/nodejs/parse.js b/src/nodejs/parse.js index 0338954..932f91f 100644 --- a/src/nodejs/parse.js +++ b/src/nodejs/parse.js @@ -5,14 +5,20 @@ exports.urlToXpathObj = function urlToXpathObj(url){ // filter no enough arguments var parseKeyList = function(string){ - result = /(.+)(:?\|(.+))/.exec(string); + + console.log("input f1: " + string); + result = /([^\|]*)/g.exec(string); + console.log(result); result.shift(); return result; } var parseBboxList = function(string){ - result = /(.+)(:?,(.+)){3}/.exec(string); + console.log("input: " + string); + result = /(.+),(.+),(.+),(.+)/.exec(string); + + console.log(result); if(result.length != 4){ throw "error"; @@ -30,19 +36,25 @@ exports.urlToXpathObj = function urlToXpathObj(url){ var xp = {}; - result = /\/(*|node|way|relation)(:?\[(.*)=(.*)\])*/.exec(url); + result = url.match(/\/(\*|node|way|relation)\[(.*)=(.*)\]*/); + console.log("OUTER: " + result); + xp.object=result[1]; for(i=2;i<=result.length;i++){ - if(result[i]==="bbox"){ - xp.bbox = parseBboxValues(result[i+1]); + if(result[i]==="bbox" && result[i]){ + xp.bbox = parseBboxList(result[i+1]); } else { - xp.tag ={}; - xp.tag.keys = parseKeyList(result[i]); - xp.tag.values = parseKeyList(result[i+1]); + if(result[i]){ + xp.tag ={}; + xp.tag.keys = parseKeyList(result[i]); + xp.tag.values = parseKeyList(result[i+1]); + } } i++; - } + } + console.log(xp); + return(xp); } |