roo 0.5.0 → 0.5.1

data/History.txt

@@ -1,5 +1,13 @@
+== 0.5.1 2007-08-26
+* 4 enhancements:
+  * Openoffice: Exception if an illegal sheet-name is selected
+  * Openoffice/Excel: no need to set a default_sheet if there is only one in 
+    the document
+  * Excel: can now read zip-ed files
+  * Excel: can now read files from http://-URL over the net
+
 == 0.5.0 2007-07-20
-* 2 enhancements:
+* 3 enhancements:
   * Excel-objects: the methods default_sheet= and sheets can now handle names instead of numbers
   * changed the celltype methods to return symbols, not strings anymore (possible values are :formula, :float, :string, :date, :percentage (if you need strings you can convert it with .to_s)
   * tests can now run on the client machine (not only my machine), if there are not public released files involved these tests are skipped

data/Manifest.txt

@@ -21,6 +21,9 @@ test/borders.ods
 test/borders.xls
 test/formula.ods
 test/formula.xls
+test/only_one_sheet.ods
+test/only_one_sheet.xls
+test/bode-v1.xls.zip
 website/index.html
 website/index.txt
 website/javascripts/rounded_corners_lite.inc.js

data/Rakefile

@@ -14,7 +14,7 @@ require File.join(File.dirname(__FILE__), 'lib', 'roo', 'version')
 
 AUTHOR = 'Thomas Preymesser'  # can also be an array of Authors
 EMAIL = "thopre@gmail.com"
-DESCRIPTION = "roo can access the contents of OpenOffice-Spreadsheets"
+DESCRIPTION = "roo can access the contents of OpenOffice-Spreadsheets and Excel-Spreadsheets"
 GEM_NAME = 'roo' # what ppl will type to install your gem
 
 @config_file = "~/.rubyforge/user-config.yml"
@@ -79,6 +79,7 @@ hoe = Hoe.new(GEM_NAME, VERS) do |p|
     ['rubyzip', '>= 0.9.1'],
     ['hpricot', '>= 0.5'],
     ['hoe', '>= 0.0.0'],
+    ['GData', '>= 0.0.3'],
   ]
   #p.spec_extras = {}    # A hash of extra values to set in the gemspec.
 end

data/examples/roo_soap_client.rb

@@ -45,9 +45,9 @@ puts "last column: #{proxy.last_column}"
 puts "cell: #{proxy.cell('C',8)}"
 puts "cell: #{proxy.cell('F',12)}"
 puts "officeversion: #{proxy.officeversion}"
-puts "Bayern:"
+puts "Berlin:"
 
-ferien_fuer_region(proxy, "Bayern")
+ferien_fuer_region(proxy, "Berlin")
 
 
 

data/lib/roo/excel.rb

@@ -1,18 +1,37 @@
 require 'rubygems'
+gem 'parseexcel', '>= 0.5.2'
 require 'parseexcel'
+require 'pp'
 
 class Excel < Openoffice
 
-  def initialize(filename)
+  def initialize(filename, packed = nil)
+    @tmpdir = "oo_"+$$.to_s
+    unless File.exists?(@tmpdir)
+      FileUtils::mkdir(@tmpdir)
+    end
+    filename = open_from_uri(filename) if filename[0,7] == "http://"
+    filename = unzip(filename) if packed and packed == :zip
     if filename[-4..-1] != ".xls"
       warn "are you sure, this is an excel file?"
     end
     @filename = filename
+p filename
     @workbook = Spreadsheet::ParseExcel.parse(filename)
     @default_sheet = nil
+    # no need to set default_sheet if there is only one sheet in the document
+    if self.sheets.size == 1
+      @default_sheet = self.sheets.first
+    end
     @first_row = @last_row = @first_column = @last_column = nil
   end
 
+  def remove_tmp
+    if File.exists?(@tmpdir)
+      FileUtils::rm_r(@tmpdir)
+    end
+  end
+
   def sheets
     #if DateTime.now < Date.new(2007,6,10)
     #  return  ["Tabelle1", "Name of Sheet 2", "Sheet3"]
