Index: openacs-4/packages/acs-lang/acs-lang.info
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-lang/acs-lang.info,v
diff -u -r1.8 -r1.9
--- openacs-4/packages/acs-lang/acs-lang.info	10 Oct 2002 19:06:17 -0000	1.8
+++ openacs-4/packages/acs-lang/acs-lang.info	14 Oct 2002 14:37:37 -0000	1.9
@@ -41,13 +41,13 @@
             <file type="data_model" db_type="oracle" path="sql/oracle/ad-locales.sql"/>
             <file type="data_model" db_type="oracle" path="sql/oracle/message-catalog-drop.sql"/>
             <file type="data_model" db_type="oracle" path="sql/oracle/message-catalog.sql"/>
-            <file type="data_model_upgrade" db_type="oracle" path="sql/oracle/upgrade/upgrade-4.1-4.7.sql"/>
+            <file type="data_model_upgrade" db_type="oracle" path="sql/oracle/upgrade/upgrade-4.1-4.7d2.sql"/>
             <file type="data_model_create" db_type="postgresql" path="sql/postgresql/acs-lang-create.sql"/>
             <file type="data_model" db_type="postgresql" path="sql/postgresql/ad-locales-drop.sql"/>
             <file type="data_model" db_type="postgresql" path="sql/postgresql/ad-locales.sql"/>
             <file type="data_model" db_type="postgresql" path="sql/postgresql/message-catalog-drop.sql"/>
             <file type="data_model" db_type="postgresql" path="sql/postgresql/message-catalog.sql"/>
-            <file type="data_model_upgrade" db_type="postgresql" path="sql/postgresql/upgrade/upgrade-4.1-4.7.sql"/>
+            <file type="data_model_upgrade" db_type="postgresql" path="sql/postgresql/upgrade/upgrade-4.1-4.7d2.sql"/>
             <file type="tcl_init" path="tcl/lang-catalog-init.tcl"/>
             <file type="tcl_procs" path="tcl/lang-catalog-procs.tcl"/>
             <file type="query_file" path="tcl/lang-catalog-procs.xql"/>
