From c325474383a59fc13dcfbc75f63f47918d836bc3 Mon Sep 17 00:00:00 2001
From: Ralph Amissah <ralph@amissah.com>
Date: Mon, 22 Oct 2007 18:52:58 +0100
Subject: regex to match composite file names in db common and cgi

---
 CHANGELOG                     | 8 ++++++++
 lib/sisu/v0/cgi_sql_common.rb | 4 ++--
 lib/sisu/v0/db_import.rb      | 2 +-
 3 files changed, 11 insertions(+), 3 deletions(-)

diff --git a/CHANGELOG b/CHANGELOG
index bef76e35..663e2903 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -9,6 +9,14 @@ Reverse Chronological:
 
 %% STABLE MANIFEST
 
+%% sisu_0.62.1.orig.tar.gz (2007-10-22:43/1)
+http://www.jus.uio.no/sisu/pkg/src/sisu_0.62.1.orig.tar.gz
+  sisu_0.62.1.orig.tar.gz
+  sisu_0.62.1-1.dsc
+  sisu_0.62.1-1.diff.gz
+
+  * db common and cgi, regex to match new composite file filename (.ssm.sst)
+
 %% sisu_0.62.0.orig.tar.gz (2007-10-20:42/6)
 http://www.jus.uio.no/sisu/pkg/src/sisu_0.62.0.orig.tar.gz
   5b46f6959c1190cdf92eee2b53b05b21 1479805 sisu_0.62.0.orig.tar.gz
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]
diff --git a/lib/sisu/v0/db_import.rb b/lib/sisu/v0/db_import.rb
index 6d50fb2b..404d9437 100644
--- a/lib/sisu/v0/db_import.rb
+++ b/lib/sisu/v0/db_import.rb
@@ -75,7 +75,7 @@ module SiSU_DB_import
         @md=SiSU_Param::Parameters.new(@opt).get
         @fnb=@md.fnb
       end
-      @suffix=@opt.fns[/(?:.+?)\.[_-]?sst/,1]
+      @suffix=@opt.fns[/(?:.+?)(?:\.ssm\.sst|\.-?sst)/,1]
       @fnm="#@dal/#{@opt.fns}.meta.rbm"
       @@seg=''
       @@seg_full=''                                                              #create? consider placing field just before clean text as opposed to seg which contains seg(.html) name info seg_full would contain seg info for levels 5 & 6 where available eg seg_full may be 7.3 (level 5) and 7.3.1 (level 6) where seg  is 7
-- 
cgit v1.2.3