@@ -29,19 +48,15 @@ class Excel < Openoffice
   end
 
   # sets the working sheet (1,2,3,..)
-  #--
-  # im Excel-Bereich muesste man wahrscheinlich intern mit Nummern arbeiten
-  # von aussen arbeite ich mit (1,2,3... intern wird Index 0,1,2,...
-  # verwendet.
   def default_sheet=(n)
-    if DateTime.now < Date.new(2007,7,19)
-      unless n.kind_of?(Fixnum)
-        fail ArgumentError.new("Number expected")
-      end
-      @default_sheet = n-1
-    else
+    if n.kind_of?(Fixnum)
+      @default_sheet = n #-1
+    elsif n.kind_of?(String)
+      raise RangeError if ! self.sheets.include?(n)
       # parseexcel supports now the name of a sheet
       @default_sheet = n
+    else
+      raise TypeError, "what are you trying to set as default sheet?"
     end
     @first_row = @last_row = @first_column = @last_column = nil
     @cells_read = false
@@ -106,11 +121,8 @@ class Excel < Openoffice
          when :text then result << cell.to_s('utf-8')
          when :date then result << cell.date
       else
-        #p cell.type
         return result << cell.to_s('utf-8')
       end
-
-      #result << cell.value
     }
     return result
   end
@@ -152,6 +164,37 @@ class Excel < Openoffice
     false
   end
 
+  def open_from_uri(uri)
+    require 'open-uri' ;
+
+    script = nil ;
+    result = nil ;
+#uri = "/home/tp/ruby-test/roo/test/numbers1.xls"
+
+    #begin ;
+    #  result = open(page) {|w| script = w.readlines } ;
+    #rescue => e ;
+    #  puts "e=#{e}, e.class=#{e.class}" ;
+    #  result = [] ;
+    #end ;
+#
+#    puts "result class=#{result.class}, count=#{result.length}" ; #,
+#    data=#{result}" ;
+#    puts "result[0] =>#{result[0].chomp}<=" if result[0] ;
+
+    tempfilename = File.join(@tmpdir, File.basename(uri))
+    f = File.open( File.join(@tmpdir, File.basename(uri)),"w")
+    begin
+    open(uri) do |net|
+      f.write(net.read)
+    end
+    rescue
+      raise "could not open #{uri}"
+    end
+    f.close
+    File.join(@tmpdir, File.basename(uri))
+  end
+
 private
 
   # check if default_sheet was set
@@ -170,18 +213,13 @@ private
       if row_par
         row_par.each_with_index {|cell,i|
           # nicht beruecksichtigen, wenn nil und vorher noch nichts war
-          # p cell
-          if !cell 
-            # nix
-          else
+          if cell 
             fc = [fc, i+1].min
             lc = [lc, i+1].max
             fr = [fr, line].min
             lr = [lr, line].max
           end
         }
-      else
-        #???
       end
       line += 1
     }
@@ -204,4 +242,40 @@ private
     end
     raise StandardError, "sheet '#{name}' not found"
   end
