From 43cea2c88cbd26cdc1f25c215acb742c94d22b2b Mon Sep 17 00:00:00 2001
From: Daniel Quathamer <danielq@memtext.de>
Date: Thu, 14 Sep 2023 08:37:16 +0200
Subject: [PATCH] Neue Tabelle costage_st_hzb, neue Spalte
 costage_st_studien.hauptstudium_flag

---
 src-modules/module/costage/conf/costage.xml   | 26 ++++++++++++++++++-
 .../costage/rohdaten/costage_unload.xml       | 21 ++++++++++++++-
 .../costage/rohdaten/csv_unloads2unl.sql      |  1 +
 3 files changed, 46 insertions(+), 2 deletions(-)

diff --git a/src-modules/module/costage/conf/costage.xml b/src-modules/module/costage/conf/costage.xml
index 75d3ed1..108551b 100644
--- a/src-modules/module/costage/conf/costage.xml
+++ b/src-modules/module/costage/conf/costage.xml
@@ -420,13 +420,14 @@ rightname="CS_BIA_STANDARDREPORTS_ADMIN[CO]" />
 </table>
 
 
-<table name="costage_st_studien" thema="Studierende und Gebühren" caption="Studienverläufe (CO)" typ="Datentabelle" releaseUnload="empty">
+<table name="costage_st_studien" thema="Studierende und Gebühren" caption="Persönliche Studien (CO)" typ="Datentabelle" releaseUnload="empty">
 <description>Studienverläufe (CO)</description>
 <columns><column name="st_studium_nr" type ="INTEGER" size ="8" default ="" notnull ="true" />
 <column name="st_studstamm_nr" type ="INTEGER" size ="8" default ="" notnull ="true" />
 <column name="st_studiengang_nr" type ="INTEGER" size ="8" default ="" notnull ="true" />
 <column name="studienform_name" type ="VARCHAR" size ="100" default ="" notnull ="false" />
 <column name="studienform_statistik_code" type ="VARCHAR" size ="2" default ="" notnull ="false" />
+<column name="hauptstudium_flag" type ="CHAR" size ="10" default ="" notnull ="false" description="Primärhaken" />
 </columns>
 <indexes></indexes>
 <primaryKeys><rs>
@@ -486,6 +487,28 @@ rightname="CS_BIA_STANDARDREPORTS_ADMIN[CO]" />
 </rs></foreignKeys>
 </table>
 
+<table name="costage_st_hzb" thema="Studierende und Gebühren" caption="Schulische Vorbildung (CO)" typ="Datentabelle" releaseUnload="empty">
+<columns><column name="nr" type ="INTEGER" size ="4" default ="" isKey="true" notnull ="true" />
+<column name="hzb_land_nr" type ="INTEGER" size ="4" default ="" notnull ="false" />
+<column name="hzb_land_sub_r_nr" type ="INTEGER" size ="4" default ="" notnull ="false" />
+<column name="hzb_art_nr" type ="INTEGER" size ="4" default ="" notnull ="true" />
+<column name="hzb_jahr" type ="INTEGER" size ="4" default ="" notnull ="false" />
+<column name="hzb_datum" type ="DATE" size ="7" default ="" notnull ="true" />
+<column name="hzb_note" type ="VARCHAR" size ="40" default ="" notnull ="false" />
+<column name="st_person_nr" type ="INTEGER" size ="4" default ="" notnull ="true" />
+</columns>
+<indexes></indexes>
+<primaryKeys><rs>
+</rs></primaryKeys>
+<foreignKeys><rs>
+</rs></foreignKeys>
+<importedKeys><rs>
+</rs></importedKeys>
+<privileges><rs>
+<row>
+</row>
+</rs></privileges>
+</table>
 
 
 <table name="costage_st_studien_aggr" thema="Studierende und Gebühren" caption="Studienverläufe (CO)" typ="Hilfstabelle" releaseUnload="empty">
@@ -1836,6 +1859,7 @@ parent="CO Basisdaten">Abfragen zu Studienplänen und Ordnungen</thema>
 <loadtable refresh="true" delimiter="^" header="false" tabname="costage_st_studien_spoversionen"><file path="$COSTAGE_LOAD_PFAD/unl/costage_st_studien_spoversionen.unl"/></loadtable>
 <loadtable refresh="true" delimiter="^" header="false" tabname="costage_st_studien"><file path="$COSTAGE_LOAD_PFAD/unl/costage_st_studien.unl"/></loadtable>
 <loadtable refresh="true" delimiter="^" header="false" tabname="costage_st_studierendenstammdaten_neu"><file path="$COSTAGE_LOAD_PFAD/unl/costage_st_studierendenstammdaten.unl"/></loadtable>
