v5: merge v6 to v5, version bump to 5.4.*, reason adds structure checksisu_5.4.0

* ao, document structure check, stop processing on major error
  (with error message & text at location of failure)
  [reason for version bump the addition of structure check]
* utils, add ok code marker
* ao, heading with no ocn, distinguish ~# from -#
  * ~# is general & means no ocn (for any object to which it is applied)
  * -# is relevant only for 1~ dummy headings & instructs that they should be
    removed from output where possible
  * applied so far to pdf, odt & plaintext
* ao_images, reduce warnings when ruby RMagic absent as program used directly
  * reduced dependency on ruby RMagic library (as some time way back had
    issues)
* ao, document markup structure check, skip processing file on major error
  * with error message & text at location of failure
* texpdf, urls in creator cause breakage
* texpdf, mailto markup links set for normal text objects
* texpdf, '&' in heading breaks toc (now removed from toc (not heading)), bug
  * revisit, bug
* texpdf, for urls switch to sans serif (small fontsize)
  * instead of typewriter, latex default
* texpdf, pdf colored hyperlinks configurable
  * --pdf-hyperlinks-color
    --pdf-hyperlinks-no-color or --pdf-hyperlinks-monochrome
  * ['default']['pdf_hyperlinks']='color'
    (other options switch hyperlink color off 'no-color' 'color-off'
    'monochrome')
* texpdf, pdf default font size configurable (cli & sisurc.yml) (no fractions)
  * --pdf-fontsize-12 --pdf-fontsize-8
  * default:
    texpdf_fontsize: 12
* texpdf, headings and table of contents representation
  * fixes 1~ and 2~ result in the same formatting
    1~ 2~ & 3~ now differentiated, see discussion in sisu.org under #744383
  * fixes :A smaller formatted than :B
    A~ B~ C~ now the same size, see discussion in sisu.org under #744383
  * :B and :C result in the same formatting, issue explained see sisu.org
* texpdf, (internal coding) fontface, rename texpdf_font texpdf_fontface
* texpdf, (internal coding) use symbols to identify page orientation
* param, metadata rights, line-breaks instead of semicolons separating rights
  * fixes remove trailing semicolon after :copyright:
* digests sha512 option implemented
  * options sha512 sha256 md5
  * command line --sha512
  * rcconf.yml ['defsault']['digest'] = sha512
* xml object citation numbering (docbook fictionbook)

1 files changed, 4 insertions, 9 deletions

diff --git a/lib/sisu/v5/cgi_pgsql.rb b/lib/sisu/v5/cgi_pgsql.rb
index 6c4385e4..1ab04316 100644
--- a/lib/sisu/v5/cgi_pgsql.rb
+++ b/lib/sisu/v5/cgi_pgsql.rb
@@ -82,16 +82,15 @@ module  SiSU_CGI_PgSQL
         opt.lingual.to_s
       else 'multi'
       end
-      if defined? @rc['search'] \
+      @name_of[:db]=if defined? @rc['search'] \
       and defined? @rc['search']['sisu'] \
       and defined? @rc['search']['sisu']['action'] \
       and @rc['search']['sisu']['action'] =~/https?:\/\/\S+?\.cgi/ \
       and defined? @rc['search']['sisu']['db'] \
       and @rc['search']['sisu']['db'] =~/\S+/
-        @name_of[:db]=@rc['search']['sisu']['db']
+        @rc['search']['sisu']['db']
       else
-        @name_of[:db]=@env.path.stub_pwd #'sisu' #breaks if not present
-        false
+        @env.path.stub_pwd #'sisu' #breaks if not present
       end
       @name_of[:host_url_cgi]=%q{http://#{ENV['HTTP_HOST']}#{ENV['PATH_INFO']}}
       @name_of[:host_url_docs]=%q{http://#{ENV['HTTP_HOST']}}
@@ -128,10 +127,6 @@ module  SiSU_CGI_PgSQL
             default database name:     #{@cX.green}#{Db[:name_prefix]}#{@name_of[:db]}#{@cX.off} (#{@name_of[:db]})
             db user:                   #{@cX.green}#{@name_of[:user]}#{@cX.off}
               to modify use:           #{@cX.brown}sisu --db-pg --db-user='#{@name_of[:user]}'#{@cX.off}
-            to create static cgi & db host use: #{@cX.brown}sisu --db-pg --webserv-search='#{@name_of[:host_url_cgi]}'#{@cX.off}
-            for static location for sisu output use: #{@cX.brown}sisu --db-pg --webserv-output='#{@name_of[:host_url_docs]}'#{@cX.off}
-            for static cgi search form link name use: #{@cX.brown}sisu --db-pg --cgi-search-form-name='#{@name_of[:cgi_script]}'#{@cX.off}
-            #{@cX.fuchsia}(settings priority: command line; sisurc.yml; else defaults)#{@cX.off}
 
             #{@cX.fuchsia}BASED ON ALREADY EXISTING databases#{@cX.off} (default database name: #{@db.psql.db})
             NOTE it is first necessary to createdb,
@@ -153,7 +148,7 @@ module  SiSU_CGI_PgSQL
             sisu --pg --dropall                              # removes existing postgresql db & tables
             sisu --pg --createall -v                         # creates postgresql db & tables
             sisu --pg --update -v *.sst  *.ssm               # populate the db
-            sisu --sample-search-form --pg                   # creates the postgresql search form
+            sisu --sample-search-form --db-pg                # creates the postgresql search form
                                                              # this should be done after creating the db
                                                              # to be searched
             sisu --webrick &                                 # starts ruby webrick web server