aboutsummaryrefslogtreecommitdiffhomepage
path: root/lib/sisu/v0/cgi_sql_common.rb
diff options
context:
space:
mode:
authorRalph Amissah <ralph@amissah.com>2007-10-22 18:52:58 +0100
committerRalph Amissah <ralph@amissah.com>2007-10-22 18:52:58 +0100
commitc325474383a59fc13dcfbc75f63f47918d836bc3 (patch)
tree6ccd4d2d0e46d60ec5fcabbec7039efc00618f22 /lib/sisu/v0/cgi_sql_common.rb
parentsisu-0.62.0 + md5s (diff)
regex to match composite file names in db common and cgi
Diffstat (limited to 'lib/sisu/v0/cgi_sql_common.rb')
-rw-r--r--lib/sisu/v0/cgi_sql_common.rb4
1 files changed, 2 insertions, 2 deletions
diff --git a/lib/sisu/v0/cgi_sql_common.rb b/lib/sisu/v0/cgi_sql_common.rb
index 7df73901..ef68fc13 100644
--- a/lib/sisu/v0/cgi_sql_common.rb
+++ b/lib/sisu/v0/cgi_sql_common.rb
@@ -788,7 +788,7 @@ module SiSU_CGI_sql
end
#text_objects_body
s_contents.each do |c| #% text body
- location=c['filename'][/(.+?)\.(?:_?sst|ssm)$/,1]
+ location=c['filename'][/(.+?)\.(?:ssm\.sst|sst)$/,1]
file_suffix=c['filename'][/.+?\.(_?sst|ssm)$/,1]
lang=if location =~ /\S+?~(\S\S\S?)$/
l=location[/\S+?~(\S\S\S?)$/,1]
@@ -889,7 +889,7 @@ module SiSU_CGI_sql
#text_objects_endnote
oldtid = 0
s_endnotes.each do |e| #% endnotes
- location=e['filename'][/(.+?)\.(?:_?sst|ssm)$/,1]
+ location=e['filename'][/(.+?)\.(?:ssm\.sst|sst)$/,1]
file_suffix=e['filename'][/.+?\.(_?sst|ssm)$/,1]
lang=if location =~ /\S+?~(\S\S\S?)$/
l=location[/\S+?~(\S\S\S?)$/,1]