From: <all...@us...> - 2003-12-02 03:26:36
|
Update of /cvsroot/gmod/schema/chado/load/bin In directory sc8-pr-cvs1:/tmp/cvs-serv30358/load/bin Modified Files: load_affyxls.pl Log Message: more filepath crap Index: load_affyxls.pl =================================================================== RCS file: /cvsroot/gmod/schema/chado/load/bin/load_affyxls.pl,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** load_affyxls.pl 2 Dec 2003 02:10:58 -0000 1.5 --- load_affyxls.pl 2 Dec 2003 03:05:50 -0000 1.6 *************** *** 77,84 **** #we can do this on filename or arrayname. #if($arrayio->id =~ /^(\d+)\-(\d+)\-(\S+)/){ ! if($arrayfile =~ /^.*\/?(\d+)\-(\d+)\-(\S+)/){ ! $chip_id = $1; ! $sample_id = $2; ! $cvterms = $3; } --- 77,92 ---- #we can do this on filename or arrayname. #if($arrayio->id =~ /^(\d+)\-(\d+)\-(\S+)/){ ! if($arrayfile =~ m!/!){ ! if($arrayfile =~ /^.*\/(\d+)\-(\d+)\-(\S+)/){ ! $chip_id = $1; ! $sample_id = $2; ! $cvterms = $3; ! } ! } else { ! if($arrayfile =~ /^(\d+)\-(\d+)\-(\S+)/){ ! $chip_id = $1; ! $sample_id = $2; ! $cvterms = $3; ! } } |