Merge branch 'upstream' into debian/sid

1 files changed, 12 insertions, 4 deletions

diff --git a/lib/sisu/v0/urls.rb b/lib/sisu/v0/urls.rb
index 7f087b95..cfe242b3 100644
--- a/lib/sisu/v0/urls.rb
+++ b/lib/sisu/v0/urls.rb
@@ -86,7 +86,7 @@ module SiSU_urls
       fn_set_lang=SiSU_Env::Standardise_language.new.file_to_language(@opt.fns)
       @fnl=@env.i18n.lang_filename(fn_set_lang[:c])
       @fn=SiSU_Env::Env_call.new(@opt.fns).lang(fn_set_lang[:c])
-      @m_regular=/(.+?)\.(?:[_-]?sst|ssm)$/
+      @m_regular=/(.+?)\.(?:(?:-|ssm\.)?sst|ssm)$/
       @path=SiSU_Env::Info_env.new(@opt.fns)
       @webserv_url=@path.url.output_tell
       @tool=@env.program.text_editor
@@ -97,7 +97,7 @@ module SiSU_urls
       @odf_viewer=@env.program.odf_viewer
       @manpage_gen=@env.program.manpage_generator
       source=if @opt.fns =~/\.sst$/; @opt.fns
-      elsif @opt.fns =~/\._sst/; "#@fnb.composite.sst"
+      elsif @opt.fns =~/\.ssm\.sst/; "#@fnb.ssm.sst"
       else 'not recognised file'
       end
       @u ||= {
@@ -122,7 +122,7 @@ module SiSU_urls
         'p (PDF portrait)'=>@fn[:pdf_p],
         'P[iu] (DB postgresql import/update)'=>'psql',
         's (sisu markup)'=>source,
-        'S (sisupod)'=>'sisupod.zip',
+        'S (sisupod)'=>@fn[:sisupod],
         'x (XML sax type)'=>@fn[:sax],
         'X (XML dom type)'=>@fn[:dom],
         'y (Manifest, html)'=>@fn[:manifest],
@@ -185,7 +185,7 @@ module SiSU_urls
       @pwd_stub="#@webserv_url"[m,1]
       @u.each do |x,y|
         if @opt.fns =~ @m_regular
-          if x=~/^([abchHNopsSwxXyY])/ and @opt.cmd=~/[abchHNopsSwxXyY]/ and x=~/^[#{@opt.cmd}]/
+          if x=~/^([abchHNopwxXyY])/ and @opt.cmd=~/[abchHNopwxXyY]/ and x=~/^[#{@opt.cmd}]/
             m=$1
             tell=SiSU_Screen::Ansi.new(@opt.cmd,"-#{x}","#@browser #@webserv_url/#@fnb/#{y}")
             tell.result unless @opt.cmd =~/q/
@@ -216,6 +216,14 @@ module SiSU_urls
             tell.result unless @opt.cmd =~/q/
             @opt.cmd.gsub!(/P[iu]/,'')
           end
+          if x=~/^[sS]/ and @opt.cmd =~/[sS]/
+            zipfile=if @opt.fns =~/\.ssm\.sst$/; y.gsub(/(?:\~\S{2,3})?(\.ssm\.sst\.zip)$/,'.ssm.zip')
+            else y.gsub(/(?:\~\S{2,3})?(\.sst\.zip)$/,'\1')
+            end
+            tell=SiSU_Screen::Ansi.new(@opt.cmd,"-#{x}","#@browser #@webserv_url/src/#{y}")
+            tell.result unless @opt.cmd =~/q/
+            @opt.cmd.gsub!(/I/,'')
+          end
           urls_maintenance(@opt,x,y) if @opt.cmd =~/[MV]/
         end
       end