roo 1.2.0 → 1.2.1

data/History.txt

@@ -1,3 +1,6 @@
+== 1.2.1 2008-11-13
+* 1 enhancement
+  * added celltype :datetime in Openoffice and Excel
 == 1.2.0 2008-08-24
 * 3 major enhancements
   * Excelx: improved the detection of cell type and conversion into roo types

data/Manifest.txt

@@ -58,6 +58,8 @@ test/ric.ods
 test/bug-row-column-fixnum-float.xls
 test/emptysheets.ods
 test/emptysheets.xls
+test/datetime.ods
+test/datetime.xls
 website/index.html
 website/index.txt
 website/javascripts/rounded_corners_lite.inc.js

data/lib/roo/excel.rb

@@ -1,7 +1,7 @@
 require 'rubygems'
 gem 'parseexcel', '>= 0.5.2'
 require 'parseexcel'
-CHARGUESS=false
+CHARGUESS = false
 require 'charguess' if CHARGUESS
 
 module Spreadsheet # :nodoc
@@ -29,6 +29,7 @@ class Excel < GenericSpreadsheet
       FileUtils::mkdir(@tmpdir)
     end
     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
       file_type_check(filename,'.xls','an Excel')
@@ -61,7 +62,8 @@ class Excel < GenericSpreadsheet
   # returns an array of sheet names in the spreadsheet
   def sheets
     result = []
-    0.upto(@workbook.sheet_count - 1) do |i|
+    #0.upto(@workbook.worksheets.size - 1) do |i| # spreadsheet
+    0.upto(@workbook.sheet_count - 1) do |i| # parseexcel
       # TODO: is there a better way to do conversion?
       if CHARGUESS
         encoding = CharGuess::guess(@workbook.worksheet(i).name)
@@ -81,13 +83,15 @@ class Excel < GenericSpreadsheet
   # returns the content of a cell. The upper left corner is (1,1) or ('A',1)
   def cell(row,col,sheet=nil)
     sheet = @default_sheet unless sheet
+    raise ArgumentError unless sheet
     read_cells(sheet) unless @cells_read[sheet]
+    raise "should be read" unless @cells_read[sheet]
     row,col = normalize(row,col)
     if celltype(row,col,sheet) == :date
-      yyyy,mm,dd = @cell[sheet]["#{row},#{col}"].split('-')
+      yyyy,mm,dd = @cell[sheet][[row,col]].split('-')
       return Date.new(yyyy.to_i,mm.to_i,dd.to_i)
     end
-    return @cell[sheet]["#{row},#{col}"]
+    return @cell[sheet][[row,col]]
   end
 
   # returns the type of a cell:
@@ -97,14 +101,20 @@ class Excel < GenericSpreadsheet
   # * :percentage
   # * :formula
   # * :time
+  # * :datetime
   def celltype(row,col,sheet=nil)
     sheet = @default_sheet unless sheet
     read_cells(sheet) unless @cells_read[sheet]
     row,col = normalize(row,col)
-    if @formula[sheet]["#{row},#{col}"]
-      return :formula
-    else
-      @cell_type[sheet]["#{row},#{col}"]
+    begin
+      if @formula[sheet][[row,col]]
+        return :formula
+      else
+        @cell_type[sheet][[row,col]]
+      end
+    rescue
+      puts "Error in sheet #{sheet}, row #{row}, col #{col}"
+      raise
     end
   end
 
@@ -155,86 +165,45 @@ class Excel < GenericSpreadsheet
     raise EXCEL_NO_FORMULAS
   end
 
-  private
-
-  # determine the first and last boundaries
-  def get_firsts_lasts_parseexcel(sheet=nil)
+  # shows the internal representation of all cells
+  # mainly for debugging purposes
+  def to_s(sheet=nil)
     sheet = @default_sheet unless sheet
