Update schema for several transforms.

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

1 files changed, 9 insertions, 18 deletions

diff --git a/examples/classification.scm b/examples/classification.scm
index 279dc86..6195ea6 100755
--- a/examples/classification.scm
+++ b/examples/classification.scm
@@ -39,9 +39,7 @@
    (gnc:species xkos:specializes gnc:set))
   (triples "gnc:species"
     (set skos:member
-         (string->identifier "species" (remap-species-identifiers (field Species Fullname))
-                             #:separator "_"
-                             #:proc string-downcase))))
+         (string->identifier "" (remap-species-identifiers (field Species Fullname))))))
 
 (define-transformer classification-scheme-set
   (tables (InbredSet))
@@ -53,8 +51,7 @@
   (triples "gnc:set"
     (set skos:member
          (string->identifier
-          "set" (field InbredSet Name InbredSetName)
-          #:separator "_"))))
+          "set" (field InbredSet Name InbredSetName) #:separator "_"))))
 
 (define-transformer species
   (tables (Species))
@@ -69,9 +66,7 @@
    (gnt:belongs_to_species rdf:comment "This resource given to this species")
    (gnt:belongs_to_species rdf:label "belongsToSpecies"))
   (triples
-      (string->identifier "species" (remap-species-identifiers (field Species Fullname))
-                          #:separator "_"
-                          #:proc string-downcase)
+      (string->identifier "" (remap-species-identifiers (field Species Fullname)))
     (set skos:inScheme 'gnc:resource_classification_scheme)
     (set rdfs:label (remap-species-identifiers (field Species Fullname)))
     (set skos:prefLabel (field Species MenuName))
@@ -88,8 +83,8 @@
            (left-join MappingMethod
                       "ON InbredSet.MappingMethodId=MappingMethod.Id")))
   (schema-triples
-   (gnt:genetic_type a owl:ObjectProperty)
-   (gnt:genetic_type rdfs:domain gnc:set)
+   (gnt:genetic-type a owl:ObjectProperty)
+   (gnt:genetic-type rdfs:domain gnc:set)
    (gnt:code a owl:ObjectProperty)
    (gnt:code rdfs:domain gnc:set)
    ;; Already defined as an owl prop in species
@@ -98,21 +93,17 @@
    (gnt:mapping_method rdfs:domain gnc:set)
    (gnt:belongs_to_group a rdf:property)
    (gnt:belongs_to_group rdf:comment "This resource given to this group")
-   (gnt:belongs_to_group rdf:label "belongs_to_group"))
-  (triples (string->identifier
-            "set" (field InbredSet Name InbredSetName)
-            #:separator "_")
+   (gnt:belongs_to_group rdf:label "belongs-to-group"))
+  (triples (string->identifier "set" (field InbredSet Name InbredSetName) #:separator "_")
     (set skos:inScheme 'gnc:resource_classification_scheme)
     (set rdfs:label (field InbredSet FullName))
     (set skos:prefLabel (field InbredSet Name InbredSetName))
-    (set gnt:genetic_type (field InbredSet GeneticType))
+    (set gnt:genetic-type (field InbredSet GeneticType))
     (set gnt:family (field InbredSet Family))
     (set gnt:mapping_method (field MappingMethod Name))
     (set gnt:code (field InbredSet InbredSetCode))
     (set xkos:generalizes
-         (string->identifier "species" (remap-species-identifiers (field Species Fullname))
-                          #:separator "_"
-                          #:proc string-downcase))))
+         (string->identifier "" (remap-species-identifiers (field Species Fullname))))))