From e248fe5f83e6e6c62cf66281937014ce23558b2f Mon Sep 17 00:00:00 2001
From: booo <borgers@mi.fu-berlin.de>
Date: Fri, 28 Jan 2011 16:08:59 +0100
Subject: xml header

---
 src/nodejs/config.json     | 13 +++++++++----
 src/nodejs/main.js         |  1 +
 src/nodejs/response.js     |  4 ++--
 src/nodejs/xmlGenerator.js | 16 ++++++++++++++++
 4 files changed, 28 insertions(+), 6 deletions(-)

diff --git a/src/nodejs/config.json b/src/nodejs/config.json
index 92b4484..2ea4352 100644
--- a/src/nodejs/config.json
+++ b/src/nodejs/config.json
@@ -1,7 +1,12 @@
 {
-    "connectionString": "pg://user:password@host/database",
-    "host":  "localhost",
-    "port": 8080,
-    "logLevel": "ERROR"
+    "connectionString"  :   "pg://user:password@host/database",
+    "host"              :   "localhost",
+    "port"              :   8080,
+    "logLevel"          :   "ERROR",
+    "version"           :   0.6,
+    "copyright"         :   "2011 OpenStreetMap contributers",
+    "instance"          :   "node xapi",
+    "generator"         :   "xapi: OSM Extended API",
+    "namespace"         :   "http://localhost/xapi/0.6"
 }
 
diff --git a/src/nodejs/main.js b/src/nodejs/main.js
index f1197ea..e02d741 100644
--- a/src/nodejs/main.js
+++ b/src/nodejs/main.js
@@ -254,6 +254,7 @@ function getConfig(configPath, callback) {
 
 function init(newConfig) {
     config = newConfig;
+    xmlGenerator.config = config;
     log.setLevel(config.logLevel);
     log.info("server starting...");
     log.info("loaded config from " + configPath);
diff --git a/src/nodejs/response.js b/src/nodejs/response.js
index 45dcc89..764726a 100644
--- a/src/nodejs/response.js
+++ b/src/nodejs/response.js
@@ -35,7 +35,7 @@ exports.mkXmlRes = function (res){
     res.atStart = function (){ 
         if(!this.started){
             this.writeHead(200);
-            this.write('<xml>');
+            this.write(xmlGen.createHeader());
             this.started = true;
         }   
     }   
@@ -43,7 +43,7 @@ exports.mkXmlRes = function (res){
         if(!this.started){
             this.atStart(pojo);
         }   
-        this.write('</xml>');
+        this.write('</osm>');
         this.end();
     }   
     res.putWay = function (pojo){
diff --git a/src/nodejs/xmlGenerator.js b/src/nodejs/xmlGenerator.js
index 258cb18..91837d1 100644
--- a/src/nodejs/xmlGenerator.js
+++ b/src/nodejs/xmlGenerator.js
@@ -1,3 +1,5 @@
+var config;
+
 var builder = require('xmlbuilder');
 //set up logger
 var log4js = require('log4js')(); //note the need to call the function
@@ -48,3 +50,17 @@ exports.createWay = function (row) {
     return builder.toString({pretty:'true'});
 };
 
+//header for xml response with information about xapi instance...
+exports.createHeader = function createHeader() {
+    var header = "<?xml version='1.0' standalone='no'?>";
+    var tmp = builder.begin('osm')
+        .att('version',config.version)
+        .att('generator',config.generator)
+        .att('xmlns:xapi',config.namespace)
+        .att('xapi:uri','')
+        .att('xapi:planetDate','')
+        .att('xapi:copyright',config.copyright)
+        .att('xapi:instance',config.instance);
+    header = header + tmp.toString();
+    return header.substr(0,header.length-2) + " >";
+}
-- 
cgit v1.2.3


From 243fa3e0193b270deb1614bb0b7e0e8e62afc4ad Mon Sep 17 00:00:00 2001
From: booo <borgers@mi.fu-berlin.de>
Date: Fri, 28 Jan 2011 16:29:33 +0100
Subject: fixed xmlGenerator.js

---
 src/nodejs/xmlGenerator.js | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/src/nodejs/xmlGenerator.js b/src/nodejs/xmlGenerator.js
index 91837d1..a477457 100644
--- a/src/nodejs/xmlGenerator.js
+++ b/src/nodejs/xmlGenerator.js
@@ -54,13 +54,13 @@ exports.createWay = function (row) {
 exports.createHeader = function createHeader() {
     var header = "<?xml version='1.0' standalone='no'?>";
     var tmp = builder.begin('osm')
-        .att('version',config.version)
-        .att('generator',config.generator)
-        .att('xmlns:xapi',config.namespace)
+        .att('version',this.config.version)
+        .att('generator',this.config.generator)
+        .att('xmlns:xapi',this.config.namespace)
         .att('xapi:uri','')
         .att('xapi:planetDate','')
-        .att('xapi:copyright',config.copyright)
-        .att('xapi:instance',config.instance);
+        .att('xapi:copyright',this.config.copyright)
+        .att('xapi:instance',this.config.instance);
     header = header + tmp.toString();
     return header.substr(0,header.length-2) + " >";
 }
-- 
cgit v1.2.3