aboutsummaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
authorRalph Amissah <ralph@amissah.com>2013-06-06 21:28:06 -0400
committerRalph Amissah <ralph@amissah.com>2013-06-06 21:28:06 -0400
commit13f66fe40a8eec2c68d0a67e5e7ac80658450f1e (patch)
tree485e006c339d8ca58928a1d360a8525bd91f5414
parentv4 v5: cgi, cosmetic, drop use of images in sample form (diff)
v4 v5: cgi helper script, sample search form generator, file name matchingsisu_4.1.4
-rw-r--r--data/doc/sisu/CHANGELOG_v44
-rw-r--r--data/doc/sisu/CHANGELOG_v54
-rw-r--r--lib/sisu/v4/cgi_sql_common.rb4
-rw-r--r--lib/sisu/v5/cgi_sql_common.rb4
4 files changed, 10 insertions, 6 deletions
diff --git a/data/doc/sisu/CHANGELOG_v4 b/data/doc/sisu/CHANGELOG_v4
index 2f7d96e1..bf4fd392 100644
--- a/data/doc/sisu/CHANGELOG_v4
+++ b/data/doc/sisu/CHANGELOG_v4
@@ -34,7 +34,9 @@ http://www.jus.uio.no/sisu/pkg/src/sisu_4.1.4.orig.tar.xz
(Note: for .ssm: @md.fns (is set during runtime & is) != @opt.fns @md.opt.fns,
affects construction of unique identifier)
-* cgi, cosmetic, drop use of images in sample form
+* cgi helper script, sample search form generator
+ * file name matching, check
+ * cosmetic, drop use of images in sample form
* sysenv, requested load warning removed, less screen clutter, consider
diff --git a/data/doc/sisu/CHANGELOG_v5 b/data/doc/sisu/CHANGELOG_v5
index 50474168..463de70e 100644
--- a/data/doc/sisu/CHANGELOG_v5
+++ b/data/doc/sisu/CHANGELOG_v5
@@ -34,7 +34,9 @@ http://www.jus.uio.no/sisu/pkg/src/sisu_5.0.4.orig.tar.xz
(Note: for .ssm: @md.fns (is set during runtime & is) != @opt.fns @md.opt.fns,
affects construction of unique identifier)
-* cgi, cosmetic, drop use of images in sample form
+* cgi helper script, sample search form generator
+ * file name matching, check
+ * cosmetic, drop use of images in sample form
* sysenv, requested load warning removed, less screen clutter, consider
diff --git a/lib/sisu/v4/cgi_sql_common.rb b/lib/sisu/v4/cgi_sql_common.rb
index d15967aa..a6639fb3 100644
--- a/lib/sisu/v4/cgi_sql_common.rb
+++ b/lib/sisu/v4/cgi_sql_common.rb
@@ -917,7 +917,7 @@ module SiSU_CGI_SQL
#% text_objects_body
s_contents.each do |c| #% text body
location=c['src_filename'][/(.+?)\.(?:ssm\.sst|sst)$/,1]
- file_suffix=c['src_filename'][/.+?\.(_?sst|ssm)$/,1]
+ file_suffix=c['src_filename'][/.+?\.(ssm\.sst|sst)$/,1]
lang=if location =~ /\S+?~(\S\S\S?)$/
l=location[/\S+?~(\S\S\S?)$/,1]
location=location.gsub(/(\S+?)~\S\S\S?/,'\1')
@@ -1009,7 +1009,7 @@ module SiSU_CGI_SQL
oldtid = 0
s_endnotes.each do |e| #% endnotes
location=e['src_filename'][/(.+?)\.(?:ssm\.sst|sst)$/,1]
- file_suffix=e['src_filename'][/.+?\.(_?sst|ssm)$/,1]
+ file_suffix=e['src_filename'][/.+?\.(ssm\.sst|sst)$/,1]
lang=if location =~ /\S+?~(\S\S\S?)$/
l=location[/\S+?~(\S\S\S?)$/,1]
location=location.gsub(/(\S+?)~\S\S\S?/,'\1')
diff --git a/lib/sisu/v5/cgi_sql_common.rb b/lib/sisu/v5/cgi_sql_common.rb
index fddde88c..b551d6c8 100644
--- a/lib/sisu/v5/cgi_sql_common.rb
+++ b/lib/sisu/v5/cgi_sql_common.rb
@@ -917,7 +917,7 @@ module SiSU_CGI_SQL
#% text_objects_body
s_contents.each do |c| #% text body
location=c['src_filename'][/(.+?)\.(?:ssm\.sst|sst)$/,1]
- file_suffix=c['src_filename'][/.+?\.(_?sst|ssm)$/,1]
+ file_suffix=c['src_filename'][/.+?\.(ssm\.sst|sst)$/,1]
lang=if location =~ /\S+?~(\S\S\S?)$/
l=location[/\S+?~(\S\S\S?)$/,1]
location=location.gsub(/(\S+?)~\S\S\S?/,'\1')
@@ -1009,7 +1009,7 @@ module SiSU_CGI_SQL
oldtid = 0
s_endnotes.each do |e| #% endnotes
location=e['src_filename'][/(.+?)\.(?:ssm\.sst|sst)$/,1]
- file_suffix=e['src_filename'][/.+?\.(_?sst|ssm)$/,1]
+ file_suffix=e['src_filename'][/.+?\.(ssm\.sst|sst)$/,1]
lang=if location =~ /\S+?~(\S\S\S?)$/
l=location[/\S+?~(\S\S\S?)$/,1]
location=location.gsub(/(\S+?)~\S\S\S?/,'\1')