[BioRuby-cvs] bioruby/lib/bio/db/kegg compound.rb, 0.15, 0.16 drug.rb, 1.2, 1.3 genome.rb, 0.17, 0.18 glycan.rb, 1.5, 1.6 reaction.rb, 1.5, 1.6

[Katayama Toshiaki]

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

Modified Files:
	compound.rb drug.rb genome.rb glycan.rb reaction.rb 
Log Message:
* utilize field_fetch


Index: compound.rb
===================================================================
RCS file: /home/repository/bioruby/bioruby/lib/bio/db/kegg/compound.rb,v
retrieving revision 0.15
retrieving revision 0.16
diff -C2 -d -r0.15 -r0.16
*** compound.rb	5 Apr 2007 23:35:41 -0000	0.15
--- compound.rb	28 Jun 2007 11:27:24 -0000	0.16
***************
*** 24,31 ****
    # ENTRY
    def entry_id
!     unless @data['ENTRY']
!       @data['ENTRY'] = fetch('ENTRY').split(/\s+/).first
!     end
!     @data['ENTRY']
    end
  
--- 24,28 ----
    # ENTRY
    def entry_id
!     field_fetch('ENTRY')[/\S+/]
    end
  

Index: drug.rb
===================================================================
RCS file: /home/repository/bioruby/bioruby/lib/bio/db/kegg/drug.rb,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** drug.rb	5 Apr 2007 23:35:41 -0000	1.2
--- drug.rb	28 Jun 2007 11:27:24 -0000	1.3
***************
*** 24,31 ****
    # ENTRY
    def entry_id
!     unless @data['ENTRY']
!       @data['ENTRY'] = fetch('ENTRY').split(/\s+/).first
!     end
!     @data['ENTRY']
    end
  
--- 24,28 ----
    # ENTRY
    def entry_id
!     field_fetch('ENTRY')[/\S+/]
    end
  

Index: genome.rb
===================================================================
RCS file: /home/repository/bioruby/bioruby/lib/bio/db/kegg/genome.rb,v
retrieving revision 0.17
retrieving revision 0.18
diff -C2 -d -r0.17 -r0.18
*** genome.rb	5 Apr 2007 23:35:41 -0000	0.17
--- genome.rb	28 Jun 2007 11:27:24 -0000	0.18
***************
*** 33,37 ****
    # ENTRY -- Returns contents of the ENTRY record as a String.
    def entry_id
!     field_fetch('ENTRY')
    end
    
--- 33,37 ----
    # ENTRY -- Returns contents of the ENTRY record as a String.
    def entry_id
!     field_fetch('ENTRY')[/\S+/]
    end
    

Index: reaction.rb
===================================================================
RCS file: /home/repository/bioruby/bioruby/lib/bio/db/kegg/reaction.rb,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** reaction.rb	5 Apr 2007 23:35:41 -0000	1.5
--- reaction.rb	28 Jun 2007 11:27:24 -0000	1.6
***************
*** 24,28 ****
    # ENTRY
    def entry_id
!     field_fetch('ENTRY')
    end
  
--- 24,28 ----
    # ENTRY
    def entry_id
!     field_fetch('ENTRY')[/\S+/]
    end
  

Index: glycan.rb
===================================================================
RCS file: /home/repository/bioruby/bioruby/lib/bio/db/kegg/glycan.rb,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** glycan.rb	5 Apr 2007 23:35:41 -0000	1.5
--- glycan.rb	28 Jun 2007 11:27:24 -0000	1.6
***************
*** 24,31 ****
    # ENTRY
    def entry_id
!     unless @data['ENTRY']
!       @data['ENTRY'] = fetch('ENTRY').split(/\s+/).first
!     end
!     @data['ENTRY']
    end
  
--- 24,28 ----
    # ENTRY
    def entry_id
!     field_fetch('ENTRY')[/\S+/]
    end