From a12fe94f174da766be612fbb2712b4db2ba98296 Mon Sep 17 00:00:00 2001
From: lltommy
Date: Wed, 22 Apr 2020 19:41:27 +0200
Subject: Small changes all around, trying to make the importer/metadata better

---
 bh20sequploader/bh20seq-schema.yml |  4 ++--
 bh20sequploader/bh20seq-shex.rdf   | 25 +++++++++++++++----------
 2 files changed, 17 insertions(+), 12 deletions(-)

(limited to 'bh20sequploader')

diff --git a/bh20sequploader/bh20seq-schema.yml b/bh20sequploader/bh20seq-schema.yml
index 1ceebe2..80013c3 100644
--- a/bh20sequploader/bh20seq-schema.yml
+++ b/bh20sequploader/bh20seq-schema.yml
@@ -25,7 +25,7 @@ $graph:
         jsonldPredicate:
           _id: http://semanticscience.org/resource/SIO_000115
     host_sex:
-        doc: Sex of the host as defined in NCIT, IRI expected (http://purl.obolibrary.org/obo/NCIT_C20197 (Male), http://purl.obolibrary.org/obo/NCIT_C27993 (Female), http://purl.obolibrary.org/obo/NCIT_C45908 (Intersex), or http://purl.obolibrary.org/obo/NCIT_C17998 (Unknown))
+        doc: Sex of the host as defined in PATO, expect male () or female ()
         type: string?
         jsonldPredicate:
           _id: http://purl.obolibrary.org/obo/PATO_0000047
@@ -144,7 +144,7 @@ $graph:
   fields:
     sample_sequencing_technology:
       doc: Technology that was used to sequence this sample (e.g Sanger, Nanopor MiniION)
-      type: string
+      type: string?
       jsonldPredicate:
         _id: http://purl.obolibrary.org/obo/OBI_0600047
         _type: "@id"
diff --git a/bh20sequploader/bh20seq-shex.rdf b/bh20sequploader/bh20seq-shex.rdf
index 31e714f..8d0055e 100644
--- a/bh20sequploader/bh20seq-shex.rdf
+++ b/bh20sequploader/bh20seq-shex.rdf
@@ -23,35 +23,40 @@ PREFIX wikidata: <http://www.wikidata.org/entity/>
     obo:PATO_0000047 [ obo:PATO_0000384 obo:PATO_0000383 ] ?;
     obo:PATO_0000011 xsd:integer ?;
     obo:NCIT_C42574 [ obo:UO_~ ] ?;
-    sio:SIO_001167 xsd:string ?;
+	obo:NCIT_C25688 xsd:string ? ;
     efo:EFO_0000727 xsd:string ?;
+    obo:VO_0000002 xsd:string ?;
+    sio:SIO_001167 xsd:string ?;
 }
 
 :sampleShape  {
     sio:SIO_000115 xsd:string;
-    obo:GAZ_00000448 [wikidata:~] ;
 	evs:C25164 xsd:string;
+	obo:GAZ_00000448 [wikidata:~] ;
     obo:OBI_0001895 xsd:string ?;
-    sio:SIO_001167 xsd:string ?;
-    obo:OBI_0001472 xsd:string ?;
+    obo:NCIT_C41206 xsd:string ?;
     obo:OBI_0001479 IRI {0,2};
+    obo:OBI_0001472 xsd:string ?;
+    sio:SIO_001167 xsd:string ?;
 }
 
 :submitterShape {
     obo:NCIT_C42781 xsd:string ;
-	obo:NCIT_C37984 xsd:string ?;
-	obo:NCIT_C37900 xsd:string ?;
     sio:SIO_000116 xsd:string ?;
-    obo:OBI_0600047 xsd:string ?;
-    sio:SIO_000115 /https:\u002F\u002Forcid.org\u002F.{4}-.{4}-.{4}-.{4}/?;
     sio:SIO_000172 xsd:string ?;
+    obo:NCIT_C37984 xsd:string ?;
+    obo:OBI_0600047 xsd:string ?;
+  	obo:NCIT_C37900 xsd:string ?;
     efo:EFO_0001741 xsd:string ?;
+    obo:NCIT_C19026 xsd:string ?;
+    sio:SIO_000115 /https:\u002F\u002Forcid.org\u002F.{4}-.{4}-.{4}-.{4}/?;
 }
 
 :technologyShape {
-    obo:OBI_0600047 IRI {0,2} ;
-    obo:FLU_0000848 xsd:double ?;
+    obo:OBI_0600047 IRI {0,2} ?;
     efo:EFO_0002699 xsd:string ?;
+    obo:FLU_0000848 xsd:double {0,2};
+    sio:SIO_001167 xsd:string ?;
 }
 
 :virusShape{
-- 
cgit v1.2.3