From b1b2fe8cc3120d2a53e4c211748107ced1b1b40b Mon Sep 17 00:00:00 2001
From: Ralph Amissah <ralph@amissah.com>
Date: Sun, 15 May 2011 23:10:49 -0400
Subject: v3: sysenv, output_path & place_file, modified, (affects many
 libraries)

* paths for dir, url, relative and rcp that vary with output dir structure
* cope with alterative dir structures
  * manifest url paths, fix
  * dal_expand_insertions, fix
  * rsync, review
* scp disabled
---
 lib/sisu/v3/manifest.rb | 194 ++++++++++++++++++++++++++----------------------
 1 file changed, 107 insertions(+), 87 deletions(-)

(limited to 'lib/sisu/v3/manifest.rb')

diff --git a/lib/sisu/v3/manifest.rb b/lib/sisu/v3/manifest.rb
index 4373ad26..90f8df55 100644
--- a/lib/sisu/v3/manifest.rb
+++ b/lib/sisu/v3/manifest.rb
@@ -84,7 +84,7 @@ module SiSU_Manifest
         browser=@env.program.console_web_browser
 #       webserv_url=@env.path.url.output_tell #fix in sysenv
         unless @opt.cmd =~/q/
-          url_html="file://#{@md.file.output_path.manifest}/#{@md.file.base_filename.manifest}"
+          url_html="file://#{@md.file.output_path.manifest.dir}/#{@md.file.base_filename.manifest}"
           @opt.cmd=~/[MVvz]/ \
           ? SiSU_Screen::Ansi.new(@opt.cmd,'Manifest',"#{xbrowser} #{url_html}").green_hi_blue \
           : SiSU_Screen::Ansi.new(@opt.cmd,'Manifest',@opt.fns).green_title_hi
@@ -105,7 +105,7 @@ module SiSU_Manifest
         @env=SiSU_Env::Info_env.new(@md.fns)
         @fnb=@md.fnb
         @base_url="#{@env.url.root}/#{@fnb}"
-        @base_path=@md.file.output_path.manifest
+        @base_path=@md.file.output_path.manifest.dir
         @@dg ||=SiSU_Env::Info_env.new.digest.type
         @dg=@@dg
         l=SiSU_Env::Standardise_language.new(@md.opt.lng).language
@@ -121,17 +121,17 @@ module SiSU_Manifest
           manifest << x
         end
       end
-      def summarize(id,file,pth='',img='● ')
+      def summarize(id,file,pth='',url='',img='● ')
         size=(File.size("#{pth}/#{file}")/1024.00).to_s
         kb=/([0-9]+\.[0-9]{0,1})/m.match(size)[1]
         @manifest[:txt] << "#{file} #{id} #{kb}\n"
