Set string->identifier to defaut to "" sep and string-capitalize

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

1 files changed, 9 insertions, 27 deletions

diff --git a/examples/dataset-metadata.scm b/examples/dataset-metadata.scm
index 56280a7..e6ef350 100755
--- a/examples/dataset-metadata.scm
+++ b/examples/dataset-metadata.scm
@@ -81,9 +81,7 @@
                                Title)))
     (set gnt:hasGOTreeValue (field GeneChip Go_tree_value))
     (set xkos:classifiedUnder
-         (string->identifier "" (remap-species-identifiers (field Species Fullname))
-                             #:separator ""
-                             #:proc string-capitalize-first))
+         (string->identifier "" (remap-species-identifiers (field Species Fullname))))
     (set gnt:hasGeoSeriesId
          (ontology 'geoSeries:
                    (string-trim-both (field GeneChip GeoPlatform))))))
@@ -146,9 +144,7 @@
   (triples (string->identifier
             "" (regexp-substitute/global #f "[^A-Za-z0-9:]"
                                          (field InfoFiles InfoPageName)
-                                         'pre "_" 'post)
-            #:separator ""
-            #:proc string-capitalize-first)
+                                         'pre "_" 'post))
     (set rdf:type 'dcat:Dataset)
     (set xkos:classifiedUnder
          (let ([dataset-type
@@ -190,9 +186,7 @@
                            (field DatasetStatus DatasetStatusName)))
     (set xkos:classifiedUnder
          (string->identifier
-          "set" (field InbredSet Name)
-          #:separator ""
-          #:proc string-capitalize-first))
+          "set" (field InbredSet Name)))
     (set gnt:hasTissue (string->identifier "tissue"
                                            (field Tissue Short_Name)))
     (set gnt:usesNormalization
@@ -253,9 +247,7 @@
        ""
        (regexp-substitute/global #f "[^A-Za-z0-9:]"
                                  (field PublishFreeze Name)
-                                 'pre "_" 'post)
-       #:separator ""
-       #:proc string-capitalize-first)
+                                 'pre "_" 'post))
     (set xkos:classifiedUnder 'gnc:Phenotype)
     (set dct:title  (field PublishFreeze FullName))
     (set rdfs:label (field PublishFreeze Name))
@@ -265,9 +257,7 @@
                       '^^xsd:date))
     (set xkos:classifiedUnder
          (string->identifier
-          "set" (field InbredSet Name)
-          #:separator ""
-          #:proc string-capitalize-first))))
+          "set" (field InbredSet Name)))))
 
 (define-transformer genofreeze
   (tables (GenoFreeze
@@ -283,9 +273,7 @@
          #f "[^A-Za-z0-9:]"
          (field GenoFreeze Name)
          'pre "_" 'post)
-        'pre "_" 'post)
-       #:separator ""
-       #:proc string-capitalize-first)
+        'pre "_" 'post))
     (set xkos:classifiedUnder 'gnc:Genotype)
     (set rdfs:label (field GenoFreeze Name))
     (set dct:title (field GenoFreeze FullName))
@@ -295,9 +283,7 @@
                       '^^xsd:date))
     (set xkos:classifiedUnder
          (string->identifier
-            "set" (field InbredSet Name)
-            #:separator ""
-            #:proc string-capitalize-first))))
+            "set" (field InbredSet Name)))))
 
 ;; Molecular Traits are also referred to as ProbeSets
 (define-transformer probesetfreeze
@@ -319,9 +305,7 @@
        (regexp-substitute/global
         #f "[^A-Za-z0-9:]"
         (field ProbeSetFreeze Name)
-        'pre "_" 'post)
-       #:separator ""
-       #:proc string-capitalize-first)
+        'pre "_" 'post))
     (set xkos:classifiedUnder 'gnc:Probeset)
     (set gnt:usesNormalization
          (string->identifier "avgMethod"
@@ -342,9 +326,7 @@
           (field Tissue Short_Name)))
     (set xkos:classifiedUnder
          (string->identifier
-          "set" (field InbredSet Name)
-          #:separator ""
-          #:proc string-capitalize-first))))
+          "set" (field InbredSet Name)))))