voruby 1.1.1 → 2.0.0

data/lib/voruby/votables/sdss.rb

@@ -1,356 +0,0 @@
-# A set of classes designed to read and manipulate 
-# especific VOTables[http://www.ivoa.net/Documents/latest/VOT.html].
-# This class represents a SDSS VOTable.
-
-require 'voruby/votables/votable'
-
-module VORuby
-  module VOTables
-
-    module VOTable
-      class SDSSVOTable < VOTable
-        
-        # Our object's contructor
-        # [_votable:_]
-        #   The VOTable object
-        def initialize(votable)
-          super(votable.id, votable.version, votable.description, 
-                votable.definitions, votable.coosys, votable.params, 
-                votable.info, votable.resources)
-        end
-        
-        # Find a field in SDSS configuration file given a key.
-        # Returns a hash with the field's attributes
-        # [_key_:]
-        #   The key indexing on field's attribute. This key is the same 
-        #   UCD, because I guess that SDSS always uses the UCDs on its 
-        #   fields
-        def find_field_in_conf_file(key)
-          sdss_field = {'id'=> nil, 'name'=> nil, 'ucd'=> nil}
-          
-          if key != nil
-            SDSS_ARCHIVE_CONFIG.each do |archive|
-              archive['votable_fields'].each do |field|
-                if field['key'] == key
-                  sdss_field['id'] = field['id'] if field['id'] != 'nil'
-                  sdss_field['name'] = field['name'] if field['name'] != 'nil'
-                  sdss_field['ucd'] = field['ucd'] if field['ucd'] != 'nil'
-                  break
-                end
-              end
-            end
-          end
-          return sdss_field
-        end
-            
-        # Find the column number(s) associated with the 
-        # VOX:imageAccessReference UCD.
-        # Returns a list of column positions.
-        def image_access_reference_columns()
-          sdss_ucd_access = find_field_in_conf_file('VOX:Image_AccessReference')['ucd']
-          
-          if find_columns(sdss_ucd_access).first != nil
-            find_columns(sdss_ucd_access).first
-          end
-        end
-        
-        def image_ra_columns
-          ucd_ra = find_field_in_conf_file('POS_EQ_RA_MAIN')['ucd']
-          
-          if find_columns(ucd_ra).first != nil
-            find_columns(ucd_ra).first
-          end
-        end
-        
-        def image_dec_columns
-          ucd_dec = find_field_in_conf_file('POS_EQ_DEC_MAIN')['ucd']
-          
-          if find_columns(ucd_dec).first != nil
-            find_columns(ucd_dec).first
-          end
-        end
-        
-        def image_filter_columns
-          #ucd_filter = find_field_in_conf_file('')['ucd']
-          
-          #if find_columns(ucd_filter).first != nil
-          #  find_columns(ucd_filter).first
-          #end
-        end
-        
-        def image_date_obs_columns
-          #ucd_date_obs = find_field_in_conf_file('')['ucd']
-          
-          #if find_columns(ucd_date_obs).first != nil
-          #  find_columns(ucd_date_obs).first
-          #end
-        end
-        
-        def image_telescope_columns
-          #ucd_telescope = find_field_in_conf_file('')['ucd']
-          
-          #if find_columns(ucd_telescope).first != nil
-          #  find_columns(ucd_telescope).first
-          #end
-        end
-        
-        def image_survey_columns
-          ucd_survey = find_field_in_conf_file('VOX:Image_Title')['ucd']
-          
-          if find_columns(ucd_survey).first != nil
-            find_columns(ucd_survey).first
-          end
-        end
-        
-        def image_instrument_columns
-          #ucd_instrument = find_field_in_conf_file('')['ucd']
-          
-          #if find_columns(ucd_instrument).first != nil
-          #  find_columns(ucd_instrument).first
-          #end
-        end
-        
-        def image_sky_columns
-          #ucd_sky = find_field_in_conf_file('')['ucd']
-          
-          #if find_columns(ucd_sky).first != nil
-          #  find_columns(ucd_sky).first
-          #end
-        end
-        
-        def image_zeropoint_columns
-          #ucd_zeropoint = find_field_in_conf_file('')['ucd']
-          
-          #if find_columns(ucd_zeropoint).first != nil
-          #  find_columns(ucd_zeropoint).first
-          #end
-        end
-        
-        def image_seeing_columns
-          #ucd_seeing = find_field_in_conf_file('')['ucd']
-          
-          #if find_columns(ucd_seeing).first != nil
-          #  find_columns(ucd_seeing).first
-          #end
-        end
-        
-        def image_depth_columns
-          #ucd_depth = find_field_in_conf_file('')['ucd']
-          
-          #if find_columns(ucd_depth).first != nil
-          #  find_columns(ucd_depth).first
-          #end
-        end
-        
-        def image_exptime_columns
-          #ucd_exptime = find_field_in_conf_file('')['ucd']
-          
-          #if find_columns(ucd_exptime).first != nil
-          #  find_columns(ucd_exptime).first
-          #end
-        end
-        
-        # Create the headers for HTML table
-        # [_access_ref_index_:]
-        #  A valid SIA VOTable will only ever have one VOX:Image_AccessReference.
-        # [_options_:]
-        # 
-        def create_headers(access_ref_index, options)
-          thead, thead_2row = create_header_cart_links(options)
-          
-          if options[:infer_access_ref] and access_ref_index
-            thead << "<th>#{options[:access_ref_header_label]}</th>\n"
-            thead_2row.push('&nbsp;')
-          end
-          
-          col_count = 0
-          fields(options[:res], options[:tbl]).each do |field|
-            field_archive = find_field_in_conf_file(field.ucd.value())
-            field_ucd = field_archive['ucd']
-            if options[:infer_access_ref] and col_count == access_ref_index
-              thead_2row[1] = field_ucd if field_ucd != 'nil'
-            else
-              thead << "<th>#{field_archive['id']}</th>\n"
-              if field_ucd != 'nil'
-                thead_2row.push(field_ucd)
-              else
-                thead_2row.push('&nbsp')
-              end
-            end
-            col_count += 1
-          end
-          
-          thead << "  </tr>\n"
-          
-          thead << "<tr>\n"
-          thead_2row.each do |h|
-            thead << "<th>#{h}</th>\n"
-          end
-          thead << "</tr>\n"
-          
-          thead << "</thead>"
-          
-          return thead
-        end
-        
-        # Creates the cart parameters
-        # [_cart_params:_]
-        # 
-        # [_columns:_]
-        #  
-        def create_item_cart_params(cart_params, columns)
-          link_ref_array = []
-          
-          cart_params.each do |key, value|
-            link_ref_array.push("#{key}=#{value}")
-          end
-          
-          access_ref_index = image_access_reference_columns()
-          link_ref_array.push("resource=#{CGI.escape(columns[access_ref_index].value).to_s}") if access_ref_index
-          ra_index = image_ra_columns()
-          link_ref_array.push("rac=#{columns[ra_index].value.to_s}") if ra_index
-          dec_index = image_dec_columns()
-          link_ref_array.push("decc=#{columns[dec_index].value.to_s}") if dec_index
-          filter_index = image_filter_columns()
-          link_ref_array.push("filter=#{columns[filter_index].value.to_s}") if filter_index
-          date_obs_index = image_date_obs_columns()
-          link_ref_array.push("date_obs=#{columns[date_obs_index].value.to_s}") if date_obs_index
-          teles_index = image_telescope_columns()
-          link_ref_array.push("telescop=#{columns[teles_index].value.to_s}") if teles_index
-          survey_index = image_survey_columns()
-          link_ref_array.push("survey=#{columns[survey_index].value.to_s}") if survey_index
-          instrum_index = image_instrument_columns()
-          link_ref_array.push("instrument=#{columns[instrum_index].value.to_s}") if instrum_index
-          sky_index = image_sky_columns()
-          link_ref_array.push("sky=#{columns[sky_index].value.to_s}") if sky_index
-          zerop_index = image_zeropoint_columns()
-          link_ref_array.push("zeropoint=#{columns[zerop_index].value.to_s}") if zerop_index
-          seeing_index = image_seeing_columns()
-          link_ref_array.push("seeing=#{columns[seeing_index].value.to_s}") if seeing_index
-          depth_index = image_depth_columns()
-          link_ref_array.push("depth=#{columns[depth_index].value.to_s}") if depth_index
-          exptime_index = image_exptime_columns()
-          link_ref_array.push("exptime=#{columns[exptime_index].value.to_s}") if exptime_index
-          
-          return link_ref_array.join('&')
-        end
-        
-        # Create body for HTML table
-        # [_access_ref_index_:]
-        #  A valid SIA VOTable will only ever have one VOX:Image_AccessReference.
-        # [_options_:]
-        #  
-        def create_body(access_ref_index, options)
-          tbody = "<tbody class=\"#{options[:body_class]}\" align=\"center\">\n"
-          row_count = 0
-          rows_data = rows(options[:res], options[:tbl])
-          if rows_data
-            rows_data.each do |tr|
-              tbody << "<tr class=\"#{options[:row_classes][row_count % 2]}\">\n"
-              
-              # Specially mark up the first column to link to the image.
-              columns = tr.tds()
-              
-              if options[:infer_add_to_cart_ref] and access_ref_index
-                tbody << "<td><input type=\"checkbox\" " +
-                         "id=\"checkbox_add_#{options[:cart_params][:archive]}_#{row_count.to_s}\" " +
-                         "value=\"#{create_item_cart_params(options[:cart_params], columns)}\"/></td>\n"
-              end
-              
-              if options[:infer_access_ref] and access_ref_index
-                tbody << "<td><a href=\"#{columns[access_ref_index].value}\">#{options[:access_ref_link_label]}</a></td>\n"
-              end
-              
-              col_count = 0
-              #ra_index = image_ra_columns()
-              #dec_index = image_dec_columns()
-              columns.each do |td|
-                if col_count != access_ref_index
-                  #if ra_index and col_count == ra_index
-                  #  tbody << "<td>#{convert_ra_to_degrees(td.value)}</td>\n"
-                  #elsif dec_index and col_count == dec_index
-                  #  tbody << "<td>#{convert_dec_to_degrees(td.value)}</td>\n"
-                  #else
-                    tbody << "<td>#{td.value}</td>\n"
-                  #end
-                end
-                col_count += 1
-              end
-              
-              tbody << "</tr>\n"
-              row_count += 1
-            end
-          end
-          tbody << "</tbody>"
-          
-          return tbody
-        end
-        
-        # Convert the specified table in the specified resource into an HTML
-        # table.
-        # [_options_:]
-        #  The options for this VOTable.
-        def to_html(options={})
-          # The ID to assign to the HTML table as a whole.
-          options[:id] = options[:id] || "#{votable}_#{Time.now.to_i}_#{rand(10000)}"
-          
-          options[:infer_add_to_cart_ref] = true if options[:infer_add_to_cart_ref] == nil
-          options[:add_to_cart_header_label] = options[:add_to_cart_header_label] || 'Add to Cart'
-          options[:cart_params] = {} if options[:cart_params] == nil
-          #options[:add_to_cart_url] = options[:add_to_cart_url] || nil
-          
-          options[:throbber_src] = options[:throbber_src] || '/images/general/indicator.gif'
-          options[:throbber_size] = options[:throbber_size] || '16x16'
-          options[:throbber_class] = options[:throbber_class] || 'throbber'
-          options[:throbber_id] = options[:throbber_id] || "#{options[:id]}_throbber_id"
-          
-          options[:flash_notice_class] = options[:flash_notice_class] || 'flash_notice'
-          options[:flash_notice_id] = options[:flash_notice_id] || "#{options[:id]}_flash_notice_id"
-          
-          # Link the access reference URL associated with a row.
-          options[:infer_access_ref] = true if options[:infer_access_ref] == nil
-          #options[:retrieve_link_ref] = options[:retrieve_link_ref] || nil
-          # For the access reference column, place this value in the header.
-          options[:access_ref_header_label] = options[:access_ref_header_label] || 'URL'
-          # For the access reference column, link this word.
-          options[:access_ref_link_label] = options[:access_ref_link_label] || 'Retrieve'
-          options[:ssl] = false if options[:ssl] == nil
-          #options[:resource_link] = options[:resource_link]
-          
-          # The resource from which to extract the table in question.
-          options[:res] = options[:res] || 0
-          # The table inside the resource from which to extract the rows in question.
-          options[:tbl] = options[:tbl] || 0
-          
-          # The boolean value to show HTML table border
-          options[:show_border] = false if options[:show_border] == nil
-          # The class to assign the HTML table as a whole.
-          options[:table_class] = options[:table_class] || 'votable'
-          # The class to assign the header of the HTML table.
-          options[:header_class] = options[:header_class] || 'header'
-          # The class to assign the body of the HTML table.
-          options[:body_class] = options[:body_class] || 'body'
-          # The class to assign the HTML table body rows.
-          options[:row_classes] = options[:row_classes] || ['row1', 'row2']
-          
-          begin
-            # A valid SIA VOTable will only ever have one VOX:Image_AccessReference.
-            access_ref_index = image_access_reference_columns()
-              
-            return create_votable(create_headers(access_ref_index, options),
-                                  create_body(access_ref_index, options),
-                                  options)
-            
-            rescue Exception => e
-              title = 'Error...'
-              message = "VORuby error: #{e.message}<br>#{e.backtrace}"
-              message << "<br>#{@resources[0].info[0].text().to_s()}" if @resources[0].info[0]
-              create_message(title, message, options)
-          end
-        end
-        
-      end
-    end
-  
-  end
-end

