Changeset 34752

Timestamp:

2021-01-30T00:28:17+13:00 (3 years ago)

Author:

davidb

Message:

Further refinements as number of errata entries (dealing with both song and entrant being strings) grows

Location:

main/trunk/model-sites-dev/eurovision-lod/collect/eurovision/prepare

Files:

• eurovision-errata.ttl (modified) (2 diffs)
• fix-problem-songs-and-entrants--using-errata.sparql (modified) (2 diffs)
• problem-entrants.html (modified) (7 diffs)
• problem-entrants.sparql (modified) (1 diff)
• problem-songs-and-entrants.html (added)
• problem-songs-and-entrants.sparql (added)
• problem-songs.html (modified) (4 diffs)
• problem-songs.sparql (modified) (1 diff)

main/trunk/model-sites-dev/eurovision-lod/collect/eurovision/prepare/eurovision-errata.ttl

@@ -80 +80 @@
 dbr:Germany_in_the_Eurovision_Song_Contest_1956    dct:source     "& \"So Geht Das Jede Nacht"@en.
 dbr:So_geht_das_jede_Nacht                         dct:source     "& \"So Geht Das Jede Nacht"@en.
-dbr:Germany_in_the_Eurovision_Song_Contest_1956    dbp:entrant      dbr:Freddy_Quinn.
-dbr:Germany_in_the_Eurovision_Song_Contest_1956    dct:source       "& Freddy Quinn"@en.
-dbr:Freddy_Quinn                                   dct:source       "& Freddy Quinn"@en.
+dbr:Germany_in_the_Eurovision_Song_Contest_1956      dbp:entrant      dbr:Freddy_Quinn.
+dbr:Germany_in_the_Eurovision_Song_Contest_1956      dct:source       "& Freddy Quinn"@en.
+dbr:Freddy_Quinn                                     dct:source       "& Freddy Quinn"@en.
 
 
@@ -88 +88 @@
 dbr:Ireland_in_the_Eurovision_Song_Contest_1965    dct:source     "I'm Walking the Streets in the Rain"@en.
 dbr:Walking_the_Streets_in_the_Rain                dct:source     "I'm Walking the Streets in the Rain"@en.
