2 files changed, 15 insertions, 21 deletions

diff --git a/src/nodejs/no1.js b/src/nodejs/no1.js
index edb7110..1b71766 100644
--- a/src/nodejs/no1.js
+++ b/src/nodejs/no1.js
@@ -1,11 +1,7 @@
-
 var clutch = require('clutch');
 var pg = require('pg');
 var builder = require('xmlbuilder');
 
-
-
-
 // load config
 var config = require('./config.json');
 process.argv.forEach(
@@ -20,8 +16,6 @@ process.argv.forEach(
         });
 var connectionString = config['connectionString'];
 
-
-
 //set up logger
 var log4js = require('log4js')(); //note the need to call the function
 //log4js.addAppender(log4js.fileAppender('osm-xapi.log'), 'cheese');
@@ -75,8 +69,8 @@ function nodeWorldHandler(req, res, key, value) {
 }
 function nodeBboxHandler(req, res, key, value, left, bottom, right, top) {
 	console.log("nodeBboxHandler");
-	db_connect(res, function() {
- 			//console.log(createNodeBboxQuery(key, value, left, bottom, right, top));
+	db_connect(res, function(client) {
+ 			console.log(createNodeBboxQuery(key, value, left, bottom, right, top));
 			var success = false;
 			var query = client.query(createNodeBboxQuery(key, value, left, bottom, right, top));
 
@@ -91,7 +85,7 @@ function nodeBboxHandler(req, res, key, value, left, bottom, right, top) {
 				//console.log("end event\n");
 				if(success) {
 					res.write("</xml>");
-    				res.end();
+      				res.end();
 				}
 				else {
 					//empty response
@@ -147,13 +141,14 @@ function db_connect(res, callback) {
 			res.writeHead(404,{});
 			res.end();
 		} else {
-			callback();
+      		console.log("db connection was successfull");
+			callback(client);
 		}
 	});
 }
 
 function wayBboxHandler(req, res, key, value, left, bottom, right, top) {
-	db_connect(res, function() {
+	db_connect(res, function(client) {
            	var count = 0;
 			var success = false;
 			//console.log(createWayBboxQuery(key, value, left, bottom, right, top));
diff --git a/src/nodejs/package.json b/src/nodejs/package.json
index 3ff8b8b..cbe341f 100644
--- a/src/nodejs/package.json
+++ b/src/nodejs/package.json
@@ -1,12 +1,11 @@
-{ 'name' : 'xapi-osm-spline'
-, 'version' : '0.0.1'
-, 'description' : 'An osm xapi implementation'
-, 'autor' : 'osm@spline <osm@lists.spline.de> (http://osm.spline.de)'
-, 'files' : ['.']
-, 'dependencies' :
-  { 'pg' : '*'
-  , 'clutch' : '*'
-  , 'xmlbuilder' : '*'
-  , 'log4js' : '*'
+{ "name" : "xapi-osm-spline"
+, "version" : "0.0.1"
+, "description" : "An osm xapi implementation"
+, "autor" : "osm@spline <osm@lists.spline.de> (http://osm.spline.de)"
+, "files" : ["."]
+, "dependencies" :
+  { "pg" : "*"
+  , "clutch" : "*"
+  , "xmlbuilder" : "*"
   }
 }