diff options
| author | Ralph Amissah <ralph@amissah.com> | 2012-02-03 20:45:52 -0500 |
|---|---|---|
| committer | Ralph Amissah <ralph@amissah.com> | 2012-02-03 20:45:52 -0500 |
| commit | 7db7a01a7d86e95159bdef47162dc180accf1acb (patch) | |
| tree | 156013cdb28b483ac122c26b9f2e199c9a7d9d12 /lib/sisu/v3/odf.rb | |
| parent | debian/changelog (3.1.12-1) (diff) | |
| parent | v3dv, dal +, use symbols to identify document objects type (is) and group (of) (diff) | |
Merge tag 'sisu_3.1.13' into debian/sid
Diffstat (limited to 'lib/sisu/v3/odf.rb')
| -rw-r--r-- | lib/sisu/v3/odf.rb | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/lib/sisu/v3/odf.rb b/lib/sisu/v3/odf.rb index 4cf46d99..6cdbd57b 100644 --- a/lib/sisu/v3/odf.rb +++ b/lib/sisu/v3/odf.rb @@ -154,8 +154,8 @@ module SiSU_ODF else '' end url=@md.fnb - fn=@md.fn[:manifest] - manifest="#{@env.url.root}/#{@md.fnb}/#{@md.fn[:manifest]}" + fn=@md.file.base_filename.manifest + manifest="#{@md.file.output_path.manifest.url}/#{@md.file.base_filename.manifest}" @@odf[:tail] << %{<text:p text:style-name="P_normal">Available document outputs: <br /> <<text:a xlink:type="simple" xlink:href="#{manifest}">#{manifest}</text:a>></text:p>} @@odf[:tail] << %{\n<text:p text:style-name="P_normal">SiSU: <<text:a xlink:type="simple" xlink:href="http://www.jus.uio.no/lm">www.jus.uio.no/sisu</text:a>> and <<text:a xlink:type="simple" xlink:href="http://www.sisudoc.org">www.sisudoc.org</text:a>></text:p>} @@odf[:tail] << "\n</office:text></office:body></office:document-content>" @@ -719,7 +719,7 @@ WOK od.puts para unless para =~/\A\s*\Z/ end od.close - opendoc=@md.fn[:odf] + opendoc=@md.file.base_filename.odt #watch where output by language FileUtils::mkdir_p(@md.file.output_path.odt.dir) unless FileTest.directory?(@md.file.output_path.odt.dir) if FileTest.directory?(@env.processing_path.odt) pwd=Dir.pwd |