Blob Blame History Raw
commit 48d89889fe4293bc91ea1b89d6ce725bd2c4cbbc
Author: Tom Hughes <tom@compton.nu>
Date:   Sun Feb 10 20:46:12 2013 +0000

    Update to use v0.2.x of xml2js

diff --git a/bin/mml2json.js b/bin/mml2json.js
index 1291a35..dd25389 100755
--- a/bin/mml2json.js
+++ b/bin/mml2json.js
@@ -25,8 +25,8 @@ fs.readFile(process.argv[2], 'utf-8', function(err, data) {
     });
 
     function addAttributes(obj) {
-        if (obj['@']) for (var key in obj['@']) obj[key] = obj['@'][key];
-        delete obj['@'];
+        if (obj['$']) for (var key in obj['$']) obj[key] = obj['$'][key];
+        delete obj['$'];
         return obj;
     }
     
@@ -35,7 +35,10 @@ fs.readFile(process.argv[2], 'utf-8', function(err, data) {
         else return obj;
     }
 
-    var parser = new xml2js.Parser();
+    var parser = new xml2js.Parser({
+        explicitRoot: false,
+        explicitArray: false
+    });
     parser.addListener('end', function(json) {
         console.log(JSON.stringify(json, function(key, value) {
             if (!key) {
@@ -52,7 +55,7 @@ fs.readFile(process.argv[2], 'utf-8', function(err, data) {
             else if (key === 'Datasource') {
                 value = addAttributes(value);
                 value.Parameter.forEach(function(parameter) {
-                    value[parameter['@'].name] = parameter['#'];
+                    value[parameter['$'].name] = parameter['_'];
                 });
                 delete value.Parameter;
                 return value;
diff --git a/package.json b/package.json
index 5b63d71..5f81688 100644
--- a/package.json
+++ b/package.json
@@ -37,7 +37,7 @@
   "dependencies": {
     "underscore": "~1.3.3",
     "mapnik-reference": "~5.0.0",
-    "xml2js": "~0.1.13"
+    "xml2js": "~0.2.4"
   },
   "devDependencies": {
     "mocha": "1.3.x",