Changeset 13 for src/main/webapp/utilstable.xhtml

Timestamp:

04/28/20 14:43:48 (5 years ago)

Author:

bart

Message:

Enhanced tournament runner

File:

• src/main/webapp/utilstable.xhtml (modified) (3 diffs)

src/main/webapp/utilstable.xhtml

@@ -4 +4 @@
 <title>Show tournament results table</title>
 <link rel="stylesheet" type="text/css" href="style.css" />
-<script src="Chart.min_2.8.0.js"></script>
 </head>
 <style>
@@ -150 +149 @@
         /**
         This function returns immediately and will add the profile to the profiles dictionary some time later.
+        @param profurl the  profile URL may have ?partial filter.
         @param callwhendone function is called (without arguments) when profiles contains no pending anymore
         */
-        function getProfile(profileurl, callwhendone) {
-                profiles[profileurl]='pending';
-                
-                        var profileurl1 = profileurl; // idem but possibly without query
-                if (SHAOP) {
-                        profileurl1 = profileurl1.split('?',1)[0]; // hacky, remove complete query.
-                }
-
-                        setStatus("fetching profile "+profileurl1);
+        function getProfile(profurl, callwhendone) {
+                profiles[profurl]='pending'; // store ORIGINAL URL 
+                var     profileurl = profurl.split('?',1)[0]; // hacky, remove complete query.
+
+                        setStatus("fetching profile "+profileurl);
                         var ws;
             if ('WebSocket' in window) {
-                ws = new WebSocket(profileurl1);
+                ws = new WebSocket(profileurl);
             } else if ('MozWebSocket' in window) {
-                ws = new MozWebSocket(profileurl1);
+                ws = new MozWebSocket(profileurl);
             } else {
                 setStatus('Fatal: WebSocket is not supported by this browser. Please use a newer browser');
@@ -174 +170 @@
                 var profile = JSON.parse(event.data);
                 if (profile['LinearAdditiveUtilitySpace']==undefined) {
-                    setStatus('Fatal: profile '+uri+" does not contain a LinearAdditiveUtilitySpace.");
+                    setStatus('Fatal: profile '+profileurl+" does not contain a LinearAdditiveUtilitySpace.");
                     return;
                 }
 
-                profiles[profileurl]=profile['LinearAdditiveUtilitySpace'];
+                profiles[profurl]=profile['LinearAdditiveUtilitySpace'];
                 
                 checkAllProfiles(callwhendone);