X-Git-Url: http://woldlab.caltech.edu/gitweb/?a=blobdiff_plain;f=htsworkflow%2Fsubmission%2Fsubmission.py;h=897053fbc148477c108d232635958db45488dfc5;hb=1000ba383f47a9c3ab422f4552b3725038c96541;hp=626897061ea4d9e4c78141a4cba65c4713011507;hpb=5cd0308e3ea6aff59ae5cbdb2a9569ffff56984a;p=htsworkflow.git diff --git a/htsworkflow/submission/submission.py b/htsworkflow/submission/submission.py index 6268970..897053f 100644 --- a/htsworkflow/submission/submission.py +++ b/htsworkflow/submission/submission.py @@ -11,7 +11,7 @@ from htsworkflow.util.rdfhelp import \ dump_model, \ fromTypedNode, \ get_model, \ - stripNamespace, \ + strip_namespace, \ toTypedNode from htsworkflow.util.rdfns import * from htsworkflow.util.hashfile import make_md5sum @@ -133,7 +133,7 @@ class Submission(object): RDF.Statement(fileNode, libraryOntology['library'], libNode)) - + LOGGER.debug("Done.") def make_file_node(self, pathname, submissionNode): @@ -175,7 +175,7 @@ class Submission(object): except ValueError: # currently its just ignore it if the fastq name parser fails return - + terms = [('flowcell', libraryOntology['flowcell_id']), ('lib_id', libraryOntology['library_id']), ('lane', libraryOntology['lane_number']), @@ -186,7 +186,7 @@ class Submission(object): if value is not None: s = RDF.Statement(fileNode, model_term, toTypedNode(value)) self.model.append(s) - + def add_label(self, file_type, file_node, lib_node): """Add rdfs:label to a file node """ @@ -348,6 +348,8 @@ class Submission(object): 'Small RNA (non-multiplexed)',] paired = ['Barcoded Illumina', 'Multiplexing', + 'NEBNext Multiplexed', + 'NEBNext Small RNA', 'Nextera', 'Paired End (non-multiplexed)', 'Dual Index Illumina',] @@ -388,7 +390,7 @@ def list_submissions(model): query = RDF.SPARQLQuery(query_body) rdfstream = query.execute(model) for row in rdfstream: - s = stripNamespace(submissionLog, row['submission']) + s = strip_namespace(submissionLog, row['submission']) if s[-1] in ['#', '/', '?']: s = s[:-1] yield s