Check for None
authorPeter Amstutz <peter.amstutz@curoverse.com>
Tue, 5 Aug 2014 17:35:05 +0000 (13:35 -0400)
committerPeter Amstutz <peter.amstutz@curoverse.com>
Tue, 5 Aug 2014 17:35:05 +0000 (13:35 -0400)
crunch_scripts/split-fastq.py

index fc61142335c3ff1fe7424f413ee25736a5133fe7..a279198742a01db6555fb5a26348418878973b1e 100755 (executable)
@@ -13,7 +13,7 @@ manifest_text = ""
 
 inp = arvados.CollectionReader(arvados.getjobparam('reads'))
 
-prog = re.compile("(.*?)_1.fastq(.gz)?$")
+prog = re.compile(r'(.*?)_1.fastq(.gz)?$')
 
 manifest_text = ""
 
@@ -72,7 +72,10 @@ for s in inp.all_streams():
             if result != None:
                 p = [{}, {}]
                 p[0]["reader"] = s.files()[result.group(0)]
-                p[1]["reader"] = s.files()[result.group(1) + "_2.fastq" + result.group(2)]
+                if result.group(2) != None:
+                    p[1]["reader"] = s.files()[result.group(1) + "_2.fastq" + result.group(2)]
+                else:
+                    p[1]["reader"] = s.files()[result.group(1) + "_2.fastq"
                 splitfastq(p)
                 #m0 = p[0]["reader"].as_manifest()[1:]
                 #m1 = p[1]["reader"].as_manifest()[1:]