aboutsummaryrefslogtreecommitdiffhomepage
path: root/lib/sisu/v3dv
diff options
context:
space:
mode:
Diffstat (limited to 'lib/sisu/v3dv')
-rw-r--r--lib/sisu/v3dv/cgi.rb6
-rw-r--r--lib/sisu/v3dv/cgi_pgsql.rb4
-rw-r--r--lib/sisu/v3dv/cgi_sql_common.rb2
-rw-r--r--lib/sisu/v3dv/cgi_sqlite.rb4
-rw-r--r--lib/sisu/v3dv/concordance.rb4
-rw-r--r--lib/sisu/v3dv/conf.rb14
-rw-r--r--lib/sisu/v3dv/dbi.rb2
-rw-r--r--lib/sisu/v3dv/digests.rb4
-rw-r--r--lib/sisu/v3dv/embedded.rb2
-rw-r--r--lib/sisu/v3dv/epub.rb4
-rw-r--r--lib/sisu/v3dv/epub_format.rb2
-rw-r--r--lib/sisu/v3dv/epub_tune.rb2
-rw-r--r--lib/sisu/v3dv/git.rb2
-rw-r--r--lib/sisu/v3dv/html.rb4
-rw-r--r--lib/sisu/v3dv/html_format.rb12
-rw-r--r--lib/sisu/v3dv/html_segments.rb4
-rw-r--r--lib/sisu/v3dv/hub.rb6
-rw-r--r--lib/sisu/v3dv/manifest.rb4
-rw-r--r--lib/sisu/v3dv/manpage.rb4
-rw-r--r--lib/sisu/v3dv/modify.rb4
-rw-r--r--lib/sisu/v3dv/odf.rb2
-rw-r--r--lib/sisu/v3dv/param.rb2
-rw-r--r--lib/sisu/v3dv/particulars.rb2
-rw-r--r--lib/sisu/v3dv/plaintext.rb2
-rw-r--r--lib/sisu/v3dv/po4a.rb2
-rw-r--r--lib/sisu/v3dv/qrcode.rb6
-rw-r--r--lib/sisu/v3dv/share_src.rb2
-rw-r--r--lib/sisu/v3dv/sitemaps.rb6
-rw-r--r--lib/sisu/v3dv/sst_to_s_xml_sax.rb4
-rw-r--r--lib/sisu/v3dv/sysenv.rb14
-rw-r--r--lib/sisu/v3dv/texinfo.rb2
-rw-r--r--lib/sisu/v3dv/texpdf.rb4
-rw-r--r--lib/sisu/v3dv/wikispeak.rb4
-rw-r--r--lib/sisu/v3dv/xhtml.rb6
-rw-r--r--lib/sisu/v3dv/xml.rb6
-rw-r--r--lib/sisu/v3dv/xml_dom.rb6
-rw-r--r--lib/sisu/v3dv/xml_fictionbook.rb2
-rw-r--r--lib/sisu/v3dv/xml_md_oai_pmh_dc.rb4
38 files changed, 83 insertions, 83 deletions
diff --git a/lib/sisu/v3dv/cgi.rb b/lib/sisu/v3dv/cgi.rb
index b1600749..b2a9c0b3 100644
--- a/lib/sisu/v3dv/cgi.rb
+++ b/lib/sisu/v3dv/cgi.rb
@@ -61,7 +61,7 @@ module SiSU_CGI
require_relative 'sysenv' # sysenv.rb
require_relative 'cgi_pgsql' # cgi_pgsql.rb
require_relative 'cgi_sqlite' # cgi_sqlite.rb
- class SiSU_search
+ class SearchSQL
def initialize(opt)
@opt=opt
@webserv=@opt.files[0].to_s.strip
@@ -74,8 +74,8 @@ module SiSU_CGI
SiSU_Screen::Ansi.new(@opt.cmd,a).print_grey
end
def read
- SiSU_CGI_SQLite::SiSU_search_sqlite.new(@opt,@webserv).sqlite
- SiSU_CGI_PgSQL::SiSU_search_pgsql.new(@opt,@webserv).pgsql
+ SiSU_CGI_SQLite::SearchSQLite.new(@opt,@webserv).sqlite
+ SiSU_CGI_PgSQL::SearchPgSQL.new(@opt,@webserv).pgsql
search_info unless @opt.cmd =~/q/
end
end
diff --git a/lib/sisu/v3dv/cgi_pgsql.rb b/lib/sisu/v3dv/cgi_pgsql.rb
index cc75f30f..41c95536 100644
--- a/lib/sisu/v3dv/cgi_pgsql.rb
+++ b/lib/sisu/v3dv/cgi_pgsql.rb
@@ -60,13 +60,13 @@ module SiSU_CGI_PgSQL
require_relative 'sysenv' # sysenv.rb
require_relative 'cgi_sql_common' # cgi_sql_common.rb
include SiSU_CGI_SQL
- class SiSU_search_pgsql < SiSU_CGI_common
+ class SearchPgSQL < CGI_Common
def initialize(opt,webserv)
@opt,@webserv=opt,webserv
@env=SiSU_Env::Info_env.new('',opt)
@sys=SiSU_Env::System_call.new
@image_src="#{@env.url.webserv_cgi}/_sisu/image_sys"
- @common=SiSU_CGI_SQL::SiSU_CGI_common.new(@webserv,@opt,@image_src,@env)
+ @common=SiSU_CGI_SQL::CGI_Common.new(@webserv,@opt,@image_src,@env)
@db=SiSU_Env::Info_db.new
@cgi_file_name="#{Db[:name_prefix_db]}by_#{opt.dir_structure_by}_pgsql.cgi"
end
diff --git a/lib/sisu/v3dv/cgi_sql_common.rb b/lib/sisu/v3dv/cgi_sql_common.rb
index e1e99888..15adf2f5 100644
--- a/lib/sisu/v3dv/cgi_sql_common.rb
+++ b/lib/sisu/v3dv/cgi_sql_common.rb
@@ -57,7 +57,7 @@
=end
module SiSU_CGI_SQL
- class SiSU_CGI_common
+ class CGI_Common
def initialize(webserv,opt,image_src,dir)
@webserv,@opt,@image_src,@env=webserv,opt,image_src,dir
@cmd=opt.cmd
diff --git a/lib/sisu/v3dv/cgi_sqlite.rb b/lib/sisu/v3dv/cgi_sqlite.rb
index 77d5c21a..0286736b 100644
--- a/lib/sisu/v3dv/cgi_sqlite.rb
+++ b/lib/sisu/v3dv/cgi_sqlite.rb
@@ -60,12 +60,12 @@ module SiSU_CGI_SQLite
require_relative 'sysenv' # sysenv.rb
require_relative 'cgi_sql_common' # cgi_sql_common.rb
include SiSU_CGI_SQL
- class SiSU_search_sqlite < SiSU_CGI_common
+ class SearchSQLite < CGI_Common
def initialize(opt,webserv)
@opt,@webserv=opt,webserv
@env=SiSU_Env::Info_env.new('',opt)
@image_src="#{@env.url.webserv_cgi}/_sisu/image_sys"
- @common=SiSU_CGI_SQL::SiSU_CGI_common.new(@webserv,@opt,@image_src,@env)
+ @common=SiSU_CGI_SQL::CGI_Common.new(@webserv,@opt,@image_src,@env)
@cgi_file_name="#{Db[:name_prefix_db]}by_#{opt.dir_structure_by}_sqlite.cgi"
end
def sqlite
diff --git a/lib/sisu/v3dv/concordance.rb b/lib/sisu/v3dv/concordance.rb
index 58138877..a1720de9 100644
--- a/lib/sisu/v3dv/concordance.rb
+++ b/lib/sisu/v3dv/concordance.rb
@@ -108,7 +108,7 @@ module SiSU_Concordance
def initialize(particulars)
@particulars,@md=particulars,particulars.md
@data=SiSU_HTML::Source::Html_environment.new(particulars).tuned_file_instructions
- @file=SiSU_Env::SiSU_file.new(@md)
+ @file=SiSU_Env::FileOp.new(@md)
@vz=SiSU_Env::Get_init.instance.skin
txt_path=%{#{@md.dir_out}}
SiSU_Env::Info_skin.new(@md).select
@@ -187,7 +187,7 @@ WOK
begin
@vz=SiSU_Env::Get_init.instance.skin
@env,@md,@dal_array=particulars.env,particulars.md,particulars.dal_array
- @file=SiSU_Env::SiSU_file.new(@md)
+ @file=SiSU_Env::FileOp.new(@md)
@freq=Hash.new(0)
@dp=@@dp ||=SiSU_Env::Info_env.new.digest.pattern
@rxp_lv1=/^#{Mx[:lv_o]}1:/ #fix @rxp_lv # Mx[:lv_o]
diff --git a/lib/sisu/v3dv/conf.rb b/lib/sisu/v3dv/conf.rb
index 8c7159be..194e5cbd 100644
--- a/lib/sisu/v3dv/conf.rb
+++ b/lib/sisu/v3dv/conf.rb
@@ -69,15 +69,15 @@ module SiSU_Initialize
@opt=opt
end
def read
- SiSU_Config.new(@opt).make_homepage
- SiSU_Config.new(@opt).css
- SiSU_Config.new(@opt).dtd
- SiSU_Config.new(@opt).cp_local_images
- SiSU_Config.new(@opt).cp_external_images
- SiSU_Config.new(@opt).cp_webserver_images #if @opt.mod.inspect =~/--init(?:ialize)?=site/
+ ConfigSite.new(@opt).make_homepage
+ ConfigSite.new(@opt).css
+ ConfigSite.new(@opt).dtd
+ ConfigSite.new(@opt).cp_local_images
+ ConfigSite.new(@opt).cp_external_images
+ ConfigSite.new(@opt).cp_webserver_images #if @opt.mod.inspect =~/--init(?:ialize)?=site/
end
end
- class SiSU_Config #config files such as css are not updated if they already exist unless forced using the --init=site modifier
+ class ConfigSite #config files such as css are not updated if they already exist unless forced using the --init=site modifier
require_relative 'sysenv' # sysenv.rb
def initialize(opt)
@opt=opt
diff --git a/lib/sisu/v3dv/dbi.rb b/lib/sisu/v3dv/dbi.rb
index 2039c13d..4d8883fa 100644
--- a/lib/sisu/v3dv/dbi.rb
+++ b/lib/sisu/v3dv/dbi.rb
@@ -66,7 +66,7 @@ module SiSU_DBI
include SiSU_DbDBI
require_relative 'shared_html_lite' # shared_html_lite.rb
include SiSU_FormatShared
- class SiSU_SQL
+ class SQL
def initialize(opt)
SiSU_Env::Load.new('dbi',true).prog
@opt=opt
diff --git a/lib/sisu/v3dv/digests.rb b/lib/sisu/v3dv/digests.rb
index 2f784963..1564884a 100644
--- a/lib/sisu/v3dv/digests.rb
+++ b/lib/sisu/v3dv/digests.rb
@@ -97,7 +97,7 @@ module SiSU_DigestView
def initialize(particulars) #data='',md='')
@particulars=particulars
@data,@env,@md=@particulars.dal_array,@particulars.env,@particulars.md
- SiSU_Env::SiSU_file.new(@md).mkdir
+ SiSU_Env::FileOp.new(@md).mkdir
@@dg ||=@env.digest.type
@@dl ||=@env.digest.length
@dg,@dl=@@dg,@@dl
@@ -134,7 +134,7 @@ module SiSU_DigestView
@@sc_info << f << e
end
def output
- file=SiSU_Env::SiSU_file.new(@md)
+ file=SiSU_Env::FileOp.new(@md)
filename_digest=file.write_file.hash_digest
filename_digest << @@description.join << @@ds[:digests].join << @@ds[:tree].join << @@ds[:summary].join << @@sc_info.join
end
diff --git a/lib/sisu/v3dv/embedded.rb b/lib/sisu/v3dv/embedded.rb
index 1dcc4fac..f8cfc9a9 100644
--- a/lib/sisu/v3dv/embedded.rb
+++ b/lib/sisu/v3dv/embedded.rb
@@ -68,7 +68,7 @@ module SiSU_Embedded
@env=SiSU_Env::Info_env.new(@md.fns)
@rhost=SiSU_Env::Info_remote.new(@opt).remote_host_base
@base_src_dir=@opt.f_pth[:pth].sub(/\/#{@opt.f_pth[:lng]}$/,'')
- @f=SiSU_Env::SiSU_file.new(@md)
+ @f=SiSU_Env::FileOp.new(@md)
end
def read
songsheet
diff --git a/lib/sisu/v3dv/epub.rb b/lib/sisu/v3dv/epub.rb
index 6d320b6b..5afba6b0 100644
--- a/lib/sisu/v3dv/epub.rb
+++ b/lib/sisu/v3dv/epub.rb
@@ -98,7 +98,7 @@ module SiSU_EPUB
dir_epub=@env.processing_path.epub
SiSU_Env::Info_skin.new(@md).select
data=nil
- SiSU_Env::SiSU_file.new(@md).mkdir.output.epub
+ SiSU_Env::FileOp.new(@md).mkdir.output.epub
@tuned_file_array=SiSU_EPUB::Source::XHtml_environment.new(@particulars).tuned_file_instructions
data=@tuned_file_array
scr_endnotes=SiSU_EPUB::Source::Endnotes.new(@md,data).scroll
@@ -138,7 +138,7 @@ module SiSU_EPUB
end
def directories
title=File.basename(@md.fns,'.rb')
- SiSU_Env::SiSU_file.new(@md).mkdir.output.epub
+ SiSU_Env::FileOp.new(@md).mkdir.output.epub
end
def tuned_file_instructions
@tell=SiSU_Screen::Ansi.new(@md.opt.cmd)
diff --git a/lib/sisu/v3dv/epub_format.rb b/lib/sisu/v3dv/epub_format.rb
index 25e659af..30b6e0bc 100644
--- a/lib/sisu/v3dv/epub_format.rb
+++ b/lib/sisu/v3dv/epub_format.rb
@@ -1596,7 +1596,7 @@ WOK
%{\n <dc:rights>#{rights}</dc:rights>}
else ''
end
- f=SiSU_Env::SiSU_file.new(@md)
+ f=SiSU_Env::FileOp.new(@md)
<<WOK
<metadata xmlns:dc="http://purl.org/dc/elements/1.1/"
xmlns:opf="http://www.idpf.org/2007/opf"
diff --git a/lib/sisu/v3dv/epub_tune.rb b/lib/sisu/v3dv/epub_tune.rb
index b348a7bf..c8cb2681 100644
--- a/lib/sisu/v3dv/epub_tune.rb
+++ b/lib/sisu/v3dv/epub_tune.rb
@@ -76,7 +76,7 @@ module SiSU_EPUB_Tune
class Output
def initialize(data,md)
@data,@md=data,md
- @file=SiSU_Env::SiSU_file.new(@md)
+ @file=SiSU_Env::FileOp.new(@md)
@cX=SiSU_Screen::Ansi.new(@md.opt.cmd).cX
end
def hard_output
diff --git a/lib/sisu/v3dv/git.rb b/lib/sisu/v3dv/git.rb
index 148b35fc..63fb132f 100644
--- a/lib/sisu/v3dv/git.rb
+++ b/lib/sisu/v3dv/git.rb
@@ -65,7 +65,7 @@ module SiSU_Git
@opt=opt
@env=SiSU_Env::Info_env.new
@md=SiSU_Param::Parameters.new(@opt).get
- @file=SiSU_Env::SiSU_file.new(@md)
+ @file=SiSU_Env::FileOp.new(@md)
l=SiSU_Env::Standardise_language.new(@md.opt.lng).language
unless @opt.lng==l[:c] # @md.i18n[0]==l[:c]
p "using: #{@opt.lng} (@make: :language:); filename #{@md.fns} filename language: #{l[:c]}, mismatch"
diff --git a/lib/sisu/v3dv/html.rb b/lib/sisu/v3dv/html.rb
index 62cbd50b..f8c3b32d 100644
--- a/lib/sisu/v3dv/html.rb
+++ b/lib/sisu/v3dv/html.rb
@@ -419,7 +419,7 @@ WOK
%{target="_top">\\1 \\2</a> })
end
p_num=SiSU_HTML_Format::Paragraph_number.new(@md,ocn) if ocn
- @file=SiSU_Env::SiSU_file.new(@md) if @md
+ @file=SiSU_Env::FileOp.new(@md) if @md
txt_obj=if seg_link=~/sisu_manifest\.html/
man_link=if @file.output_dir_structure.by_language_code? \
or @file.output_dir_structure.by_filetype?
@@ -611,7 +611,7 @@ WOK
class Output
def initialize(data='',md='')
@data,@md=data,md
- @file=SiSU_Env::SiSU_file.new(@md)
+ @file=SiSU_Env::FileOp.new(@md)
end
def scroll
begin
diff --git a/lib/sisu/v3dv/html_format.rb b/lib/sisu/v3dv/html_format.rb
index 76df9d57..662e7c75 100644
--- a/lib/sisu/v3dv/html_format.rb
+++ b/lib/sisu/v3dv/html_format.rb
@@ -155,7 +155,7 @@ module SiSU_HTML_Format
@md=md
@cf_defaults=SiSU_Env::Info_processing_flag.new
@env=SiSU_Env::Info_env.new(@md.fns)
- @file=SiSU_Env::SiSU_file.new(@md)
+ @file=SiSU_Env::FileOp.new(@md)
end
def home
%{<td align="center" bgcolor=#{@vz.color_band2}>
@@ -334,7 +334,7 @@ WOK
<p />}
end
def manifest_link(text)
-# @file=SiSU_Env::SiSU_file.new(@md) if @md
+# @file=SiSU_Env::FileOp.new(@md) if @md
%{<font size=2>
<a href="#{@md.fn[:manifest]}" target="_top" #{@vz.js_manifest}>#{text}</a>
</font>}
@@ -417,7 +417,7 @@ WOK
end
end
def links_guide_vertical_open
-# @file=SiSU_Env::SiSU_file.new(@md) if @md
+# @file=SiSU_Env::FileOp.new(@md) if @md
url=((defined? @vz.url_hp) && @vz.url_hp =~/^https?:\/\/\S+$/ ? @vz.url_hp : @vz.url_home)
%{
<div id="vertical_links">
@@ -438,7 +438,7 @@ WOK
<!- quick ref -!>}
end
def links_guide_horizontal_open
-# @file=SiSU_Env::SiSU_file.new(@md) if @md
+# @file=SiSU_Env::FileOp.new(@md) if @md
url=((defined? @vz.url_hp) && @vz.url_hp =~/^https?:\/\/\S+$/ ? @vz.url_hp : @vz.url_home)
%{
<div id="horizontal_links">
@@ -650,7 +650,7 @@ WOK
up="#{@toc}#{@md.lang_code_insert}#{Sfx[:html]}"
nxt="#{@seg_name_html[@seg_name_html_tracker+1]}#{@md.lang_code_insert}#{Sfx[:html]}"
if nxt=~/sisu_manifest\.html/
- @file=SiSU_Env::SiSU_file.new(@md) if @md
+ @file=SiSU_Env::FileOp.new(@md) if @md
if @file.output_dir_structure.by_language_code? \
or @file.output_dir_structure.by_filetype?
nxt.gsub!(/sisu_manifest\.html/,"../../manifest/#{@file.base_filename.manifest}")
@@ -712,7 +712,7 @@ WOK
</a>
</td>} if f_nxt==true
if nxt =~/sisu_manifest.html/
- @file=SiSU_Env::SiSU_file.new(@md) if @md
+ @file=SiSU_Env::FileOp.new(@md) if @md
if @file.output_dir_structure.by_language_code? \
or @file.output_dir_structure.by_filetype?
nxt.gsub!(/sisu_manifest\.html/,"../../manifest/#{@file.base_filename.manifest}")
diff --git a/lib/sisu/v3dv/html_segments.rb b/lib/sisu/v3dv/html_segments.rb
index b1afa6a3..39b3984f 100644
--- a/lib/sisu/v3dv/html_segments.rb
+++ b/lib/sisu/v3dv/html_segments.rb
@@ -65,7 +65,7 @@ module SiSU_HTML_Seg
def initialize(md,outputfile,seg,minitoc,type='')
@md,@output_seg_file,@seg,@minitoc,@type=md,outputfile,seg,minitoc,type
@title_banner_=SiSU_Env::Create_site.new(@md.opt.cmd).html_seg_title_banner?
- @file=SiSU_Env::SiSU_file.new(@md)
+ @file=SiSU_Env::FileOp.new(@md)
end
def output
if @seg[:title] =~/\S/
@@ -230,7 +230,7 @@ module SiSU_HTML_Seg
if tracking != 0
dirout=SiSU_Env::Info_env.new(@md.fns)
dir_sisu=dirout.path.output
- @file=SiSU_Env::SiSU_file.new(@md)
+ @file=SiSU_Env::FileOp.new(@md)
unless FileTest.directory?(@file.output_path.html_seg.dir)
FileUtils::mkdir_p(@file.output_path.html_seg.dir) if File.writable?("#{@file.output_path.base.dir}/.")
end
diff --git a/lib/sisu/v3dv/hub.rb b/lib/sisu/v3dv/hub.rb
index 0dfa865b..243b2f14 100644
--- a/lib/sisu/v3dv/hub.rb
+++ b/lib/sisu/v3dv/hub.rb
@@ -223,7 +223,7 @@ module SiSU
when /^qrcode$/; SiSU_QRcode::Source.new(@opt).read # -Q qrcode.rb
when /^sitemaps$/; SiSU_Sitemaps::Source.new(@opt).read # -Y sitemaps.rb
when /^zap$/; SiSU_Zap::Source.new(@opt).read # -Z zap.rb
- when /^dbi$/; SiSU_DBI::SiSU_SQL.new(@opt).connect # -D -d dbi.rb
+ when /^dbi$/; SiSU_DBI::SQL.new(@opt).connect # -D -d dbi.rb
end
@n_do=@n_do+1
SiSU_Screen::Ansi.new(@opt.cmd,@n_do,"#{@req.upcase} processed").files_processed if @opt.cmd =~/[MVv]/
@@ -254,7 +254,7 @@ module SiSU
end
end
end
- elsif @req =~/^dbi$/; SiSU_DBI::SiSU_SQL.new(@opt).connect # -D -d
+ elsif @req =~/^dbi$/; SiSU_DBI::SQL.new(@opt).connect # -D -d
elsif @req=~/^sisupod_make$/; SiSU_Doc::Source.new(@opt).read # -S
end
Operations.new.counter
@@ -291,7 +291,7 @@ p "here #{__FILE__} #{__LINE__}" if @opt =~/M/
end
def cgi # -F
require_relative 'cgi' # cgi.rb
- SiSU_CGI::SiSU_search.new(@opt).read
+ SiSU_CGI::SearchSQL.new(@opt).read
end
def encoding # -K build character encoding db (uses KirbyBase)
require_relative 'character_encoding' # character_encoding.rb
diff --git a/lib/sisu/v3dv/manifest.rb b/lib/sisu/v3dv/manifest.rb
index 7e0d5bf4..36988cec 100644
--- a/lib/sisu/v3dv/manifest.rb
+++ b/lib/sisu/v3dv/manifest.rb
@@ -105,7 +105,7 @@ module SiSU_Manifest
@env=SiSU_Env::Info_env.new(@md.fns)
@fnb=@md.fnb
@base_url="#{@env.url.root}/#{@fnb}"
- @f=SiSU_Env::SiSU_file.new(@md)
+ @f=SiSU_Env::FileOp.new(@md)
@base_path=@f.output_path.manifest.dir
@@dg ||=SiSU_Env::Info_env.new.digest.type
@dg=@@dg
@@ -146,7 +146,7 @@ module SiSU_Manifest
@manifest[:html] << %{<tr><th class="left"><p class="norm"><a href="#{rel}/#{file}">#{id}</a></p></th><td class="right"><p class="tiny"><a href="#{rel}/#{file}">#{file}</a> &nbsp;&nbsp;#{dgst[1]}<br />#{@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} if kb and kb =~/\d+/
end
def published_manifests?
- @f=SiSU_Env::SiSU_file.new(@md) #.base_filename
+ @f=SiSU_Env::FileOp.new(@md) #.base_filename
@m=[]
url=@f.output_path.base.url
manifests={}
diff --git a/lib/sisu/v3dv/manpage.rb b/lib/sisu/v3dv/manpage.rb
index 3d29f9d9..7ce9b1d7 100644
--- a/lib/sisu/v3dv/manpage.rb
+++ b/lib/sisu/v3dv/manpage.rb
@@ -409,8 +409,8 @@ WOK
@md,@content=md,content
end
def manpage #%manpage output
- SiSU_Env::SiSU_file.new(@md).mkdir
- filename_manpage=SiSU_Env::SiSU_file.new(@md).write_file.manpage
+ SiSU_Env::FileOp.new(@md).mkdir
+ filename_manpage=SiSU_Env::FileOp.new(@md).write_file.manpage
@sisu=[]
@content.each do |para| # this is a hack
if para.class==Array \
diff --git a/lib/sisu/v3dv/modify.rb b/lib/sisu/v3dv/modify.rb
index fd5d0b03..73e7ac2a 100644
--- a/lib/sisu/v3dv/modify.rb
+++ b/lib/sisu/v3dv/modify.rb
@@ -88,8 +88,8 @@ module SiSU_Modify
#Extracted.new.modify.modules,
#Extracted.new.modify.classes,
#modify.dates,
- modify.modules,
- #modify.classes,
+ #modify.modules,
+ modify.classes,
#modify.misc,
]
end
diff --git a/lib/sisu/v3dv/odf.rb b/lib/sisu/v3dv/odf.rb
index 8205f286..85a9a390 100644
--- a/lib/sisu/v3dv/odf.rb
+++ b/lib/sisu/v3dv/odf.rb
@@ -684,7 +684,7 @@ WOK
@content,@md,@env=content,md,env
end
def odf #%odf output
- env=SiSU_Env::SiSU_file.new(@md)
+ env=SiSU_Env::FileOp.new(@md)
env.mkdir
header=SiSU_ODF_Format::ODT_head_1_2.new(@md)
filename="#{@env.processing_path.odt}/manifest.rdf"
diff --git a/lib/sisu/v3dv/param.rb b/lib/sisu/v3dv/param.rb
index 1fe39700..78a5f975 100644
--- a/lib/sisu/v3dv/param.rb
+++ b/lib/sisu/v3dv/param.rb
@@ -1495,7 +1495,7 @@ module SiSU_Param
SiSU_Screen::Ansi.new(@opt.cmd,"doc_skin <- #{@doc_skin}").txt_grey if @opt.cmd =~/v/
end
@data=nil #else whole file's contents are stored in md pstore & is not required to be... big waste actually
- @file=SiSU_Env::SiSU_file.new(self) #watch
+ @file=SiSU_Env::FileOp.new(self) #watch
Store.new(self,@env).store #% pstore
self
end
diff --git a/lib/sisu/v3dv/particulars.rb b/lib/sisu/v3dv/particulars.rb
index a0006dc6..cd4e29d5 100644
--- a/lib/sisu/v3dv/particulars.rb
+++ b/lib/sisu/v3dv/particulars.rb
@@ -146,7 +146,7 @@ module SiSU_Particulars
def set_file
begin
set_md unless @md
- @file=SiSU_Env::SiSU_file.new(@md)
+ @file=SiSU_Env::FileOp.new(@md)
self
rescue; SiSU_Errors::Info_error.new($!,$@,@opt.cmd,@opt.fns).error
end
diff --git a/lib/sisu/v3dv/plaintext.rb b/lib/sisu/v3dv/plaintext.rb
index a306e6c6..739ffb09 100644
--- a/lib/sisu/v3dv/plaintext.rb
+++ b/lib/sisu/v3dv/plaintext.rb
@@ -401,7 +401,7 @@ WOK
@content,@md=content,md
end
def plaintext #%plaintext output
- file_plaintext=SiSU_Env::SiSU_file.new(@md).write_file.txt
+ file_plaintext=SiSU_Env::FileOp.new(@md).write_file.txt
@sisu=[]
emptyline=0
@content.each do |para| # this is a hack
diff --git a/lib/sisu/v3dv/po4a.rb b/lib/sisu/v3dv/po4a.rb
index bfb7658e..332891b7 100644
--- a/lib/sisu/v3dv/po4a.rb
+++ b/lib/sisu/v3dv/po4a.rb
@@ -921,7 +921,7 @@ GSUB
include SiSU_Env
def initialize(fn,content,md)
@fn,@content,@md=fn,content,md
- @file=SiSU_Env::SiSU_file.new(md,fn)
+ @file=SiSU_Env::FileOp.new(md,fn)
end
def po4a #%pot output
file_pot=(@md.opt.f_pth[:lng] ==opt.lng_base) \
diff --git a/lib/sisu/v3dv/qrcode.rb b/lib/sisu/v3dv/qrcode.rb
index 2dd621e7..69ded246 100644
--- a/lib/sisu/v3dv/qrcode.rb
+++ b/lib/sisu/v3dv/qrcode.rb
@@ -102,7 +102,7 @@ module SiSU_QRcode
@env=SiSU_Env::Info_env.new(@md.fns)
@fnb=@md.fnb
@base_url="#{@env.url.root}/#{@fnb}"
- @f=SiSU_Env::SiSU_file.new(@md)
+ @f=SiSU_Env::FileOp.new(@md)
@base_path=@f.output_path.manifest.dir
@@dg ||=SiSU_Env::Info_env.new.digest.type
@dg=@@dg
@@ -176,7 +176,7 @@ WOK
WOK
end
def published_manifests?
- @f=SiSU_Env::SiSU_file.new(@md) #.base_filename
+ @f=SiSU_Env::FileOp.new(@md) #.base_filename
@m=[]
url=@f.output_path.base.url
manifests={}
@@ -704,7 +704,7 @@ WOK
begin
id,file='',''
vz=SiSU_Env::Get_init.instance.skin
- @f=SiSU_Env::SiSU_file.new(@md) #.base_filename
+ @f=SiSU_Env::FileOp.new(@md) #.base_filename
url=@f.output_path.base.url
@en_manifest=if @env.output_dir_structure.by_language_code?
"#{url}/en/manifest/#{@md.fnb}.html"
diff --git a/lib/sisu/v3dv/share_src.rb b/lib/sisu/v3dv/share_src.rb
index 82fffca0..ac1d4374 100644
--- a/lib/sisu/v3dv/share_src.rb
+++ b/lib/sisu/v3dv/share_src.rb
@@ -65,7 +65,7 @@ module SiSU_Markup
@opt=opt
@env=SiSU_Env::Info_env.new(@opt.fns)
md=SiSU_Param::Parameters.new(@opt).get
- @file=SiSU_Env::SiSU_file.new(md)
+ @file=SiSU_Env::FileOp.new(md)
stub=@opt.fnb.gsub(/~[a-z]+$/,'')
end
def read
diff --git a/lib/sisu/v3dv/sitemaps.rb b/lib/sisu/v3dv/sitemaps.rb
index a96c239e..b3e9169d 100644
--- a/lib/sisu/v3dv/sitemaps.rb
+++ b/lib/sisu/v3dv/sitemaps.rb
@@ -79,7 +79,7 @@ module SiSU_Sitemaps
@md=SiSU_Param::Parameters.new(@opt).get
@trans=SiSU_XML_Munge::Trans.new(@md) #check @md is required
@env=SiSU_Env::Info_env.new(@md.fns)
-# @file=SiSU_Env::SiSU_file.new(@md)
+# @file=SiSU_Env::FileOp.new(@md)
@rdf=SiSU_XML_Tags::RDF.new(@md)
@fnb_utf8_xml=@md.fnb.dup
@trans.char_enc.utf8(@fnb_utf8_xml) if @sys.locale =~/utf-?8/i #% utf8
@@ -105,8 +105,8 @@ module SiSU_Sitemaps
filename=@fn[:sitemap]
touch_path=@md.file.output_path.sitemaps.dir
touch_filename=@fn[:sitemap_touch]
- SiSU_Env::SiSU_file.new(@md).make_path(path)
- file=SiSU_Env::SiSU_file.new(@md).make_file(path,filename)
+ SiSU_Env::FileOp.new(@md).make_path(path)
+ file=SiSU_Env::FileOp.new(@md).make_file(path,filename)
file << sitemap
if FileTest.file?("#{touch_path}/#{touch_filename}")
FileUtils::rm("#{touch_path}/#{touch_filename}")
diff --git a/lib/sisu/v3dv/sst_to_s_xml_sax.rb b/lib/sisu/v3dv/sst_to_s_xml_sax.rb
index 8e9f8e37..0fc34be7 100644
--- a/lib/sisu/v3dv/sst_to_s_xml_sax.rb
+++ b/lib/sisu/v3dv/sst_to_s_xml_sax.rb
@@ -420,8 +420,8 @@ WOK
end
new_file_data=@sisu.join
@sisu=new_file_data.scan(/.+/)
- SiSU_Env::SiSU_file.new(@md).mkdir
- filename_sxm=SiSU_Env::SiSU_file.new(@md,@md.fn[:sxs]).mkfile_pwd
+ SiSU_Env::FileOp.new(@md).mkdir
+ filename_sxm=SiSU_Env::FileOp.new(@md,@md.fn[:sxs]).mkfile_pwd
if filename_sxm.class==File
@sisu.each {|para| filename_sxm.puts para}
filename_sxm.close
diff --git a/lib/sisu/v3dv/sysenv.rb b/lib/sisu/v3dv/sysenv.rb
index 16dabd36..a7fa3c75 100644
--- a/lib/sisu/v3dv/sysenv.rb
+++ b/lib/sisu/v3dv/sysenv.rb
@@ -2986,7 +2986,7 @@ WOK
skin_images_array
end
def rsync
- @f=SiSU_Env::SiSU_file.new(@md)
+ @f=SiSU_Env::FileOp.new(@md)
def document
self.remote_host_base.each do |remote_conn|
local_gen=@source_path
@@ -3248,7 +3248,7 @@ WOK
#File.symlink("../../man/form", "#{@env.path.output}/man/pdf") unless File.symlink?("#{@env.path.output}/man/pdf")==true
end
end
- class Info_file <Info_env #todo unify with SiSU_file
+ class Info_file <Info_env #todo unify with FileOp
def initialize(fns)
begin
super(fns)
@@ -3314,7 +3314,7 @@ WOK
end
self
end
- def mkdir #check moved from SiSU_file, existing mkdir
+ def mkdir #check moved from FileOp, existing mkdir
def processing
def dal
FileUtils::mkdir_p(@env.processing_path.dal) unless FileTest.directory?(@env.processing_path.dal)
@@ -3326,7 +3326,7 @@ WOK
end
end
end
- class SiSU_file <Info_file #todo unify with Create_file
+ class FileOp <Info_file #todo unify with Create_file
def initialize(md,fno='')
begin
@md,@fno=md,fno
@@ -4726,7 +4726,7 @@ WOK
self
end
end
- class Create_file <Info_env #todo unify with SiSU_file
+ class Create_file <Info_env #todo unify with FileOp
def initialize(fns)
begin
super(fns)
@@ -4808,7 +4808,7 @@ WOK
File.new("#{@env.processing_path.texinfo}/#{@fnb}.texinfo",'w+')
end
end
- class Clear <Info_env #todo unify with SiSU_file
+ class Clear <Info_env #todo unify with FileOp
def initialize(cmd,fns,operation='')
@cmd=cmd
begin
@@ -5116,7 +5116,7 @@ WOK
@md=md
@css=CSS_select.new(@md)
@env=SiSU_Env::Info_env.new
- @file=SiSU_Env::SiSU_file.new(@md)
+ @file=SiSU_Env::FileOp.new(@md)
end
def html
%{ <link rel="stylesheet" href="#{@file.path_rel_links.html_scroll_css}#{@env.path.style}/#{@css.html}" type="text/css" />}
diff --git a/lib/sisu/v3dv/texinfo.rb b/lib/sisu/v3dv/texinfo.rb
index 0a28b734..9961171e 100644
--- a/lib/sisu/v3dv/texinfo.rb
+++ b/lib/sisu/v3dv/texinfo.rb
@@ -133,7 +133,7 @@ module SiSU_TexInfo
@md,@data=md,data
@env=SiSU_Env::Info_env.new(@md.fns)
@vz=SiSU_Env::Get_init.instance.skin
- @f=SiSU_Env::SiSU_file.new(@md)
+ @f=SiSU_Env::FileOp.new(@md)
end
def songsheet
begin
diff --git a/lib/sisu/v3dv/texpdf.rb b/lib/sisu/v3dv/texpdf.rb
index c94ce629..aae3b1d5 100644
--- a/lib/sisu/v3dv/texpdf.rb
+++ b/lib/sisu/v3dv/texpdf.rb
@@ -91,7 +91,7 @@ module SiSU_TeX
begin
case @opt.fns
when /\.(?:-|ssm\.)?sst$/
- SiSU_Env::SiSU_file.new(@md).mkdir
+ SiSU_Env::FileOp.new(@md).mkdir
Dir.mkdir(@env.processing_path.tex) unless FileTest.directory?(@env.processing_path.tex)
end
rescue; SiSU_Errors::Info_error.new($!,$@,@opt.cmd,@opt.fns).error
@@ -148,7 +148,7 @@ module SiSU_TeX
@@n_lpdf||=0 #change
def initialize(md,env)
@md,@env=md,env
- @f=SiSU_Env::SiSU_file.new(@md).base_filename
+ @f=SiSU_Env::FileOp.new(@md).base_filename
end
def latex_do(texfilename,papersize)
@texfilename=texfilename
diff --git a/lib/sisu/v3dv/wikispeak.rb b/lib/sisu/v3dv/wikispeak.rb
index 52bbd367..2b82039e 100644
--- a/lib/sisu/v3dv/wikispeak.rb
+++ b/lib/sisu/v3dv/wikispeak.rb
@@ -355,8 +355,8 @@ WOK
@content,@md=content,md
end
def wiki #%wiki output
- SiSU_Env::SiSU_file.new(@md).mkdir
- filename_wiki=SiSU_Env::SiSU_file.new(@md,@md.fn[:wiki]).mkfile
+ SiSU_Env::FileOp.new(@md).mkdir
+ filename_wiki=SiSU_Env::FileOp.new(@md,@md.fn[:wiki]).mkfile
@sisu=[]
@content.each do |para| # this is a hack
if para =~/^\S/
diff --git a/lib/sisu/v3dv/xhtml.rb b/lib/sisu/v3dv/xhtml.rb
index 752a0317..bd4bdd6a 100644
--- a/lib/sisu/v3dv/xhtml.rb
+++ b/lib/sisu/v3dv/xhtml.rb
@@ -102,7 +102,7 @@ module SiSU_XHTML
class Songsheet
def initialize(particulars)
@env,@md,@dal_array,@particulars=particulars.env,particulars.md,particulars.dal_array,particulars
- @file=SiSU_Env::SiSU_file.new(@md)
+ @file=SiSU_Env::FileOp.new(@md)
end
def song
begin
@@ -387,10 +387,10 @@ WOK
class Output
def initialize(data,md)
@data,@md=data,md
- @file=SiSU_Env::SiSU_file.new(@md)
+ @file=SiSU_Env::FileOp.new(@md)
end
def xhtml
- SiSU_Env::SiSU_file.new(@md).mkdir
+ SiSU_Env::FileOp.new(@md).mkdir
filename_xml=@file.write_file.xhtml
@data.each do |str|
str.gsub!(/\A\s+\Z/m,'') #str.gsub!(/^\s+$/,'')
diff --git a/lib/sisu/v3dv/xml.rb b/lib/sisu/v3dv/xml.rb
index 972d3ef0..27a57f4e 100644
--- a/lib/sisu/v3dv/xml.rb
+++ b/lib/sisu/v3dv/xml.rb
@@ -102,7 +102,7 @@ module SiSU_XML_SAX
class Songsheet
def initialize(particulars)
@env,@md,@dal_array,@particulars=particulars.env,particulars.md,particulars.dal_array,particulars
- @file=SiSU_Env::SiSU_file.new(@md)
+ @file=SiSU_Env::FileOp.new(@md)
end
def song
begin
@@ -429,10 +429,10 @@ WOK
class Output
def initialize(data,md)
@data,@md=data,md
- @file=SiSU_Env::SiSU_file.new(@md)
+ @file=SiSU_Env::FileOp.new(@md)
end
def xml
- SiSU_Env::SiSU_file.new(@md).mkdir
+ SiSU_Env::FileOp.new(@md).mkdir
filename_xml=@file.write_file.xml_sax
@data.each do |str|
str.gsub!(/\A\s+\Z/m,'') #str.gsub!(/^\s+$/,'')
diff --git a/lib/sisu/v3dv/xml_dom.rb b/lib/sisu/v3dv/xml_dom.rb
index 6fa30abf..8a6394ad 100644
--- a/lib/sisu/v3dv/xml_dom.rb
+++ b/lib/sisu/v3dv/xml_dom.rb
@@ -99,7 +99,7 @@ module SiSU_XML_DOM
class Songsheet
def initialize(particulars)
@env,@md,@dal_array,@particulars=particulars.env,particulars.md,particulars.dal_array,particulars
- @file=SiSU_Env::SiSU_file.new(@md)
+ @file=SiSU_Env::FileOp.new(@md)
end
def songsheet
begin
@@ -506,10 +506,10 @@ WOK
include SiSU_Param
def initialize(data,md)
@data,@md=data,md
- @file=SiSU_Env::SiSU_file.new(@md)
+ @file=SiSU_Env::FileOp.new(@md)
end
def xml
- SiSU_Env::SiSU_file.new(@md).mkdir
+ SiSU_Env::FileOp.new(@md).mkdir
filename_xml=@file.write_file.xml_dom
@data.each do |str|
str.gsub!(/#{Mx[:pa_o]}:\S+#{Mx[:pa_c]}/,'')
diff --git a/lib/sisu/v3dv/xml_fictionbook.rb b/lib/sisu/v3dv/xml_fictionbook.rb
index 8fb79d1d..31dcd126 100644
--- a/lib/sisu/v3dv/xml_fictionbook.rb
+++ b/lib/sisu/v3dv/xml_fictionbook.rb
@@ -85,7 +85,7 @@ module SiSU_XML_Fictionbook
def initialize(data='',md='')
@data,@md=data,md
@trans=SiSU_XML_Munge::Trans.new(@md)
- @file_fictionbook=SiSU_Env::SiSU_file.new(@md,'fictionbook.xml').mkfile
+ @file_fictionbook=SiSU_Env::FileOp.new(@md,'fictionbook.xml').mkfile
end
def songsheet
@t='fictionbook'
diff --git a/lib/sisu/v3dv/xml_md_oai_pmh_dc.rb b/lib/sisu/v3dv/xml_md_oai_pmh_dc.rb
index 625ef062..8397b15a 100644
--- a/lib/sisu/v3dv/xml_md_oai_pmh_dc.rb
+++ b/lib/sisu/v3dv/xml_md_oai_pmh_dc.rb
@@ -192,8 +192,8 @@ WOK
'</oai_dc:dc>'
end
def output
- SiSU_Env::SiSU_file.new(@md).mkdir
- oai_pmh=SiSU_Env::SiSU_file.new(@md,@md.fn[:oai_pmh]).mkfile #implement in param
+ SiSU_Env::FileOp.new(@md).mkdir
+ oai_pmh=SiSU_Env::FileOp.new(@md,@md.fn[:oai_pmh]).mkfile #implement in param
oai_pmh << pre
body.each do |x|
oai_pmh << x