2.3.6 Fix html graph/report rendering bug

aigents · Apr 19, 2020 · 10bd77d · 10bd77d
1 parent bd068f0
commit 10bd77d
Show file tree

Hide file tree

Showing 5 changed files with 9 additions and 8 deletions.
diff --git a/html/index.html b/html/index.html
@@ -17,9 +17,9 @@
   <script type="text/javascript" src="/ui/aigents-speech.js?401"></script>
   <script type="text/javascript" src="/ui/aigents-locales.js?445"></script>
   <script type="text/javascript" src="/ui/aigents-graph.js?445"></script>
-  <script type="text/javascript" src="/ui/aigents-gui.js?447"></script>
+  <script type="text/javascript" src="/ui/aigents-gui.js?448"></script>
   <script type="text/javascript" src="/ui/aigents-map.js?457"></script>
-  <script type="text/javascript" src="/ui/aigents-wui.js?457"></script>
+  <script type="text/javascript" src="/ui/aigents-wui.js?458"></script>
   <meta property="og:title" content="Aigents for everyone"/>
   <meta property="og:description" content="Aigents - helping to monitor, extract, evaluate and share information on the Internet, adjusting to your needs and learning the preferences."/>
   <meta property="og:image" content="http://aigents.com/img/aigents-find-share.jpg"/>

diff --git a/html/ui/aigents-wui.js b/html/ui/aigents-wui.js
@@ -2173,9 +2173,10 @@ function talks_say_out(text) {
 function talks_say_in(text) {
 	if (text.substr(0,6) == "<html>") {
 		var title = AL.parseBetween(text,"<title>","</title>",true);
+		var body = AL.parseBetween(text,"<body>","</body>",true);
 		if (!title)
 			title = "Aigents Search Report";
-		popUpReport(title,text,true);//true - use jquery
+		popUpReport(title,body,true);//true - use jquery
 		text = "Ok.";//return;
 	}
 	displayStatus(text);

diff --git a/php/agent/test_api.php b/php/agent/test_api.php
@@ -25,7 +25,7 @@
 
 include_once("pest.php");
 
-$version = "2.3.4";
+$version = "2.3.5";
 $copyright = " Copyright © 2020 Anton Kolonin, Aigents®.";
 
 $baseURL = "http://localhost:1180/?";

diff --git a/src/main/java/net/webstructor/agent/Body.java b/src/main/java/net/webstructor/agent/Body.java
@@ -60,7 +60,7 @@
 public abstract class Body extends Anything implements Environment, Updater
 {
 	public final static String APPNAME = "Aigents";
-	public final static String VERSION = "2.3.4";
+	public final static String VERSION = "2.3.5";
 	public final static String COPYRIGHT = "Copyright © 2020 Anton Kolonin, Aigents®.";
 	public final static String ORIGINSITE = "https://aigents.com";
 

diff --git a/src/main/java/net/webstructor/util/Reporter.java b/src/main/java/net/webstructor/util/Reporter.java
@@ -146,10 +146,10 @@ public void graph(String id, String graph, String colors) {
 		try {
 			writer.append("<br><div id=\"wrapper_"+id+"\" style=\"width:100%;height:100%\"/>");
 			writer.append("<script>\n");
-			writer.append("var graph_text = \"");
+			writer.append("var graph_text_data = \"");
 			writer.append(graph);
 			writer.append("\";\n");
-			writer.append("GraphUI.request_graph_inline(\"svg_inline_"+id+"\", {text : graph_text, builder : function(text) {var config = {colors:{"+colors+"},labeled_links:true};return GraphCustom.build_graph(text,{weighted:true,linktypes:null},config);}}, \"svg_widgets_"+id+"\", document.getElementById(\"wrapper_"+id+"\"));\n");
+			writer.append("GraphUI.request_graph_inline(\"svg_inline_"+id+"\", {text : graph_text_data, builder : function(text) {var config = {colors:{"+colors+"},labeled_links:true};return GraphCustom.build_graph(text,{weighted:true,linktypes:null},config);}}, \"svg_widgets_"+id+"\", document.getElementById(\"wrapper_"+id+"\"));\n");
 			writer.append("</script><br>");
 		} catch (IOException e) {
             env.error("Reporter "+e.toString(),e);
@@ -387,7 +387,7 @@ public void closePeer(){
 
 	public void closeReport(){
 		try {
-			writer.append("<body><html>");
+			writer.append("</body></html>");
 			writer.close();
 		} catch (IOException e) {
             env.error(e.toString(),e);