Changeset 34960 for main/trunk/model-sites-dev/eurovision-lod/collect/eurovision/transform

Timestamp:

2021-03-09T23:30:43+13:00 (3 years ago)

Author:

davidb

Message:

Changes associated with adding in Combined and Single Voting totals; adjustments to DL based on Terhi's feedback

Location:

main/trunk/model-sites-dev/eurovision-lod/collect/eurovision/transform/pages

Files:

• document.xsl (modified) (1 diff)
• sparql.xsl (modified) (6 diffs)

main/trunk/model-sites-dev/eurovision-lod/collect/eurovision/transform/pages/document.xsl

@@ -191 +191 @@
 
     <div id="to-country-votes">
+      <gsf:switch>
+    <gsf:metadata name='FinishingPos'/>
+    <gsf:when test='exists'>
+      <h2>
+        Overall Final Postion: <gsf:metadata name='FinishingPos'/>
+      </h2>
+    </gsf:when>
+      </gsf:switch>
+      
       <gsf:script>
     append_to_country_votes("Jury Votes","JuryVotesJSON","JuryVotesTotal");
     append_to_country_votes("Televotes","TeleVotesJSON","TeleVotesTotal");
+
+    append_to_country_votes("Combined Jury &amp; Tele Votes","CombVotesJSON","CombVotesTotal");
+    append_to_country_votes("Voting Exclusively by Jury","SingVotesJSON","SingVotesTotal");
       </gsf:script>
 

main/trunk/model-sites-dev/eurovision-lod/collect/eurovision/transform/pages/sparql.xsl

@@ -103 +103 @@
           </textarea>
           
-          <div style="display:none;">
+          <div style="displayXXXX:none;">
         <div>
           Output:
@@ -229 +229 @@
     ?esc_entrant_uri dc:Relation.isPartOf &lt;http://127.0.0.1:8383/greenstone3/library/collection/eurovision&gt;.
 
-    ?esc_entrant_uri gsextracted:JuryVotesTotal ?total.
+    ?esc_entrant_uri gsextracted:SingVotesTotal ?total.
     BIND(xsd:integer(?total) AS ?total_int).
     
@@ -268 +268 @@
 </xsl:text>
         </div>
+
+
+        <div id="ssq-winning-totals" style="display: none;">
+<!-- -->
+<xsl:text>
+PREFIX gsextracted: &lt;http://greenstone.org/gsextracted#&gt;
+PREFIX xsd: &lt;http://www.w3.org/2001/XMLSchema#&gt;
+PREFIX dc: &lt;http://purl.org/dc/elements/1.1/&gt;
+
+
+SELECT ?year ?country ?total_max WHERE {
+  GRAPH &lt;http://localhost:3030/greenstone/data/eurovision&gt;  {
+
+    { 
+      SELECT ?year (STR(MAX(?total_int_inner)) as ?total_max) WHERE {
+      
+        ?esc_entrant_uri gsextracted:VoteGrandTotal ?total.
+        BIND(xsd:integer(?total) AS ?total_int_inner).
+    
+        ?esc_entrant_uri gsextracted:Year ?year.
+      }
+      GROUP BY ?year
+     }
+
+    ?esc_entrant_uri gsextracted:VoteGrandTotal ?total_max.    
+    ?esc_entrant_uri gsextracted:Year ?year.
+    ?esc_entrant_uri gsextracted:Country ?country.
+
+    BIND(xsd:integer(?total_max) as ?total_int).    
+  }
+}
+ORDER BY DESC(?total_int)
+</xsl:text>
+        </div>
+
+
+        <div id="ssq-winning-freq-count" style="display: none;">
+<!-- -->
+<xsl:text>
+
+PREFIX gsextracted: &lt;http://greenstone.org/gsextracted#&gt;
+PREFIX xsd: &lt;http://www.w3.org/2001/XMLSchema#&gt;
+PREFIX dc: &lt;http://purl.org/dc/elements/1.1/&gt;
+
+
+SELECT ?country (STR(COUNT(?country)) as ?number_of_vote_wins) WHERE {
+  GRAPH &lt;http://localhost:3030/greenstone/data/eurovision&gt;  {
+
+
+    { 
+      SELECT ?year (STR(MAX(?total_int)) as ?total_max) WHERE {
+
+      
+        ?esc_entrant_uri gsextracted:VoteGrandTotal ?total.
+        BIND(xsd:integer(?total) AS ?total_int).
+    
+        ?esc_entrant_uri gsextracted:Year ?year.
+      }
+      GROUP BY ?year
+    }
+
+    ?esc_entrant_uri gsextracted:VoteGrandTotal ?total_max.    
+    ?esc_entrant_uri gsextracted:Year ?year.
+    ?esc_entrant_uri gsextracted:Country ?country.    
+  }
+}
+GROUP BY ?country
+ORDER BY DESC(?number_of_vote_wins)
+</xsl:text>
+        </div>
+
+
 
 
@@ -350 +422 @@
 
           <li>
-        Jury Voting Totals in 1975:<br/>
+        Voting Totals in 1975:<br/>
         <button type="button" class="load-ssq" id="load-ssq-jury-votes-totals-1975" onclick="ssq_load('ssq-jury-votes-totals-1975')">Load query above</button>
         <button type="button" class="exec-ssq" id="exec-ssq-jury-votes-totals-1975" onclick="ssq_execute()">Get Results</button><br/>
         
-        The jury vote totals countries received in 1975, ranked to score.
+        In 1975 all voting was done exclusively by jury.  This query retrieves the
+        totals of this Single voting format, and orders them by that score.
           </li>
           
@@ -365 +438 @@
           </li>
 
+
+          <li>
+        Most points won:<br/>
+        <button type="button" class="load-ssq" id="load-ssq-winning-totals" onclick="ssq_load('ssq-winning-totals')">Load query above</button>
+        <button type="button" class="exec-ssq" id="exec-ssq-winning-totals" onclick="ssq_execute()">Get Results</button><br/>
+        
+        List the coutries which won and their voting totals, sorted by total score.
+          </li>
+
+          <li>
+        Number of Times Countries Have Won:<br/>
+        <button type="button" class="load-ssq" id="load-ssq-winning-freq-count" onclick="ssq_load('ssq-winning-freq-count')">Load query above</button>
+        <button type="button" class="exec-ssq" id="exec-ssq-winning-freq-count" onclick="ssq_execute()">Get Results</button><br/>
+
+        The number of times a country has won Eurovision across the years.  The includes
+        the years when only Juries voted (1956-2000) through to the introduction
+        of Televotes, where a variety of forms have been used such as only
+        Televotes, a pre-combined score based on Televotes and Jury votes, to
+        (from 2016 onwards) where the Jury and Tele votes are explicitly
+        given individually per country, then combined.
+          </li>
+          
+
           <li>
         Facts and Figures About Competing Countries:<br/>
@@ -374 +470 @@
           
         </ul>
+
+        <p>
+          Looking for something a bit more visual?  Why not head over to our 
+          <a href="{$library_name}/collection/{$collName}/page/sgvizler"><i>SGVizler page</i></a> and try the SPARQL-based visualization samples there.
+        </p>
         
       </div>