From: Paul J R <me@pjr.cc>
Date: Mon, 16 Nov 2009 17:30:29 +0000 (+1100)
Subject: ok, web post is now working through javascript
X-Git-Url: http://git.pjr.cc/?p=goDBhammer.git;a=commitdiff_plain;h=72f8f5c4eea74b9148fea41006fdc6db181fb86c

ok, web post is now working through javascript
---

diff --git a/src/web/index.html b/src/web/index.html
index a772842..b8b1b4a 100644
--- a/src/web/index.html
+++ b/src/web/index.html
@@ -10,6 +10,11 @@
 <script type="text/javascript">
 
 function doDBSetPost() {
+	$(".submitbody").toggle(false);
+	$(".setupbody").toggle(false);
+	$(".beginbody").toggle(false);
+	$(".reportbody").toggle(false);
+	$(".loadingbody").toggle(true);
 $(function() {
 	var frm = $(document.dbsetsform);
 	var dat = JSON.stringify(frm.serializeArray());
@@ -18,7 +23,7 @@ $(function() {
             frm.attr("action"),
             dat,
             function(data) {
-              alert("Response: " + data);
+              //alert("Response: " + data);
             }
           );
         });
@@ -59,12 +64,12 @@ setTimeout('bollocks()', 2000);
 <form method="post" action="/json" name="dbsetsform">
 <table>
 <tr><td>Database Type</td><td><input type="text" name="dbtype"></td></tr>
-<tr><td>Database Host</td><td><input type="text" name="dbtype"></td></tr>
-<tr><td>Database Username</td><td><input type="text" name="dbtype"></td></tr>
-<tr><td>Database Password</td><td><input type="text" name="dbtype"></td></tr>
-<tr><td>Database</td><td><input type="text" name="dbtype"></td></tr>
-<tr><td>Data Multiplier</td><td><input type="text" name="dbtype"></td></tr>
-<tr><td>Number of Clients</td><td><input type="text" name="dbtype"></td></tr>
+<tr><td>Database Host</td><td><input type="text" name="dbhost"></td></tr>
+<tr><td>Database Username</td><td><input type="text" name="dbuser"></td></tr>
+<tr><td>Database Password</td><td><input type="text" name="dbpass"></td></tr>
+<tr><td>Database</td><td><input type="text" name="dbname"></td></tr>
+<tr><td>Data Multiplier</td><td><input type="text" name="datamult"></td></tr>
+<tr><td>Number of Clients</td><td><input type="text" name="nclients"></td></tr>
 </table>
 <input type="submit" name="Go" value="Go" onClick="doDBSetPost(); return false">
 </form>
diff --git a/src/webconnector.go b/src/webconnector.go
index 127d168..3216db3 100644
--- a/src/webconnector.go
+++ b/src/webconnector.go
@@ -22,13 +22,15 @@ var comin chan string;
 var cominstatus chan string;
 var comout chan string;
 
+var stat int;
+
 func JSONResponder(c *http.Conn, req *http.Request)
 {
 	//stat := <- cominstatus;
 	
 	if(req.Method == "GET") {
 	
-		j, _, _ := json.StringToJson("{\"status\":1, \"complete\":90}");
+		j, _, _ := json.StringToJson(fmt.Sprintf("{\"status\":%d, \"complete\":90}", stat));
 		
 		io.WriteString(c, fmt.Sprintf("%s\n", json.JsonToString(j)));
 		fmt.Printf("i got a get\n");
@@ -37,7 +39,8 @@ func JSONResponder(c *http.Conn, req *http.Request)
 		lp := make([]byte, 1048576);
 		req.Body.Read(lp);
 		fmt.Printf("i got a post...%s\n", (string)(lp));
-		http.Redirect(c, "/", 301);
+		//http.Redirect(c, "/", 301);
+		stat = 2;
 	}
 	
 }
@@ -59,6 +62,7 @@ func main()
 	cominstatus = make(chan string);
 	comout = make(chan string);
 	
+	stat = 1;
 	
 	bc := benchcontroller.CreateController();
 	go benchcontroller.MainLoop(bc, comout, comin, cominstatus);