-dbr:Ireland_in_the_Eurovision_Song_Contest_1965    dbp:entrant      dbr:Butch_Moore.
-dbr:Ireland_in_the_Eurovision_Song_Contest_1965    dct:source       "Butch Moore"@en.
-dbr:Butch_Moore                                    dct:source       "Butch Moore"@en.
+dbr:Ireland_in_the_Eurovision_Song_Contest_1965      dbp:entrant      dbr:Butch_Moore.
+dbr:Ireland_in_the_Eurovision_Song_Contest_1965      dct:source       "Butch Moore"@en.
+dbr:Butch_Moore                                      dct:source       "Butch Moore"@en.
+
+dbr:Ireland_in_the_Eurovision_Song_Contest_1966    dbp:song       dbr:Come_Back_to_Stay.
+dbr:Ireland_in_the_Eurovision_Song_Contest_1966    dct:source     "Come Back to Stay"@en.
+dbr:Come_Back_to_Stay                              dct:source     "Come Back to Stay"@en.
+dbr:Ireland_in_the_Eurovision_Song_Contest_1966      dbp:entrant      dbr:Dickie_Rock.
+dbr:Ireland_in_the_Eurovision_Song_Contest_1966      dct:source       "Dickie Rock"@en.
+dbr:Dickie_Rock                                      dct:source       "Dickie Rock"@en.
+
+dbr:Ireland_in_the_Eurovision_Song_Contest_1967    dbp:song       dbr:If_I_Could_Choose.
+dbr:Ireland_in_the_Eurovision_Song_Contest_1967    dct:source     "If I Could Choose"@en.
+dbr:If_I_Could_Choose                              dct:source     "If I Could Choose"@en.
+dbr:Ireland_in_the_Eurovision_Song_Contest_1967      dbp:entrant      dbr:Sean_Dunphy.
+dbr:Ireland_in_the_Eurovision_Song_Contest_1967      dct:source       "Sean Dunphy"@en.
+dbr:Sean_Dunphy                                      dct:source       "Sean Dunphy"@en.
+
+dbr:Ireland_in_the_Eurovision_Song_Contest_1968    dbp:song       dbr:Chance_of_a_Lifetime_\(Pat_McGeegan_song\).
+dbr:Ireland_in_the_Eurovision_Song_Contest_1968    dct:source     "Chance of a Lifetime"@en.
+dbr:Chance_of_a_Lifetime_\(Pat_McGeegan_song\)     dct:source     "Chance of a Lifetime"@en.
+dbr:Ireland_in_the_Eurovision_Song_Contest_1968      dbp:entrant      dbr:Pat_McGuigan.
+dbr:Ireland_in_the_Eurovision_Song_Contest_1968      dct:source       "Pat McGeegan"@en.
+dbr:Pat_McGuigan                                     dct:source       "Pat McGeegan"@en.
+
+
+dbr:Ireland_in_the_Eurovision_Song_Contest_1969    dbp:song       dbr:The_Wages_of_Love.
+dbr:Ireland_in_the_Eurovision_Song_Contest_1969    dct:source     "The Wages of Love"@en.
+dbr:The_Wages_of_Love                              dct:source     "The Wages of Love"@en.
+dbr:Ireland_in_the_Eurovision_Song_Contest_1969      dbp:entrant      dbr:Muriel_Day.
+dbr:Ireland_in_the_Eurovision_Song_Contest_1969      dct:source       "Muriel Day"@en.
+dbr:Muriel_Day                                       dct:source       "Muriel Day"@en.
+
+
+dbr:Yugoslavia_in_the_Eurovision_Song_Contest_1982    dbp:song       dbr:Halo\,_Halo.
+dbr:Yugoslavia_in_the_Eurovision_Song_Contest_1982    dct:source     "Halo, halo"@en.
+dbr:Halo\,_Halo                                        dct:source     "Halo, halo"@en.
+dbr:Yugoslavia_in_the_Eurovision_Song_Contest_1982      dbp:entrant      dbr:Aska_\(group\).
+dbr:Yugoslavia_in_the_Eurovision_Song_Contest_1982      dct:source       "Aska"@en.
+dbr:Aska_\(group\)                                      dct:source       "Aska"@en.
+
+#!!!!
+# The URI for the song and entrant do not exist in Wikipedia
+# There are some wiki pages that anticipate them coming into existence, e.g.:
+#   https://en.wikipedia.org/wiki/Israel_in_the_Eurovision_Song_Contest_1996
+# where links in the 'songs' and 'artists' in the footer area have been built
+# (but present in red with a strike-thru)
+#
+# => Allow the URIs to be formed, and accept that an attempt to  'got_document'
+#    on the entrant 'song' field will fail (in download_from.pl)
+#!!!!
+
+dbr:Israel_in_the_Eurovision_Song_Contest_1996    dbp:song       dbr:Shalom_Olam.
+dbr:Israel_in_the_Eurovision_Song_Contest_1996    dct:source     "Shalom Olam"@en.
+dbr:Shalom_Olam                                   dct:source     "Shalom Olam"@en.
+dbr:Israel_in_the_Eurovision_Song_Contest_1996      dbp:entrant      dbr:Galit_Bell.
+dbr:Israel_in_the_Eurovision_Song_Contest_1996      dct:source       "Galit Bell"@en.
+dbr:Galit_Bell                                      dct:source       "Galit Bell"@en.
+
+

main/trunk/model-sites-dev/eurovision-lod/collect/eurovision/prepare/fix-problem-songs-and-entrants--using-errata.sparql

@@ -14 +14 @@
 PREFIX prov:   <http://www.w3.org/ns/prov#>
 
