summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRalph Amissah <ralph@amissah.com>2014-07-29 23:29:33 +0000
committerRalph Amissah <ralph@amissah.com>2014-07-29 23:29:35 +0000
commita79f98621cca3304c06ab3312603b3314bfe773f (patch)
tree45a3d2aec9b300723004dd80235029b79cb568c5
parentv5 v6: options, minor fixes (diff)
downloadsisu-a79f98621cca3304c06ab3312603b3314bfe773f.zip
sisu-a79f98621cca3304c06ab3312603b3314bfe773f.tar.xz
v5 v6: ensure reset of parsed document directory pathsisu_5.5.5
* needed in the case of html for some subsequent processing
-rw-r--r--data/doc/sisu/CHANGELOG_v53
-rw-r--r--data/doc/sisu/CHANGELOG_v63
-rw-r--r--lib/sisu/v5/dbi_discrete.rb2
-rw-r--r--lib/sisu/v5/html.rb1
-rw-r--r--lib/sisu/v5/html_concordance.rb1
-rw-r--r--lib/sisu/v5/manifest.rb1
-rw-r--r--lib/sisu/v5/manpage.rb1
-rw-r--r--lib/sisu/v5/texinfo.rb6
-rw-r--r--lib/sisu/v5/texpdf.rb6
-rw-r--r--lib/sisu/v5/xhtml.rb1
-rw-r--r--lib/sisu/v5/xhtml_epub2.rb6
-rw-r--r--lib/sisu/v5/xml_docbook5.rb1
-rw-r--r--lib/sisu/v5/xml_dom.rb1
-rw-r--r--lib/sisu/v5/xml_fictionbook2.rb1
-rw-r--r--lib/sisu/v5/xml_odf_odt.rb1
-rw-r--r--lib/sisu/v5/xml_sax.rb1
-rw-r--r--lib/sisu/v6/dbi_discrete.rb2
-rw-r--r--lib/sisu/v6/html.rb1
-rw-r--r--lib/sisu/v6/html_concordance.rb1
-rw-r--r--lib/sisu/v6/manifest.rb1
-rw-r--r--lib/sisu/v6/manpage.rb1
-rw-r--r--lib/sisu/v6/texinfo.rb6
-rw-r--r--lib/sisu/v6/texpdf.rb6
-rw-r--r--lib/sisu/v6/xhtml.rb1
-rw-r--r--lib/sisu/v6/xhtml_epub2.rb6
-rw-r--r--lib/sisu/v6/xml_docbook5.rb1
-rw-r--r--lib/sisu/v6/xml_dom.rb1
-rw-r--r--lib/sisu/v6/xml_fictionbook2.rb1
-rw-r--r--lib/sisu/v6/xml_odf_odt.rb1
-rw-r--r--lib/sisu/v6/xml_sax.rb1
30 files changed, 60 insertions, 6 deletions
diff --git a/data/doc/sisu/CHANGELOG_v5 b/data/doc/sisu/CHANGELOG_v5
index 88d7f08..e3646e8 100644
--- a/data/doc/sisu/CHANGELOG_v5
+++ b/data/doc/sisu/CHANGELOG_v5
@@ -38,6 +38,9 @@ http://www.jus.uio.no/sisu/pkg/src/sisu_5.5.5.orig.tar.xz
sisu_5.5.5.orig.tar.xz
sisu_5.5.5-1.dsc
+* ensure reset of parsed document directory path
+ * needed in the case of html for some subsequent processing
+
%% 5.5.4.orig.tar.xz (2014-07-24:29/4)
http://sources.sisudoc.org/gitweb/?p=code/sisu.git;a=log;h=refs/tags/sisu_5.5.4
http://sources.sisudoc.org/gitweb/?p=code/sisu.git;a=log;h=refs/tags/debian/sisu_5.5.4-1
diff --git a/data/doc/sisu/CHANGELOG_v6 b/data/doc/sisu/CHANGELOG_v6
index 1e37398..cc2f932 100644
--- a/data/doc/sisu/CHANGELOG_v6
+++ b/data/doc/sisu/CHANGELOG_v6
@@ -26,6 +26,9 @@ http://sources.sisudoc.org/gitweb/?p=code/sisu.git;a=log;h=refs/tags/sisu_6.1.5
http://sources.sisudoc.org/gitweb/?p=code/sisu.git;a=log;h=refs/tags/debian/sisu_6.1.5-1
http://www.jus.uio.no/sisu/pkg/src/sisu_6.1.5.orig.tar.xz
+* ensure reset of parsed document directory path
+ * needed in the case of html for some subsequent processing
+
%% 6.1.4.orig.tar.xz (2014-07-24:29/4)
http://sources.sisudoc.org/gitweb/?p=code/sisu.git;a=log;h=refs/tags/sisu_6.1.4
http://sources.sisudoc.org/gitweb/?p=code/sisu.git;a=log;h=refs/tags/debian/sisu_6.1.4-1
diff --git a/lib/sisu/v5/dbi_discrete.rb b/lib/sisu/v5/dbi_discrete.rb
index a2aa3d0..9c4726c 100644
--- a/lib/sisu/v5/dbi_discrete.rb
+++ b/lib/sisu/v5/dbi_discrete.rb
@@ -160,6 +160,8 @@ module SiSU_DBI_Discrete #% database building
@conn=@db.sqlite.conn_sqlite3
rescue LoadError
SiSU_Utils::CodeMarker.new(__LINE__,__FILE__,:fuchsia).error('sqlite3 not available')
+ ensure
+ Dir.chdir(@opt.f_pth[:pth])
end
end
end
diff --git a/lib/sisu/v5/html.rb b/lib/sisu/v5/html.rb
index 13aaf58..526b41c 100644
--- a/lib/sisu/v5/html.rb
+++ b/lib/sisu/v5/html.rb
@@ -91,6 +91,7 @@ module SiSU_HTML
ensure
SiSU_Env::CreateSite.new(@opt).cp_css
SiSU_Env::CreateSite.new(@opt).cp_base_images
+ Dir.chdir(@opt.f_pth[:pth])
end
end
def songsheet
diff --git a/lib/sisu/v5/html_concordance.rb b/lib/sisu/v5/html_concordance.rb
index f336937..7bbb1a4 100644
--- a/lib/sisu/v5/html_concordance.rb
+++ b/lib/sisu/v5/html_concordance.rb
@@ -123,6 +123,7 @@ module SiSU_Concordance
end
ensure
SiSU_Env::CreateSite.new(@opt).cp_css
+ Dir.chdir(@opt.f_pth[:pth])
end
end
private
diff --git a/lib/sisu/v5/manifest.rb b/lib/sisu/v5/manifest.rb
index faca95a..1afe1de 100644
--- a/lib/sisu/v5/manifest.rb
+++ b/lib/sisu/v5/manifest.rb
@@ -121,6 +121,7 @@ module SiSU_Manifest
end
ensure
SiSU_Env::CreateSite.new(@opt).cp_css
+ Dir.chdir(@opt.f_pth[:pth])
end
end
private
diff --git a/lib/sisu/v5/manpage.rb b/lib/sisu/v5/manpage.rb
index 526e028..a59ba83 100644
--- a/lib/sisu/v5/manpage.rb
+++ b/lib/sisu/v5/manpage.rb
@@ -120,6 +120,7 @@ module SiSU_Manpage
__LINE__.to_s + ':' + __FILE__
end
ensure
+ Dir.chdir(@opt.f_pth[:pth])
end
end
private
diff --git a/lib/sisu/v5/texinfo.rb b/lib/sisu/v5/texinfo.rb
index ad8217e..4c25c1e 100644
--- a/lib/sisu/v5/texinfo.rb
+++ b/lib/sisu/v5/texinfo.rb
@@ -100,7 +100,11 @@ module SiSU_TexInfo
end
end
def read
- song
+ begin
+ song
+ ensure
+ Dir.chdir(@opt.f_pth[:pth])
+ end
end
def song
begin
diff --git a/lib/sisu/v5/texpdf.rb b/lib/sisu/v5/texpdf.rb
index 7d12b24..8d6a01c 100644
--- a/lib/sisu/v5/texpdf.rb
+++ b/lib/sisu/v5/texpdf.rb
@@ -114,7 +114,11 @@ module SiSU_TeX
end
end
def read
- song
+ begin
+ song
+ ensure
+ Dir.chdir(@opt.f_pth[:pth])
+ end
end
def song
begin
diff --git a/lib/sisu/v5/xhtml.rb b/lib/sisu/v5/xhtml.rb
index 8a7df5f..e1efeea 100644
--- a/lib/sisu/v5/xhtml.rb
+++ b/lib/sisu/v5/xhtml.rb
@@ -121,6 +121,7 @@ module SiSU_XHTML
end
ensure
SiSU_Env::CreateSite.new(@opt).cp_css
+ Dir.chdir(@opt.f_pth[:pth])
end
end
private
diff --git a/lib/sisu/v5/xhtml_epub2.rb b/lib/sisu/v5/xhtml_epub2.rb
index 5f43a9d..d0b4a7d 100644
--- a/lib/sisu/v5/xhtml_epub2.rb
+++ b/lib/sisu/v5/xhtml_epub2.rb
@@ -84,7 +84,11 @@ module SiSU_XHTML_EPUB2
@particulars=SiSU_Particulars::CombinedSingleton.instance.get_all(opt)
end
def read
- songsheet
+ begin
+ songsheet
+ ensure
+ Dir.chdir(@opt.f_pth[:pth])
+ end
end
def songsheet
begin
diff --git a/lib/sisu/v5/xml_docbook5.rb b/lib/sisu/v5/xml_docbook5.rb
index 829f35b..0870c06 100644
--- a/lib/sisu/v5/xml_docbook5.rb
+++ b/lib/sisu/v5/xml_docbook5.rb
@@ -89,6 +89,7 @@ module SiSU_XML_Docbook_Book
ensure
#SiSU_Env::CreateSite.new(@opt.cmd).cp_css
#SiSU_Env::CreateSite.new(@opt.cmd).cp_base_images
+ Dir.chdir(@opt.f_pth[:pth])
end
end
private
diff --git a/lib/sisu/v5/xml_dom.rb b/lib/sisu/v5/xml_dom.rb
index f06aea5..b51a317 100644
--- a/lib/sisu/v5/xml_dom.rb
+++ b/lib/sisu/v5/xml_dom.rb
@@ -122,6 +122,7 @@ module SiSU_XML_DOM
end
ensure
SiSU_Env::CreateSite.new(@opt).cp_css
+ Dir.chdir(@opt.f_pth[:pth])
end
end
private
diff --git a/lib/sisu/v5/xml_fictionbook2.rb b/lib/sisu/v5/xml_fictionbook2.rb
index 35bccc7..997f0b0 100644
--- a/lib/sisu/v5/xml_fictionbook2.rb
+++ b/lib/sisu/v5/xml_fictionbook2.rb
@@ -86,6 +86,7 @@ module SiSU_XML_Fictionbook
__LINE__.to_s + ':' + __FILE__
end
ensure
+ Dir.chdir(@opt.f_pth[:pth])
end
end
private
diff --git a/lib/sisu/v5/xml_odf_odt.rb b/lib/sisu/v5/xml_odf_odt.rb
index 9bcb29d..df71ce8 100644
--- a/lib/sisu/v5/xml_odf_odt.rb
+++ b/lib/sisu/v5/xml_odf_odt.rb
@@ -121,6 +121,7 @@ module SiSU_XML_ODF_ODT
__LINE__.to_s + ':' + __FILE__
end
ensure
+ Dir.chdir(@opt.f_pth[:pth])
end
end
private
diff --git a/lib/sisu/v5/xml_sax.rb b/lib/sisu/v5/xml_sax.rb
index 58ac50d..ac2b6d4 100644
--- a/lib/sisu/v5/xml_sax.rb
+++ b/lib/sisu/v5/xml_sax.rb
@@ -122,6 +122,7 @@ module SiSU_XML_SAX
ensure
#file closed in songsheet
SiSU_Env::CreateSite.new(@opt).cp_css
+ Dir.chdir(@opt.f_pth[:pth])
end
end
private
diff --git a/lib/sisu/v6/dbi_discrete.rb b/lib/sisu/v6/dbi_discrete.rb
index 9e83009..fc5c310 100644
--- a/lib/sisu/v6/dbi_discrete.rb
+++ b/lib/sisu/v6/dbi_discrete.rb
@@ -160,6 +160,8 @@ module SiSU_DBI_Discrete #% database building
@conn=@db.sqlite.conn_sqlite3
rescue LoadError
SiSU_Utils::CodeMarker.new(__LINE__,__FILE__,:fuchsia).error('sqlite3 not available')
+ ensure
+ Dir.chdir(@opt.f_pth[:pth])
end
end
end
diff --git a/lib/sisu/v6/html.rb b/lib/sisu/v6/html.rb
index 1e2a51e..1f6b787 100644
--- a/lib/sisu/v6/html.rb
+++ b/lib/sisu/v6/html.rb
@@ -91,6 +91,7 @@ module SiSU_HTML
ensure
SiSU_Env::CreateSite.new(@opt).cp_css
SiSU_Env::CreateSite.new(@opt).cp_base_images
+ Dir.chdir(@opt.f_pth[:pth])
end
end
def songsheet
diff --git a/lib/sisu/v6/html_concordance.rb b/lib/sisu/v6/html_concordance.rb
index 0a92799..0f87ee0 100644
--- a/lib/sisu/v6/html_concordance.rb
+++ b/lib/sisu/v6/html_concordance.rb
@@ -123,6 +123,7 @@ module SiSU_Concordance
end
ensure
SiSU_Env::CreateSite.new(@opt).cp_css
+ Dir.chdir(@opt.f_pth[:pth])
end
end
private
diff --git a/lib/sisu/v6/manifest.rb b/lib/sisu/v6/manifest.rb
index f426028..2135093 100644
--- a/lib/sisu/v6/manifest.rb
+++ b/lib/sisu/v6/manifest.rb
@@ -121,6 +121,7 @@ module SiSU_Manifest
end
ensure
SiSU_Env::CreateSite.new(@opt).cp_css
+ Dir.chdir(@opt.f_pth[:pth])
end
end
private
diff --git a/lib/sisu/v6/manpage.rb b/lib/sisu/v6/manpage.rb
index 4a0c978..4f2bb80 100644
--- a/lib/sisu/v6/manpage.rb
+++ b/lib/sisu/v6/manpage.rb
@@ -120,6 +120,7 @@ module SiSU_Manpage
__LINE__.to_s + ':' + __FILE__
end
ensure
+ Dir.chdir(@opt.f_pth[:pth])
end
end
private
diff --git a/lib/sisu/v6/texinfo.rb b/lib/sisu/v6/texinfo.rb
index f17ab1a..459d3ac 100644
--- a/lib/sisu/v6/texinfo.rb
+++ b/lib/sisu/v6/texinfo.rb
@@ -100,7 +100,11 @@ module SiSU_TexInfo
end
end
def read
- song
+ begin
+ song
+ ensure
+ Dir.chdir(@opt.f_pth[:pth])
+ end
end
def song
begin
diff --git a/lib/sisu/v6/texpdf.rb b/lib/sisu/v6/texpdf.rb
index fd0e969..2869c59 100644
--- a/lib/sisu/v6/texpdf.rb
+++ b/lib/sisu/v6/texpdf.rb
@@ -114,7 +114,11 @@ module SiSU_TeX
end
end
def read
- song
+ begin
+ song
+ ensure
+ Dir.chdir(@opt.f_pth[:pth])
+ end
end
def song
begin
diff --git a/lib/sisu/v6/xhtml.rb b/lib/sisu/v6/xhtml.rb
index 3201834..dc04e8b 100644
--- a/lib/sisu/v6/xhtml.rb
+++ b/lib/sisu/v6/xhtml.rb
@@ -121,6 +121,7 @@ module SiSU_XHTML
end
ensure
SiSU_Env::CreateSite.new(@opt).cp_css
+ Dir.chdir(@opt.f_pth[:pth])
end
end
private
diff --git a/lib/sisu/v6/xhtml_epub2.rb b/lib/sisu/v6/xhtml_epub2.rb
index 62cd9ca..e978c15 100644
--- a/lib/sisu/v6/xhtml_epub2.rb
+++ b/lib/sisu/v6/xhtml_epub2.rb
@@ -84,7 +84,11 @@ module SiSU_XHTML_EPUB2
@particulars=SiSU_Particulars::CombinedSingleton.instance.get_all(opt)
end
def read
- songsheet
+ begin
+ songsheet
+ ensure
+ Dir.chdir(@opt.f_pth[:pth])
+ end
end
def songsheet
begin
diff --git a/lib/sisu/v6/xml_docbook5.rb b/lib/sisu/v6/xml_docbook5.rb
index 0a86b0c..c5be78f 100644
--- a/lib/sisu/v6/xml_docbook5.rb
+++ b/lib/sisu/v6/xml_docbook5.rb
@@ -89,6 +89,7 @@ module SiSU_XML_Docbook_Book
ensure
#SiSU_Env::CreateSite.new(@opt.cmd).cp_css
#SiSU_Env::CreateSite.new(@opt.cmd).cp_base_images
+ Dir.chdir(@opt.f_pth[:pth])
end
end
private
diff --git a/lib/sisu/v6/xml_dom.rb b/lib/sisu/v6/xml_dom.rb
index 7532a7f..b92c2d5 100644
--- a/lib/sisu/v6/xml_dom.rb
+++ b/lib/sisu/v6/xml_dom.rb
@@ -122,6 +122,7 @@ module SiSU_XML_DOM
end
ensure
SiSU_Env::CreateSite.new(@opt).cp_css
+ Dir.chdir(@opt.f_pth[:pth])
end
end
private
diff --git a/lib/sisu/v6/xml_fictionbook2.rb b/lib/sisu/v6/xml_fictionbook2.rb
index 0029b28..0430314 100644
--- a/lib/sisu/v6/xml_fictionbook2.rb
+++ b/lib/sisu/v6/xml_fictionbook2.rb
@@ -86,6 +86,7 @@ module SiSU_XML_Fictionbook
__LINE__.to_s + ':' + __FILE__
end
ensure
+ Dir.chdir(@opt.f_pth[:pth])
end
end
private
diff --git a/lib/sisu/v6/xml_odf_odt.rb b/lib/sisu/v6/xml_odf_odt.rb
index e42776a..224de6d 100644
--- a/lib/sisu/v6/xml_odf_odt.rb
+++ b/lib/sisu/v6/xml_odf_odt.rb
@@ -121,6 +121,7 @@ module SiSU_XML_ODF_ODT
__LINE__.to_s + ':' + __FILE__
end
ensure
+ Dir.chdir(@opt.f_pth[:pth])
end
end
private
diff --git a/lib/sisu/v6/xml_sax.rb b/lib/sisu/v6/xml_sax.rb
index 8e3dec2..6893246 100644
--- a/lib/sisu/v6/xml_sax.rb
+++ b/lib/sisu/v6/xml_sax.rb
@@ -122,6 +122,7 @@ module SiSU_XML_SAX
ensure
#file closed in songsheet
SiSU_Env::CreateSite.new(@opt).cp_css
+ Dir.chdir(@opt.f_pth[:pth])
end
end
private