Changeset 34747 for main/trunk

Timestamp:

2021-01-29T18:19:23+13:00 (3 years ago)

Author:

davidb

Message:

Next round of testing/debugging after trialling both song and entrant errata as the same time

Location:

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

Files:

• eurovision-errata.ttl (modified) (3 diffs)
• fix-problem-songs--using-errata.sparql (modified) (2 diffs)
• fix-problem-songs-and-entrants--using-errata.sparql (added)

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

@@ -9 +9 @@
 
 @prefix dct:    <http://purl.org/dc/terms/> .
+
+
+####
+# Song (title) errata
+####
 
 
@@ -27 +32 @@
 dbr:Ne_crois_pas                                      dct:source     "Ne Crois Pas\" and"@en.
 
-####
+#!!!!
 # In addition to the song title correct,
 # The *entrant* page lists the second artist as the *string* "& Freddy Quinn (en)" not as a URI
+# => this still needs to be addressed
+#!!!!
 
 dbr:Germany_in_the_Eurovision_Song_Contest_1956    dbp:song       dbr:So_geht_das_jede_Nacht.
@@ -53 +60 @@
 
 
-#### end of Song errata
-
-
-#"Voorgoed voorbij = Voorgoed voorbij
-#De vogels van Holland" and => De vogels van Holland
-
-#Das alte Karussell" and "Refrain => Das alte Karussell
-#Das alte Karussell" and "Refrain => "Refrain
-
-#"Amami se vuoi => Amami se vuoi
 
 
 
+####
+# Entrant (artist) errata
+####
 
-#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:Denmark_in_the_Eurovision_Song_Contest_1957  dbp:entrant      dbr:Gustav_Winckler.
+dbr:Denmark_in_the_Eurovision_Song_Contest_1957  dct:source       "and Gustav Winckler"@en.
+dbr:Gustav_Winckler                              dct:source       "and Gustav Winckler"@en.
 
 
 
-dbr:Denmark_in_the_Eurovision_Song_Contest_1957    dbp:entrant    dbr:Gustav_Winckler.
-dbr:Denmark_in_the_Eurovision_Song_Contest_1957    dct:source     "and Gustav Winckler"@en.
-dbr:Gustav_Winckler                                dct:source     "and Gustav Winckler"@en.
+####
+# Both Song (title) and Entrant (artist) errata
+####
+
+dbr:Germany_in_the_Eurovision_Song_Contest_1956    dbp:song       dbr:So_geht_das_jede_Nacht.
+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:Ireland_in_the_Eurovision_Song_Contest_1965    dbp:song       dbr:Walking_the_Streets_in_the_Rain.
+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.

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

@@ -26 +26 @@
     ?country_in_year dbp:country ?country.
 
-    ?country_in_year dbp:entrant ?entrant.
-    ?entrant rdfs:label ?entrant_label
-      FILTER (lang(?entrant_label) = 'en').
+    ?country_in_year dbp:entrant ?entrant
+        FILTER (isURI(?entrant)).    
 
     ?country_in_year dbp:song ?song_errata
@@ -42 +41 @@
   ?song dct:source ?song_errata.
 
+  SERVICE <https://dbpedia.demo.openlinksw.com/sparql> {
+    ?entrant rdfs:label ?entrant_label
+      FILTER (lang(?entrant_label) = 'en').
+  }
 }
 ORDER BY DESC(?countries_in_esc_by_year)