-    fr = fc = 999_999
-    lr = lc = -999_999
-    worksheet = @workbook.worksheet(sheet_no(sheet))
-    unless worksheet.min_row 
-      fr = nil
-    else
-      fr = worksheet.min_row + 1
-    end
-    unless worksheet.max_row
-      lr = nil
-    else
-      lr = worksheet.max_row + 1
-    end
-    unless worksheet.min_col 
-      fc = nil
-    else
-      fc = worksheet.min_col + 1
-    end
-    unless worksheet.max_col
-      lc = nil
-    else
-      lc = worksheet.max_col + 1
-    end
-    if lr 
-      # 2007-11-05 BEGIN
-      # parsexcel liefert (mir unverstaendlich) eine Zeile als letzte Zeile
-      # zurueck, die aber leer ist. Deshalb Korrekturfunktion, die wirklich
-      # die letzte nicht leere Zeile liefert.
-      # 2008-07-23 meine Loesung funtionierte auch noch nicht unter allen
-      # Umstaenden row() == nil ergaenzt
-      while row(lr,sheet) == nil || empty_row?(row(lr,sheet))
-        lr -= 1
-      end
-    end
-    # 2007-11-05 END
-    
-    if lc
-      letzte_spalte_leer = true
-      until ! letzte_spalte_leer
-        worksheet.each(0) {|reihe|
-          if reihe
-            cell = reihe.at(lc-1)
-            if cell
-              case cell.type
-              when :numeric, :date
-                letzte_spalte_leer = false
-              when :text
-                letzte_spalte_leer = false if cell.to_s != "" 
-              end
-            end
-          end
-        }  
-        lc -= 1 if letzte_spalte_leer
-        #puts "letzte Spalte auf #{lc} verringert" if letzte_spalte_leer
-      end    
-    end
-
-    return fr, lr, fc, lc
+    read_cells(sheet) unless @cells_read[sheet]
+    @cell[sheet].inspect
   end
 
+  private
   # determine the first and last boundaries
   def get_firsts_lasts(sheet=nil)
-    fr,lr,fc,lc = get_firsts_lasts_parseexcel(sheet)
-    if lr 
-      # 2007-11-05 BEGIN
-      # parsexcel liefert (mir unverstaendlich) eine Zeile als letzte Zeile
-      # zurueck, die aber leer ist. Deshalb Korrekturfunktion, die wirklich
-      # die letzte nicht leere Zeile liefert.
-      # 2008-07-23 meine Loesung funtionierte auch noch nicht unter allen
-      # Umstaenden row() == nil ergaenzt
-      while row(lr,sheet) == nil || empty_row?(row(lr,sheet))
-        lr -= 1
-      end
+    
+    # 2008-09-14 BEGINf
+    fr=lr=fc=lc=nil
+    sheet = @default_sheet unless sheet
+    if ! @cells_read[sheet]
+      read_cells(sheet)
+    end
+    if @cell[sheet] # nur wenn ueberhaupt Zellen belegt sind
+      @cell[sheet].each {|cellitem|
+        key = cellitem.first
+        y,x = key
+
+        if cellitem[1].class != String or
+            (cellitem[1].class == String and cellitem[1] != "")
+          fr = y unless fr
+          fr = y if y < fr  
+      
+          lr = y unless lr
+          lr = y if y > lr 
+      
+          fc = x unless fc
+          fc = x if x < fc
+      
+          lc = x unless lc
+          lc = x if x > lc 
+        end
+      }
     end
-    # 2007-11-05 END
     @first_row[sheet]    = fr
     @last_row[sheet]     = lr
     @first_column[sheet] = fc
@@ -246,6 +215,7 @@ class Excel < GenericSpreadsheet
   def sheet_no(name)
     return name-1 if name.kind_of?(Fixnum)
     0.upto(@workbook.sheet_count - 1) do |i|
+      #0.upto(@workbook.worksheets.size - 1) do |i|
       # TODO: is there a better way to do conversion?
       return i if name == platform_specific_iconv(
         @workbook.worksheet(i).name)
@@ -317,19 +287,22 @@ class Excel < GenericSpreadsheet
 
   # helper function to set the internal representation of cells
   def set_cell_values(sheet,x,y,i,v,vt,formula,tr,str_v)
-    key = "#{y},#{x+i}"
+    #key = "#{y},#{x+i}"
+    key = [y,x+i]
     @cell_type[sheet] = {} unless @cell_type[sheet]
     @cell_type[sheet][key] = vt 
     @formula[sheet] = {} unless @formula[sheet]
     @formula[sheet][key] = formula  if formula
     @cell[sheet]    = {} unless @cell[sheet]
