lib/imperituroard/projects/ukaz60/ukaz60_add_func.rb in imperituroard-0.5.7 vs lib/imperituroard/projects/ukaz60/ukaz60_add_func.rb in imperituroard-0.5.8
- old
+ new
@@ -1,6 +1,7 @@
require 'imperituroard/add_functions/logger/any_functions'
+require 'uri'
class AddFuncUkaz60_2
attr_accessor :add_functions
@@ -207,11 +208,11 @@
if star_url_curr[star_dom_len - 1] == "/"
star_dom_x = star_url_curr[0..star_dom_len - 2]
else
star_dom_x = star_url_curr
end
- if belg_url.include?(star_dom_x)
+ if belg_url.include?(star_dom_x) || belg_url.include?(URI.decode(star_dom_x))
blocked = 1
for_unblock_tmp[star_host[:hostname]].push(star_dom)
end
end
if blocked == 0
@@ -243,10 +244,20 @@
output_answ[:body][:for_unblock][:for_unblock_stat] = for_unblock_stat
rescue
output_answ = {:code => 507, :result => "staros_compare_http: Unknown SDK error"}
end
+
+ #p JSON.pretty_generate(output_answ)
+ p "staros_compare_http"
+ p output_answ
+
+ p "temp data"
+ for i in output_answ[:body][:for_unblock][:for_unblock]["vit11asr2"]
+ #for i in output_answ[:body][:for_block][:not_blocked_belgim]["vit11asr2"]
+ p i
+ end
output_answ
end
@@ -286,11 +297,9 @@
answ_out[:body][:to_message][:data][:unblock_me]= unblock_me
else
answ_out[:body][:to_message][:data][:block_me] = data[:body][:for_block][:notblocked_stat]
answ_out[:body][:to_message][:data][:unblock_me] = data[:body][:for_unblock][:for_unblock_stat]
end
-
-
answ_out
end
end