about summary refs log tree commit diff
diff options
context:
space:
mode:
-rwxr-xr-xexamples/genelist.scm4
-rwxr-xr-xexamples/probeset.scm10
2 files changed, 5 insertions, 9 deletions
diff --git a/examples/genelist.scm b/examples/genelist.scm
index 78df9d7..2d94a3b 100755
--- a/examples/genelist.scm
+++ b/examples/genelist.scm
@@ -84,11 +84,11 @@
        "gene" (regexp-substitute/global
                #f "[^A-Za-z0-9:]"
                (string-trim-both
-                (field GeneList GeneSymbol))
+                (field ("CONCAT_WS('_', GeneSymbol, GeneID, AlignID)" GENE_UID)))
                'pre "_" 'post)
        #:proc (lambda (x) x))
     (set rdf:type 'gnc:GeneSymbol)
-    (set rdfs:label (field GeneList GeneSymbol))
+    (set gnt:geneSymbol (field GeneList GeneSymbol))
     (set dct:description (sanitize-rdf-string (field GeneList GeneDescription)))
     (set gnt:hasGeneId (ontology 'gene: (field GeneList GeneId)))
     (set dct:references
diff --git a/examples/probeset.scm b/examples/probeset.scm
index 0f83a86..c7efce7 100755
--- a/examples/probeset.scm
+++ b/examples/probeset.scm
@@ -33,7 +33,7 @@
    (gnt:hasChip rdfs:domain gnc:Probeset)
    (gnt:hasTargetId a owl:ObjectProperty)
    (gnt:hasTargetId rdfs:domain gnc:Probeset)
-   (gnt:symbol rdfs:domain gnc:Probeset)
+   (gnt:geneSymbol rdfs:domain gnc:Probeset)
    (gnt:location rdfs:domain gnc:ProbeSet)
    (gnt:location a owl:ObjectProperty)
    (gnt:strandPosition rdfs:domain gnc:ProbeSet)
@@ -79,12 +79,8 @@
     (set gnt:hasTargetId
          (field ("NULLIF(TRIM(ProbeSet.TargetId), '')"
                  TargetId)))
-    (set gnt:symbol
-         (string->identifier
-          "gene" (regexp-substitute/global #f "[^A-Za-z0-9:]"
-                                           (field ProbeSet Symbol)
-                                           'pre "_" 'post)
-          #:proc (lambda (x) x)))
+    (set gnt:geneSymbol
+         (field ProbeSet Symbol))
     (set dct:description (sanitize-rdf-string (field ProbeSet description)))
     (set gnt:targetsRegion
          (sanitize-rdf-string