-    case @cell_type[sheet][key]
+    case vt # @cell_type[sheet][key]
     when :float
       @cell[sheet][key] = v.to_f
     when :string
       @cell[sheet][key] = str_v
     when :date
       @cell[sheet][key] = v 
+    when :datetime
+      @cell[sheet][key] = DateTime.new(v.year,v.month,v.day,v.hour,v.min,v.sec)
     when :percentage
       @cell[sheet][key] = v.to_f
     when :time
@@ -344,6 +317,11 @@ class Excel < GenericSpreadsheet
     sheet = @default_sheet unless sheet
     raise ArgumentError, "Error: sheet '#{sheet||'nil'}' not valid" if @default_sheet == nil and sheet==nil
     raise RangeError unless self.sheets.include? sheet
+    
+    if @cells_read[sheet]
+      raise "sheet #{sheet} already read"
+    end
+    
     worksheet = @workbook.worksheet(sheet_no(sheet))
     skip = 0
     x =1
@@ -352,7 +330,7 @@ class Excel < GenericSpreadsheet
     worksheet.each(skip) { |row_par| 
       if row_par
         x =1
-        row_par.each do # |void|  
+        row_par.each do # |void|
           cell = row_par.at(x-1)
           if cell
             case cell.type
@@ -374,17 +352,26 @@ class Excel < GenericSpreadsheet
                 s = secs
                 v = h*3600+m*60+s
               else
-                vt = :date
-                v = cell.date
-                v = sprintf("%04d-%02d-%02d",v.year,v.month,v.day)
+                if cell.datetime.hour != 0 or
+                    cell.datetime.min  != 0 or
+                    cell.datetime.sec  != 0 or
+                    cell.datetime.msec != 0
+                  vt = :datetime
+                  v = cell.datetime
+                else
+                  vt = :date
+                  v = cell.date
+                  v = sprintf("%04d-%02d-%02d",v.year,v.month,v.day)
+                end
               end
             else
-              vt = cell.type.to_sym
+              vt = cell.type.to_s.downcase.to_sym
               v = nil
             end # case
             formula = tr = nil #TODO:???
             set_cell_values(sheet,x,y,i,v,vt,formula,tr,str_v)
           end # if cell
+          
           x += 1
         end
       end
@@ -393,18 +380,18 @@ class Excel < GenericSpreadsheet
     @cells_read[sheet] = true
   end
 
-    #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
-#
+  #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

@@ -4,7 +4,6 @@ require 'rexml/document'
 require 'fileutils'
 require 'zip/zipfilesystem'
 require 'date'
-#require 'base64'
 
 class  String
   def end_with?(str)
@@ -156,10 +155,10 @@ class Excelx < GenericSpreadsheet
     read_cells(sheet) unless @cells_read[sheet]
     row,col = normalize(row,col)
     if celltype(row,col,sheet) == :date
-      yyyy,mm,dd = @cell[sheet]["#{row},#{col}"].split('-')
+      yyyy,mm,dd = @cell[sheet][[row,col]].split('-')
       return Date.new(yyyy.to_i,mm.to_i,dd.to_i)
     end
-    @cell[sheet]["#{row},#{col}"]
+    @cell[sheet][[row,col]]
   end
 
   # Returns the formula at (row,col).
@@ -169,10 +168,10 @@ class Excelx < GenericSpreadsheet
     sheet = @default_sheet unless sheet
     read_cells(sheet) unless @cells_read[sheet]
     row,col = normalize(row,col)
-    if @formula[sheet]["#{row},#{col}"] == nil
+    if @formula[sheet][[row,col]] == nil
       return nil
     else
-      return @formula[sheet]["#{row},#{col}"]
+      return @formula[sheet][[row,col]]
     end
   end
 
@@ -209,15 +208,15 @@ class Excelx < GenericSpreadsheet
   # * :percentage
   # * :formula
   # * :time
-  def celltype(row,col,sheet=nil)
+  # * :datetime
+def celltype(row,col,sheet=nil)
     sheet = @default_sheet unless sheet
     read_cells(sheet) unless @cells_read[sheet]
     row,col = normalize(row,col)
-    # if @formula and @formula[sheet] and @formula[sheet]["#{row},#{col}"]
-    if @formula[sheet]["#{row},#{col}"]
+    if @formula[sheet][[row,col]]
       return :formula
     else
-      @cell_type[sheet]["#{row},#{col}"]
+      @cell_type[sheet][[row,col]]
     end
   end
 
@@ -229,7 +228,7 @@ class Excelx < GenericSpreadsheet
     sheet = @default_sheet unless sheet
     read_cells(sheet) unless @cells_read[sheet]
     row,col = normalize(row,col)
-    return @excelx_type[sheet]["#{row},#{col}"]
+    return @excelx_type[sheet][[row,col]]
   end
   
   # returns the internal value of an excelx cell
@@ -238,7 +237,7 @@ class Excelx < GenericSpreadsheet
     sheet = @default_sheet unless sheet
     read_cells(sheet) unless @cells_read[sheet]
     row,col = normalize(row,col)
-    return @excelx_value[sheet]["#{row},#{col}"]
+    return @excelx_value[sheet][[row,col]]
   end
   
   # returns the internal format of an excel cell
@@ -246,7 +245,7 @@ class Excelx < GenericSpreadsheet
     sheet = @default_sheet unless sheet
     read_cells(sheet) unless @cells_read[sheet]
     row,col = normalize(row,col)
-    s = @s_attribute[sheet]["#{row},#{col}"]
+    s = @s_attribute[sheet][[row,col]]
     result = attribute2format(s)
     result
   end
@@ -298,7 +297,7 @@ class Excelx < GenericSpreadsheet
       excelx_type=nil,
       excelx_value=nil,
       s_attribute=nil)