-SELECT ?country_in_year (?year AS ?Year) (?country AS ?Country) ?entrant ?song
+SELECT ?country_in_year (?year AS ?Year) (?country AS ?Country) ?entrant ?entrant_label ?song
 
 WHERE {
@@ -45 +45 @@
   ?entrant dct:source ?entrant_errata.
 
-  SERVICE <https://dbpedia.demo.openlinksw.com/sparql> {
-    ?entrant rdfs:label ?entrant_label
-      FILTER (lang(?entrant_label) = 'en').
+   OPTIONAL {
+    SERVICE <https://dbpedia.demo.openlinksw.com/sparql> {
+      ?entrant rdfs:label ?entrant_opt_label
+        FILTER (lang(?entrant_opt_label) = 'en').
+    }
   }
-  
+  BIND(IF(bound(?entrant_opt_label),?entrant_opt_label,?entrant_errata) AS ?entrant_label)
 }
 ORDER BY DESC(?countries_in_esc_by_year)

main/trunk/model-sites-dev/eurovision-lod/collect/eurovision/prepare/problem-entrants.html

@@ -13 +13 @@
   </tr>
   <tr>
-    <td><a href="http://dbpedia.org/resource/Netherlands_in_the_Eurovision_Song_Contest_1956">http://dbpedia.org/resource/Netherlands_in_the_Eurovision_Song_Contest_1956</a></td>
-    <td><pre>1956</pre></td>
-    <td><pre>"Netherlands"@en</pre></td>
-    <td><pre>"Jetty Paerl and"@en</pre></td>
-  </tr>
-  <tr>
     <td><a href="http://dbpedia.org/resource/Denmark_in_the_Eurovision_Song_Contest_1957">http://dbpedia.org/resource/Denmark_in_the_Eurovision_Song_Contest_1957</a></td>
     <td><pre>1957</pre></td>
@@ -31 +25 @@
   </tr>
   <tr>
-    <td><a href="http://dbpedia.org/resource/Ireland_in_the_Eurovision_Song_Contest_1965">http://dbpedia.org/resource/Ireland_in_the_Eurovision_Song_Contest_1965</a></td>
-    <td><pre>1965</pre></td>
-    <td><pre>"Ireland"@en</pre></td>
-    <td><pre>"Butch Moore"@en</pre></td>
-  </tr>
-  <tr>
     <td><a href="http://dbpedia.org/resource/Sweden_in_the_Eurovision_Song_Contest_1966">http://dbpedia.org/resource/Sweden_in_the_Eurovision_Song_Contest_1966</a></td>
     <td><pre>1966</pre></td>
@@ -43 +31 @@
   </tr>
   <tr>
-    <td><a href="http://dbpedia.org/resource/Ireland_in_the_Eurovision_Song_Contest_1966">http://dbpedia.org/resource/Ireland_in_the_Eurovision_Song_Contest_1966</a></td>
-    <td><pre>1966</pre></td>
-    <td><pre>"Ireland"@en</pre></td>
-    <td><pre>"Dickie Rock"@en</pre></td>
-  </tr>
-  <tr>
     <td><a href="http://dbpedia.org/resource/Yugoslavia_in_the_Eurovision_Song_Contest_1967">http://dbpedia.org/resource/Yugoslavia_in_the_Eurovision_Song_Contest_1967</a></td>
     <td><pre>1967</pre></td>
@@ -55 +37 @@
   </tr>
   <tr>
-    <td><a href="http://dbpedia.org/resource/Ireland_in_the_Eurovision_Song_Contest_1967">http://dbpedia.org/resource/Ireland_in_the_Eurovision_Song_Contest_1967</a></td>
-    <td><pre>1967</pre></td>
-    <td><pre>"Ireland"@en</pre></td>
-    <td><pre>"Sean Dunphy"@en</pre></td>
-  </tr>
-  <tr>
-    <td><a href="http://dbpedia.org/resource/Ireland_in_the_Eurovision_Song_Contest_1968">http://dbpedia.org/resource/Ireland_in_the_Eurovision_Song_Contest_1968</a></td>
-    <td><pre>1968</pre></td>
-    <td><pre>"Ireland"@en</pre></td>
-    <td><pre>"Pat McGeegan"@en</pre></td>
-  </tr>
-  <tr>
     <td><a href="http://dbpedia.org/resource/Yugoslavia_in_the_Eurovision_Song_Contest_1969">http://dbpedia.org/resource/Yugoslavia_in_the_Eurovision_Song_Contest_1969</a></td>
     <td><pre>1969</pre></td>
