From 5546247d3406daf3b9ad19e59ebb113e06cb2425 Mon Sep 17 00:00:00 2001
From: Glenn Jones
Date: Thu, 31 Jan 2013 11:08:36 +0000
Subject: [PATCH] Fixed example server querystring issue
---
bin/microformat-node | 42 +++++++++++++++++++++++++++++-------------
lib/logger.js | 3 +--
lib/parser.js | 2 +-
static/index.html | 3 ++-
4 files changed, 33 insertions(+), 17 deletions(-)
diff --git a/bin/microformat-node b/bin/microformat-node
index ea7ec65..03e42fe 100755
--- a/bin/microformat-node
+++ b/bin/microformat-node
@@ -41,6 +41,7 @@ function handler(req, res) {
// return json uf
}else{
+ // set for direct url entry
var options = {
'baseurl': '',
'useCache': false,
@@ -51,6 +52,15 @@ function handler(req, res) {
'filters': [],
'textFormat': 'normalised'
};
+
+ // set for form entry - radio button not giving a =false
+ if(query.testform){
+ options.useCache = false;
+ options.version1 = false;
+ options.children = false;
+ options.childrenRel = false;
+ options.rel = false;
+ }
if(query.baseurl){
options.baseUrl = query.baseurl;
@@ -72,17 +82,26 @@ function handler(req, res) {
options.filters = out;
}
- options.useCache = (query.usecache === 'true')? true : false;
- options.version1 = (query.version1 === 'true')? true : false;
- options.children = (query.children === 'true')? true : false;
- options.childrenRel = (query.childrenrel === 'true')? true : false;
- options.rel = (query.rel === 'true')? true : false;
- if(!query.usecache){options.useCache = false};
- if(!query.version1){options.version1 = false};
- if(!query.children){options.children = false};
- if(!query.childrenrel){options.childrenRel = false};
- if(!query.rel){options.rel = false};
+ if(query.usecache){
+ options.useCache = (query.usecache === 'true')? true : false;
+ }
+
+ if(query.version1){
+ options.version1 = (query.version1 === 'true')? true : false;
+ }
+
+ if(query.children){
+ options.children = (query.children === 'true')? true : false;
+ }
+
+ if(query.childrenrel){
+ options.childrenRel = (query.childrenrel === 'true')? true : false;
+ }
+
+ if(query.rel){
+ options.rel = (query.rel === 'true')? true : false;
+ }
if(query.textformat){
options.textFormat = query.textformat;
@@ -123,9 +142,6 @@ function handler(req, res) {
}
- function setOptionTrueFalse(query, name, option){
- option = (query[name] === 'true')? true : false
- }
function writeHTML(path){
diff --git a/lib/logger.js b/lib/logger.js
index b167ebb..06f2353 100644
--- a/lib/logger.js
+++ b/lib/logger.js
@@ -59,5 +59,4 @@ exports.log = log;
exports.info = info;
exports.warn = warn;
exports.error = error;
-exports.setLogLevel = setLogLevel;
-
+exports.setLogLevel = setLogLevel;
\ No newline at end of file
diff --git a/lib/parser.js b/lib/parser.js
index 3672a58..3bd5d73 100644
--- a/lib/parser.js
+++ b/lib/parser.js
@@ -74,7 +74,7 @@ function parseUrl(url, options, callback) {
returnData([{'error': err + ' - ' + url}], out, callback, deferred, logger);
}
}
- return deferred.promise;
+ //return deferred.promise;
}
diff --git a/static/index.html b/static/index.html
index 1c59240..de69d79 100644
--- a/static/index.html
+++ b/static/index.html
@@ -12,6 +12,7 @@ microformat-node (version 2)
-
+