diff options
| author | Ralph Amissah <ralph@amissah.com> | 2010-03-23 19:21:06 -0400 |
|---|---|---|
| committer | Ralph Amissah <ralph@amissah.com> | 2010-03-23 19:21:06 -0400 |
| commit | f5ea5dbea7e43a67680acad29fa428f829053406 (patch) | |
| tree | c88f820c96c81943085f56a17c857639dc9be1ee | |
| parent | sha256 (2.0.3) (diff) | |
correct method call for md.title.full a number of places
* [in db_import, results in failure of doc import when called]
| -rw-r--r-- | lib/sisu/v2/concordance.rb | 6 | ||||
| -rw-r--r-- | lib/sisu/v2/db_import.rb | 2 | ||||
| -rw-r--r-- | lib/sisu/v2/manifest.rb | 4 | ||||
| -rw-r--r-- | lib/sisu/v2/shared_txt.rb | 2 | ||||
| -rw-r--r-- | 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=%{<a href="http://www.jus.uio.no/sisu/" target="_top"><img border="0" height="44" width="144" valign="center" src="../_sisu/image/sisu.png" alt="SiSU home -->"></a>} @doc_details =<<WOK -<table summary="links to text related to this rudimentary index" width="96%" border="0" bgcolor="white" cellpadding="0" align="center"><tr><td width="2%" align="right"> </td><td width="94%" valign="top" align="justify"><h1 class="small"><a href="#{@md.fn[:toc]}" #{@vz.js_toc}><b>#{@md.full_title}</b></a></h1><p class="bold">#{@md.author}</p></td></tr></table> +<table summary="links to text related to this rudimentary index" width="96%" border="0" bgcolor="white" cellpadding="0" align="center"><tr><td width="2%" align="right"> </td><td width="94%" valign="top" align="justify"><h1 class="small"><a href="#{@md.fn[:toc]}" #{@vz.js_toc}><b>#{@md.title.full}</b></a></h1><p class="bold">#{@md.author}</p></td></tr></table> WOK end def create @@ -123,11 +123,11 @@ WOK <html> <head> <title> - SiSU created WordIndex for: #{@md.full_title} + SiSU created WordIndex for: #{@md.title.full} </title> <meta http-equiv="Content-Type" content="text/html;charset=utf-8" /> <meta name="Description" content=" SiSU created"> - <meta name="keywords" content="word index for #{@md.full_title}"> + <meta name="keywords" content="word index for #{@md.title.full}"> <meta name="generator" content="SiSU (Linux & Ruby!)"> <link rel="generator" href="http://www.jus.uio.no/sisu" /> <link rel="shortcut icon" href="../_sisu/image/rb7.ico" /> 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 <html xmlns="http://www.w3.org/1999/xhtml"> <head> <title> -SiSU manifest: #{@md.full_title} +SiSU manifest: #{@md.title.full} </title> <meta http-equiv="Content-Type" content="text/html;charset=utf-8" /> <meta name="sourcefile" content="#{@md.fns}" /> @@ -613,7 +613,7 @@ SiSU manifest: #{@md.full_title} </div> <div class="content"> <h1 class="small">#{@translate.manifest_description}</h1> -<h2 class="small">#{@md.full_title}</h2> +<h2 class="small">#{@md.title.full}</h2> <p class="bold">#{@md.author}</p> <p class="small"> <a href="#output">Document, Available Filetypes</a> 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 <middle-name>***</middle-name> <last-name>***</last-name> </author> - <book-title>#{@md.full_title}</book-title> + <book-title>#{@md.title.full}</book-title> <annotation> </annotation> <date value="#{@md.date}">yyyy</date> |