From f5ea5dbea7e43a67680acad29fa428f829053406 Mon Sep 17 00:00:00 2001 From: Ralph Amissah Date: Tue, 23 Mar 2010 19:21:06 -0400 Subject: correct method call for md.title.full a number of places * [in db_import, results in failure of doc import when called] --- lib/sisu/v2/concordance.rb | 6 +++--- lib/sisu/v2/db_import.rb | 2 +- lib/sisu/v2/manifest.rb | 4 ++-- lib/sisu/v2/shared_txt.rb | 2 +- lib/sisu/v2/xml_fictionbook.rb | 2 +- 5 files changed, 8 insertions(+), 8 deletions(-) diff --git a/lib/sisu/v2/concordance.rb b/lib/sisu/v2/concordance.rb index 06cc3056..74338e98 100644 --- a/lib/sisu/v2/concordance.rb +++ b/lib/sisu/v2/concordance.rb @@ -111,7 +111,7 @@ module SiSU_Concordance @fnb=@md.fnb @lex_button=%{SiSU home -->} @doc_details =< 

#{@md.full_title}

#{@md.author}

+
 

#{@md.title.full}

#{@md.author}

WOK end def create @@ -123,11 +123,11 @@ WOK - SiSU created WordIndex for: #{@md.full_title} + SiSU created WordIndex for: #{@md.title.full} - + diff --git a/lib/sisu/v2/db_import.rb b/lib/sisu/v2/db_import.rb index e5c05040..1f795e68 100644 --- a/lib/sisu/v2/db_import.rb +++ b/lib/sisu/v2/db_import.rb @@ -224,7 +224,7 @@ module SiSU_DB_import @md=SiSU_Param::Parameters.new(@opt).get if defined? @md.title.full \ and @md.title.full=~/\S+/ # DublinCore 1 - title - @tp[:title]=@md.title.all + @tp[:title]=@md.title.full special_character_escape(@tp[:title]) @tp[:title_f],@tp[:title_i]='title, ',"'#{@tp[:title]}', " sql='SELECT MAX(tid) FROM metadata' diff --git a/lib/sisu/v2/manifest.rb b/lib/sisu/v2/manifest.rb index 680a7abf..c1da4ccb 100644 --- a/lib/sisu/v2/manifest.rb +++ b/lib/sisu/v2/manifest.rb @@ -598,7 +598,7 @@ WOK -SiSU manifest: #{@md.full_title} +SiSU manifest: #{@md.title.full} @@ -613,7 +613,7 @@ SiSU manifest: #{@md.full_title}

#{@translate.manifest_description}

-

#{@md.full_title}

+

#{@md.title.full}

#{@md.author}

  Document, Available Filetypes diff --git a/lib/sisu/v2/shared_txt.rb b/lib/sisu/v2/shared_txt.rb index 90de5ef5..9d35743b 100644 --- a/lib/sisu/v2/shared_txt.rb +++ b/lib/sisu/v2/shared_txt.rb @@ -162,7 +162,7 @@ module SiSU_text_utils end def start_is_match meta=case @p - when /^#{Mx[:meta_o]}(title)#{Mx[:meta_c]}\s*(.+?)$/; header($1,@md.full_title,'meta','dc') #dc 1 + when /^#{Mx[:meta_o]}(title)#{Mx[:meta_c]}\s*(.+?)$/; header($1,@md.title.full,'meta','dc') #dc 1 when /^#{Mx[:meta_o]}(creator|author)#{Mx[:meta_c]}\s*(.+?)$/; header('creator',$2,'meta','dc') #dc 2 when /^#{Mx[:meta_o]}(subject)#{Mx[:meta_c]}\s*(.+?)$/; header($1,$2,'meta','dc') #dc 3 when /^#{Mx[:meta_o]}(description)#{Mx[:meta_c]}\s*(.+?)$/; header($1,$2,'meta','dc') #dc 4 diff --git a/lib/sisu/v2/xml_fictionbook.rb b/lib/sisu/v2/xml_fictionbook.rb index 129dabd3..045fdb93 100644 --- a/lib/sisu/v2/xml_fictionbook.rb +++ b/lib/sisu/v2/xml_fictionbook.rb @@ -123,7 +123,7 @@ module SiSU_XML_Fictionbook *** *** - #{@md.full_title} + #{@md.title.full} yyyy -- cgit v1.2.3