roo 1.9.6 → 1.9.7

data/History.txt

@@ -1,4 +1,10 @@
+== 1.9.7 2011-08-27
+
+* 1 bugfix
+  * Openoffice: Better way for extracting formula strings, some characters were deleted at the formula string under some circumstances.
+
 == 1.9.6 2011-08-03
+
 * 1 enhancement
   * new class Libreoffice (Libreoffice should do exactly the same as the Openoffice
     class. It's just another name. Technically, Libreoffice is inherited from

data/bin/roo

@@ -26,7 +26,8 @@ Choice.options do
 		long '--info <spreadsheetfile>'
 		desc 'Show information about a spreadsheet file'
 		action do
-			puts '#'
+			p Choice.choices
+			puts 'Filename: '+Choice.choices['info']
 		end
 	end
 end

data/lib/roo.rb

@@ -3,7 +3,7 @@
 module Roo
 
   # :stopdoc:
-  VERSION = '1.9.6'
+  VERSION = '1.9.7'
   LIBPATH = ::File.expand_path(::File.dirname(__FILE__)) + ::File::SEPARATOR
   PATH = ::File.dirname(LIBPATH) + ::File::SEPARATOR
   # :startdoc:

data/lib/roo/excel.rb

@@ -100,8 +100,7 @@ class Excel < GenericSpreadsheet
   def initialize(filename, packed = nil, file_warning = :error)
     super()
     @file_warning = file_warning
-        file_type_check(filename,'.xls','an Excel',packed)
-    # @tmpdir = "oo_"+$$.to_s
+    file_type_check(filename,'.xls','an Excel',packed)
     @tmpdir = GenericSpreadsheet.next_tmpdir
     @tmpdir = File.join(ENV['ROO_TMP'], @tmpdir) if ENV['ROO_TMP'] 
     unless File.exists?(@tmpdir)
@@ -110,36 +109,19 @@ class Excel < GenericSpreadsheet
     filename = open_from_uri(filename) if filename[0,7] == "http://"
     filename = open_from_stream(filename[7..-1]) if filename[0,7] == "stream:"
     filename = unzip(filename) if packed and packed == :zip
-    #begin
-      #begin
-      #  file_type_check(filename,'.xls','an Excel')
-      #rescue TypeError
-      #  #FileUtils::rm_r @tmpdir
-      #  raise
-      #end
-      @filename = filename
-      unless File.file?(@filename)
-        FileUtils::rm_r(@tmpdir)
-        raise IOError, "file #{@filename} does not exist"
-      end
-      begin
-        @workbook = Spreadsheet.open(filename)
-      rescue Ole::Storage::FormatError
-        FileUtils::rm_r(@tmpdir)
-        raise # nach aussen weiterhin sichtbar
-      end
-      @default_sheet = self.sheets.first
-    #ensure
-      #if ENV["roo_local"] != "thomas-p"
-	    # ich glaube ich darf hier noch nicht die temporaere
-      # Datei loeschen, weil
-      #to do
-        #"Loeschen temp. Directory anpassen"
-      #end
-    #end
-    #if fremdrechner?
+    @filename = filename
+    unless File.file?(@filename)
+      FileUtils::rm_r(@tmpdir)
+      raise IOError, "file #{@filename} does not exist"
+    end
+    begin
+      @workbook = Spreadsheet.open(filename)
+    rescue Ole::Storage::FormatError
       FileUtils::rm_r(@tmpdir)
-    #end
+      raise # nach aussen weiterhin sichtbar
+    end
+    @default_sheet = self.sheets.first
+    FileUtils::rm_r(@tmpdir)
     @cell = Hash.new
     @cell_type = Hash.new
     @formula = Hash.new
@@ -154,11 +136,7 @@ class Excel < GenericSpreadsheet
 
   # returns an array of sheet names in the spreadsheet
   def sheets
-    result = []
-    @workbook.worksheets.each do |worksheet| 
-      result << normalize_string(worksheet.name)
-    end
-    return result
+    @workbook.worksheets.collect {|worksheet| normalize_string(worksheet.name)}
   end
 
   # returns the content of a cell. The upper left corner is (1,1) or ('A',1)
@@ -175,7 +153,6 @@ class Excel < GenericSpreadsheet
     if celltype(row,col,sheet) == :string
       return platform_specific_iconv(@cell[sheet][[row,col]])
     else
-      #return @cell[sheet][[row,col]]
       if @cell[sheet] and @cell[sheet][[row,col]]
         return @cell[sheet][[row,col]]
       else
@@ -200,7 +177,6 @@ class Excel < GenericSpreadsheet
       if @formula[sheet] and @formula[sheet][[row,col]]
         return :formula
       else
-        # @cell_type[sheet][[row,col]]
         if @cell_type[sheet] and @cell_type[sheet][[row,col]]
           return @cell_type[sheet][[row,col]]
         else
@@ -354,7 +330,7 @@ class Excel < GenericSpreadsheet
     @fonts[sheet] = {} unless @fonts[sheet]
     @fonts[sheet][key] = font
     
-    case vt # @cell_type[sheet][key]
+    case vt 
     when :float
       @cell[sheet][key] = v.to_f
     when :string
@@ -388,7 +364,7 @@ class Excel < GenericSpreadsheet
       (0..row.size).each do |cell_index|
         cell = row.at(cell_index)
         next if cell.nil?  #skip empty cells
-        next if cell.class == Spreadsheet::Formula && cell.value.nil? # skip empty formla cells
+        next if cell.class == Spreadsheet::Formula && cell.value.nil? # skip empty formula cells
         if date_or_time?(row, cell_index)
           vt, v = read_cell_date_or_time(row, cell_index)
         else
@@ -484,18 +460,4 @@ class Excel < GenericSpreadsheet
   end
   private :read_cell
   
-  #TODO: testing only
-  #  def inject_null_characters(str)
-  #    if str.class != String
-  #      return str
-  #    end
-  #    new_str=''
-  #    0.upto(str.size-1) do |i|
-  #      new_str += str[i,1]
-  #      new_str += "\000"
-  #    end
-  #    new_str
-  #  end
-  #
-
 end

data/lib/roo/excelx.rb

@@ -1,4 +1,3 @@
-#TODO: require 'xml'
 require 'fileutils'
 require 'zip/zipfilesystem'
 require 'date'
@@ -87,8 +86,7 @@ class Excelx < GenericSpreadsheet
   def initialize(filename, packed=nil, file_warning = :error) #, create = false)
     super()
     @file_warning = file_warning
-      file_type_check(filename,'.xlsx','an Excel-xlsx',packed)
-    #@tmpdir = "oo_"+$$.to_s
+    file_type_check(filename,'.xlsx','an Excel-xlsx',packed)
     @tmpdir = GenericSpreadsheet.next_tmpdir
     @tmpdir = File.join(ENV['ROO_TMP'], @tmpdir) if ENV['ROO_TMP'] 
     unless File.exists?(@tmpdir)
@@ -96,52 +94,39 @@ class Excelx < GenericSpreadsheet
     end
     filename = open_from_uri(filename) if filename[0,7] == "http://"
     filename = unzip(filename) if packed and packed == :zip
-    #begin
-      #file_type_check(filename,'.xlsx','an Excel-xlsx')
-      @cells_read = Hash.new
-      @filename = filename
-      unless File.file?(@filename)
-        FileUtils::rm_r(@tmpdir)
-        raise IOError, "file #{@filename} does not exist"
-      end
-      @@nr += 1
-      @file_nr = @@nr
-      extract_content(@filename)
-      file = File.new(File.join(@tmpdir, @file_nr.to_s+"_roo_workbook.xml"))
-      # TODO: @workbook_doc = XML::Parser.io(file).parse
-      @workbook_doc = Nokogiri::XML(file)
-
-
+    @cells_read = Hash.new
+    @filename = filename
+    unless File.file?(@filename)
+      FileUtils::rm_r(@tmpdir)
+      raise IOError, "file #{@filename} does not exist"
+    end
+    @@nr += 1
+    @file_nr = @@nr
+    extract_content(@filename)
+    file = File.new(File.join(@tmpdir, @file_nr.to_s+"_roo_workbook.xml"))
+    @workbook_doc = Nokogiri::XML(file)
+    file.close
+    @shared_table = []
+    if File.exist?(File.join(@tmpdir, @file_nr.to_s+'_roo_sharedStrings.xml'))
+      file = File.new(File.join(@tmpdir, @file_nr.to_s+'_roo_sharedStrings.xml'))
+      @sharedstring_doc = Nokogiri::XML(file)
       file.close
-      @shared_table = []
-      if File.exist?(File.join(@tmpdir, @file_nr.to_s+'_roo_sharedStrings.xml'))
-        file = File.new(File.join(@tmpdir, @file_nr.to_s+'_roo_sharedStrings.xml'))
-        #TODO: @sharedstring_doc = XML::Parser.io(file).parse
-        @sharedstring_doc = Nokogiri::XML(file)
-        file.close
-        read_shared_strings(@sharedstring_doc)
-      end
-      @styles_table = []
-      @style_definitions = Array.new # TODO: ??? { |h,k| h[k] = {} }
-      if File.exist?(File.join(@tmpdir, @file_nr.to_s+'_roo_styles.xml'))
-        file = File.new(File.join(@tmpdir, @file_nr.to_s+'_roo_styles.xml'))
-        #TODO: @styles_doc = XML::Parser.io(file).parse
-        @styles_doc = Nokogiri::XML(file)
-        file.close
-        read_styles(@styles_doc)
-      end
-      @sheet_doc = []
-      @sheet_files.each_with_index do |item, i|
-        file = File.new(item)
-        #TODO: @sheet_doc[i] = XML::Parser.io(file).parse
-        @sheet_doc[i] = Nokogiri::XML(file)
-        file.close
-      end
-    #ensure
-      #if ENV["roo_local"] != "thomas-p"
-      #FileUtils::rm_r(@tmpdir)
-      #end
-    #end
+      read_shared_strings(@sharedstring_doc)
+    end
+    @styles_table = []
+    @style_definitions = Array.new # TODO: ??? { |h,k| h[k] = {} }
+    if File.exist?(File.join(@tmpdir, @file_nr.to_s+'_roo_styles.xml'))
+      file = File.new(File.join(@tmpdir, @file_nr.to_s+'_roo_styles.xml'))
+      @styles_doc = Nokogiri::XML(file)
+      file.close
+      read_styles(@styles_doc)
+    end
+    @sheet_doc = []
+    @sheet_files.each_with_index do |item, i|
+      file = File.new(item)
+      @sheet_doc[i] = Nokogiri::XML(file)
+      file.close
+    end
     FileUtils::rm_r(@tmpdir)
     @default_sheet = self.sheets.first
     @cell = Hash.new
@@ -296,13 +281,12 @@ class Excelx < GenericSpreadsheet
   # returns an array of sheet names in the spreadsheet
   def sheets
     return_sheets = []
-    #TODO:    @workbook_doc.find("//*[local-name()='sheet']").each do |sheet|
     @workbook_doc.xpath("//*[local-name()='sheet']").each do |sheet|
-      #TODO:      return_sheets << sheet.attributes.to_h['name']
       return_sheets << sheet['name']
     end
     return_sheets
   end
+
   # shows the internal representation of all cells
   # for debugging purposes
   def to_s(sheet=nil)
@@ -315,9 +299,9 @@ class Excelx < GenericSpreadsheet
 
   # helper function to set the internal representation of cells
   def set_cell_values(sheet,x,y,i,v,vt,formula,tr,str_v,
-      excelx_type=nil,
-      excelx_value=nil,
-      s_attribute=nil)
+    excelx_type=nil,
+    excelx_value=nil,
+    s_attribute=nil)
     key = [y,x+i]
     @cell_type[sheet] = {} unless @cell_type[sheet]
     @cell_type[sheet][key] = vt
