k_astat_lfb_fg.tab ergänzt

superx/WEB-INF/conf/edustore/db/install/MODULINFO

@@ -1,6 +1,6 @@
 #!/bin/bash
 
-export MODUL_VERSION=5.2b
+export MODUL_VERSION=5.2
 export MODULNAME=kern
 export SACHGEBIETID=0
 export SACHGEBIET=Administration

superx/WEB-INF/conf/edustore/db/install/VERSION

@@ -1 +1 @@
-5.2b
+5.2

superx/WEB-INF/conf/edustore/db/install/conf/builddatum.txt

@@ -1 +1 @@
-21.11.2024
+06.03.2025

superx/WEB-INF/conf/edustore/db/install/conf/his1/dbconv/sch.eduetl/k_astat_abschl_grp.tab

@@ -3,7 +3,8 @@ create table k_astat_abschl_grp(
 	abschluss_astat_bund NVARCHAR(255)  not null, 
 abschluss_astat_bund_ktxt NVARCHAR(255) , 
 abschlussart NVARCHAR(255) , 
-abschluss_grp NVARCHAR(255) 
+abschluss_grp NVARCHAR(255) , 
+ist_lehramt SMALLINT  default 0 
 );
 	
 comment on column k_astat_abschl_grp.abschluss_astat_bund is 'Abschluss [Bundesschlüssel]';
@@ -13,4 +14,6 @@ comment on column k_astat_abschl_grp.abschluss_astat_bund_ktxt is 'Abschluss [Bu
 comment on column k_astat_abschl_grp.abschlussart is 'Abschlussart';
 	
 comment on column k_astat_abschl_grp.abschluss_grp is 'Abschlussgruppe';
+	
+comment on column k_astat_abschl_grp.ist_lehramt is 'Lehramt [J/N]';
 	

superx/WEB-INF/conf/edustore/db/install/conf/his1/dbconv/sch.eduetl/k_astat_lfb_fg.tab

