From 64dfdccbc0a136aab15c53ef0375244a28895429 Mon Sep 17 00:00:00 2001 From: Ralph Amissah Date: Thu, 19 Mar 2015 18:38:21 -0400 Subject: d: ao & elsewhere, use of map & select --- lib/sisu/develop/db_sqltxt.rb | 17 ++++++++--------- 1 file changed, 8 insertions(+), 9 deletions(-) (limited to 'lib/sisu/develop/db_sqltxt.rb') diff --git a/lib/sisu/develop/db_sqltxt.rb b/lib/sisu/develop/db_sqltxt.rb index 86984596..1e3efbc7 100644 --- a/lib/sisu/develop/db_sqltxt.rb +++ b/lib/sisu/develop/db_sqltxt.rb @@ -66,9 +66,9 @@ module SiSU_DbText gsub(/#{Mx[:lnk_o]}\s*(.+?)\s*#{Mx[:lnk_c]}#{Mx[:url_o]}\S+?#{Mx[:url_c]}/m,'\1') end def clean_searchable_text_from_document_objects(arr) - txt_arr,en=[],[] + en=[] arr=(arr.is_a?(String)) ? [ arr ] : arr - arr.each do |s| + txt_arr=arr.each.map do |s| s=s.gsub(/#{Mx[:fa_o]}[a-z]{1,4}#{Mx[:fa_o_c]}/m,''). gsub(/#{Mx[:fa_c_o]}[a-z]{1,4}#{Mx[:fa_c]}/m,''). gsub(/
/m,' ') @@ -77,27 +77,26 @@ module SiSU_DbText gsub(/#{Mx[:en_b_o]}.+?#{Mx[:en_b_c]}/m,''). gsub(/ \s+/m,' ') #p s if s =~/[^ \nA-Za-z0-9'"`?!#@$%^&*=+,.;:\[\]()<>{}‹›|\\\/~_-]/ - txt_arr << s + s end txt_arr=txt_arr << en txt=txt_arr.flatten.join("\n") special_character_escape(txt) end def clean_document_objects_body(arr) - txt_arr,en,en_arr=[],[],[] + en=[] arr=(arr.is_a?(String)) ? [ arr ] : arr - arr.each do |s| + txt_arr=arr.each.map do |s| en << s.scan(/#{Mx[:en_a_o]}\s*(.+?)\s*#{Mx[:en_a_c]}/m) s=s. gsub(/#{Mx[:en_a_o]}\s*(\d+).+?#{Mx[:en_a_c]}/m, '\1'). gsub(/#{Mx[:en_b_o]}.+?#{Mx[:en_b_c]}/m,''). gsub(/ \s+/m,' ') - txt_arr << s + s end - en.flatten.each do |e| - e=e.sub(/^(\d+)\s*/,'\1 ') - en_arr << e + en_arr=en.flatten.each.map do |e| + e.sub(/^(\d+)\s*/,'\1 ') end txt_arr=txt_arr << en_arr txt=txt_arr.flatten.join("\n
") -- cgit v1.2.3