From 07f72215b1aab33ddd67b143963876384c7c0508 Mon Sep 17 00:00:00 2001
From: Adrian Bowyer <reprappro@gmail.com>
Date: Sat, 4 May 2013 18:55:18 +0100
Subject: [PATCH] JSON requests now working, but with strange requirements...

---
 SD-image/www/reprap.htm  | 27 ++++++++++++---------------
 SD-image/www/reprap.htm~ | 27 ++++++++++++---------------
 Webserver.ino            | 12 ++++++------
 3 files changed, 30 insertions(+), 36 deletions(-)

diff --git a/SD-image/www/reprap.htm b/SD-image/www/reprap.htm
index 0196bc6..dba499f 100644
--- a/SD-image/www/reprap.htm
+++ b/SD-image/www/reprap.htm
@@ -50,7 +50,7 @@
 
 <a href="http://reprappro.com" target="_blank"><img src="logo.png" alt="RepRapPro logo" align="right"></a>
 
-<div style="font-size:20px">RepRap: <strong data-bind="text: machineName, click: $root.getName"></strong></div>
+<div style="font-size:20px">RepRap: <strong data-bind="text: machineName"></strong></div>
 
 <br clear = "all">
 
@@ -93,23 +93,20 @@ function RepRap()
     self.pages = ['Control', 'Print', 'Help', 'Settings', 'Messages', 'Logout'];
     self.chosenPageId = ko.observable();
     self.chosenPageData = ko.observable();
-    self.machineName = ko.observable('<click here>');
-    //var nameData = '{"myName":"RRR 5"}';
-    //var parsed;
+    self.machineName = ko.computed(
+	function() 
+	{
+		var n = ko.observable('r');
+		$.get('/rr_name', {}, n);
+		alert(n()); // Without this line it does not work...
+		return n().myName;
+    	}
+    );
+
     // Behaviours
     self.getName = function() 
     {
-	//alert(nameData);
-	//parsed = JSON.parse(nameData);
-	//alert(parsed.myName);
-	//$.getJSON('/rr_name', function(nameData) {
-	//	alert(nameData);
-    	//	parsed = JSON.parse(nameData);
-	//	self.machineName(parsed.myName);
-	//	});
-	
-   	$.get('/rr_name', { qual: 'null' }, self.machineName);
-	//alert(parsed.myName);
+   	$.get('/rr_name', {}, self.machineName);
     };
 
     self.goToPage = function(page) 
diff --git a/SD-image/www/reprap.htm~ b/SD-image/www/reprap.htm~
index 0196bc6..d2c5818 100644
--- a/SD-image/www/reprap.htm~
+++ b/SD-image/www/reprap.htm~
@@ -50,7 +50,7 @@
 
 <a href="http://reprappro.com" target="_blank"><img src="logo.png" alt="RepRapPro logo" align="right"></a>
 
-<div style="font-size:20px">RepRap: <strong data-bind="text: machineName, click: $root.getName"></strong></div>
+<div style="font-size:20px">RepRap: <strong data-bind="text: machineName"></strong></div>
 
 <br clear = "all">
 
@@ -93,23 +93,20 @@ function RepRap()
     self.pages = ['Control', 'Print', 'Help', 'Settings', 'Messages', 'Logout'];
     self.chosenPageId = ko.observable();
     self.chosenPageData = ko.observable();
-    self.machineName = ko.observable('<click here>');
-    //var nameData = '{"myName":"RRR 5"}';
-    //var parsed;
+    self.machineName = ko.computed(
+	function() 
+	{
+		var n = ko.observable('r');
+		$.get('/rr_name', {}, n);
+		alert(n());
+		return n().myName;
+    	}
+    );
+
     // Behaviours
     self.getName = function() 
     {
-	//alert(nameData);
-	//parsed = JSON.parse(nameData);
-	//alert(parsed.myName);
-	//$.getJSON('/rr_name', function(nameData) {
-	//	alert(nameData);
-    	//	parsed = JSON.parse(nameData);
-	//	self.machineName(parsed.myName);
-	//	});
-	
-   	$.get('/rr_name', { qual: 'null' }, self.machineName);
-	//alert(parsed.myName);
+   	$.get('/rr_name', {}, self.machineName);
     };
 
     self.goToPage = function(page) 
diff --git a/Webserver.ino b/Webserver.ino
index c733e34..a11a5f0 100644
--- a/Webserver.ino
+++ b/Webserver.ino
@@ -207,9 +207,9 @@ void Webserver::SendFile(char* nameOfFileToSend)
     writing = true;
   } 
   
-  if(jsonPointer >=0)
-    platform->SendToClient("HTTP/1.1 201 OK\n");
-  else
+  //if(jsonPointer >=0)
+  //  platform->SendToClient("HTTP/1.1 201 OK\n");
+  //else
     platform->SendToClient("HTTP/1.1 200 OK\n");
   
   platform->SendToClient("Content-Type: ");
@@ -347,9 +347,9 @@ void Webserver::ParseGetPost()
 //    Serial.print("HTTP request: ");
 //    Serial.println(clientLine);
   
-    //platform->Message(HOST_MESSAGE, "HTTP request: ");
-    //platform->Message(HOST_MESSAGE, clientLine);
-    //platform->Message(HOST_MESSAGE, "<br>\n");
+    platform->Message(HOST_MESSAGE, "HTTP request: ");
+    platform->Message(HOST_MESSAGE, clientLine);
+    platform->Message(HOST_MESSAGE, "<br>\n");
     
     int i = 5;
     int j = 0;