@@ -390,18 +374,13 @@ class Excelx < GenericSpreadsheet
     raise ArgumentError, "Error: sheet '#{sheet||'nil'}' not valid" if @default_sheet == nil and sheet==nil
     raise RangeError unless self.sheets.include? sheet
     n = self.sheets.index(sheet)
-    #TODO:    @sheet_doc[n].find("//*[local-name()='c']").each do |c|
     @sheet_doc[n].xpath("//*[local-name()='c']").each do |c|
-      #TODO:      s_attribute = c.attributes.to_h['s'].to_i   # should be here
       s_attribute = c['s'].to_i   # should be here
-      #TODO: if (c.attributes.to_h['t'] == 's')
       # c: <c r="A5" s="2">
       # <v>22606</v>
       # </c>, format: , tmp_type: float
-
       if c['t'] == 's'
         tmp_type = :shared
-        #TODO: elsif (c.attributes.to_h['t'] == 'b')
       elsif c['t'] == 'b'
         tmp_type = :boolean
         # 2011-02-25 BEGIN
@@ -409,19 +388,15 @@ class Excelx < GenericSpreadsheet
         tmp_type = :string
         # 2011-02-25 END
       else
-        #s_attribute = c.attributes.to_h['s'].to_i     # was here
-        s_attribute = c['s'].to_i     # was here
+        s_attribute = c['s'].to_i
         format = attribute2format(s_attribute)
         tmp_type = format2type(format)
       end
       formula = nil
