SUZUKI Miho
null+****@clear*****
Fri Oct 19 01:38:22 JST 2012
SUZUKI Miho 2012-10-19 01:38:22 +0900 (Fri, 19 Oct 2012) New Revision: 61c27c26634bf113e6f4459a8630408c7dbb7b56 https://github.com/logaling/logaling-command/commit/61c27c26634bf113e6f4459a8630408c7dbb7b56 Merged 6ed24d3: Merge pull request #84 from logaling/fix-deindex-glossary Log: Extract GlossaryDB#glossary_source_of_the_same_project_exist? Modified files: lib/logaling/glossary_db.rb Modified: lib/logaling/glossary_db.rb (+21 -14) =================================================================== --- lib/logaling/glossary_db.rb 2012-10-18 07:30:58 +0900 (2eb93a6) +++ lib/logaling/glossary_db.rb 2012-10-19 01:38:22 +0900 (c18212e) @@ -64,21 +64,9 @@ module Logaling def deindex_glossary(glossary, glossary_source) delete_translations_by_glossary_source(glossary_source.source_path) delete_glossary_source(glossary_source.source_path) - - glossary_source_num = 0 - get_all_glossary_sources.each do |glossary_source_taken| - if glossary_source.belongs_to_personal? && glossary_source_taken.belongs_to_personal? - if glossary_source.glossary_name == glossary_source_taken.glossary_name - glossary_source_num += 1 - end - elsif glossary_source.belongs_to_project? && glossary_source_taken.belongs_to_project? - if glossary_source.project_name == glossary_source_taken.project_name && - glossary_source.glossary_name == glossary_source_taken.glossary_name - glossary_source_num += 1 - end - end + unless glossary_source_of_the_same_project_exist?(glossary_source) + delete_glossary(glossary.name) end - delete_glossary(glossary.name) if glossary_source_num == 0 end def deindex_glossary_source(glossary_source) @@ -451,5 +439,24 @@ module Logaling # use online index if LOGALING_OFFLINE_INDEX=no ENV["LOGALING_OFFLINE_INDEX"] != "no" end + + def glossary_source_of_the_same_project_exist?(glossary_source) + glossary_source_num = 0 + get_all_glossary_sources.each do |glossary_source_taken| + if glossary_source.belongs_to_personal? && glossary_source_taken.belongs_to_personal? + if glossary_source.glossary_name == glossary_source_taken.glossary_name + glossary_source_num = 1 + break + end + elsif glossary_source.belongs_to_project? && glossary_source_taken.belongs_to_project? + if glossary_source.project_name == glossary_source_taken.project_name && + glossary_source.glossary_name == glossary_source_taken.glossary_name + glossary_source_num = 1 + break + end + end + end + glossary_source_num > 0 ? true : false + end end end -------------- next part -------------- An HTML attachment was scrubbed...Download
