Changeset 35036

Timestamp:

2021-04-06T00:15:44+12:00 (3 years ago)

Author:

davidb

Message:

Refinement of existing queries as well as expansion of queries

Location:

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

Files:

• draw-bias.xsl (added)
• got-nul-point-after-winning.xsl (added)
• got-nul-point.xsl (modified) (2 diffs)
• made-the-final.xsl (modified) (1 diff)
• voting-dataflow-jury.xsl (modified) (1 diff)
• voting-dataflow-tele.xsl (modified) (1 diff)

main/trunk/model-sites-dev/eurovision-lod/collect/eurovision/transform/dataviz/got-nul-point.xsl

@@ -27 +27 @@
 
         ?esc_entrant_uri gsdlextracted:Country ?country.
-        ?esc_entrant_uri gsdlextracted:Final "true".
+#        ?esc_entrant_uri gsdlextracted:Final "true".
 
         ?esc_entrant_uri gsdlextracted:VoteGrandTotal ?total.
@@ -46 +46 @@
 <!-- -->
 <xsl:text>
-title=Number times a Country received &quot;nul point&quot; in the final|legend.position=none|height=900|chartArea.height=840|fontSize=11
+title=Number times a Country received &quot;nul point&quot; in the final|legend.position=none|height=300|chartArea.height=240|fontSize=11
 </xsl:text>
         </div>
 
+        <div id="ssv-got-nul-point-div-style" style="display: none;">
+<!-- -->
+<xsl:text>
+width:600px; height:300px; margin-left: auto; margin-right: auto; overflow-y: hidden; overflow-x: hidden;  
+</xsl:text>
+
+    </div>
 
   </xsl:template>

main/trunk/model-sites-dev/eurovision-lod/collect/eurovision/transform/dataviz/made-the-final.xsl

@@ -17 +17 @@
 <xsl:text>
 PREFIX rdfs: &lt;http://www.w3.org/2000/01/rdf-schema#&gt;
+PREFIX xsd:  &lt;http://www.w3.org/2001/XMLSchema#&gt;
 PREFIX gsdlextracted: &lt;http://greenstone.org/gsdlextracted#&gt;
+
 SELECT (?country) (COUNT(?country) AS ?freqCount)        
 WHERE {
     GRAPH &lt;http://localhost:4040/greenstone/data/</xsl:text><xsl:value-of select="$collName"/><xsl:text>&gt;  {
-        ?s gsdlextracted:Country ?country.
-        ?s gsdlextracted:Final "true"
+        ?esc_entrant_uri gsdlextracted:Country ?country.
+#        ?esc_entrant_uri gsdlextracted:Final "true"
+
+        ?esc_entrant_uri gsdlextracted:VoteGrandTotal ?total.
+        BIND(xsd:integer(?total) AS ?total_int).
+        FILTER(?total_int >= 0).   
+    
    }
 }

main/trunk/model-sites-dev/eurovision-lod/collect/eurovision/transform/dataviz/voting-dataflow-jury.xsl

@@ -33 +33 @@
 
     ?esc_entrant_uri gsdlextracted:Year ?year
-      FILTER(xsd:integer(?year) > 2010 && xsd:integer(?year) <= 2019).    
+      FILTER(xsd:integer(?year) > **startyear** && xsd:integer(?year) <= **endyear**).    
     ?esc_entrant_uri gsdlextracted:Country ?country.
 

main/trunk/model-sites-dev/eurovision-lod/collect/eurovision/transform/dataviz/voting-dataflow-tele.xsl

@@ -33 +33 @@
 
     ?esc_entrant_uri gsdlextracted:Year ?year
-      FILTER(xsd:integer(?year) >= 2018 && xsd:integer(?year) <= 2019).    
+      FILTER(xsd:integer(?year) >= **startyear** && xsd:integer(?year) <= **endyear**).
     ?esc_entrant_uri gsdlextracted:Country ?country.