aboutsummaryrefslogtreecommitdiffhomepage
path: root/lib/sisu/v2/sysenv.rb
diff options
context:
space:
mode:
authorRalph Amissah <ralph@amissah.com>2010-12-04 12:43:58 -0500
committerRalph Amissah <ralph@amissah.com>2010-12-04 12:44:01 -0500
commit74f7e0adab199936fd943b535f40359b08d40324 (patch)
tree3fe98437287bbb4a0c27b05f026586a81900373a /lib/sisu/v2/sysenv.rb
parenthtml, link to "document manifest" remains (individual output links removed) (diff)
html, link to "document manifest" & search form reviewed (testing required)
Diffstat (limited to 'lib/sisu/v2/sysenv.rb')
-rw-r--r--lib/sisu/v2/sysenv.rb30
1 files changed, 5 insertions, 25 deletions
diff --git a/lib/sisu/v2/sysenv.rb b/lib/sisu/v2/sysenv.rb
index ed955006..ef6d86c7 100644
--- a/lib/sisu/v2/sysenv.rb
+++ b/lib/sisu/v2/sysenv.rb
@@ -1019,13 +1019,6 @@ module SiSU_Env
end
def search_form(type='sisusearch',action=nil,db=nil,table=false)
rc=SiSU_Env::Get_init.instance.yamlrc
- create_form_hyperestraier=if defined? rc['search']['sisu']['flag'] \
- and rc['search']['sisu']['flag']==true \
- and action \
- and action =~/https?:\/\//
- true
- else false
- end
create_form_sisu=if action \
and db \
and action =~/https?:\/\// \
@@ -1041,6 +1034,11 @@ module SiSU_Env
end
action=rc['search']['sisu']['action']
true
+ elsif defined? rc['search']['sisu']['flag'] \
+ and defined? rc['search']['sisu']['action'] \
+ and rc['search']['sisu']['flag']==true \
+ and rc['search']['sisu']['action'] =~/https?:\/\//
+ true
else false
end
if table
@@ -1071,24 +1069,6 @@ module SiSU_Env
#{table_close}
<!-- SiSU Search -->
WOK
- elsif create_form_hyperestraier \
- and type=~/hyperestraier/ \
- and defined? rc['search']['hyperestraier']
- <<WOK
-<!-- SiSU Search using Hyperestraier -->
-#{table_open}
-<a name="search"></a>
-<form method="get" action="#{rc['search']['hyperestraier']['action']}" target="_top">
-<font size="2">
-<input type="text" name="phrase" value="" size="24" maxlength="255" />
-<input type="submit" value="search" />
-<input type="hidden" name="enc" value="UTF-8" />
-<font size="2">
-<a href="#{rc['search']['hyperestraier']['action']}">hyperestraier search</a>
-</font></form>
-#{table_close}
-<!-- SiSU Search using Hyperestraier -->
-WOK
else ''
end
form