-    key = "#{y},#{x+i}"
+    key = [y,x+i]
     @cell_type[sheet] = {} unless @cell_type[sheet]
     @cell_type[sheet][key] = vt
     @formula[sheet] = {} unless @formula[sheet]
@@ -314,8 +313,6 @@ class Excelx < GenericSpreadsheet
     when :percentage
       @cell[sheet][key] = v.to_f
     when :time
-      #hms = v.split(':')
-      #@cell[sheet][key] = hms[0].to_i*3600 + hms[1].to_i*60 + hms[2].to_i
       @cell[sheet][key] = v.to_f*(24*60*60)
     else
       @cell[sheet][key] = v
@@ -497,13 +494,13 @@ class Excelx < GenericSpreadsheet
   # sets the value of a cell
   def set_value(row,col,value,sheet=nil)
     sheet = @default_value unless sheet
-    @cell[sheet]["#{row},#{col}"] = value
+    @cell[sheet][[row,col]] = value
   end
 
   # sets the type of a cell
   def set_type(row,col,type,sheet=nil)
     sheet = @default_value unless sheet
-    @cell_type[sheet]["#{row},#{col}"] = type
+    @cell_type[sheet][[row,col]] = type
   end
 
   # read the shared strings xml document
@@ -542,7 +539,6 @@ class Excelx < GenericSpreadsheet
             e2.each_element do |e3|
               if e3.name == 'xf'
                 numFmtId = e3.attributes['numFmtId'] 
-                # p numFmtId
                 @cellXfs << [numFmtId]
               end
             end

data/lib/roo/generic_spreadsheet.rb

@@ -53,7 +53,7 @@ class GenericSpreadsheet
     impossible_value = 999_999 # more than a spreadsheet can hold
     result = impossible_value
     @cell[sheet].each_pair {|key,value|
-      y,x = key.split(',')
+      y,x = key # _to_string(key).split(',')
       y = y.to_i
       result = [result, y].min if value
     } if @cell[sheet]
@@ -72,7 +72,7 @@ class GenericSpreadsheet
     impossible_value = 0
     result = impossible_value
     @cell[sheet].each_pair {|key,value|
-      y,x = key.split(',')
+      y,x = key # _to_string(key).split(',')
       y = y.to_i
       result = [result, y].max if value
     } if @cell[sheet]
@@ -93,8 +93,8 @@ class GenericSpreadsheet
     impossible_value = 999_999 # more than a spreadsheet can hold
     result = impossible_value
     @cell[sheet].each_pair {|key,value|
-      y,x = key.split(',')
-      x = x.to_i
+      y,x = key # _to_string(key).split(',')
+      x = x # .to_i
       result = [result, x].min if value
     } if @cell[sheet]
     result = nil if result == impossible_value
