summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRalph Amissah <ralph@amissah.com>2014-09-02 03:11:39 +0000
committerRalph Amissah <ralph@amissah.com>2014-09-02 03:11:41 +0000
commit81c7c3ff5b33e3b57d91acc3eb6c2739e0008e17 (patch)
treed4753940c71d5246286351a4acf5c49dae962b41
parentv5 v6: version & changelog (& rakefile) (diff)
downloadsisu-81c7c3ff5b33e3b57d91acc3eb6c2739e0008e17.zip
sisu-81c7c3ff5b33e3b57d91acc3eb6c2739e0008e17.tar.xz
v5 v6: cgi_sqlite, expansion of variable (default db name), double quotes, fix
-rw-r--r--data/doc/sisu/CHANGELOG_v54
-rw-r--r--data/doc/sisu/CHANGELOG_v64
-rw-r--r--lib/sisu/v5/cgi_sqlite.rb2
-rw-r--r--lib/sisu/v6/cgi_sqlite.rb2
4 files changed, 8 insertions, 4 deletions
diff --git a/data/doc/sisu/CHANGELOG_v5 b/data/doc/sisu/CHANGELOG_v5
index dd228b5..474da96 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 496ebe4..29136e1 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 4644dbc..9cd9167 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 722d903..8559b7a 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