From 4eba45de27c3e11fca02428fe709a2b6630d21ae Mon Sep 17 00:00:00 2001
From: Daniel Quathamer <danielq@memtext.de>
Date: Fri, 31 May 2024 15:50:03 +0200
Subject: [PATCH] Staaten und Kontinente ins Kernmodul verlagern #6

---
 .../conf/edustore/db/install/conf/kern.xml    |  15 ++
 superx/WEB-INF/patch/xml/patch_2024-04-29.xml |   4 +-
 superx/WEB-INF/patch/xml/patch_2024-05-31.xml | 156 ++++++++++++++++++
 3 files changed, 174 insertions(+), 1 deletion(-)
 create mode 100644 superx/WEB-INF/patch/xml/patch_2024-05-31.xml

diff --git a/superx/WEB-INF/conf/edustore/db/install/conf/kern.xml b/superx/WEB-INF/conf/edustore/db/install/conf/kern.xml
index b7783c8..de8624e 100644
--- a/superx/WEB-INF/conf/edustore/db/install/conf/kern.xml
+++ b/superx/WEB-INF/conf/edustore/db/install/conf/kern.xml
@@ -5407,6 +5407,21 @@
 		</rs></importedKeys>
 		<privileges><rs>
 		</rs></privileges>
+	</table>
+	<table name="k_astat_faechergruppe" thema="Stammdaten verwalten" typ="Schlüsseltabelle"
+				releaseUnload="demo" caption="Amtl.Fächergruppen-Schlüssel (Bundesschlüssel)">
+		<columns><column name="schluessel" type ="VARCHAR" size ="255" default ="" notnull ="true" description="Schlüssel" />
+		<column name="name" type ="VARCHAR" size ="255" default ="" notnull ="false" description="Name"/>
+		</columns>
+		<indexes></indexes>
+		<primaryKeys><rs>
+		</rs></primaryKeys>
+		<foreignKeys><rs>
+		</rs></foreignKeys>
+		<importedKeys><rs>
+		</rs></importedKeys>
+		<privileges><rs>
+		</rs></privileges>
 	</table>
 		<!-- <table name="core_module_patch" typ="Datentabelle" thema="Administration" 
 			etl="false" demo="false"> <description>Patch Installation Historie</description> 
diff --git a/superx/WEB-INF/patch/xml/patch_2024-04-29.xml b/superx/WEB-INF/patch/xml/patch_2024-04-29.xml
index fb72049..5fb9162 100644
--- a/superx/WEB-INF/patch/xml/patch_2024-04-29.xml
+++ b/superx/WEB-INF/patch/xml/patch_2024-04-29.xml
@@ -38,10 +38,12 @@
 <file path="edit/kern/sx_repository_edit_content.inc"><patch-description feature_id="283628">Bugfix Repository Bearbeitung</patch-description></file>
 <file path="WEB-INF/conf/edustore/db/install/upgrade/cif_fuellen_key_2.sql"><patch-description feature_id="307740">Bugfix Metadaten Stammdaten-Verwaltung</patch-description></file>
 <file path="xml/js/memtext/sx_functions.js"></file>
-<file path="xml/maskComponents_html.xsl"><patch-description>Bugfix Lesezeichen-Vorlagen</patch-description></file>
 <file path="xml/maske_html.xsl"></file>
 <file path="xml/menue_html.css"><patch-description feature_id="322854">BUGFIX Datenschutz und Impressum überlagern Buttons und Links aus Masken und Themenbaum</patch-description></file>
 <file path="edit/kern/webapp_manager.jsp"><patch-description feature_id="315314">Bugfix bei Auswahl Zeilenanzahl im Logdateien</patch-description></file>
+<file path="superx/edit/kern/organigramm_dialog.jsp"><patch-description feature_id="">Bugfix Formular Organigramm Bearbeitung</patch-description></file>
+
+
 </files>
 
 <database name="superx">