-        @manifest[:html] << %{<tr><th class="left"><p class="norm"><a href="#{pth}/#{file}">#{img}#{id}</a></p></th><td><p class="small"><a href="#{pth}/#{file}">#{file}</a></p><p class="tiny">#{@brace_url.xml_open}<a href="#{@base_url}/#{file}">#{@base_url}/#{file}</a>#{@brace_url.xml_close}</p></td><td class="right"><p class="right">#{kb}</p></td></tr>\n}
+        @manifest[:html] << %{<tr><th class="left"><p class="norm"><a href="#{pth}/#{file}">#{img}#{id}</a></p></th><td><p class="small"><a href="#{pth}/#{file}">#{file}</a></p><p class="tiny">#{@brace_url.xml_open}<a href="#{url}/#{file}">#{url}/#{file}</a>#{@brace_url.xml_close}</p></td><td class="right"><p class="right">#{kb}</p></td></tr>\n}
       end
-      def summarize_html_seg(id,file,pth='',img='● ')
+      def summarize_html_seg(id,file,pth='',url='',img='● ')
         size=(File.size("#{pth}/#{file}")/1024.00).to_s
         kb=/([0-9]+\.[0-9]{0,1})/m.match(size)[1]
         @manifest[:txt] << "#{file} #{id} #{kb}\n"
-        @manifest[:html] << %{<tr><th class="left"><p class="norm"><a href="#{pth}/#{file}">#{img}#{id}</a></p></th><td><p class="small"><a href="#{pth}/#{file}">#{file}</a></p><p class="tiny">#{@brace_url.xml_open}<a href="#{@base_url}/#{file}">#{@base_url}/#{file}</a>#{@brace_url.xml_close}</p></td><td class="right"><p class="right">#{kb}</p></td></tr>\n}
+        @manifest[:html] << %{<tr><th class="left"><p class="norm"><a href="#{pth}/#{file}">#{img}#{id}</a></p></th><td><p class="small"><a href="#{pth}/#{file}">#{file}</a></p><p class="tiny">#{@brace_url.xml_open}<a href="#{url}/#{file}">#{url}/#{file}</a>#{@brace_url.xml_close}</p></td><td class="right"><p class="right">#{kb}</p></td></tr>\n}
       end
       def summarize_sources(id,file,pth,url)
         sys=SiSU_Env::System_call.new
@@ -175,143 +175,163 @@ module SiSU_Manifest
         @manifest[:html] << %{<tr><th class="right" width=5%><p class="norm">●</p></th><td class="left"><p class="norm"><a href="#{url}">#{lnk}</a></p><p class="tiny">&nbsp;&nbsp;#{@brace_url.xml_open}<a href="#{static}">#{static}</a>#{@brace_url.xml_close}</p></td></tr>\n}
       end
       def output_tests
-        if FileTest.file?(@md.file.place_file.html_segtoc)==true
+        if FileTest.file?(@md.file.place_file.html_segtoc.dir)==true
           img=%{<img border="0" height="18" width="15" src="#{@md.file.path_rel_links.html_scroll_2}_sisu/image_sys/b_toc.png" alt="TOC linked" /> }
-          pth=@md.file.output_path.html_seg
+          pth=@md.file.output_path.html_seg.dir
+          url=@md.file.output_path.html_seg.url
           id,file='HTML, table of contents (for segmented text)',@md.file.base_filename.html_segtoc
-          summarize_html_seg(id,file,pth,img)
+          summarize_html_seg(id,file,pth,url,img)
         end
-        if FileTest.file?(@md.file.place_file.html_scroll)==true
+        if FileTest.file?(@md.file.place_file.html_scroll.dir)==true
           img=%{<img border="0" height="15" width="15" src="#{@md.file.path_rel_links.html_scroll_2}_sisu/image_sys/b_doc.png" alt="Full Text" /> }
-          pth=@md.file.output_path.html_scroll
+          pth=@md.file.output_path.html_scroll.dir
+          url=@md.file.output_path.html_scroll.url
           id,file='HTML, full length document',@md.file.base_filename.html_scroll
-          summarize(id,file,pth,img)
+          summarize(id,file,pth,url,img)
         end
-        if FileTest.file?(@md.file.place_file.html_book_index)==true
-          pth=@md.file.output_path.html_seg
+        if FileTest.file?(@md.file.place_file.html_book_index.dir)==true
+          pth=@md.file.output_path.html_seg.dir
+          url=@md.file.output_path.html_seg.url
           id,file='HTML, (book type) index',@md.file.base_filename.html_book_index
-          summarize(id,file,pth)
+          summarize(id,file,pth,url)
         end
-        if FileTest.file?(@md.file.place_file.html_concordance)==true
-          pth=@md.file.output_path.html_seg
+        if FileTest.file?(@md.file.place_file.html_concordance.dir)==true
+          pth=@md.file.output_path.html_seg.dir
+          url=@md.file.output_path.html_seg.url
           id,file='HTML, concordance file',@md.file.base_filename.html_concordance
-          summarize(id,file,pth)
+          summarize(id,file,pth,url)
         end
-        if FileTest.file?(@md.file.place_file.epub)==true
+        if FileTest.file?(@md.file.place_file.epub.dir)==true
           img=%{<img border="0" height="18" width="18" src="#{@md.file.path_rel_links.html_scroll_2}_sisu/image_sys/b_epub.png" alt="EPUB" /> }
           id,file='EPUB (Electronic Publication, e-book standard)',@md.file.base_filename.epub
-          pth=@md.file.output_path.epub
-          summarize(id,file,pth,img)
+          pth=@md.file.output_path.epub.dir
+          url=@md.file.output_path.epub.url
+          summarize(id,file,pth,url,img)
         end
-        if FileTest.file?("#{@md.file.output_path.pdf}/#{@md.file.base_filename.pdf_p_letter}")==true
+        if FileTest.file?("#{@md.file.output_path.pdf.dir}/#{@md.file.base_filename.pdf_p_letter}")==true
           img=%{<img border="0" height="18" width="15" src="#{@md.file.path_rel_links.html_scroll_2}_sisu/image_sys/b_pdf.png" alt="PDF portrait" /> }
-          pth=@md.file.output_path.pdf
+          pth=@md.file.output_path.pdf.dir
+          url=@md.file.output_path.pdf.url
           id,file="PDF, U.S. letter size, portrait/vertical document (recommended for printing)","#{@md.file.base_filename.pdf_p_letter}"
-          summarize(id,file,pth,img)
+          summarize(id,file,pth,url,img)
         end
-        if FileTest.file?("#{@md.file.output_path.pdf}/#{@md.file.base_filename.pdf_l_letter}")==true
+        if FileTest.file?("#{@md.file.output_path.pdf.dir}/#{@md.file.base_filename.pdf_l_letter}")==true
           img=%{<img border="0" height="15" width="18" src="#{@md.file.path_rel_links.html_scroll_2}_sisu/image_sys/b_pdf.png" alt="PDF landscape" /> }
-          pth=@md.file.output_path.pdf
+          pth=@md.file.output_path.pdf.dir
+          url=@md.file.output_path.pdf.url
           id,file="PDF, U.S. letter size, landscape/horizontal document (recommended for screen viewing)","#{@md.file.base_filename.pdf_l_letter}"
-          summarize(id,file,pth,img)
+          summarize(id,file,pth,url,img)
         end
-        if FileTest.file?("#{@md.file.output_path.pdf}/#{@md.file.base_filename.pdf_p_a4}")==true
+        if FileTest.file?("#{@md.file.output_path.pdf.dir}/#{@md.file.base_filename.pdf_p_a4}")==true
           img=%{<img border="0" height="18" width="15" src="#{@md.file.path_rel_links.html_scroll_2}_sisu/image_sys/b_pdf.png" alt="PDF portrait" /> }
-          pth=@md.file.output_path.pdf
+          pth=@md.file.output_path.pdf.dir
+          url=@md.file.output_path.pdf.url
           id,file="PDF, A4 size, portrait/vertical document (recommended for printing)","#{@md.file.base_filename.pdf_p_a4}"
-          summarize(id,file,pth,img)
+          summarize(id,file,pth,url,img)
         end
-        if FileTest.file?("#{@md.file.output_path.pdf}/#{@md.file.base_filename.pdf_l_a4}")==true
+        if FileTest.file?("#{@md.file.output_path.pdf.dir}/#{@md.file.base_filename.pdf_l_a4}")==true
           img=%{<img border="0" height="15" width="18" src="#{@md.file.path_rel_links.html_scroll_2}_sisu/image_sys/b_pdf.png" alt="PDF landscape" /> }
-          pth=@md.file.output_path.pdf
+          pth=@md.file.output_path.pdf.dir
+          url=@md.file.output_path.pdf.url
           id,file="PDF, A4 size, landscape/horizontal document (recommended for screen viewing)","#{@md.file.base_filename.pdf_l_a4}"
-          summarize(id,file,pth,img)
+          summarize(id,file,pth,url,img)
         end
-        if FileTest.file?("#{@md.file.output_path.pdf}/#{@md.file.base_filename.pdf_p_a5}")==true
+        if FileTest.file?("#{@md.file.output_path.pdf.dir}/#{@md.file.base_filename.pdf_p_a5}")==true
           img=%{<img border="0" height="18" width="15" src="#{@md.file.path_rel_links.html_scroll_2}_sisu/image_sys/b_pdf.png" alt="PDF portrait" /> }
-          pth=@md.file.output_path.pdf
+          pth=@md.file.output_path.pdf.dir
+          url=@md.file.output_path.pdf.url
           id,file="PDF, A5 (book) size, portrait/vertical document (recommended for printing)","#{@md.file.base_filename.pdf_p_a5}"
-          summarize(id,file,pth,img)
+          summarize(id,file,pth,url,img)
         end
-        if FileTest.file?("#{@md.file.output_path.pdf}/#{@md.file.base_filename.pdf_l_a5}")==true
+        if FileTest.file?("#{@md.file.output_path.pdf.dir}/#{@md.file.base_filename.pdf_l_a5}")==true
           img=%{<img border="0" height="15" width="18" src="#{@md.file.path_rel_links.html_scroll_2}_sisu/image_sys/b_pdf.png" alt="PDF landscape" /> }
-          pth=@md.file.output_path.pdf
+          pth=@md.file.output_path.pdf.dir
+          url=@md.file.output_path.pdf.url
           id,file="PDF, A5 (book) size, landscape/horizontal document (recommended for screen viewing)","#{@md.file.base_filename.pdf_l_a5}"
-          summarize(id,file,pth,img)
+          summarize(id,file,pth,url,img)
         end
-        if FileTest.file?("#{@md.file.output_path.pdf}/#{@md.file.base_filename.pdf_p_b5}")==true
+        if FileTest.file?("#{@md.file.output_path.pdf.dir}/#{@md.file.base_filename.pdf_p_b5}")==true
           img=%{<img border="0" height="18" width="15" src="#{@md.file.path_rel_links.html_scroll_2}_sisu/image_sys/b_pdf.png" alt="PDF portrait" /> }
-          pth=@md.file.output_path.pdf
+          pth=@md.file.output_path.pdf.dir
+          url=@md.file.output_path.pdf.url
           id,file="PDF, B5 (book) size, portrait/vertical document (recommended for printing)","#{@md.file.base_filename.pdf_p_b5}"
-          summarize(id,file,pth,img)
+          summarize(id,file,pth,url,img)
         end
-        if FileTest.file?("#{@md.file.output_path.pdf}/#{@md.file.base_filename.pdf_l_b5}")==true
+        if FileTest.file?("#{@md.file.output_path.pdf.dir}/#{@md.file.base_filename.pdf_l_b5}")==true
           img=%{<img border="0" height="15" width="18" src="#{@md.file.path_rel_links.html_scroll_2}_sisu/image_sys/b_pdf.png" alt="PDF landscape" /> }
-          pth=@md.file.output_path.pdf
+          pth=@md.file.output_path.pdf.dir
+          url=@md.file.output_path.pdf.url
           id,file="PDF, B5 (book) size, landscape/horizontal document (recommended for screen viewing)","#{@md.file.base_filename.pdf_l_b5}"
-          summarize(id,file,pth,img)
+          summarize(id,file,pth,url,img)
         end
-        if FileTest.file?("#{@md.file.output_path.pdf}/#{@md.file.base_filename.pdf_p_legal}")==true
+        if FileTest.file?("#{@md.file.output_path.pdf.dir}/#{@md.file.base_filename.pdf_p_legal}")==true
           img=%{<img border="0" height="18" width="15" src="#{@md.file.path_rel_links.html_scroll_2}_sisu/image_sys/b_pdf.png" alt="PDF portrait" /> }
-          pth=@md.file.output_path.pdf
+          pth=@md.file.output_path.pdf.dir
+          url=@md.file.output_path.pdf.url
           id,file="PDF, U.S. legal size, portrait/vertical document (recommended for printing)","#{@md.file.base_filename.pdf_p_legal}"
-          summarize(id,file,pth,img)
+          summarize(id,file,pth,url,img)
         end
-        if FileTest.file?("#{@md.file.output_path.pdf}/#{@md.file.base_filename.pdf_l_legal}")==true
+        if FileTest.file?("#{@md.file.output_path.pdf.dir}/#{@md.file.base_filename.pdf_l_legal}")==true
           img=%{<img border="0" height="15" width="18" src="#{@md.file.path_rel_links.html_scroll_2}_sisu/image_sys/b_pdf.png" alt="PDF landscape" /> }
-          pth=@md.file.output_path.pdf
+          pth=@md.file.output_path.pdf.dir
+          url=@md.file.output_path.pdf.url
           id,file="PDF, U.S. legal size, landscape/horizontal document (recommended for screen viewing)","#{@md.file.base_filename.pdf_l_legal}"
-          summarize(id,file,pth,img)
+          summarize(id,file,pth,url,img)
         end
-        if FileTest.file?(@md.file.place_file.odt)==true
+        if FileTest.file?(@md.file.place_file.odt.dir)==true
           img=%{<img border="0" height="18" width="18" src="#{@md.file.path_rel_links.html_scroll_2}_sisu/image_sys/b_odf.png" alt="ODF/ODT" /> }
-          pth=@md.file.output_path.odt
+          pth=@md.file.output_path.odt.dir
+          url=@md.file.output_path.odf.url
           id,file='ODF:ODT (Open Document Format)',@md.file.base_filename.odt
-          summarize(id,file,pth,img)
+          summarize(id,file,pth,url,img)
         end
-        if FileTest.file?(@md.file.place_file.xhtml)==true
-          pth=@md.file.output_path.xhtml
+        if FileTest.file?(@md.file.place_file.xhtml.dir)==true
+          pth=@md.file.output_path.xhtml.dir
+          url=@md.file.output_path.xhtml.url
+          id,file='ODF:ODT (Open Document Format)',@md.file.base_filename.odt
           id,file='XHTML',@md.file.base_filename.xhtml
-          summarize(id,file,pth)
+          summarize(id,file,pth,url)
         end
-        if FileTest.file?(@md.file.place_file.xml_sax)==true
-          pth=@md.file.output_path.xml_sax
+        if FileTest.file?(@md.file.place_file.xml_sax.dir)==true
+          pth=@md.file.output_path.xml_sax.dir
+          url=@md.file.output_path.xml_sax.url
           id,file='XML SAX',@md.file.base_filename.xml_sax
-          summarize(id,file,pth)
+          summarize(id,file,pth,url)
         end
-        if FileTest.file?(@md.file.place_file.xml_dom)==true
-          pth=@md.file.output_path.xml_dom
+        if FileTest.file?(@md.file.place_file.xml_dom.dir)==true
+          pth=@md.file.output_path.xml_dom.dir
+          url=@md.file.output_path.xml_dom.url
           id,file='XML DOM',@md.file.base_filename.xml_dom
-          summarize(id,file,pth)
+          summarize(id,file,pth,url)
         end
-        if FileTest.file?(@md.file.place_file.txt)==true
+        if FileTest.file?(@md.file.place_file.txt.dir)==true
         if    @md.opt.cmd =~/a/; id='Plaintext (Unix (UTF-8) with footnotes)'
         elsif @md.opt.cmd =~/e/; id='Plaintext (Unix (UTF-8) with endnotes)'
         elsif @md.opt.cmd =~/A/; id='Plaintext (dos (UTF-8) with footnotes)'
         elsif @md.opt.cmd =~/E/; id='Plaintext (dos (UTF-8) with endnotes)'
         else                id='Plaintext (UTF-8)'
         end
-          pth=@md.file.output_path.txt
+          pth=@md.file.output_path.txt.dir
+          url=@md.file.output_path.txt.url
           file=@md.file.base_filename.txt
-          summarize(id,file,pth)
+          summarize(id,file,pth,url)
         end
         if FileTest.file?("#{@base_path}/#{@md.fns}.tex")==true
           id,file='LaTeX (portrait)',"#{@md.fns}.tex"
-          #pth=@base_path
-          pth=''
-          summarize(id,file,pth)
+          pth,url='',''
+          summarize(id,file,pth,url)
         end
         if FileTest.file?("#{@base_path}/#{@md.fns}.tex")==true
           id,file='LaTeX (landscape)',"#{@md.fns}.landscape.tex"
-          #pth=@base_path
-          pth=''
-          summarize(id,file,pth)
+          pth,url='',''
+          summarize(id,file,pth,url)
         end
         if FileTest.file?("#{@base_path}/#{@md.fn[:digest]}")==true
           id,file="Digest/DCC - Document Content Certificate (#{@dg})",@md.fn[:digest]
           pth=@base_path
+          url=''
           #pth=''
-          summarize(id,file,pth)
+          summarize(id,file,pth,url)
         end
       end
       def published_versions
@@ -321,7 +341,7 @@ module SiSU_Manifest
         end
       end
       def language_versions
-        if FileTest.file?(@md.file.place_file.manifest)==true
+        if FileTest.file?(@md.file.place_file.manifest.dir)==true
           id,file='Markup (SiSU source)',@md.fns
           published_languages(id,file)
         end
@@ -329,29 +349,29 @@ module SiSU_Manifest
       def source_tests
         if @md.fns =~/\.ssm\.sst$/                                                  #% decide whether to extract and include requested/required documents
           req=@md.fns
-          if FileTest.file?(@md.file.place_file.src)==true
-            pth=@md.file.output_path.src
-            url=@env.url.src_txt
+          if FileTest.file?(@md.file.place_file.src.dir)==true
+            pth=@md.file.output_path.src.dir
+            url=@md.file.output_path.src.url
             id,file='Markup Composite File (SiSU source)',@md.file.base_filename.src
-            summarize_sources(id,file,pth,url,url)
+            summarize_sources(id,file,pth,url)
           end
         else
-          if FileTest.file?(@md.file.place_file.src)==true
-            pth=@md.file.output_path.src
-            url=@env.url.src_txt
+          if FileTest.file?(@md.file.place_file.src.dir)==true
+            pth=@md.file.output_path.src.dir
+            url=@md.file.output_path.src.url
             id,file='Markup (SiSU source)',@md.file.base_filename.src
             summarize_sources(id,file,pth,url)
           end
         end
-        if FileTest.file?(@md.file.place_file.sisupod)==true
-          pth=@md.file.output_path.sisupod
-          url=@env.url.src_pod
+        if FileTest.file?(@md.file.place_file.sisupod.dir)==true
+          pth=@md.file.output_path.sisupod.dir
+          url=@md.file.output_path.sisupod.url
           id,file='SiSU doc (zip)',@md.file.base_filename.sisupod
           summarize_sources(id,file,pth,url)
         end
-        if FileTest.file?(@md.file.place_file.pot)==true
-          pth=@md.file.output_path.pot
-          url=@env.url.pot
+        if FileTest.file?(@md.file.place_file.pot.dir)==true
+          pth=@md.file.output_path.pot.dir
+          url=@md.file.output_path.pot.url
           id,file='SiSU pot',@md.file.base_filename.pot
           summarize_sources(id,file,pth,url)
         end
-- 
cgit v1.2.3