Changeset 319

Show
Ignore:
Timestamp:
05/05/08 03:20:55 (7 months ago)
Author:
eric.dumin..@gmail.com
Message:

Refactoring

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved
  • trunk/lib/picolena/templates/app/models/indexer.rb

    r316 r319  
    5151 
    5252    def add_or_update_file(complete_path) 
    53       default_fields = Document.default_fields_for(complete_path) 
     53      document = Document.default_fields_for(complete_path) 
    5454      begin 
    55         document = PlainTextExtractor.extract_content_and_language_from(complete_path) 
     55        document.merge! PlainTextExtractor.extract_content_and_language_from(complete_path) 
    5656        raise "empty document #{complete_path}" if document[:content].strip.empty? 
    57         document.merge! default_fields 
    58         log :debug => ["Added : #{complete_path}",document[:language] ? " (#{document[:language]})" : ""].join 
     57        log :debug => ["Added : #{complete_path}",document[:language] && " ("<<document[:language]<<")"].join 
    5958      rescue => e 
    6059        log :debug => "\tindexing without content: #{e.message}" 
    61         document = default_fields 
    6260      end 
    6361      index << document