data/lib/voruby/votables/transforms.rb

@@ -1,388 +0,0 @@
-module VORuby
-  module VOTables
-    module VOTable
-      class VOTable
-        def self.from_soap_obj(mvot)
-          VOTable.new(
-            VOTable::_find_attr_value(mvot.__xmlattr, 'ID'),
-            VOTable::_find_attr_value(mvot.__xmlattr, 'version'),
-            (mvot.respond_to?(:dESCRIPTION))? Meta::Description.from_soap_obj(mvot.dESCRIPTION): nil,
-            (mvot.respond_to?(:dEFINITIONS))? Meta::Definitions.from_soap_obj(mvot.dEFINITIONS): nil,
-            (mvot.respond_to?(:cOOSYS))? Meta::CooSys.from_soap_obj(mvot.cOOSYS): [],
-            (mvot.respond_to?(:pARAM))? Meta::Param.from_soap_obj(mvot.pARAM): [],
-            (mvot.respond_to?(:iNFO))? Meta::Info.from_soap_obj(mvot.iNFO): [],
-            (mvot.respond_to?(:rESOURCE))? Meta::Resource.from_soap_obj(mvot.rESOURCE): []
-          )
-        end
-      end
-  
-      module Meta
-    
-        class Definitions
-          def self.from_soap_obj(mdef)
-            Definitions.new(
-               (mdef.respond_to?(:cOOSYS))? VOTable._coosys_from_soap_obj(mdef.cOOSYS): nil,
-               (mdef.respond_to?(:pARAM))? VOTable._params_from_soap_obj(mdef.pARAM): nil
-             )
-          end
-        end
-    
-        class Description
-          def self.from_soap_obj(mdesc)
-            Description.new(mdesc)
-          end
-        end
-    
-        class CooSys
-          def self.from_soap_obj(mcoosystems)
-            mcoosystems = [mcoosystems] if !mcoosystems.respond_to(:each)
-
-             coosys = []
-             mcoosystems.each do |mcoosys|
-               equinox_txt = VOTable::_find_attr_value(mcoosys.__xmlattr, 'equinox')
-               epoch_txt = VOTable::_find_attr_value(mcoosys.__xmlattr, 'epoch')
-               system_txt = VOTable::_find_attr_value(mcoosys.__xmlattr, 'system') || 'eq_FK5'
-
-               coosys.push(CooSys.new(
-                 VOTable::_find_attr_value(mcoosys.__xmlattr, 'ID'),
-                 (equinox_txt == nil)? nil: Type::AstroYear.new(equinox_txt),
-                 (epoch_txt == nil)? nil: Type::AstroYear.new(epoch_txt),
-                 Type::CoordSystemType.new(system_txt)
-               ))
-             end
-
-             coosys
-          end
-        end
-    
-        class Param
-          def self.from_soap_obj(mparams)
-            mparams = [mparams] if !mparams.respond_to?(:each)
-
-            params = []
-            mparams.each do |mparam|
-              datatype_txt = VOTable::_find_attr_value(mparam.__xmlattr, 'datatype')
-              ucd_txt = VOTable::_find_attr_value(mparam.__xmlattr, 'ucd')
-              precision_txt = VOTable::_find_attr_value(mparam.__xmlattr, 'precision')
-              width_txt = VOTable::_find_attr_value(mparam.__xmlattr, 'width')
-              arraysize_txt = VOTable::_find_attr_value(mparam.__xmlattr, 'arraysize')
-
-              params.push(Param.new(
-                VOTable::_find_attr_value(mparam.__xmlattr, 'name'),
-                (datatype_txt == nil)? nil: Type::DataType.new(datatype_txt),
-                VOTable::_find_attr_value(mparam.__xmlattr, 'value'),
-                (ucd_txt == nil)? nil: Type::UCDType.new(ucd_txt),
-                VOTable::_find_attr_value(mparam.__xmlattr, 'unit'),
-                (mparam.respond_to?(:dESCRIPTION))? _description_from_soap_obj(mparam.dESCRIPTION): nil,
-                (mparam.respond_to?(:vALUES))? _values_from_soap_obj(mparam.vALUES): nil,
-                (mparam.respond_to?(:lINK))? _links_from_soap_obj(mapram.lINK): nil,
-                VOTable::_find_attr_value(mparam.__xmlattr, 'ID'),
-                (precision_txt == nil)? nil: Type::PrecisionType.new(precision_txt.to_i),
-                VOTable::_find_attr_value(mparam.__xmlattr, 'utype'),
-                (width_txt == nil)? nil: Type::PositiveInteger.new(width_txt.to_i),
-                VOTable::_find_attr_value(mparam.__xmlattr, 'ref'),
-                (arraysize_txt == nil)? nil: Type::ArrayDef.new(arraysize_txt)
-              ))
-            end
-        
-            params
-          end
-        end
-    
-        class Info
-          def self.from_soap_obj(minfo)
-            info = []
-            info.push(Info.new(
-              VOTable::_find_attr_value(minfo.__xmlattr, 'name'),
-              VOTable::_find_attr_value(minfo.__xmlattr, 'value'),
-              VOTable::_find_attr_value(minfo.__xmlattr, 'ID'),
-              minfo.__xmlele # text
-            ))
-        
-            info
-          end
-        end
-    
-        class Resource
-          def self.from_soap_obj(mresources)
-            mresources = [mresources] if !mresources.respond_to?(:each)
-
-            resources = []
-            mresources.each do |mres|
-              type_txt = VOTable::_find_attr_value(mres.__xmlattr, 'type') || 'results'
-
-              resources.push(Resource.new(
-                VOTable::_find_attr_value(mres.__xmlattr, 'name'),
-                VOTable::_find_attr_value(mres.__xmlattr, 'ID'),
-                VOTable::_find_attr_value(mres.__xmlattr, 'utype'),
-                Type::ResourceType.new(type_txt),
-                (mres.respond_to?(:dESCRIPTION))? Description.from_soap_obj(mres.dESCRIPTION): nil,
-                (mres.respond_to?(:iNFO))? Info.from_soap_obj(mres.iNFO): [],
-                (mres.respond_to?(:cOOSYS))? CooSys.from_soap_obj(mres.cOOSYS): [],
-                (mres.respond_to?(:pARAM))? Param.from_soap_obj(mres.pARAM): [],
-                (mres.respond_to?(:lINK))? Link.from_soap_obj(mres.lINK): [],
-                Table.from_soap_obj(mres.tABLE),
-                (mres.respond_to?(:rESOURCE))? Resource.from_soap_obj(mres.rESOURCE): []
-              ))
-            end
-
-            resources
-          end
-        end
-    
-        class Table
-          def self.from_soap_obj(mtables)
-            mtables = [mtables] if !mtables.respond_to?(:each)
-
-            tables = []
-            mtables.each do |mtable|
-              ucd_txt = VOTable::_find_attr_value(mtable.__xmlattr, 'ucd')
-              nrows_txt = VOTable::_find_attr_value(mtable.__xmlattr, 'nrows')
-
-              tables.push(Table.new(
-                VOTable::_find_attr_value(mtable.__xmlattr, 'name'),
-                VOTable::_find_attr_value(mtable.__xmlattr, 'ID'),
-                (ucd_txt == nil)? nil: Type::UCDType.new(ucd_txt),
-                VOTable::_find_attr_value(mtable.__xmlattr, 'utype'),
-                VOTable::_find_attr_value(mtable.__xmlattr, 'ref'),
-                (nrows_txt == nil)? nil: Type::NonNegativeInteger.new(nrows_txt.to_i),
-                (mtable.respond_to?(:dESCRIPTION))? Description.from_soap_obj(mtable.dESCRIPTION): nil,
-                (mtable.respond_to?(:fIELD))? Field.from_soap_obj(mtable.fIELD): [],
-                (mtable.respond_to?(:pARAM))? Param.from_soap_obj(mtable.pARAM): [],
-                (mtable.respond_to?(:gROUP))? Group.from_soap_obj(mtable.gROUP): [],
-                (mtable.respond_to?(:lINK))? Link.from_soap_obj(mtable.lINK): [],
-                (mtable.respond_to?(:dATA))? Data::Data.from_soap_obj(mtable.dATA): nil
-              ))
-            end
-
-            tables
-          end
-        end
-    
-        class Group
-          def self.from_soap_obj(mgroups)
-            mgroups = [mgroups] if !mgroups.respond_to?(:each)
-
-            groups = []
-            mgroups.each do |mgroup|
-              ucd_txt = OTable::VOTable::_find_attr_value(mgroup.__xmlattr, 'ucd')
-
-              groups.push(Group.new(
-                VOTable::_find_attr_value(mgroup.__xmlattr, 'name'),
-                (ucd_txt == nil)? nil: Type::UCDType.new(ucd_txt),
-                (mgroup.respond_to?(:dESCRIPTION))? Description.from_soap_obj(mgroup.dESCRIPTION): nil,
-                (mgroup.respond_to?(:fIELDref))? FieldRef.from_soap_obj(mgroup.fIELDref): [],
-                (mgroup.respond_to?(:pARAMref))? ParamRef.from_soap_obj(mgroup.pARAMref): [],
-                (mgroup.respond_to?(:pARAM))? Param.from_soap_obj(mgroup.pARAM): [],
-                (mgroup.respond_to?(:gROUP))? Group.from_soap_obj(mgroup.gROUP): [],
-                VOTable::_find_attr_value(mgroup.__xmlattr, 'ID'),
-                VOTable::_find_attr_value(mgroup.__xmlattr, 'ref'),
-                VOTable::_find_attr_value(mgroup.__xmlattr, 'utype')
-              ))
-            end
-
-            groups       
-          end
-        end
-    
-        class FieldRef
-          def self.from_soap_obj(mfieldrefs)
-            mfieldrefs = [mfieldrefs] if !mfieldrefs.respond_to?(:each)
-
-            fieldrefs = []
-            mfieldrefs.each do |mfieldref|
-              fieldrefs.push(FieldRef.new(
-                VOTable::_find_attr_value(mfieldref.__xmlattr, 'ref')
-              ))
-            end
-
-            fieldrefs       
-          end
-        end
-    
-        class ParamRef
-          def self.from_soap_obj(mparamrefs)
-            mparamrefs = [mparamrefs] if !mparamrefs.respond_to?(:each)
-
-            paramrefs = []
-            mparamrefs.each do |mparamref|
-              paramrefs.push(ParamRef.new(
-                VOTable::_find_attr_value(mparamref.__xmlattr, 'ref')
-              ))
-            end
-
-            paramrefs        
-          end
-        end
-    
-        class Field
-          def self.from_soap_obj(mfields)
-            mfields = [mfields] if !mfields.respond_to?(:each)
-
-            fields = []
-            mfields.each do |mfield|
-              datatype_txt = VOTable::_find_attr_value(mfield.__xmlattr, 'datatype')
-              ucd_txt = VOTable::_find_attr_value(mfield.__xmlattr, 'ucd')
-              precision_txt = VOTable::_find_attr_value(mfield.__xmlattr, 'precision')
-              width_txt = VOTable::_find_attr_value(mfield.__xmlattr, 'width')
-              arraysize_txt = VOTable::_find_attr_value(mfield.__xmlattr, 'arraysize')
-              type_txt = VOTable::_find_attr_value(mfield.__xmlattr, 'type')
-
-              fields.push(Field.new(
-                VOTable::_find_attr_value(mfield.__xmlattr, 'name'),
-                (datatype_txt == nil)? nil: Type::DataType.new(datatype_txt),
-                (ucd_txt == nil)? nil: Type::UCDType.new(ucd_txt),
-                VOTable::_find_attr_value(mfield.__xmlattr, 'unit'),
-                (mfield.respond_to?(:dESCRIPTION))? Description.from_soap_obj(mfield.dESCRIPTION): nil,
-                (mfield.respond_to?(:vALUES))? Values.from_soap_obj(mfield.vALUES): nil,
-                (mfield.respond_to?(:lINK))? Link.from_soap_obj(mfield.lINK): [],
-                VOTable::_find_attr_value(mfield.__xmlattr, 'ID'),
-                (precision_txt == nil)? nil: Type::PrecisionType.new(precision_txt),
-                VOTable::_find_attr_value(mfield.__xmlattr, 'utype'),
-                (width_txt == nil)? nil: Type::PositiveInteger.new(width_txt.to_i),
-                VOTable::_find_attr_value(mfield.__xmlattr, 'ref'),
-                (arraysize_txt == nil)? nil: Type::ArrayDef.new(arraysize_txt),
-                (type_txt == nil)? nil: Type::FieldType.new(type_txt)
-              ))
-            end
-        
-            fields
-          end
-        end
-    
-        class Link
-          def self.from_soap_obj(mlinks)
-            mlinks = [mlinks] if !mlinks.respond_to?(:each)
-
-             links = []
-             mlinks.each do |mlink|
-               href_txt = VOTable::_find_attr_value(mlink.__xmlattr, 'href')
-               action_txt = VOTable::_find_attr_value(mlink.__xmlattr, 'action')
-               content_role_txt = VOTable::_find_attr_value(mlink.__xmlattr, 'content-role')
-
-               links.push(Link.new(
-                 (href_txt == nil)? nil: Type::AnyURI.new(href_txt),
-                 VOTable::_find_attr_value(mlink.__xmlattr, 'value'),
-                 VOTable::_find_attr_value(mlink.__xmlattr, 'title'),
-                 (action_txt == nil)? nil: Type::AnyURI.new(action_txt),
-                 VOTable::_find_attr_value(mlink.__xmlattr, 'ID'),
-                 VOTable::_find_attr_value(mlink.__xmlattr, 'content-type'),
-                 (content_role_txt == nil)? nil: Type::ContentRole.new(content_role_txt),
-                 VOTable::_find_attr_value(mlink.__xmlattr, 'ghref')
-               ))
-             end
-
-             links       
-          end
-        end
-    
-        class Values
-          def self.from_soap_obj(mvalues)
-            type_txt = VOTable::_find_attr_value(mvalues.__xmlattr, 'type') || 'legal'
-
-            Values.new(
-               (mvalues.respond_to?(:mIN))? Min.from_soap_obj(mvalues.mIN): nil,
-               (mvalues.respond_to?(:mAX))? Max.from_soap_obj(mvalues.mAX): nil,
-               (mvalues.respond_to?(:oPTIONS))? Option.from_soap_obj(mvalues.oPTIONS): [],
-               VOTable::_find_attr_value(mvalues.__xmlattr, 'ID'),
-               (type_txt == nil)? nil: Type::ValuesType.new(type_txt),
-               VOTable::_find_attr_value(mvalues.__xmlattr, 'null'),
-               VOTable::_find_attr_value(mvalues.__xmlattr, 'ref')
-             )       
-          end
-        end
-    
-        class Option
-          def self.from_soap_obj(moptions)
-            options = []
-            moptions.each do |moption|
-              options.push(Option.new(
-                VOTable::_find_attr_value(mvalues.__xmlattr, 'value'),
-                VOTable::_find_attr_value(mvalues.__xmlattr, 'name'),
-                (moption.respond_to?(:oPTION))? Option.from_soap_obj(moption.oPTION): []
-            ))
-            end
-        
-            options
-          end
-        end
-    
-        class Min
-          def self.from_soap_obj(mmin)
-            inclusive_txt = VOTable::_find_attr_value(mmin.__xmlattr, 'inclusive') || 'yes'
-
-            Min.new(
-              VOTable::_find_attr_value(mmin.__xmlattr, 'value'),
-              Type::YesNo.new(inclusive_txt)
-            )       
-          end
-        end
-    
-        class Max
-          def self.from_soap_obj(mmax)
-            inclusive_txt = VOTable::_find_attr_value(mmax.__xmlattr, 'inclusive') || 'yes'
-
-            Max.new(
-              VOTable::_find_attr_value(mmax.__xmlattr, 'value'),
-              Type::YesNo.new(inclusive_txt)
-            )        
-          end
-        end
-    
-      end
-  
-      module Data
-  
-        class Data
-          def self.from_soap_obj(mdata)
-            # Note that strictly one can also have a FITS or BINARY stream here
-            Data.new(
-              (mdata.respond_to?(:tABLEDATA))? TableData.from_soap_obj(mdata.tABLEDATA): nil
-            )
-          end
-        end
-  
-        class TableData
-          def self.from_soap_obj(mtbldata)
-            TableData.new(
-               (mtbldata.respond_to?(:tR))? TR.from_soap_obj(mtbldata.tR): []
-             )        
-          end
-        end
-    
-        class TR
-          def self.from_soap_obj(mtrs)
-            mtrs = [mtrs] if !mtrs.respond_to?(:each)
-
-            trs = []
-            mtrs.each do |tr|
-              trs.push(
-                (tr.respond_to?(:tD))? TR.new(TD.from_soap_obj(tr.tD)): []
-              )
-            end
-
-            trs
-          end
-        end
-    
-        class TD
-          def self.from_soap_obj(mtds)
-            mtds = [mtds] if !mtds.respond_to?(:each)
-
-            tds = []
-            mtds.each do |td|
-              tds.push(TD.new(
-                td,
-                (td.respond_to?(:__xmlattr))? VOTable::_find_attr_value(td.__xmlattr, 'encoding'): Type::EncodingType.new('none')
-              ))
-            end
-
-            tds
-          end
-        end
-    
-      end
-    end
-    
-  end
-end