Update schema for several transforms.

Signed-off-by: Munyoki Kilyungi <me@bonfacemunyoki.com>

1 files changed, 7 insertions, 12 deletions

diff --git a/examples/strains.scm b/examples/strains.scm
index 976d358..b2332bd 100755
--- a/examples/strains.scm
+++ b/examples/strains.scm
@@ -63,16 +63,11 @@ At this point it is not very clear how Name, Name2, Symbol and Alias are used.
    (gnt:gene_symbol rdfs:domain gnc:strain)
    (gnt:gene_symbol a owl:ObjectProperty))
   (triples (string->identifier
-            ""
-            (regexp-substitute/global
-             #f "[^A-Za-z0-9:]"
-             (field Strain Name)
-             'pre "_" 'post))
+            "strain"
+            (field Strain Name)
+            #:separator "_")
     (set rdf:type 'gnc:strain)
-    (set gnt:belongs_to_species
-         (string->identifier "" (remap-species-identifiers (field Species Fullname))
-                             #:separator "_"
-                             #:proc string-downcase))
+    (set gnt:belongs_to_species (string->identifier "" (remap-species-identifiers (field Species Fullname))))
     ;; Name, and maybe a second name
     (set rdfs:label (sanitize-rdf-string (field Strain Name)))
     (set skos:altLabel (sanitize-rdf-string (field ("IF ((Strain.Name2 != Strain.Name), Strain.Name2, '')" Name2))))
@@ -85,7 +80,7 @@ At this point it is not very clear how Name, Name2, Symbol and Alias are used.
    (gnc:mapping_method a skos:Concept)
    (gnc:mapping_method skos:definition "Terms that decribe mapping methods used on this resource"))
   (triples
-      (string->identifier "mapping_method" (field MappingMethod Name))
+      (string->identifier "mapping_method" (field MappingMethod Name) #:separator "_")
     (set rdf:type 'gnc:mapping_method)
     (set rdfs:label (field MappingMethod Name))))
 
@@ -96,7 +91,7 @@ At this point it is not very clear how Name, Name2, Symbol and Alias are used.
   (schema-triples
    (gnc:avg_method a skos:Concept)
    (gnc:avg_method skos:definition "Terms that decribe normalization methods used on this resource"))
-  (triples (string->identifier "avgMethod" (field AvgMethod Name AvgMethodName))
+  (triples (string->identifier "avg_method" (field AvgMethod Name AvgMethodName) #:separator "_")
     (set rdf:type 'gnc:avg_method)
     (set rdfs:label (field AvgMethod Normalization))))
 
@@ -115,7 +110,7 @@ At this point it is not very clear how Name, Name2, Symbol and Alias are used.
           read)))
 
   (with-documentation
-   (name "Species Metadata")
+   (name "Strain Metadata")
    (connection %connection-settings)
    (table-metadata? #f)
    (prefixes