voruby 1.1.1 → 2.0.0

data/lib/voruby/votables/int.rb

@@ -1,354 +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 INT VOTable.
-
-require 'voruby/votables/votable'
-
-module VORuby
-  module VOTables
-    
-    module VOTable
-      class INTVOTable < 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 INT configuration file given a key.
-        # Returns a hash with the field's attributes
-        # [_key_:]
-        #   The key indexing on field's attribute
-        def find_field_in_conf_file(key)
-          int_field = {'id'=> nil, 'name'=> nil, 'ucd'=> nil}
-          
-          if key != nil
-            INT_ARCHIVE_CONFIG.each do |archive|
-              archive['votable_fields'].each do |field|
-                if field['key'] == key
-                  int_field['id'] = field['id'] if field['id'] != 'nil'
-                  int_field['name'] = field['name'] if field['name'] != 'nil'
-                  int_field['ucd'] = field['ucd'] if field['ucd'] != 'nil'
-                  break
-                end
-              end
-            end
-          end
-          return int_field
-        end
-            
-        # Find the column number(s) associated with the 
-        # VOX:imageAccessReference UCD.
-        # Returns a list of column positions.
-        def image_access_reference_columns()
-          ucd_access = find_field_in_conf_file('VOX:Image_AccessReference')['ucd']
-          
-          if find_columns(ucd_access).first != nil
-            find_columns(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('VOX:BandPass_ID')['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('VOX:INST_ID')['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['name']}</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/libxml_parser.rb

@@ -1,411 +0,0 @@
-module VORuby
-  module VOTables
-    module VOTable
-      require 'xml/libxml'
-
-      module Meta
-
-        class Description
-          def self.from_xml(node)
-    		    return Meta::Description.new(node.to_s)
-          end
-        end
-
-        class Definitions
-          def self.from_xml(node)
-    		    systems = []
-        		node.find('COOSYS').each { |sysNode|
-        	  		systems.push(Meta::CooSys.from_xml(sysNode))
-        		}
-	
-        		params = []
-        		node.find('PARAM').each { |paramNode|
-        	  		params.push(Meta::Param.from_xml(paramNode))
-        		}
-	
-        		return self.new(systems, params)
-          end
-        end
-
-        class CooSys
-          def self.from_xml(node)
-    		    id = node['ID']
-        		equinox = Type::AstroYear.new(node['equinox']) if node['equinox']
-        		epoch = Type::AstroYear.new(node['epoch']) if node['epoch']
-        		system = Type::CoordSystemType.new(node['system']) if node['system']
-	
-        		return self.new(id, equinox, epoch, system)
-          end
-        end
-
-        class Link
-          def self.from_xml(node)
-    		    id = node['ID']
-        		content_role = Type::ContentRole.new(node['content-role']) if node['content-role']
-        		content_type = node['content-type']
-        		title = node['title']
-        		value = node['value']
-        		href = Type::AnyURI.new(node['href']) if node['href']
-        		gref = node['gref']
-        		action = Type::AnyURI.new(node['action']) if node['action']
-	
-        		return self.new(href, value, title, action, id, content_type, content_role, gref)
-          end
-        end
-
-        class Values
-          def self.from_xml(node)
-    		    # Attributes
-        		id = node['ID'] if node['ID']
-        		type = Type::ValuesType.new(node['type']) if node['type']
-        		null = node['null'] if node['null']
-        		ref = node['ref'] if node['ref']
-	
-        		# Elements
-        		min = Meta::Min.from_xml(node.find('MIN').to_a.first) if node.find('MIN').length > 0
-        		max = Meta::Max.from_xml(node.find('MAX').to_a.first) if node.find('MAX').length > 0
-
-        		options = []
-        		node.find('OPTION').each { |optNode|
-        	  		options.push(Meta::Option.from_xml(optNode))
-        		}
-	
-        		return self.new(min, max, options, id, type, null, ref)
-          end
-        end
-
-        class FieldRef
-          def self.from_xml(node)
-    		    ref = node['ref'] if node['ref']
-	
-        		return self.new(ref)
-          end
-        end
-
-        class ParamRef
-          def self.from_xml(node)
-    		    ref = node['ref'] if node['ref']
-	
-        		return self.new(ref)
-          end
-        end
-
-        class Group
-          def self.from_xml(node)
-    		    # Attributes
-        		id = node['ID'] if node['ID']
-        		name = node['name'] if node['name']
-        		ref = node['ref'] if node['ref']
-        		ucd = UCDType.new(node['ucd']) if node['ucd']
-        		utype = node['utype'] if node['utype']
-	
-        		# Elements
-        		description =
-        	  		Meta::Description.from_xml(node.find('DESCRIPTION').to_a.first) if node.find('DESCRIPTION').length > 0
-		
-        		fieldrefs = []
-        		node.find('FIELDref').each { |fref|
-        	  		fieldrefs.push(Meta::FieldRef.from_xml(fref))
-        		}
-	
-        		paramrefs = []
-        		node.find('PARAMref').each { |pref|
-        	  		paramrefs.push(Meta::ParamRef.from_xml(pref))
-        		}
-	
-        		params = []
-        		node.find('PARAM').each { |param|
-        	  		params.push(Meta::Param.from_xml(param))
-        		}
-	
-        		groups = []
-        		node.find('GROUP').each { |group|
-        	  		groups.push(Meta::Group.from_xml(group))
-        		}
-	
-        		return self.new(name, ucd, description, fieldrefs, paramrefs, params, groups,
-        						id, ref, utype)
-          end
-        end
-
-        class Param
-          def self.from_xml(node)
-    	    	# Attributes
-        		id = node['ID'] if node['ID']
-        		unit = node['unit'] if node['unit']
-        		datatype = Type::DataType.new(node['datatype']) if node['datatype']
-        		precision = Type::PrecisionType.new(node['precision']) if node['precision']
-        		width = Type::PositiveInteger.new(node['width'].to_i) if node['width']
-        		ref = node['ref'] if node['ref']
-        		name = node['name'] if node['name']
-        		ucd = Type::UCDType.new(node['ucd']) if node['ucd']
-        		utype = node['utype'] if node['utype']
-        		value = node['value'] if node['value']
-        		arraysize = Type::ArrayDef.new(node['arraysize']) if node['arraysize']
-	
-        		# Elements
-        		description =
-        	  		Meta::Description.from_xml(node.find('DESCRIPTION').to_a.first) if node.find('DESCRIPTION').length > 0
-        		values =
-        	  		Meta::Values.from_xml(node.find('VALUES').to_a.first) if node.find('VALUES').length > 0
-
-        		links = []
-        		node.find('LINK').each { |linkNode|
-        	  		links.push(Meta::Link.from_xml(linkNode))
-        		}
-	
-        		return self.new(name, datatype, value, ucd, unit, description, values, links,
-        						id, precision, utype, width, ref, arraysize)
-          end
-        end
-
-        class Field
-          def self.from_xml(node)
-    	    	# Attributes
-        		id = node['ID'] if node['ID']
-        		unit =  node['unit'] if node['unit']
-        		datatype = Type::DataType.new(node['datatype']) if node['datatype']
-        		precision = Type::PrecisionType.new(node['precision']) if node['precision']
-        		width = Type::PositiveInteger.new(node['width'].to_i) if node['width']
-        		ref = node['ref'] if node['ref']
-        		name = node['name'] if node['name']
-        		ucd = Type::UCDType.new(node['ucd']) if node['ucd']
-        		arraysize = Type::ArrayDef.new(node['arraysize']) if node['arraysize']
-        		type = Type::FieldType.new(node['type']) if node['type']
-        		utype = node['utype'] if node['utype']
-	
-        		# Elements
-        		description =
-        	  		Meta::Description.from_xml(node.find('DESCRIPTION').to_a.first) if node.find('DESCRIPTION').length > 0
-        		values =
-        	  		Meta::Values.from_xml(node.find('VALUES').to_a.first) if node.find('VALUES').length > 0
-
-        		links = []
-        		node.find('LINK').each { |link|
-        	  		links.push(Meta::Link.from_xml(link))
-        		}
-	
-        		return self.new(name, datatype, ucd, unit, description, values,
-        						links, id, precision, utype, width, ref, arraysize, type)
-          end
-        end
-
-        class Info
-          def self.from_xml(node)
-    		    id = node['ID']
-        		name = node['name']
-        		value = node['value']
-	
-        		return self.new(name, value, id)
-          end
-        end
-
-        class Table
-          def self.from_xml(node)
-    	    	# Attributes
-        		id = node['ID'] if node['ID']
-        		name = node['name'] if node['name']
-        		ref = node['ref'] if node['ref']
-        		ucd = UCDType.new(node['ucd']) if node['ucd']
-        		utype = node['utype'] if node['utype']
-        		nrows = NonNegativeInteger.new(node['nrows'].to_i) if node['nrows']
-	
-        		# Elements
-        		description =
-        	  		Meta::Description.from_xml(node.find('DESCRIPTION').to_a.first) if node.find('DESCRIPTION').length > 0
-	
-        		fields = []
-        		node.find('FIELD').each { |fieldNode|
-        	  		fields.push(Meta::Field.from_xml(fieldNode))
-        		}
-		
-        		params = []
-        		node.find('PARAM').each { |paramNode|
-        	  		params.push(Meta::Param.from_xml(paramNode))
-        		}
-	
-        		groups = []
-        		node.find('GROUP').each { |groupNode|
-        	  		params.push(Meta::Group.from_xml(groupNode))
-        		}
-	
-        		links = []
-        		node.find('LINK').each { |linkNode|
-        	  		params.push(Meta::Link.from_xml(linkNode))
-        		}
-	
-        		data = Data::Data.from_xml(node.find('DATA').to_a.first) if node.find('DATA').length > 0
-            
-        		return self.new(name, id, ucd, utype, ref, nrows, description,
-        						fields, params, groups, links, data)
-          end
-        end
-
-        class Resource
-          def self.from_xml(node)
-    	    	# Attributes
-        		name = node['name'] if node['name']
-        		id = node['ID'] if node['ID']
-        		utype = node['utype'] if node['utype']
-        		type = Type::ResourceType.new(node['type']) if node['type']
-	
-        		# Elements
-        		description =
-        	  		Meta::Description.from_xml(node.find('DESCRIPTION').to_a.first) if node.find('DESCRIPTION').length > 0
-	
-        		info = []
-        		node.find('INFO').each { |infoNode|
-        	  		info.push(Meta::Info.from_xml(infoNode))
-        		}
-	
-        		systems = []
-        		node.find('COOSYS').each { |sysNode|
-        	  		systems.push(Meta::CooSys.from_xml(sysNode))
-        		}
-             
-        		params = []
-        		node.find('PARAM').each { |paramNode|
-        	  		params.push(Meta::Param.from_xml(paramNode))
-        		}
-             
-        		resources = []
-        		node.find('RESOURCE').each { |resNode|
-        	  		resources.push(Meta::Resource.from_xml(resNode))
-        		}
-	
-        		links = []
-        		node.find('LINK').each { |linkNode|
-        	  		links.push(Meta::Link.from_xml(linkNode))
-        		}
-	
-        		tables = []
-        		node.find('TABLE').each { |tblNode|
-        	  		tables.push(Meta::Table.from_xml(tblNode))
-        		}
-	
-        		return self.new(name, id, utype, type, description,
-        						info, systems, params, links, tables, resources)
-          end
-        end
-
-        class Option
-          def self.from_xml(node)
-    	    	value = node['value'] if node['value']
-        		name = node['name'] if node['name']
-	
-        		options = []
-        		node.find('OPTION').each { |optNode|
-        	  		options.push(Meta::Option.from_xml(optNode))
-        		}
-			  
-        		return self.new(value, name, options)
-          end
-        end
-
-        class Max
-          def self.from_xml(node)
-    		    value = node['node'] if node['node']
-        		inclusive = Type::YesNo.new(node['inclusive']) if node['inclusive']
-	
-        		return self.new(value, inclusive)
-          end
-        end
-
-        class Min
-          def self.from_xml(node)
-        		value = node['node'] if node['node']
-        		inclusive = Type::YesNo.new(node['inclusive']) if node['inclusive']
-	
-        		return self.new(value, inclusive)
-          end
-        end
-
-      end
-
-      module Data
-
-        class Stream
-          def self.from_xml(node)
-    		    href = Type::AnyURI.new(node['href']) if node['href']
-        		expires = DateTime.parse(node['expires']) if node['expires']
-        		rights = node['rights']
-        		type = Type::StreamType.new(node['type']) if node['type']
-        		actuate = Actuate.new(node['actuate']) if node['actuate']
-        		encoding = Type::EncodingType.new(node['encoding']) if node['encoding']
-	
-        		return self.new(href, expires, rights, type, actuate, encoding)
-          end
-        end
-
-        class BinaryStream
-          def self.from_xml(node)
-    		    stream = Stream.from_xml(node.find('STREAM').to_a.first)
-	
-        		return self.new(stream)
-          end
-        end
-
-        class FITSStream
-          def self.from_xml(node)	
-    		    stream = Stream.from_xml(node.find('STREAM').to_a.first)
-        		extnum = Type::PositiveInteger.new(node['extnum'].to_i) if node['extnum']
-	
-        		return self.new(stream, extnum)
-          end
-        end
-
-        class TD
-          def self.from_xml(node)
-    		    value = node.to_s 
-        		encoding = Type::EncodingType.new(node['encoding']) if node['encoding']
-	
-        		return self.new(value, encoding)
-          end
-        end
-
-        class TR
-          def self.from_xml(node)
-    		    tds = []
-        		node.find('TD').each { |tdNode|
-        	  		tds.push(TD.from_xml(tdNode))
-        		}
-	
-        		return self.new(tds)
-          end
-        end
-
-        class TableData
-          def self.from_xml(node)
-    		    trs = []
-        		node.find('TR').each { |trNode|
-        	  		trs.push(TR.from_xml(trNode))
-        		}
-	
-        		return self.new(trs)
-          end
-        end
-
-        class Data
-          def self.from_xml(node)
-    		    format = nil
-        		node.find('FITS').each { |fnode|
-        	  		format = FITSStream.from_xml(fnode)
-        		}
-	
-        		node.find('BINARY').each { |bnode|
-        	  		format = BinaryStream.from_xml(bode)
-        		}
-	
-        		node.find('TABLEDATA').each { |tnode|
-        	  		format = TableData.from_xml(tnode)
-        		}
-	
-        		return self.new(format)
-          end
-        end
-
-      end
-    end
-    
-  end
-end