From c07cf3661d3964e339d31de63cc93331615856bb Mon Sep 17 00:00:00 2001
From: Ralph Amissah <ralph@amissah.com>
Date: Wed, 10 Oct 2007 12:44:55 +0100
Subject: sysenv, extra check for sisurc search info (and a cosmetic change
 (quotes))

---
 lib/sisu/v0/defaults.rb | 2 +-
 lib/sisu/v0/sysenv.rb   | 7 ++++---
 2 files changed, 5 insertions(+), 4 deletions(-)

(limited to 'lib')

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/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}
-- 
cgit v1.2.3


From 2178c097c3c6264832952d3f1b91cc9b822d43e2 Mon Sep 17 00:00:00 2001
From: Ralph Amissah <ralph@amissah.com>
Date: Thu, 11 Oct 2007 15:18:40 +0100
Subject: shared markup source, composite documents, fix look to processing
 directory for: text share source and binary sisupod (make)

---
 lib/sisu/v0/share_src.rb    | 2 +-
 lib/sisu/v0/sisupod_make.rb | 4 +---
 2 files changed, 2 insertions(+), 4 deletions(-)

(limited to 'lib')

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..4f3bf569 100644
--- a/lib/sisu/v0/sisupod_make.rb
+++ b/lib/sisu/v0/sisupod_make.rb
@@ -157,10 +157,8 @@ 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,'')
+      file_array=IO.readlines("#{@env.path.composite_file}/#{@opt.fnb}._sst",'')
       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
-- 
cgit v1.2.3


From 39bf7a712e5954ca32b2de7b771e2f97660cb87e Mon Sep 17 00:00:00 2001
From: Ralph Amissah <ralph@amissah.com>
Date: Thu, 11 Oct 2007 18:13:30 +0100
Subject: sisupod_make, composite file is an exception

---
 lib/sisu/v0/sisupod_make.rb | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

(limited to 'lib')

diff --git a/lib/sisu/v0/sisupod_make.rb b/lib/sisu/v0/sisupod_make.rb
index 4f3bf569..8e6932f0 100644
--- a/lib/sisu/v0/sisupod_make.rb
+++ b/lib/sisu/v0/sisupod_make.rb
@@ -157,7 +157,10 @@ 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("#{@env.path.composite_file}/#{@opt.fnb}._sst",'')
+      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=[],[],[]
       file_array.each do |f|                                                  #% work area
         if f !~/^%\s/
-- 
cgit v1.2.3