diff options
| -rwxr-xr-x | examples/datasets.scm | 5 | ||||
| -rwxr-xr-x | examples/molecular-traits.scm | 4 |
2 files changed, 4 insertions, 5 deletions
diff --git a/examples/datasets.scm b/examples/datasets.scm index d8b3a00..8abb84f 100755 --- a/examples/datasets.scm +++ b/examples/datasets.scm @@ -16,7 +16,8 @@ (define-transformer gn:dataset->metadata (tables (Datasets - (inner-join InfoFiles "ON InfoFiles.DatasetId = Datasets.DatasetId")) + (inner-join InfoFiles "ON InfoFiles.DatasetId = Datasets.DatasetId") + (inner-join InbredSet "ON InbredSet.Id = InfoFiles.InbredSetId")) ;; Skip monkey datasets "WHERE InfoFiles.InfoPageName NOT LIKE 'INIA_MacFas_%'" "GROUP BY Datasets.DatasetId") @@ -72,6 +73,8 @@ (set rdf:type 'dcat:Dataset) (set dct:title (normalize-string-field (field InfoFiles InfoPageName))) (set dct:identifier (format #f "GN~a" (field InfoFiles GN_AccesionId))) + (set gnt:has_strain + (string->identifier "set" (field InbredSet Name InbredSetName) #:separator "_")) (set gnt:has_experiment_type (let ((experiment-type (field InfoFiles Experiment_Type))) diff --git a/examples/molecular-traits.scm b/examples/molecular-traits.scm index 10ba68c..2ba2664 100755 --- a/examples/molecular-traits.scm +++ b/examples/molecular-traits.scm @@ -78,10 +78,6 @@ (set dct:created (annotate-field (field ProbeSetFreeze CreateTime) '^^xsd:datetime)) (set gnt:uses_normalization_method (string->identifier "avg_method" (field AvgMethod Name AvgMethodName) #:separator "_")) - (set gnt:has_strain - (string->identifier "set" (field InbredSet Name InbredSetName) #:separator "_")) - (set gnt:has_species - (string->identifier "" (remap-species-identifiers (field Species Fullname)))) (set gnt:has_molecular_trait (string->identifier "trait" (field Tissue Short_Name) #:separator "_")) (set gnt:uses_genechip |