Fisheye: Tag 1.2 refers to a dead (removed) revision in file `openacs-4/packages/acs-lang/sql/oracle/upgrade/upgrade-4.1-4.7.sql'.
Fisheye: No comparison available.  Pass `N' to diff?
Index: openacs-4/packages/acs-lang/sql/oracle/upgrade/upgrade-4.1-4.7d2.sql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-lang/sql/oracle/upgrade/upgrade-4.1-4.7d2.sql,v
diff -u
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ openacs-4/packages/acs-lang/sql/oracle/upgrade/upgrade-4.1-4.7d2.sql	14 Oct 2002 14:37:40 -0000	1.1
@@ -0,0 +1,72 @@
+--
+-- Upgrade script from 4.1 to 4.7
+--
+-- Changes lang_messages so it uses locale instead of language
+-- by looking up the default locale in ad_locales.
+--
+-- There two things that could go wrong here:
+--
+-- 1. There could be no locale at all for some language
+--    in that case the scripts adds a new locale
+-- 2. There could be no default locale
+--    the script makes sure that theres is one default locale
+--    pr. language 
+--
+-- @author Christian Hvid
+--
+
+-- Make sure that there is a default for every language
+
+UPDATE ad_locales
+SET    default_p = 't'
+WHERE  (SELECT count(*) 
+        FROM   ad_locales a 
+        WHERE  a.language = ad_locales.language AND default_p='t') = 0;
+
+-- Make sure that there is a locale for every language used in lang_messages
+
+INSERT INTO ad_locales (language, locale, country, label, nls_language, default_p)
+SELECT      language, 
+            language || '_' || UPPER(language) as locale, 
+             '??' as country, 
+             'Locale created by upgrade-4.1-4.7 for language ' || language as label,
+             '??' as nls_language, 
+             't' as default_p
+FROM 
+  ((SELECT DISTINCT lang as language 
+    FROM            lang_messages) MINUS
+   (SELECT DISTINCT language
+    FROM            ad_locales));
+
+create table temp (    
+  key                     varchar(200),
+  lang                    varchar(2),
+  message                 clob,
+  registered_p char(1)
+);
+
+INSERT INTO temp(key, lang, message, registered_p) 
+SELECT      key, lang, message, registered_p
+FROM        lang_messages;
+
+DROP TABLE lang_messages;
+
+create table lang_messages (    
+    key varchar2(200),
+    locale varchar2(30) 
+        constraint lang_messages_locale_fk
+            references ad_locales(locale)
+        constraint lang_messages_locale_nn
+	    not null,
+    message clob,
+    registered_p char(1)
+        constraint lm_tranlated_p_ck check(registered_p in ('t','f')),
+        constraint lang_messages_pk primary key (key, locale)
+);
+
+INSERT INTO lang_messages(key, locale, message, registered_p) 
+SELECT      key, ad_locales.locale, message, registered_p
+FROM        temp, ad_locales
+WHERE       ad_locales.language = temp.lang;
+
+DROP TABLE temp;
Fisheye: Tag 1.2 refers to a dead (removed) revision in file `openacs-4/packages/acs-lang/sql/postgresql/upgrade/upgrade-4.1-4.7.sql'.
Fisheye: No comparison available.  Pass `N' to diff?
Index: openacs-4/packages/acs-lang/sql/postgresql/upgrade/upgrade-4.1-4.7d2.sql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-lang/sql/postgresql/upgrade/upgrade-4.1-4.7d2.sql,v
diff -u
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ openacs-4/packages/acs-lang/sql/postgresql/upgrade/upgrade-4.1-4.7d2.sql	14 Oct 2002 14:37:41 -0000	1.1
@@ -0,0 +1,73 @@
+--
+-- Upgrade script from 4.1 to 4.7
+--
+-- Changes lang_messages so it uses locale instead of language
+-- by looking up the default locale in ad_locales.
+--
+-- There two things that could go wrong here:
+--
+-- 1. There could be no locale at all for some language
+--    in that case the scripts adds a new locale
+-- 2. There could be no default locale
+--    the script makes sure that theres is one default locale
+--    pr. language 
+--
+-- @author Christian Hvid
+--
+
+-- Make sure that there is a default for every language
+
+UPDATE ad_locales
+SET    default_p = 't'
+WHERE  (SELECT count(*) 
+        FROM   ad_locales AS a 
+        WHERE  a.language = ad_locales.language AND default_p='t') = 0;
+
+-- Make sure that there is a locale for every language used in lang_messages
+
+INSERT INTO ad_locales (language, locale, country, label, nls_language, default_p)
+SELECT      language, 
+            language || '_' || UPPER(language) as locale, 
+             '??' as country, 
+             'Locale created by upgrade-4.1-4.7 for language ' || language as label,
+             '??' as nls_language, 
+             't' as default_p
+FROM 
+  ((SELECT DISTINCT lang as language 
+    FROM            lang_messages) EXCEPT
+   (SELECT DISTINCT language
+    FROM            ad_locales)) as new_languages;
+
+create table temp (    
+  key                     varchar(200),
+  lang                    varchar(2),
+  message                 text,
+  registered_p            boolean
+);
+
+INSERT INTO temp(key, lang, message, registered_p) 
+SELECT      key, lang, message, registered_p
+FROM        lang_messages;
+
+DROP TABLE lang_messages;
+
+create table lang_messages (    
+  key                     varchar(200),
+  locale                  varchar(30) 
+                          constraint lang_messages_locale_fk
+                          references ad_locales(locale)
+                          constraint lang_messages_locale_nn
+                          not null,
+  message                 text,
+  registered_p            boolean,
+  constraint lang_messages_pk 
+  primary key (key, locale)
+);
+
+INSERT INTO lang_messages(key, locale, message, registered_p) 
+SELECT      key, ad_locales.locale, message, registered_p
+FROM        temp, ad_locales
+WHERE       cast (ad_locales.language as text) = cast (temp.lang as text)
+AND         ad_locales.default_p = 't';
+
+DROP TABLE temp;