aboutsummaryrefslogtreecommitdiffhomepage
path: root/lib
diff options
context:
space:
mode:
Diffstat (limited to 'lib')
-rw-r--r--lib/sisu/v0/defaults.rb2
-rw-r--r--lib/sisu/v0/share_src.rb2
-rw-r--r--lib/sisu/v0/sisupod_make.rb7
-rw-r--r--lib/sisu/v0/sysenv.rb7
4 files changed, 10 insertions, 8 deletions
diff --git a/lib/sisu/v0/defaults.rb b/lib/sisu/v0/defaults.rb
index 4d97aed1..47fbeec8 100644
--- a/lib/sisu/v0/defaults.rb
+++ b/lib/sisu/v0/defaults.rb
@@ -1328,7 +1328,7 @@ WOK
<b>#{v[:project]}</b>
</a>
Copyright <sup>&copy;</sup> Ralph Amissah
- 1997, current #{@date.year_static}.
+ 1997, current #{@date.year_static}.
All Rights Reserved.
<br />
<a href="#{url_sisu}" #{js_sisu}>
diff --git a/lib/sisu/v0/share_src.rb b/lib/sisu/v0/share_src.rb
index b4b75d48..53e19f1c 100644
--- a/lib/sisu/v0/share_src.rb
+++ b/lib/sisu/v0/share_src.rb
@@ -78,7 +78,7 @@ module SiSU_Markup
unless @opt.fns =~/\.ssm$/; cp(@opt.fns,@output_path)
else
req=@opt.fns.gsub(/(.+)?\.ssm$/,'\1.composite.sst')
- file=@opt.fns.gsub(/(.+)?\.ssm$/,'\1._sst')
+ file="#{@env.path.composite_file}/#{@opt.fnb}._sst"
if FileTest.file?(file); cp(file,"#@output_path/#{req}")
else print "did not find #{file} to copy"
end
diff --git a/lib/sisu/v0/sisupod_make.rb b/lib/sisu/v0/sisupod_make.rb
index 32811f0f..8e6932f0 100644
--- a/lib/sisu/v0/sisupod_make.rb
+++ b/lib/sisu/v0/sisupod_make.rb
@@ -157,10 +157,11 @@ module SiSU_Doc
@rgx_image=/\{\s*(\S+?\.(?:png|jpg|gif))/
@rgx_skin=/^(?:@skin:|0~skin)\s+(\S+)/
@rgx_doc_import=/^%\s\s*\|(\S+?\.ss[ti])\|@\|\^\|>>ok/
- file_array=IO.readlines(@opt.fns,'')
+ use_file=if @opt.fns =~/(?:\.ssm|\._sst)$/; "#{@env.path.composite_file}/#{@opt.fnb}._sst"
+ else @opt.fns
+ end
+ file_array=IO.readlines(use_file,'')
skin,images,doc_import=[],[],[]
- #skin_dir=SiSU_Env::Info_skin.new.select
- #skin << [skin_dir.gsub(/.+?\/(skin_\S+?)\.rb/,'\1')]
file_array.each do |f| #% work area
if f !~/^%\s/
skin << f.scan(@rgx_skin).uniq.flatten if f =~@rgx_skin
diff --git a/lib/sisu/v0/sysenv.rb b/lib/sisu/v0/sysenv.rb
index 48161592..4080795d 100644
--- a/lib/sisu/v0/sysenv.rb
+++ b/lib/sisu/v0/sysenv.rb
@@ -68,7 +68,7 @@ module SiSU_Env
@dt,@t=Date.today.to_s,Time.now
end
def week
- w=@t.strftime("%W")
+ w=@t.strftime('%W')
"#{@t.year}w#{w}"
end
def month
@@ -79,7 +79,7 @@ module SiSU_Env
end
def weekonly
#@t.cweek
- @t.strftime("%W")
+ @t.strftime('%W')
end
def monthonly
@t.month
@@ -917,7 +917,8 @@ module SiSU_Env
table_close='<br />'
end
form=if create_form_sisu and type=~/sisusearch/ and
- defined? rc['search']['sisu']
+ defined? rc['search']['sisu'] and
+ defined? rc['search']['sisu']['action']
<<WOK
<!-- SiSU Search -->
#{table_open}