+
+  def process_zipfile(zip, path='')
+    ret=nil
+    if zip.file.file? path
+      #puts %{#{path}: "#{zip.read(path)}"}
+      puts %{#{path}: }
+      # extract and return filename
+      @tmpdir = "oo_"+$$.to_s
+      unless File.exists?(@tmpdir)
+        FileUtils::mkdir(@tmpdir)
+      end
+      #file = File.new(File.join(@tmpdir, path))
+      file = File.open(File.join(@tmpdir, path),"w")
+      file.write(zip.read(path))
+      file.close
+      p File.join(@tmpdir, path)
+      return File.join(@tmpdir, path)
+    else
+      unless path.empty?
+        path += '/'
+        puts path
+      end
+      zip.dir.foreach(path) do |filename|
+        ret = process_zipfile(zip, path + filename)
+      end
+    end
+    ret
+  end
+
+  def unzip(filename)
+    ret = nil
+    Zip::ZipFile.open(filename) do |zip|
+      ret = process_zipfile zip 
+    end
+    ret
+  end
 end

data/lib/roo/google.rb

@@ -1,112 +1,124 @@
 
-require 'net/http'
-require 'net/https'
-require 'uri'
+#require 'net/http'
+#require 'net/https'
+#require 'uri'
 require 'rubygems'
-require 'hpricot'
+#require 'hpricot'
 require 'timeout'
-
+#require 'GData'
+require 'gdata'
 
 # Make it easy to use some of the convenience methods using https
 #
-module Net  class HTTPS < HTTP
-    def initialize(address, port = nil)
-      super(address, port)
-      self.use_ssl = true
-    end
-  end
-end
-
-class GoogleSpreadSheet
-  GOOGLE_LOGIN_URL = URI.parse('https://www.google.com/accounts/ClientLogin')
-
-  def initialize(spreadsheet_key)
-    @spreadsheet_key = spreadsheet_key
-    @headers = nil
-    @default_sheet = nil
-  end
-
-  def default_sheet=(numberofsheet)
-    @default_sheet = numberofsheet
-  end
-
-  def authenticate(email, password)
-    $VERBOSE = nil
-    response = Net::HTTPS.post_form(GOOGLE_LOGIN_URL,
-      {'Email'   => email,
-       'Passwd'  => password,
-       'source'  => "formula",
-       'service' => 'wise' })
-    @headers = {     'Authorization' => "GoogleLogin auth=#{response.body.split(/=/).last}",
-     'Content-Type'  => 'application/atom+xml'
-    }
-  end
-
-  def evaluate_cell(cell)
-    path = "/feeds/cells/#{@spreadsheet_key}/#{@default_sheet}/#{@headers ? "private" : "public"}/basic/#{cell}"
-
-    doc = Hpricot(request(path))
-    result = (doc/"content[@type='text']").inner_html
-  end
-
-  def set_entry(entry)
-    path = "/feeds/cells/#{@spreadsheet_key}/#{@default_sheet}/#{@headers ? 'private' : 'public'}/full"
-
-    post(path, entry)
-  end
-
-  def entry(formula, row=1, col=1)
-    <<XML
-<?xml version='1.0' ?>
-<entry xmlns='http://www.w3.org/2005/Atom' xmlns:gs='http://schemas.google.com/spreadsheets/2006'>
-  <gs:cell row='#{row}' col='#{col}' inputValue='=#{formula}' />
-</entry>
-XML
-  end
-
-  def add_to_cell(formula)    #puts entry(formula)
-    set_entry(entry(formula))
-  end
-
-  private
-  def request(path)
-    response, data = get_http.get(path, @headers)
-    data
-  end
-
-  def post(path, entry)
-    get_http.post(path, entry, @headers)
-  end
-
-  def get_http
-    http = Net::HTTP.new('spreadsheets.google.com', 80)
-    #http.set_debug_output $stderr
-    http
-  end
-end
+#module Net  class HTTPS < HTTP
+#    def initialize(address, port = nil)
+#      super(address, port)
+#      self.use_ssl = true
+#    end
+#  end
+#end
+#
+#class GoogleSpreadSheet
+#  GOOGLE_LOGIN_URL = URI.parse('https://www.google.com/accounts/ClientLogin')
+#
+#  def initialize(spreadsheet_key)
+#    @spreadsheet_key = spreadsheet_key
+#    @headers = nil
+#    @default_sheet = nil
+#  end
+#
+#  def default_sheet=(numberofsheet)
+#    @default_sheet = numberofsheet
+#  end
+#
+#  def authenticate(email, password)
+#    $VERBOSE = nil
+#    response = Net::HTTPS.post_form(GOOGLE_LOGIN_URL,
+#      {'Email'   => email,
+#       'Passwd'  => password,
+#       'source'  => "formula",
+#       'service' => 'wise' })
+#    @headers = {     'Authorization' => "GoogleLogin auth=#{response.body.split(/=/).last}",
+#     'Content-Type'  => 'application/atom+xml'
+#    }
+#  end
+#
+#  def evaluate_cell(cell)
+#    path = "/feeds/cells/#{@spreadsheet_key}/#{@default_sheet}/#{@headers ? "private" : "public"}/basic/#{cell}"
+#
+#    doc = Hpricot(request(path))
+#    result = (doc/"content[@type='text']").inner_html
+#  end
+#
+#  def set_entry(entry)
+#    path = "/feeds/cells/#{@spreadsheet_key}/#{@default_sheet}/#{@headers ? 'private' : 'public'}/full"
+#
+#    post(path, entry)
+#  end
+#
+#  def entry(formula, row=1, col=1)
+#    <<XML
+#<?xml version='1.0' ?>
+#<entry xmlns='http://www.w3.org/2005/Atom' xmlns:gs='http://schemas.google.com/spreadsheets/2006'>
+#  <gs:cell row='#{row}' col='#{col}' inputValue='=#{formula}' />
+#</entry>
+#XML
+#  end
+#
+#  def add_to_cell(formula)    #puts entry(formula)
+#    set_entry(entry(formula))
+#  end
+#
+#  private
+#  def request(path)
+#    response, data = get_http.get(path, @headers)
+#    data
+#  end
+#
+#  def post(path, entry)
+#    get_http.post(path, entry, @headers)
+#  end
+#
+#  def get_http
+#    http = Net::HTTP.new('spreadsheets.google.com', 80)
+#    #http.set_debug_output $stderr
+#    http
+#  end
+#end
 
 class Google < Openoffice
 
   TIMEOUT_IN_SECONDS = 2
 
-  def initialize(user, password, spreadsheetkey)
+  def initialize(user, password, spreadsheetkey, spreadsheetname)
     @cells_read = false
     @cell = Hash.new
     @cell_type = Hash.new
-    Timeout.timeout(TIMEOUT_IN_SECONDS) {
-      @gs = GoogleSpreadSheet.new(spreadsheetkey)
-      @gs.authenticate(user, password)
-      @default_sheet = nil
-    }
+    #Timeout.timeout(TIMEOUT_IN_SECONDS) {
+    #  @gs = GoogleSpreadSheet.new(spreadsheetkey)
+    #  @gs.authenticate(user, password)
+    #  @default_sheet = nil
+    #}
+    # alle eigenen Spreadsheets bei Google
+    # @spreadsheets= GData::Spreadsheet.spreadsheets("emmanuel.pirsch@gmail.com", "secret") # funktioniert anscheinend noch nicht!!!!!!!!!
+    # ein einzelnes Spreadsheet bei Google
+    # @spreadsheet= spreadsheet[spreadsheetname]
+
+    #gb = GData::Base.new
+    #gb.authenticate("thopre@gmail.com","nora3033")
+
+    g = GData::Spreadsheet.new("ttt")
+    @default_sheet = nil
   end
 
   def sheets
-# http://spreadsheets.google.com/feeds/worksheets/ptu6bbahNZpYrdGHwteUNCw/private/full
-    if DateTime.now < Date.new(2007,6,15)
-      return ["Sheet eins","Sheet zwei","Sheet drei"]
-    else
-      return []
-    end
+    # http://spreadsheets.google.com/feeds/worksheets/ptu6bbahNZpYrdGHwteUNCw/private/full
+    #if DateTime.now < Date.new(2007,6,15)
+    #  return ["Sheet eins","Sheet zwei","Sheet drei"]
+    #else
+    #  return []
+    #end
+    @spreadsheet
   end
 
   def default_sheet=(numberofsheet)

data/lib/roo/openoffice.rb

@@ -4,7 +4,7 @@ require 'rexml/document'
 require 'fileutils'
 require 'zip/zipfilesystem'
 require 'date'
-require 'llip'
+#require 'llip'
 require 'base64'
 
 #require 'lib/roo/spreadsheetparser'
@@ -16,13 +16,13 @@ class Openoffice
   # initialization and opening of a spreasheet file
   # file will be created if 'create' is true
   # and the file does not exist
-  def initialize(filename, create = false)
+  def initialize(filename, packed=nil) #, create = false)
     if filename[-4..-1] != ".ods"
       warn "are you sure, this is an openoffice file?"
     end
-    if create and ! File.exists?(filename)
-      self.create_openoffice(filename)
-    end
+    #if create and ! File.exists?(filename)
+    #  self.create_openoffice(filename)
+    #end
     @cells_read = false
     @filename = filename
     @tmpdir = "oo_"+$$.to_s
@@ -38,15 +38,19 @@ class Openoffice
     @cell = Hash.new
     @cell_type = Hash.new
     @formula = Hash.new
-    if ENV["roo_local"] != "thomas-p"
+    #if ENV["roo_local"] != "thomas-p"
       FileUtils::rm_r(@tmpdir)
-    end
+    #end
     @default_sheet = nil 
+    # no need to set default_sheet if there is only one sheet in the document
+    if self.sheets.size == 1
+      @default_sheet = self.sheets.first
+    end
     @first_column = @last_column = nil
     @first_row = @last_row = nil
-    trap('INT') {
-      FileUtils::rm_r(@tmpdir)
-    }
+#    trap('INT') {
+#      FileUtils::rm_r(@tmpdir)
+#    }
   end
 
   # creates a new empty openoffice-spreadsheet file
@@ -61,33 +65,32 @@ class Openoffice
     f.close
   end
 
-  # reopens and read a spreadsheet document
-  if false
-  def reload
-    @cells_read = false
-    @tmpdir = "oo_"+$$.to_s
-    unless File.exists?(@tmpdir)
-      FileUtils::mkdir(@tmpdir) 
-    end
-    extract_content
-    file = File.new(File.join(@tmpdir, @file_nr.to_s+"_roo_content.xml")) 
-    @doc = REXML::Document.new file
-    file.close
-    @cell = Hash.new
-    @cell_type = Hash.new
-    FileUtils::rm_r(@tmpdir)
-    @default_sheet = nil
-    @first_column = @last_column = nil
-    @first_row = @last_row = nil
-  end
-  end
+  #if false
+  #def reload
+  #  @cells_read = false
+  #  @tmpdir = "oo_"+$$.to_s
+  #  unless File.exists?(@tmpdir)
+  #    FileUtils::mkdir(@tmpdir) 
+  #  end
+  #  extract_content
+  #  file = File.new(File.join(@tmpdir, @file_nr.to_s+"_roo_content.xml")) 
+  #  @doc = REXML::Document.new file
+  #  file.close
+  #  @cell = Hash.new
+  #  @cell_type = Hash.new
+  #  FileUtils::rm_r(@tmpdir)
+  #  @default_sheet = nil
+  #  @first_column = @last_column = nil
+  #  @first_row = @last_row = nil
+  #end
+  #end
 
+  # reopens and read a spreadsheet document
   def reload
     default_sheet = @default_sheet
     initialize(@filename) 
     self.default_sheet = default_sheet
-     @first_row = @last_row = @first_column = @last_column = nil
-
+    @first_row = @last_row = @first_column = @last_column = nil
   end
 
   # returns the content of a spreadsheet-cell
@@ -177,13 +180,17 @@ class Openoffice
   end
 
   # set the working sheet in the document
-  def default_sheet=(s)
-    @default_sheet = s
+  def default_sheet=(sheet)
+    if ! sheet.kind_of?(String)
+      raise TypeError, "what are you trying to set as default sheet?"
+    end
+    @default_sheet = sheet
     @first_row = @last_row = @first_column = @last_column = nil
     @cells_read = false
     @cell = Hash.new
     @cell_type = Hash.new
     @formula = Hash.new
+    check_default_sheet
   end
 
   alias set_default_sheet default_sheet=
@@ -191,7 +198,8 @@ class Openoffice
   # version of the openoffice document 
   # at 2007 this is always "1.0"
   def officeversion
-    read_cells(:ignore_default_sheet => true) unless @cells_read
+    # read_cells(false) unless @cells_read
+    oo_version
     @officeversion
   end
 
@@ -324,9 +332,9 @@ class Openoffice
     parser = SpreadsheetParser.new
     visitor = Visitor.new
     #puts cell(row,col)
-    puts formula(row,col)
+    #puts formula(row,col)
     formula = formula(row,col)[1..-1] # .downcase
-    puts formula
+    # puts formula
     #eval formula
     #parser.parse(formula)
     parser.parse(formula).accept(visitor)
@@ -371,15 +379,21 @@ class Openoffice
   end
 
 private
+  # 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
+  end
 
   # read all cells in the selected sheet
-  def read_cells(*args)
-    if :ignore_default_sheet == false
-      raise ArgumentError, "Error: default_sheet not set" if @default_sheet == nil
-    end
+  def read_cells
+    sheet_found = false
+    raise ArgumentError, "Error: default_sheet not set" if @default_sheet == nil
     oo_document_count = 0
     @doc.each_element do |oo_document|
-      @officeversion = oo_document.attributes['version']
+      # @officeversion = oo_document.attributes['version']
       oo_document_count += 1
       oo_element_count = 0
       oo_document.each_element do |oo_element|
@@ -390,73 +404,73 @@ private
               be.each_element do |se|
                 if se.name == "table"
                   if se.attributes['name']==@default_sheet
-
-                  x=1
-                  y=1
-                  se.each_element do |te|
-                    if te.name == "table-column"
-                      rep = te.attributes["number-columns-repeated"]
-                    elsif te.name == "table-row"
-                      if te.attributes['number-rows-repeated']
-                        skip_y = te.attributes['number-rows-repeated'].to_i 
-                        y = y + skip_y - 1 # minus 1 because this line will be counted as a line element
-                      end
-                      te.each_element do |tr|
-                        if tr.name == 'table-cell'
-                           skip = tr.attributes['number-columns-repeated']
-                           formula = tr.attributes['formula']
-                           vt = tr.attributes['value-type']
-                           v  = tr.attributes['value']
-                           if vt == 'string'
-                             tr.each_element do |str|
-                               if str.name == 'p'
-                                 v = str.text
-                               end
-                             end
-                           end
-                           if skip
-                             if v == nil
-                               x += (skip.to_i - 1)
-                             else
-                               0.upto(skip.to_i-1) do |i|
-                                 @cell_type["#{y},#{x+i}"] = Openoffice.oo_type_2_roo_type(vt)
-                                 @formula["#{y},#{x+i}"] = formula if formula
-                                 if @cell_type["#{y},#{x+i}"] == :float
-                                   @cell["#{y},#{x+i}"] = v.to_f
-                                 elsif @cell_type["#{y},#{x+i}"] == :string
-                                   @cell["#{y},#{x+i}"] = v
-                                 elsif @cell_type["#{y},#{x+i}"] == :date
-                                   @cell["#{y},#{x+i}"] = tr.attributes['date-value']
-                                 else
-                                   @cell["#{y},#{x+i}"] = v
-                                 end
-                               end
-                               x += 1
-                             end
-                           end # if skip
-                           @formula["#{y},#{x}"] = formula if formula
-                           @cell_type["#{y},#{x}"] = Openoffice.oo_type_2_roo_type(vt)
-                           if @cell_type["#{y},#{x}"] == :float
-                             @cell["#{y},#{x}"] = v.to_f
-                           elsif @cell_type["#{y},#{x}"] == :string
-                             tr.each_element do |str|
-                               if str.name == 'p'
-                                 @cell["#{y},#{x}"] = str.text
-                               end
-                             end
-                           elsif @cell_type["#{y},#{x}"] == :date
-                             @cell["#{y},#{x}"] = tr.attributes['date-value']
-                           else
-                             @cell["#{y},#{x}"] = v
-                           end
-                           x += 1
+                    sheet_found = true
+                    x=1
+                    y=1
+                    se.each_element do |te|
+                      if te.name == "table-column"
+                        rep = te.attributes["number-columns-repeated"]
+                      elsif te.name == "table-row"
+                        if te.attributes['number-rows-repeated']
+                          skip_y = te.attributes['number-rows-repeated'].to_i 
+                          y = y + skip_y - 1 # minus 1 because this line will be counted as a line element
+                        end
+                        te.each_element do |tr|
+                          if tr.name == 'table-cell'
+                            skip = tr.attributes['number-columns-repeated']
+                            formula = tr.attributes['formula']
+                            vt = tr.attributes['value-type']
+                            v  = tr.attributes['value']
+                            if vt == 'string'
+                              tr.each_element do |str|
+                                if str.name == 'p'
+                                  v = str.text
+                                end
+                              end
+                            end
+                            if skip
+                              if v == nil
+                                x += (skip.to_i - 1)
+                              else
+                                0.upto(skip.to_i-1) do |i|
+                                  @cell_type["#{y},#{x+i}"] = Openoffice.oo_type_2_roo_type(vt)
+                                  @formula["#{y},#{x+i}"] = formula if formula
+                                  if @cell_type["#{y},#{x+i}"] == :float
+                                    @cell["#{y},#{x+i}"] = v.to_f
+                                  elsif @cell_type["#{y},#{x+i}"] == :string
+                                    @cell["#{y},#{x+i}"] = v
+                                  elsif @cell_type["#{y},#{x+i}"] == :date
+                                    @cell["#{y},#{x+i}"] = tr.attributes['date-value']
+                                  else
+                                    @cell["#{y},#{x+i}"] = v
+                                  end
+                                end
+                                x += 1
+                              end
+                            end # if skip
+                            @formula["#{y},#{x}"] = formula if formula
+                            @cell_type["#{y},#{x}"] = Openoffice.oo_type_2_roo_type(vt)
+                            if @cell_type["#{y},#{x}"] == :float
+                              @cell["#{y},#{x}"] = v.to_f
+                            elsif @cell_type["#{y},#{x}"] == :string
+                              tr.each_element do |str|
+                                if str.name == 'p'
+                                  @cell["#{y},#{x}"] = str.text
+                                end
+                              end
+                            elsif @cell_type["#{y},#{x}"] == :date
+                              @cell["#{y},#{x}"] = tr.attributes['date-value']
+                            else
+                              @cell["#{y},#{x}"] = v
+                            end
+                            x += 1
+                          end
                         end
+                        y += 1
+                        x = 1
                       end
-                      y += 1
-                      x = 1
                     end
-                  end
-                end # sheet 
+                  end # sheet 
                 end
               end
             end
@@ -464,11 +478,42 @@ private
         end
       end
     end
+    if sheet_found == false
+      raise RangeError 
+    end
     @cells_read = true
   end
 
+  # Checks if the default_sheet exists. If not an RangeError exception is 
+  # raised
+  def check_default_sheet
+    sheet_found = false
+    raise ArgumentError, "Error: default_sheet not set" if @default_sheet == nil
+    @doc.each_element do |oo_document|
+      oo_element_count = 0
+      oo_document.each_element do |oo_element|
+        oo_element_count += 1
+        if oo_element.name == "body"
+          oo_element.each_element do |be|
+            if be.name == "spreadsheet"
+              be.each_element do |se|
+                if se.name == "table"
+                  if se.attributes['name'] == @default_sheet
+                    sheet_found = true
+                  end # sheet 
+                end
+              end
+            end
+          end
+        end
+      end
+    end
+    if ! sheet_found
+      raise RangeError, "sheet '#{@default_sheet}' not found"
+    end
+  end
+
   def process_zipfile(zip, path='')
-    #p path
     if zip.file.file? path
       if path == "content.xml"
         open(@tmpdir+'/'+@file_nr.to_s+'_roo_content.xml','w') {|f|