From 74c5828574ef20c2082adf848c9d7b914598732f Mon Sep 17 00:00:00 2001 From: Ralph Amissah Date: Tue, 30 Jul 2013 21:23:59 -0400 Subject: v4 (v5): misc, minor --- bin/sisu | 2 +- lib/sisu/v4/db_columns.rb | 2 +- lib/sisu/v4/db_import.rb | 4 ++-- lib/sisu/v5/db_import.rb | 4 ++-- 4 files changed, 6 insertions(+), 6 deletions(-) diff --git a/bin/sisu b/bin/sisu index 4914890c..f6e2725e 100644 --- a/bin/sisu +++ b/bin/sisu @@ -42,7 +42,7 @@ WOK ruby_version_ok?(rbv_sisu_dev) end def require_hub_path(sisu_path_specified_lib_) - sisu_path_lib=if sisu_path_specified_lib_ \ + if sisu_path_specified_lib_ \ && FileTest.file?("#{sisu_path_specified_lib_}/#{SiSU_lib}/hub.rb") "#{sisu_path_specified_lib_}/#{SiSU_lib}" else diff --git a/lib/sisu/v4/db_columns.rb b/lib/sisu/v4/db_columns.rb index 5223aed8..488df7c5 100644 --- a/lib/sisu/v4/db_columns.rb +++ b/lib/sisu/v4/db_columns.rb @@ -50,7 +50,7 @@ * Git - + * Ralph Amissah diff --git a/lib/sisu/v4/db_import.rb b/lib/sisu/v4/db_import.rb index eb46e795..4f77cdb0 100644 --- a/lib/sisu/v4/db_import.rb +++ b/lib/sisu/v4/db_import.rb @@ -643,8 +643,8 @@ module SiSU_DbImport if FileTest.file?("#{@md.file.output_path.txt.dir}/#{@md.file.base_filename.txt}")==true f[:txt],u[:txt]='plaintext,', "'#{@md.file.output_path.txt.url}/#{@md.file.base_filename.txt}'," end - if FileTest.file?("#{@md.file.output_path.html_seg.dir}/#{@md.file.base_filename.html_seg}")==true - f[:html_toc],u[:html_toc]='html_toc,', "'#{@md.file.output_path.html_seg.url}/#{@md.file.base_filename.html_seg}'," + if FileTest.file?("#{@md.file.output_path.html_seg.dir}/#{@md.file.base_filename.html_segtoc}")==true + f[:html_toc],u[:html_toc]='html_toc,', "'#{@md.file.output_path.html_seg.url}/#{@md.file.base_filename.html_segtoc}'," end if FileTest.file?("#{@md.file.output_path.html_scroll.dir}/#{@md.file.base_filename.html_scroll}")==true f[:html_doc],u[:html_doc]='html_doc,', "'#{@md.file.output_path.html_scroll.url}/#{@md.file.base_filename.html_scroll}'," diff --git a/lib/sisu/v5/db_import.rb b/lib/sisu/v5/db_import.rb index a4edfab7..9025b359 100644 --- a/lib/sisu/v5/db_import.rb +++ b/lib/sisu/v5/db_import.rb @@ -643,8 +643,8 @@ module SiSU_DbImport if FileTest.file?("#{@md.file.output_path.txt.dir}/#{@md.file.base_filename.txt}")==true f[:txt],u[:txt]='plaintext,', "'#{@md.file.output_path.txt.url}/#{@md.file.base_filename.txt}'," end - if FileTest.file?("#{@md.file.output_path.html_seg.dir}/#{@md.file.base_filename.html_seg}")==true - f[:html_toc],u[:html_toc]='html_toc,', "'#{@md.file.output_path.html_seg.url}/#{@md.file.base_filename.html_seg}'," + if FileTest.file?("#{@md.file.output_path.html_seg.dir}/#{@md.file.base_filename.html_segtoc}")==true + f[:html_toc],u[:html_toc]='html_toc,', "'#{@md.file.output_path.html_seg.url}/#{@md.file.base_filename.html_segtoc}'," end if FileTest.file?("#{@md.file.output_path.html_scroll.dir}/#{@md.file.base_filename.html_scroll}")==true f[:html_doc],u[:html_doc]='html_doc,', "'#{@md.file.output_path.html_scroll.url}/#{@md.file.base_filename.html_scroll}'," -- cgit v1.2.3