use original image URLs

Author: tpluscode

mapping/Images.xrm

@@ -1,7 +1,5 @@
 output r2rml
 
-template cloudinaryUrl "https://res.cloudinary.com/dytcmwide/image/upload/t_default_downsize/v1599422851/{0}.jpg"
-template cloudinaryThumbUrl "https://res.cloudinary.com/dytcmwide/image/upload/t_media_lib_thumb/v1599422851/{0}.jpg"
 template magazineIssueImageId "magazine/{0}/issue/{1}/image"
 
 map Image from wikibus.images {
@@ -15,7 +13,7 @@ map Image from wikibus.images {
 
     properties
         schema.identifier from ExternalId;
-        schema.contentUrl template cloudinaryUrl with ExternalId;
+        schema.contentUrl from OriginalUrl as IRI;
         schema.thumbnail template "cloudinary-image-{0}" with Id as BlankNode;
         dtype.orderIndex from OrderIndex with datatype xsd.int;
 }
@@ -27,7 +25,7 @@ map ImageThumbnail from wikibus.images {
 		template imageId with SourceType ExternalId;
 
     properties
-        schema.contentUrl template cloudinaryThumbUrl with ExternalId;
+        schema.contentUrl from ThumbnailUrl as IRI;
 }
 
 map LegacyImage from wikibus.legacy_images {

mapping/sources.xrm

@@ -203,6 +203,8 @@ where SourceType = 'book'"
 			ExternalId
 			OrderIndex
 			SourceType
+			OriginalUrl
+			ThumbnailUrl
 	}
 
 	logical-source users {

shapes/Brochure-examples.ttl

@@ -75,6 +75,21 @@
         [
             sh:path schema:image ;
             sh:hasValue <https://wikibus.lndo.site/image/brochure-wikibus%20library%2Fbrochures%2Fifatzmg81pwm1dbnmj3l> ;
+            sh:node 
+            [
+                sh:property
+                [
+                    sh:path schema:contentUrl ;
+                    sh:hasValue <https://res.cloudinary.com/dytcmwide/image/upload/t_default_downsize/v1632163731/wikibus%20library/brochures/ifatzmg81pwm1dbnmj3l.jpg> ;
+                ] , [
+                    sh:path schema:thumbnail ;
+                    sh:node 
+                    [
+                        sh:path schema:contentUrl ;
+                        sh:hasValue <https://res.cloudinary.com/dytcmwide/image/upload/t_media_lib_thumb/v1632163731/wikibus%20library/brochures/ifatzmg81pwm1dbnmj3l.jpg> ;
+                    ] ;
+                ] ;
+            ]
         ]
 .
 

shapes/Brochure.ttl

@@ -31,6 +31,7 @@
             sh:datatype xsd:string ;
             sh:minLength 1 ;
             sh:maxCount 1 ;
+            sh:pattern "^[^\\s]" ;
         ],
         [
             sh:path dcterms:description ;