From 2d51582284a3837866e1e004ad124e93ec380624 Mon Sep 17 00:00:00 2001
From: Jan Michel <j.michel@gsi.de>
Date: Wed, 2 Jul 2014 18:04:51 +0200
Subject: [PATCH] fixed long delay after loading xml-db pages

---
 web/htdocs/commands/xmlpage.pm   | 15 +++++----------
 web/htdocs/scripts/scriptsnew.js |  2 +-
 web/htdocs/scripts/xmlpage.js    | 25 +++++++++++++++++--------
 3 files changed, 23 insertions(+), 19 deletions(-)

diff --git a/web/htdocs/commands/xmlpage.pm b/web/htdocs/commands/xmlpage.pm
index bb09b22..02dd199 100644
--- a/web/htdocs/commands/xmlpage.pm
+++ b/web/htdocs/commands/xmlpage.pm
@@ -115,18 +115,13 @@ sub printJavaScripts {
   var currentpage = $active;
   var Timeoutvar;
   
-  
-  if(period != -1) {
-    Timeoutvar = setTimeout("refresh(0)",400);
-    }
-  else {
-    Timeoutvar = setTimeout("refresh(-1)",400);
-    }
+
+  setTimeout('eatCookies()',100);
+//   setTimeout('document.getElementById("period").value = period;',300);
   setTimeout('document.getElementById("content").addEventListener("click",editsetting,0)',400);
-  setTimeout('document.getElementById("period").value = period;',300);
+
   
-  setTimeout('eatCookies()',100);
-</script>
+  </script>
 |;
 }
 
diff --git a/web/htdocs/scripts/scriptsnew.js b/web/htdocs/scripts/scriptsnew.js
index 814f76b..8339f49 100644
--- a/web/htdocs/scripts/scriptsnew.js
+++ b/web/htdocs/scripts/scriptsnew.js
@@ -22,7 +22,7 @@ function getdataprint(command,dId,async,time,callback) {
   //async==false : do the task after you finished the previous task!
   
   // super duper debug line!
-//   alert("caller is " + arguments.callee.caller.toString());
+  // alert("caller is " + arguments.callee.caller.toString());
   
   var xmlhttp = null;
   var cb = null;
diff --git a/web/htdocs/scripts/xmlpage.js b/web/htdocs/scripts/xmlpage.js
index 83accc1..683cba8 100644
--- a/web/htdocs/scripts/xmlpage.js
+++ b/web/htdocs/scripts/xmlpage.js
@@ -19,6 +19,7 @@
     }
     
   function refresh(time = 0) {
+//     alert(time);
     if(time == -1) {  //call immediately and only once
       getdataprint(GETCOMMAND+'?'+command,'content',false,0);
       }
@@ -40,10 +41,10 @@
     else if (period < 100) {
       period = 1000;
       document.getElementById("period").value = period;
-      refresh(period);
+      if(e != -1) {refresh(period);}
       }
     else {
-      refresh(period);
+      if(e != -1) {refresh(period);}
       }
     makeCookies();
    
@@ -65,7 +66,7 @@
          }
       }
       
-    refresh(period);
+    if(e != -1) {refresh(period);}
     makeCookies();
   
     }
@@ -88,8 +89,8 @@
          var part = com[i].split('-');
          command += part[0]+"-"+address+"-"+part[2] + "-" + part[3] + "&";
          }
-      }    
-    refresh(period);
+      }
+    if(e != -1) {refresh(period);}
     makeCookies();
     }
 
@@ -129,9 +130,17 @@
     if (t != "" && document.getElementById("rate")) {
       document.getElementById("rate").checked = (t=="true")?true:false;
       }      
-    setperiod();
-    settarget();
-    setaddress();
+    setperiod(-1);
+    settarget(-1);
+    setaddress(-1);
+  
+    if(period != -1) {
+      Timeoutvar = setTimeout("refresh(0)",400);
+      }
+    else {
+      Timeoutvar = setTimeout("refresh(-1)",400);
+      }
+        
     }
  
 /*From w3schools.com*/ 
-- 
2.43.0