@@ -79 +49 @@
   </tr>
   <tr>
-    <td><a href="http://dbpedia.org/resource/Ireland_in_the_Eurovision_Song_Contest_1969">http://dbpedia.org/resource/Ireland_in_the_Eurovision_Song_Contest_1969</a></td>
-    <td><pre>1969</pre></td>
-    <td><pre>"Ireland"@en</pre></td>
-    <td><pre>"Muriel Day"@en</pre></td>
-  </tr>
-  <tr>
     <td><a href="http://dbpedia.org/resource/Israel_in_the_Eurovision_Song_Contest_1974">http://dbpedia.org/resource/Israel_in_the_Eurovision_Song_Contest_1974</a></td>
     <td><pre>1974</pre></td>
@@ -103 +67 @@
   </tr>
   <tr>
-    <td><a href="http://dbpedia.org/resource/Yugoslavia_in_the_Eurovision_Song_Contest_1982">http://dbpedia.org/resource/Yugoslavia_in_the_Eurovision_Song_Contest_1982</a></td>
-    <td><pre>1982</pre></td>
-    <td><pre>"Yugoslavia"@en</pre></td>
-    <td><pre>"Aska"@en</pre></td>
-  </tr>
-  <tr>
     <td><a href="http://dbpedia.org/resource/Turkey_in_the_Eurovision_Song_Contest_1982">http://dbpedia.org/resource/Turkey_in_the_Eurovision_Song_Contest_1982</a></td>
     <td><pre>1982</pre></td>
@@ -331 +289 @@
   </tr>
   <tr>
-    <td><a href="http://dbpedia.org/resource/Israel_in_the_Eurovision_Song_Contest_1996">http://dbpedia.org/resource/Israel_in_the_Eurovision_Song_Contest_1996</a></td>
-    <td><pre>1996</pre></td>
-    <td><pre>"Israel"@en</pre></td>
-    <td><pre>"Galit Bell"@en</pre></td>
-  </tr>
-  <tr>
     <td><a href="http://dbpedia.org/resource/Cyprus_in_the_Eurovision_Song_Contest_1997">http://dbpedia.org/resource/Cyprus_in_the_Eurovision_Song_Contest_1997</a></td>
     <td><pre>1997</pre></td>

main/trunk/model-sites-dev/eurovision-lod/collect/eurovision/prepare/problem-entrants.sparql

@@ -10 +10 @@
 
     ?country_in_year dbp:country ?country.
-    ?country_in_year dbp:entrant ?entrant.
+
+    ?country_in_year dbp:entrant ?entrant
       FILTER (isLITERAL(?entrant)).
+
     ?country_in_year dbp:song ?song
+      FILTER (isIRI(?song)).
+    
 }
 ORDER BY ASC(?countries_in_esc_by_year)

main/trunk/model-sites-dev/eurovision-lod/collect/eurovision/prepare/problem-songs.html

@@ -55 +55 @@
   </tr>
   <tr>
-    <td><a href="http://dbpedia.org/resource/Ireland_in_the_Eurovision_Song_Contest_1965">http://dbpedia.org/resource/Ireland_in_the_Eurovision_Song_Contest_1965</a></td>
-    <td><pre>1965</pre></td>
-    <td><pre>"Ireland"@en</pre></td>
-    <td><pre>"I&#39;m Walking the Streets in the Rain"@en</pre></td>
-  </tr>
-  <tr>
-    <td><a href="http://dbpedia.org/resource/Ireland_in_the_Eurovision_Song_Contest_1966">http://dbpedia.org/resource/Ireland_in_the_Eurovision_Song_Contest_1966</a></td>
-    <td><pre>1966</pre></td>
-    <td><pre>"Ireland"@en</pre></td>
-    <td><pre>"Come Back to Stay"@en</pre></td>
-  </tr>
-  <tr>
-    <td><a href="http://dbpedia.org/resource/Ireland_in_the_Eurovision_Song_Contest_1967">http://dbpedia.org/resource/Ireland_in_the_Eurovision_Song_Contest_1967</a></td>
-    <td><pre>1967</pre></td>
-    <td><pre>"Ireland"@en</pre></td>
-    <td><pre>"If I Could Choose"@en</pre></td>
-  </tr>
-  <tr>
     <td><a href="http://dbpedia.org/resource/Norway_in_the_Eurovision_Song_Contest_1968">http://dbpedia.org/resource/Norway_in_the_Eurovision_Song_Contest_1968</a></td>
     <td><pre>1968</pre></td>
