diff options
| author | Ralph Amissah <ralph@amissah.com> | 2007-10-22 18:53:13 +0100 |
|---|---|---|
| committer | Ralph Amissah <ralph@amissah.com> | 2007-10-22 18:53:13 +0100 |
| commit | 29cc91fa0588a3077bcfe280e825709e704beee2 (patch) | |
| tree | 5f5a5ddba288785425b7181c92139251fc940f25 /lib/sisu/v0/cgi_sql_common.rb | |
| parent | Merge branch 'upstream' into debian/sid (diff) | |
| parent | regex to match composite file names in db common and cgi (diff) | |
Merge branch 'upstream' into debian/sid
Diffstat (limited to 'lib/sisu/v0/cgi_sql_common.rb')
| -rw-r--r-- | lib/sisu/v0/cgi_sql_common.rb | 4 |
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] |