This might actually generate soft file with raw & supplemental data.

[htsworkflow.git] / htsworkflow / templates / geo_files.sparql

diff --git a/htsworkflow/templates/geo_files.sparql b/htsworkflow/templates/geo_files.sparql
index e3fcb9d8d4028c57f752e254019227f6e61b85bf..6fd7cac6ad92a92517b38240c0cf1b7ccbc57d70 100644 (file)
--- a/htsworkflow/templates/geo_files.sparql
+++ b/htsworkflow/templates/geo_files.sparql
@@ -3,20 +3,22 @@ PREFIX submissionOntology: <http://jumpgate.caltech.edu/wiki/UcscSubmissionOntol
 PREFIX ucscDaf: <http://jumpgate.caltech.edu/wiki/UcscDaf#>
 PREFIX ncbiTaxon: <http://www.ncbi.nlm.nih.gov/Taxonomy/Browser/wwwtax.cgi?id=>
 PREFIX geoSoft: <http://www.ncbi.nlm.nih.gov/geo/info/soft2.html#>
+PREFIX dc: <http://purl.org/dc/elements/1.1/>
 
 select distinct ?filename, ?md5sum, ?file_type ?file_type_label ?flowcell_id ?read_length ?flowcell_type ?image_software ?image_version ?basecall_software ?basecall_version ?sequencer_model
 WHERE {
   <{{submission}}> ucscDaf:has_file ?file ;
+                   submissionOntology:library ?library ;
                    a submissionOntology:submission .
 
   ?file ucscDaf:filename ?filename ;
         ucscDaf:md5sum ?md5sum ;
-        libraryOntology:has_lane ?lane ;
         a ?file_type .
   ?file_type a <{{file_class}}> ;
              geoSoft:fileTypeLabel ?file_type_label .
 
-  OPTIONAL { ?lane libraryOntology:flowcell ?flowcell .
+  OPTIONAL { ?file dc:source ?source_file .
+             ?source_file libraryOntology:flowcell ?flowcell .
              ?flowcell libraryOntology:flowcell_id ?flowcell_id ;
                        libraryOntology:read_length ?read_length ;
                        libraryOntology:flowcell_type ?flowcell_type ;