fix format

Adhidarma Hadiwinoto
1 parent 408d15fe30
Showing 2 changed files with 33 additions and 4 deletions Side-by-side Diff
httpserver.js
package.json
@@ -13,13 +13,40 @@ var httpServer;
 var config;
 var logger;
  
-function formatData(data, format) {
-    if (format == 'xml') {
-        return js2xmlparser('stock', data);
+
+function toArrayOfObject(obj) {
+    var arr = [];
+    
+    var chips = Object.getOwnPropertyNames(obj);
+    var chipsCount = chips.length;
+    
+    for (var i = 0; i < chipsCount; i++) {
+        data = {
+            'name': chips[i],
+            'stock': obj[chips[i]],
+        }
+        
+        arr.push(data);
     }
+    return arr;
+}
+
+function formatDataAsHtml(data) {
     return JSON.stringify(data);
 }
  
+function formatData(_data, format) {
+    data = toArrayOfObject(_data);
+    if (format == 'xml') {
+        return js2xmlparser('chips', {chip: data});
+    }
+    else if (format == 'json') {
+        return JSON.stringify(data);
+    }
+    
+    return formatDataAsHtml(data);
+}
+
 function getStockKeyForDenom(denom) {
     return 'stock.dompul.by-denom.' + denom;
 }
@@ -26,6 +26,8 @@
     "iniparser": "~1.0.5",
     "winston": "~1.0.0",
     "node-simple-router": "~0.9.4-2",
-    "js2xmlparser": "~0.1.9"
+    "js2xmlparser": "~0.1.9",
+    "xml": "~1.0.0",
+    "xmlbuilder": "~2.6.2"
   }
 }
...	...	@@ -13,13 +13,40 @@ var httpServer;
13	13	var config;
14	14	var logger;
15	15
16		-function formatData(data, format) {
17		- if (format == 'xml') {
18		- return js2xmlparser('stock', data);
	16	+
	17	+function toArrayOfObject(obj) {
	18	+ var arr = [];
	19	+
	20	+ var chips = Object.getOwnPropertyNames(obj);
	21	+ var chipsCount = chips.length;
	22	+
	23	+ for (var i = 0; i < chipsCount; i++) {
	24	+ data = {
	25	+ 'name': chips[i],
	26	+ 'stock': obj[chips[i]],
	27	+ }
	28	+
	29	+ arr.push(data);
19	30	}
	31	+ return arr;
	32	+}
	33	+
	34	+function formatDataAsHtml(data) {
20	35	return JSON.stringify(data);
21	36	}
22	37
	38	+function formatData(_data, format) {
	39	+ data = toArrayOfObject(_data);
	40	+ if (format == 'xml') {
	41	+ return js2xmlparser('chips', {chip: data});
	42	+ }
	43	+ else if (format == 'json') {
	44	+ return JSON.stringify(data);
	45	+ }
	46	+
	47	+ return formatDataAsHtml(data);
	48	+}
	49	+
23	50	function getStockKeyForDenom(denom) {
24	51	return 'stock.dompul.by-denom.' + denom;
25	52	}
...	...	@@ -26,6 +26,8 @@
26	26	"iniparser": "~1.0.5",
27	27	"winston": "~1.0.0",
28	28	"node-simple-router": "~0.9.4-2",
29		- "js2xmlparser": "~0.1.9"
	29	+ "js2xmlparser": "~0.1.9",
	30	+ "xml": "~1.0.0",
	31	+ "xmlbuilder": "~2.6.2"
30	32	}
31	33	}