null+****@clear*****
null+****@clear*****
Tue Feb 21 14:08:05 JST 2012
SHIMADA Koji 2012-02-21 14:08:05 +0900 (Tue, 21 Feb 2012) New Revision: d84dda492a3a7f0e062a7aa8c82f215d98f22c52 Log: Enable to lookup without glossary_source Modified files: lib/logaling/glossary_db.rb Modified: lib/logaling/glossary_db.rb (+12 -8) =================================================================== --- lib/logaling/glossary_db.rb 2012-02-21 13:52:59 +0900 (420181b) +++ lib/logaling/glossary_db.rb 2012-02-21 14:08:05 +0900 (f0ad81b) @@ -81,18 +81,22 @@ module Logaling end end - def lookup(source_term, glossary_source) + def lookup(source_term, glossary_source=nil) records_selected = Groonga["translations"].select do |record| conditions = [record.source_term =~ source_term] - conditions << (record.source_language =~ glossary_source.source_language) if glossary_source.source_language - conditions << (record.target_language =~ glossary_source.target_language) if glossary_source.target_language + if glossary_source + conditions << (record.source_language =~ glossary_source.source_language) if glossary_source.source_language + conditions << (record.target_language =~ glossary_source.target_language) if glossary_source.target_language + end conditions end - specified_glossary = records_selected.select do |record| - record.glossary == glossary_source.glossary - end - specified_glossary.each do |record| - record.key._score += 10 + if glossary_source + specified_glossary = records_selected.select do |record| + record.glossary == glossary_source.glossary + end + specified_glossary.each do |record| + record.key._score += 10 + end end records = records_selected.sort([ {:key=>"_score", :order=>'descending'},