From 1c84bbb8c41ff546ae007dd85f75a7a12023cdb9 Mon Sep 17 00:00:00 2001 From: Ralph Amissah Date: Fri, 8 Oct 2010 19:46:21 -0400 Subject: sha256 (2.7.4) --- CHANGELOG_v2 | 6 +++--- data/doc/sisu/v2/CHANGELOG | 6 +++--- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/CHANGELOG_v2 b/CHANGELOG_v2 index 130973c5..2c9ff5a1 100644 --- a/CHANGELOG_v2 +++ b/CHANGELOG_v2 @@ -14,9 +14,9 @@ Reverse Chronological: %% 2.7.4.orig.tar.gz (2010-10-08:40/5) http://www.jus.uio.no/sisu/pkg/src/sisu_2.7.4.orig.tar.gz - sisu_2.7.4.orig.tar.gz - sisu_2.7.4-1.dsc - sisu_2.7.4-1.diff.gz + 3d36b407f7f2df7b260f0a7932adf520a0539f8578dac59c6ca6de3bbfd03e62 2743433 sisu_2.7.4.orig.tar.gz + bc2193743fc8635a5974aa0e55507bf99264df0669d23e635cda11bff767ce3a 1196 sisu_2.7.4-1.dsc + cec3bbe1250444300c8c69899a0a5e849d7f5e39c9e0170f7984eaa4fea7b3b4 288468 sisu_2.7.4-1.diff.gz [debian freeze, fix] diff --git a/data/doc/sisu/v2/CHANGELOG b/data/doc/sisu/v2/CHANGELOG index ce051c23..45e47ec7 100644 --- a/data/doc/sisu/v2/CHANGELOG +++ b/data/doc/sisu/v2/CHANGELOG @@ -14,9 +14,9 @@ Reverse Chronological: %% 2.7.4.orig.tar.gz (2010-10-08:40/5) http://www.jus.uio.no/sisu/pkg/src/sisu_2.7.4.orig.tar.gz - sisu_2.7.4.orig.tar.gz - sisu_2.7.4-1.dsc - sisu_2.7.4-1.diff.gz + 3d36b407f7f2df7b260f0a7932adf520a0539f8578dac59c6ca6de3bbfd03e62 2743433 sisu_2.7.4.orig.tar.gz + bc2193743fc8635a5974aa0e55507bf99264df0669d23e635cda11bff767ce3a 1196 sisu_2.7.4-1.dsc + cec3bbe1250444300c8c69899a0a5e849d7f5e39c9e0170f7984eaa4fea7b3b4 288468 sisu_2.7.4-1.diff.gz [debian freeze, fix] -- cgit v1.2.3 From 7010772e78d181be3a8ba304387d94b8f4825ea7 Mon Sep 17 00:00:00 2001 From: Ralph Amissah Date: Sat, 9 Oct 2010 22:51:24 -0400 Subject: odt fix cornercase breakage matching and representing " ", "&" and urls (+changelog) * odf, " " and "&" (prior to this fix, odt for viral_spiral is broken in sisu-markup-samples) * shared_metadata, " ", "&" and urls in metadata more consistent open document text results --- CHANGELOG_v2 | 15 +++++++++++++++ data/doc/sisu/v2/CHANGELOG | 15 +++++++++++++++ lib/sisu/v2/odf.rb | 6 +++--- lib/sisu/v2/shared_metadata.rb | 14 +++++++++++++- 4 files changed, 46 insertions(+), 4 deletions(-) diff --git a/CHANGELOG_v2 b/CHANGELOG_v2 index 2c9ff5a1..d27ff32d 100644 --- a/CHANGELOG_v2 +++ b/CHANGELOG_v2 @@ -12,6 +12,21 @@ Reverse Chronological: %% Development branch UNSTABLE +%% 2.7.5.orig.tar.gz (2010-10-08:40/5) +http://www.jus.uio.no/sisu/pkg/src/sisu_2.7.5.orig.tar.gz + sisu_2.7.5.orig.tar.gz + sisu_2.7.5-1.dsc + sisu_2.7.5-1.diff.gz + + [debian freeze, fix] + + * odf:odt + * odf, fix odt cornercase document breakage when matching and representing + " " and "&" (prior to this fix, odt for viral_spiral is broken in + sisu-markup-samples) + * shared_metadata, fix cornercase odt document breakage when matching and + representing " ", "&" and urls in metadata + %% 2.7.4.orig.tar.gz (2010-10-08:40/5) http://www.jus.uio.no/sisu/pkg/src/sisu_2.7.4.orig.tar.gz 3d36b407f7f2df7b260f0a7932adf520a0539f8578dac59c6ca6de3bbfd03e62 2743433 sisu_2.7.4.orig.tar.gz diff --git a/data/doc/sisu/v2/CHANGELOG b/data/doc/sisu/v2/CHANGELOG index 45e47ec7..6f8b3edf 100644 --- a/data/doc/sisu/v2/CHANGELOG +++ b/data/doc/sisu/v2/CHANGELOG @@ -12,6 +12,21 @@ Reverse Chronological: %% Development branch UNSTABLE +%% 2.7.5.orig.tar.gz (2010-10-08:40/5) +http://www.jus.uio.no/sisu/pkg/src/sisu_2.7.5.orig.tar.gz + sisu_2.7.5.orig.tar.gz + sisu_2.7.5-1.dsc + sisu_2.7.5-1.diff.gz + + [debian freeze, fix] + + * odf:odt + * odf, fix odt cornercase document breakage when matching and representing + " " and "&" (prior to this fix, odt for viral_spiral is broken in + sisu-markup-samples) + * shared_metadata, fix cornercase odt document breakage when matching and + representing " ", "&" and urls in metadata + %% 2.7.4.orig.tar.gz (2010-10-08:40/5) http://www.jus.uio.no/sisu/pkg/src/sisu_2.7.4.orig.tar.gz 3d36b407f7f2df7b260f0a7932adf520a0539f8578dac59c6ca6de3bbfd03e62 2743433 sisu_2.7.4.orig.tar.gz diff --git a/lib/sisu/v2/odf.rb b/lib/sisu/v2/odf.rb index 41229249..ad1f45d1 100644 --- a/lib/sisu/v2/odf.rb +++ b/lib/sisu/v2/odf.rb @@ -461,9 +461,9 @@ module SiSU_ODF word.each do |w| # _ - / # | : ! ^ ~ unless dob =~/^(?:#{Rx[:meta]}|%+ )/m w.gsub!(/&#(?:126|152);/,'~') #126 usual - if w !~/&\S{1,7};/ \ - or w =~/ / - w.gsub!(/&/,'&') #watch   + w.gsub!(/ /,' ') + if w !~/&\S{2,7}?;/ + w.gsub!(/&/,'&') end w.gsub!(/(&\S{1,7};)+&/,'\1&') #could break things end diff --git a/lib/sisu/v2/shared_metadata.rb b/lib/sisu/v2/shared_metadata.rb index 69a92070..e589c598 100644 --- a/lib/sisu/v2/shared_metadata.rb +++ b/lib/sisu/v2/shared_metadata.rb @@ -476,6 +476,18 @@ WOK if @inf.class==String @inf.gsub!(//,'>') @inf.gsub!(/<br(?: \/)?>/,'
') + if @inf =~/&/ + inf_array=[] + word=@inf.scan(/\S+|\n/) + word.each do |w| # _ - / # | : ! ^ ~ + w.gsub!(/ /,' ') + if w !~/&\S{2,7}?;/ + w.gsub!(/&/,'&') + end + inf_array << w + end + @inf=inf_array.join(' ') + end @inf.gsub!(/#{Mx[:url_o]}_(\S+?)#{Mx[:url_c]}/, '\1') #http ftp matches escaped, no decoration @inf.gsub!(/(#{Mx[:lnk_c]})#{Mx[:url_o]}(\S+?)#{Mx[:url_c]}/, @@ -484,7 +496,7 @@ WOK @inf.gsub!(/#{Mx[:url_o]}(\S+?)#{Mx[:url_c]}/, %{#{url_brace.xml_open}\\1#{url_brace.xml_close}}) #http ftp matches with decoration else - @inf.gsub!(/(https?:\/\/\S+)/, + @inf.gsub!(/(https?:\/\/[^<>'"\s]+)/, %{#{url_brace.xml_open}\\1#{url_brace.xml_close}}) #http ftp matches with decoration end @inf.gsub!(/([a-zA-Z0-9._-]+@[a-zA-Z0-9._-]+)/, -- cgit v1.2.3 From fb20770a4b7f21e6f8b2ef975b0a77eab637ff50 Mon Sep 17 00:00:00 2001 From: Ralph Amissah Date: Sat, 9 Oct 2010 22:54:08 -0400 Subject: param, metadata rights, keep colon separator from interfering with urls (+changelog) --- CHANGELOG_v2 | 2 ++ data/doc/sisu/v2/CHANGELOG | 2 ++ lib/sisu/v2/param.rb | 44 ++++++++++++++++++++++++++++++++------------ 3 files changed, 36 insertions(+), 12 deletions(-) diff --git a/CHANGELOG_v2 b/CHANGELOG_v2 index d27ff32d..fbe60bf4 100644 --- a/CHANGELOG_v2 +++ b/CHANGELOG_v2 @@ -27,6 +27,8 @@ http://www.jus.uio.no/sisu/pkg/src/sisu_2.7.5.orig.tar.gz * shared_metadata, fix cornercase odt document breakage when matching and representing " ", "&" and urls in metadata + * param, metadata rights, keep colon separator from interfering with urls + %% 2.7.4.orig.tar.gz (2010-10-08:40/5) http://www.jus.uio.no/sisu/pkg/src/sisu_2.7.4.orig.tar.gz 3d36b407f7f2df7b260f0a7932adf520a0539f8578dac59c6ca6de3bbfd03e62 2743433 sisu_2.7.4.orig.tar.gz diff --git a/data/doc/sisu/v2/CHANGELOG b/data/doc/sisu/v2/CHANGELOG index 6f8b3edf..da409f26 100644 --- a/data/doc/sisu/v2/CHANGELOG +++ b/data/doc/sisu/v2/CHANGELOG @@ -27,6 +27,8 @@ http://www.jus.uio.no/sisu/pkg/src/sisu_2.7.5.orig.tar.gz * shared_metadata, fix cornercase odt document breakage when matching and representing " ", "&" and urls in metadata + * param, metadata rights, keep colon separator from interfering with urls + %% 2.7.4.orig.tar.gz (2010-10-08:40/5) http://www.jus.uio.no/sisu/pkg/src/sisu_2.7.4.orig.tar.gz 3d36b407f7f2df7b260f0a7932adf520a0539f8578dac59c6ca6de3bbfd03e62 2743433 sisu_2.7.4.orig.tar.gz diff --git a/lib/sisu/v2/param.rb b/lib/sisu/v2/param.rb index b44a5b8e..78cad7c6 100644 --- a/lib/sisu/v2/param.rb +++ b/lib/sisu/v2/param.rb @@ -427,32 +427,52 @@ module SiSU_Param l,n=Db[:col_info_note],'rights.license' validate_length(s,l,n) end + def sep(str) + (str =~/https?:\/\/\S+$/) ? ' ;' : ';' + end def all s=if @h['all']; @h['all'] else - s=copyright.text + ';' + s='' + if defined? copyright.text \ + and copyright.text \ + and not copyright.text.empty? + v=sep(copyright.text) + s +=copyright.text + v + end if defined? copyright.translation \ - and copyright.translation - s +='
translation ' + copyright.translation + ';' + and copyright.translation \ + and not copyright.translation.empty? + v=sep(copyright.translation) + s +='
translation ' + copyright.translation + v end if defined? copyright.illustrations \ - and copyright.illustrations - s +='
illustrations ' + copyright.illustrations + ';' + and copyright.illustrations \ + and not copyright.illustrations.empty? + v=sep(copyright.illustrations) + s +='
illustrations ' + copyright.illustrations + v end if defined? copyright.photographs \ - and copyright.photographs - s +='
photographs ' + copyright.photographs + ';' + and copyright.photographs \ + and not copyright.photographs.empty? + v=sep(copyright.photographs) + s +='
photographs ' + copyright.photographs + v end if defined? copyright.digitization \ - and copyright.digitization - s +='
digitization ' + copyright.digitization + ';' + and copyright.digitization \ + and not copyright.digitization.empty? + v=sep(copyright.digitization) + s +='
digitization ' + copyright.digitization + v end if defined? copyright.audio \ - and copyright.audio - s +='
audio ' + copyright.audio + ';' + and copyright.audio \ + and not copyright.audio.empty? + v=sep(copyright.audio) + s +='
audio ' + copyright.audio + v end if defined? copyright.license \ - and copyright.license + and copyright.license \ + and not copyright.license.empty? s +='
License: ' + copyright.license end if s.empty? -- cgit v1.2.3 From 10b211ff0cd222f792c3523a5d6abf0bfcc4b578 Mon Sep 17 00:00:00 2001 From: Ralph Amissah Date: Sat, 9 Oct 2010 22:54:58 -0400 Subject: update version (2.7.5) --- data/sisu/v2/v/version.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/data/sisu/v2/v/version.yml b/data/sisu/v2/v/version.yml index adbdc2b4..a7ab11d5 100644 --- a/data/sisu/v2/v/version.yml +++ b/data/sisu/v2/v/version.yml @@ -1,5 +1,5 @@ --- -:version: 2.7.4 +:version: 2.7.5 :date_stamp: 2010w40/5 :date: "2010-10-08" :project: SiSU -- cgit v1.2.3 From 41902ef3d2d741e9b207a01b9a3a6ddba771ae47 Mon Sep 17 00:00:00 2001 From: Ralph Amissah Date: Sat, 9 Oct 2010 23:11:35 -0400 Subject: version date --- data/sisu/v2/v/version.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/data/sisu/v2/v/version.yml b/data/sisu/v2/v/version.yml index a7ab11d5..a17c3674 100644 --- a/data/sisu/v2/v/version.yml +++ b/data/sisu/v2/v/version.yml @@ -1,5 +1,5 @@ --- :version: 2.7.5 -:date_stamp: 2010w40/5 -:date: "2010-10-08" +:date_stamp: 2010w40/6 +:date: "2010-10-09" :project: SiSU -- cgit v1.2.3