diff options
| -rw-r--r-- | data/doc/sisu/CHANGELOG_v5 | 4 | ||||
| -rw-r--r-- | data/doc/sisu/CHANGELOG_v6 | 4 | ||||
| -rw-r--r-- | lib/sisu/v5/cgi_sqlite.rb | 2 | ||||
| -rw-r--r-- | lib/sisu/v6/cgi_sqlite.rb | 2 |
4 files changed, 8 insertions, 4 deletions
diff --git a/data/doc/sisu/CHANGELOG_v5 b/data/doc/sisu/CHANGELOG_v5 index dd228b5f..474da965 100644 --- a/data/doc/sisu/CHANGELOG_v5 +++ b/data/doc/sisu/CHANGELOG_v5 @@ -31,13 +31,15 @@ v2 branch is removed; it is available in sisu =< 3.3.2 %% Reverse Chronological: -%% 5.6.4.orig.tar.xz (2014-08-30:34/6) +%% 5.6.4.orig.tar.xz (2014-09-01:35/1) http://sources.sisudoc.org/gitweb/?p=code/sisu.git;a=log;h=refs/tags/sisu_5.6.4 http://sources.sisudoc.org/gitweb/?p=code/sisu.git;a=log;h=refs/tags/debian/sisu_5.6.4-1 http://www.jus.uio.no/sisu/pkg/src/sisu_5.6.4.orig.tar.xz sisu_5.6.4.orig.tar.xz sisu_5.6.4-1.dsc +* cgi_sqlite, allow expansion of variable (default db name), double quotes, fix + %% 5.6.3.orig.tar.xz (2014-08-29:34/5) http://sources.sisudoc.org/gitweb/?p=code/sisu.git;a=log;h=refs/tags/sisu_5.6.3 http://sources.sisudoc.org/gitweb/?p=code/sisu.git;a=log;h=refs/tags/debian/sisu_5.6.3-1 diff --git a/data/doc/sisu/CHANGELOG_v6 b/data/doc/sisu/CHANGELOG_v6 index 496ebe42..29136e1f 100644 --- a/data/doc/sisu/CHANGELOG_v6 +++ b/data/doc/sisu/CHANGELOG_v6 @@ -21,13 +21,15 @@ v2 branch is removed; it is available in sisu =< 3.3.2 %% Reverse Chronological: -%% 6.2.5.orig.tar.xz (2014-08-30:34/6) +%% 6.2.5.orig.tar.xz (2014-09-01:35/1) http://sources.sisudoc.org/gitweb/?p=code/sisu.git;a=log;h=refs/tags/sisu_6.2.5 http://sources.sisudoc.org/gitweb/?p=code/sisu.git;a=log;h=refs/tags/debian/sisu_6.2.5-1 http://www.jus.uio.no/sisu/pkg/src/sisu_6.2.5.orig.tar.xz sisu_6.2.5.orig.tar.xz sisu_6.2.5-1.dsc +* cgi_sqlite, allow expansion of variable (default db name), double quotes, fix + %% 6.2.4.orig.tar.xz (2014-08-29:34/5) http://sources.sisudoc.org/gitweb/?p=code/sisu.git;a=log;h=refs/tags/sisu_6.2.4 http://sources.sisudoc.org/gitweb/?p=code/sisu.git;a=log;h=refs/tags/debian/sisu_6.2.4-1 diff --git a/lib/sisu/v5/cgi_sqlite.rb b/lib/sisu/v5/cgi_sqlite.rb index 4644dbc0..9cd91676 100644 --- a/lib/sisu/v5/cgi_sqlite.rb +++ b/lib/sisu/v5/cgi_sqlite.rb @@ -112,7 +112,7 @@ module SiSU_CGI_SQLite #% database building doc serve.each do |x| f3 << %{ when /#{Db[:name_prefix]}#{x}/ then "#{@env.path.webserv}/#{x}/\#{db_name}"\n} end - f3 << %{ else '#{@env.path.webserv}/#{serve[0]}/\#{db_name}'\n end\n} + f3 << %{ else "#{@env.path.webserv}/#{serve[0]}/\#{db_name}"\n end\n} if FileTest.writable?('.') output=File.open(@cgi_file_name,'w') output << header0 << header1 << header_desc << header2 << f1 << buttons1 << buttons2 << search_request << search_statement << search_statement_common << search_query1 << @common.pages << search_query2 << @common.tail << @common.main1 << f2 << f3 << dbi_connect << @common.main2 << @common.dir_structure << @common.main3 diff --git a/lib/sisu/v6/cgi_sqlite.rb b/lib/sisu/v6/cgi_sqlite.rb index 722d9033..8559b7a8 100644 --- a/lib/sisu/v6/cgi_sqlite.rb +++ b/lib/sisu/v6/cgi_sqlite.rb @@ -112,7 +112,7 @@ module SiSU_CGI_SQLite #% database building doc serve.each do |x| f3 << %{ when /#{Db[:name_prefix]}#{x}/ then "#{@env.path.webserv}/#{x}/\#{db_name}"\n} end - f3 << %{ else '#{@env.path.webserv}/#{serve[0]}/\#{db_name}'\n end\n} + f3 << %{ else "#{@env.path.webserv}/#{serve[0]}/\#{db_name}"\n end\n} if FileTest.writable?('.') output=File.open(@cgi_file_name,'w') output << header0 << header1 << header_desc << header2 << f1 << buttons1 << buttons2 << search_request << search_statement << search_statement_common << search_query1 << @common.pages << search_query2 << @common.tail << @common.main1 << f2 << f3 << dbi_connect << @common.main2 << @common.dir_structure << @common.main3 |