[BioRuby-cvs] bioruby/lib/bio/db/embl sptr.rb,1.34,1.35

[Mitsuteru C. Nakao]

Update of /home/repository/bioruby/bioruby/lib/bio/db/embl
In directory dev.open-bio.org:/tmp/cvs-serv11054/lib/bio/db/embl

Modified Files:
	sptr.rb 
Log Message:
* Fixed Bio::SPTR bugs reported by SONDEREGGER Bernhard.
  - Now a leading uncapital letter OS line is acceptable. (cf. uniprot:Q32725).
  - Fixed regexp for parsing the OS line from uniprot:O63147.



Index: sptr.rb
===================================================================
RCS file: /home/repository/bioruby/bioruby/lib/bio/db/embl/sptr.rb,v
retrieving revision 1.34
retrieving revision 1.35
diff -C2 -d -r1.34 -r1.35
*** sptr.rb	15 Jul 2006 15:29:26 -0000	1.34
--- sptr.rb	5 Oct 2006 07:39:29 -0000	1.35
***************
*** 293,301 ****
    #  OS   Genus species (name0), G s0 (name0), and G s (name0) (name1).
    #  OS   Homo sapiens (Human), and Rarrus norveticus (Rat)
    def os(num = nil)
      unless @data['OS']
        os = Array.new
        fetch('OS').split(/, and|, /).each do |tmp|
!         if tmp =~ /([A-Z][a-z]* *[\w\d \:\'\+\-]+[\w\d])/
            org = $1
            tmp =~ /(\(.+\))/ 
--- 293,303 ----
    #  OS   Genus species (name0), G s0 (name0), and G s (name0) (name1).
    #  OS   Homo sapiens (Human), and Rarrus norveticus (Rat)
+   #  OS   Hippotis sp. Clark and Watts 825.
+   #  OS   unknown cyperaceous sp.
    def os(num = nil)
      unless @data['OS']
        os = Array.new
        fetch('OS').split(/, and|, /).each do |tmp|
!         if tmp =~ /(\w+ *[\w\d \:\'\+\-\.]+[\w\d\.])/
            org = $1
            tmp =~ /(\(.+\))/