putting try/catch around whole XML parsing

mncaudill · Oct 20, 2011 · 3bef5e9 · 3bef5e9
1 parent 6a4aa2e
commit 3bef5e9
Show file tree

Hide file tree

Showing 2 changed files with 24 additions and 24 deletions.
diff --git a/flickr-conduit.js b/flickr-conduit.js
@@ -76,30 +76,30 @@ var parseFlickrPost = function(content, callback) {
     var xml = new xml2js.Parser();
     var imgObjs = [];
     xml.on('end', function(data) {
-        // We possibly get multiple entries per POST
-        var entries = Array.isArray(data.entry) ? data.entry : [data.entry];
-
-        var imgData = null;
-        var photoUrl= null;
-        for (var i in entries) {
-            try {
-                imgData = entries[i]['media:content']['@'];
-
-                // Dumb, but there's a bug in the xml2js that messes up on the <link> tab. (Or I'm missing something.)
-                var id = entries[i]['id'].split(':')[2].split('/')[2];
-                photoUrl = entries[i].author.uri.replace("http://www.flickr.com/people/", 'http://www.flickr.com/photos/');
-                photoUrl += id + '/';
-
-                imgObjs.push({
-                    url: imgData.url,
-                    width: imgData.width,
-                    height: imgData.height,
-                    link: photoUrl,
-                    raw: entries[i],
-                });
-            } catch (e) {
-                // Noop
+        try {
+            // We possibly get multiple entries per POST
+            var entries = Array.isArray(data.entry) ? data.entry : [data.entry];
+
+            var imgData = null;
+            var photoUrl= null;
+            for (var i in entries) {
+                    imgData = entries[i]['media:content']['@'];
+
+                    // Dumb, but there's a bug in the xml2js that messes up on the <link> tab. (Or I'm missing something.)
+                    var id = entries[i]['id'].split(':')[2].split('/')[2];
+                    photoUrl = entries[i].author.uri.replace("http://www.flickr.com/people/", 'http://www.flickr.com/photos/');
+                    photoUrl += id + '/';
+
+                    imgObjs.push({
+                        url: imgData.url,
+                        width: imgData.width,
+                        height: imgData.height,
+                        link: photoUrl,
+                        raw: entries[i],
+                    });
             }
+        } catch (e) {
+            // Noop
         }
         callback(imgObjs);
     });

diff --git a/package.json b/package.json
@@ -2,7 +2,7 @@
   "author": "Nolan Caudill <nolan@nolancaudill.com> (http://nolancaudill.com)",
   "name": "flickr-conduit",
   "description": "A subscriber endpoint for Flickr's real-time PuSH feed",
-  "version": "0.1.3",
+  "version": "0.1.4",
   "homepage": "https://github.com/mncaudill/flickr-conduit",
   "repository": {
     "type": "git",