-      #TODO:      c.each_element do |cell|
       c.children.each do |cell|
-        #TODO: if cell.name == 'f'
         if cell.name == 'f'
           formula = cell.content
         end
-        #TODO:        if cell.name == 'v'
         if cell.name == 'v'
           if tmp_type == :time or tmp_type == :datetime
             if cell.content.to_f >= 1.0 
@@ -464,8 +439,6 @@ class Excelx < GenericSpreadsheet
             vt = :float
             v = cell.content
           end
-          #puts "vt: #{vt}" if cell.text.include? "22606.5120"
-          #TODO: x,y = split_coordinate(c.attributes.to_h['r'])
           x,y = split_coordinate(c['r'])
           tr=nil #TODO: ???s
           set_cell_values(sheet,x,y,0,v,vt,formula,tr,str_v,excelx_type,excelx_value,s_attribute)
@@ -546,13 +519,10 @@ class Excelx < GenericSpreadsheet
 
   # read the shared strings xml document
   def read_shared_strings(doc)
-    #TODO: doc.find("//*[local-name()='si']").each do |si|
     doc.xpath("//*[local-name()='si']").each do |si|
       shared_table_entry = ''
-      #TODO:  si.each_element do |elem|
       si.children.each do |elem|
         if elem.name == 'r' and elem.children