+<loadtable refresh="true" delimiter="^" header="false" tabname="costage_st_hzb"><file path="$COSTAGE_LOAD_PFAD/unl/costage_st_hzb.unl"/></loadtable>
 <!--neu ab 0.3-->
 <loadtable refresh="true" delimiter="^" header="false" tabname="costage_bw_bewerbungen"><file path="$COSTAGE_LOAD_PFAD/unl/costage_bw_bewerbungen.unl"/></loadtable>
 <loadtable refresh="true" delimiter="^" header="false" tabname="costage_bw_bewerbung_kombination"><file path="$COSTAGE_LOAD_PFAD/unl/costage_bw_bewerbung_kombination.unl"/></loadtable>
diff --git a/src-modules/module/costage/rohdaten/costage_unload.xml b/src-modules/module/costage/rohdaten/costage_unload.xml
index c1b33cc..fb0d647 100644
--- a/src-modules/module/costage/rohdaten/costage_unload.xml
+++ b/src-modules/module/costage/rohdaten/costage_unload.xml
@@ -205,7 +205,8 @@ SELECT st_studium_nr,
        st_studstamm_nr,
        st_studiengang_nr,
        studienform_name,
-       studienform_statistik_code
+       studienform_statistik_code,
+       hauptstudien_flag
 FROM px_st_studien_v 
  
 
@@ -357,6 +358,24 @@ SELECT st_studstamm_nr,
 FROM px_st_studierendenstammdaten_v
  ;
 
+]]>
+</extraction-sql>
+</unload-job>
+<unload-job id="px_st_hzb_v" target-table="costage_st_hzb" extraction-script="" transfer-unload-file="unl/costage_st_hzb.unl" >
+<comment> </comment>
+<extraction-sql sourcesystem="co"  database="" version="">
+<![CDATA[
+nr,
+       hzb_land_nr,
+       hzb_land_sub_r_nr,
+       hzb_art_nr,
+       hzb_jahr,
+       hzb_datum,
+       hzb_note,
+       st_person_nr
+FROM px_st_hzb_v 
+ ;
+
 ]]>
 </extraction-sql>
 </unload-job>
diff --git a/src-modules/module/costage/rohdaten/csv_unloads2unl.sql b/src-modules/module/costage/rohdaten/csv_unloads2unl.sql
index 30c7c8d..822fb94 100644
--- a/src-modules/module/costage/rohdaten/csv_unloads2unl.sql
+++ b/src-modules/module/costage/rohdaten/csv_unloads2unl.sql
@@ -19,6 +19,7 @@
   {"srcfile":"px_st_studien_spoversionen_v.csv", "targettable":"costage_st_studien_spoversionen", "targetfile":"costage_st_studien_spoversionen.unl"},
   {"srcfile":"px_st_studien_v.csv", "targettable":"costage_st_studien", "targetfile":"costage_st_studien.unl"},
   {"srcfile":"px_st_studierendenstammdaten_v.csv", "targettable":"costage_st_studierendenstammdaten_neu", "targetfile":"costage_st_studierendenstammdaten.unl", "specialrule":"update costage_st_studierendenstammdaten_neu set aufnahmedatum=now() where st_studstamm_nr=419856"},
+  {"srcfile":"px_st_hzb_v.csv", "targettable":"costage_st_hzb", "targetfile":"costage_st_hzb.unl", "specialrule":""},
   {"srcfile":"px_bw_bewerbungen_v.csv", "targettable":"costage_bw_bewerbungen", "targetfile":"costage_bw_bewerbungen.unl"},
   {"srcfile":"px_bw_bewerbung_kombination_v.csv", "targettable":"costage_bw_bewerbung_kombination", "targetfile":"costage_bw_bewerbung_kombination.unl"},
   {"srcfile":"px_bw_bewerb_hzb_v.csv", "targettable":"costage_bw_bewerb_hzb", "targetfile":"costage_bw_bewerb_hzb.unl"},