aboutsummaryrefslogtreecommitdiffhomepage
path: root/lib/sisu/v2/sysenv.rb
diff options
context:
space:
mode:
authorRalph Amissah <ralph@amissah.com>2010-03-10 16:45:06 -0500
committerRalph Amissah <ralph@amissah.com>2010-03-10 16:45:06 -0500
commit438f9863e6a3e52b2d0db357c60f8ef93a4fee51 (patch)
tree2b1053131f40e0e23045f40c28fe14307bd51803 /lib/sisu/v2/sysenv.rb
parenttexpdf_format, where image missing, escape image markup loop (diff)
sysenv, html_promo, db name prefix from constants (now SiSUv2_)
Diffstat (limited to 'lib/sisu/v2/sysenv.rb')
-rw-r--r--lib/sisu/v2/sysenv.rb12
1 files changed, 6 insertions, 6 deletions
diff --git a/lib/sisu/v2/sysenv.rb b/lib/sisu/v2/sysenv.rb
index 9f69ccfe..99d0beb1 100644
--- a/lib/sisu/v2/sysenv.rb
+++ b/lib/sisu/v2/sysenv.rb
@@ -1004,9 +1004,9 @@ module SiSU_Env
elsif widget.search?
db=if rc['search']['sisu']['flag']==true \
and rc['search']['sisu']['db']=~/\S+/
- (rc['search']['sisu']['db']=~/^SiSU_\S+/) \
+ (rc['search']['sisu']['db']=~/^#{Db[:name_prefix]}\S+/) \
? rc['search']['sisu']['db'] \
- : "SiSU_#{rc['search']['sisu']['db']}"
+ : "#{Db[:name_prefix]}#{rc['search']['sisu']['db']}"
else nil
end
action=rc['search']['sisu']['action']
@@ -1074,9 +1074,9 @@ WOK
elsif widget.search_fixed?
db=if rc['search']['sisu']['flag']==true \
and rc['search']['sisu']['db']=~/\S+/
- (rc['search']['sisu']['db']=~/^SiSU_\S+/) \
+ (rc['search']['sisu']['db']=~/^#{Db[:name_prefix]}\S+/) \
? rc['search']['sisu']['db'] \
- : "SiSU_#{rc['search']['sisu']['db']}"
+ : "#{Db[:name_prefix]}#{rc['search']['sisu']['db']}"
else nil
end
action=rc['search']['sisu']['action']
@@ -1171,9 +1171,9 @@ WOK
elsif widget_static.search? \
and rc['search']['sisu']['flag']==true
db=if rc['search']['sisu']['db']=~/\S+/
- (rc['search']['sisu']['db']=~/^SiSU_\S+/) \
+ (rc['search']['sisu']['db']=~/^#{Db[:name_prefix]}\S+/) \
? rc['search']['sisu']['db'] \
- : "SiSU_#{rc['search']['sisu']['db']}"
+ : "#{Db[:name_prefix]}#{rc['search']['sisu']['db']}"
else nil
end
action=rc['search']['sisu']['action']