-          # elem.each_element do |r_elem|
           elem.children.each do |r_elem|
             if r_elem.name == 't'
               shared_table_entry << r_elem.content
@@ -573,19 +543,13 @@ class Excelx < GenericSpreadsheet
     @cellXfs = []
     fonts = []
     
-    #TODO:     doc.find("//*[local-name()='numFmt']").each do |numFmt|
     doc.xpath("//*[local-name()='numFmt']").each do |numFmt|
-      # TODO: numFmtId = numFmt.attributes.to_h['numFmtId']
       numFmtId = numFmt.attributes['numFmtId']
-      #TODO: formatCode = numFmt.attributes.to_h['formatCode']
       formatCode = numFmt.attributes['formatCode']
       @numFmts << [numFmtId, formatCode]
     end
-    #TODO:    doc.find("//*[local-name()='fonts']").each do |fonts_el|
     doc.xpath("//*[local-name()='fonts']").each do |fonts_el|
-      #TODO: fonts_el.each_element do |font_el|
       fonts_el.children.each do |font_el|
-        #TODO: if font_el.name == 'font'
         if font_el == 'font'
           font = Excelx::Font.new
           font_el.each_element do |font_sub_el|
@@ -603,13 +567,10 @@ class Excelx < GenericSpreadsheet
       end
     end
     
-    #TODO:    doc.find("//*[local-name()='cellXfs']").each do |xfs|
     doc.xpath("//*[local-name()='cellXfs']").each do |xfs|
       xfs.children.each do |xf|
-        #TODO:        numFmtId = xf.attributes.to_h['numFmtId']
         numFmtId = xf['numFmtId']
         @cellXfs << [numFmtId]
-        #TODO:        fontId = xf.attributes.to_h['fontId'].to_i
         fontId = xf['fontId'].to_i
         @style_definitions << fonts[fontId]
       end