diff --git a/superx/WEB-INF/patch/xml/patch_2024-05-31.xml b/superx/WEB-INF/patch/xml/patch_2024-05-31.xml
new file mode 100644
index 0000000..94ac73b
--- /dev/null
+++ b/superx/WEB-INF/patch/xml/patch_2024-05-31.xml
@@ -0,0 +1,156 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<patch patch_id="2024-05-31">
+<systeme>
+<system name="his1" codierung="utf8"/>
+<system name="superx" codierung="utf8"/>
+<system name="superx" codierung="iso"/>
+</systeme>
+                                                                                                                                                                                                                                  
+
+<module name="kern" systeminfo_id="xxx" inst_from="xx">
+<patch-description feature_id="252453">Patch: landesspezifische Fächerschlüssel. Es wird eine Vorab-Version der Tabelle k_astat_studienfach_land sowie weiterer Tabellen eingespielt, die in SuperX Kern 5.1 und HISinOne-BI 2024.06 bereits enthalten ist. Die Tabelle ist die Grundlage für die Ermittlung landesspez. Fächerschlüssel in BaWue, NRW und Sachsen.<br />
+Hinweis für HISinOne-BI bis Version 2023.12: Da Patches nicht automatisch installiert werden können müssen sie die Schritte <a href="http://www.superx-projekt.de/doku/kenn_modul/stala_bw/f_InstallationdesPatchesunterHISinOne-BI.htm">manuell</a> ausführen.<br />
+Weitere Hinweise siehe <a href="https://superx-rocks.de/git/Memtext/KENN_BW_STALA_2022">Laderegel</a></patch-description>
+  
+<patch-test>
+<!-- Bisher nur sql erlaubt. Ergebniss muss 0 sein, um zu erlauben, dass der Patch eingespielt wird! -->
+<nativeaction sql="select 0 from xdummy where (select count(*) from db_version where his_system='kern') > 0 " scriptfile="" database=""/>
+</patch-test>
+
+<patch-data>
+
+<files>
+<file path="WEB-INF/conf/edustore/db/install/schluesseltabellen/release_unloads/k_astat_studienfach_land.unl"><patch-description feature_id="252453">Datei Fach (Land) zu Land (Bund)</patch-description></file>
+<file path="WEB-INF/conf/edustore/db/install/schluesseltabellen/release_unloads/k_astat_staat.unl"><patch-description feature_id="315457">Datei Staat (Bund)</patch-description></file>
+<file path="WEB-INF/conf/edustore/db/install/schluesseltabellen/release_unloads/k_astat_kontinent.unl"><patch-description feature_id="315457">Datei Kontinent (Bund)</patch-description></file>
+<file path="WEB-INF/conf/edustore/db/install/schluesseltabellen/release_unloads/k_astat_faechergruppe.unl"><patch-description feature_id="252453">Datei Fächergruppen (Bund)</patch-description></file>
+<file path="WEB-INF/conf/edustore/db/install/schluesseltabellen/release_unloads/k_astat_abschluss3steller_land.unl"><patch-description feature_id="252453">Datei Abschluss (Land) zu Abschluss (Bund)</patch-description></file>
+<file path="WEB-INF/conf/edustore/db/install/schluesseltabellen/release_unloads/k_astat_abschluss2steller.unl"><patch-description feature_id="252453">Datei Abschluss (Bund)</patch-description></file>
+<file path="WEB-INF/conf/edustore/db/install/schluesseltabellen/release_unloads/k_astat_studienbereich.unl"><patch-description feature_id="252453">Datei Studienbereich (Bund)</patch-description></file>
+<file path="WEB-INF/conf/edustore/db/install/schluesseltabellen/release_unloads/k_astat_studienfach.unl"><patch-description feature_id="252453">Datei Fach (Bund)</patch-description></file>
+
+
+</files>
+
+<database name="superx">
+<!-- TODO: hier können beliebige Elemente der normalen Modul-XML stehen-->
+<masken>>
+</masken>
+</database>
+
+<upgrade>
+<upgrade-step>
+
+
+<action error="cont">
+<nativeaction sql="CREATE TABLE IF NOT EXISTS k_astat_studienfach_land(
+	schluessel VARCHAR(255) , 
+gueltig_ab INTEGER , 
+land INTEGER , 
+version INTEGER , 
+sortkey INTEGER , 
+gueltig_bis INTEGER , 
+name VARCHAR(255) , 
+isced VARCHAR(255) , 
+keybund VARCHAR(255) 
+) 
+; " scriptfile="" database="POSTGRES"/>
+
+<nativeaction sql="CREATE TABLE IF NOT EXISTS k_astat_abschluss3steller_land(
+	schluessel VARCHAR(255)  not null, 
+gueltig_ab INTEGER , 
+land INTEGER , 
+version INTEGER , 
+sortkey INTEGER , 
+gueltig_bis INTEGER , 
+name VARCHAR(255) , 
+sig2steller VARCHAR(255) , 
+keybund VARCHAR(255) 
+) 
+; " scriptfile="" database="POSTGRES"/>
+<nativeaction sql="CREATE TABLE IF NOT EXISTS k_astat_abschluss2steller(
+	schluessel VARCHAR(255)  not null, 
+name VARCHAR(255) 
+) 
+; " scriptfile="" database="POSTGRES"/>
+
+<nativeaction sql="CREATE TABLE IF NOT EXISTS k_astat_studienbereich(
+	schluessel VARCHAR(255)  not null, 
+name VARCHAR(255) , 
+fgr VARCHAR(255) 
+) 
+; " scriptfile="" database="POSTGRES"/>
+
+<nativeaction sql="CREATE TABLE IF NOT EXISTS k_astat_studienfach(
+	schluessel VARCHAR(255)  not null, 
+name VARCHAR(255) , 
+sb VARCHAR(255) 
+) 
+;" scriptfile="" database="POSTGRES"/>
+<nativeaction sql="CREATE TABLE IF NOT EXISTS k_astat_staat(
+	schluessel INTEGER  not null, 
+nummer VARCHAR(255) , 
+name VARCHAR(255) , 
+kennz VARCHAR(255) , 
+kontinent INTEGER , 
+	constraint c_k_astat_staat primary key (schluessel)
+
+) 
+; " scriptfile="" database="POSTGRES"/>
+<nativeaction sql="CREATE TABLE IF NOT EXISTS k_astat_kontinent(
+	schluessel INTEGER  not null, 
+nummer VARCHAR(255) , 
+name VARCHAR(255) , 
+	constraint c_k_astat_kontinent primary key (schluessel)
+
+) 
+;
+ " scriptfile="" database="POSTGRES"/>
+<nativeaction sql="CREATE TABLE IF NOT EXISTS create table k_astat_faechergruppe(
+	schluessel VARCHAR(255)  not null, 
+name VARCHAR(255) 
+) 
+; " scriptfile="" database="POSTGRES"/>
+
+</action>
+
+
+<action error="cont">
+		<loadtable refresh="true" delimiter="^" header="false" tabname="k_astat_studienfach_land">
+			<file path="$SUPERX_DIR/db/install/schluesseltabellen/release_unloads/k_astat_studienfach_land.unl" />
+		</loadtable>
+		<loadtable refresh="true" delimiter="^" header="false" tabname="k_astat_abschluss3steller_land">
+			<file path="$SUPERX_DIR/db/install/schluesseltabellen/release_unloads/k_astat_abschluss3steller_land.unl" />
+		</loadtable>
+		<loadtable refresh="true" delimiter="^" header="false" tabname="k_astat_abschluss2steller">
+			<file path="$SUPERX_DIR/db/install/schluesseltabellen/release_unloads/k_astat_abschluss2steller.unl" />
+		</loadtable>
+		<loadtable refresh="true" delimiter="^" header="false" tabname="k_astat_studienbereich">
+			<file path="$SUPERX_DIR/db/install/schluesseltabellen/release_unloads/k_astat_studienbereich.unl" />
+		</loadtable>
+		<loadtable refresh="true" delimiter="^" header="false" tabname="k_astat_studienfach">
+			<file path="$SUPERX_DIR/db/install/schluesseltabellen/release_unloads/k_astat_studienfach.unl" />
+		</loadtable>
+		<loadtable refresh="true" delimiter="^" header="false" tabname="k_astat_staat">
+			<file path="$SUPERX_DIR/db/install/schluesseltabellen/release_unloads/k_astat_staat.unl" />
+		</loadtable>
+		<loadtable refresh="true" delimiter="^" header="false" tabname="k_astat_kontinent">
+			<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>
+</action>
+
+
+
+</upgrade-step>
+</upgrade>
+
+</patch-data>
+
+</module>
+
+
+
+</patch>