@@ -0,0 +1,13 @@
+{### k_astat_lfb_fg -  automatisch generiert #########}
+create table k_astat_lfb_fg(
+	tid SERIAL  not null, 
+fgr CHAR(10) , 
+fgr_str NCHAR(255) , 
+lfb CHAR(10) , 
+lfb_str NCHAR(255) , 
+fg CHAR(10) , 
+fg_str NVARCHAR(255) , 
+gueltig_von DATE , 
+gueltig_bis DATE 
+);
+	

superx/WEB-INF/conf/edustore/db/install/conf/his1/dbconv/sch.eduetl/trans_cifx.idx

@@ -1,4 +1,7 @@
 
 {### trans_cifx -  automatisch generiert ##############################################
 }
+
+create unique index pk_trans_cifx_tid on trans_cifx (tid);
 create  index trans_cifx_ind on trans_cifx (sourcesystem_id );
+create  index trans_cifx_ind2 on trans_cifx (cifx_tid );

superx/WEB-INF/conf/edustore/db/install/conf/his1/dbconv/sch.eduetl/trans_cifx.tab

@@ -1,6 +1,7 @@
 {### trans_cifx -  automatisch generiert #########}
 create table trans_cifx(
-	key SMALLINT  not null, 
+	tid SERIAL  not null, 
+key SMALLINT  not null, 
 apnr CHAR(10)  not null, 
 cifx_tid INTEGER , 
 sourcesystem INTEGER  not null, 

superx/WEB-INF/conf/edustore/db/install/conf/his1/edustore_doc/kern_rename_demofiles.bat

@@ -35,3 +35,4 @@ move k_astat_faechergruppe k_astat_faechergruppe_demo
 move k_astat_abschl_grp k_astat_abschl_grp_demo
 move k_prio_param k_prio_param_demo
 move k_source k_source_demo
+move k_astat_lfb_fg k_astat_lfb_fg_demo

superx/WEB-INF/conf/edustore/db/install/conf/his1/edustore_doc/kern_rename_demofiles.sh

@@ -36,3 +36,4 @@ mv k_astat_faechergruppe k_astat_faechergruppe_demo
 mv k_astat_abschl_grp k_astat_abschl_grp_demo
 mv k_prio_param k_prio_param_demo
 mv k_source k_source_demo
+mv k_astat_lfb_fg k_astat_lfb_fg_demo

superx/WEB-INF/conf/edustore/db/install/conf/his1/edustore_install/edustore_kern_drop_ids.xml

@@ -478,6 +478,9 @@
 </dbi:dbaction>
 <dbi:dbaction dbi:action="sqlexec">eduetl:drop table k_source;
 
+</dbi:dbaction>
+<dbi:dbaction dbi:action="sqlexec">eduetl:drop table k_astat_lfb_fg;
+
 </dbi:dbaction>
 <dbi:dbaction dbi:action="executeFile">
 <dbi:file structure="SQL" withNativeClient="n" encoding="UTF-8" database="eduetl" filename="$KERN_PFAD/conf/sx_tables_loeschen.sql"/>

superx/WEB-INF/conf/edustore/db/install/conf/his1/edustore_install/edustore_kern_drop_pg.xml

@@ -598,6 +598,9 @@
 </dbi:dbaction>
 <dbi:dbaction dbi:action="sqlexec">eduetl:drop table if exists k_source cascade;
 
+</dbi:dbaction>
+<dbi:dbaction dbi:action="sqlexec">eduetl:drop table if exists k_astat_lfb_fg cascade;
+
 </dbi:dbaction>
 <dbi:dbaction dbi:action="executeFile">
 <dbi:file structure="SQL" withNativeClient="n" encoding="UTF-8" database="eduetl" filename="$KERN_PFAD/conf/sx_tables_loeschen.sql"/>

superx/WEB-INF/conf/edustore/db/install/conf/his1/edustore_install/edustore_kern_integrate_ids.sql

@@ -7,7 +7,7 @@
 -- Fülle db_version
 
 delete from db_version  where his_system='kern';
-insert into db_version (his_system,version,systeminfo_id) values('kern','5.2b',9);
+insert into db_version (his_system,version,systeminfo_id) values('kern','5.2',9);
 
 
 
@@ -280,6 +280,8 @@ delete from db_tabellen where name='k_prio_param';
 insert into db_tabellen (name,protokollierung) values('k_prio_param',0);
 delete from db_tabellen where name='k_source';
 insert into db_tabellen (name,protokollierung) values('k_source',0);
+delete from db_tabellen where name='k_astat_lfb_fg';
+insert into db_tabellen (name,protokollierung) values('k_astat_lfb_fg',0);
 
 
 -- Fülle sachgebiete, systeminfo und themenbaum

superx/WEB-INF/conf/edustore/db/install/conf/his1/edustore_install/edustore_kern_integrate_pg.sql

@@ -7,7 +7,7 @@
 -- Fülle db_version
 
 delete from db_version  where his_system='kern';
-insert into db_version (his_system,version,systeminfo_id) values('kern','5.2b',9);
+insert into db_version (his_system,version,systeminfo_id) values('kern','5.2',9);
 
 
 
@@ -280,6 +280,8 @@ delete from db_tabellen where name='k_prio_param';
 insert into db_tabellen (name,protokollierung) values('k_prio_param',0);
 delete from db_tabellen where name='k_source';
 insert into db_tabellen (name,protokollierung) values('k_source',0);
+delete from db_tabellen where name='k_astat_lfb_fg';
+insert into db_tabellen (name,protokollierung) values('k_astat_lfb_fg',0);
 
 
 -- Fülle sachgebiete, systeminfo und themenbaum

superx/WEB-INF/conf/edustore/db/install/conf/his1/edustore_install/edustore_kern_upgrade2_ids.xml

@@ -41,12 +41,12 @@
 </dbi:dbaction>
 <dbi:dbaction dbi:action="sqlexec">eduetl:delete from k_astat_studienbereich;
 </dbi:dbaction>
+<dbi:dbaction dbi:action="sqlexec">eduetl:delete from k_astat_faechergruppe;
+</dbi:dbaction>
 <dbi:dbaction dbi:action="sqlexec">eduetl:delete from k_astat_staat;
 </dbi:dbaction>
 <dbi:dbaction dbi:action="sqlexec">eduetl:delete from k_astat_kontinent;
 </dbi:dbaction>
-<dbi:dbaction dbi:action="sqlexec">eduetl:delete from k_astat_faechergruppe;
-</dbi:dbaction>
 <dbi:dbaction dbi:action="sqlexec">eduetl:delete from k_astat_abschl_grp;
 </dbi:dbaction>
 <dbi:dbaction dbi:action="sqlexec">eduetl:delete from k_astat_staat_eu;
@@ -87,6 +87,11 @@
 </dbi:data>
 </dbi:dbaction>
 <dbi:dbaction dbi:action="importFile">
+<dbi:data database="eduetl" table="k_astat_faechergruppe">
+<dbi:file encoding="UTF-8" separator="^" trailingSeparator="y" withNativeClient="n" firstLinedescription="n" structure="CSV" filename="$SUPERX_DIR/db/install/schluesseltabellen/release_unloads/k_astat_faechergruppe.unl"/>
+</dbi:data>
+</dbi:dbaction>
+<dbi:dbaction dbi:action="importFile">
 <dbi:data database="eduetl" table="k_astat_staat">
 <dbi:file encoding="UTF-8" separator="^" trailingSeparator="y" withNativeClient="n" firstLinedescription="n" structure="CSV" filename="$SUPERX_DIR/db/install/schluesseltabellen/release_unloads/k_astat_staat.unl"/>
 </dbi:data>
@@ -97,11 +102,6 @@
 </dbi:data>
 </dbi:dbaction>
 <dbi:dbaction dbi:action="importFile">
-<dbi:data database="eduetl" table="k_astat_faechergruppe">
-<dbi:file encoding="UTF-8" separator="^" trailingSeparator="y" withNativeClient="n" firstLinedescription="n" structure="CSV" filename="$SUPERX_DIR/db/install/schluesseltabellen/release_unloads/k_astat_faechergruppe.unl"/>
-</dbi:data>
-</dbi:dbaction>
-<dbi:dbaction dbi:action="importFile">
 <dbi:data database="eduetl" table="k_astat_abschl_grp">
 <dbi:file encoding="UTF-8" separator="^" trailingSeparator="y" withNativeClient="n" firstLinedescription="n" structure="CSV" filename="$SUPERX_DIR/db/install/schluesseltabellen/release_unloads/k_astat_abschl_grp.unl"/>
 </dbi:data>
@@ -253,7 +253,7 @@
 <dbi:dbaction dbi:action="executeFile">
 <dbi:file database="eduetl" encoding="UTF-8" withNativeClient="n" structure="SQL" filename="$SUPERX_DIR/db/install/schluesseltabellen/themenbaum_update_logo_css.sql"/>
 </dbi:dbaction>
-<dbi:dbaction dbi:action="sqlexec">eduetl:UPDATE db_version SET version = '5.2b'
+<dbi:dbaction dbi:action="sqlexec">eduetl:UPDATE db_version SET version = '5.2'
   WHERE his_system = 'kern';
 </dbi:dbaction>
 <dbi:dbaction dbi:action="executeFile">

superx/WEB-INF/conf/edustore/db/install/conf/his1/edustore_install/edustore_kern_upgrade2_pg.xml

@@ -41,12 +41,12 @@
 </dbi:dbaction>
 <dbi:dbaction dbi:action="sqlexec">eduetl:truncate table k_astat_studienbereich cascade;
 </dbi:dbaction>
+<dbi:dbaction dbi:action="sqlexec">eduetl:truncate table k_astat_faechergruppe cascade;
+</dbi:dbaction>
 <dbi:dbaction dbi:action="sqlexec">eduetl:truncate table k_astat_staat cascade;
 </dbi:dbaction>
 <dbi:dbaction dbi:action="sqlexec">eduetl:truncate table k_astat_kontinent cascade;
 </dbi:dbaction>
-<dbi:dbaction dbi:action="sqlexec">eduetl:truncate table k_astat_faechergruppe cascade;
-</dbi:dbaction>
 <dbi:dbaction dbi:action="sqlexec">eduetl:truncate table k_astat_abschl_grp cascade;
 </dbi:dbaction>
 <dbi:dbaction dbi:action="sqlexec">eduetl:truncate table k_astat_staat_eu cascade;
@@ -87,6 +87,11 @@
 </dbi:data>
 </dbi:dbaction>
 <dbi:dbaction dbi:action="importFile">
+<dbi:data database="eduetl" table="k_astat_faechergruppe">
+<dbi:file encoding="UTF-8" separator="^" trailingSeparator="y" withNativeClient="n" firstLinedescription="n" structure="CSV" filename="$SUPERX_DIR/db/install/schluesseltabellen/release_unloads/k_astat_faechergruppe.unl"/>
+</dbi:data>
+</dbi:dbaction>
+<dbi:dbaction dbi:action="importFile">
 <dbi:data database="eduetl" table="k_astat_staat">
 <dbi:file encoding="UTF-8" separator="^" trailingSeparator="y" withNativeClient="n" firstLinedescription="n" structure="CSV" filename="$SUPERX_DIR/db/install/schluesseltabellen/release_unloads/k_astat_staat.unl"/>
 </dbi:data>
@@ -97,11 +102,6 @@
 </dbi:data>
 </dbi:dbaction>
 <dbi:dbaction dbi:action="importFile">
-<dbi:data database="eduetl" table="k_astat_faechergruppe">
-<dbi:file encoding="UTF-8" separator="^" trailingSeparator="y" withNativeClient="n" firstLinedescription="n" structure="CSV" filename="$SUPERX_DIR/db/install/schluesseltabellen/release_unloads/k_astat_faechergruppe.unl"/>
-</dbi:data>
-</dbi:dbaction>
-<dbi:dbaction dbi:action="importFile">
 <dbi:data database="eduetl" table="k_astat_abschl_grp">
 <dbi:file encoding="UTF-8" separator="^" trailingSeparator="y" withNativeClient="n" firstLinedescription="n" structure="CSV" filename="$SUPERX_DIR/db/install/schluesseltabellen/release_unloads/k_astat_abschl_grp.unl"/>
 </dbi:data>
@@ -263,7 +263,7 @@
 <dbi:dbaction dbi:action="executeFile">
 <dbi:file database="eduetl" encoding="UTF-8" withNativeClient="n" structure="SQL" filename="$SUPERX_DIR/db/install/schluesseltabellen/themenbaum_update_logo_css.sql"/>
 </dbi:dbaction>
-<dbi:dbaction dbi:action="sqlexec">eduetl:UPDATE db_version SET version = '5.2b'
+<dbi:dbaction dbi:action="sqlexec">eduetl:UPDATE db_version SET version = '5.2'
   WHERE his_system = 'kern';
 </dbi:dbaction>
 <dbi:dbaction dbi:action="sqlquery">eduetl:select setval('themenbaum_tid_seq',(select max(tid)+1 from themenbaum));

superx/WEB-INF/conf/edustore/db/install/conf/kern.html

@@ -142,7 +142,7 @@ a:active {
          </tr>
          <tr>
             <td class="themenspalte">Modulversion</td>
-            <td>5.2b</td>
+            <td>5.2</td>
          </tr>
          <tr>
             <td class="themenspalte">Sachgebiet</td>
@@ -223,6 +223,7 @@ a:active {
                            <li><a href="#tab_k_astat_abschluss3steller_land">k_astat_abschluss3steller_land</a></li>
                            <li><a href="#tab_k_astat_faechergruppe">k_astat_faechergruppe</a></li>
                            <li><a href="#tab_k_astat_kontinent">k_astat_kontinent</a></li>
+                           <li><a href="#tab_k_astat_lfb_fg">k_astat_lfb_fg</a></li>
                            <li><a href="#tab_k_astat_staat">k_astat_staat</a></li>
                            <li><a href="#tab_k_astat_staat_eu">k_astat_staat_eu</a></li>
                            <li><a href="#tab_k_astat_studienbereich">k_astat_studienbereich</a></li>
@@ -387,6 +388,7 @@ a:active {
                            <li><a href="#tab_hisinone_deleted_entity">hisinone_deleted_entity</a></li>
                            <li><a href="#tab_hochschulinfo">hochschulinfo</a></li>
                            <li><a href="#tab_implicit_orgunit_rights">implicit_orgunit_rights</a></li>
+                           <li><a href="#tab_k_astat_lfb_fg">k_astat_lfb_fg</a></li>
                            <li><a href="#tab_k_prio_param">k_prio_param</a></li>
                            <li><a href="#tab_k_source">k_source</a></li>
                            <li><a href="#tab_kern_cifx_neu">kern_cifx_neu</a></li>
@@ -510,6 +512,7 @@ a:active {
                            <li><a href="#tab_hisinone_deleted_entity">hisinone_deleted_entity</a></li>
                            <li><a href="#tab_hochschulinfo">hochschulinfo</a></li>
                            <li><a href="#tab_implicit_orgunit_rights">implicit_orgunit_rights</a></li>
+                           <li><a href="#tab_k_astat_lfb_fg">k_astat_lfb_fg</a></li>
                            <li><a href="#tab_k_prio_param">k_prio_param</a></li>
                            <li><a href="#tab_k_source">k_source</a></li>
                            <li><a href="#tab_kern_cifx_neu">kern_cifx_neu</a></li>
@@ -700,6 +703,7 @@ a:active {
                            <li><a href="#tab_k_astat_abschluss3steller_land">k_astat_abschluss3steller_land</a></li>
                            <li><a href="#tab_k_astat_faechergruppe">k_astat_faechergruppe</a></li>
                            <li><a href="#tab_k_astat_kontinent">k_astat_kontinent</a></li>
+                           <li><a href="#tab_k_astat_lfb_fg">k_astat_lfb_fg</a></li>
                            <li><a href="#tab_k_astat_staat">k_astat_staat</a></li>
                            <li><a href="#tab_k_astat_staat_eu">k_astat_staat_eu</a></li>
                            <li><a href="#tab_k_astat_studienbereich">k_astat_studienbereich</a></li>
@@ -1117,8 +1121,8 @@ a:active {
             </tr>
          </tfoot>
       </table>
-      <h5 class="level_5"><a name="tab_cif">Tabelle cif</a></h5>
-      <p></p>
+      <h5 class="level_5"><a name="tab_cif">Tabelle cif (cif)</a></h5>
+      <p>Schlüsseltabelle für numerische Schlüssel</p>
       <p>Typ: Schlüsseltabelle, Themenbereich: Administration</p><span class="separator">&nbsp;</span><table class="table is-bordered is-striped is-narrow is-hoverable">
          <thead>
             <tr>
@@ -1287,8 +1291,8 @@ a:active {
             </tr>
          </tfoot>
       </table>
-      <h5 class="level_5"><a name="tab_cifx">Tabelle cifx</a></h5>
-      <p></p>
+      <h5 class="level_5"><a name="tab_cifx">Tabelle cifx (cifx)</a></h5>
+      <p>Schlüsseltabelle für alphanumerische Schlüssel</p>
       <p>Typ: Schlüsseltabelle, Themenbereich: Administration</p><span class="separator">&nbsp;</span><table class="table is-bordered is-striped is-narrow is-hoverable">
          <thead>
             <tr>
@@ -5411,8 +5415,8 @@ a:active {
             </tr>
          </tfoot>
       </table>
-      <h5 class="level_5"><a name="tab_hochschulinfo">Tabelle hochschulinfo</a></h5>
-      <p></p>
+      <h5 class="level_5"><a name="tab_hochschulinfo">Tabelle hochschulinfo (Hochschulinfo)</a></h5>
+      <p>Name und Adresse der Hochschule</p>
       <p>Typ: Schlüsseltabelle, Themenbereich: Administration</p><span class="separator">&nbsp;</span><table class="table is-bordered is-striped is-narrow is-hoverable">
          <thead>
             <tr>
@@ -5655,6 +5659,16 @@ a:active {
                <td class="tabellenzeile"></td>
                <td class="tabellenzeile"></td>
             </tr>
+            <tr>
+               <td class="tabellenzeile">ist_lehramt</td>
+               <td class="tabellenzeile">SMALLINT</td>
+               <td class="tabellenzeile">255</td>
+               <td class="tabellenzeile">0</td>
+               <td class="tabellenzeile">false</td>
+               <td class="tabellenzeile">Lehramt (J/N)</td>
+               <td class="tabellenzeile">Ist Lehramt=1, nein =0</td>
+               <td class="tabellenzeile"></td>
+            </tr>
          </tbody>
          <tfoot>
             <tr>
@@ -5989,6 +6003,134 @@ a:active {
             </tr>
          </tfoot>
       </table>
+      <h5 class="level_5"><a name="tab_k_astat_lfb_fg">Tabelle k_astat_lfb_fg</a></h5>
+      <p></p>
+      <p>Typ: Schlüsseltabelle, Themenbereich: Administration</p><span class="separator">&nbsp;</span><table class="table is-bordered is-striped is-narrow is-hoverable">
+         <thead>
+            <tr>
+               <th class="column-title">Feldname</th>
+               <th class="column-title">Feldtyp</th>
+               <th class="column-title">Größe</th>
+               <th class="column-title">Default</th>
+               <th class="column-title">Not Null</th>
+               <th class="column-title">Beschreibung</th>
+               <th class="column-title">Kommentar</th>
+               <th class="column-title">Fremdschlüssel</th>
+            </tr>
+         </thead>
+         <tbody>
+            <tr>
+               <td class="tabellenzeile">tid</td>
+               <td class="tabellenzeile">SERIAL</td>
+               <td class="tabellenzeile">4</td>
+               <td class="tabellenzeile"></td>
+               <td class="tabellenzeile">true</td>
+               <td class="tabellenzeile"></td>
+               <td class="tabellenzeile"></td>
+               <td class="tabellenzeile"></td>
+            </tr>
+            <tr>
+               <td class="tabellenzeile">fgr</td>
+               <td class="tabellenzeile">CHAR</td>
+               <td class="tabellenzeile">10</td>
+               <td class="tabellenzeile"></td>
+               <td class="tabellenzeile">false</td>
+               <td class="tabellenzeile"></td>
+               <td class="tabellenzeile"></td>
+               <td class="tabellenzeile"></td>
+            </tr>
+            <tr>
+               <td class="tabellenzeile">fgr_str</td>
+               <td class="tabellenzeile">CHAR</td>
+               <td class="tabellenzeile">255</td>
+               <td class="tabellenzeile"></td>
+               <td class="tabellenzeile">false</td>
+               <td class="tabellenzeile"></td>
+               <td class="tabellenzeile"></td>
+               <td class="tabellenzeile"></td>
+            </tr>
+            <tr>
+               <td class="tabellenzeile">lfb</td>
+               <td class="tabellenzeile">CHAR</td>
+               <td class="tabellenzeile">10</td>
+               <td class="tabellenzeile"></td>
+               <td class="tabellenzeile">false</td>
+               <td class="tabellenzeile"></td>
+               <td class="tabellenzeile"></td>
+               <td class="tabellenzeile"></td>
+            </tr>
+            <tr>
+               <td class="tabellenzeile">lfb_str</td>
+               <td class="tabellenzeile">CHAR</td>
+               <td class="tabellenzeile">255</td>
+               <td class="tabellenzeile"></td>
+               <td class="tabellenzeile">false</td>
+               <td class="tabellenzeile"></td>
+               <td class="tabellenzeile"></td>
+               <td class="tabellenzeile"></td>
+            </tr>
+            <tr>
+               <td class="tabellenzeile">fg</td>
+               <td class="tabellenzeile">CHAR</td>
+               <td class="tabellenzeile">10</td>
+               <td class="tabellenzeile"></td>
+               <td class="tabellenzeile">false</td>
+               <td class="tabellenzeile"></td>
+               <td class="tabellenzeile"></td>
+               <td class="tabellenzeile"></td>
+            </tr>
+            <tr>
+               <td class="tabellenzeile">fg_str</td>
+               <td class="tabellenzeile">VARCHAR</td>
+               <td class="tabellenzeile">255</td>
+               <td class="tabellenzeile"></td>
+               <td class="tabellenzeile">false</td>
+               <td class="tabellenzeile"></td>
+               <td class="tabellenzeile"></td>
+               <td class="tabellenzeile"></td>
+            </tr>
+            <tr>
+               <td class="tabellenzeile">gueltig_von</td>
+               <td class="tabellenzeile">DATE</td>
+               <td class="tabellenzeile">255</td>
+               <td class="tabellenzeile"></td>
+               <td class="tabellenzeile">false</td>
+               <td class="tabellenzeile"></td>
+               <td class="tabellenzeile"></td>
+               <td class="tabellenzeile"></td>
+            </tr>
+            <tr>
+               <td class="tabellenzeile">gueltig_bis</td>
+               <td class="tabellenzeile">DATE</td>
+               <td class="tabellenzeile">255</td>
+               <td class="tabellenzeile"></td>
+               <td class="tabellenzeile">false</td>
+               <td class="tabellenzeile"></td>
+               <td class="tabellenzeile"></td>
+               <td class="tabellenzeile"></td>
+            </tr>
+         </tbody>
+         <tfoot>
+            <tr>
+               <td class="themenspalte">Primärschlüssel:</td>
+               <td colspan="8">
+                  <p style="font-size:smaller"><span style="font-family:courier,monospace;font-size:0.9em">pk_k_astat_lfb_fg: </span>tid</p>
+               </td>
+            </tr>
+            <tr>
+               <td class="themenspalte">Index/Indizes:</td>
+               <td colspan="8">
+                  <ul></ul>
+               </td>
+            </tr>
+            <tr>
+               <td class="themenspalte">Wird benutzt in:</td>
+               <td colspan="8">
+                  <ul></ul>
+               </td>
+            </tr>
+         </tfoot>
+      </table>
       <h5 class="level_5"><a name="tab_k_astat_staat">Tabelle k_astat_staat (Amtl.Staaten-Schlüssel (Bundesschlüssel))</a></h5>
       <p></p>
       <p>Typ: Schlüsseltabelle, Themenbereich: Stammdaten verwalten</p><span class="separator">&nbsp;</span><table class="table is-bordered is-striped is-narrow is-hoverable">
@@ -8610,8 +8752,8 @@ a:active {
             </tr>
          </tfoot>
       </table>
-      <h5 class="level_5"><a name="tab_organigramm">Tabelle organigramm</a></h5>
-      <p></p>
+      <h5 class="level_5"><a name="tab_organigramm">Tabelle organigramm (Organigramm)</a></h5>
+      <p>Liste der Organisationseinheiten</p>
       <p>Typ: Schlüsseltabelle, Themenbereich: Administration</p><span class="separator">&nbsp;</span><table class="table is-bordered is-striped is-narrow is-hoverable">
          <thead>
             <tr>
@@ -10087,7 +10229,7 @@ a:active {
          </tfoot>
       </table>
       <h5 class="level_5"><a name="tab_sichten">Tabelle sichten (Sichten)</a></h5>
-      <p>Sichten</p>
+      <p>Sichten und Bäume für Hierarchien </p>
       <p>Typ: Schlüsseltabelle, Themenbereich: Administration</p><span class="separator">&nbsp;</span><table class="table is-bordered is-striped is-narrow is-hoverable">
          <thead>
             <tr>
@@ -12952,7 +13094,7 @@ a:active {
          </tfoot>
       </table>
       <h5 class="level_5"><a name="tab_themenbaum">Tabelle themenbaum (Themenbaum)</a></h5>
-      <p>Themenbaum</p>
+      <p>Konfiguration der Menüstruktur</p>
       <p>Typ: Schlüsseltabelle, Themenbereich: Administration</p><span class="separator">&nbsp;</span><table class="table is-bordered is-striped is-narrow is-hoverable">
          <thead>
             <tr>
@@ -13187,8 +13329,8 @@ a:active {
             </tr>
          </tfoot>
       </table>
-      <h5 class="level_5"><a name="tab_trans_cif">Tabelle trans_cif</a></h5>
-      <p></p>
+      <h5 class="level_5"><a name="tab_trans_cif">Tabelle trans_cif (trans_cif)</a></h5>
+      <p>Transfertabelle für numerische Schlüssel</p>
       <p>Typ: Schlüsseltabelle, Themenbereich: Administration</p><span class="separator">&nbsp;</span><table class="table is-bordered is-striped is-narrow is-hoverable">
          <thead>
             <tr>
@@ -13287,8 +13429,8 @@ a:active {
             </tr>
          </tfoot>
       </table>
-      <h5 class="level_5"><a name="tab_trans_cifx">Tabelle trans_cifx</a></h5>
-      <p></p>
+      <h5 class="level_5"><a name="tab_trans_cifx">Tabelle trans_cifx (trans_cifx)</a></h5>
+      <p>Transfertabelle für alphanumerische Schlüssel</p>
       <p>Typ: Schlüsseltabelle, Themenbereich: Administration</p><span class="separator">&nbsp;</span><table class="table is-bordered is-striped is-narrow is-hoverable">
          <thead>
             <tr>
@@ -13303,6 +13445,16 @@ a:active {
             </tr>
          </thead>
          <tbody>
+            <tr>
+               <td class="tabellenzeile">tid</td>
+               <td class="tabellenzeile">SERIAL</td>
+               <td class="tabellenzeile">4</td>
+               <td class="tabellenzeile"></td>
+               <td class="tabellenzeile">true</td>
+               <td class="tabellenzeile"></td>
+               <td class="tabellenzeile"></td>
+               <td class="tabellenzeile"></td>
+            </tr>
             <tr>
                <td class="tabellenzeile">key</td>
                <td class="tabellenzeile">SMALLINT</td>
@@ -13369,7 +13521,7 @@ a:active {
             <tr>
                <td class="themenspalte">Primärschlüssel:</td>
                <td colspan="8">
-                  <p style="font-size:smaller"></p>
+                  <p style="font-size:smaller"><span style="font-family:courier,monospace;font-size:0.9em">pk_trans_cifx_tid: </span>tid</p>
                </td>
             </tr>
             <tr>
@@ -13377,6 +13529,7 @@ a:active {
                <td colspan="8">
                   <ul>
                      <li style="font-size:0.9em"><span style="font-family:courier,monospace;font-size:0.9em">trans_cifx_ind</span> auf trans_cifx (sourcesystem_id );</li>
+                     <li style="font-size:0.9em"><span style="font-family:courier,monospace;font-size:0.9em">trans_cifx_ind2</span> auf trans_cifx (cifx_tid );</li>
                   </ul>
                </td>
             </tr>
@@ -20810,7 +20963,7 @@ a:active {
       </ol>
       <h3 class="level_3"><a name="upgrade">Upgrade</a></h3>
       <p>Folgende Tabellen werden bei dem Upgrade geladen:</p>
-      <ol><span class="separator">&nbsp;</span><span class="separator">&nbsp;</span><span class="separator">&nbsp;</span><span class="separator">&nbsp;</span><li><a href="#tab_k_astat_studienfach_land">k_astat_studienfach_land</a><br> wird geladen aus $SUPERX_DIR/db/install/schluesseltabellen/release_unloads/k_astat_studienfach_land.unl</li><span class="separator">&nbsp;</span><li><a href="#tab_k_astat_abschluss3steller_land">k_astat_abschluss3steller_land</a><br> wird geladen aus $SUPERX_DIR/db/install/schluesseltabellen/release_unloads/k_astat_abschluss3steller_land.unl</li><span class="separator">&nbsp;</span><li><a href="#tab_k_astat_abschluss2steller">k_astat_abschluss2steller</a><br> wird geladen aus $SUPERX_DIR/db/install/schluesseltabellen/release_unloads/k_astat_abschluss2steller.unl</li><span class="separator">&nbsp;</span><li><a href="#tab_k_astat_studienfach">k_astat_studienfach</a><br> wird geladen aus $SUPERX_DIR/db/install/schluesseltabellen/release_unloads/k_astat_studienfach.unl</li><span class="separator">&nbsp;</span><li><a href="#tab_k_astat_studienbereich">k_astat_studienbereich</a><br> wird geladen aus $SUPERX_DIR/db/install/schluesseltabellen/release_unloads/k_astat_studienbereich.unl</li><span class="separator">&nbsp;</span><li><a href="#tab_k_astat_staat">k_astat_staat</a><br> wird geladen aus $SUPERX_DIR/db/install/schluesseltabellen/release_unloads/k_astat_staat.unl</li><span class="separator">&nbsp;</span><li><a href="#tab_k_astat_kontinent">k_astat_kontinent</a><br> wird geladen aus $SUPERX_DIR/db/install/schluesseltabellen/release_unloads/k_astat_kontinent.unl</li><span class="separator">&nbsp;</span><li><a href="#tab_k_astat_faechergruppe">k_astat_faechergruppe</a><br> wird geladen aus $SUPERX_DIR/db/install/schluesseltabellen/release_unloads/k_astat_faechergruppe.unl</li><span class="separator">&nbsp;</span><li><a href="#tab_k_astat_abschl_grp">k_astat_abschl_grp</a><br> wird geladen aus $SUPERX_DIR/db/install/schluesseltabellen/release_unloads/k_astat_abschl_grp.unl</li><span class="separator">&nbsp;</span><li><a href="#tab_k_astat_staat_eu">k_astat_staat_eu</a><br> wird geladen aus $SUPERX_DIR/db/install/schluesseltabellen/release_unloads/k_astat_staat_eu.unl</li><span class="separator">&nbsp;</span><span class="separator">&nbsp;</span><span class="separator">&nbsp;</span><span class="separator">&nbsp;</span><span class="separator">&nbsp;</span><li><a href="#tab_dim_datum">dim_datum</a><br> wird geladen aus $SUPERX_DIR/db/install/schluesseltabellen/release_unloads/dim_datum.unl</li><span class="separator">&nbsp;</span><li><a href="#tab_aggre_bland">aggre_bland</a><br> wird geladen aus $SUPERX_DIR/db/install/schluesseltabellen/release_unloads/aggre_bland.unl</li>
+      <ol><span class="separator">&nbsp;</span><span class="separator">&nbsp;</span><span class="separator">&nbsp;</span><span class="separator">&nbsp;</span><li><a href="#tab_k_astat_studienfach_land">k_astat_studienfach_land</a><br> wird geladen aus $SUPERX_DIR/db/install/schluesseltabellen/release_unloads/k_astat_studienfach_land.unl</li><span class="separator">&nbsp;</span><li><a href="#tab_k_astat_abschluss3steller_land">k_astat_abschluss3steller_land</a><br> wird geladen aus $SUPERX_DIR/db/install/schluesseltabellen/release_unloads/k_astat_abschluss3steller_land.unl</li><span class="separator">&nbsp;</span><li><a href="#tab_k_astat_abschluss2steller">k_astat_abschluss2steller</a><br> wird geladen aus $SUPERX_DIR/db/install/schluesseltabellen/release_unloads/k_astat_abschluss2steller.unl</li><span class="separator">&nbsp;</span><li><a href="#tab_k_astat_studienfach">k_astat_studienfach</a><br> wird geladen aus $SUPERX_DIR/db/install/schluesseltabellen/release_unloads/k_astat_studienfach.unl</li><span class="separator">&nbsp;</span><li><a href="#tab_k_astat_studienbereich">k_astat_studienbereich</a><br> wird geladen aus $SUPERX_DIR/db/install/schluesseltabellen/release_unloads/k_astat_studienbereich.unl</li><span class="separator">&nbsp;</span><li><a href="#tab_k_astat_faechergruppe">k_astat_faechergruppe</a><br> wird geladen aus $SUPERX_DIR/db/install/schluesseltabellen/release_unloads/k_astat_faechergruppe.unl</li><span class="separator">&nbsp;</span><li><a href="#tab_k_astat_staat">k_astat_staat</a><br> wird geladen aus $SUPERX_DIR/db/install/schluesseltabellen/release_unloads/k_astat_staat.unl</li><span class="separator">&nbsp;</span><li><a href="#tab_k_astat_kontinent">k_astat_kontinent</a><br> wird geladen aus $SUPERX_DIR/db/install/schluesseltabellen/release_unloads/k_astat_kontinent.unl</li><span class="separator">&nbsp;</span><li><a href="#tab_k_astat_abschl_grp">k_astat_abschl_grp</a><br> wird geladen aus $SUPERX_DIR/db/install/schluesseltabellen/release_unloads/k_astat_abschl_grp.unl</li><span class="separator">&nbsp;</span><li><a href="#tab_k_astat_staat_eu">k_astat_staat_eu</a><br> wird geladen aus $SUPERX_DIR/db/install/schluesseltabellen/release_unloads/k_astat_staat_eu.unl</li><span class="separator">&nbsp;</span><span class="separator">&nbsp;</span><span class="separator">&nbsp;</span><span class="separator">&nbsp;</span><span class="separator">&nbsp;</span><li><a href="#tab_dim_datum">dim_datum</a><br> wird geladen aus $SUPERX_DIR/db/install/schluesseltabellen/release_unloads/dim_datum.unl</li><span class="separator">&nbsp;</span><li><a href="#tab_aggre_bland">aggre_bland</a><br> wird geladen aus $SUPERX_DIR/db/install/schluesseltabellen/release_unloads/aggre_bland.unl</li>
       </ol>
       <h3 class="level_3"><a name="etl">ETL-Routine</a></h3>
       <p>Folgende Tabellen werden in der ETL-Routine geladen:</p>

superx/WEB-INF/conf/edustore/db/install/conf/kern.xml

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!--<!DOCTYPE module SYSTEM "../../conf/superx-module.dtd"> -->
-<module name="kern" version="5.2b" sachgebiet_id="0" sachgebiet="Administration"
+<module name="kern" version="5.2" sachgebiet_id="0" sachgebiet="Administration"
 	systeminfo_id="9" system="Administration" thema="Administration"
 	thema_parent="Abfragen">
 	<database name="superx" version="2" system="superx">
@@ -266,7 +266,7 @@
 		</table>
 		<!-- Wenn sich hier Merkmale ändern, müssen auch Kern-Subkonnektoren unload/upload-config geändert werden!-->
 		<table name="sichten" version="3.0" caption="Sichten" thema="Administration" typ="Schlüsseltabelle">
-            <description>Sichten</description>
+            <description>Sichten und Bäume für Hierarchien </description>
 			<columns>
 				<column name="tid" type="SERIAL" size="4" default="" isKey="true" notnull="true" />
 				<column name="parent" type="CHAR" size="255" default=""
@@ -1080,7 +1080,8 @@
 				</rs>
 			</privileges>
 		</table>
-		<table name="cif" version="1.0" thema="Administration" typ="Schlüsseltabelle" releaseUnload="demo">
+		<table name="cif" version="1.0" thema="Administration" typ="Schlüsseltabelle" releaseUnload="demo" caption="cif">
+            <description>Schlüsseltabelle für numerische Schlüssel</description>
 			<columns>
 				<column name="tid" type="INTEGER" size="4" default=""
 					notnull="true" />
@@ -1156,7 +1157,8 @@
 			</privileges>
 		</table>
 		<table name="cifx" version="1.0" thema="Administration" typ="Schlüsseltabelle"
-			releaseUnload="demo">
+			releaseUnload="demo" caption="cifx">
+            <description>Schlüsseltabelle für alphanumerische Schlüssel</description>
 			<columns>
 				<column name="tid" type="INTEGER" size="4" default=""
 					notnull="true" />
@@ -1274,8 +1276,11 @@
 		</table>
 
 		<table name="trans_cifx" version="1.0" thema="Administration"
-			typ="Schlüsseltabelle" releaseUnload="demo">
+			typ="Schlüsseltabelle" releaseUnload="demo" caption="trans_cifx">
+            <description>Transfertabelle für alphanumerische Schlüssel</description>
 			<columns>
+				<column name="tid" type="SERIAL" size="4" default=""
+					notnull="true" />
 				<column name="key" type="SMALLINT" size="2" default=""
 					notnull="true" />
 				<column name="apnr" type="CHAR" size="10" default="" notnull="true" />
@@ -1292,8 +1297,22 @@
 				<index name="trans_cifx_ind" unique="false">
 					<index-column name="sourcesystem_id" />
 				</index>
+				<index name="trans_cifx_ind2" unique="false">
+					<index-column name="cifx_tid" />
+				</index>
 			</indexes>
-			<primaryKeys></primaryKeys>
+			<primaryKeys>
+				<rs>
+					<row>
+						<fld name='table_cat'>superx</fld>
+						<fld name='table_schem'>superx</fld>
+						<fld name='table_name'>trans_cifx</fld>
+						<fld name='column_name'>tid</fld>
+						<fld name='key_seq'>1</fld>
+						<fld name='pk_name'>pk_trans_cifx_tid</fld>
+					</row>
+				</rs>
+			</primaryKeys>
 			<foreignKeys>
 				<rs>
 				</rs>
@@ -1308,7 +1327,8 @@
 			</privileges>
 		</table>
 		<table name="trans_cif" version="1.0" thema="Administration"
-			typ="Schlüsseltabelle" releaseUnload="demo">
+			typ="Schlüsseltabelle" releaseUnload="demo" caption="trans_cif">
+            <description>Transfertabelle für numerische Schlüssel</description>
 			<columns>
 				<column name="key" type="SMALLINT" size="2" default=""
 					notnull="true" />
@@ -1445,7 +1465,8 @@
 		</table>
 		<!-- Wenn sich hier Merkmale ändern, müssen auch Kern-Subkonnektoren unload/upload-config geändert werden!-->
 		<table name="hochschulinfo" version="1.0" thema="Administration"
-			typ="Schlüsseltabelle" releaseUnload="demo">
+			typ="Schlüsseltabelle" releaseUnload="demo" caption="Hochschulinfo">
+            <description>Name und Adresse der Hochschule</description>
 			<columns>
 				<column name="name" type="CHAR" size="100" default=""
 					notnull="true" />
@@ -1768,7 +1789,7 @@
 		<!-- Wenn sich hier Merkmale ändern, müssen auch Kern-Subkonnektoren unload/upload-config geändert werden!-->
 		<table name="themenbaum" version="2.1" thema="Administration"
 			typ="Schlüsseltabelle" caption="Themenbaum">
-            <description>Themenbaum</description>
+            <description>Konfiguration der Menüstruktur</description>
 			<columns>
 				<column name="tid" type="SERIAL" size="4" default="" notnull="false"
 					description="Tid" />
@@ -1951,7 +1972,8 @@
 </table>
 
 		<table name="organigramm" version="2.0" thema="Administration"
-			typ="Schlüsseltabelle" releaseUnload="demo">
+			typ="Schlüsseltabelle" releaseUnload="demo" caption="Organigramm">
+            <description>Liste der Organisationseinheiten</description>
 			<columns>
 				<column name="tid" type="SERIAL" size="4" default=""
 					notnull="true" isKey="true" description="Tupelidentifier" />
@@ -5409,6 +5431,7 @@
 		<column name="abschluss_astat_bund_ktxt" type ="VARCHAR" size ="255" default ="" notnull ="false" description="Abschluss (Bundesschlüssel) Kurztext"/>
 		<column name="abschlussart" type ="VARCHAR" size ="255" default ="" notnull ="false" description="Abschlussart"/>
 		<column name="abschluss_grp" type ="VARCHAR" size ="255" default ="" notnull ="false" description="Abschlussgruppe" />
+		<column name="ist_lehramt" type ="SMALLINT" size ="255" default ="0" notnull ="false" description="Lehramt (J/N)" ><comment>Ist Lehramt=1, nein =0</comment></column>
 	  </columns>
 	  <indexes></indexes>
 	  <primaryKeys>		<rs>
@@ -5542,6 +5565,34 @@
 	       <column name="sortorder" type="VARCHAR" size="255" default="" notnull="" description="Sortierung des Quellsystems" />
 	   </columns>
 	</table>
+	<table name="k_astat_lfb_fg" thema="Administration" releaseUnload="demo" typ="Schlüsseltabelle" > 
+	   <columns>
+			<column name="tid" type ="SERIAL" size ="4" default ="" notnull ="true" />
+			<column name="fgr" type ="CHAR" size ="10" default ="" notnull ="false" />
+			<column name="fgr_str" type ="CHAR" size ="255" default ="" notnull ="false" />
+			<column name="lfb" type ="CHAR" size ="10" default ="" notnull ="false" />
+			<column name="lfb_str" type ="CHAR" size ="255" default ="" notnull ="false" />
+			<column name="fg" type ="CHAR" size ="10" default ="" notnull ="false" />
+			<column name="fg_str" type ="VARCHAR" size ="255" default ="" notnull ="false" />
+			<column name="gueltig_von" type ="DATE" size ="255" default ="" notnull ="false" />
+			<column name="gueltig_bis" type ="DATE" size ="255" default ="" notnull ="false" />
+	   </columns>
+	   <indexes></indexes>
+		<primaryKeys><rs>
+			<row>
+				<fld name='table_cat'></fld>
+				<fld name='table_schem'>public</fld>
+				<fld name='table_name'>k_astat_lfb_fg</fld>
+				<fld name='column_name'>tid</fld>
+				<fld name='key_seq'>1</fld>
+				<fld name='pk_name'>pk_k_astat_lfb_fg</fld>
+			</row>
+		</rs></primaryKeys>
+		<foreignKeys></foreignKeys>
+		<importedKeys></importedKeys>
+		<privileges><rs>
+		</rs></privileges>
+	</table>
 
 		<themen>
 			<thema name="Administration" parent="Abfragen"></thema>
@@ -10348,6 +10399,11 @@ gueltig_bis DATE
 					<file
 						path="$SUPERX_DIR/db/install/schluesseltabellen/release_unloads/k_astat_studienbereich.unl" />
 				</loadtable>
+				<loadtable refresh="true" delimiter="^" header="false"
+					tabname="k_astat_faechergruppe">
+					<file
+						path="$SUPERX_DIR/db/install/schluesseltabellen/release_unloads/k_astat_faechergruppe.unl" />
+				</loadtable>
 				<loadtable refresh="true" delimiter="^" header="false"
 					tabname="k_astat_staat">
 					<file
@@ -10358,11 +10414,6 @@ gueltig_bis DATE
 					<file
 						path="$SUPERX_DIR/db/install/schluesseltabellen/release_unloads/k_astat_kontinent.unl" />
 				</loadtable>
-				<loadtable refresh="true" delimiter="^" header="false"
-					tabname="k_astat_faechergruppe">
-					<file
-						path="$SUPERX_DIR/db/install/schluesseltabellen/release_unloads/k_astat_faechergruppe.unl" />
-				</loadtable>
 				<loadtable refresh="true" delimiter="^" header="false"
 					tabname="k_astat_abschl_grp">
 					<file
@@ -10374,6 +10425,7 @@ gueltig_bis DATE
 						path="$SUPERX_DIR/db/install/schluesseltabellen/release_unloads/k_astat_staat_eu.unl" />
 				</loadtable>
 
+
 			</action>
 			<action>
 				<nativeaction sql="" scriptfile="$SUPERX_DIR/db/install/upgrade/kern_drop_views_ids.sql" database="INFORMIX"/>

superx/WEB-INF/conf/edustore/db/install/conf/kern_load.html

@@ -92,7 +92,7 @@ font-style:italic:
 <td class="themenspalte">SuperX-Version</td><td>2</td>
 </tr>
 <tr>
-<td class="themenspalte">Modulversion</td><td>5.2b</td>
+<td class="themenspalte">Modulversion</td><td>5.2</td>
 </tr>
 <tr>
 <td class="themenspalte">Sachgebiet</td><td>Administration id 0</td>

superx/WEB-INF/conf/edustore/db/install/conf/module_alter_table_schema.x

@@ -144,3 +144,4 @@ DOQUERY "alter table arch_table SET SCHEMA $SCHEMA;"
 DOQUERY "alter table arch_datum SET SCHEMA $SCHEMA;"
 DOQUERY "alter table k_prio_param SET SCHEMA $SCHEMA;"
 DOQUERY "alter table k_source SET SCHEMA $SCHEMA;"
+DOQUERY "alter table k_astat_lfb_fg SET SCHEMA $SCHEMA;"

superx/WEB-INF/conf/edustore/db/install/conf/module_grant.x

@@ -73,6 +73,12 @@ DOQUERY "grant $RIGHT on aggre_bland to $GRANTEE;"
 DOQUERY "grant $RIGHT on cif to $GRANTEE;"
 DOQUERY "grant $RIGHT on cifx to $GRANTEE;"
 DOQUERY "grant $RIGHT on trans_cifx to $GRANTEE;"
+
+if [ "$DATABASE" == "POSTGRES" -a "$RIGHT" != "select" ]
+	then
+DOQUERY "grant  update on trans_cifx_tid_seq to $GRANTEE;"
+fi
+
 DOQUERY "grant $RIGHT on trans_cif to $GRANTEE;"
 DOQUERY "grant $RIGHT on cifx_customize to $GRANTEE;"
 
@@ -474,6 +480,13 @@ if [ "$DATABASE" == "POSTGRES" -a "$RIGHT" != "select" ]
 DOQUERY "grant  update on k_source_id_seq to $GRANTEE;"
 fi
 
+DOQUERY "grant $RIGHT on k_astat_lfb_fg to $GRANTEE;"
+
+if [ "$DATABASE" == "POSTGRES" -a "$RIGHT" != "select" ]
+	then
+DOQUERY "grant  update on k_astat_lfb_fg_tid_seq to $GRANTEE;"
+fi
+
 
 #Besonderheit Kernmodul: 
 #Zum Login braucht man Update Rechte auf einzelne Tabellen:"

superx/WEB-INF/conf/edustore/db/install/conf/module_metadata.sql

@@ -2,7 +2,7 @@
 --SQL Script automatisch generiert von SuperX module_upgrade.xsl
 
 delete from db_version  where his_system='kern';
-insert into db_version (his_system,version,systeminfo_id) values('kern','5.2b',9);
+insert into db_version (his_system,version,systeminfo_id) values('kern','5.2',9);
 
  
 CREATE temp TABLE tmp_db_forms (

superx/WEB-INF/conf/edustore/db/install/conf/module_revoke.x

@@ -73,6 +73,12 @@ DOQUERY "revoke $RIGHT on aggre_bland from $GRANTEE;"
 DOQUERY "revoke $RIGHT on cif from $GRANTEE;"
 DOQUERY "revoke $RIGHT on cifx from $GRANTEE;"
 DOQUERY "revoke $RIGHT on trans_cifx from $GRANTEE;"
+
+if [ "$DATABASE" == "POSTGRES" -a "$RIGHT" != "select" ]
+	then
+DOQUERY "revoke  update on trans_cifx_tid_seq from $GRANTEE;"
+fi
+
 DOQUERY "revoke $RIGHT on trans_cif from $GRANTEE;"
 DOQUERY "revoke $RIGHT on cifx_customize from $GRANTEE;"
 
@@ -474,6 +480,13 @@ if [ "$DATABASE" == "POSTGRES" -a "$RIGHT" != "select" ]
 DOQUERY "revoke  update on k_source_id_seq from $GRANTEE;"
 fi
 
+DOQUERY "revoke $RIGHT on k_astat_lfb_fg from $GRANTEE;"
+
+if [ "$DATABASE" == "POSTGRES" -a "$RIGHT" != "select" ]
+	then
+DOQUERY "revoke  update on k_astat_lfb_fg_tid_seq from $GRANTEE;"
+fi
+
 #Views:
 DOQUERY "revoke $RIGHT on user_groups from $GRANTEE;"
 DOQUERY "revoke $RIGHT on menu_element_fieldmode from $GRANTEE;"

superx/WEB-INF/conf/edustore/db/install/conf/sx_fields_fuellen.sql

@@ -7218,6 +7218,28 @@ values('k_astat_abschl_grp',
 0,
 1);
 
+insert into tmp_fields (
+table_name,
+name,
+caption,
+description,
+field_type,
+field_size,
+field_not_null,
+currentlyUsed,
+check_integrity,
+is_sum) 
+values('k_astat_abschl_grp',
+'ist_lehramt',
+'Lehramt (J/N)',
+'Ist Lehramt=1, nein =0',
+'SMALLINT',
+'255',
+0,
+1,
+0,
+1);
+
 insert into tmp_fields (
 table_name,
 name,
@@ -7573,6 +7595,207 @@ values('k_astat_kontinent',
 0,
 1);
 
+insert into tmp_fields (
+table_name,
+name,
+caption,
+description,
+field_type,
+field_size,
+field_not_null,
+currentlyUsed,
+check_integrity,
+is_sum) 
+values('k_astat_lfb_fg',
+'tid',
+'tid',
+'',
+'SERIAL',
+'4',
+1,
+1,
+0,
+1);
+
+update tmp_fields set is_primarykey=1 
+where trim(table_name) || '_' || trim(name) ='k_astat_lfb_fg_tid';
+
+insert into tmp_fields (
+table_name,
+name,
+caption,
+description,
+field_type,
+field_size,
+field_not_null,
+currentlyUsed,
+check_integrity,
+is_sum) 
+values('k_astat_lfb_fg',
+'fgr',
+'fgr',
+'',
+'CHAR',
+'10',
+0,
+1,
+0,
+1);
+
+insert into tmp_fields (
+table_name,
+name,
+caption,
+description,
+field_type,
+field_size,
+field_not_null,
+currentlyUsed,
+check_integrity,
+is_sum) 
+values('k_astat_lfb_fg',
+'fgr_str',
+'fgr_str',
+'',
+'CHAR',
+'255',
+0,
+1,
+0,
+1);
+
+insert into tmp_fields (
+table_name,
+name,
+caption,
+description,
+field_type,
+field_size,
+field_not_null,
+currentlyUsed,
+check_integrity,
+is_sum) 
+values('k_astat_lfb_fg',
+'lfb',
+'lfb',
+'',
+'CHAR',
+'10',
+0,
+1,
+0,
+1);
+
+insert into tmp_fields (
+table_name,
+name,
+caption,
+description,
+field_type,
+field_size,
+field_not_null,
+currentlyUsed,
+check_integrity,
+is_sum) 
+values('k_astat_lfb_fg',
+'lfb_str',
+'lfb_str',
+'',
+'CHAR',
+'255',
+0,
+1,
+0,
+1);
+
+insert into tmp_fields (
+table_name,
+name,
+caption,
+description,
+field_type,
+field_size,
+field_not_null,
+currentlyUsed,
+check_integrity,
+is_sum) 
+values('k_astat_lfb_fg',
+'fg',
+'fg',
+'',
+'CHAR',
+'10',
+0,
+1,
+0,
+1);
+
+insert into tmp_fields (
+table_name,
+name,
+caption,
+description,
+field_type,
+field_size,
+field_not_null,
+currentlyUsed,
+check_integrity,
+is_sum) 
+values('k_astat_lfb_fg',
+'fg_str',
+'fg_str',
+'',
+'VARCHAR',
+'255',
+0,
+1,
+0,
+1);
+
+insert into tmp_fields (
+table_name,
+name,
+caption,
+description,
+field_type,
+field_size,
+field_not_null,
+currentlyUsed,
+check_integrity,
+is_sum) 
+values('k_astat_lfb_fg',
+'gueltig_von',
+'gueltig_von',
+'',
+'DATE',
+'255',
+0,
+1,
+0,
+1);
+
+insert into tmp_fields (
+table_name,
+name,
+caption,
+description,
+field_type,
+field_size,
+field_not_null,
+currentlyUsed,
+check_integrity,
+is_sum) 
+values('k_astat_lfb_fg',
+'gueltig_bis',
+'gueltig_bis',
+'',
+'DATE',
+'255',
+0,
+1,
+0,
+1);
+
 insert into tmp_fields (
 table_name,
 name,
@@ -18692,6 +18915,31 @@ values('trans_cif',
 0,
 1);
 
+insert into tmp_fields (
+table_name,
+name,
+caption,
+description,
+field_type,
+field_size,
+field_not_null,
+currentlyUsed,
+check_integrity,
+is_sum) 
+values('trans_cifx',
+'tid',
+'tid',
+'',
+'SERIAL',
+'4',
+1,
+1,
+0,
+1);
+
+update tmp_fields set is_primarykey=1 
+where trim(table_name) || '_' || trim(name) ='trans_cifx_tid';
+
 insert into tmp_fields (
 table_name,
 name,

superx/WEB-INF/conf/edustore/db/install/conf/sx_fields_loeschen.sql

@@ -1926,6 +1926,12 @@ name)
 values('k_astat_abschl_grp',
 'abschluss_grp');
 
+insert into tmp_fields (
+table_name,
+name) 
+values('k_astat_abschl_grp',
+'ist_lehramt');
+
 insert into tmp_fields (
 table_name,
 name) 
@@ -2022,6 +2028,60 @@ name)
 values('k_astat_kontinent',
 'name');
 
+insert into tmp_fields (
+table_name,
+name) 
+values('k_astat_lfb_fg',
+'tid');
+
+insert into tmp_fields (
+table_name,
+name) 
+values('k_astat_lfb_fg',
+'fgr');
+
+insert into tmp_fields (
+table_name,
+name) 
+values('k_astat_lfb_fg',
+'fgr_str');
+
+insert into tmp_fields (
+table_name,
+name) 
+values('k_astat_lfb_fg',
+'lfb');
+
+insert into tmp_fields (
+table_name,
+name) 
+values('k_astat_lfb_fg',
+'lfb_str');
+
+insert into tmp_fields (
+table_name,
+name) 
+values('k_astat_lfb_fg',
+'fg');
+
+insert into tmp_fields (
+table_name,
+name) 
+values('k_astat_lfb_fg',
+'fg_str');
+
+insert into tmp_fields (
+table_name,
+name) 
+values('k_astat_lfb_fg',
+'gueltig_von');
+
+insert into tmp_fields (
+table_name,
+name) 
+values('k_astat_lfb_fg',
+'gueltig_bis');
+
 insert into tmp_fields (
 table_name,
 name) 
@@ -4938,6 +4998,12 @@ name)
 values('trans_cif',
 'systeminfo_id');
 
+insert into tmp_fields (
+table_name,
+name) 
+values('trans_cifx',
+'tid');
+
 insert into tmp_fields (
 table_name,
 name) 

superx/WEB-INF/conf/edustore/db/install/conf/sx_tables_fuellen.sql

@@ -48,7 +48,7 @@ values('arch_table','','',
 0);
 
 insert into tmp_tables (name,caption,description,table_type,systeminfo_id,systeminfo_orig,thema,sachgebiete_id) 
-values('cif','','',
+values('cif','cif','Schlüsseltabelle für numerische Schlüssel',
 'Schlüsseltabelle',
 9,
 9,
@@ -56,7 +56,7 @@ values('cif','','',
 0);
 
 insert into tmp_tables (name,caption,description,table_type,systeminfo_id,systeminfo_orig,thema,sachgebiete_id) 
-values('cifx','','',
+values('cifx','cifx','Schlüsseltabelle für alphanumerische Schlüssel',
 'Schlüsseltabelle',
 9,
 9,
@@ -344,7 +344,7 @@ values('hisinone_deleted_entity','','Entities die in HISinOne gelöscht wurden.'
 0);
 
 insert into tmp_tables (name,caption,description,table_type,systeminfo_id,systeminfo_orig,thema,sachgebiete_id) 
-values('hochschulinfo','','',
+values('hochschulinfo','Hochschulinfo','Name und Adresse der Hochschule',
 'Schlüsseltabelle',
 9,
 9,
@@ -399,6 +399,14 @@ values('k_astat_kontinent','Kontinent-Schlüssel (Bundesschlüssel)','',
 'Stammdaten verwalten',
 0);
 
+insert into tmp_tables (name,caption,description,table_type,systeminfo_id,systeminfo_orig,thema,sachgebiete_id) 
+values('k_astat_lfb_fg','','',
+'Schlüsseltabelle',
+9,
+9,
+'Administration',
+0);
+
 insert into tmp_tables (name,caption,description,table_type,systeminfo_id,systeminfo_orig,thema,sachgebiete_id) 
 values('k_astat_staat','Amtl.Staaten-Schlüssel (Bundesschlüssel)','',
 'Schlüsseltabelle',
@@ -600,7 +608,7 @@ values('nachricht','','',
 0);
 
 insert into tmp_tables (name,caption,description,table_type,systeminfo_id,systeminfo_orig,thema,sachgebiete_id) 
-values('organigramm','','',
+values('organigramm','Organigramm','Liste der Organisationseinheiten',
 'Schlüsseltabelle',
 9,
 9,
@@ -720,7 +728,7 @@ values('sichtart_rechttabelle','','',
 0);
 
 insert into tmp_tables (name,caption,description,table_type,systeminfo_id,systeminfo_orig,thema,sachgebiete_id) 
-values('sichten','Sichten','Sichten',
+values('sichten','Sichten','Sichten und Bäume für Hierarchien ',
 'Schlüsseltabelle',
 9,
 9,
@@ -872,7 +880,7 @@ values('systeminfo','','',
 0);
 
 insert into tmp_tables (name,caption,description,table_type,systeminfo_id,systeminfo_orig,thema,sachgebiete_id) 
-values('themenbaum','Themenbaum','Themenbaum',
+values('themenbaum','Themenbaum','Konfiguration der Menüstruktur',
 'Schlüsseltabelle',
 9,
 9,
@@ -888,7 +896,7 @@ values('themenbaum_bak','','',
 0);
 
 insert into tmp_tables (name,caption,description,table_type,systeminfo_id,systeminfo_orig,thema,sachgebiete_id) 
-values('trans_cif','','',
+values('trans_cif','trans_cif','Transfertabelle für numerische Schlüssel',
 'Schlüsseltabelle',
 9,
 9,
@@ -896,7 +904,7 @@ values('trans_cif','','',
 0);
 
 insert into tmp_tables (name,caption,description,table_type,systeminfo_id,systeminfo_orig,thema,sachgebiete_id) 
-values('trans_cifx','','',
+values('trans_cifx','trans_cifx','Transfertabelle für alphanumerische Schlüssel',
 'Schlüsseltabelle',
 9,
 9,

superx/WEB-INF/conf/edustore/db/install/kern_backup.x

@@ -57,7 +57,7 @@ DOQUERY "select groupinfo_id, maskeninfo_id from group_masken_bez;" false $DBDEL
 DOQUERY "select tid, bland, text from aggre_bland;" false $DBDELIMITER ${BACKUP_PFAD_INDIVIDUELL_MODULE}/aggre_bland.unl txt
 DOQUERY "select tid, hs, key, apnr, d_akt_von, d_akt_bis, kurz, druck, lang_1, lang_2, lang_3, sort1, uniquename from cif;" false $DBDELIMITER ${BACKUP_PFAD_INDIVIDUELL_MODULE}/cif.unl txt
 DOQUERY "select tid, hs, key, apnr, d_akt_von, d_akt_bis, kurz, druck, lang_1, lang_2, lang_3, parent, parent_int, filter, refapnr, astat, bund_apnr, land_apnr, hiskey_id, uniquename, sort1, sort2, sort3, sortc1, sortc2, sourcesystem, sourcesystem_id, intern_int, intern_c, sprache, struktur_int, struktur_c, ebene, lid, parent_lid from cifx;" false $DBDELIMITER ${BACKUP_PFAD_INDIVIDUELL_MODULE}/cifx.unl txt
-DOQUERY "select key, apnr, cifx_tid, sourcesystem, sourcesystem_id, systeminfo_id from trans_cifx;" false $DBDELIMITER ${BACKUP_PFAD_INDIVIDUELL_MODULE}/trans_cifx.unl txt
+DOQUERY "select tid, key, apnr, cifx_tid, sourcesystem, sourcesystem_id, systeminfo_id from trans_cifx;" false $DBDELIMITER ${BACKUP_PFAD_INDIVIDUELL_MODULE}/trans_cifx.unl txt
 DOQUERY "select key, apnr, cif_tid, sourcesystem, sourcesystem_id, systeminfo_id from trans_cif;" false $DBDELIMITER ${BACKUP_PFAD_INDIVIDUELL_MODULE}/trans_cif.unl txt
 DOQUERY "select tid, cifx_table, key, apnr, kurz, druck, lang_1, uniquename from cifx_customize;" false $DBDELIMITER ${BACKUP_PFAD_INDIVIDUELL_MODULE}/cifx_customize.unl txt
 DOQUERY "select tid, name, nummer, x, y, buttonbreite, feldbreite, zeilenanzahl, typ, laenge, obligatorisch, art, relation, attribut, defaultwert from felderinfo;" false $DBDELIMITER ${BACKUP_PFAD_INDIVIDUELL_MODULE}/felderinfo.unl txt
@@ -154,7 +154,7 @@ DOQUERY "select schluessel, name, sb from k_astat_studienfach;" false $DBDELIMIT
 DOQUERY "select schluessel, nummer, name, kennz, kontinent from k_astat_staat;" false $DBDELIMITER ${BACKUP_PFAD_INDIVIDUELL_MODULE}/k_astat_staat.unl txt
 DOQUERY "select schluessel, nummer, name from k_astat_kontinent;" false $DBDELIMITER ${BACKUP_PFAD_INDIVIDUELL_MODULE}/k_astat_kontinent.unl txt
 DOQUERY "select schluessel, name from k_astat_faechergruppe;" false $DBDELIMITER ${BACKUP_PFAD_INDIVIDUELL_MODULE}/k_astat_faechergruppe.unl txt
-DOQUERY "select abschluss_astat_bund, abschluss_astat_bund_ktxt, abschlussart, abschluss_grp from k_astat_abschl_grp;" false $DBDELIMITER ${BACKUP_PFAD_INDIVIDUELL_MODULE}/k_astat_abschl_grp.unl txt
+DOQUERY "select abschluss_astat_bund, abschluss_astat_bund_ktxt, abschlussart, abschluss_grp, ist_lehramt from k_astat_abschl_grp;" false $DBDELIMITER ${BACKUP_PFAD_INDIVIDUELL_MODULE}/k_astat_abschl_grp.unl txt
 DOQUERY "select tid, astat, eu, semester_von, semester_bis, gueltig_von, gueltig_bis from k_astat_staat_eu;" false $DBDELIMITER ${BACKUP_PFAD_INDIVIDUELL_MODULE}/k_astat_staat_eu.unl txt
 DOQUERY "select tid, pop3_host, pop3_port, pop3_starttls_enable, smtp_host, smtp_port, smtp_auth, smtp_starttls_enable, username, password, userinfo_id, type, daemon1, daemon1_interval, daemon1_loglevel, daemon2, daemon2_interval, daemon3, daemon3_interval from sx_mail;" false $DBDELIMITER ${BACKUP_PFAD_INDIVIDUELL_MODULE}/sx_mail.unl txt
 DOQUERY "select id, caption, sortorder, colors from colorscheme;" false $DBDELIMITER ${BACKUP_PFAD_INDIVIDUELL_MODULE}/colorscheme.unl txt
@@ -162,6 +162,7 @@ DOQUERY "select id, name, zeitfeld from arch_table;" false $DBDELIMITER ${BACKUP
 DOQUERY "select arch_table, datum, bezugszeit_von, bezugszeit_bis, bezugsart, userinfo_id, kommentar from arch_datum;" false $DBDELIMITER ${BACKUP_PFAD_INDIVIDUELL_MODULE}/arch_datum.unl txt
 DOQUERY "select id, name, sortorder from k_prio_param;" false $DBDELIMITER ${BACKUP_PFAD_INDIVIDUELL_MODULE}/k_prio_param.unl txt
 DOQUERY "select id, name, sortorder from k_source;" false $DBDELIMITER ${BACKUP_PFAD_INDIVIDUELL_MODULE}/k_source.unl txt
+DOQUERY "select tid, fgr, fgr_str, lfb, lfb_str, fg, fg_str, gueltig_von, gueltig_bis from k_astat_lfb_fg;" false $DBDELIMITER ${BACKUP_PFAD_INDIVIDUELL_MODULE}/k_astat_lfb_fg.unl txt
 
 
 echo "Finished unloading"

superx/WEB-INF/conf/edustore/db/install/kern_drop_ids.sql

@@ -174,6 +174,7 @@ drop table arch_table cascade;
 drop table arch_datum cascade;
 drop table k_prio_param cascade;
 drop table k_source cascade;
+drop table k_astat_lfb_fg cascade;
 
 
 ! echo "Uninstall-Actions"

superx/WEB-INF/conf/edustore/db/install/kern_drop_pg.sql

@@ -211,6 +211,7 @@ drop table if exists arch_table cascade;
 drop table if exists arch_datum cascade;
 drop table if exists k_prio_param cascade;
 drop table if exists k_source cascade;
+drop table if exists k_astat_lfb_fg cascade;
 
 
 select now(), 'Uninstall-Actions';

superx/WEB-INF/conf/edustore/db/install/kern_indexes_drop.sql

@@ -11,6 +11,7 @@ drop  index ix_group_felder2 ;
 	drop  index cifx_ind2 ;
 	drop  index cifx_ind3 ;
 	drop  index trans_cifx_ind ;
+	drop  index trans_cifx_ind2 ;
 	drop  index trans_cif_ind ;
 	drop  index i_userinfo ;
 	drop  index i_orga ;

superx/WEB-INF/conf/edustore/db/install/kern_indexes_ids.sql

@@ -83,6 +83,12 @@ apnr );
 create  index trans_cifx_ind on trans_cifx (sourcesystem_id );
 
 
+! echo "Erzeuge Index trans_cifx_ind2"
+! echo `date`
+ 
+create  index trans_cifx_ind2 on trans_cifx (cifx_tid );
+
+
 ! echo "Erzeuge Index trans_cif_ind"
 ! echo `date`
  

superx/WEB-INF/conf/edustore/db/install/kern_indexes_pg.sql

@@ -70,6 +70,11 @@ select now(), 'Erzeuge Index trans_cifx_ind';
 create  index trans_cifx_ind on trans_cifx (sourcesystem_id );
 
 
+select now(), 'Erzeuge Index trans_cifx_ind2';
+
+create  index trans_cifx_ind2 on trans_cifx (cifx_tid );
+
+
 select now(), 'Erzeuge Index trans_cif_ind';
 
 create  index trans_cif_ind on trans_cif (sourcesystem_id );

superx/WEB-INF/conf/edustore/db/install/kern_install_ids.sql

@@ -691,12 +691,15 @@ apnr );
 ! echo `date`
  
 create table trans_cifx(
-	key SMALLINT  not null, 
+	tid SERIAL  not null, 
+key SMALLINT  not null, 
 apnr CHAR(10)  not null, 
 cifx_tid INTEGER , 
 sourcesystem INTEGER  not null, 
 sourcesystem_id NVARCHAR(255) , 
-systeminfo_id INTEGER 
+systeminfo_id INTEGER ,
+	primary key (tid)
+	constraint pk_trans_cifx_tid
 ) 
 ;
 
@@ -709,6 +712,12 @@ systeminfo_id INTEGER
 create  index trans_cifx_ind on trans_cifx (sourcesystem_id );
 
 
+! echo "Erzeuge Index trans_cifx_ind2"
+! echo `date`
+ 
+create  index trans_cifx_ind2 on trans_cifx (cifx_tid );
+
+
 ! echo "Tabelle trans_cifx erzeugt"
 ! echo `date`
  
@@ -3320,7 +3329,8 @@ create table k_astat_abschl_grp(
 	abschluss_astat_bund NVARCHAR(255)  not null, 
 abschluss_astat_bund_ktxt NVARCHAR(255) , 
 abschlussart NVARCHAR(255) , 
-abschluss_grp NVARCHAR(255) ,
+abschluss_grp NVARCHAR(255) , 
+ist_lehramt SMALLINT  default 0 ,
 	primary key (abschluss_astat_bund)
 	constraint pk_k_astat_abschl_grp
 ) 
@@ -3495,6 +3505,32 @@ sortorder NVARCHAR(255)
  
 
 
+! echo "Erzeuge Tabelle k_astat_lfb_fg"
+! echo `date`
+ 
+create table k_astat_lfb_fg(
+	tid SERIAL  not null, 
+fgr CHAR(10) , 
+fgr_str NCHAR(255) , 
+lfb CHAR(10) , 
+lfb_str NCHAR(255) , 
+fg CHAR(10) , 
+fg_str NVARCHAR(255) , 
+gueltig_von DATE , 
+gueltig_bis DATE ,
+	primary key (tid)
+	constraint pk_k_astat_lfb_fg
+) 
+;
+
+
+
+
+! echo "Tabelle k_astat_lfb_fg erzeugt"
+! echo `date`
+ 
+
+
 ! echo "Erzeuge View user_groups"
 ! echo `date`
  
@@ -4379,7 +4415,7 @@ end procedure;
  
 
 delete from db_version  where his_system='kern';
-insert into db_version (his_system,version,systeminfo_id) values('kern','5.2b',9);
+insert into db_version (his_system,version,systeminfo_id) values('kern','5.2',9);
 
 
 
@@ -4654,6 +4690,8 @@ delete from db_tabellen where name='k_prio_param';
 insert into db_tabellen (name,protokollierung) values('k_prio_param',0);
 delete from db_tabellen where name='k_source';
 insert into db_tabellen (name,protokollierung) values('k_source',0);
+delete from db_tabellen where name='k_astat_lfb_fg';
+insert into db_tabellen (name,protokollierung) values('k_astat_lfb_fg',0);
 
 
 ! echo "Fülle sachgebiete, systeminfo und themenbaum"

superx/WEB-INF/conf/edustore/db/install/kern_install_pg.sql

@@ -250,7 +250,7 @@ aktiv SMALLINT  default 1 ,
 
 
 
-comment on table sichten is 'Sichten';
+comment on table sichten is 'Sichten und Bäume für Hierarchien ';
 
 comment on column sichten.parent is 'Übergeordnete Sicht';
 
@@ -665,6 +665,8 @@ uniquename VARCHAR(255) ,
 
 
 
+comment on table cif is 'Schlüsseltabelle für numerische Schlüssel';
+
 comment on column cif.uniquename is 'Schlüssel';
 
 
@@ -724,6 +726,8 @@ parent_lid VARCHAR(255) ,
 
 
 
+comment on table cifx is 'Schlüsseltabelle für alphanumerische Schlüssel';
+
 comment on column cifx.druck is 'Drucktext';
 
 comment on column cifx.parent is 'übergeordn. Element';
@@ -774,17 +778,22 @@ select now(), 'Tabelle cifx erzeugt';
 select now(), 'Erzeuge Tabelle trans_cifx';
 
 create table trans_cifx(
-	key SMALLINT  not null, 
+	tid SERIAL  not null, 
+key SMALLINT  not null, 
 apnr CHAR(10)  not null, 
 cifx_tid INTEGER , 
 sourcesystem INTEGER  not null, 
 sourcesystem_id VARCHAR(255) , 
-systeminfo_id INTEGER 
+systeminfo_id INTEGER , 
+	constraint pk_trans_cifx_tid primary key (tid)
+
 ) 
 ;
 
 
 
+comment on table trans_cifx is 'Transfertabelle für alphanumerische Schlüssel';
+
 comment on column trans_cifx.sourcesystem is 'Vorsystem';
 
 comment on column trans_cifx.sourcesystem_id is 'ID im Vorsystem';
@@ -795,6 +804,11 @@ select now(), 'Erzeuge Index trans_cifx_ind';
 create  index trans_cifx_ind on trans_cifx (sourcesystem_id );
 
 
+select now(), 'Erzeuge Index trans_cifx_ind2';
+
+create  index trans_cifx_ind2 on trans_cifx (cifx_tid );
+
+
 select now(), 'Tabelle trans_cifx erzeugt';
 
 
@@ -813,6 +827,8 @@ systeminfo_id INTEGER
 
 
 
+comment on table trans_cif is 'Transfertabelle für numerische Schlüssel';
+
 comment on column trans_cif.sourcesystem is 'Vorsystem';
 
 comment on column trans_cif.sourcesystem_id is 'ID im Vorsystem';
@@ -913,6 +929,8 @@ passwd CHAR(16) ,
 
 
 
+comment on table hochschulinfo is 'Name und Adresse der Hochschule';
+
 comment on column hochschulinfo.hs_nr is 'Hochschulnummer (HIS)';
 
 
@@ -1097,7 +1115,7 @@ css_class VARCHAR(255) ,
 
 
 
-comment on table themenbaum is 'Themenbaum';
+comment on table themenbaum is 'Konfiguration der Menüstruktur';
 
 comment on column themenbaum.tid is 'Tid';
 
@@ -1225,6 +1243,8 @@ nodeattrib SMALLINT
 
 
 
+comment on table organigramm is 'Liste der Organisationseinheiten';
+
 comment on column organigramm.tid is 'Tupelidentifier';
 
 comment on column organigramm.key_apnr is 'Schlüssel';
@@ -4209,6 +4229,7 @@ create table k_astat_abschl_grp(
 abschluss_astat_bund_ktxt VARCHAR(255) , 
 abschlussart VARCHAR(255) , 
 abschluss_grp VARCHAR(255) , 
+ist_lehramt SMALLINT  default 0 , 
 	constraint pk_k_astat_abschl_grp primary key (abschluss_astat_bund)
 
 ) 
@@ -4224,6 +4245,8 @@ comment on column k_astat_abschl_grp.abschlussart is 'Abschlussart';
 
 comment on column k_astat_abschl_grp.abschluss_grp is 'Abschlussgruppe';
 
+comment on column k_astat_abschl_grp.ist_lehramt is 'Lehramt (J/N)';
+
 
 select now(), 'Tabelle k_astat_abschl_grp erzeugt';
 
@@ -4459,6 +4482,30 @@ select now(), 'Tabelle k_source erzeugt';
 
 
 
+select now(), 'Erzeuge Tabelle k_astat_lfb_fg';
+
+create table k_astat_lfb_fg(
+	tid SERIAL  not null, 
+fgr CHAR(10) , 
+fgr_str CHAR(255) , 
+lfb CHAR(10) , 
+lfb_str CHAR(255) , 
+fg CHAR(10) , 
+fg_str VARCHAR(255) , 
+gueltig_von DATE , 
+gueltig_bis DATE , 
+	constraint pk_k_astat_lfb_fg primary key (tid)
+
+) 
+;
+
+
+
+
+select now(), 'Tabelle k_astat_lfb_fg erzeugt';
+
+
+
 select now(), 'Erzeuge View user_groups';
 
 create view user_groups(
@@ -5356,7 +5403,7 @@ select now(), 'Fülle db_version';
 
 
 delete from db_version  where his_system='kern';
-insert into db_version (his_system,version,systeminfo_id) values('kern','5.2b',9);
+insert into db_version (his_system,version,systeminfo_id) values('kern','5.2',9);
 
 
 
@@ -5630,6 +5677,8 @@ delete from db_tabellen where name='k_prio_param';
 insert into db_tabellen (name,protokollierung) values('k_prio_param',0);
 delete from db_tabellen where name='k_source';
 insert into db_tabellen (name,protokollierung) values('k_source',0);
+delete from db_tabellen where name='k_astat_lfb_fg';
+insert into db_tabellen (name,protokollierung) values('k_astat_lfb_fg',0);
 
 
 select now(), 'Fülle sachgebiete, systeminfo und themenbaum';

superx/WEB-INF/conf/edustore/db/install/kern_restore.x

@@ -137,6 +137,7 @@ sx_auto_upload_table.x arch_table tmp"$MANDANTENID"/arch_table.unl
 sx_auto_upload_table.x arch_datum tmp"$MANDANTENID"/arch_datum.unl
 sx_auto_upload_table.x k_prio_param tmp"$MANDANTENID"/k_prio_param.unl
 sx_auto_upload_table.x k_source tmp"$MANDANTENID"/k_source.unl
+sx_auto_upload_table.x k_astat_lfb_fg tmp"$MANDANTENID"/k_astat_lfb_fg.unl
 
 
 echo 'Finished restoring'

superx/WEB-INF/conf/edustore/db/install/schluesseltabellen/release_unloads/k_astat_abschl_grp.unl

@@ -1,98 +1,98 @@
-70^staatl.Prf^A9^G_Abschlus^
-71^Bühnen-/Ko^A23^G_Konzerte^
-72^Privatmusi^A9^G_Abschlus^
-01^MFB mLaU^A24^G_Bachelor^
-02^Magister^A3^G_Magister^
-03^Lizentiat^A7^G_Lizentia^
-04^kirchliche^A8^G_Kirchlic^
-05^akad.gepr.^A9^G_Abschlus^
-06^Promotion^PROM^G_Prom^
-07^Prom.ohne^PROM^G_Prom^
-08^Staatsexam^A5^G_Staatsex^
-09^Staatsexam^A5^G_Staatsex^
-10^Fakultätsp^A4^G_Fakultät^
-11^Diplom Uni^A1^G_Diplom^
-12^Diplom Uni^A1^G_Diplom^
-13^Diplom Uni^A1^G_Diplom^
-14^Diplom I U^A2^G_Diplom^
-17^AbschlPrfg^A9^G_Abschlus^
-18^Diplom Leh^A40^G_Diplom^
-19^LA Ba G/P^A24^G_Bachelor^
-20^LA Grund-u^A12^G_Lehramt^
-21^LA Grundsc^A10^G_Lehramt^
-22^LA Hauptsc^A13^G_Lehramt^
-23^LA Realsch^A15^G_Lehramt^
-24^LA Haupt-u^A14^G_Lehramt^
-25^LA Gymnasi^A17^G_Lehramt^
-26^LA Sonders^A25^G_Lehramt^
-27^LA Berufss^A19^G_Lehramt^
-28^LA Sekund.^A16^G_Lehramt^
-29^sonst.LA n^A40^G_Diplom^
-30^LA Master^A37^G_Master^
-31^LA Ba swkD^A24^G_Bachelor^
-32^LA Ba SI/P^A24^G_Bachelor^
-33^LA Ba G/SI^A24^G_Bachelor^
-34^LA Ba Real^A24^G_Bachelor^
-35^LA Ba UuMG^A24^G_Bachelor^
-36^LA Ba M/SI^A24^G_Bachelor^
-37^LA Ba S2/S^A24^G_Bachelor^
-38^LA Ba Gym^A24^G_Bachelor^
-39^LA Ba Oall^A24^G_Bachelor^
-40^LA Grundsc^A12^G_Lehramt^
-41^LA Sekunda^A18^G_Lehramt^
-42^LA Grundst^A11^G_Lehramt^
-43^LA Mittels^A16^G_Lehramt^
-44^LA Oberst.^A18^G_Lehramt^
-45^LA Oberst.^A18^G_Lehramt^
-46^LA Ba S/F^A24^G_Bachelor^
-47^LA Ba BS^A24^G_Bachelor^
-48^LA Ba Ober^A24^G_Bachelor^
-49^LA Ma Gru^A37^G_Master^
-50^LA Ma Hau^A37^G_Master^
-51^Diplom FH^A20^G_DiplomFH^
-52^LA Ma G/P^A37^G_Master^
-53^Diplom FH^A20^G_DiplomFH^
-54^Diplom FH^A20^G_DiplomFH^
-55^LA Ma SI/P^A37^G_Master^
-56^staatl.Lau^A9^G_Abschlus^
-57^LA Ma G/SI^A37^G_Master^
-58^LA Ma Real^A37^G_Master^
-59^sonst.FH A^A99^G_Sonstige^
-60^LA Ma UuMG^A37^G_Master^
-61^LA Ma M/SI^A37^G_Master^
-62^LA Ma S2/S^A37^G_Master^
-63^LA Ma Oall^A37^G_Master^
-64^LA Ma Gym^A37^G_Master^
-65^LA Ma S/F^A37^G_Master^
-66^LA Ma BS^A37^G_Master^
-67^LA Ma Ober^A37^G_Master^
-68^MFB oLaU^A24^G_Bachelor^
-69^MFM aU^A37^G_Master^
-73^Kirchenmus^A9^G_Abschlus^
-74^Kirchenmus^A99^G_Sonstige^
-75^Diplom Kun^A1^G_Diplom^
-76^Meister^A99^G_Sonstige^
-77^Kunstpädag^A9^G_Abschlus^
-78^Master(U)L^A37^G_Master^
-79^Solistenpr^A9^G_Abschlus^
-80^sonstiger^A9^G_Abschlus^
-81^Akademiebr^A9^G_Abschlus^
-82^Bachelor U^A24^G_Bachelor^
-83^Bachelor K^A24^G_Bachelor^
-84^Bachelor F^A24^G_Bachelor^
-88^Master Uni^A37^G_Master^
-89^Master Kun^A37^G_Master^
-90^Master FH^A37^G_Master^
-91^St Prom^PROM^G_Prom^
-92^PnFH-A^PROM^G_Prom^
-93^Ba Lehrer^A24^G_Bachelor^
-94^Abschlußze^A9^G_Abschlus^
-95^sonst.Absc^A9^G_Abschlus^
-96^Abschluß a^A9^G_Abschlus^
-97^keine Absc^A99^G_Sonstige^
-98^LA Ba G-uH^A24^G_Bachelor^
-99^LA Ma G-uH^A37^G_Master^
-15^LA Ba G^A24^G_Bachelor^
-16^LA Ba H^A24^G_Bachelor^
-87^^A99^G_Sonstige^
-86^^A99^G_Sonstige^
+78^Master(U)L^A37^G_Master^1^
+93^Ba Lehrer^A24^G_Bachelor^1^
+19^LA Ba G/P^A24^G_Bachelor^1^
+20^LA Grund-u^A12^G_Lehramt^1^
+21^LA Grundsc^A10^G_Lehramt^1^
+22^LA Hauptsc^A13^G_Lehramt^1^
+23^LA Realsch^A15^G_Lehramt^1^
+24^LA Haupt-u^A14^G_Lehramt^1^
+25^LA Gymnasi^A17^G_Lehramt^1^
+26^LA Sonders^A25^G_Lehramt^1^
+27^LA Berufss^A19^G_Lehramt^1^
+28^LA Sekund.^A16^G_Lehramt^1^
+29^sonst.LA n^A40^G_Diplom^1^
+30^LA Master^A37^G_Master^1^
+31^LA Ba swkD^A24^G_Bachelor^1^
+32^LA Ba SI/P^A24^G_Bachelor^1^
+33^LA Ba G/SI^A24^G_Bachelor^1^
+34^LA Ba Real^A24^G_Bachelor^1^
+35^LA Ba UuMG^A24^G_Bachelor^1^
+36^LA Ba M/SI^A24^G_Bachelor^1^
+37^LA Ba S2/S^A24^G_Bachelor^1^
+38^LA Ba Gym^A24^G_Bachelor^1^
+39^LA Ba Oall^A24^G_Bachelor^1^
+40^LA Grundsc^A12^G_Lehramt^1^
+41^LA Sekunda^A18^G_Lehramt^1^
+42^LA Grundst^A11^G_Lehramt^1^
+43^LA Mittels^A16^G_Lehramt^1^
+44^LA Oberst.^A18^G_Lehramt^1^
+45^LA Oberst.^A18^G_Lehramt^1^
+46^LA Ba S/F^A24^G_Bachelor^1^
+47^LA Ba BS^A24^G_Bachelor^1^
+48^LA Ba Ober^A24^G_Bachelor^1^
+49^LA Ma Gru^A37^G_Master^1^
+50^LA Ma Hau^A37^G_Master^1^
+52^LA Ma G/P^A37^G_Master^1^
+55^LA Ma SI/P^A37^G_Master^1^
+57^LA Ma G/SI^A37^G_Master^1^
+58^LA Ma Real^A37^G_Master^1^
+60^LA Ma UuMG^A37^G_Master^1^
+61^LA Ma M/SI^A37^G_Master^1^
+70^staatl.Prf^A9^G_Abschlus^0^
+71^Bühnen-/Ko^A23^G_Konzerte^0^
+72^Privatmusi^A9^G_Abschlus^0^
+01^MFB mLaU^A24^G_Bachelor^0^
+02^Magister^A3^G_Magister^0^
+03^Lizentiat^A7^G_Lizentia^0^
+04^kirchliche^A8^G_Kirchlic^0^
+05^akad.gepr.^A9^G_Abschlus^0^
+06^Promotion^PROM^G_Prom^0^
+07^Prom.ohne^PROM^G_Prom^0^
+08^Staatsexam^A5^G_Staatsex^0^
+09^Staatsexam^A5^G_Staatsex^0^
+10^Fakultätsp^A4^G_Fakultät^0^
+11^Diplom Uni^A1^G_Diplom^0^
+12^Diplom Uni^A1^G_Diplom^0^
+13^Diplom Uni^A1^G_Diplom^0^
+14^Diplom I U^A2^G_Diplom^0^
+17^AbschlPrfg^A9^G_Abschlus^0^
+18^Diplom Leh^A40^G_Diplom^0^
+51^Diplom FH^A20^G_DiplomFH^0^
+53^Diplom FH^A20^G_DiplomFH^0^
+54^Diplom FH^A20^G_DiplomFH^0^
+56^staatl.Lau^A9^G_Abschlus^0^
+59^sonst.FH A^A99^G_Sonstige^0^
+68^MFB oLaU^A24^G_Bachelor^0^
+69^MFM aU^A37^G_Master^0^
+73^Kirchenmus^A9^G_Abschlus^0^
+74^Kirchenmus^A99^G_Sonstige^0^
+75^Diplom Kun^A1^G_Diplom^0^
+76^Meister^A99^G_Sonstige^0^
+77^Kunstpädag^A9^G_Abschlus^0^
+79^Solistenpr^A9^G_Abschlus^0^
+80^sonstiger^A9^G_Abschlus^0^
+81^Akademiebr^A9^G_Abschlus^0^
+82^Bachelor U^A24^G_Bachelor^0^
+83^Bachelor K^A24^G_Bachelor^0^
+84^Bachelor F^A24^G_Bachelor^0^
+88^Master Uni^A37^G_Master^0^
+89^Master Kun^A37^G_Master^0^
+90^Master FH^A37^G_Master^0^
+91^St Prom^PROM^G_Prom^0^
+92^PnFH-A^PROM^G_Prom^0^
+94^Abschlußze^A9^G_Abschlus^0^
+62^LA Ma S2/S^A37^G_Master^1^
+63^LA Ma Oall^A37^G_Master^1^
+64^LA Ma Gym^A37^G_Master^1^
+65^LA Ma S/F^A37^G_Master^1^
+66^LA Ma BS^A37^G_Master^1^
+67^LA Ma Ober^A37^G_Master^1^
+98^LA Ba G-uH^A24^G_Bachelor^1^
+99^LA Ma G-uH^A37^G_Master^1^
+15^LA Ba G^A24^G_Bachelor^1^
+16^LA Ba H^A24^G_Bachelor^1^
+95^sonst.Absc^A9^G_Abschlus^0^
+96^Abschluß a^A9^G_Abschlus^0^
+97^keine Absc^A99^G_Sonstige^0^
+87^^A99^G_Sonstige^0^
+86^^A99^G_Sonstige^0^

superx/WEB-INF/conf/edustore/db/install/schluesseltabellen/release_unloads/k_astat_staat_eu.unl

@@ -154,7 +154,7 @@
 155^265^N^19001^29992^01.04.1900^31.03.3000^
 156^157^J^19951^29992^01.04.1995^31.03.3000^
 157^472^N^19001^29992^01.04.1900^31.03.3000^
-158^132^N^19001^29992^01.04.1900^31.03.3000^
+158^132^N^19001^20212^01.04.1900^31.12.2021^
 159^281^N^19001^29992^01.04.1900^31.03.3000^
 160^474^N^19001^29992^01.04.1900^31.03.3000^
 161^155^J^20041^29992^01.04.2004^31.03.3000^
@@ -202,11 +202,11 @@
 203^257^N^19001^29992^01.04.1900^31.03.3000^
 204^263^N^19001^29992^01.04.1900^31.03.3000^
 205^233^N^19001^29992^01.04.1900^31.03.3000^
-206^159^N^19001^29992^01.04.1900^31.03.3000^
+206^159^N^19001^20212^01.04.1900^31.12.2021^
 207^162^J^20041^29992^01.04.2004^31.03.3000^
 208^199^N^19001^29992^01.04.1900^31.03.3000^
 209^299^N^19001^29992^01.04.1900^31.03.3000^
-210^443^N^19001^29992^01.04.1900^31.03.3000^
+210^443^N^19001^20182^01.04.1900^31.12.2018^
 211^525^N^19001^29992^01.04.1900^31.03.3000^
 212^151^N^19001^19562^01.04.1900^31.03.1957^
 213^124^N^19001^19562^01.04.1900^31.03.1957^
@@ -263,3 +263,57 @@
 263^411^N^19001^29992^01.04.1900^31.03.3000^
 264^519^N^19001^29992^01.04.1900^31.03.3000^
 265^168^N^20211^29992^01.01.2021^31.03.3000^
+266^315^J^19571^29992^01.04.1957^31.03.3000^
+267^315^N^19001^19562^01.04.1900^31.03.1957^
+268^317^J^19571^29992^01.04.1957^31.03.3000^
+269^317^N^19001^19562^01.04.1900^31.03.1957^
+270^319^J^19571^29992^01.04.1957^31.03.3000^
+271^319^N^19001^19562^01.04.1900^31.03.1957^
+272^211^J^19571^29992^01.04.1957^31.03.3000^
+273^211^N^19001^19562^01.04.1900^31.03.1957^
+274^214^J^19571^29992^01.04.1957^31.03.3000^
+275^214^N^19001^19562^01.04.1900^31.03.1957^
+276^331^J^19571^29992^01.04.1957^31.03.3000^
+277^331^N^19001^19562^01.04.1900^31.03.1957^
+278^329^J^19571^20112^01.04.1957^31.12.2011^
+279^329^N^19001^19562^01.04.1900^31.03.1957^
+280^329^N^20121^29992^01.01.2012^31.03.3000^
+281^342^J^19731^19842^01.04.1973^31.12.1984^
+282^342^N^19001^19722^01.04.1900^31.03.1973^
+283^342^N^19851^29992^01.01.1985^31.03.3000^
+284^112^N^19001^29992^01.01.1900^31.03.3000^
+285^113^N^19001^29992^01.01.1900^31.03.3000^
+286^114^N^19001^29992^01.01.1900^31.03.3000^
+287^115^N^19001^29992^01.01.1900^31.03.3000^
+288^116^N^19001^29992^01.01.1900^31.03.3000^
+289^182^N^19001^29992^01.01.1900^31.03.3000^
+290^185^N^19001^29992^01.01.1900^31.03.3000^
+291^216^N^19001^29992^01.01.1900^31.03.3000^
+292^311^N^19001^29992^01.01.1900^31.03.3000^
+293^321^N^19001^29992^01.01.1900^31.03.3000^
+294^325^N^19001^29992^01.01.1900^31.03.3000^
+295^338^N^19001^29992^01.01.1900^31.03.3000^
+296^341^N^19001^29992^01.01.1900^31.03.3000^
+297^343^N^19001^29992^01.01.1900^31.03.3000^
+298^344^N^19001^29992^01.01.1900^31.03.3000^
+299^352^N^19001^29992^01.01.1900^31.03.3000^
+300^412^N^19001^29992^01.01.1900^31.03.3000^
+301^510^N^19001^29992^01.01.1900^31.03.3000^
+302^511^N^19001^29992^01.01.1900^31.03.3000^
+303^512^N^19001^29992^01.01.1900^31.03.3000^
+304^513^N^19001^29992^01.01.1900^31.03.3000^
+305^514^N^19001^29992^01.01.1900^31.03.3000^
+306^515^N^19001^29992^01.01.1900^31.03.3000^
+307^517^N^19001^29992^01.01.1900^31.03.3000^
+308^520^N^19001^29992^01.01.1900^31.03.3000^
+309^521^N^19001^29992^01.01.1900^31.03.3000^
+310^522^N^19001^29992^01.01.1900^31.03.3000^
+311^528^N^19001^29992^01.01.1900^31.03.3000^
+312^529^N^19001^29992^01.01.1900^31.03.3000^
+313^534^N^19001^29992^01.01.1900^31.03.3000^
+314^535^N^19001^29992^01.01.1900^31.03.3000^
+315^542^N^19001^29992^01.01.1900^31.03.3000^
+316^546^N^19001^29992^01.01.1900^31.03.3000^
+317^547^N^19001^29992^01.01.1900^31.03.3000^
+318^548^N^19001^29992^01.01.1900^31.03.3000^
+319^549^N^19001^29992^01.01.1900^31.03.3000^

superx/WEB-INF/conf/edustore/db/install/upgrade/kern_pre_upgrade_pg.sql

@@ -2,16 +2,27 @@
 --alte sticky-Technik entfernen
 --freemarker template
 <sqlvars>
-<sqlvar name="fm_templates_tid_exists">
 
+<sqlvar name="fm_templates_tid_exists">
 select  count(*) 
 FROM pg_attribute A, pg_class C
 where C.oid = A.attrelid
-and A.attnum >0 
+and A.attnum >0
+and A.attisdropped = FALSE
 and C.relname::varchar(255) = 'fm_templates'
 and trim(A.attname)='tid' ;
+</sqlvar>
 
+<sqlvar name="trans_cifx_tid_exists">
+select  count(*) 
+FROM pg_attribute A, pg_class C
+where C.oid = A.attrelid
+and A.attnum >0
+and A.attisdropped = FALSE
+and C.relname::varchar(255) = 'trans_cifx'
+and trim(A.attname)='tid' ;
 </sqlvar>
+
 <sqlvar name="dim_staat_view_exists">
 select sp_bool_to_smallint(count(*) &gt; 0) from pg_class
 where relname::char(200) = 'dim_staat' 
@@ -67,6 +78,15 @@ insert into fm_templates (id,content,description,comment,version) select id,cont
 drop table tmp_fm_templates;
 </#if>
 
+<#if trans_cifx_tid_exists=0>
+create temp table tmp_trans_cifx (key smallint NOT NULL,apnr char(10) NOT NULL,cifx_tid integer,sourcesystem integer NOT NULL,sourcesystem_id char(255),systeminfo_id integer);
+insert into tmp_trans_cifx (key,apnr,cifx_tid,sourcesystem,sourcesystem_id,systeminfo_id) select key,apnr,cifx_tid,sourcesystem,sourcesystem_id,systeminfo_id from trans_cifx;
+drop table trans_cifx;
+create table trans_cifx (tid SERIAL  not null,key smallint NOT NULL,apnr char(10) NOT NULL,cifx_tid integer,sourcesystem integer NOT NULL,sourcesystem_id char(255),systeminfo_id integer ,constraint pk_trans_cifx_tid primary key (tid));
+insert into trans_cifx (key,apnr,cifx_tid,sourcesystem,sourcesystem_id,systeminfo_id) select key,apnr,cifx_tid,sourcesystem,sourcesystem_id,systeminfo_id from tmp_trans_cifx;
+drop table tmp_trans_cifx;
+</#if>
+
 <#if dim_staat_view_exists =1 >
 drop view dim_staat;
 
@@ -94,7 +114,6 @@ drop view if exists dim_kreis;
 -- themen
 --delete from themenbaum where name in ('Benutzer', 'Benutzer Info', 'Masken','Benutzer verwalten','Benutzerinfo verwalten','Masken verwalten', 'Felder');
 update themenbaum set name='Institutionen verwalten' where name='Institutionen';
-update themenbaum set name='Benutzer verwalten' where name='Benutzer';
 update themenbaum set name='Benutzerinfo verwalten' where name='Benutzer Info';
 update themenbaum set name='Masken verwalten' where name='Masken';
 -- Masken
@@ -115,6 +134,9 @@ alter table sieve_column_def alter lookup_cond type varchar(1000);
 <#if TableFieldExists?exists && TableFieldExists('sieve_column_def','lookup_func')>
 alter table sieve_column_def alter lookup_func type varchar(1000);
 </#if>
+<#if TableFieldExists?exists && TableFieldExists('db_version','version_hash')>
+alter table db_version alter column version_hash type varchar;
+</#if>
 
 alter table systeminfo alter datum type timestamp;
 alter table db_version alter his_system type varchar(255);
@@ -127,3 +149,5 @@ update sx_repository set aktiv=0 where aktiv is null;
 <#if TableFieldExists?exists && TableFieldExists('sx_repository','aktiv')>
 alter table sx_repository alter aktiv set not null;
 </#if>
+
+drop view if exists k_sourcesystem;

superx/WEB-INF/conf/edustore/db/install/upgrade/kern_upgrade_fields_ids.sql

@@ -141,7 +141,8 @@ where a.tabid = b.tabid and b.tabname
 'arch_table',
 'arch_datum',
 'k_prio_param',
-'k_source'
+'k_source',
+'k_astat_lfb_fg'
 ) order by 1;</sqlvar>
 </sqlvars>
 
@@ -1890,6 +1891,16 @@ alter table cifx add ( parent_lid NVARCHAR(255) );
 
 </#if>
 
+<#if !fields?seq_contains("trans_cifx.tid") >
+
+
+! echo "field trans_cifx.tid will be added"
+! echo `date`
+ 
+alter table trans_cifx add ( tid SERIAL  not null);
+
+</#if>
+
 <#if !fields?seq_contains("trans_cifx.key") >
 
 
@@ -9400,6 +9411,16 @@ alter table k_astat_abschl_grp add ( abschluss_grp NVARCHAR(255) );
 
 </#if>
 
+<#if !fields?seq_contains("k_astat_abschl_grp.ist_lehramt") >
+
+
+! echo "field k_astat_abschl_grp.ist_lehramt will be added"
+! echo `date`
+ 
+alter table k_astat_abschl_grp add ( ist_lehramt SMALLINT  default 0 );
+
+</#if>
+
 <#if !fields?seq_contains("k_astat_staat_eu.tid") >
 
 
@@ -9859,3 +9880,93 @@ alter table k_source add ( name NVARCHAR(255) );
 alter table k_source add ( sortorder NVARCHAR(255) );
 
 </#if>
+
+<#if !fields?seq_contains("k_astat_lfb_fg.tid") >
+
+
+! echo "field k_astat_lfb_fg.tid will be added"
+! echo `date`
+ 
+alter table k_astat_lfb_fg add ( tid SERIAL  not null);
+
+</#if>
+
+<#if !fields?seq_contains("k_astat_lfb_fg.fgr") >
+
+
+! echo "field k_astat_lfb_fg.fgr will be added"
+! echo `date`
+ 
+alter table k_astat_lfb_fg add ( fgr CHAR(10) );
+
+</#if>
+
+<#if !fields?seq_contains("k_astat_lfb_fg.fgr_str") >
+
+
+! echo "field k_astat_lfb_fg.fgr_str will be added"
+! echo `date`
+ 
+alter table k_astat_lfb_fg add ( fgr_str NCHAR(255) );
+
+</#if>
+
+<#if !fields?seq_contains("k_astat_lfb_fg.lfb") >
+
+
+! echo "field k_astat_lfb_fg.lfb will be added"
+! echo `date`
+ 
+alter table k_astat_lfb_fg add ( lfb CHAR(10) );
+
+</#if>
+
+<#if !fields?seq_contains("k_astat_lfb_fg.lfb_str") >
+
+
+! echo "field k_astat_lfb_fg.lfb_str will be added"
+! echo `date`
+ 
+alter table k_astat_lfb_fg add ( lfb_str NCHAR(255) );
+
+</#if>
+
+<#if !fields?seq_contains("k_astat_lfb_fg.fg") >
+
+
+! echo "field k_astat_lfb_fg.fg will be added"
+! echo `date`
+ 
+alter table k_astat_lfb_fg add ( fg CHAR(10) );
+
+</#if>
+
+<#if !fields?seq_contains("k_astat_lfb_fg.fg_str") >
+
+
+! echo "field k_astat_lfb_fg.fg_str will be added"
+! echo `date`
+ 
+alter table k_astat_lfb_fg add ( fg_str NVARCHAR(255) );
+
+</#if>
+
+<#if !fields?seq_contains("k_astat_lfb_fg.gueltig_von") >
+
+
+! echo "field k_astat_lfb_fg.gueltig_von will be added"
+! echo `date`
+ 
+alter table k_astat_lfb_fg add ( gueltig_von DATE );
+
+</#if>
+
+<#if !fields?seq_contains("k_astat_lfb_fg.gueltig_bis") >
+
+
+! echo "field k_astat_lfb_fg.gueltig_bis will be added"
+! echo `date`
+ 
+alter table k_astat_lfb_fg add ( gueltig_bis DATE );
+
+</#if>

superx/WEB-INF/conf/edustore/db/install/upgrade/kern_upgrade_fields_pg.sql

@@ -141,7 +141,8 @@ and C.relname::varchar(255)  in ('sichtart_rechttabelle',
 'arch_table',
 'arch_datum',
 'k_prio_param',
-'k_source') UNION SELECT trim(N.nspname||'.'||C.relname) || '.' || trim(A.attname),trim(N.nspname||'.'||C.relname) || '.' || trim(A.attname)
+'k_source',
+'k_astat_lfb_fg') UNION SELECT trim(N.nspname||'.'||C.relname) || '.' || trim(A.attname),trim(N.nspname||'.'||C.relname) || '.' || trim(A.attname)
 FROM pg_attribute A, pg_class C, pg_namespace N
 where C.oid = A.attrelid
 and N.oid = C.relnamespace
@@ -279,7 +280,8 @@ and N.nspname||'.'||C.relname  in ('sichtart_rechttabelle',
 'arch_table',
 'arch_datum',
 'k_prio_param',
-'k_source'
+'k_source',
+'k_astat_lfb_fg'
 ) order by 1;</sqlvar>
 </sqlvars>
 
@@ -1853,6 +1855,15 @@ alter table cifx add column parent_lid VARCHAR(255) ;
 
 </#if>
 
+<#if !fields?seq_contains("trans_cifx.tid") >
+
+
+select now(), 'field trans_cifx.tid will be added';
+
+alter table trans_cifx add column tid SERIAL  not null;
+
+</#if>
+
 <#if !fields?seq_contains("trans_cifx.key") >
 
 
@@ -8612,6 +8623,15 @@ alter table k_astat_abschl_grp add column abschluss_grp VARCHAR(255) ;
 
 </#if>
 
+<#if !fields?seq_contains("k_astat_abschl_grp.ist_lehramt") >
+
+
+select now(), 'field k_astat_abschl_grp.ist_lehramt will be added';
+
+alter table k_astat_abschl_grp add column ist_lehramt SMALLINT  default 0 ;
+
+</#if>
+
 <#if !fields?seq_contains("k_astat_staat_eu.tid") >
 
 
@@ -9025,3 +9045,84 @@ select now(), 'field k_source.sortorder will be added';
 alter table k_source add column sortorder VARCHAR(255) ;
 
 </#if>
+
+<#if !fields?seq_contains("k_astat_lfb_fg.tid") >
+
+
+select now(), 'field k_astat_lfb_fg.tid will be added';
+
+alter table k_astat_lfb_fg add column tid SERIAL  not null;
+
+</#if>
+
+<#if !fields?seq_contains("k_astat_lfb_fg.fgr") >
+
+
+select now(), 'field k_astat_lfb_fg.fgr will be added';
+
+alter table k_astat_lfb_fg add column fgr CHAR(10) ;
+
+</#if>
+
+<#if !fields?seq_contains("k_astat_lfb_fg.fgr_str") >
+
+
+select now(), 'field k_astat_lfb_fg.fgr_str will be added';
+
+alter table k_astat_lfb_fg add column fgr_str CHAR(255) ;
+
+</#if>
+
+<#if !fields?seq_contains("k_astat_lfb_fg.lfb") >
+
+
+select now(), 'field k_astat_lfb_fg.lfb will be added';
+
+alter table k_astat_lfb_fg add column lfb CHAR(10) ;
+
+</#if>
+
+<#if !fields?seq_contains("k_astat_lfb_fg.lfb_str") >
+
+
+select now(), 'field k_astat_lfb_fg.lfb_str will be added';
+
+alter table k_astat_lfb_fg add column lfb_str CHAR(255) ;
+
+</#if>
+
+<#if !fields?seq_contains("k_astat_lfb_fg.fg") >
+
+
+select now(), 'field k_astat_lfb_fg.fg will be added';
+
+alter table k_astat_lfb_fg add column fg CHAR(10) ;
+
+</#if>
+
+<#if !fields?seq_contains("k_astat_lfb_fg.fg_str") >
+
+
+select now(), 'field k_astat_lfb_fg.fg_str will be added';
+
+alter table k_astat_lfb_fg add column fg_str VARCHAR(255) ;
+
+</#if>
+
+<#if !fields?seq_contains("k_astat_lfb_fg.gueltig_von") >
+
+
+select now(), 'field k_astat_lfb_fg.gueltig_von will be added';
+
+alter table k_astat_lfb_fg add column gueltig_von DATE ;
+
+</#if>
+
+<#if !fields?seq_contains("k_astat_lfb_fg.gueltig_bis") >
+
+
+select now(), 'field k_astat_lfb_fg.gueltig_bis will be added';
+
+alter table k_astat_lfb_fg add column gueltig_bis DATE ;
+
+</#if>

superx/WEB-INF/conf/edustore/db/install/upgrade/kern_upgrade_ids.sql

@@ -97,22 +97,22 @@ create table tmp_repository(  tid SERIAL  not null, id CHAR(200)  not null, cont
 !sx_auto_upload_table.x k_astat_studienbereich $SUPERX_DIR/db/install/schluesseltabellen/release_unloads/k_astat_studienbereich.unl
 
 
-! echo "Lade Tabelle k_astat_staat"
+! echo "Lade Tabelle k_astat_faechergruppe"
 ! echo `date`
  
-!sx_auto_upload_table.x k_astat_staat $SUPERX_DIR/db/install/schluesseltabellen/release_unloads/k_astat_staat.unl
+!sx_auto_upload_table.x k_astat_faechergruppe $SUPERX_DIR/db/install/schluesseltabellen/release_unloads/k_astat_faechergruppe.unl
 
 
-! echo "Lade Tabelle k_astat_kontinent"
+! echo "Lade Tabelle k_astat_staat"
 ! echo `date`
  
-!sx_auto_upload_table.x k_astat_kontinent $SUPERX_DIR/db/install/schluesseltabellen/release_unloads/k_astat_kontinent.unl
+!sx_auto_upload_table.x k_astat_staat $SUPERX_DIR/db/install/schluesseltabellen/release_unloads/k_astat_staat.unl
 
 
-! echo "Lade Tabelle k_astat_faechergruppe"
+! echo "Lade Tabelle k_astat_kontinent"
 ! echo `date`
  
-!sx_auto_upload_table.x k_astat_faechergruppe $SUPERX_DIR/db/install/schluesseltabellen/release_unloads/k_astat_faechergruppe.unl
+!sx_auto_upload_table.x k_astat_kontinent $SUPERX_DIR/db/install/schluesseltabellen/release_unloads/k_astat_kontinent.unl
 
 
 ! echo "Lade Tabelle k_astat_abschl_grp"
@@ -416,7 +416,7 @@ drop table tmp_cif_load;
  
 
 delete from db_version  where his_system='kern';
-insert into db_version (his_system,version,systeminfo_id) values('kern','5.2b',9);
+insert into db_version (his_system,version,systeminfo_id) values('kern','5.2',9);
 
 
 

superx/WEB-INF/conf/edustore/db/install/upgrade/kern_upgrade_indexes_ids.sql

@@ -143,7 +143,8 @@ and (systables.tabname
 'arch_table',
 'arch_datum',
 'k_prio_param',
-'k_source'
+'k_source',
+'k_astat_lfb_fg'
 ));</sqlvar>
 </sqlvars>
 
@@ -445,6 +446,30 @@ create  index trans_cifx_ind on trans_cifx (sourcesystem_id );
 
 </#if>
 
+<#assign exists="false" />
+<#list indexes as i>
+<#if i.getName()="trans_cifx_ind2">
+<#assign exists="true" />
+</#if>
+</#list>
+
+<#if exists="true" >
+
+
+! echo "index trans_cifx_ind2 exists - fine"
+! echo `date`
+ 
+
+<#else>
+
+
+! echo "Erzeuge Index trans_cifx_ind2"
+! echo `date`
+ 
+create  index trans_cifx_ind2 on trans_cifx (cifx_tid );
+
+</#if>
+
 <#assign exists="false" />
 <#list indexes as i>
 <#if i.getName()="trans_cif_ind">

superx/WEB-INF/conf/edustore/db/install/upgrade/kern_upgrade_indexes_pg.sql

@@ -142,7 +142,8 @@ where D.relname::varchar(200)  in ('sichtart_rechttabelle',
 'arch_table',
 'arch_datum',
 'k_prio_param',
-'k_source')) UNION SELECT
+'k_source',
+'k_astat_lfb_fg')) UNION SELECT
  C.relname, C.relname from pg_class C, pg_index I
 where I.indexrelid=C.oid
 and I.indrelid in (
@@ -281,7 +282,8 @@ and N.nspname||'.'||D.relname  in ('sichtart_rechttabelle',
 'arch_table',
 'arch_datum',
 'k_prio_param',
-'k_source'
+'k_source',
+'k_astat_lfb_fg'
 ));</sqlvar>
 </sqlvars>
 
@@ -558,6 +560,28 @@ create  index trans_cifx_ind on trans_cifx (sourcesystem_id );
 
 </#if>
 
+<#assign exists="false" />
+<#list indexes as i>
+<#if i.getName()="trans_cifx_ind2">
+<#assign exists="true" />
+</#if>
+</#list>
+
+<#if exists="true" >
+
+
+select now(), 'index trans_cifx_ind2 exists - fine';
+
+
+<#else>
+
+
+select now(), 'Erzeuge Index trans_cifx_ind2';
+
+create  index trans_cifx_ind2 on trans_cifx (cifx_tid );
+
+</#if>
+
 <#assign exists="false" />
 <#list indexes as i>
 <#if i.getName()="trans_cif_ind">

superx/WEB-INF/conf/edustore/db/install/upgrade/kern_upgrade_pg.sql

@@ -82,6 +82,11 @@ select now(), 'Lade Tabelle k_astat_studienbereich';
 \! sx_auto_upload_table.x k_astat_studienbereich $SUPERX_DIR/db/install/schluesseltabellen/release_unloads/k_astat_studienbereich.unl
 
 
+select now(), 'Lade Tabelle k_astat_faechergruppe';
+
+\! sx_auto_upload_table.x k_astat_faechergruppe $SUPERX_DIR/db/install/schluesseltabellen/release_unloads/k_astat_faechergruppe.unl
+
+
 select now(), 'Lade Tabelle k_astat_staat';
 
 \! sx_auto_upload_table.x k_astat_staat $SUPERX_DIR/db/install/schluesseltabellen/release_unloads/k_astat_staat.unl
@@ -92,11 +97,6 @@ select now(), 'Lade Tabelle k_astat_kontinent';
 \! sx_auto_upload_table.x k_astat_kontinent $SUPERX_DIR/db/install/schluesseltabellen/release_unloads/k_astat_kontinent.unl
 
 
-select now(), 'Lade Tabelle k_astat_faechergruppe';
-
-\! sx_auto_upload_table.x k_astat_faechergruppe $SUPERX_DIR/db/install/schluesseltabellen/release_unloads/k_astat_faechergruppe.unl
-
-
 select now(), 'Lade Tabelle k_astat_abschl_grp';
 
 \! sx_auto_upload_table.x k_astat_abschl_grp $SUPERX_DIR/db/install/schluesseltabellen/release_unloads/k_astat_abschl_grp.unl
@@ -376,7 +376,7 @@ select now(), 'Fülle db_version';
 
 
 delete from db_version  where his_system='kern';
-insert into db_version (his_system,version,systeminfo_id) values('kern','5.2b',9);
+insert into db_version (his_system,version,systeminfo_id) values('kern','5.2',9);
 
 
 

superx/WEB-INF/conf/edustore/db/install/upgrade/kern_upgrade_tables_ids.sql

@@ -139,7 +139,8 @@ tabname  as tabelle from systables where tabname
 'arch_table',
 'arch_datum',
 'k_prio_param',
-'k_source'
+'k_source',
+'k_astat_lfb_fg'
 );</sqlvar>
 </sqlvars>
 
@@ -1068,12 +1069,15 @@ insert into db_tabellen (name,protokollierung) values('cifx',0);
 ! echo `date`
  
 create table trans_cifx(
-	key SMALLINT  not null, 
+	tid SERIAL  not null, 
+key SMALLINT  not null, 
 apnr CHAR(10)  not null, 
 cifx_tid INTEGER , 
 sourcesystem INTEGER  not null, 
 sourcesystem_id NVARCHAR(255) , 
-systeminfo_id INTEGER 
+systeminfo_id INTEGER ,
+	primary key (tid)
+	constraint pk_trans_cifx_tid
 ) 
 ;
 
@@ -1085,6 +1089,12 @@ systeminfo_id INTEGER
  
 create  index trans_cifx_ind on trans_cifx (sourcesystem_id );
 
+
+! echo "Erzeuge Index trans_cifx_ind2"
+! echo `date`
+ 
+create  index trans_cifx_ind2 on trans_cifx (cifx_tid );
+
 </#if>
 delete from db_tabellen where name='trans_cifx';
 insert into db_tabellen (name,protokollierung) values('trans_cifx',0);
@@ -4497,7 +4507,8 @@ create table k_astat_abschl_grp(
 	abschluss_astat_bund NVARCHAR(255)  not null, 
 abschluss_astat_bund_ktxt NVARCHAR(255) , 
 abschlussart NVARCHAR(255) , 
-abschluss_grp NVARCHAR(255) ,
+abschluss_grp NVARCHAR(255) , 
+ist_lehramt SMALLINT  default 0 ,
 	primary key (abschluss_astat_bund)
 	constraint pk_k_astat_abschl_grp
 ) 
@@ -4725,3 +4736,37 @@ sortorder NVARCHAR(255)
 </#if>
 delete from db_tabellen where name='k_source';
 insert into db_tabellen (name,protokollierung) values('k_source',0);
+
+<#if !deleted_tables?seq_contains("k_astat_lfb_fg") && tables?is_sequence && tables?seq_contains("k_astat_lfb_fg") >
+
+
+! echo "table k_astat_lfb_fg exists - fine"
+! echo `date`
+ 
+
+<#else>
+
+
+! echo "Erzeuge Tabelle k_astat_lfb_fg"
+! echo `date`
+ 
+create table k_astat_lfb_fg(
+	tid SERIAL  not null, 
+fgr CHAR(10) , 
+fgr_str NCHAR(255) , 
+lfb CHAR(10) , 
+lfb_str NCHAR(255) , 
+fg CHAR(10) , 
+fg_str NVARCHAR(255) , 
+gueltig_von DATE , 
+gueltig_bis DATE ,
+	primary key (tid)
+	constraint pk_k_astat_lfb_fg
+) 
+;
+
+
+
+</#if>
+delete from db_tabellen where name='k_astat_lfb_fg';
+insert into db_tabellen (name,protokollierung) values('k_astat_lfb_fg',0);

superx/WEB-INF/conf/edustore/db/install/upgrade/kern_upgrade_tables_pg.sql

@@ -137,7 +137,8 @@ select relname,relname as tabelle from pg_class JOIN pg_namespace ON pg_namespac
 'arch_table',
 'arch_datum',
 'k_prio_param',
-'k_source') UNION SELECT pg_namespace.nspname||'.'||relname as relname,pg_namespace.nspname||'.'||relname as tabelle from pg_class JOIN pg_namespace ON pg_namespace.oid = pg_class.relnamespace WHERE pg_namespace.nspname||'.'||relname in ('sichtart_rechttabelle',
+'k_source',
+'k_astat_lfb_fg') UNION SELECT pg_namespace.nspname||'.'||relname as relname,pg_namespace.nspname||'.'||relname as tabelle from pg_class JOIN pg_namespace ON pg_namespace.oid = pg_class.relnamespace WHERE pg_namespace.nspname||'.'||relname in ('sichtart_rechttabelle',
 'group_field_pref',
 'stylesheet_field',
 'db_tabellen',
@@ -270,7 +271,8 @@ select relname,relname as tabelle from pg_class JOIN pg_namespace ON pg_namespac
 'arch_table',
 'arch_datum',
 'k_prio_param',
-'k_source'
+'k_source',
+'k_astat_lfb_fg'
 );</sqlvar>
 </sqlvars>
 
@@ -605,7 +607,7 @@ aktiv SMALLINT  default 1 ,
 
 
 
-comment on table sichten is 'Sichten';
+comment on table sichten is 'Sichten und Bäume für Hierarchien ';
 
 comment on column sichten.parent is 'Übergeordnete Sicht';
 
@@ -1156,6 +1158,8 @@ uniquename VARCHAR(255) ,
 
 
 
+comment on table cif is 'Schlüsseltabelle für numerische Schlüssel';
+
 comment on column cif.uniquename is 'Schlüssel';
 
 
@@ -1223,6 +1227,8 @@ parent_lid VARCHAR(255) ,
 
 
 
+comment on table cifx is 'Schlüsseltabelle für alphanumerische Schlüssel';
+
 comment on column cifx.druck is 'Drucktext';
 
 comment on column cifx.parent is 'übergeordn. Element';
@@ -1281,17 +1287,22 @@ select now(), 'table trans_cifx exists - fine';
 select now(), 'Erzeuge Tabelle trans_cifx';
 
 create table trans_cifx(
-	key SMALLINT  not null, 
+	tid SERIAL  not null, 
+key SMALLINT  not null, 
 apnr CHAR(10)  not null, 
 cifx_tid INTEGER , 
 sourcesystem INTEGER  not null, 
 sourcesystem_id VARCHAR(255) , 
-systeminfo_id INTEGER 
+systeminfo_id INTEGER , 
+	constraint pk_trans_cifx_tid primary key (tid)
+
 ) 
 ;
 
 
 
+comment on table trans_cifx is 'Transfertabelle für alphanumerische Schlüssel';
+
 comment on column trans_cifx.sourcesystem is 'Vorsystem';
 
 comment on column trans_cifx.sourcesystem_id is 'ID im Vorsystem';
@@ -1301,6 +1312,11 @@ select now(), 'Erzeuge Index trans_cifx_ind';
 
 create  index trans_cifx_ind on trans_cifx (sourcesystem_id );
 
+
+select now(), 'Erzeuge Index trans_cifx_ind2';
+
+create  index trans_cifx_ind2 on trans_cifx (cifx_tid );
+
 </#if>
 delete from db_tabellen where name='trans_cifx';
 insert into db_tabellen (name,protokollierung) values('trans_cifx',0);
@@ -1328,6 +1344,8 @@ systeminfo_id INTEGER
 
 
 
+comment on table trans_cif is 'Transfertabelle für numerische Schlüssel';
+
 comment on column trans_cif.sourcesystem is 'Vorsystem';
 
 comment on column trans_cif.sourcesystem_id is 'ID im Vorsystem';
@@ -1452,6 +1470,8 @@ passwd CHAR(16) ,
 
 
 
+comment on table hochschulinfo is 'Name und Adresse der Hochschule';
+
 comment on column hochschulinfo.hs_nr is 'Hochschulnummer (HIS)';
 
 </#if>
@@ -1692,7 +1712,7 @@ css_class VARCHAR(255) ,
 
 
 
-comment on table themenbaum is 'Themenbaum';
+comment on table themenbaum is 'Konfiguration der Menüstruktur';
 
 comment on column themenbaum.tid is 'Tid';
 
@@ -1860,6 +1880,8 @@ nodeattrib SMALLINT
 
 
 
+comment on table organigramm is 'Liste der Organisationseinheiten';
+
 comment on column organigramm.tid is 'Tupelidentifier';
 
 comment on column organigramm.key_apnr is 'Schlüssel';
@@ -5516,6 +5538,7 @@ create table k_astat_abschl_grp(
 abschluss_astat_bund_ktxt VARCHAR(255) , 
 abschlussart VARCHAR(255) , 
 abschluss_grp VARCHAR(255) , 
+ist_lehramt SMALLINT  default 0 , 
 	constraint pk_k_astat_abschl_grp primary key (abschluss_astat_bund)
 
 ) 
@@ -5531,6 +5554,8 @@ comment on column k_astat_abschl_grp.abschlussart is 'Abschlussart';
 
 comment on column k_astat_abschl_grp.abschluss_grp is 'Abschlussgruppe';
 
+comment on column k_astat_abschl_grp.ist_lehramt is 'Lehramt (J/N)';
+
 </#if>
 delete from db_tabellen where name='k_astat_abschl_grp';
 insert into db_tabellen (name,protokollierung) values('k_astat_abschl_grp',0);
@@ -5820,6 +5845,38 @@ comment on column k_source.sortorder is 'Sortierung des Quellsystems';
 </#if>
 delete from db_tabellen where name='k_source';
 insert into db_tabellen (name,protokollierung) values('k_source',0);
+
+<#if !deleted_tables?seq_contains("k_astat_lfb_fg") && tables?is_sequence && tables?seq_contains("k_astat_lfb_fg") >
+
+
+select now(), 'table k_astat_lfb_fg exists - fine';
+
+
+<#else>
+
+
+select now(), 'Erzeuge Tabelle k_astat_lfb_fg';
+
+create table k_astat_lfb_fg(
+	tid SERIAL  not null, 
+fgr CHAR(10) , 
+fgr_str CHAR(255) , 
+lfb CHAR(10) , 
+lfb_str CHAR(255) , 
+fg CHAR(10) , 
+fg_str VARCHAR(255) , 
+gueltig_von DATE , 
+gueltig_bis DATE , 
+	constraint pk_k_astat_lfb_fg primary key (tid)
+
+) 
+;
+
+
+
+</#if>
+delete from db_tabellen where name='k_astat_lfb_fg';
+insert into db_tabellen (name,protokollierung) values('k_astat_lfb_fg',0);
  -- update primary keys, see ticket: #296420 
 alter table if exists sichtart_rechttabelle drop constraint if exists sichtart_rechttabelle_pkey;
 alter table if exists sichtart_rechttabelle drop constraint if exists ix_sichtart_rt_p1;
@@ -5867,6 +5924,8 @@ alter table if exists cif drop constraint if exists cif_pkey;
 alter table if exists cif drop constraint if exists c_cif;
 alter table if exists cifx drop constraint if exists cifx_pkey;
 alter table if exists cifx drop constraint if exists c_cifx_tid;
+alter table if exists trans_cifx drop constraint if exists trans_cifx_pkey;
+alter table if exists trans_cifx drop constraint if exists pk_trans_cifx_tid;
 alter table if exists cifx_customize drop constraint if exists cifx_customize_pkey;
 alter table if exists cifx_customize drop constraint if exists c_cifx_customize;
 alter table if exists felderinfo drop constraint if exists felderinfo_pkey;
@@ -6011,6 +6070,8 @@ alter table if exists k_astat_abschl_grp drop constraint if exists k_astat_absch
 alter table if exists k_astat_abschl_grp drop constraint if exists pk_k_astat_abschl_grp;
 alter table if exists k_astat_staat_eu drop constraint if exists k_astat_staat_eu_pkey;
 alter table if exists k_astat_staat_eu drop constraint if exists pk_k_astat_staat_eu;
+alter table if exists k_astat_lfb_fg drop constraint if exists k_astat_lfb_fg_pkey;
+alter table if exists k_astat_lfb_fg drop constraint if exists pk_k_astat_lfb_fg;
 alter table if exists sichtart_rechttabelle add constraint sichtart_rechttabelle_pkey  primary key (tid);
 alter table if exists group_field_pref add constraint group_field_pref_pkey  primary key (tid);
 alter table if exists stylesheet_field add constraint stylesheet_field_pkey  primary key (tid);
@@ -6034,6 +6095,7 @@ alter table if exists group_masken_bez add constraint group_masken_bez_pkey  pri
 alter table if exists aggre_bland add constraint aggre_bland_pkey  primary key (tid);
 alter table if exists cif add constraint cif_pkey  primary key (tid);
 alter table if exists cifx add constraint cifx_pkey  primary key (tid);
+alter table if exists trans_cifx add constraint trans_cifx_pkey  primary key (tid);
 alter table if exists cifx_customize add constraint cifx_customize_pkey  primary key (tid);
 alter table if exists felderinfo add constraint felderinfo_pkey  primary key (tid);
 alter table if exists hochschulinfo add constraint hochschulinfo_pkey  primary key (hs_nr);
@@ -6106,3 +6168,4 @@ alter table if exists k_astat_staat add constraint k_astat_staat_pkey  primary k
 alter table if exists k_astat_kontinent add constraint k_astat_kontinent_pkey  primary key (schluessel);
 alter table if exists k_astat_abschl_grp add constraint k_astat_abschl_grp_pkey  primary key (abschluss_astat_bund);
 alter table if exists k_astat_staat_eu add constraint k_astat_staat_eu_pkey  primary key (tid);
+alter table if exists k_astat_lfb_fg add constraint k_astat_lfb_fg_pkey  primary key (tid);

superx/WEB-INF/kern_dbforms-config_ids.xml

@@ -590,6 +590,9 @@
 <field name="abschluss_astat_bund_ktxt" description="Abschluss (Bundesschlüssel) Kurztext" fieldType="varchar" size="255" isKey="" sortable=""/>
 <field name="abschlussart" description="Abschlussart" fieldType="varchar" size="255" isKey="" sortable=""/>
 <field name="abschluss_grp" description="Abschlussgruppe" fieldType="varchar" size="255" isKey="" sortable=""/>
+<field name="ist_lehramt" description="Lehramt (J/N)" fieldType="int" size="6" isKey="" defaultValue="0" sortable="">
+<comment>Ist Lehramt=1, nein =0</comment>
+</field>
 <interceptor className="de.superx.servlet.DbformInterceptor"/>
 </table>
 <table name="k_astat_abschluss2steller">
@@ -624,6 +627,18 @@
 <field name="name" description="Name" fieldType="varchar" size="255" isKey="" sortable=""/>
 <interceptor className="de.superx.servlet.DbformInterceptor"/>
 </table>
+<table name="k_astat_lfb_fg">
+<field name="tid" description="" fieldType="int" size="4" isKey="true" autoInc="true" sortable=""/>
+<field name="fgr" description="" fieldType="char" size="10" isKey="" sortable=""/>
+<field name="fgr_str" description="" fieldType="char" size="255" isKey="" sortable=""/>
+<field name="lfb" description="" fieldType="char" size="10" isKey="" sortable=""/>
+<field name="lfb_str" description="" fieldType="char" size="255" isKey="" sortable=""/>
+<field name="fg" description="" fieldType="char" size="10" isKey="" sortable=""/>
+<field name="fg_str" description="" fieldType="varchar" size="255" isKey="" sortable=""/>
+<field name="gueltig_von" description="" fieldType="date" size="255" isKey="" sortable=""/>
+<field name="gueltig_bis" description="" fieldType="date" size="255" isKey="" sortable=""/>
+<interceptor className="de.superx.servlet.DbformInterceptor"/>
+</table>
 <table name="k_astat_staat">
 <field name="schluessel" description="Schlüssel" fieldType="int" size="6" isKey="true" sortable=""/>
 <field name="nummer" description="Nummer" fieldType="varchar" size="255" isKey="" sortable=""/>
@@ -1629,9 +1644,10 @@
 <interceptor className="de.superx.servlet.DbformInterceptor"/>
 </table>
 <table name="trans_cifx">
+<field name="tid" description="" fieldType="int" size="4" isKey="true" autoInc="true" sortable=""/>
 <field name="key" description="" fieldType="int" size="6" isKey="" sortable=""/>
 <field name="apnr" description="" fieldType="char" size="10" isKey="" sortable=""/>
-<field name="cifx_tid" description="" fieldType="int" size="6" isKey="" sortable=""/>
+<field name="cifx_tid" description="" fieldType="int" size="6" isKey="" sortable="true"/>
 <field name="sourcesystem" description="Vorsystem" fieldType="int" size="6" isKey="" sortable=""/>
 <field name="sourcesystem_id" description="ID im Vorsystem" fieldType="varchar" size="255" isKey="" sortable="true"/>
 <field name="systeminfo_id" description="" fieldType="int" size="6" isKey="" sortable=""/>

superx/WEB-INF/kern_dbforms-config_pg.xml

@@ -590,6 +590,9 @@
 <field name="abschluss_astat_bund_ktxt" description="Abschluss (Bundesschlüssel) Kurztext" fieldType="varchar" size="255" isKey="" sortable=""/>
 <field name="abschlussart" description="Abschlussart" fieldType="varchar" size="255" isKey="" sortable=""/>
 <field name="abschluss_grp" description="Abschlussgruppe" fieldType="varchar" size="255" isKey="" sortable=""/>
+<field name="ist_lehramt" description="Lehramt (J/N)" fieldType="int" size="6" isKey="" defaultValue="0" sortable="">
+<comment>Ist Lehramt=1, nein =0</comment>
+</field>
 <interceptor className="de.superx.servlet.DbformInterceptor"/>
 </table>
 <table name="k_astat_abschluss2steller">
@@ -624,6 +627,18 @@
 <field name="name" description="Name" fieldType="varchar" size="255" isKey="" sortable=""/>
 <interceptor className="de.superx.servlet.DbformInterceptor"/>
 </table>
+<table name="k_astat_lfb_fg">
+<field name="tid" description="" fieldType="int" size="4" isKey="true" autoInc="true" sortable=""/>
+<field name="fgr" description="" fieldType="char" size="10" isKey="" sortable=""/>
+<field name="fgr_str" description="" fieldType="char" size="255" isKey="" sortable=""/>
+<field name="lfb" description="" fieldType="char" size="10" isKey="" sortable=""/>
+<field name="lfb_str" description="" fieldType="char" size="255" isKey="" sortable=""/>
+<field name="fg" description="" fieldType="char" size="10" isKey="" sortable=""/>
+<field name="fg_str" description="" fieldType="varchar" size="255" isKey="" sortable=""/>
+<field name="gueltig_von" description="" fieldType="date" size="255" isKey="" sortable=""/>
+<field name="gueltig_bis" description="" fieldType="date" size="255" isKey="" sortable=""/>
+<interceptor className="de.superx.servlet.DbformInterceptor"/>
+</table>
 <table name="k_astat_staat">
 <field name="schluessel" description="Schlüssel" fieldType="int" size="6" isKey="true" sortable=""/>
 <field name="nummer" description="Nummer" fieldType="varchar" size="255" isKey="" sortable=""/>
@@ -1629,9 +1644,10 @@
 <interceptor className="de.superx.servlet.DbformInterceptor"/>
 </table>
 <table name="trans_cifx">
+<field name="tid" description="" fieldType="int" size="4" isKey="true" autoInc="true" sortable=""/>
 <field name="key" description="" fieldType="int" size="6" isKey="" sortable=""/>
 <field name="apnr" description="" fieldType="char" size="10" isKey="" sortable=""/>
-<field name="cifx_tid" description="" fieldType="int" size="6" isKey="" sortable=""/>
+<field name="cifx_tid" description="" fieldType="int" size="6" isKey="" sortable="true"/>
 <field name="sourcesystem" description="Vorsystem" fieldType="int" size="6" isKey="" sortable=""/>
 <field name="sourcesystem_id" description="ID im Vorsystem" fieldType="varchar" size="255" isKey="" sortable="true"/>
 <field name="systeminfo_id" description="" fieldType="int" size="6" isKey="" sortable=""/>

superx/edit/kern/show_html_content.jsp

@@ -37,9 +37,11 @@ if(!entryOK)
 if(defaultMandantenIDParam != null && !defaultMandantenIDParam.toString().equals("")) {
 	LinkMandantID.append("/"+defaultMandantenIDParam.toString());
 }   
-    
-  if (request.getSession()!=null&&request.getSession().getAttribute("sessiontype")!=null&&
-  request.getSession().getAttribute("sessiontype").equals("superx")) {
+    //Impressum wird immer angezeigt, alles andere nur nach Login:
+  if (
+  (IdOutput.equals("IMPRINT") ||
+  (  request.getSession()!=null&&request.getSession().getAttribute("sessiontype")!=null&&
+  request.getSession().getAttribute("sessiontype").equals("superx"))) {
 
 Object mandantobject=request.getSession().getAttribute("MandantenID");
 Object userid=request.getSession().getAttribute("UserID");

superx/xml/nd_templates.xsl

@@ -1146,7 +1146,7 @@ menue.push(entry);
 <xsl:template name="nd_buttonbar_mask">
 <div id="nd_buttonbar_mask">
 <div class="buttonbar">
-      <a href="/{/maske/@helpcontext}" target="_blank"><img src="../images/bookblck_rotiert.svg" alt="Benutzerhandbuch" title="Benutzerhandbuch" border="0" /></a>
+      <xsl:call-template name="nd_button_UserDoc" />
       <a onclick="maskepreparelesezeichendlg();document.getElementById('lesezeichendlg').style='display:block'; return false;"  id="btnBookmark"><img src="../images/attach.svg" alt="Lesezeichen erstellen" title="Die aktuelle SuperX-Maske als Lesezeichen im Browser speichern." border="0" /></a>
       <a onclick="ndMaskeTogglekeyfields(); return false;" id="btnDeepLink" class="linkLookImage"><img title="Schlüsselfelder an- oder ausschalten" alt="Schlüsselfelder an- oder ausschalten" src="../images/key.svg" border="0"/></a>
 </div> <!--Ende buttonbar-->
@@ -1177,7 +1177,7 @@ menue.push(entry);
 
 <img src="../images/arrow_left_fat.svg" class="svg_icon" border="0" alt="zur Maske" />
 </a>
-<a href="https://www.superx-projekt.de/doku/kern_modul/benutzer/" target="_blank"><img src="../images/bookblck_rotiert.svg" alt="Benutzerhandbuch" title="Benutzerhandbuch" border="0" /></a>
+<xsl:call-template name="nd_button_UserDoc" />
       <a onclick="openModal('modalCard_erlaeuterung0');">
       <img src="../images/information.svg" alt="Erläuterung der Tabelle" title="Erläuterung der Tabelle" border="0" />
       </a>
@@ -1244,9 +1244,18 @@ menue.push(entry);
 
 <!--#Template Beginn Button Nutzungsdoku-->
 <xsl:template name="nd_button_UserDoc">
-<div id="nd_button_UserDoc">
-   <a href="https://superxhosting.de/superx/doku/kern_modul/benutzer/main.htm" target="_blank"><img src="../images/bookblck_rotiert.svg" alt="Nutzungshandbuch" title="Nutzungshandbuch" border="0" /></a>
-</div>
+<xsl:variable name="docUrl">
+<xsl:choose>
+<xsl:when test="/*/generalinfo/REPORT_DOCUMENTATION_URL !=''">
+<xsl:value-of select="/*/generalinfo/REPORT_DOCUMENTATION_URL"/>
+</xsl:when>
+<xsl:otherwise>
+<xsl:text>https://www.superx-projekt.de/doku/kern_modul/benutzer/</xsl:text>
+</xsl:otherwise>
+</xsl:choose>
+</xsl:variable>
+   <a href="{$docUrl}" target="_blank"><img src="../images/bookblck_rotiert.svg" alt="Nutzungshandbuch" title="Nutzungshandbuch" border="0" /></a>
+
 </xsl:template>
 <!--#Template Ende Button Nutzungsdoku-->
 

superx/xml/submenu_html.xsl

@@ -35,7 +35,8 @@
     <xsl:call-template name="nd_htmlhead">
     <xsl:with-param name="title" select="concat('Submenue ',/menue/user)" />
     </xsl:call-template> 
-<script src="../xml/js/jquery/jquery-1.12.4.min.js"></script>
+<xsl:call-template name="nd_htmlscript" />
+
 </head>
 <body class="has-navbar-fixed-top">
 <!--#Template Beginn Top-Navigation-->