@@ -620,7 +581,6 @@ class Excelx < GenericSpreadsheet
   def attribute2format(s)
     result = nil
     @numFmts.each {|nf|
-      #TODO: if nf.first == @cellXfs[s.to_i].first
       # to_s weil das eine Nokogiri::XML::Attr und das
       # andere ein String ist
       if nf.first.to_s == @cellXfs[s.to_i].first

data/lib/roo/generic_spreadsheet.rb

@@ -6,8 +6,6 @@ class GenericSpreadsheet
 
   attr_reader :default_sheet
 
-  @@class_counter = 0
-
   # sets the line with attribute names (default: 1)
   attr_accessor :header_line
 
@@ -30,11 +28,8 @@ class GenericSpreadsheet
   end
 
   def self.next_tmpdir
-	  @@class_counter += 1
-	  # tmpdir = "oo_"+$$.to_s+"_"+sprintf("%04d",@@class_counter)
-	  tmpdir = "oo_"+$$.to_s+"_"+sprintf("%010d",rand(10_000_000_000))
-	  # p "@tmpdir = #{tmpdir}"; sleep 5
-	  tmpdir
+    tmpdir = "oo_"+$$.to_s+"_"+sprintf("%010d",rand(10_000_000_000))
+    tmpdir
   end
 
 
@@ -333,9 +328,14 @@ class GenericSpreadsheet
   def reload
     # von Abfrage der Klasse direkt auf .to_s == '..' umgestellt
     ds = @default_sheet
-    initialize(@filename) if self.class.to_s == 'Openoffice' or
-      self.class.to_s == 'Excel'
-    initialize(@spreadsheetkey,@user,@password) if self.class.to_s == 'Google'
+    if self.class.to_s == 'Google'
+      initialize(@spreadsheetkey,@user,@password)
+    else
+      initialize(@filename)
+      to do
+	      'was ist mit weiteren Parametern bei initialize'
+      end
+    end
     self.default_sheet = ds
     #@first_row = @last_row = @first_column = @last_column = nil
   end
@@ -354,13 +354,7 @@ class GenericSpreadsheet
   # recursively removes the current temporary directory
   # this is only needed if you work with zipped files or files via the web
   def remove_tmp
-    #to do
-    #  "remove_tmp wieder aktivieren"
-    #end
-    #return
-    #$log.debug("remove_tmp('#{@tmpdir}')")
     if File.exists?(@tmpdir)
-      #$log.debug("#{@tmpdir} exists")
       FileUtils::rm_r(@tmpdir)
     end
   end
@@ -441,12 +435,11 @@ class GenericSpreadsheet
     sheet = @default_sheet unless sheet
     read_cells(sheet) unless @cells_read[sheet]
     return theformulas unless first_row(sheet) # if there is no first row then
-                                               # there can't be formulas
+    # there can't be formulas
     first_row(sheet).upto(last_row(sheet)) {|row|
       first_column(sheet).upto(last_column(sheet)) {|col|
         if formula?(row,col,sheet)
-          f = [row, col, formula(row,col,sheet)]
-          theformulas << f
+          theformulas << [row, col, formula(row,col,sheet)]
         end
       }
     }
@@ -592,17 +585,12 @@ class GenericSpreadsheet
     if ! sheet_found
       raise RangeError, "sheet '#{@default_sheet}' not found"
     end
-    #raise ArgumentError, "Error: default_sheet not set" if @default_sheet == nil
   end
 
   def process_zipfile_packed(zip, path='')
     ret=nil
     if zip.file.file? path
       # extract and return filename
-      #2011-08-01 @tmpdir = "oo_"+$$.to_s
-      #2011-08-01 unless File.exists?(@tmpdir)
-        #2011-08-01 FileUtils::mkdir(@tmpdir)
-      #2011-08-01end
       file = File.open(File.join(@tmpdir, path),"wb")
       file.write(zip.read(path))
       file.close
@@ -623,7 +611,6 @@ class GenericSpreadsheet
   def write_csv_content(file=nil,sheet=nil)
     file = STDOUT unless file
     if first_row(sheet) # sheet is not empty
-      # first_row(sheet).upto(last_row(sheet)) do |row|
       1.upto(last_row(sheet)) do |row|
         1.upto(last_column(sheet)) do |col|
           file.print(",") if col > 1
@@ -644,16 +631,10 @@ class GenericSpreadsheet
     else
       case onecelltype
       when :string
-        #if onecell == ""
-        #  str << ''
-        #else
-        #  one = onecell.gsub(/"/,'""')
-        #  str << ('"'+one+'"')
-        #end
-	unless onecell.empty?
+        unless onecell.empty?
           one = onecell.gsub(/"/,'""')
           str << ('"'+one+'"')
-	end
+        end
       when :float, :percentage
         if onecell == onecell.to_i
           str << onecell.to_i.to_s
@@ -662,16 +643,10 @@ class GenericSpreadsheet
         end
       when :formula
         if onecell.class == String
-          # if onecell == ""
-          #   str << ''
-          # else
-          #   one = onecell.gsub(/"/,'""')
-          #   str << '"'+one+'"'
-          # end
-	  unless onecell.empty?
+          unless onecell.empty?
             one = onecell.gsub(/"/,'""')
             str << '"'+one+'"'
-	  end
+          end
         elsif onecell.class == Float
           if onecell == onecell.to_i
             str << onecell.to_i.to_s
@@ -686,10 +661,7 @@ class GenericSpreadsheet
       when :time
         str << GenericSpreadsheet.integer_to_timestring(onecell)
       when :datetime
-	# date,rest = onecell.to_s.split('T')
-	# time = rest.split('+').first
-	# str << date + ' ' + time
-	str << onecell.to_s
+        str << onecell.to_s
       else
         raise "unhandled celltype "+onecelltype.to_s
       end

data/lib/roo/google.rb

@@ -249,19 +249,12 @@ class Google < GenericSpreadsheet
         @cell_type[sheet][key] = value_type
         @formula[sheet] = {} unless @formula[sheet]
         @formula[sheet][key] = string_value if value_type == :formula
-        ############
-        #$log.debug("key: #{key}")
-        #$log.debug "#{ws[row,col].inspect}"
-        #@cell[sheet][key] = ws[row,col]
-        #$log.debug "@cell[sheet][key]: #{@cell[sheet][key]}"
-        ############
       end
     end
     @cells_read[sheet] = true
   end
   
   def determine_datatype(val, numval=nil)
-    #    $log.debug "val: #{val} numval: #{numval}"
     if val.nil? || val[0,1] == '='
       ty = :formula
       if numeric?(numval)
@@ -284,7 +277,6 @@ class Google < GenericSpreadsheet
         ty = :string
       end
     end
-    #$log.debug "val: #{val} ty: #{ty}" if ty == :date
     return val, ty 
   end
 

data/lib/roo/openoffice.rb

@@ -2,7 +2,6 @@ require 'rubygems'
 require 'fileutils'
 require 'zip/zipfilesystem'
 require 'date'
-require 'base64'
 require 'nokogiri'
 require 'cgi'
 
@@ -12,7 +11,7 @@ class Openoffice < GenericSpreadsheet
 
   # initialization and opening of a spreadsheet file
   # values for packed: :zip
-  def initialize(filename, packed=nil, file_warning=:error, tmpdir=nil) #, create = false)
+  def initialize(filename, packed=nil, file_warning=:error, tmpdir=nil)
     @file_warning = file_warning
     super()
     file_type_check(filename,'.ods','an openoffice', packed)
@@ -24,9 +23,6 @@ class Openoffice < GenericSpreadsheet
     end
     filename = open_from_uri(filename) if filename[0,7] == "http://"
     filename = unzip(filename) if packed and packed == :zip
-    #if create and ! File.exists?(filename)
-    #  self.create_openoffice(filename)
-    #end
     @cells_read = Hash.new
     #TODO: @cells_read[:default] = false
     @filename = filename
@@ -40,9 +36,7 @@ class Openoffice < GenericSpreadsheet
     file = File.new(File.join(@tmpdir, @file_nr.to_s+"_roo_content.xml"))
     @doc = Nokogiri::XML(file)
     file.close
-    #unless Dir.glob(@tmpdir).empty?
-      FileUtils::rm_r(@tmpdir)
-    #end
+    FileUtils::rm_r(@tmpdir)
     @default_sheet = self.sheets.first
     @cell = Hash.new
     @cell_type = Hash.new
@@ -69,18 +63,6 @@ class Openoffice < GenericSpreadsheet
 	  end
   end
 
-  # creates a new empty openoffice-spreadsheet file
-  def create_openoffice(filename) #:nodoc:
-    #TODO: a better way for creating the file contents
-    # now you have to call mkbase64...rb to create an include file with all
-    # the empty files in an openoffice zip-file
-    load 'base64include.rb'
-    # puts @@empty_spreadsheet
-    f = File.open(filename,'wb')
-    f.print(Base64.decode64(@@empty_spreadsheet))
-    f.close
-  end
-
   # Returns the content of a spreadsheet-cell.
   # (1,1) is the upper left corner.
   # (1,1), (1,'A'), ('A',1), ('a',1) all refers to the
@@ -90,7 +72,6 @@ class Openoffice < GenericSpreadsheet
     read_cells(sheet) unless @cells_read[sheet]
     row,col = normalize(row,col)
     if celltype(row,col,sheet) == :date
-      #TODO: yyyy,mm,dd = @cell[sheet][[row,col]].split('-')
       yyyy,mm,dd = @cell[sheet][[row,col]].to_s.split('-')
       return Date.new(yyyy.to_i,mm.to_i,dd.to_i)
     end
@@ -107,7 +88,13 @@ class Openoffice < GenericSpreadsheet
     if @formula[sheet][[row,col]] == nil
       return nil
     else
-      return @formula[sheet][[row,col]]["oooc:".length..-1]
+      # return @formula[sheet][[row,col]]["oooc:".length..-1]
+      str = @formula[sheet][[row,col]]
+      if str.include? ':'
+	      return str[str.index(':')+1..-1]
+      else
+	      return str
+      end
     end
   end
 
@@ -183,9 +170,7 @@ class Openoffice < GenericSpreadsheet
 
   def sheets
     return_sheets = []
-    #TODO: @doc.find("//*[local-name()='table']").each do |sheet|
     @doc.xpath("//*[local-name()='table']").each do |sheet|
-      #TODO: return_sheets << sheet.attributes['name']
       return_sheets << sheet['name']
     end
     return_sheets
@@ -206,11 +191,6 @@ class Openoffice < GenericSpreadsheet
     @cell[sheet].inspect
   end
 
-  # save spreadsheet
-  def save #:nodoc:
-    42
-  end
-
   # returns the row,col values of the labelled cell
   # (nil,nil) if label is not defined
   # sheet parameter is not really needed because label names are global
@@ -231,7 +211,6 @@ class Openoffice < GenericSpreadsheet
 
   # read the version of the OO-Version
   def oo_version
-    #TODO: @doc.find("//*[local-name()='document-content']").each do |office|
     @doc.xpath("//*[local-name()='document-content']").each do |office|
       @officeversion = office.attributes['version'].to_s
     end
@@ -300,41 +279,30 @@ class Openoffice < GenericSpreadsheet
       @labels[name] = [sheetname,row,col]
     end
     
-    #TODO: @doc.find("//*[local-name()='table']").each do |ws|
     @doc.xpath("//*[local-name()='table']").each do |ws|
-      #TODO: if sheet == ws.attributes['name']
       if sheet == ws['name']
         sheet_found = true
         col = 1
         row = 1
-        #TODO: ws.each_element do |table_element|
         ws.children.each do |table_element|
           case table_element.name
           when 'table-column'
             @style_defaults[sheet] << table_element.attributes['default-cell-style-name'] 
           when 'table-row'
             if table_element.attributes['number-rows-repeated']
-              #TODO: skip_row = table_element.attributes['number-rows-repeated'].to_i
               skip_row = table_element.attributes['number-rows-repeated'].to_s.to_i
               row = row + skip_row - 1
             end
-            #TODO: table_element.each_element do |cell|
             table_element.children.each do |cell|
-              #TODO: skip_col = cell.attributes['number-columns-repeated']
               skip_col = cell['number-columns-repeated']
-              #TODO: formula = cell.attributes['formula']
               formula = cell['formula']
-              #TODO: vt = cell.attributes['value-type']
               vt = cell['value-type']
-              #TODO: v =  cell.attributes['value']
               v =  cell['value']
-              #TODO: style_name = cell.attributes['style-name']
               style_name = cell['style-name']
               if vt == 'string'
                 str_v  = ''
                 # insert \n if there is more than one paragraph
                 para_count = 0
-                #TODO: cell.each_element do |str|
                 cell.children.each do |str|
                   if str.name == 'p'
                     v = str.content
@@ -352,7 +320,6 @@ class Openoffice < GenericSpreadsheet
                   end # == 'p'
                 end
               elsif vt == 'time'
-                #TODO: cell.each_element do |str|
                 cell.children.each do |str|
                   if str.name == 'p'
                     v = str.content
@@ -388,8 +355,6 @@ class Openoffice < GenericSpreadsheet
         end
       end
     end
-    
-    #TODO: @doc.find("//*[local-name()='automatic-styles']").each do |style|
     @doc.xpath("//*[local-name()='automatic-styles']").each do |style|
       read_styles(style)
     end

data/test/benchmark1.rb

@@ -0,0 +1,43 @@
+require 'rubygems'
+require 'roo'
+require 'benchmark'
+
+def process_all_cells(oo)
+	oo.default_sheet = oo.sheets.first
+	#oo.first_row.upto(oo.last_row) do |row|
+	#	oo.first_column.upto(oo.last_column) do |col|
+	#		result = oo.cell(row,col)
+	#	end
+	#end
+	ret = []
+	oo.first_row.upto(oo.last_row) do |row|
+		ret << oo.row(row)
+	end
+end
+# 3735 Zeilen jeweils
+def openoffice
+	oo = Openoffice.new('Bibelbund.ods')
+	process_all_cells(oo)
+end
+def excel
+	oo = Excel.new('Bibelbund.xls')
+	process_all_cells(oo)
+end
+def excelx
+	oo = Excelx.new('Bibelbund.xlsx')
+	process_all_cells(oo)
+end
+
+n = 1
+Benchmark.bmbm(10) do |x|
+x.report('openoffice:') { n.times do   
+	openoffice 
+end }
+x.report('excel:') { n.times do   
+	excel 
+end }
+x.report('excelx:') { n.times do   
+	excelx
+end }
+end
+

data/test/test_roo.rb

@@ -34,7 +34,7 @@ $log = Logger.new(File.join(ENV['HOME'],"roo.log"))
 #$log.level = Logger::WARN
 $log.level = Logger::DEBUG
 
-DISPLAY_LOG = false
+DISPLAY_LOG = true
 DB_LOG = false
 if DB_LOG
   require 'activerecord'
@@ -170,7 +170,7 @@ class TestRoo < Test::Unit::TestCase
   LIBREOFFICE       = true  	# do Libreoffice tests? (.ods files)
 
   ONLINE = false
-  LONG_RUN = false
+  LONG_RUN = true
   GLOBAL_TIMEOUT = 48.minutes 
 
   def setup
@@ -2351,4 +2351,29 @@ where the expected result is
       assert_equal "", `diff test/so_datetime.csv datetime.csv`
     end
   end
+
+  # 2011-08-11
+  def test_bug_openoffice_formula_missing_letters
+	  if OPENOFFICE
+		  # Dieses Dokument wurde mit LibreOffice angelegt.
+		  # Keine Ahnung, ob es damit zusammenhaengt, das diese
+		  # Formeln anders sind, als in der Datei formula.ods, welche
+		  # mit Openoffice angelegt wurde.
+		  # Bei den Openoffice-Dateien ist in diesem Feld in der XML-
+		  # Datei of: als Prefix enthalten, waehrend in dieser Datei
+		  # irgendetwas mit oooc: als Prefix verwendet wird.
+		  oo = Openoffice.new(File.join(TESTDIR,'dreimalvier.ods'))
+		  oo.default_sheet = oo.sheets.first
+		  assert_equal '=SUM([.A1:.D1])', oo.formula('e',1)
+		  assert_equal '=SUM([.A2:.D2])', oo.formula('e',2)
+		  assert_equal '=SUM([.A3:.D3])', oo.formula('e',3)
+		  assert_equal [ 
+			  [1,5,'=SUM([.A1:.D1])'],
+		          [2,5,'=SUM([.A2:.D2])'],
+		          [3,5,'=SUM([.A3:.D3])'],
+		  ], oo.formulas
+
+	  end
+  end
+
 end # class

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: roo
 version: !ruby/object:Gem::Version
-  version: 1.9.6
+  version: 1.9.7
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-08-03 00:00:00.000000000Z
+date: 2011-08-27 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: spreadsheet
-  requirement: &25564452 !ruby/object:Gem::Requirement
+  requirement: &25467852 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>'
@@ -21,10 +21,10 @@ dependencies:
         version: 0.6.4
   type: :runtime
   prerelease: false
-  version_requirements: *25564452
+  version_requirements: *25467852
 - !ruby/object:Gem::Dependency
   name: nokogiri
-  requirement: &25564128 !ruby/object:Gem::Requirement
+  requirement: &25467564 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
         version: 1.5.0
   type: :runtime
   prerelease: false
-  version_requirements: *25564128
+  version_requirements: *25467564
 - !ruby/object:Gem::Dependency
   name: google-spreadsheet-ruby
-  requirement: &25563816 !ruby/object:Gem::Requirement
+  requirement: &25467036 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,10 +43,10 @@ dependencies:
         version: 0.1.5
   type: :runtime
   prerelease: false
-  version_requirements: *25563816
+  version_requirements: *25467036
 - !ruby/object:Gem::Dependency
   name: choice
-  requirement: &25563468 !ruby/object:Gem::Requirement
+  requirement: &25466676 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -54,10 +54,10 @@ dependencies:
         version: 0.1.4
   type: :runtime
   prerelease: false
-  version_requirements: *25563468
+  version_requirements: *25466676
 - !ruby/object:Gem::Dependency
   name: todonotes
-  requirement: &25563144 !ruby/object:Gem::Requirement
+  requirement: &25466244 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -65,18 +65,18 @@ dependencies:
         version: 0.1.0
   type: :runtime
   prerelease: false
-  version_requirements: *25563144
+  version_requirements: *25466244
 - !ruby/object:Gem::Dependency
   name: bones
-  requirement: &25562808 !ruby/object:Gem::Requirement
+  requirement: &25465872 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: 3.7.0
+        version: 3.7.1
   type: :development
   prerelease: false
-  version_requirements: *25562808
+  version_requirements: *25465872
 description: ! 'Roo can access the contents of various spreadsheet files. It can handle
 
   * Openoffice
@@ -96,8 +96,6 @@ extra_rdoc_files:
 - PostInstall.txt
 - README.txt
 - bin/roo
-- lib/.roo.rb.swp
-- lib/roo/.generic_spreadsheet.rb.swp
 - test/no_spreadsheet_file.txt
 files:
 - History.txt
@@ -110,9 +108,7 @@ files:
 - bin/roo
 - csv8532
 - datetime.csv
-- lib/.roo.rb.swp
 - lib/roo.rb
-- lib/roo/.generic_spreadsheet.rb.swp
 - lib/roo/excel.rb
 - lib/roo/excelx.rb
 - lib/roo/generic_spreadsheet.rb
@@ -131,6 +127,7 @@ files:
 - test/bbu.ods
 - test/bbu.xls
 - test/bbu.xlsx
+- test/benchmark1.rb
 - test/bode-v1.ods.zip
 - test/bode-v1.xls.zip
 - test/boolean.ods
@@ -144,6 +141,7 @@ files:
 - test/datetime.xls
 - test/datetime.xlsx
 - test/datetime_floatconv.xls
+- test/dreimalvier.ods
 - test/emptysheets.ods
 - test/emptysheets.xls
 - test/emptysheets.xlsx
@@ -215,7 +213,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: roo
-rubygems_version: 1.8.6
+rubygems_version: 1.8.9
 signing_key: 
 specification_version: 3
 summary: Roo can access the contents of various spreadsheet files.