Changeset 35045


Ignore:
Timestamp:
2021-04-10T16:49:16+12:00 (3 years ago)
Author:
davidb
Message:

Fixed up missing js/css file; added in additions SPARQL example; general tweaking of text and improved formatting

Location:
main/trunk/model-sites-dev/eurovision-lod/collect/eurovision/transform/pages
Files:
3 edited

Legend:

Unmodified
Added
Removed

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

    r35044 r35045  
    523523
    524524        <p>
     525          Access to and the analysis of how countries have voted over the years
     526         
    525527          To fulfill our vision of developing this DL collection as a rich resource to
    526           through which to explore the phenonomon
     528          through which people can explore the phenonomon
    527529         
    528530        </p>

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

    r35042 r35045  
    1212    <!-- use the 'main' layout -->
    1313    <xsl:import href="layouts/main.xsl"/>
     14
    1415    <xsl:import href="dataviz/made-the-final.xsl"/>
     16    <xsl:import href="dataviz/list-of-winners.xsl"/>
    1517    <xsl:import href="dataviz/got-nul-point.xsl"/>
    1618    <xsl:import href="dataviz/got-nul-point-after-winning.xsl"/>
    … …  
    234236
    235237        <xsl:call-template name="ssv-made-the-final"/>
     238        <xsl:call-template name="ssv-list-of-winners"/>
    236239        <xsl:call-template name="ssv-got-nul-point"/>
    237240        <xsl:call-template name="ssv-got-nul-point-after-winning"/>
    … …  
    258261          </li>
    259262
     263          <li>
     264        List of Winners:<br/>
     265        <button type="button" class="load-ssq" id="load-ssv-list-of-winners" onclick="ssv_load('ssv-list-of-winners')">Load query above</button>
     266        <button type="button" class="exec-ssq" id="exec-ssv-list-of-winners" onclick="ssv_execute()">Visualize Tabulated Results</button><br/>
     267        The songs that have won through the ages.
     268          </li>
     269         
    260270          <li>
    261271        The ignominy of &quot;nul point&quot;:<br/>

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

    r35011 r35045  
    3838      <link rel="stylesheet" href="sites/{$site_name}/collect/{$collName}/style/fuseki.css" type="text/css" />
    3939      -->
     40      <gsf:script src="sites/{$site_name}/collect/{$collName}/js/jquery.show-more.js"/>
    4041      <gsf:script src="sites/{$site_name}/collect/{$collName}/js/eurovision.js"/>
    41 
     42      <gsf:script src="sites/{$site_name}/collect/{$collName}/js/dataviz.js"/>
     43
     44      <!--
    4245      <link rel="stylesheet" href="sites/{$site_name}/collect/{$collName}/css/eurovision.css" type="text/css" />
     46      -->
     47      <gsf:style src="sites/{$site_name}/collect/{$collName}/css/eurovision.css" />
     48      <gsf:style src="sites/{$site_name}/collect/{$collName}/css/dataviz.css" />
    4349      <style>
    44         div { padding-left: 12px; padding-right: 12px; padding-top: 6px; padding-bottom: 6px;}
    45         p { padding-bottom: 12px;}
    46         a { text-decoration: underline; }
    47         li { padding-bottom: 6px; }
     50        div          { padding-left: 12px; padding-right: 12px; padding-top: 6px; padding-bottom: 6px;}
     51        div.showmore { padding-left:  0px; padding-right:  0px; padding-top: 0px; padding-bottom: 0px;}
     52
     53        p  { padding-top: 6px; padding-bottom: 6px;}
     54        a  { text-decoration: underline; }
     55        li { padding-bottom: 6px; margin-bottom: 6px; }
    4856      </style>
    4957
    … …  
    7078        </p>
    7179
    72         <p>
    73           Alternatively, you might be interested in downloading the complete Triplestore in
    74           TriG syntax.  In which case,
    75           <a href="/greenstone3-lod3/greenstone/query" download="greenstone3-eurovision-lod.ttl">click here</a>
    76           to initiate the download.
    77         </p>
    78        
     80        <div id="sparql-show-more" class="showmore">
     81          <p>
     82        Alternatively, you might be interested in experimenting
     83        with forms of access to the triplestore through the more powerful, but complex:
     84        <ul>
     85          <li>
     86            <a target="_blank" href="https://so-we-must-think.space/greenstone3-lod3/dataset.html?tab=query&amp;ds=/greenstone">Fuseki interface</a>
     87          </li>
     88        </ul>
     89          </p>
     90          <p>
     91        Or else export the entire triplestore to work on it with whichever Linked Data tools are your preference:
     92        <ul>
     93          <li>
     94            <a href="/greenstone3-lod3/greenstone/data" download="greenstone3-eurovision-lod.trig">Full Export in TriG Syntax</a>
     95          </li>
     96          <li>
     97            <a href="/greenstone3-lod3/greenstone/data" download="greenstone3-eurovision-lod.ttl">Full Export in Turle Syntax</a>
     98          </li>
     99        </ul>
     100          </p>
     101         
     102        </div>
     103        <!-- show mroe -->
     104        <gsf:script>
     105          $('#sparql-show-more').showMore({
     106            minheight: 0,
     107        buttontxtmore:"show more ...",
     108        buttontxtless:"... show less"
     109          });
     110        </gsf:script>       
     111     
    79112      </div>     
    80 
    81113      <div>
    82114        <h2>SPARQL Query</h2>
    83 
     115        <!--
    84116        <p>
    85117          Dataset: /greenstone<br/>
    86118          Graph: eurovision
    87119        </p>
     120        -->
     121       
    88122      </div>
    89123
    90124      <div class="moreindent">
    91125        <form id="sample-sparql-query-form" action="/greenstone3-lod3/greenstone/query" target="_blank"
    92           method="GET" accept-charset="UTF-8">
     126          method="POST" accept-charset="UTF-8">
    93127
    94128              <textarea id="sample-sparql-query" name="query" style="width:100%; min-width:100%; max-width: 100%;" rows="14">
    … …  
    99133SELECT ?subject ?predicate ?object WHERE {
    100134  GRAPH &lt;http://localhost:4040/greenstone/data/</xsl:text><xsl:value-of select="$collName"/><xsl:text>&gt;  {
    101     ?subject ?predicate ?object
    102 
    103     # The following removed a triple that stores JSON data that
    104     # is voluminous but not very interesting to look at
    105     FILTER (?predicate != gsdlextracted:JSON).
     135    ?subject ?predicate ?object.
    106136  }
    107137}
    … …  
    166196SELECT ?subject ?predicate ?object WHERE {
    167197  GRAPH &lt;http://localhost:4040/greenstone/data/</xsl:text><xsl:value-of select="$collName"/><xsl:text>&gt;  {
    168     ?subject ?predicate ?object
    169 
    170     # The following removed a triple that stores JSON data that
     198    ?subject ?predicate ?object.
     199    ?subject gsdlextracted:Year "2000".   
     200  }
     201}
     202OFFSET 0 LIMIT 200
     203</xsl:text>
     204        </div>
     205
     206        <div id="ssq-restrict-year-then-filter" style="display: none;">
     207<!-- -->
     208<xsl:text>
     209PREFIX gsdlextracted: &lt;http://greenstone.org/gsdlextracted#&gt;
     210
     211SELECT ?subject ?predicate ?object WHERE {
     212  GRAPH &lt;http://localhost:4040/greenstone/data/</xsl:text><xsl:value-of select="$collName"/><xsl:text>&gt;  {
     213    ?subject ?predicate ?object.
     214    ?subject gsdlextracted:Year "2000".   
     215
     216    # The following removes a triple that stores JSON data that
    171217    # is voluminous but not very interesting to look at
    172218    FILTER (?predicate != gsdlextracted:JSON).
    173     ?subject gsdlextracted:Year "2000".   
    174219  }
    175220}
    … …  
    177222</xsl:text>
    178223        </div>
    179 
     224       
    180225
    181226        <div id="ssq-restrict-country-and-year" style="display: none;">
    … …  
    189234    ?subject ?predicate ?object
    190235
    191     # The following removed a triple that stores JSON data that
     236    # The following removes a triple that stores JSON data that
    192237    # is voluminous but not very interesting to look at
    193238    FILTER (?predicate != gsdlextracted:JSON).
    … …  
    406451        <ul class="ssq">
    407452          <li>
    408         Year Restricted (raw data rows):<br/>
     453        <b>Year Restricted (raw data rows):</b><br />
    409454        <button type="button" class="load-ssq" id="load-ssq-restrict-year" onclick="ssq_load('ssq-restrict-year')">Load query above</button>
    410         <button type="button" class="exec-ssq" id="exec-ssq-restrict-year" onclick="ssq_execute()">Get Results</button><br/>
    411         Similar to the default query (all results returned) but restricted to entries associated with the year 2000.
    412           </li>
    413 
    414           <li>
    415         Country and Year Restricted (raw data rows):<br/>
     455        <button type="button" class="exec-ssq" id="exec-ssq-restrict-year" onclick="ssq_execute()">Get Results</button><br />
     456        <p>Similar to the default query (all results returned) but restricted to entries associated with the year 2000.</p>
     457          </li>
     458
     459          <li>
     460        <b>Year Restricted (raw data rows) then filter out <i>gsdlextracted:JSON</i> entries:</b><br/>
     461        <button type="button" class="load-ssq" id="load-ssq-restrict-year-then-filter" onclick="ssq_load('ssq-restrict-year-then-filter')">Load query above</button>
     462        <button type="button" class="exec-ssq" id="exec-ssq-restrict-year-then-filter" onclick="ssq_execute()">Get Results</button><br/>
     463        <p>
     464          Similar to the previous query (restricted to results from 2000) but filtering out the voluminous, but not very interesting to look at,
     465          <i>gsdlextracted:JSON</i>.
     466        </p>
     467        <p>
     468          This field is formed by Greenstone at ingest-time: it represents all the metadata fields for a particular couuntry
     469          stored in the JSON format.  It is a handy item for the Greenstone3 runtime-system to access, but in the context of viewing the output
     470          of SPARQL queries at HTML only serves to pollute the generated result set with large text items.
     471        </p>
     472          </li>
     473         
     474          <li>
     475        <b>Country and Year Restricted (raw data rows):</b><br/>
    416476        <button type="button" class="load-ssq" id="load-ssq-restrict-country-and-year" onclick="ssq_load('ssq-restrict-country-and-year')">Load query above</button>
    417477        <button type="button" class="exec-ssq" id="exec-ssq-restrict-country-and-year" onclick="ssq_execute()">Get Results</button><br/>
    418478       
    419         Similar to the default query but restricted to entries about the country France, in the years 1996-2000.
    420           </li>
    421 
    422           <li>
    423         Eurovison Song Contest (ESC) entrants:<br/>
     479        <p>Similar to the previous query, but restricted to entries about the country France, in the years 1996-2000.</p>
     480          </li>
     481
     482          <li>
     483        <b>Eurovison Song Contest (ESC) entrants:</b><br/>
    424484        <button type="button" class="load-ssq" id="load-ssq-esc-entrants" onclick="ssq_load('ssq-esc-entrants')">Load query above</button>
    425485        <button type="button" class="exec-ssq" id="exec-ssq-esc-entrants" onclick="ssq_execute()">Get Results</button><br/>
    426486       
    427         List all the entrants (country and year) sorted by year, then by country.
    428           </li>
    429 
    430           <li>
    431         Voting Totals in 1975:<br/>
     487        <p>List all the entrants (country and year) sorted by year, then by country.</p>
     488          </li>
     489
     490          <li>
     491        <b>Voting Totals in 1975:</b><br/>
    432492        <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>
    433493        <button type="button" class="exec-ssq" id="exec-ssq-jury-votes-totals-1975" onclick="ssq_execute()">Get Results</button><br/>
    434494       
    435         In 1975 all voting was done exclusively by jury.  This query retrieves the
    436         totals of this Single voting format, and orders them by that score.
    437           </li>
    438          
    439           <li>
    440         Jury Votes Cast by Country in 1975:<br/>
     495        <p>In 1975 all voting was done exclusively by jury.  This query retrieves the
     496        totals of this Single voting format, and orders them by that score.</p>
     497          </li>
     498         
     499          <li>
     500        <b>Jury Votes Cast by Country in 1975:</b><br/>
    441501        <button type="button" class="load-ssq" id="load-ssq-jury-votes-1975" onclick="ssq_load('ssq-jury-votes-1975')">Load query above</button>
    442502        <button type="button" class="exec-ssq" id="exec-ssq-jury-votes-1975" onclick="ssq_execute()">Get Results</button><br/>
    443503       
    444         List all votes case in the 1975 competition.
    445           </li>
    446 
    447 
    448           <li>
    449         Most points won:<br/>
     504        <p>List all votes case in the 1975 competition.</p>
     505          </li>
     506
     507
     508          <li>
     509        <b>Most points won:</b><br/>
    450510        <button type="button" class="load-ssq" id="load-ssq-winning-totals" onclick="ssq_load('ssq-winning-totals')">Load query above</button>
    451511        <button type="button" class="exec-ssq" id="exec-ssq-winning-totals" onclick="ssq_execute()">Get Results</button><br/>
    452512       
    453         List the coutries which won and their voting totals, sorted by total score.
    454           </li>
    455 
    456           <li>
    457         Number of Times Countries Have Won:<br/>
     513        <p>List the coutries which won and their voting totals, sorted by total score.</p>
     514          </li>
     515
     516          <li>
     517        <b>Number of Times Countries Have Won:</b><br/>
    458518        <button type="button" class="load-ssq" id="load-ssq-winning-freq-count" onclick="ssq_load('ssq-winning-freq-count')">Load query above</button>
    459519        <button type="button" class="exec-ssq" id="exec-ssq-winning-freq-count" onclick="ssq_execute()">Get Results</button><br/>
    460520
    461         The number of times a country has won Eurovision across the years.  The includes
    462         the years when only Juries voted (1956-2000) through to the introduction
    463         of Televotes, where a variety of forms have been used such as only
    464         Televotes, a pre-combined score based on Televotes and Jury votes, to
    465         (from 2016 onwards) where the Jury and Tele votes are explicitly
    466         given individually per country, then combined.
    467           </li>
    468          
    469 
    470           <li>
    471         Facts and Figures About Competing Countries:<br/>
     521        <p>
     522          The number of times a country has won Eurovision across the years.  The includes
     523          the years when only Juries voted (1956-2000) through to the introduction
     524          of Televotes, where a variety of forms have been used such as only
     525          Televotes, a pre-combined score based on Televotes and Jury votes, to
     526          (from 2016 onwards) where the Jury and Tele votes are explicitly
     527          given individually per country, then combined.
     528        </p>
     529          </li>
     530         
     531
     532          <li>
     533        <b>Facts and Figures About Competing Countries:</b><br/>
    472534        <button type="button" class="load-ssq" id="load-ssq-country-info" onclick="ssq_load('ssq-country-info')">Load query above</button>
    473535        <button type="button" class="exec-ssq" id="exec-ssq-country-info" onclick="ssq_execute()">Get Results</button><br/>
    474536       
    475         Demographics about other related information about the countries the song constest entries are from.
     537        <p>Demographics about other related information about the countries the song constest entries are from.</p>
    476538          </li>
    477539         
Note: See TracChangeset for help on using the changeset viewer.