lib/solrizer/xml/terminology_based_solrizer.rb in solrizer-2.0.0.rc3 vs lib/solrizer/xml/terminology_based_solrizer.rb in solrizer-2.0.0.rc4

@@ -34,11 +34,11 @@
     nodeset = doc.find_by_terms(*term_pointer)
     
     nodeset.each do |node|
       # create solr fields
       
-      self.solrize_node(node, doc, term_pointer, term, solr_doc, field_mapper)
+      doc.solrize_node(node, term_pointer, term, solr_doc, field_mapper)
       unless term.kind_of? OM::XML::NamedTermProxy
         term.children.each_pair do |child_term_name, child_term|
           doc.solrize_term(child_term, solr_doc, field_mapper, opts={:parents=>parents+[{term.name=>nodeset.index(node)}]})
         end
       end
@@ -66,19 +66,19 @@
       node_value = node.text
     end
     
     generic_field_name_base = OM::XML::Terminology.term_generic_name(*term_pointer)
     
-    field_mapper.solr_names_and_values(generic_field_name_base, node_value, term.data_type, term.index_as).each do |field_name, field_value|
+    field_mapper.solr_names_and_values(generic_field_name_base, node_value, term.type, term.index_as).each do |field_name, field_value|
       unless field_value.join("").strip.empty?
         ::Solrizer::Extractor.insert_solr_field_value(solr_doc, field_name, field_value)
       end
     end
     
     if term_pointer.length > 1
       hierarchical_field_name_base = OM::XML::Terminology.term_hierarchical_name(*term_pointer)
-      field_mapper.solr_names_and_values(hierarchical_field_name_base, node_value, term.data_type, term.index_as).each do |field_name, field_value|
+      field_mapper.solr_names_and_values(hierarchical_field_name_base, node_value, term.type, term.index_as).each do |field_name, field_value|
         unless field_value.join("").strip.empty?
           ::Solrizer::Extractor.insert_solr_field_value(solr_doc, field_name, field_value)
         end
       end
     end
@@ -96,9 +96,9 @@
   def solrize_term(term, solr_doc = Hash.new, field_mapper = self.field_mapper, opts={})
     Solrizer::XML::TerminologyBasedSolrizer.solrize_term(self, term, solr_doc, field_mapper, opts)    
   end
   
   def solrize_node(node, term_pointer, term, solr_doc = Hash.new, field_mapper = self.field_mapper, opts={})
-    Solrizer::XML::TerminologyBasedSolrizer.solrize_node(node, self, term_pointer, solr_doc, field_mapper, opts)
+    Solrizer::XML::TerminologyBasedSolrizer.solrize_node(node, self, term_pointer, term, solr_doc, field_mapper, opts)
   end
   
 end