the identifiers of web socket return data now include the argument list

KSP-Telemachus · Feb 24, 2014 · c94f3eb · c94f3eb
1 parent 0f43092
commit c94f3eb
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/Telemachus/src/KSPWebSocketService.cs b/Telemachus/src/KSPWebSocketService.cs
@@ -73,15 +73,15 @@ private void streamData(object sender, ElapsedEventArgs e)
 
                             foreach (string s in toRun)
                             {
-                                string refArg = s.Trim().Substring(1, s.Length - 2);
+                                string trimedQuotes = s.Trim().Substring(1, s.Length - 2);
+                                string refArg = trimedQuotes;
                                 kspAPI.parseParams(ref refArg, ref dataSources);
 
                                 kspAPI.process(refArg, out entry);
 
                                 if (entry != null)
                                 {
-                                    entry.formatter.setVarName(entry.APIString);
-
+                                    entry.formatter.setVarName(trimedQuotes);
                                     entries.Add(entry.formatter.format(entry.function(dataSources)));
                                 }
                             }

diff --git a/WebPages/WebPagesTest/src/websockets-telemachus.html b/WebPages/WebPagesTest/src/websockets-telemachus.html
@@ -71,7 +71,7 @@
     }
 
     function doStringifyTest() {
-        doSend(JSON.stringify({ "+":["v.altitude","n.roll","b.name[1]", "f.throttle"], "rate":100 }));
+        doSend(JSON.stringify({ "+": ["v.altitude", "n.roll", "b.name[1]", "r.resource[LiquidFuel]", "f.throttle"], "rate": 100 }));
     }
 
     function doComplexTest()