diff options
| -rw-r--r-- | CHANGELOG_v2 | 19 | ||||
| -rw-r--r-- | conf/sisu/v2/version.yml | 6 | ||||
| -rw-r--r-- | data/doc/sisu/v2/CHANGELOG | 19 | ||||
| -rw-r--r-- | data/doc/sisu/v2/sisu_markup_samples/sisu_manual/sisu_download.ssi | 20 | ||||
| -rw-r--r-- | data/sisu/v1/conf/editor-syntax-etc/vim/syntax/sisu.vim | 2 | ||||
| -rw-r--r-- | data/sisu/v2/conf/editor-syntax-etc/vim/syntax/sisu.vim | 2 | ||||
| -rw-r--r-- | lib/sisu/v1/db_import.rb | 4 | ||||
| -rw-r--r-- | lib/sisu/v2/db_import.rb | 75 | ||||
| -rw-r--r-- | lib/sisu/v2/param.rb | 11 |
9 files changed, 89 insertions, 69 deletions
diff --git a/CHANGELOG_v2 b/CHANGELOG_v2 index b49cd17a..42052e3d 100644 --- a/CHANGELOG_v2 +++ b/CHANGELOG_v2 @@ -12,11 +12,24 @@ Reverse Chronological: %% Development branch UNSTABLE +%% 2.0.2.orig.tar.gz (2010-03-21:11/7) +http://www.jus.uio.no/sisu/pkg/src/sisu_2.0.2.orig.tar.gz + sisu_2.0.2.orig.tar.gz + sisu_2.0.2-1.dsc + sisu_2.0.2-1.diff.gz + + * bug fixes + param, recommended links (reinstated) + db_import, special character escape special endnote content + + * vim syntax highlighter, sisu v2 & v1 version and date headers + updated/corrected + %% 2.0.1.orig.tar.gz (2010-03-17:11/3) http://www.jus.uio.no/sisu/pkg/src/sisu_2.0.1.orig.tar.gz - sisu_2.0.1.orig.tar.gz - sisu_2.0.1-1.dsc - sisu_2.0.1-1.diff.gz + 364b65b99376303c8bb90e0b8e6709d5b11277280c8fc57d69a71b459f279d06 2736627 sisu_2.0.1.orig.tar.gz + 7b6eb6a962b3120f0e0820fecae7ef0ceadd4ef510719727b63e70f7ae2a323c 1145 sisu_2.0.1-1.dsc + b89c5cb02f3c027590e24976f1d5f8254c1f64b9f7e021ccc6042a1ba3cbe8f2 275341 sisu_2.0.1-1.diff.gz * bug fixes * html, tables fix diff --git a/conf/sisu/v2/version.yml b/conf/sisu/v2/version.yml index 8b856e61..b0312a0b 100644 --- a/conf/sisu/v2/version.yml +++ b/conf/sisu/v2/version.yml @@ -1,5 +1,5 @@ --- -:version: 2.0.1 -:date_stamp: 2010w11/3 -:date: "2010-03-17" +:version: 2.0.2 +:date_stamp: 2010w11/7 +:date: "2010-03-21" :project: SiSU diff --git a/data/doc/sisu/v2/CHANGELOG b/data/doc/sisu/v2/CHANGELOG index b49cd17a..42052e3d 100644 --- a/data/doc/sisu/v2/CHANGELOG +++ b/data/doc/sisu/v2/CHANGELOG @@ -12,11 +12,24 @@ Reverse Chronological: %% Development branch UNSTABLE +%% 2.0.2.orig.tar.gz (2010-03-21:11/7) +http://www.jus.uio.no/sisu/pkg/src/sisu_2.0.2.orig.tar.gz + sisu_2.0.2.orig.tar.gz + sisu_2.0.2-1.dsc + sisu_2.0.2-1.diff.gz + + * bug fixes + param, recommended links (reinstated) + db_import, special character escape special endnote content + + * vim syntax highlighter, sisu v2 & v1 version and date headers + updated/corrected + %% 2.0.1.orig.tar.gz (2010-03-17:11/3) http://www.jus.uio.no/sisu/pkg/src/sisu_2.0.1.orig.tar.gz - sisu_2.0.1.orig.tar.gz - sisu_2.0.1-1.dsc - sisu_2.0.1-1.diff.gz + 364b65b99376303c8bb90e0b8e6709d5b11277280c8fc57d69a71b459f279d06 2736627 sisu_2.0.1.orig.tar.gz + 7b6eb6a962b3120f0e0820fecae7ef0ceadd4ef510719727b63e70f7ae2a323c 1145 sisu_2.0.1-1.dsc + b89c5cb02f3c027590e24976f1d5f8254c1f64b9f7e021ccc6042a1ba3cbe8f2 275341 sisu_2.0.1-1.diff.gz * bug fixes * html, tables fix diff --git a/data/doc/sisu/v2/sisu_markup_samples/sisu_manual/sisu_download.ssi b/data/doc/sisu/v2/sisu_markup_samples/sisu_manual/sisu_download.ssi index 43cf0864..15517daa 100644 --- a/data/doc/sisu/v2/sisu_markup_samples/sisu_manual/sisu_download.ssi +++ b/data/doc/sisu/v2/sisu_markup_samples/sisu_manual/sisu_download.ssi @@ -57,7 +57,7 @@ Download the latest version of SiSU (and SiSU markup samples):~{ Breakage and Fixes Report<br> http://www.jus.uio.no/sisu/SiSU/breakage_and_fixes.html }~ -_* {~^ sisu_2.0.1.orig.tar.gz (of 2010-03-17:11/3) }http://www.jus.uio.no/sisu/pkg/src/sisu_2.0.1.orig.tar.gz +_* {~^ sisu_2.0.2.orig.tar.gz (of 2010-03-21:11/7) }http://www.jus.uio.no/sisu/pkg/src/sisu_2.0.2.orig.tar.gz _* {~^ sisu-markup-samples_1.0.10.orig.tar.gz (of 2008-10-09:40/4 ) }http://www.jus.uio.no/sisu/pkg/src/sisu-markup-samples_1.0.10.orig.tar.gz ~{ <br>1e769b5c2c2d6135c3f5a14ede1d019f77588c7024168c756c7093510145c7dc 3442966 }~ *~sisu-markup-samples @@ -104,11 +104,11 @@ group{ *{Source}* -{~^ sisu_2.0.1.orig.tar.gz }http://www.jus.uio.no/sisu/pkg/src/sisu_2.0.1.orig.tar.gz +{~^ sisu_2.0.2.orig.tar.gz }http://www.jus.uio.no/sisu/pkg/src/sisu_2.0.2.orig.tar.gz -{~^ sisu_2.0.1-1.diff.gz }http://www.jus.uio.no/sisu/pkg/src/sisu_2.0.1-1.diff.gz +{~^ sisu_2.0.2-1.diff.gz }http://www.jus.uio.no/sisu/pkg/src/sisu_2.0.2-1.diff.gz -{~^ sisu_2.0.1-1.dsc }http://www.jus.uio.no/sisu/pkg/src/sisu_2.0.1-1.dsc +{~^ sisu_2.0.2-1.dsc }http://www.jus.uio.no/sisu/pkg/src/sisu_2.0.2-1.dsc }group @@ -116,15 +116,15 @@ group{ *{Debs}* -{~^ sisu_2.0.1-1_all.deb }http://www.jus.uio.no/sisu/archive/pool/main/s/sisu/sisu_2.0.1-1_all.deb ~{ <br>sisu, the base code, (the main package on which the others depend), without any dependencies other than ruby (and for convenience the ruby webrick web server), this generates a number of types of output on its own, other packages provide additional functionality, and have their dependencies <br>Depends: ruby (>=1.8.2), libwebrick-ruby<br>Recommends: sisu-pdf, sisu-sqlite, sisu-postgresql, sisu-examples, vim-sisu, librmagick-ruby, trang, tidy, libtidy, librexml-ruby, zip, unzip, openssl }~ +{~^ sisu_2.0.2-1_all.deb }http://www.jus.uio.no/sisu/archive/pool/main/s/sisu/sisu_2.0.2-1_all.deb ~{ <br>sisu, the base code, (the main package on which the others depend), without any dependencies other than ruby (and for convenience the ruby webrick web server), this generates a number of types of output on its own, other packages provide additional functionality, and have their dependencies <br>Depends: ruby (>=1.8.2), libwebrick-ruby<br>Recommends: sisu-pdf, sisu-sqlite, sisu-postgresql, sisu-examples, vim-sisu, librmagick-ruby, trang, tidy, libtidy, librexml-ruby, zip, unzip, openssl }~ -{~^ sisu-complete_2.0.1-1_all.deb }http://www.jus.uio.no/sisu/archive/pool/main/s/sisu/sisu-complete_2.0.1-1_all.deb ~{ <br>a package that pulls in other packages to build the whole of sisu (excluding sisu-examples) <br>Depends: ruby (>=1.8.2), sisu, sisu-pdf, sisu-postgresql, sisu-remote, sisu-sqlite, vim-sisu<br>Recommends: sisu-examples }~ +{~^ sisu-complete_2.0.2-1_all.deb }http://www.jus.uio.no/sisu/archive/pool/main/s/sisu/sisu-complete_2.0.2-1_all.deb ~{ <br>a package that pulls in other packages to build the whole of sisu (excluding sisu-examples) <br>Depends: ruby (>=1.8.2), sisu, sisu-pdf, sisu-postgresql, sisu-remote, sisu-sqlite, vim-sisu<br>Recommends: sisu-examples }~ -{~^ sisu-pdf_2.0.1-1_all.deb }http://www.jus.uio.no/sisu/archive/pool/main/s/sisu/sisu-pdf_2.0.1-1_all.deb ~{ <br>dependencies used by sisu to produce pdf from LaTeX generated <br>Depends: sisu, tetex-bin, tetex-extra, latex-ucs<br>Suggests: evince, xpdf }~ +{~^ sisu-pdf_2.0.2-1_all.deb }http://www.jus.uio.no/sisu/archive/pool/main/s/sisu/sisu-pdf_2.0.2-1_all.deb ~{ <br>dependencies used by sisu to produce pdf from LaTeX generated <br>Depends: sisu, tetex-bin, tetex-extra, latex-ucs<br>Suggests: evince, xpdf }~ -{~^ sisu-postgresql_2.0.1-1_all.deb }http://www.jus.uio.no/sisu/archive/pool/main/s/sisu/sisu-postgresql_2.0.1-1_all.deb ~{ <br>dependencies used by sisu to populate postgresql database (further configuration is necessary) <br>Depends: sisu, postgresql-8.1, libdbi-ruby, libdbm-ruby, libdbd-pg-ruby<br>Suggests: pgaccess, libdbd-pgsql, postgresql-contrib-8.1 }~ +{~^ sisu-postgresql_2.0.2-1_all.deb }http://www.jus.uio.no/sisu/archive/pool/main/s/sisu/sisu-postgresql_2.0.2-1_all.deb ~{ <br>dependencies used by sisu to populate postgresql database (further configuration is necessary) <br>Depends: sisu, postgresql-8.1, libdbi-ruby, libdbm-ruby, libdbd-pg-ruby<br>Suggests: pgaccess, libdbd-pgsql, postgresql-contrib-8.1 }~ -{~^ sisu-sqlite_2.0.1-1_all.deb }http://www.jus.uio.no/sisu/archive/pool/main/s/sisu/sisu-sqlite_2.0.1-1_all.deb ~{ <br>dependencies used by sisu to populate sqlite database <br>Depends: sisu, sqlite, libdbi-ruby, libdbm-ruby, libdbd-sqlite-ruby<br>Suggests: libdbd-sqlite }~ +{~^ sisu-sqlite_2.0.2-1_all.deb }http://www.jus.uio.no/sisu/archive/pool/main/s/sisu/sisu-sqlite_2.0.2-1_all.deb ~{ <br>dependencies used by sisu to populate sqlite database <br>Depends: sisu, sqlite, libdbi-ruby, libdbm-ruby, libdbd-sqlite-ruby<br>Suggests: libdbd-sqlite }~ }group @@ -154,7 +154,7 @@ The RPM is generated from the source file using Alien.~{ http://www.kitenet.net/ sudo rpm -i [package name] -_* {~^ sisu-2.0.1-2.noarch.rpm }http://www.jus.uio.no/sisu/pkg/rpm/sisu-2.0.1-2.noarch.rpm ~{ <br>created using alien }~ +_* {~^ sisu-2.0.2-2.noarch.rpm }http://www.jus.uio.no/sisu/pkg/rpm/sisu-2.0.2-2.noarch.rpm ~{ <br>created using alien }~ _* {~^ sisu-markup-samples_1.0.10.orig-2.noarch.rpm }http://www.jus.uio.no/sisu/pkg/rpm/sisu-markup-samples_1.0.6.orig-2.noarch.rpm ~{ <br> http://www.jus.uio.no/sisu/archive/pool/non-free/s/sisu-markup-samples/sisu-markup-samples_1.0.10-1_all.deb <br> created using: alien -r sisu_0.70.5-1_all.deb }~ diff --git a/data/sisu/v1/conf/editor-syntax-etc/vim/syntax/sisu.vim b/data/sisu/v1/conf/editor-syntax-etc/vim/syntax/sisu.vim index fd570fa7..5b02f345 100644 --- a/data/sisu/v1/conf/editor-syntax-etc/vim/syntax/sisu.vim +++ b/data/sisu/v1/conf/editor-syntax-etc/vim/syntax/sisu.vim @@ -1,6 +1,6 @@ "SiSU Vim syntax file "SiSU Maintainer: Ralph Amissah <ralph@amissah.com> -"SiSU Markup: SiSU (sisu-0.69.0, 2008-09-16) +"SiSU Markup: SiSU (sisu-1.0.0, 2009-12-21) "(originally looked at Ruby Vim by Mirko Nasato) if version < 600 diff --git a/data/sisu/v2/conf/editor-syntax-etc/vim/syntax/sisu.vim b/data/sisu/v2/conf/editor-syntax-etc/vim/syntax/sisu.vim index d1b1fcc6..6944782f 100644 --- a/data/sisu/v2/conf/editor-syntax-etc/vim/syntax/sisu.vim +++ b/data/sisu/v2/conf/editor-syntax-etc/vim/syntax/sisu.vim @@ -1,6 +1,6 @@ "SiSU Vim syntax file "SiSU Maintainer: Ralph Amissah <ralph@amissah.com> -"SiSU Markup: SiSU (sisu-0.72.0, 2009-09-30) +"SiSU Markup: SiSU (sisu-2.0.1, 2010-03-17) "(originally looked at Ruby Vim by Mirko Nasato) if version < 600 diff --git a/lib/sisu/v1/db_import.rb b/lib/sisu/v1/db_import.rb index 7e96d7d5..036f446e 100644 --- a/lib/sisu/v1/db_import.rb +++ b/lib/sisu/v1/db_import.rb @@ -912,8 +912,8 @@ module SiSU_DB_import or (@opt.cmd=~/e/ and FileTest.file?("#{out}/#@fnb/#{@opt.fns}.tgz")==true) f[:sisupod],u[:sisupod]='sisupod,', "'#{base}/#@fnb/#{@opt.fns}.tgz'," end - t=SiSU_DB_tuple::Load_urls.new(@conn,f,u,@@id_t,@opt,@file) - tuple=t.tuple + t=SiSU_DB_tuple::Load_urls.new(@conn,f,u,@@id_t,@opt,@file) + tuple=t.tuple rescue; SiSU_Errors::Info_error.new($!,$@,@opt.cmd,@opt.fns).error ensure end diff --git a/lib/sisu/v2/db_import.rb b/lib/sisu/v2/db_import.rb index c2ce648c..e5c05040 100644 --- a/lib/sisu/v2/db_import.rb +++ b/lib/sisu/v2/db_import.rb @@ -126,7 +126,7 @@ module SiSU_DB_import end if (@sql_type!~/sqlite/ and not file_exist) \ or @sql_type=~/sqlite/ - t_d=[] # transaction_data + t_d=[] # transaction_data t_d << db_import_metadata t_d << db_import_documents(@dal_array) t_d << db_import_urls(@dal_array,@fnc) #import OID on/off @@ -199,6 +199,7 @@ module SiSU_DB_import str.gsub!(/#{Mx[:lnk_o]}\s*(\S+?\.(?:png|jpg))(?:\s+\d+x\d+)?(.+?)#{Mx[:lnk_c]}\S+/,'[image: \1] \2') str.gsub!(/#{Mx[:lnk_o]}\s*(.+?)\s*#{Mx[:lnk_c]}(?:file|ftp):\/\/\S+?([.,!?]?(?:\s|$))/,'\1\2') str.gsub!(/#{Mx[:lnk_o]}\s*(.+?)\s*#{Mx[:lnk_c]}#{Mx[:url_o]}\S+?#{Mx[:url_c]}/,'\1') + str end def strip_markup(str) #define rules, make same as in dal clean str.gsub!(/#{Mx[:fa_superscript_o]}(\d+)#{Mx[:fa_superscript_c]}/,'[\1]') @@ -211,6 +212,7 @@ module SiSU_DB_import str.gsub!(/#{Mx[:lnk_o]}.+?\.(?:png|jpg|gif).+?#{Mx[:lnk_c]}#{Mx[:url_o]}\S+?#{Mx[:url_c]}/,' [image]') # else image names found in search str.gsub!(/\s\s+/,' ') str.strip! + str end def pf_db_import_transaction_open end @@ -460,10 +462,8 @@ module SiSU_DB_import def db_import_documents(dal_array) #% import documents - populate main database table, import into substantive database tables (tuple) begin @col[:tid]=@@id_t - @en,@en_ast,@en_pls=[],[],[] - @col[:en_a]=nil - @col[:en_z]=nil - @tuple_array=[] + @en,@en_ast,@en_pls,@tuple_array=[],[],[],[] + @col[:en_a],@col[:en_z]=nil,nil dal_array.each do |data| data.obj.gsub!(/#{Mx[:fa_bold_o]}(.+?)#{Mx[:fa_bold_c]}/,'\1') data.obj.gsub!(/#{Mx[:fa_italics_o]}(.+?)#{Mx[:fa_italics_c]}/,'\1') @@ -633,8 +633,8 @@ module SiSU_DB_import @en_a_plus,@en_z_plus=@en_pls[0].first,@en_pls[0].last if @en_pls[0] @col[:body]=if data.is=='table' SiSU_Format_Shared::CSS_Format.new(@md,data).html_table - elsif defined? data.indent and data.indent =~/[1-9]/ - SiSU_Format_Shared::CSS_Format.new(@md,data).indent(data.indent) + elsif defined? data.indent and data.indent =~/[1-9]/ + SiSU_Format_Shared::CSS_Format.new(@md,data).indent(data.indent) else SiSU_Format_Shared::CSS_Format.new(@md,data).norm end @@ -655,9 +655,10 @@ module SiSU_DB_import nr,txt,digest_clean=$1,$2.strip,0 end @id_n+=1 - body=SiSU_Format_Shared::CSS_Format.new(@md,data).endnote(nr,txt) - special_character_escape(body) special_character_escape(txt) + body=SiSU_Format_Shared::CSS_Format.new(@md,data).endnote(nr,txt) + #special_character_escape(body) + #special_character_escape(txt) strip_markup(txt) if txt.size > (endnote_clean - 1) puts "\n\nTOO LARGE (ENDNOTE - see error log)\n\n" @@ -694,8 +695,8 @@ module SiSU_DB_import nr,txt,digest_clean=$1,$2.strip,0 end @id_n+=1 - body=SiSU_Format_Shared::CSS_Format.new(@md,data).endnote(nr,txt) special_character_escape(txt) + body=SiSU_Format_Shared::CSS_Format.new(@md,data).endnote(nr,txt) strip_markup(txt) if txt.size > (endnote_clean - 1) puts "\n\nTOO LARGE (ENDNOTE - see error log)\n\n" @@ -732,8 +733,8 @@ module SiSU_DB_import nr,txt,digest_clean=$1,$2.strip,0 end @id_n+=1 - body=SiSU_Format_Shared::CSS_Format.new(@md,data).endnote(nr,txt) special_character_escape(txt) + body=SiSU_Format_Shared::CSS_Format.new(@md,data).endnote(nr,txt) strip_markup(txt) if txt.size > (endnote_clean - 1) puts "\n\nTOO LARGE (ENDNOTE - see error log)\n\n" @@ -825,72 +826,56 @@ module SiSU_DB_import or @fnb.nil? p 'file output path error' #remove end - if @opt.cmd !~/e/ \ - or (@opt.cmd=~/e/ and FileTest.file?("#{out}/#{@fnb}/#{@md.fn[:plain]}")==true) + if FileTest.file?("#{out}/#{@fnb}/#{@md.fn[:plain]}")==true f[:txt],u[:txt]='plaintext,', "'#{base}/#{@fnb}/#{@md.fn[:plain]}'," end - if @opt.cmd !~/e/ \ - or (@opt.cmd=~/e/ and FileTest.file?("#{out}/#{@fnb}/#{@md.fn[:toc]}")==true) + if FileTest.file?("#{out}/#{@fnb}/#{@md.fn[:toc]}")==true f[:html_toc],u[:html_toc]='html_toc,', "'#{base}/#{@fnb}/#{@md.fn[:toc]}'," end - if @opt.cmd !~/e/ \ - or (@opt.cmd=~/e/ and FileTest.file?("#{out}/#{@fnb}/#{@md.fn[:doc]}")==true) + if FileTest.file?("#{out}/#{@fnb}/#{@md.fn[:doc]}")==true f[:html_doc],u[:html_doc]='html_doc,', "'#{base}/#{@fnb}/#{@md.fn[:doc]}'," end - if @opt.cmd !~/e/ \ - or (@opt.cmd=~/e/ and FileTest.file?("#{out}/#{@fnb}/#{@md.fn[:xhtml]}")==true) + if FileTest.file?("#{out}/#{@fnb}/#{@md.fn[:xhtml]}")==true f[:xhtml],u[:xhtml]='xhtml,', "'#{base}/#{@fnb}/#{@md.fn[:xhtml]}'," end - if @opt.cmd !~/e/ \ - or (@opt.cmd=~/e/ and FileTest.file?("#{out}/#{@fnb}/#{@md.fn[:sax]}")==true) + if FileTest.file?("#{out}/#{@fnb}/#{@md.fn[:sax]}")==true f[:xml_sax],u[:xml_sax]='xml_sax,', "'#{base}/#{@fnb}/#{@md.fn[:sax]}'," end - if @opt.cmd !~/e/ \ - or (@opt.cmd=~/e/ and FileTest.file?("#{out}/#{@fnb}/#{@md.fn[:dom]}")==true) + if FileTest.file?("#{out}/#{@fnb}/#{@md.fn[:dom]}")==true f[:xml_dom],u[:xml_dom]='xml_dom,', "'#{base}/#{@fnb}/#{@md.fn[:dom]}'," end - if @opt.cmd !~/e/ \ - or (@opt.cmd=~/e/ and FileTest.file?("#{out}/#{@fnb}/#{@md.fn[:odf]}")==true) + if FileTest.file?("#{out}/#{@fnb}/#{@md.fn[:odf]}")==true f[:odf],u[:odf]='odf,', "'#{base}/#{@fnb}/#{@md.fn[:odf]}'," end - if @opt.cmd !~/e/ \ - or (@opt.cmd=~/e/ and FileTest.file?("#{out}/#{@fnb}/#{@md.fn[:pdf_p]}")==true) + if FileTest.file?("#{out}/#{@fnb}/#{@md.fn[:pdf_p]}")==true f[:pdf_p],u[:pdf_p]='pdf_p,', "'#{base}/#{@fnb}/#{@md.fn[:pdf_p]}'," end - if @opt.cmd !~/e/ \ - or (@opt.cmd=~/e/ and FileTest.file?("#{out}/#{@fnb}/#{@md.fn[:pdf_l]}")==true) + if FileTest.file?("#{out}/#{@fnb}/#{@md.fn[:pdf_l]}")==true f[:pdf_l],u[:pdf_l]='pdf_l,', "'#{base}/#{@fnb}/#{@md.fn[:pdf_l]}'," end - if @opt.cmd !~/e/ \ - or (@opt.cmd=~/e/ and FileTest.file?("#{out}/#{@fnb}/#{@md.fn[:concordance]}")==true) + if FileTest.file?("#{out}/#{@fnb}/#{@md.fn[:concordance]}")==true f[:concordance],u[:concordance]='concordance,', "'#{base}/#{@fnb}/#{@md.fn[:concordance]}'," end - if @opt.cmd !~/e/ \ - or (@opt.cmd=~/e/ and FileTest.file?("#{out}/#{@fnb}/#{@opt.fns}.tex")==true) + if FileTest.file?("#{out}/#{@fnb}/#{@opt.fns}.tex")==true f[:latex_p],u[:latex_p]='latex_p,', "'#{base}/#{@fnb}/#{@opt.fns}.tex'," end - if @opt.cmd !~/e/ \ - or (@opt.cmd=~/e/ and FileTest.file?("#{out}/#{@fnb}/#{@opt.fns}.landscape.tex")==true) + if FileTest.file?("#{out}/#{@fnb}/#{@opt.fns}.landscape.tex")==true f[:latex_l],u[:latex_l]='latex_l,', "'#{base}/#{@fnb}/#{@opt}.fns}.landscape.tex'," end - if @opt.cmd !~/e/ \ - or (@opt.cmd=~/e/ and FileTest.file?("#{out}/#{@fnb}/#{@md.fn[:digest]}")==true) + if FileTest.file?("#{out}/#{@fnb}/#{@md.fn[:digest]}")==true f[:digest],u[:digest]='digest,', "'#{base}/#{@fnb}/#{@md.fn[:digest]}'," end - if @opt.cmd !~/e/ \ - or (@opt.cmd=~/e/ and FileTest.file?("#{out}/#{@fnb}/#{@md.fn[:manifest]}")==true) #revisit, was to be text, this is html + if FileTest.file?("#{out}/#{@fnb}/#{@md.fn[:manifest]}")==true #revisit, was to be text, this is html f[:manifest],u[:manifest]='manifest,', "'#{base}/#{@fnb}/#{@md.fn[:manifest]}'," end - if @opt.cmd !~/e/ \ - or (@opt.cmd=~/e/ and FileTest.file?("#{out}/#{@fnb}/#{@opt.fns}.meta")==true) + if FileTest.file?("#{out}/#{@fnb}/#{@opt.fns}.meta")==true f[:markup],u[:markup]='markup,', "'#{base}/#{@fnb}/#{@opt.fns}.meta'," end - if @opt.cmd !~/e/ \ - or (@opt.cmd=~/e/ and FileTest.file?("#{out}/#{@fnb}/#{@opt.fns}.tgz")==true) + if FileTest.file?("#{out}/#{@fnb}/#{@opt.fns}.tgz")==true f[:sisupod],u[:sisupod]='sisupod,', "'#{base}/#{@fnb}/#{@opt.fns}.tgz'," end - t=SiSU_DB_tuple::Load_urls.new(@conn,f,u,@@id_t,@opt,@file) - tuple=t.tuple + t=SiSU_DB_tuple::Load_urls.new(@conn,f,u,@@id_t,@opt,@file) + tuple=t.tuple rescue; SiSU_Errors::Info_error.new($!,$@,@opt.cmd,@opt.fns).error ensure end diff --git a/lib/sisu/v2/param.rb b/lib/sisu/v2/param.rb index f5085d50..9d1f03e9 100644 --- a/lib/sisu/v2/param.rb +++ b/lib/sisu/v2/param.rb @@ -798,7 +798,16 @@ module SiSU_Param @man_section=(defined? @make.manpage.section) ? @make.manpage.section : 1 end when /^@links:\s+(.+?)\Z/m #% processing - Md.new($1.strip).links + doc_links=Md.new($1.strip).links + count=1 + @lnk=[] + doc_links.each do |doc_link| + if doc_link=~/\{.+?\}(?:(?:https?|file|ftp):\/|\.\.)\/\S+(?:\s|$)/ + @lnk[count]={} + @lnk[count][:say],@lnk[count][:url]=/\{\s*(.+?)\s*\}((?:(?:https?|file|ftp):\/|\.\.)\/\S+)/im.match(doc_link)[1,2] + count +=1 + end + end when /^@notes?:\s(.+)/ #% metainfo Md.new($1.strip).notes when /^@base_program:\s+(.+?)$/; @base_program=$1 #% processing |