@@ -112,7 +112,7 @@ class GenericSpreadsheet
     impossible_value = 0
     result = impossible_value
     @cell[sheet].each_pair {|key,value|
-      y,x = key.split(',')
+      y,x = key # _to_string(key).split(',')
       x = x.to_i
       result = [result, x].max if value
     } if @cell[sheet]
@@ -227,7 +227,6 @@ class GenericSpreadsheet
                   found *= 0
                 end
               }
-              # p self.row(i) if found > 0
               if found > 0
                 tmp = {}
                 1.upto(self.row(i).size) {|j|
@@ -261,7 +260,7 @@ class GenericSpreadsheet
     result = []
     tmp_arr = []
     @cell[sheet].each_pair {|key,value|
-      y,x = key.split(',')
+      y,x = key # _to_string(key).split(',')
       x = x.to_i
       y = y.to_i
       if y == rownumber
@@ -400,6 +399,21 @@ class GenericSpreadsheet
     end
   end
 
+  # konvertiert einen Key in der Form "12,45" (=row,column) in
+  # ein Array mit numerischen Werten ([12,45])
+  # Diese Methode ist eine temp. Loesung, um zu erforschen, ob der 
+  # Zugriff mit numerischen Keys schneller ist.
+  def key_to_num(str)
+    r,c = str.split(',')
+    r = r.to_i
+    c = c.to_i
+    [r,c]
+  end
+
+  # siehe: key_to_num
+  def key_to_string(arr)
+    "#{arr[0]},#{arr[1]}"
+  end 
 
   private
 
@@ -435,6 +449,14 @@ class GenericSpreadsheet
     File.join(@tmpdir, File.basename(uri))
   end
 
+  def open_from_stream(stream)
+    tempfilename = File.join(@tmpdir, "spreadsheet")
+    f = File.open(tempfilename,"wb")
+    f.write(stream[7..-1])
+    f.close
+    File.join(@tmpdir, "spreadsheet")
+  end
+
   # convert a number to something like 'AB' (1 => 'A', 2 => 'B', ...)
   def self.number_to_letter(n)
     letters=""

data/lib/roo/google.rb

@@ -162,6 +162,7 @@ class Google < GenericSpreadsheet
   # * :percentage
   # * :formula
   # * :time
+    # * :datetime
   def celltype(row, col, sheet=nil)
     sheet = @default_sheet unless sheet
     read_cells(sheet) unless @cells_read[sheet]
@@ -321,6 +322,7 @@ class Google < GenericSpreadsheet
   # read all cells in a sheet
   def read_cells(sheet=nil)
     sheet = @default_sheet unless sheet
+    raise RangeError, "illegal sheet <#{sheet}>" unless sheets.index(sheet)
     sheet_no = sheets.index(sheet)+1
     doc = @gs.fulldoc(sheet_no)
     (doc/"gs:cell").each {|item|

data/lib/roo/openoffice.rb

@@ -80,10 +80,10 @@ class Openoffice < GenericSpreadsheet
     read_cells(sheet) unless @cells_read[sheet]
     row,col = normalize(row,col)
     if celltype(row,col,sheet) == :date
-      yyyy,mm,dd = @cell[sheet]["#{row},#{col}"].split('-')
+      yyyy,mm,dd = @cell[sheet][[row,col]].split('-')
       return Date.new(yyyy.to_i,mm.to_i,dd.to_i)
     end
-    @cell[sheet]["#{row},#{col}"]
+    @cell[sheet][[row,col]]
   end
 
   # Returns the formula at (row,col).
@@ -93,10 +93,10 @@ class Openoffice < GenericSpreadsheet
     sheet = @default_sheet unless sheet
     read_cells(sheet) unless @cells_read[sheet]
     row,col = normalize(row,col)
-    if @formula[sheet]["#{row},#{col}"] == nil
+    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]
     end
   end
 
@@ -133,14 +133,15 @@ class Openoffice < GenericSpreadsheet
   # * :percentage
   # * :formula
   # * :time
+  # * :datetime
   def celltype(row,col,sheet=nil)
     sheet = @default_sheet unless sheet
     read_cells(sheet) unless @cells_read[sheet]
     row,col = normalize(row,col)
-    if @formula[sheet]["#{row},#{col}"]
+    if @formula[sheet][[row,col]]
       return :formula
     else
-      @cell_type[sheet]["#{row},#{col}"]
+      @cell_type[sheet][[row,col]]
     end
   end
 
@@ -172,7 +173,6 @@ class Openoffice < GenericSpreadsheet
   # version of the openoffice document
   # at 2007 this is always "1.0"
   def officeversion
-    # read_cells(false) unless @cells_read
     oo_version
     @officeversion
   end
@@ -211,7 +211,6 @@ class Openoffice < GenericSpreadsheet
 
   # read the version of the OO-Version
   def oo_version
-    #sheet_found = false
     @doc.each_element do |oo_document|
       @officeversion = oo_document.attributes['version']
     end
@@ -219,7 +218,7 @@ class Openoffice < GenericSpreadsheet
 
   # helper function to set the internal representation of cells
   def set_cell_values(sheet,x,y,i,v,vt,formula,tr,str_v)
-    key = "#{y},#{x+i}"
+    key = [y,x+i]
     @cell_type[sheet] = {} unless @cell_type[sheet]
     @cell_type[sheet][key] = Openoffice.oo_type_2_roo_type(vt)
     @formula[sheet] = {} unless @formula[sheet]
@@ -231,7 +230,14 @@ class Openoffice < GenericSpreadsheet
     when :string
       @cell[sheet][key] = str_v
     when :date
-      @cell[sheet][key] = tr.attributes['date-value']
+      if tr.attributes['date-value'].size != "XXXX-XX-XX".size
+        #-- dann ist noch eine Uhrzeit vorhanden
+        #-- "1961-11-21T12:17:18"
+        @cell[sheet][key] = DateTime.parse(tr.attributes['date-value'])
+        @cell_type[sheet][key] = :datetime
+      else
+        @cell[sheet][key] = tr.attributes['date-value']
+      end
     when :percentage
       @cell[sheet][key] = v.to_f
     when :time
@@ -264,7 +270,7 @@ class Openoffice < GenericSpreadsheet
             if be.name == "spreadsheet"
               be.each_element do |se|
                 if se.name == "table"
-                  if se.attributes['name']==sheet #@default_sheet
+                  if se.attributes['name']==sheet
                     sheet_found = true
                     x=1
                     y=1
@@ -303,13 +309,24 @@ class Openoffice < GenericSpreadsheet
                                   str_v.gsub!(/&apos;/,"'")
                                 end # == 'p'
                               end
-                            end
-                            if vt == 'time'
+                            elsif vt == 'time'
                               tr.each_element do |str|
                                 if str.name == 'p'
                                   v = str.text
                                 end
                               end
+                            elsif vt == '' or vt == nil
+                              #
+                            elsif vt == 'date'
+                              #
+                            elsif vt == 'percentage'
+                              #
+                            elsif vt == 'float'
+                              #
+                            elsif vt == 'boolean'
+                              #
+                            else
+                              # raise "unknown type #{vt}"
                             end
                             if skip
                               if v != nil or tr.attributes['date-value']
@@ -373,7 +390,7 @@ class Openoffice < GenericSpreadsheet
   def process_zipfile(zip, path='')
     if zip.file.file? path
       if path == "content.xml"
-        open(@tmpdir+'/'+@file_nr.to_s+'_roo_content.xml','wb') {|f|
+        open(File.join(@tmpdir, @file_nr.to_s+'_roo_content.xml'),'wb') {|f|
           f << zip.read(path)
         }
       end
@@ -395,12 +412,12 @@ class Openoffice < GenericSpreadsheet
 
   def set_value(row,col,value,sheet=nil)
     sheet = @default_value unless sheet
-    @cell[sheet]["#{row},#{col}"] = value
+    @cell[sheet][[row,col]] = value
   end
 
   def set_type(row,col,type,sheet=nil)
     sheet = @default_value unless sheet
-    @cell_type[sheet]["#{row},#{col}"] = type
+    @cell_type[sheet][[row,col]] = type
   end
 
   A_ROO_TYPE = {