From e481fdd4b3403d621380c43047484aeb3a3a46d2 Mon Sep 17 00:00:00 2001
From: Ralph Amissah <ralph.amissah@gmail.com>
Date: Thu, 17 Mar 2022 11:49:22 -0400
Subject: ruby variable passing breakage, make constant?

---
 lib/sisu/se_createsite.rb | 2 +-
 lib/sisu/xhtml_epub2.rb   | 8 ++++++++
 lib/sisu/xml_odf_odt.rb   | 8 ++++----
 3 files changed, 13 insertions(+), 5 deletions(-)

(limited to 'lib')

diff --git a/lib/sisu/se_createsite.rb b/lib/sisu/se_createsite.rb
index 4d5a1dec..f998f43d 100644
--- a/lib/sisu/se_createsite.rb
+++ b/lib/sisu/se_createsite.rb
@@ -159,7 +159,7 @@ module SiSU_Create_Site
       cp_images(src,dest) if FileTest.directory?(src)
     end
     def cp_base_images #fix images
-      src=SiSU_is.path_base_system_data? + '/image'
+      src=$sisu_base_data + '/image' # hard fix, revisit
       dest_arr=[
         "#{@env.path.webserv}/_sisu/image_sys",
         "#{@env.path.webserv}/#{@env.path.base_markup_dir_stub}/_sisu/image_sys"
diff --git a/lib/sisu/xhtml_epub2.rb b/lib/sisu/xhtml_epub2.rb
index 63ac620f..8f6ef05a 100644
--- a/lib/sisu/xhtml_epub2.rb
+++ b/lib/sisu/xhtml_epub2.rb
@@ -786,6 +786,11 @@ module SiSU_XHTML_EPUB2
         end
       end
       def images
+#puts @md.env.path.image_source_include
+#puts @md.env.processing_path.epub
+#puts @md.env.path.image_source_include_local
+puts @md.file.output_path.epub.rel_image
+        #img_pth=$sisu_base_data + '/image'
         img_pth=@md.env.path.image_source_include
         img_src_pth=unless @md.opt.f_pth[:pth] =~/\/\S+?\/sisupod\/\S+?\/sisupod\/doc/
           @md.file.output_path.epub.rel_image
@@ -797,6 +802,9 @@ module SiSU_XHTML_EPUB2
           if FileTest.directory?("#{@md.env.processing_path.epub}/#{Ep[:d_oebps]}/image") \
           && FileTest.file?("#{img_src_pth}/#{x}")
             FileUtils::cp("#{img_src_pth}/#{x}","#{@md.env.processing_path.epub}/#{Ep[:d_oebps]}/image")
+          #elsif FileTest.directory?("#{$sisu_base_data}/image") \
+          #&& FileTest.file?("#{img_pth}/#{x}")
+          #  FileUtils::cp("#{img_pth}/#{x}","#{@md.env.processing_path.epub}/#{Ep[:d_oebps]}/image")
           elsif FileTest.directory?("#{@md.env.processing_path.epub}/#{Ep[:d_oebps]}/image") \
           && FileTest.file?("#{img_pth}/#{x}")
             FileUtils::cp("#{img_pth}/#{x}","#{@md.env.processing_path.epub}/#{Ep[:d_oebps]}/image")
diff --git a/lib/sisu/xml_odf_odt.rb b/lib/sisu/xml_odf_odt.rb
index 75537204..fb9c9cde 100644
--- a/lib/sisu/xml_odf_odt.rb
+++ b/lib/sisu/xml_odf_odt.rb
@@ -256,15 +256,15 @@ module SiSU_XML_ODF_ODT
               @md.opt.act[:color_state][:set],
               "ERROR - image:",
               %{"#{i}" missing},
-              "search locations: #{@env.path.image_source_include_local}," \
+              "search locations: #{$sisu_base_data}/image," \
               + "#{@env.path.image_source_include_remote} and" \
               + "#{@env.path.image_source_include}"
             ).error2 unless @md.opt.act[:quiet][:set]==:on
             nil
           end
         elsif @md.fns =~/\.ss[tm]$/ \
-        and FileTest.file?("#{@env.path.image_source_include_local}/#{i}") #review
-          @env.path.image_source_include_local
+        and FileTest.file?("#{$sisu_base_data}/image/#{i}") #review
+          $sisu_base_data + '/image'
         elsif @md.fns =~/\.ss[tm]$/ \
         and FileTest.file?("#{@env.path.image_source_sisu_includes(@md)}/#{i}")
           @env.path.image_source_sisu_includes(@md)
@@ -277,7 +277,7 @@ module SiSU_XML_ODF_ODT
             "ERROR - image:",
               %{"#{i}" missing},
               "search locations: " \
-              + @env.path.image_source_include_local + ',' \
+              + $sisu_base_data + '/image' + ',' \
               + @env.path.image_source_include_remote + 'and' \
               + @env.path.image_source_include \
               + @md.opt.sisu_data_dir?
-- 
cgit v1.2.3