diff options
Diffstat (limited to 'lib/sisu')
| -rw-r--r-- | lib/sisu/v2/dal_syntax.rb | 2 | ||||
| -rw-r--r-- | lib/sisu/v2/hub.rb | 5 | ||||
| -rw-r--r-- | lib/sisu/v2/sysenv.rb | 8 | ||||
| -rw-r--r-- | lib/sisu/v2/urls.rb | 11 |
4 files changed, 11 insertions, 15 deletions
diff --git a/lib/sisu/v2/dal_syntax.rb b/lib/sisu/v2/dal_syntax.rb index 2b1da084..c34104c7 100644 --- a/lib/sisu/v2/dal_syntax.rb +++ b/lib/sisu/v2/dal_syntax.rb @@ -358,7 +358,7 @@ module SiSU_Syntax "\\1#{@emph[:o]}\\2#{@emph[:c]}") #emphasis dob.obj.gsub!(/(^|#{Mx[:gl_c]}|\s+|['"]|#{Mx[:nbsp]}|#{Mx[:fa_o_c]}|#{Mx[:fa_c]}|#{Mx[:lnk_o]}|#{Mx[:br_line]}|#{Mx[:br_paragraph]}|[\(\[\{]|\>)!\{(.+?)\}!/, "\\1#{Mx[:fa_bold_o]}\\2#{Mx[:fa_bold_c]}") #bold - dob.obj.gsub!(/(^|#{Mx[:gl_c]}|\s+|['"]|#{Mx[:nbsp]}|#{Mx[:fa_o_c]}|#{Mx[:fa_c]}|#{Mx[:lnk_o]}|#{Mx[:br_line]}|#{Mx[:br_paragraph]}|[\(\[]|\(|\>)\/\{(.+?)\}\//, + dob.obj.gsub!(/(^|#{Mx[:gl_c]}|\s+|['"]|#{Mx[:nbsp]}|#{Mx[:fa_o_c]}|#{Mx[:fa_c]}|#{Mx[:lnk_o]}|#{Mx[:br_line]}|#{Mx[:br_paragraph]}|[\(\[\{]|\(|\>)\/\{(.+?)\}\//, "\\1#{Mx[:fa_italics_o]}\\2#{Mx[:fa_italics_c]}") #italics dob.obj.gsub!(/(^|#{Mx[:gl_c]}|\s+|['"]|#{Mx[:nbsp]}|#{Mx[:fa_o_c]}|#{Mx[:fa_c]}|#{Mx[:lnk_o]}|#{Mx[:br_line]}|#{Mx[:br_paragraph]}|[\(\[\{]|\>)_\{(.+?)\}_/, "\\1#{Mx[:fa_underscore_o]}\\2#{Mx[:fa_underscore_c]}") #underscore diff --git a/lib/sisu/v2/hub.rb b/lib/sisu/v2/hub.rb index bab13ed1..b182a31e 100644 --- a/lib/sisu/v2/hub.rb +++ b/lib/sisu/v2/hub.rb @@ -484,9 +484,8 @@ p "here #{__FILE__} #{__LINE__}" if @opt =~/M/ end else end - unless @opt.cmd =~/[q]/; op('urls','urls') #% unless -q - end - @msg,@msgs="\tsisu -W [to start ruby web-server on output directory]\n",nil + op('urls','urls') + @msg,@msgs="\tsisu -W [to start ruby web-server on output directory]\n",nil unless @opt.cmd =~/q/ @tell.call.print_brown if @opt.cmd =~/[uUvVM]/ unless @opt.files.join.empty? if defined? @@env.path.processing \ and FileTest.directory?(@@env.path.processing) \ diff --git a/lib/sisu/v2/sysenv.rb b/lib/sisu/v2/sysenv.rb index cc21a6c9..f11cdcbd 100644 --- a/lib/sisu/v2/sysenv.rb +++ b/lib/sisu/v2/sysenv.rb @@ -200,7 +200,7 @@ module SiSU_Env LANGUAGE_CODE => 'en', #change, unecessary duplication though currently used MULTILINGUAL => true, CONCORD_MAX => 260000, - DIGEST => 'md5', + DIGEST => 'sha256', WEBSERV_HOST_CGI => ' http://localhost', WEBSERV_PORT_CGI => 8081, #8111,8123,8081 POSTGRESQL_USER => @@user, #'ralph', # change user !!! @@ -1900,16 +1900,16 @@ WOK case @rc['default']['digest'] when /^sha(?:2|256)?$/; 'sha256' when /^md5$/; 'md5' - else 'md5' + else 'sha256' end - else 'md5' + else 'sha256' end end def length case digest.type when /sha256/; 64 when /md5/; 32 - else 32 + else 64 end end def pattern diff --git a/lib/sisu/v2/urls.rb b/lib/sisu/v2/urls.rb index fd88f1ac..56b93a78 100644 --- a/lib/sisu/v2/urls.rb +++ b/lib/sisu/v2/urls.rb @@ -123,8 +123,7 @@ module SiSU_urls end def songsheet begin - urls_all if @opt.cmd=~/U/ - urls_select unless @opt.cmd=~/q/ + @opt.cmd=~/U/ ? urls_all : (urls_select unless @opt.cmd=~/q/) rescue; SiSU_Errors::Info_error.new($!,$@,@opt.cmd,@opt.fns).error ensure end @@ -248,10 +247,8 @@ module SiSU_urls end end def urls_all - if @opt.cmd =~/[MVv]/ - SiSU_Screen::Ansi.new(@opt.cmd,'URLs').grey_title_hi - SiSU_Screen::Ansi.new(@opt.cmd,@opt.fns,"#{@env.path.output}/#{@fnb}").flow - end + i="(output manifest) #{@env.url.output_tell}/#{@fnb}/sisu_manifest.html" + SiSU_Screen::Ansi.new(@opt.cmd,'URLs',i).grey_title_hi @u.each do |x,y| tell=case x when /^m/ @@ -268,7 +265,7 @@ module SiSU_urls when /^i/ SiSU_Screen::Ansi.new(@opt.cmd,"-#{x}","#{@prog.manpage_generator} #{@env.path.manpage}/#{@fnb}.1 |most") end - if @opt.cmd =~/[MVv]/ + unless @opt.cmd =~/q/ tellx.result if tellx tell.result if tell end |