@@ -78 +60 @@
     <td><pre>"Jeg har aldri vÊrt så glad i noen som deg 
 Stress"@en</pre></td>
-  </tr>
-  <tr>
-    <td><a href="http://dbpedia.org/resource/Ireland_in_the_Eurovision_Song_Contest_1968">http://dbpedia.org/resource/Ireland_in_the_Eurovision_Song_Contest_1968</a></td>
-    <td><pre>1968</pre></td>
-    <td><pre>"Ireland"@en</pre></td>
-    <td><pre>"Chance of a Lifetime"@en</pre></td>
-  </tr>
-  <tr>
-    <td><a href="http://dbpedia.org/resource/Ireland_in_the_Eurovision_Song_Contest_1969">http://dbpedia.org/resource/Ireland_in_the_Eurovision_Song_Contest_1969</a></td>
-    <td><pre>1969</pre></td>
-    <td><pre>"Ireland"@en</pre></td>
-    <td><pre>"The Wages of Love"@en</pre></td>
-  </tr>
-  <tr>
-    <td><a href="http://dbpedia.org/resource/Yugoslavia_in_the_Eurovision_Song_Contest_1982">http://dbpedia.org/resource/Yugoslavia_in_the_Eurovision_Song_Contest_1982</a></td>
-    <td><pre>1982</pre></td>
-    <td><pre>"Yugoslavia"@en</pre></td>
-    <td><pre>"Halo, halo"@en</pre></td>
   </tr>
   <tr>
@@ -146 +110 @@
   </tr>
   <tr>
-    <td><a href="http://dbpedia.org/resource/Israel_in_the_Eurovision_Song_Contest_1996">http://dbpedia.org/resource/Israel_in_the_Eurovision_Song_Contest_1996</a></td>
-    <td><pre>1996</pre></td>
-    <td><pre>"Israel"@en</pre></td>
-    <td><pre>"Shalom Olam"@en</pre></td>
-  </tr>
-  <tr>
     <td><a href="http://dbpedia.org/resource/Macedonia_in_the_Eurovision_Song_Contest_2000">http://dbpedia.org/resource/Macedonia_in_the_Eurovision_Song_Contest_2000</a></td>
     <td><pre>2000</pre></td>
@@ -170 +128 @@
   </tr>
   <tr>
-    <td><a href="http://dbpedia.org/resource/Cyprus_in_the_Eurovision_Song_Contest_2010">http://dbpedia.org/resource/Cyprus_in_the_Eurovision_Song_Contest_2010</a></td>
-    <td><pre>2010</pre></td>
-    <td><pre>"Cyprus"@en</pre></td>
-    <td><pre>""@en</pre></td>
-  </tr>
-  <tr>
     <td><a href="http://dbpedia.org/resource/Ukraine_in_the_Eurovision_Song_Contest_2016">http://dbpedia.org/resource/Ukraine_in_the_Eurovision_Song_Contest_2016</a></td>
     <td><pre>2016</pre></td>

main/trunk/model-sites-dev/eurovision-lod/collect/eurovision/prepare/problem-songs.sparql

@@ -10 +10 @@
 
     ?country_in_year dbp:country ?country.
-    ?country_in_year dbp:entrant ?entrant.
+
+    ?country_in_year dbp:entrant ?entrant
+       FILTER (isIRI(?entrant)).    
+
     ?country_in_year dbp:song ?song
-    FILTER (isLITERAL(?song))
+       FILTER (isLITERAL(?song))
 }
 ORDER BY ASC(?countries_in_esc_by_year)