small fix

SVN: 34314

plasmid/source/core-plugins/weismigration/1/dss/drop-boxes/add_strain_parents/add_strain_parents.py

@@ -30,7 +30,7 @@ def update_sample_with_parents(tr, sample_dict):
   sample_id = sample_dict['identifier']
 
   yeast_parent_code = sample_dict['derived from']
-  yeast_parent_code_split = re.split("\&|+|x|/|-|\?|\(|\)", yeast_parent_code)
+  yeast_parent_code_split = re.split("and|,|\&|\+|x|/|-|\?|\(|\)", yeast_parent_code)
   print sample_id, yeast_parent_code_split
   #e.split("/|-|\?|\(|\)" 
   # insert=sample_dict['Insert']
@@ -50,19 +50,31 @@ def update_sample_with_parents(tr, sample_dict):
     sample_for_update = tr.makeSampleMutable(sample)   
     if re.search ("kwy ", name):
       yeast_parent_id = "/MATERIALS/"+name.replace("kwy ","KWY").strip()
-      sample_for_update.setParentSampleIdentifiers([yeast_parent_id])        
+      sample_for_update.setParentSampleIdentifiers([yeast_parent_id])
+    elif re.search ("pKW", name):
+      yeast_parent_id = "/MATERIALS/"+name.replace("pKW","PKW").strip()
+      sample_for_update.setParentSampleIdentifiers([yeast_parent_id])               
+    elif re.search ("PKW", name):
+      yeast_parent_id = "/MATERIALS/"+name
+      sample_for_update.setParentSampleIdentifiers([yeast_parent_id])   
     elif re.search ("kwy", name):
       yeast_parent_id = "/MATERIALS/"+name.replace("kwy","KWY").strip()
       sample_for_update.setParentSampleIdentifiers([yeast_parent_id])           
     elif re.search ("KWY ", name): 
       yeast_parent_id = "/MATERIALS/"+name.replace("KWY ","KWY").strip()
       sample_for_update.setParentSampleIdentifiers([yeast_parent_id])        
-    elif re.search ("KW", name): 
+    elif re.match ("KW\d+", name): 
       yeast_parent_id = "/MATERIALS/"+name.replace("KW","KWY").strip()
       sample_for_update.setParentSampleIdentifiers([yeast_parent_id])             
     elif re.search ("k", name): 
       yeast_parent_id = "/MATERIALS/"+name.replace("k","KWY").strip()
       sample_for_update.setParentSampleIdentifiers([yeast_parent_id])        
+    elif re.search ("KWYY", name): 
+      yeast_parent_id = "/MATERIALS/"+name.replace("KWYY","KWY").strip()
+      sample_for_update.setParentSampleIdentifiers([yeast_parent_id])        
+    elif re.search ("KWy", name): 
+      yeast_parent_id = "/MATERIALS/"+name.replace("KWy","KWY").strip()
+      sample_for_update.setParentSampleIdentifiers([yeast_parent_id])