Changeset 34738 for main/trunk

Timestamp:

2021-01-29T14:54:28+13:00 (3 years ago)

Author:

davidb

Message:

Changed to using 'AS' rather then 'as'; added in additional variable that facilitaes removeing '(.. song)' at the end of titles

File:

• main/trunk/model-sites-dev/eurovision-lod/collect/eurovision/prepare/countries-in-esc-by-year.sparql (modified) (2 diffs)

main/trunk/model-sites-dev/eurovision-lod/collect/eurovision/prepare/countries-in-esc-by-year.sparql

@@ -1 +1 @@
 # PREFIX prov https://www.w3.org/ns/prov#
 
-SELECT ?countries_in_esc_by_year ?country_in_year ?year as ?Year ?country as ?Country ?entrant ?entrant_label as ?Creator ?song ?song_label as ?Title ?was_derived_from as ?WikipediaURL
+SELECT ?countries_in_esc_by_year ?country_in_year ?year AS ?Year ?country AS ?Country ?entrant ?entrant_label AS ?Creator ?song ?song_label AS ?Title ?was_derived_from AS ?WikipediaURL
 WHERE {
     ?countries_in_esc_by_year skos:broader dbc:Countries_in_the_Eurovision_Song_Contest_by_year.
 
     ?country_in_year dct:subject ?countries_in_esc_by_year.
-    bind( REPLACE(str(?country_in_year), ".*(\\d{4})", "$1") as ?year).
+    bind( REPLACE(str(?country_in_year), ".*(\\d{4})", "$1") AS ?year).
     FILTER ( xsd:integer(?year) < 2020).
 
@@ -16 +16 @@
 
     ?country_in_year dbp:song ?song.
-    ?song rdfs:label ?song_label
-      FILTER (lang(?song_label) = 'en').
+    ?song rdfs:label ?song_label_raw
+      FILTER (lang(?song_label_raw) = 'en').
+
+    BIND(REPLACE(?song_label_raw, "\\s*\\(.*?song\\)$", "", "i") AS ?song_label).
 
     OPTIONAL {