diff --git a/superx/WEB-INF/conf/edustore/db/conf/build.xml b/superx/WEB-INF/conf/edustore/db/conf/build.xml
index bcfe684..0b4af69 100644
--- a/superx/WEB-INF/conf/edustore/db/conf/build.xml
+++ b/superx/WEB-INF/conf/edustore/db/conf/build.xml
@@ -112,6 +112,8 @@
+
+
@@ -317,8 +319,8 @@
-
-
+
@@ -490,11 +492,11 @@ xmlns:HtmlUtils="de.superx.util.HtmlUtils">
-eduetl:drop view user_groups;
-
-
-eduetl:drop view menu_element_fieldmode;
-
-
-eduetl:drop view menu_element_mandatory;
-
-
-eduetl:drop view menu_element_nature;
-
-
-eduetl:drop view menu_element_orgstructure;
-
-
-eduetl:drop view user_inst_org;
-
-
-eduetl:drop view hochschulen;
-
-
-eduetl:drop view dimension_view;
-
-
-eduetl:drop view fact_table;
-
-
-eduetl:drop view dim_staat;
-
-
-eduetl:drop view dim_stg;
-
-
-eduetl:drop view dim_abschluss;
-
-
-eduetl:drop view dim_kost;
-
-
-eduetl:drop view dim_kotr;
-
-
-eduetl:drop view dim_kreis;
-
+
+eduetl:drop function sp_user_themen(integer, date, smallint);
@@ -239,358 +197,379 @@
eduetl:drop function trim_all_whitespace(varchar);
-eduetl:drop table sichtart_rechttabelle cascade;
+eduetl:drop table if exists sichtart_rechttabelle cascade;
-eduetl:drop table group_field_pref cascade;
+eduetl:drop table if exists group_field_pref cascade;
-eduetl:drop table stylesheet_field cascade;
+eduetl:drop table if exists stylesheet_field cascade;
-eduetl:drop table db_tabellen cascade;
+eduetl:drop table if exists db_tabellen cascade;
-eduetl:drop table db_forms cascade;
+eduetl:drop table if exists db_forms cascade;
-eduetl:drop table db_version cascade;
+eduetl:drop table if exists db_version cascade;
-eduetl:drop table aggregierung cascade;
+eduetl:drop table if exists aggregierung cascade;
-eduetl:drop table sichten cascade;
+eduetl:drop table if exists sichten cascade;
-eduetl:drop table lehr_orga_bez cascade;
+eduetl:drop table if exists lehr_orga_bez cascade;
-eduetl:drop table masken_felder_bez cascade;
+eduetl:drop table if exists masken_felder_bez cascade;
-eduetl:drop table sachgebiete cascade;
+eduetl:drop table if exists sachgebiete cascade;
-eduetl:drop table sachgeb_maske_bez cascade;
+eduetl:drop table if exists sachgeb_maske_bez cascade;
-eduetl:drop table sachgeb_dbform_bez cascade;
+eduetl:drop table if exists sachgeb_dbform_bez cascade;
-eduetl:drop table user_masken_bez cascade;
+eduetl:drop table if exists user_masken_bez cascade;
-eduetl:drop table user_sachgeb_bez cascade;
+eduetl:drop table if exists user_sachgeb_bez cascade;
-eduetl:drop table xdummy cascade;
+eduetl:drop table if exists xdummy cascade;
-eduetl:drop table macro_masken_bez cascade;
+eduetl:drop table if exists macro_masken_bez cascade;
-eduetl:drop table graphicformat cascade;
+eduetl:drop table if exists graphicformat cascade;
-eduetl:drop table macro_feld_wert cascade;
+eduetl:drop table if exists macro_feld_wert cascade;
-eduetl:drop table groupinfo cascade;
+eduetl:drop table if exists groupinfo cascade;
-eduetl:drop table user_group_bez cascade;
+eduetl:drop table if exists user_group_bez cascade;
-eduetl:drop table group_sachgeb_bez cascade;
+eduetl:drop table if exists group_sachgeb_bez cascade;
-eduetl:drop table group_masken_bez cascade;
+eduetl:drop table if exists group_masken_bez cascade;
-eduetl:drop table aggre_bland cascade;
+eduetl:drop table if exists aggre_bland cascade;
-eduetl:drop table cif cascade;
+eduetl:drop table if exists cif cascade;
-eduetl:drop table cifx cascade;
+eduetl:drop table if exists cifx cascade;
-eduetl:drop table trans_cifx cascade;
+eduetl:drop table if exists trans_cifx cascade;
-eduetl:drop table trans_cif cascade;
+eduetl:drop table if exists trans_cif cascade;
-eduetl:drop table felderinfo cascade;
+eduetl:drop table if exists cifx_customize cascade;
-eduetl:drop table hochschulinfo cascade;
+eduetl:drop table if exists felderinfo cascade;
-eduetl:drop table maske_system_bez cascade;
+eduetl:drop table if exists hochschulinfo cascade;
-eduetl:drop table maskeninfo cascade;
+eduetl:drop table if exists maske_system_bez cascade;
-eduetl:drop table proto_funktion cascade;
+eduetl:drop table if exists maskeninfo cascade;
-eduetl:drop table systeminfo cascade;
+eduetl:drop table if exists proto_funktion cascade;
-eduetl:drop table user_einstellungen cascade;
+eduetl:drop table if exists systeminfo cascade;
-eduetl:drop table userinfo cascade;
+eduetl:drop table if exists user_einstellungen cascade;
-eduetl:drop table themenbaum cascade;
+eduetl:drop table if exists userinfo cascade;
-eduetl:drop table themenbaum_bak cascade;
+eduetl:drop table if exists themenbaum cascade;
-eduetl:drop table nachricht cascade;
+eduetl:drop table if exists themenbaum_bak cascade;
-eduetl:drop table menu_element cascade;
+eduetl:drop table if exists nachricht cascade;
-eduetl:drop table dbconnections cascade;
+eduetl:drop table if exists menu_element cascade;
-eduetl:drop table organigramm cascade;
+eduetl:drop table if exists dbconnections cascade;
-eduetl:drop table organigramm_bak cascade;
+eduetl:drop table if exists organigramm cascade;
-eduetl:drop table user_institution cascade;
+eduetl:drop table if exists organigramm_bak cascade;
-eduetl:drop table kostentraeger cascade;
+eduetl:drop table if exists user_institution cascade;
-eduetl:drop table user_kostentraeger cascade;
+eduetl:drop table if exists kostentraeger cascade;
-eduetl:drop table kotr_to_inst cascade;
+eduetl:drop table if exists user_kostentraeger cascade;
-eduetl:drop table protokoll cascade;
+eduetl:drop table if exists kotr_to_inst cascade;
-eduetl:drop table trans_inst cascade;
+eduetl:drop table if exists protokoll cascade;
-eduetl:drop table konstanten cascade;
+eduetl:drop table if exists trans_inst cascade;
-eduetl:drop table lehreinheit_inst cascade;
+eduetl:drop table if exists konstanten cascade;
-eduetl:drop table sx_stylesheets cascade;
+eduetl:drop table if exists lehreinheit_inst cascade;
-eduetl:drop table sx_mask_style cascade;
+eduetl:drop table if exists sx_stylesheets cascade;
-eduetl:drop table sx_stylesheet_param cascade;
+eduetl:drop table if exists sx_mask_style cascade;
-eduetl:drop table sx_captions cascade;
+eduetl:drop table if exists sx_stylesheet_param cascade;
-eduetl:drop table fm_templates cascade;
+eduetl:drop table if exists sx_captions cascade;
-eduetl:drop table user_sichten cascade;
+eduetl:drop table if exists fm_templates cascade;
-eduetl:drop table user_sichtarten cascade;
+eduetl:drop table if exists user_sichten cascade;
-eduetl:drop table group_sichten cascade;
+eduetl:drop table if exists user_sichtarten cascade;
-eduetl:drop table group_sichtarten cascade;
+eduetl:drop table if exists group_sichten cascade;
-eduetl:drop table sachgeb_sichten cascade;
+eduetl:drop table if exists group_sichtarten cascade;
-eduetl:drop table sachgeb_sichtarten cascade;
+eduetl:drop table if exists sachgeb_sichten cascade;
-eduetl:drop table sx_repository cascade;
+eduetl:drop table if exists sachgeb_sichtarten cascade;
-eduetl:drop table user_pw cascade;
+eduetl:drop table if exists sx_repository cascade;
-eduetl:drop table sx_downloads cascade;
+eduetl:drop table if exists user_pw cascade;
-eduetl:drop table download_group_bez cascade;
+eduetl:drop table if exists sx_downloads cascade;
-eduetl:drop table download_user_bez cascade;
+eduetl:drop table if exists download_group_bez cascade;
-eduetl:drop table download_keyw_bez cascade;
+eduetl:drop table if exists download_user_bez cascade;
-eduetl:drop table sx_keywords cascade;
+eduetl:drop table if exists download_keyw_bez cascade;
-eduetl:drop table user_startpage cascade;
+eduetl:drop table if exists sx_keywords cascade;
-eduetl:drop table user_startfields cascade;
+eduetl:drop table if exists user_startpage cascade;
-eduetl:drop table user_dialog cascade;
+eduetl:drop table if exists user_startfields cascade;
-eduetl:drop table user_dialog_accept cascade;
+eduetl:drop table if exists user_dialog cascade;
-eduetl:drop table user_hinweis cascade;
+eduetl:drop table if exists user_dialog_accept cascade;
-eduetl:drop table group_hinweis cascade;
+eduetl:drop table if exists user_hinweis cascade;
-eduetl:drop table unload_params cascade;
+eduetl:drop table if exists group_hinweis cascade;
-eduetl:drop table sx_tables cascade;
+eduetl:drop table if exists unload_params cascade;
-eduetl:drop table sx_fields cascade;
+eduetl:drop table if exists sx_tables cascade;
-eduetl:drop table dimension_bp cascade;
+eduetl:drop table if exists sx_fields cascade;
-eduetl:drop table dimension cascade;
+eduetl:drop table if exists dimension_bp cascade;
-eduetl:drop table dim_bp_apnr cascade;
+eduetl:drop table if exists dimension cascade;
-eduetl:drop table dim_bp_altsicht_apnr cascade;
+eduetl:drop table if exists dim_bp_apnr cascade;
-eduetl:drop table dim_closure cascade;
+eduetl:drop table if exists dim_bp_altsicht_apnr cascade;
-eduetl:drop table mondrian_schema cascade;
+eduetl:drop table if exists dim_closure cascade;
-eduetl:drop table trans_dim_bp_apnr cascade;
+eduetl:drop table if exists mondrian_schema cascade;
-eduetl:drop table masken_protokoll cascade;
+eduetl:drop table if exists trans_dim_bp_apnr cascade;
-eduetl:drop table masken_prot_feld cascade;
+eduetl:drop table if exists masken_protokoll cascade;
-eduetl:drop table data_upload cascade;
+eduetl:drop table if exists masken_prot_feld cascade;
-eduetl:drop table update_prot cascade;
+eduetl:drop table if exists data_upload cascade;
-eduetl:drop table update_prot_neu cascade;
+eduetl:drop table if exists update_prot cascade;
-eduetl:drop table personattribute_neu cascade;
+eduetl:drop table if exists update_prot_neu cascade;
-eduetl:drop table personattribute cascade;
+eduetl:drop table if exists personattribute_neu cascade;
-eduetl:drop table personattributetype cascade;
+eduetl:drop table if exists personattribute cascade;
-eduetl:drop table personattribute_value_list cascade;
+eduetl:drop table if exists personattributetype cascade;
-eduetl:drop table user_preset_values cascade;
+eduetl:drop table if exists personattribute_value_list cascade;
-eduetl:drop table sx_portlet cascade;
+eduetl:drop table if exists user_preset_values cascade;
-eduetl:drop table user_portlet_bez cascade;
+eduetl:drop table if exists sx_portlet cascade;
-eduetl:drop table group_portlet_bez cascade;
+eduetl:drop table if exists user_portlet_bez cascade;
-eduetl:drop table kern_cifx_neu cascade;
+eduetl:drop table if exists group_portlet_bez cascade;
-eduetl:drop table sieve cascade;
+eduetl:drop table if exists kern_cifx_neu cascade;
-eduetl:drop table sieve_column_def cascade;
+eduetl:drop table if exists sieve cascade;
-eduetl:drop table sieve_column cascade;
+eduetl:drop table if exists sieve_column_def cascade;
-eduetl:drop table sieve_field cascade;
+eduetl:drop table if exists sieve_column cascade;
-eduetl:drop table sx_jobs cascade;
+eduetl:drop table if exists sieve_field cascade;
-eduetl:drop table orgunit_mapping cascade;
+eduetl:drop table if exists sx_jobs cascade;
-eduetl:drop table implicit_orgunit_rights cascade;
+eduetl:drop table if exists orgunit_mapping cascade;
-eduetl:drop table kern_pruefrout cascade;
+eduetl:drop table if exists implicit_orgunit_rights cascade;
-eduetl:drop table masken_statistik cascade;
+eduetl:drop table if exists kern_pruefrout cascade;
-eduetl:drop table dim_datum cascade;
+eduetl:drop table if exists masken_statistik cascade;
-eduetl:drop table hisinone_deleted_entity cascade;
+eduetl:drop table if exists dim_datum cascade;
-eduetl:drop table etl_step cascade;
+eduetl:drop table if exists hisinone_deleted_entity cascade;
-eduetl:drop table etl_step_type cascade;
+eduetl:drop table if exists etl_step cascade;
-eduetl:drop table etl_step_type_param cascade;
+eduetl:drop table if exists etl_step_type cascade;
-eduetl:drop table etl_step_property cascade;
+eduetl:drop table if exists etl_step_type_param cascade;
-eduetl:drop table etl_step_relation cascade;
+eduetl:drop table if exists etl_step_property cascade;
-eduetl:drop table etl_job cascade;
+eduetl:drop table if exists etl_step_relation cascade;
-eduetl:drop table etl_job_param cascade;
+eduetl:drop table if exists etl_job cascade;
-eduetl:drop table sx_mail cascade;
+eduetl:drop table if exists etl_job_param cascade;
+
+
+eduetl:drop table if exists k_astat_studienfach_land cascade;
+
+
+eduetl:drop table if exists k_astat_abschluss3steller_land cascade;
+
+
+eduetl:drop table if exists k_astat_abschluss2steller cascade;
+
+
+eduetl:drop table if exists k_astat_studienbereich cascade;
+
+
+eduetl:drop table if exists k_astat_studienfach cascade;
+
+
+eduetl:drop table if exists colorscheme cascade;
+
+
+eduetl:drop table if exists sx_mail cascade;
@@ -602,4 +581,7 @@
+
+
+
diff --git a/superx/WEB-INF/conf/edustore/db/install/conf/his1/edustore_install/edustore_kern_install_pg.xml b/superx/WEB-INF/conf/edustore/db/install/conf/his1/edustore_install/edustore_kern_install_pg.xml
index e089afe..418fff3 100644
--- a/superx/WEB-INF/conf/edustore/db/install/conf/his1/edustore_install/edustore_kern_install_pg.xml
+++ b/superx/WEB-INF/conf/edustore/db/install/conf/his1/edustore_install/edustore_kern_install_pg.xml
@@ -77,199 +77,234 @@
eduetl:truncate table sx_repository cascade;
+eduetl:truncate table k_astat_studienfach_land cascade;
+
+eduetl:truncate table k_astat_abschluss3steller_land cascade;
+
+eduetl:truncate table k_astat_abschluss2steller cascade;
+
+eduetl:truncate table k_astat_studienfach cascade;
+
+eduetl:truncate table k_astat_studienbereich cascade;
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -279,10 +314,10 @@
-
+
-
+
diff --git a/superx/WEB-INF/conf/edustore/db/install/conf/his1/edustore_install/edustore_kern_integrate_pg.sql b/superx/WEB-INF/conf/edustore/db/install/conf/his1/edustore_install/edustore_kern_integrate_pg.sql
index b6ecbe3..fff9761 100644
--- a/superx/WEB-INF/conf/edustore/db/install/conf/his1/edustore_install/edustore_kern_integrate_pg.sql
+++ b/superx/WEB-INF/conf/edustore/db/install/conf/his1/edustore_install/edustore_kern_integrate_pg.sql
@@ -4,14 +4,18 @@
--Integrieren:
--- Fülle db_version
+select now(),'Fülle db_version'
+from xdummy;
+
delete from db_version where his_system='kern';
-insert into db_version (his_system,version) values('kern','5.0b');
+insert into db_version (his_system,version,systeminfo_id) values('kern','5.0',9);
+
+select now(),'Fülle db_tabellen'
+from xdummy;
--- Fülle db_tabellen
delete from db_tabellen where name='sichtart_rechttabelle';
insert into db_tabellen (name,protokollierung) values('sichtart_rechttabelle',0);
delete from db_tabellen where name='group_field_pref';
@@ -68,6 +72,8 @@ delete from db_tabellen where name='trans_cifx';
insert into db_tabellen (name,protokollierung) values('trans_cifx',0);
delete from db_tabellen where name='trans_cif';
insert into db_tabellen (name,protokollierung) values('trans_cif',0);
+delete from db_tabellen where name='cifx_customize';
+insert into db_tabellen (name,protokollierung) values('cifx_customize',0);
delete from db_tabellen where name='felderinfo';
insert into db_tabellen (name,protokollierung) values('felderinfo',0);
delete from db_tabellen where name='hochschulinfo';
@@ -246,21 +252,37 @@ delete from db_tabellen where name='etl_job';
insert into db_tabellen (name,protokollierung) values('etl_job',0);
delete from db_tabellen where name='etl_job_param';
insert into db_tabellen (name,protokollierung) values('etl_job_param',0);
+delete from db_tabellen where name='k_astat_studienfach_land';
+insert into db_tabellen (name,protokollierung) values('k_astat_studienfach_land',0);
+delete from db_tabellen where name='k_astat_abschluss3steller_land';
+insert into db_tabellen (name,protokollierung) values('k_astat_abschluss3steller_land',0);
+delete from db_tabellen where name='k_astat_abschluss2steller';
+insert into db_tabellen (name,protokollierung) values('k_astat_abschluss2steller',0);
+delete from db_tabellen where name='k_astat_studienbereich';
+insert into db_tabellen (name,protokollierung) values('k_astat_studienbereich',0);
+delete from db_tabellen where name='k_astat_studienfach';
+insert into db_tabellen (name,protokollierung) values('k_astat_studienfach',0);
+delete from db_tabellen where name='colorscheme';
+insert into db_tabellen (name,protokollierung) values('colorscheme',0);
delete from db_tabellen where name='sx_mail';
insert into db_tabellen (name,protokollierung) values('sx_mail',0);
--- Fülle sachgebiete, systeminfo und themenbaum
+select now(),'Fülle sachgebiete, systeminfo und themenbaum'
+from xdummy;
+
--Das Sachgebiet wird erzeugt, ggf. vorherige Sachgebiete sichern.
-delete from sachgebiete where tid=0;
-insert into sachgebiete(tid,name) values (0,'Administration');
--- den admins die Rechte geben
-delete from group_sachgeb_bez where sachgebiete_id=0;
+
+insert into sachgebiete(tid,name) select 0,'Administration'
+from xdummy
+where 0=(select count(*) from sachgebiete S where S.tid=0);
insert into group_sachgeb_bez
-select G.tid,0 from groupinfo G where G.name='Administratoren' or G.name='superx' ;
+select G.tid,0 from groupinfo G
+where (G.name='Administratoren' or G.name='superx')
+and 0=(select count(*) from group_sachgeb_bez G where G.sachgebiete_id=0);
-- his1 rightname fuer Sachgebiete nachtragen
@@ -272,12 +294,17 @@ update sachgebiete set rightname='CS_BIA_ADMINISTRATE_TOPIC_AREA[CORE_OU]' where
update sachgebiete set rightname='CS_BIA_ADMINISTRATE_TOPIC_AREA[CORE_USERINFO]' where tid=53;
update sachgebiete set rightname='CS_BIA_ADMINISTRATE_TOPIC_AREA[CORE_LOAD]' where tid=54;
- -- wird auch noch mal als template aufgerufen in sx_tables_fuellen.sql vergl. http://ics/ilias3/goto.php?target=wiki_40_SingleSignOn-Rechteuebernahme&client_id=memtext --Das system wird erzeugt, ggf. vorherige systeme sichern.
-delete from systeminfo where tid=9;
-insert into systeminfo(tid,name,datum) values (9,'Administration',date('1.1.1900'));
+ -- wird auch noch mal als template aufgerufen in sx_tables_fuellen.sql --Das system wird erzeugt, ggf. vorherige systeme sichern.
+insert into systeminfo(tid,name,datum) select 9,'Administration',date('1.1.1900')
+from xdummy
+where 0=(select count(*) from systeminfo S where S.tid=9);
+
+
+
+select now(),'Das Thema und die Masken in den Themenbaum einfügen'
+from xdummy;
--- Das Thema und die Masken in den Themenbaum einfügen
--Das Thema und die Masken in den Themenbaum einfügen
--zunaechst werden die Eintraege in den themenbaum_bak eingefuegt, default ist parent=themenbaum_root
@@ -310,7 +337,9 @@ create temp table tmp_themenbaum
select setval('tmp_themenbaum_tid_seq',(select max(tid)+1 from themenbaum));
--- root für das Modul einfügen und in den Themenbaum einhängen:
+select now(),'root für das Modul einfügen und in den Themenbaum einhängen:'
+from xdummy;
+
insert into tmp_themenbaum
( tid,name, gueltig_seit,gueltig_bis )
@@ -371,6 +400,12 @@ insert into tmp_themenbaum(name, parentname, gueltig_seit,gueltig_bis,erlaeuteru
--gibt es das Thema schon?
delete from tmp_themenbaum where name in (select T.name from themenbaum T where T.name='Entwicklung'
or T.name='Administration');
+insert into tmp_themenbaum(name, parentname, gueltig_seit,gueltig_bis,erlaeuterung)
+ values('Stammdaten verwalten','Administration',date_val('01.01.1900'),date_val('01.01.3000'),'Abfragen zur Stammdatenverwaltung');
+
+--gibt es das Thema schon?
+delete from tmp_themenbaum where name in (select T.name from themenbaum T where T.name='Stammdaten verwalten'
+or T.name='Administration');
--root für das Modul einfügen und in den Themenbaum einhängen
--update themenbaum_bak set parent=(select tid from themenbaum where parent is null)
@@ -384,7 +419,9 @@ or T.name='Administration');
--Nun die einzelnen Masken
--- Nun die einzelnen Masken:
+select now(),'Nun die einzelnen Masken:'
+from xdummy;
+
insert into tmp_themenbaum
( name ,maskeninfo_id, parentname,
@@ -666,7 +703,9 @@ values('Gastzugang einrichten','71770','Administration',date_val('01.01.1900'),d
delete from tmp_themenbaum where maskeninfo_id in (select T.maskeninfo_id from themenbaum T);
--- Die einzelnen Masken sind eingefügt.
+select now(),'Die einzelnen Masken sind eingefügt.'
+from xdummy;
+
insert into tmp_themenbaum2 select * from tmp_themenbaum;
@@ -694,9 +733,12 @@ update themenbaum set erlaeuterung='Uploads/Downloads verwalten' where name='Upl
update themenbaum set erlaeuterung='Abfragen zur Feld-Verwaltung' where name='Felder';
update themenbaum set erlaeuterung='Benutzereinstellungen (Passwort ändern etc.)' where name='Benutzer';
update themenbaum set erlaeuterung='Spezielle Funktionen für die Entwicklung' where name='Entwicklung';
+update themenbaum set erlaeuterung='Abfragen zur Stammdatenverwaltung' where name='Stammdaten verwalten';
+
+select now(),'db_forms einfügen'
+from xdummy;
--- db_forms einfügen
CREATE temp TABLE tmp_db_forms (
tid serial NOT NULL,
@@ -707,115 +749,115 @@ CREATE temp TABLE tmp_db_forms (
description character(255)
);
insert into tmp_db_forms (name, tablename,form_path,caption,description)
-values ('sachgebiete','sachgebiete','/edit/kern/sachgebiete_edit.jsp','Sachgebiete verwalten','In diesem Formular können Sie Sachgebiete verwalten.');
+values ('sachgebiete','sachgebiete','/edit/kern/sachgebiete_edit.jsp','Sachgebiete verwalten'::varchar(200),'In diesem Formular können Sie Sachgebiete verwalten.'::varchar(255));
insert into tmp_db_forms (name, tablename,form_path,caption,description)
-values ('sx_stylesheets','sx_stylesheets','/edit/kern/sx_stylesheets_edit.jsp','Stylesheets verwalten','In diesem Formular können Sie XSL-Stylesheets verwalten.');
+values ('sx_stylesheets','sx_stylesheets','/edit/kern/sx_stylesheets_edit.jsp','Stylesheets verwalten'::varchar(200),'In diesem Formular können Sie XSL-Stylesheets verwalten.'::varchar(255));
insert into tmp_db_forms (name, tablename,form_path,caption,description)
-values ('organigramm','organigramm','/edit/kern/organigramm_edit.jsp','Organigramm verwalten','In diesem Formular können Sie Organisationseinheiten verwalten.');
+values ('organigramm','organigramm','/edit/kern/organigramm_edit.jsp','Organigramm verwalten'::varchar(200),'In diesem Formular können Sie Organisationseinheiten verwalten.'::varchar(255));
insert into tmp_db_forms (name, tablename,form_path,caption,description)
-values ('organigramm_nodeattrib','organigramm','/edit/kern/organigramm_editnodeattrib.jsp','Organigramm Sichtbarkeit verwalten','In diesem Formular können Sie die Sichtbarkeit von Organisationseinheiten verwalten.');
+values ('organigramm_nodeattrib','organigramm','/edit/kern/organigramm_editnodeattrib.jsp','Organigramm Sichtbarkeit verwalten'::varchar(200),'In diesem Formular können Sie die Sichtbarkeit von Organisationseinheiten verwalten.'::varchar(255));
insert into tmp_db_forms (name, tablename,form_path,caption,description)
-values ('maskeninfo','maskeninfo','/edit/kern/maskeninfo_edit.jsp','Maskeninfo verwalten','In diesem Formular können Sie Maskendefinitionen verwalten.');
+values ('maskeninfo','maskeninfo','/edit/kern/maskeninfo_edit.jsp','Maskeninfo verwalten'::varchar(200),'In diesem Formular können Sie Maskendefinitionen verwalten.'::varchar(255));
insert into tmp_db_forms (name, tablename,form_path,caption,description)
-values ('macro_feld_wert_list','macro_feld_wert','/edit/kern/macro_feld_wert_list.jsp','Feld-Vorbelegung von Makro-Masken','In diesem Formular können Sie Feld-Vorbelegung von Makro-Masken verwalten.');
+values ('macro_feld_wert_list','macro_feld_wert','/edit/kern/macro_feld_wert_list.jsp','Feld-Vorbelegung von Makro-Masken'::varchar(200),'In diesem Formular können Sie Feld-Vorbelegung von Makro-Masken verwalten.'::varchar(255));
insert into tmp_db_forms (name, tablename,form_path,caption,description)
-values ('felderinfo','felderinfo','/edit/kern/felderinfo_edit.jsp','Felderinfo verwalten','In diesem Formular können Sie Felder verwalten.');
+values ('felderinfo','felderinfo','/edit/kern/felderinfo_edit.jsp','Felderinfo verwalten'::varchar(200),'In diesem Formular können Sie Felder verwalten.'::varchar(255));
insert into tmp_db_forms (name, tablename,form_path,caption,description)
-values ('systeminfo','systeminfo','/edit/kern/systeminfo_edit.jsp','Systeminfo verwalten','In diesem Formular können Sie Quellsysteme verwalten.');
+values ('systeminfo','systeminfo','/edit/kern/systeminfo_edit.jsp','Systeminfo verwalten'::varchar(200),'In diesem Formular können Sie Quellsysteme verwalten.'::varchar(255));
insert into tmp_db_forms (name, tablename,form_path,caption,description)
-values ('user_sachgeb_bez','user_sachgeb_bez','/edit/kern/user_sachgeb_bez_edit.jsp','Benutzer und Sachgebiete verwalten','In diesem Formular können Sie Benutzern Sachgebietsrechte geben. Achtung: Einträge von externem System (HisInOne) werden bei Neuanmeldung überschrieben');
+values ('user_sachgeb_bez','user_sachgeb_bez','/edit/kern/user_sachgeb_bez_edit.jsp','Benutzer und Sachgebiete verwalten'::varchar(200),'In diesem Formular können Sie Benutzern Sachgebietsrechte geben. Achtung: Einträge von externem System (HisInOne) werden bei Neuanmeldung überschrieben'::varchar(255));
insert into tmp_db_forms (name, tablename,form_path,caption,description)
-values ('user_group_bez','user_group_bez','/edit/kern/user_group_bez_edit.jsp','Benutzer und Gruppen verwalten','In diesem Formular können Sie Benutzer zu Gruppen zuordnen. Achtung: Zuordnung zur Gruppe Administratoren für admins von externem System (HisInOne) werden bei Neuanmeldung überschrieben');
+values ('user_group_bez','user_group_bez','/edit/kern/user_group_bez_edit.jsp','Benutzer und Gruppen verwalten'::varchar(200),'In diesem Formular können Sie Benutzer zu Gruppen zuordnen. Achtung: Zuordnung zur Gruppe Administratoren für admins von externem System (HisInOne) werden bei Neuanmeldung überschrieben'::varchar(255));
insert into tmp_db_forms (name, tablename,form_path,caption,description)
-values ('user_masken_bez','user_masken_bez','/edit/kern/user_masken_bez_edit.jsp','Maskenrechte von Benutzern','In diesem Formular können Sie Benutzern Rechte auf einzelne Masken geben.');
+values ('user_masken_bez','user_masken_bez','/edit/kern/user_masken_bez_edit.jsp','Maskenrechte von Benutzern'::varchar(200),'In diesem Formular können Sie Benutzern Rechte auf einzelne Masken geben.'::varchar(255));
insert into tmp_db_forms (name, tablename,form_path,caption,description)
-values ('user_institution','user_institution','/edit/kern/user_institution_edit.jsp','Institutionsrechte von Benutzern','In diesem Formular können Sie Benutzern Rechte auf einzelne Insitutionen geben. Achtung: Einträge von externem System (HisInOne) werden bei Neuanmeldung überschrieben');
+values ('user_institution','user_institution','/edit/kern/user_institution_edit.jsp','Institutionsrechte von Benutzern'::varchar(200),'In diesem Formular können Sie Benutzern Rechte auf einzelne Insitutionen geben. Achtung: Einträge von externem System (HisInOne) werden bei Neuanmeldung überschrieben'::varchar(255));
insert into tmp_db_forms (name, tablename,form_path,caption,description)
-values ('themenbaum_edit','themenbaum','/edit/kern/themenbaum_edit.jsp','Themenbaum','In diesem Formular können Sie den Themenbaum bearbeiten. Bitte beachten Sie: bei Änderungen muss der Themenbaum neu geladen werden (SuperXManager)');
+values ('themenbaum_edit','themenbaum','/edit/kern/themenbaum_edit.jsp','Themenbaum'::varchar(200),'In diesem Formular können Sie den Themenbaum bearbeiten. Bitte beachten Sie: bei Änderungen muss der Themenbaum neu geladen werden (SuperXManager)'::varchar(255));
insert into tmp_db_forms (name, tablename,form_path,caption,description)
-values ('sichten','sichten','/edit/kern/sichten_edit.jsp','Sichten','In diesem Formular können Sie Sichten auf das Organigramm verwalten.');
+values ('sichten','sichten','/edit/kern/sichten_edit.jsp','Sichten'::varchar(200),'In diesem Formular können Sie Sichten auf das Organigramm verwalten.'::varchar(255));
insert into tmp_db_forms (name, tablename,form_path,caption,description)
-values ('sachgeb_maske_bez','sachgeb_maske_bez','/edit/kern/sachgeb_maske_bez_edit.jsp','Masken und Sachgebiete','In diesem Formular können Sie Masken zu Sachgebieten zuordnen.');
+values ('sachgeb_maske_bez','sachgeb_maske_bez','/edit/kern/sachgeb_maske_bez_edit.jsp','Masken und Sachgebiete'::varchar(200),'In diesem Formular können Sie Masken zu Sachgebieten zuordnen.'::varchar(255));
insert into tmp_db_forms (name, tablename,form_path,caption,description)
-values ('masken_felder_bez','masken_felder_bez','/edit/kern/masken_felder_bez_edit.jsp','Masken und Felder','In diesem Formular können Sie Felder zu Masken zuordnen.');
+values ('masken_felder_bez','masken_felder_bez','/edit/kern/masken_felder_bez_edit.jsp','Masken und Felder'::varchar(200),'In diesem Formular können Sie Felder zu Masken zuordnen.'::varchar(255));
insert into tmp_db_forms (name, tablename,form_path,caption,description)
-values ('maske_system_bez','maske_system_bez','/edit/kern/maske_system_bez_edit.jsp','Masken und Systeme','In diesem Formular können Sie Masken zu Quellsystemen zuordnen.');
+values ('maske_system_bez','maske_system_bez','/edit/kern/maske_system_bez_edit.jsp','Masken und Systeme'::varchar(200),'In diesem Formular können Sie Masken zu Quellsystemen zuordnen.'::varchar(255));
insert into tmp_db_forms (name, tablename,form_path,caption,description)
-values ('macro_masken_bez','macro_masken_bez','/edit/kern/macro_masken_bez_edit.jsp','Masken und Makros','In diesem Formular können Sie Masken zu Makros zuordnen.');
+values ('macro_masken_bez','macro_masken_bez','/edit/kern/macro_masken_bez_edit.jsp','Masken und Makros'::varchar(200),'In diesem Formular können Sie Masken zu Makros zuordnen.'::varchar(255));
insert into tmp_db_forms (name, tablename,form_path,caption,description)
-values ('macro_masken_bez_list','macro_masken_bez','/edit/kern/macro_masken_bez_list.jsp','Masken und Makros','In diesem Formular können Sie Masken zu Makros zuordnen.');
+values ('macro_masken_bez_list','macro_masken_bez','/edit/kern/macro_masken_bez_list.jsp','Masken und Makros'::varchar(200),'In diesem Formular können Sie Masken zu Makros zuordnen.'::varchar(255));
insert into tmp_db_forms (name, tablename,form_path,caption,description)
-values ('konstanten','konstanten','/edit/kern/konstanten_edit.jsp','Konstanten','In diesem Formular können Sie Konstanten verwalten.');
+values ('konstanten','konstanten','/edit/kern/konstanten_edit.jsp','Konstanten'::varchar(200),'In diesem Formular können Sie Konstanten verwalten.'::varchar(255));
insert into tmp_db_forms (name, tablename,form_path,caption,description)
-values ('konstante','konstanten','/edit/kern/konstante_edit.jsp','Konstante verwalten','');
+values ('konstante','konstanten','/edit/kern/konstante_edit.jsp','Konstante verwalten'::varchar(200),''::varchar(255));
insert into tmp_db_forms (name, tablename,form_path,caption,description)
-values ('hochschulinfo','hochschulinfo','/edit/kern/hochschulinfo_edit.jsp','Hochschulinfo','In diesem Formular können Infos zu Ihrer Hochschule speichern. Bitte ordnen Sie Ihre Hochschule im Feld Hochschulnummer (HIS) zu.');
+values ('hochschulinfo','hochschulinfo','/edit/kern/hochschulinfo_edit.jsp','Hochschulinfo'::varchar(200),'In diesem Formular können Infos zu Ihrer Hochschule speichern. Bitte ordnen Sie Ihre Hochschule im Feld Hochschulnummer (HIS) zu.'::varchar(255));
insert into tmp_db_forms (name, tablename,form_path,caption,description)
-values ('group_sachgeb_bez','group_sachgeb_bez','/edit/kern/group_sachgeb_bez_edit.jsp','Gruppen und Sachgebiete','In diesem Formular können Sie Gruppen zu Sachgebieten zuordnen.');
+values ('group_sachgeb_bez','group_sachgeb_bez','/edit/kern/group_sachgeb_bez_edit.jsp','Gruppen und Sachgebiete'::varchar(200),'In diesem Formular können Sie Gruppen zu Sachgebieten zuordnen.'::varchar(255));
insert into tmp_db_forms (name, tablename,form_path,caption,description)
-values ('group_masken_bez','group_masken_bez','/edit/kern/group_masken_bez_edit.jsp','Gruppen und Masken','In diesem Formular können Sie Gruppen zu einzelnen Masken zuordnen.');
+values ('group_masken_bez','group_masken_bez','/edit/kern/group_masken_bez_edit.jsp','Gruppen und Masken'::varchar(200),'In diesem Formular können Sie Gruppen zu einzelnen Masken zuordnen.'::varchar(255));
insert into tmp_db_forms (name, tablename,form_path,caption,description)
-values ('group_masken_bez','group_masken_bez','/edit/kern/group_masken_bez_edit.jsp','Gruppen und Masken','In diesem Formular können Sie Gruppen zu einzelnen Masken zuordnen.');
+values ('group_masken_bez','group_masken_bez','/edit/kern/group_masken_bez_edit.jsp','Gruppen und Masken'::varchar(200),'In diesem Formular können Sie Gruppen zu einzelnen Masken zuordnen.'::varchar(255));
insert into tmp_db_forms (name, tablename,form_path,caption,description)
-values ('user_sichten','user_sichten','/edit/kern/user_sichten_edit.jsp','Benutzer und Sichten','In diesem Formular können Sie User-Rechte für Sichten bearbeiten. Bitte beachten Sie: bei Änderungen an den Sichten muss der Themenbaum neu geladen werden (SuperXManager)');
+values ('user_sichten','user_sichten','/edit/kern/user_sichten_edit.jsp','Benutzer und Sichten'::varchar(200),'In diesem Formular können Sie User-Rechte für Sichten bearbeiten. Bitte beachten Sie: bei Änderungen an den Sichten muss der Themenbaum neu geladen werden (SuperXManager)'::varchar(255));
insert into tmp_db_forms (name, tablename,form_path,caption,description)
-values ('group_sichten','group_sichten','/edit/kern/group_sichten_edit.jsp','Gruppen und Sichten','In diesem Formular können Sie Gruppen-Rechte für Sichten bearbeiten. Bitte beachten Sie: bei Änderungen an den Sichten muss der Themenbaum neu geladen werden (SuperXManager)');
+values ('group_sichten','group_sichten','/edit/kern/group_sichten_edit.jsp','Gruppen und Sichten'::varchar(200),'In diesem Formular können Sie Gruppen-Rechte für Sichten bearbeiten. Bitte beachten Sie: bei Änderungen an den Sichten muss der Themenbaum neu geladen werden (SuperXManager)'::varchar(255));
insert into tmp_db_forms (name, tablename,form_path,caption,description)
-values ('sx_captions','sx_captions','/edit/kern/sx_captions_edit.jsp','Beschriftungen','In diesem Formular können Sie Beschriftungen bearbeiten. Für Masken- und Spalten- und Felderläuterungen.');
+values ('sx_captions','sx_captions','/edit/kern/sx_captions_edit.jsp','Beschriftungen'::varchar(200),'In diesem Formular können Sie Beschriftungen bearbeiten. Für Masken- und Spalten- und Felderläuterungen.'::varchar(255));
insert into tmp_db_forms (name, tablename,form_path,caption,description)
-values ('user_sichtarten','user_sichtarten','/edit/kern/user_sichtarten_edit.jsp','Benutzer und Sichtarten','In diesem Formular können Sie User-Rechte für Sichtarten bearbeiten. Bitte beachten Sie: bei Änderungen an den Sichten muss der Themenbaum neu geladen werden (SuperXManager)');
+values ('user_sichtarten','user_sichtarten','/edit/kern/user_sichtarten_edit.jsp','Benutzer und Sichtarten'::varchar(200),'In diesem Formular können Sie User-Rechte für Sichtarten bearbeiten. Bitte beachten Sie: bei Änderungen an den Sichten muss der Themenbaum neu geladen werden (SuperXManager)'::varchar(255));
insert into tmp_db_forms (name, tablename,form_path,caption,description)
-values ('group_sichtarten','group_sichtarten','/edit/kern/group_sichtarten_edit.jsp','Gruppen und Sichtarten','In diesem Formular können Sie Gruppen-Rechte für Sichtarten bearbeiten. Bitte beachten Sie: bei Änderungen an den Sichten muss der Themenbaum neu geladen werden (SuperXManager)');
+values ('group_sichtarten','group_sichtarten','/edit/kern/group_sichtarten_edit.jsp','Gruppen und Sichtarten'::varchar(200),'In diesem Formular können Sie Gruppen-Rechte für Sichtarten bearbeiten. Bitte beachten Sie: bei Änderungen an den Sichten muss der Themenbaum neu geladen werden (SuperXManager)'::varchar(255));
insert into tmp_db_forms (name, tablename,form_path,caption,description)
-values ('sx_repository_edit','sx_repository','/edit/kern/sx_repository_edit.jsp','Hochschul-Repository','In diesem Formular können Sie hochschulspezifische Konstanten oder SQL-Ausdrücke bearbeiten.');
+values ('sx_repository_edit','sx_repository','/edit/kern/sx_repository_edit.jsp','Hochschul-Repository'::varchar(200),'In diesem Formular können Sie hochschulspezifische Konstanten oder SQL-Ausdrücke bearbeiten.'::varchar(255));
insert into tmp_db_forms (name, tablename,form_path,caption,description)
-values ('sx_repository_list','sx_repository','/edit/kern/sx_repository_list.jsp','Hochschul-Repository','In diesem Formular können Sie hochschulspezifische Konstanten oder SQL-Ausdrücke bearbeiten.');
+values ('sx_repository_list','sx_repository','/edit/kern/sx_repository_list.jsp','Hochschul-Repository'::varchar(200),'In diesem Formular können Sie hochschulspezifische Konstanten oder SQL-Ausdrücke bearbeiten.'::varchar(255));
insert into tmp_db_forms (name, tablename,form_path,caption,description)
-values ('sx_downloads','sx_downloads','/edit/kern/sx_downloads_edit.jsp','Downloads','In diesem Formular können Sie Downloads bearbeiten. ');
+values ('sx_downloads','sx_downloads','/edit/kern/sx_downloads_edit.jsp','Downloads'::varchar(200),'In diesem Formular können Sie Downloads bearbeiten. '::varchar(255));
insert into tmp_db_forms (name, tablename,form_path,caption,description)
-values ('sx_keywords','sx_keywords','/edit/kern/sx_keywords_edit.jsp','Stichworte','In diesem Formular können Sie Stichworte bearbeiten. ');
+values ('sx_keywords','sx_keywords','/edit/kern/sx_keywords_edit.jsp','Stichworte'::varchar(200),'In diesem Formular können Sie Stichworte bearbeiten. '::varchar(255));
insert into tmp_db_forms (name, tablename,form_path,caption,description)
-values ('sachgeb_sichten','sachgeb_sichten','/edit/kern/sachgeb_sichten_edit.jsp','Zuordnung Sichten zu Sachgebieten','In diesem Formular können Sie Sichten zu Sachgebieten zuordnen. ');
+values ('sachgeb_sichten','sachgeb_sichten','/edit/kern/sachgeb_sichten_edit.jsp','Zuordnung Sichten zu Sachgebieten'::varchar(200),'In diesem Formular können Sie Sichten zu Sachgebieten zuordnen. '::varchar(255));
insert into tmp_db_forms (name, tablename,form_path,caption,description)
-values ('sachgeb_sichtarten','sachgeb_sichtarten','/edit/kern/sachgeb_sichtarten_edit.jsp','Zuordnung Sichtarten zu Sachgebieten','In diesem Formular können Sie Sichtarten zu Sachgebieten zuordnen. ');
+values ('sachgeb_sichtarten','sachgeb_sichtarten','/edit/kern/sachgeb_sichtarten_edit.jsp','Zuordnung Sichtarten zu Sachgebieten'::varchar(200),'In diesem Formular können Sie Sichtarten zu Sachgebieten zuordnen. '::varchar(255));
insert into tmp_db_forms (name, tablename,form_path,caption,description)
-values ('unload_params','unload_params','/edit/kern/unload_params_edit.jsp','Entladeparameter verwalten','');
+values ('unload_params','unload_params','/edit/kern/unload_params_edit.jsp','Entladeparameter verwalten'::varchar(200),''::varchar(255));
insert into tmp_db_forms (name, tablename,form_path,caption,description)
-values ('trans_inst_list','trans_inst','/edit/kern/trans_inst_list.jsp','Kostenstellen transformieren (Liste)','In diesem Formular können Sie Kostenstellen umschlüsseln.');
+values ('trans_inst_list','trans_inst','/edit/kern/trans_inst_list.jsp','Kostenstellen transformieren (Liste)'::varchar(200),'In diesem Formular können Sie Kostenstellen umschlüsseln.'::varchar(255));
insert into tmp_db_forms (name, tablename,form_path,caption,description)
-values ('trans_inst_edit','trans_inst','/edit/kern/trans_inst_edit.jsp','Kostenstellen transformieren (Details)','In diesem Formular können Sie Kostenstellen umschlüsseln.');
+values ('trans_inst_edit','trans_inst','/edit/kern/trans_inst_edit.jsp','Kostenstellen transformieren (Details)'::varchar(200),'In diesem Formular können Sie Kostenstellen umschlüsseln.'::varchar(255));
insert into tmp_db_forms (name, tablename,form_path,caption,description)
-values ('data_upload_edit','data_upload','/edit/kern/data_upload_edit.jsp','Verzeichnis der Datei-Uploads','In diesem Formular können Sie Uploads bearbeiten. ');
+values ('data_upload_edit','data_upload','/edit/kern/data_upload_edit.jsp','Verzeichnis der Datei-Uploads'::varchar(200),'In diesem Formular können Sie Uploads bearbeiten. '::varchar(255));
insert into tmp_db_forms (name, tablename,form_path,caption,description)
-values ('stylesheet_field_edit','stylesheet_field','/edit/kern/stylesheet_field_edit.jsp','Stylesheets und zugehörige Felder','In diesem Formular können Sie von Stylesheets benötigte Felder entsprechend zuordnen.');
+values ('stylesheet_field_edit','stylesheet_field','/edit/kern/stylesheet_field_edit.jsp','Stylesheets und zugehörige Felder'::varchar(200),'In diesem Formular können Sie von Stylesheets benötigte Felder entsprechend zuordnen.'::varchar(255));
insert into tmp_db_forms (name, tablename,form_path,caption,description)
-values ('stylesheet_field_list','stylesheet_field','/edit/kern/stylesheet_field_list.jsp','Stylesheets und zugehörige Felder','In diesem Formular können Sie von Stylesheets benötigte Felder entsprechend zuordnen.');
+values ('stylesheet_field_list','stylesheet_field','/edit/kern/stylesheet_field_list.jsp','Stylesheets und zugehörige Felder'::varchar(200),'In diesem Formular können Sie von Stylesheets benötigte Felder entsprechend zuordnen.'::varchar(255));
insert into tmp_db_forms (name, tablename,form_path,caption,description)
-values ('group_field_pref_edit','group_field_pref','/edit/kern/group_field_pref_edit.jsp','Gruppen Feldattribute zuweisen','In diesem Formular können Sie Feldern in Masken für bestimmte Gruppen Attribute wie Verstecken zuweisen.');
+values ('group_field_pref_edit','group_field_pref','/edit/kern/group_field_pref_edit.jsp','Gruppen Feldattribute zuweisen'::varchar(200),'In diesem Formular können Sie Feldern in Masken für bestimmte Gruppen Attribute wie Verstecken zuweisen.'::varchar(255));
insert into tmp_db_forms (name, tablename,form_path,caption,description)
-values ('group_field_pref_list','group_field_pref','/edit/kern/group_field_pref_list.jsp','Gruppen Felderattribute zuweisen','In diesem Formular können Sie Feldern in Masken für bestimmte Gruppen Attribute wie Verstecken zuweisen.');
+values ('group_field_pref_list','group_field_pref','/edit/kern/group_field_pref_list.jsp','Gruppen Felderattribute zuweisen'::varchar(200),'In diesem Formular können Sie Feldern in Masken für bestimmte Gruppen Attribute wie Verstecken zuweisen.'::varchar(255));
insert into tmp_db_forms (name, tablename,form_path,caption,description)
-values ('fm_templates_list','fm_templates','/edit/kern/fm_templates_list.jsp','Freemarker-Templates bearbeiten','In diesem Formular können Sie Freemarker-Templates verwalten.');
+values ('fm_templates_list','fm_templates','/edit/kern/fm_templates_list.jsp','Freemarker-Templates bearbeiten'::varchar(200),'In diesem Formular können Sie Freemarker-Templates verwalten.'::varchar(255));
insert into tmp_db_forms (name, tablename,form_path,caption,description)
-values ('fm_templates_edit','fm_templates','/edit/kern/fm_templates_edit.jsp','Freemarker-Templates bearbeiten','In diesem Formular können Sie Freemarker-Templates verwalten.');
+values ('fm_templates_edit','fm_templates','/edit/kern/fm_templates_edit.jsp','Freemarker-Templates bearbeiten'::varchar(200),'In diesem Formular können Sie Freemarker-Templates verwalten.'::varchar(255));
insert into tmp_db_forms (name, tablename,form_path,caption,description)
-values ('dbconnections_list','dbconnections','/edit/kern/dbconnections_list.jsp','DB-Connections','In diesem Formular können Sie DB Connections bearbeiten.');
+values ('dbconnections_list','dbconnections','/edit/kern/dbconnections_list.jsp','DB-Connections'::varchar(200),'In diesem Formular können Sie DB Connections bearbeiten.'::varchar(255));
insert into tmp_db_forms (name, tablename,form_path,caption,description)
-values ('portlets_list','sx_portlet','/edit/kern/portlets_list.jsp','Portlets','In diesem Formular können Sie Portlets bearbeiten.');
+values ('portlets_list','sx_portlet','/edit/kern/portlets_list.jsp','Portlets'::varchar(200),'In diesem Formular können Sie Portlets bearbeiten.'::varchar(255));
insert into tmp_db_forms (name, tablename,form_path,caption,description)
-values ('sichtart_rechttabelle_list','sichtart_rechttabelle','/edit/kern/sichtart_rechttabelle_list.jsp','Spezielle Sichtart-Rechte','In diesem Formular können Sie Rechtetabellen für Sichtarten bearbeiten.');
+values ('sichtart_rechttabelle_list','sichtart_rechttabelle','/edit/kern/sichtart_rechttabelle_list.jsp','Spezielle Sichtart-Rechte'::varchar(200),'In diesem Formular können Sie Rechtetabellen für Sichtarten bearbeiten.'::varchar(255));
insert into tmp_db_forms (name, tablename,form_path,caption,description)
-values ('sichtart_rechttabelle_edit','sichtart_rechttabelle','/edit/kern/sichtart_rechttabelle_edit.jsp','Spezielle Sichtart-Rechte Einzelbarbeitung','In diesem Formular können Sie Rechtetabellen für Sichtarten bearbeiten.');
+values ('sichtart_rechttabelle_edit','sichtart_rechttabelle','/edit/kern/sichtart_rechttabelle_edit.jsp','Spezielle Sichtart-Rechte Einzelbarbeitung'::varchar(200),'In diesem Formular können Sie Rechtetabellen für Sichtarten bearbeiten.'::varchar(255));
insert into tmp_db_forms (name, tablename,form_path,caption,description)
-values ('sx_jobs_edit','sx_jobs','/edit/kern/sx_jobs_edit.jsp','Ladejobs verwalten','In diesem Formular können Sie Ladejobs verwalten');
+values ('sx_jobs_edit','sx_jobs','/edit/kern/sx_jobs_edit.jsp','Ladejobs verwalten'::varchar(200),'In diesem Formular können Sie Ladejobs verwalten'::varchar(255));
insert into tmp_db_forms (name, tablename,form_path,caption,description)
-values ('sx_jobs_list','sx_jobs','/edit/kern/sx_jobs_list.jsp','Ladejobs verwalten','In diesem Formular können Sie Ladejobs verwalten');
+values ('sx_jobs_list','sx_jobs','/edit/kern/sx_jobs_list.jsp','Ladejobs verwalten'::varchar(200),'In diesem Formular können Sie Ladejobs verwalten'::varchar(255));
insert into tmp_db_forms (name, tablename,form_path,caption,description)
-values ('organigramm_list','organigramm','/edit/kern/organigramm_list.jsp','Organigramm','In diesem Formular können Sie das Organigramm aufrufen');
+values ('organigramm_list','organigramm','/edit/kern/organigramm_list.jsp','Organigramm'::varchar(200),'In diesem Formular können Sie das Organigramm aufrufen'::varchar(255));
insert into tmp_db_forms (name, tablename,form_path,caption,description)
-values ('sx_stylesheet_param_edit','sx_stylesheet_param','/edit/kern/sx_stylesheet_param_edit.jsp','Stylesheet-Parameter','In diesem Formular können Sie Stylesheet-Parameter bearbeiten.');
+values ('sx_stylesheet_param_edit','sx_stylesheet_param','/edit/kern/sx_stylesheet_param_edit.jsp','Stylesheet-Parameter'::varchar(200),'In diesem Formular können Sie Stylesheet-Parameter bearbeiten.'::varchar(255));
insert into tmp_db_forms (name, tablename,form_path,caption,description)
-values ('sx_stylesheet_param_list','sx_stylesheet_param','/edit/kern/sx_stylesheet_param_list.jsp','Stylesheet-Parameter','In diesem Formular können Sie Stylesheet-Parameter bearbeiten.');
+values ('sx_stylesheet_param_list','sx_stylesheet_param','/edit/kern/sx_stylesheet_param_list.jsp','Stylesheet-Parameter'::varchar(200),'In diesem Formular können Sie Stylesheet-Parameter bearbeiten.'::varchar(255));
create temp table tmp_hilf(tid integer);
insert into tmp_hilf select max(tid) from db_forms;
diff --git a/superx/WEB-INF/conf/edustore/db/install/conf/his1/edustore_install/edustore_kern_masken_einspielen.xml b/superx/WEB-INF/conf/edustore/db/install/conf/his1/edustore_install/edustore_kern_masken_einspielen.xml
index cc0da6a..a9b6dca 100644
--- a/superx/WEB-INF/conf/edustore/db/install/conf/his1/edustore_install/edustore_kern_masken_einspielen.xml
+++ b/superx/WEB-INF/conf/edustore/db/install/conf/his1/edustore_install/edustore_kern_masken_einspielen.xml
@@ -287,42 +287,6 @@
-eduetl:delete from maskeninfo where tid = 70520;
-
-eduetl:delete from felderinfo where tid in
-(select felderinfo_id from masken_felder_bez where maskeninfo_id = 70520);
-
-eduetl:delete from masken_felder_bez where maskeninfo_id = 70520;
-
-eduetl:delete from sachgeb_maske_bez where maskeninfo_id = 70520;
-
-eduetl:delete from maske_system_bez where maskeninfo_id = 70520;
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-eduetl:delete from maskeninfo where tid = 70580;
eduetl:delete from felderinfo where tid in
diff --git a/superx/WEB-INF/conf/edustore/db/install/conf/his1/edustore_install/edustore_kern_masken_entladen.xml b/superx/WEB-INF/conf/edustore/db/install/conf/his1/edustore_install/edustore_kern_masken_entladen.xml
index 8492b64..74e8fb6 100644
--- a/superx/WEB-INF/conf/edustore/db/install/conf/his1/edustore_install/edustore_kern_masken_entladen.xml
+++ b/superx/WEB-INF/conf/edustore/db/install/conf/his1/edustore_install/edustore_kern_masken_entladen.xml
@@ -9,28 +9,28 @@
select * from felderinfo where tid in
-(select felderinfo_id from masken_felder_bez where maskeninfo_id = 750);
+(select felderinfo_id from masken_felder_bez where maskeninfo_id = 750) order by tid;
-select * from masken_felder_bez where maskeninfo_id = 750;
+select maskeninfo_id, felderinfo_id from masken_felder_bez where maskeninfo_id = 750 order by 1,2;
-select * from sachgeb_maske_bez where maskeninfo_id = 750;
+select sachgebiete_id, maskeninfo_id from sachgeb_maske_bez where maskeninfo_id = 750 order by 1,2;
-select * from maske_system_bez where maskeninfo_id = 750;
+select maskeninfo_id, systeminfo_id from maske_system_bez where maskeninfo_id = 750 order by 1,2;
@@ -45,28 +45,28 @@
select * from felderinfo where tid in
-(select felderinfo_id from masken_felder_bez where maskeninfo_id = 70460);
+(select felderinfo_id from masken_felder_bez where maskeninfo_id = 70460) order by tid;
-select * from masken_felder_bez where maskeninfo_id = 70460;
+select maskeninfo_id, felderinfo_id from masken_felder_bez where maskeninfo_id = 70460 order by 1,2;
-select * from sachgeb_maske_bez where maskeninfo_id = 70460;
+select sachgebiete_id, maskeninfo_id from sachgeb_maske_bez where maskeninfo_id = 70460 order by 1,2;
-select * from maske_system_bez where maskeninfo_id = 70460;
+select maskeninfo_id, systeminfo_id from maske_system_bez where maskeninfo_id = 70460 order by 1,2;
@@ -81,28 +81,28 @@
select * from felderinfo where tid in
-(select felderinfo_id from masken_felder_bez where maskeninfo_id = 70350);
+(select felderinfo_id from masken_felder_bez where maskeninfo_id = 70350) order by tid;
-select * from masken_felder_bez where maskeninfo_id = 70350;
+select maskeninfo_id, felderinfo_id from masken_felder_bez where maskeninfo_id = 70350 order by 1,2;
-select * from sachgeb_maske_bez where maskeninfo_id = 70350;
+select sachgebiete_id, maskeninfo_id from sachgeb_maske_bez where maskeninfo_id = 70350 order by 1,2;
-select * from maske_system_bez where maskeninfo_id = 70350;
+select maskeninfo_id, systeminfo_id from maske_system_bez where maskeninfo_id = 70350 order by 1,2;
@@ -117,28 +117,28 @@
select * from felderinfo where tid in
-(select felderinfo_id from masken_felder_bez where maskeninfo_id = 70370);
+(select felderinfo_id from masken_felder_bez where maskeninfo_id = 70370) order by tid;
-select * from masken_felder_bez where maskeninfo_id = 70370;
+select maskeninfo_id, felderinfo_id from masken_felder_bez where maskeninfo_id = 70370 order by 1,2;
-select * from sachgeb_maske_bez where maskeninfo_id = 70370;
+select sachgebiete_id, maskeninfo_id from sachgeb_maske_bez where maskeninfo_id = 70370 order by 1,2;
-select * from maske_system_bez where maskeninfo_id = 70370;
+select maskeninfo_id, systeminfo_id from maske_system_bez where maskeninfo_id = 70370 order by 1,2;
@@ -153,28 +153,28 @@
select * from felderinfo where tid in
-(select felderinfo_id from masken_felder_bez where maskeninfo_id = 70510);
+(select felderinfo_id from masken_felder_bez where maskeninfo_id = 70510) order by tid;
-select * from masken_felder_bez where maskeninfo_id = 70510;
+select maskeninfo_id, felderinfo_id from masken_felder_bez where maskeninfo_id = 70510 order by 1,2;
-select * from sachgeb_maske_bez where maskeninfo_id = 70510;
+select sachgebiete_id, maskeninfo_id from sachgeb_maske_bez where maskeninfo_id = 70510 order by 1,2;
-select * from maske_system_bez where maskeninfo_id = 70510;
+select maskeninfo_id, systeminfo_id from maske_system_bez where maskeninfo_id = 70510 order by 1,2;
@@ -189,28 +189,28 @@
select * from felderinfo where tid in
-(select felderinfo_id from masken_felder_bez where maskeninfo_id = 70630);
+(select felderinfo_id from masken_felder_bez where maskeninfo_id = 70630) order by tid;
-select * from masken_felder_bez where maskeninfo_id = 70630;
+select maskeninfo_id, felderinfo_id from masken_felder_bez where maskeninfo_id = 70630 order by 1,2;
-select * from sachgeb_maske_bez where maskeninfo_id = 70630;
+select sachgebiete_id, maskeninfo_id from sachgeb_maske_bez where maskeninfo_id = 70630 order by 1,2;
-select * from maske_system_bez where maskeninfo_id = 70630;
+select maskeninfo_id, systeminfo_id from maske_system_bez where maskeninfo_id = 70630 order by 1,2;
@@ -225,28 +225,28 @@
select * from felderinfo where tid in
-(select felderinfo_id from masken_felder_bez where maskeninfo_id = 70620);
+(select felderinfo_id from masken_felder_bez where maskeninfo_id = 70620) order by tid;
-select * from masken_felder_bez where maskeninfo_id = 70620;
+select maskeninfo_id, felderinfo_id from masken_felder_bez where maskeninfo_id = 70620 order by 1,2;
-select * from sachgeb_maske_bez where maskeninfo_id = 70620;
+select sachgebiete_id, maskeninfo_id from sachgeb_maske_bez where maskeninfo_id = 70620 order by 1,2;
-select * from maske_system_bez where maskeninfo_id = 70620;
+select maskeninfo_id, systeminfo_id from maske_system_bez where maskeninfo_id = 70620 order by 1,2;
@@ -261,70 +261,34 @@
select * from felderinfo where tid in
-(select felderinfo_id from masken_felder_bez where maskeninfo_id = 70570);
+(select felderinfo_id from masken_felder_bez where maskeninfo_id = 70570) order by tid;
-select * from masken_felder_bez where maskeninfo_id = 70570;
+select maskeninfo_id, felderinfo_id from masken_felder_bez where maskeninfo_id = 70570 order by 1,2;
-select * from sachgeb_maske_bez where maskeninfo_id = 70570;
+select sachgebiete_id, maskeninfo_id from sachgeb_maske_bez where maskeninfo_id = 70570 order by 1,2;
-select * from maske_system_bez where maskeninfo_id = 70570;
+select maskeninfo_id, systeminfo_id from maske_system_bez where maskeninfo_id = 70570 order by 1,2;
-select * from maskeninfo where tid = 70520;
-
-
-
-
-
-
-select * from felderinfo where tid in
-(select felderinfo_id from masken_felder_bez where maskeninfo_id = 70520);
-
-
-
-
-
-
-select * from masken_felder_bez where maskeninfo_id = 70520;
-
-
-
-
-
-
-select * from sachgeb_maske_bez where maskeninfo_id = 70520;
-
-
-
-
-
-
-select * from maske_system_bez where maskeninfo_id = 70520;
-
-
-
-
-
-select * from maskeninfo where tid = 70580;
@@ -333,28 +297,28 @@
select * from felderinfo where tid in
-(select felderinfo_id from masken_felder_bez where maskeninfo_id = 70580);
+(select felderinfo_id from masken_felder_bez where maskeninfo_id = 70580) order by tid;
-select * from masken_felder_bez where maskeninfo_id = 70580;
+select maskeninfo_id, felderinfo_id from masken_felder_bez where maskeninfo_id = 70580 order by 1,2;
-select * from sachgeb_maske_bez where maskeninfo_id = 70580;
+select sachgebiete_id, maskeninfo_id from sachgeb_maske_bez where maskeninfo_id = 70580 order by 1,2;
-select * from maske_system_bez where maskeninfo_id = 70580;
+select maskeninfo_id, systeminfo_id from maske_system_bez where maskeninfo_id = 70580 order by 1,2;
@@ -369,28 +333,28 @@
select * from felderinfo where tid in
-(select felderinfo_id from masken_felder_bez where maskeninfo_id = 70640);
+(select felderinfo_id from masken_felder_bez where maskeninfo_id = 70640) order by tid;
-select * from masken_felder_bez where maskeninfo_id = 70640;
+select maskeninfo_id, felderinfo_id from masken_felder_bez where maskeninfo_id = 70640 order by 1,2;
-select * from sachgeb_maske_bez where maskeninfo_id = 70640;
+select sachgebiete_id, maskeninfo_id from sachgeb_maske_bez where maskeninfo_id = 70640 order by 1,2;
-select * from maske_system_bez where maskeninfo_id = 70640;
+select maskeninfo_id, systeminfo_id from maske_system_bez where maskeninfo_id = 70640 order by 1,2;
@@ -405,28 +369,28 @@
select * from felderinfo where tid in
-(select felderinfo_id from masken_felder_bez where maskeninfo_id = 70970);
+(select felderinfo_id from masken_felder_bez where maskeninfo_id = 70970) order by tid;
-select * from masken_felder_bez where maskeninfo_id = 70970;
+select maskeninfo_id, felderinfo_id from masken_felder_bez where maskeninfo_id = 70970 order by 1,2;
-select * from sachgeb_maske_bez where maskeninfo_id = 70970;
+select sachgebiete_id, maskeninfo_id from sachgeb_maske_bez where maskeninfo_id = 70970 order by 1,2;
-select * from maske_system_bez where maskeninfo_id = 70970;
+select maskeninfo_id, systeminfo_id from maske_system_bez where maskeninfo_id = 70970 order by 1,2;
@@ -441,28 +405,28 @@
select * from felderinfo where tid in
-(select felderinfo_id from masken_felder_bez where maskeninfo_id = 70990);
+(select felderinfo_id from masken_felder_bez where maskeninfo_id = 70990) order by tid;
-select * from masken_felder_bez where maskeninfo_id = 70990;
+select maskeninfo_id, felderinfo_id from masken_felder_bez where maskeninfo_id = 70990 order by 1,2;
-select * from sachgeb_maske_bez where maskeninfo_id = 70990;
+select sachgebiete_id, maskeninfo_id from sachgeb_maske_bez where maskeninfo_id = 70990 order by 1,2;
-select * from maske_system_bez where maskeninfo_id = 70990;
+select maskeninfo_id, systeminfo_id from maske_system_bez where maskeninfo_id = 70990 order by 1,2;
@@ -477,28 +441,28 @@
select * from felderinfo where tid in
-(select felderinfo_id from masken_felder_bez where maskeninfo_id = 70060);
+(select felderinfo_id from masken_felder_bez where maskeninfo_id = 70060) order by tid;
-select * from masken_felder_bez where maskeninfo_id = 70060;
+select maskeninfo_id, felderinfo_id from masken_felder_bez where maskeninfo_id = 70060 order by 1,2;
-select * from sachgeb_maske_bez where maskeninfo_id = 70060;
+select sachgebiete_id, maskeninfo_id from sachgeb_maske_bez where maskeninfo_id = 70060 order by 1,2;
-select * from maske_system_bez where maskeninfo_id = 70060;
+select maskeninfo_id, systeminfo_id from maske_system_bez where maskeninfo_id = 70060 order by 1,2;
@@ -513,28 +477,28 @@
select * from felderinfo where tid in
-(select felderinfo_id from masken_felder_bez where maskeninfo_id = 71000);
+(select felderinfo_id from masken_felder_bez where maskeninfo_id = 71000) order by tid;
-select * from masken_felder_bez where maskeninfo_id = 71000;
+select maskeninfo_id, felderinfo_id from masken_felder_bez where maskeninfo_id = 71000 order by 1,2;
-select * from sachgeb_maske_bez where maskeninfo_id = 71000;
+select sachgebiete_id, maskeninfo_id from sachgeb_maske_bez where maskeninfo_id = 71000 order by 1,2;
-select * from maske_system_bez where maskeninfo_id = 71000;
+select maskeninfo_id, systeminfo_id from maske_system_bez where maskeninfo_id = 71000 order by 1,2;
@@ -549,28 +513,28 @@
select * from felderinfo where tid in
-(select felderinfo_id from masken_felder_bez where maskeninfo_id = 71010);
+(select felderinfo_id from masken_felder_bez where maskeninfo_id = 71010) order by tid;
-select * from masken_felder_bez where maskeninfo_id = 71010;
+select maskeninfo_id, felderinfo_id from masken_felder_bez where maskeninfo_id = 71010 order by 1,2;
-select * from sachgeb_maske_bez where maskeninfo_id = 71010;
+select sachgebiete_id, maskeninfo_id from sachgeb_maske_bez where maskeninfo_id = 71010 order by 1,2;
-select * from maske_system_bez where maskeninfo_id = 71010;
+select maskeninfo_id, systeminfo_id from maske_system_bez where maskeninfo_id = 71010 order by 1,2;
@@ -585,28 +549,28 @@
select * from felderinfo where tid in
-(select felderinfo_id from masken_felder_bez where maskeninfo_id = 71040);
+(select felderinfo_id from masken_felder_bez where maskeninfo_id = 71040) order by tid;
-select * from masken_felder_bez where maskeninfo_id = 71040;
+select maskeninfo_id, felderinfo_id from masken_felder_bez where maskeninfo_id = 71040 order by 1,2;
-select * from sachgeb_maske_bez where maskeninfo_id = 71040;
+select sachgebiete_id, maskeninfo_id from sachgeb_maske_bez where maskeninfo_id = 71040 order by 1,2;
-select * from maske_system_bez where maskeninfo_id = 71040;
+select maskeninfo_id, systeminfo_id from maske_system_bez where maskeninfo_id = 71040 order by 1,2;
@@ -621,28 +585,28 @@
select * from felderinfo where tid in
-(select felderinfo_id from masken_felder_bez where maskeninfo_id = 71030);
+(select felderinfo_id from masken_felder_bez where maskeninfo_id = 71030) order by tid;
-select * from masken_felder_bez where maskeninfo_id = 71030;
+select maskeninfo_id, felderinfo_id from masken_felder_bez where maskeninfo_id = 71030 order by 1,2;
-select * from sachgeb_maske_bez where maskeninfo_id = 71030;
+select sachgebiete_id, maskeninfo_id from sachgeb_maske_bez where maskeninfo_id = 71030 order by 1,2;
-select * from maske_system_bez where maskeninfo_id = 71030;
+select maskeninfo_id, systeminfo_id from maske_system_bez where maskeninfo_id = 71030 order by 1,2;
@@ -657,28 +621,28 @@
select * from felderinfo where tid in
-(select felderinfo_id from masken_felder_bez where maskeninfo_id = 71050);
+(select felderinfo_id from masken_felder_bez where maskeninfo_id = 71050) order by tid;
-select * from masken_felder_bez where maskeninfo_id = 71050;
+select maskeninfo_id, felderinfo_id from masken_felder_bez where maskeninfo_id = 71050 order by 1,2;
-select * from sachgeb_maske_bez where maskeninfo_id = 71050;
+select sachgebiete_id, maskeninfo_id from sachgeb_maske_bez where maskeninfo_id = 71050 order by 1,2;
-select * from maske_system_bez where maskeninfo_id = 71050;
+select maskeninfo_id, systeminfo_id from maske_system_bez where maskeninfo_id = 71050 order by 1,2;
@@ -693,28 +657,28 @@
select * from felderinfo where tid in
-(select felderinfo_id from masken_felder_bez where maskeninfo_id = 70160);
+(select felderinfo_id from masken_felder_bez where maskeninfo_id = 70160) order by tid;
-select * from masken_felder_bez where maskeninfo_id = 70160;
+select maskeninfo_id, felderinfo_id from masken_felder_bez where maskeninfo_id = 70160 order by 1,2;
-select * from sachgeb_maske_bez where maskeninfo_id = 70160;
+select sachgebiete_id, maskeninfo_id from sachgeb_maske_bez where maskeninfo_id = 70160 order by 1,2;
-select * from maske_system_bez where maskeninfo_id = 70160;
+select maskeninfo_id, systeminfo_id from maske_system_bez where maskeninfo_id = 70160 order by 1,2;
@@ -729,28 +693,28 @@
select * from felderinfo where tid in
-(select felderinfo_id from masken_felder_bez where maskeninfo_id = 70170);
+(select felderinfo_id from masken_felder_bez where maskeninfo_id = 70170) order by tid;
-select * from masken_felder_bez where maskeninfo_id = 70170;
+select maskeninfo_id, felderinfo_id from masken_felder_bez where maskeninfo_id = 70170 order by 1,2;
-select * from sachgeb_maske_bez where maskeninfo_id = 70170;
+select sachgebiete_id, maskeninfo_id from sachgeb_maske_bez where maskeninfo_id = 70170 order by 1,2;
-select * from maske_system_bez where maskeninfo_id = 70170;
+select maskeninfo_id, systeminfo_id from maske_system_bez where maskeninfo_id = 70170 order by 1,2;
@@ -765,28 +729,28 @@
select * from felderinfo where tid in
-(select felderinfo_id from masken_felder_bez where maskeninfo_id = 71080);
+(select felderinfo_id from masken_felder_bez where maskeninfo_id = 71080) order by tid;
-select * from masken_felder_bez where maskeninfo_id = 71080;
+select maskeninfo_id, felderinfo_id from masken_felder_bez where maskeninfo_id = 71080 order by 1,2;
-select * from sachgeb_maske_bez where maskeninfo_id = 71080;
+select sachgebiete_id, maskeninfo_id from sachgeb_maske_bez where maskeninfo_id = 71080 order by 1,2;
-select * from maske_system_bez where maskeninfo_id = 71080;
+select maskeninfo_id, systeminfo_id from maske_system_bez where maskeninfo_id = 71080 order by 1,2;
@@ -801,28 +765,28 @@
select * from felderinfo where tid in
-(select felderinfo_id from masken_felder_bez where maskeninfo_id = 71090);
+(select felderinfo_id from masken_felder_bez where maskeninfo_id = 71090) order by tid;
-select * from masken_felder_bez where maskeninfo_id = 71090;
+select maskeninfo_id, felderinfo_id from masken_felder_bez where maskeninfo_id = 71090 order by 1,2;
-select * from sachgeb_maske_bez where maskeninfo_id = 71090;
+select sachgebiete_id, maskeninfo_id from sachgeb_maske_bez where maskeninfo_id = 71090 order by 1,2;
-select * from maske_system_bez where maskeninfo_id = 71090;
+select maskeninfo_id, systeminfo_id from maske_system_bez where maskeninfo_id = 71090 order by 1,2;
@@ -837,28 +801,28 @@
select * from felderinfo where tid in
-(select felderinfo_id from masken_felder_bez where maskeninfo_id = 71100);
+(select felderinfo_id from masken_felder_bez where maskeninfo_id = 71100) order by tid;
-select * from masken_felder_bez where maskeninfo_id = 71100;
+select maskeninfo_id, felderinfo_id from masken_felder_bez where maskeninfo_id = 71100 order by 1,2;
-select * from sachgeb_maske_bez where maskeninfo_id = 71100;
+select sachgebiete_id, maskeninfo_id from sachgeb_maske_bez where maskeninfo_id = 71100 order by 1,2;
-select * from maske_system_bez where maskeninfo_id = 71100;
+select maskeninfo_id, systeminfo_id from maske_system_bez where maskeninfo_id = 71100 order by 1,2;
@@ -873,28 +837,28 @@
select * from felderinfo where tid in
-(select felderinfo_id from masken_felder_bez where maskeninfo_id = 71120);
+(select felderinfo_id from masken_felder_bez where maskeninfo_id = 71120) order by tid;
-select * from masken_felder_bez where maskeninfo_id = 71120;
+select maskeninfo_id, felderinfo_id from masken_felder_bez where maskeninfo_id = 71120 order by 1,2;
-select * from sachgeb_maske_bez where maskeninfo_id = 71120;
+select sachgebiete_id, maskeninfo_id from sachgeb_maske_bez where maskeninfo_id = 71120 order by 1,2;
-select * from maske_system_bez where maskeninfo_id = 71120;
+select maskeninfo_id, systeminfo_id from maske_system_bez where maskeninfo_id = 71120 order by 1,2;
@@ -909,28 +873,28 @@
select * from felderinfo where tid in
-(select felderinfo_id from masken_felder_bez where maskeninfo_id = 71140);
+(select felderinfo_id from masken_felder_bez where maskeninfo_id = 71140) order by tid;
-select * from masken_felder_bez where maskeninfo_id = 71140;
+select maskeninfo_id, felderinfo_id from masken_felder_bez where maskeninfo_id = 71140 order by 1,2;
-select * from sachgeb_maske_bez where maskeninfo_id = 71140;
+select sachgebiete_id, maskeninfo_id from sachgeb_maske_bez where maskeninfo_id = 71140 order by 1,2;
-select * from maske_system_bez where maskeninfo_id = 71140;
+select maskeninfo_id, systeminfo_id from maske_system_bez where maskeninfo_id = 71140 order by 1,2;
@@ -945,28 +909,28 @@
select * from felderinfo where tid in
-(select felderinfo_id from masken_felder_bez where maskeninfo_id = 71220);
+(select felderinfo_id from masken_felder_bez where maskeninfo_id = 71220) order by tid;
-select * from masken_felder_bez where maskeninfo_id = 71220;
+select maskeninfo_id, felderinfo_id from masken_felder_bez where maskeninfo_id = 71220 order by 1,2;
-select * from sachgeb_maske_bez where maskeninfo_id = 71220;
+select sachgebiete_id, maskeninfo_id from sachgeb_maske_bez where maskeninfo_id = 71220 order by 1,2;
-select * from maske_system_bez where maskeninfo_id = 71220;
+select maskeninfo_id, systeminfo_id from maske_system_bez where maskeninfo_id = 71220 order by 1,2;
@@ -981,28 +945,28 @@
select * from felderinfo where tid in
-(select felderinfo_id from masken_felder_bez where maskeninfo_id = 71240);
+(select felderinfo_id from masken_felder_bez where maskeninfo_id = 71240) order by tid;
-select * from masken_felder_bez where maskeninfo_id = 71240;
+select maskeninfo_id, felderinfo_id from masken_felder_bez where maskeninfo_id = 71240 order by 1,2;
-select * from sachgeb_maske_bez where maskeninfo_id = 71240;
+select sachgebiete_id, maskeninfo_id from sachgeb_maske_bez where maskeninfo_id = 71240 order by 1,2;
-select * from maske_system_bez where maskeninfo_id = 71240;
+select maskeninfo_id, systeminfo_id from maske_system_bez where maskeninfo_id = 71240 order by 1,2;
@@ -1017,28 +981,28 @@
select * from felderinfo where tid in
-(select felderinfo_id from masken_felder_bez where maskeninfo_id = 71180);
+(select felderinfo_id from masken_felder_bez where maskeninfo_id = 71180) order by tid;
-select * from masken_felder_bez where maskeninfo_id = 71180;
+select maskeninfo_id, felderinfo_id from masken_felder_bez where maskeninfo_id = 71180 order by 1,2;
-select * from sachgeb_maske_bez where maskeninfo_id = 71180;
+select sachgebiete_id, maskeninfo_id from sachgeb_maske_bez where maskeninfo_id = 71180 order by 1,2;
-select * from maske_system_bez where maskeninfo_id = 71180;
+select maskeninfo_id, systeminfo_id from maske_system_bez where maskeninfo_id = 71180 order by 1,2;
@@ -1053,28 +1017,28 @@
select * from felderinfo where tid in
-(select felderinfo_id from masken_felder_bez where maskeninfo_id = 71190);
+(select felderinfo_id from masken_felder_bez where maskeninfo_id = 71190) order by tid;
-select * from masken_felder_bez where maskeninfo_id = 71190;
+select maskeninfo_id, felderinfo_id from masken_felder_bez where maskeninfo_id = 71190 order by 1,2;
-select * from sachgeb_maske_bez where maskeninfo_id = 71190;
+select sachgebiete_id, maskeninfo_id from sachgeb_maske_bez where maskeninfo_id = 71190 order by 1,2;
-select * from maske_system_bez where maskeninfo_id = 71190;
+select maskeninfo_id, systeminfo_id from maske_system_bez where maskeninfo_id = 71190 order by 1,2;
@@ -1089,28 +1053,28 @@
select * from felderinfo where tid in
-(select felderinfo_id from masken_felder_bez where maskeninfo_id = 71200);
+(select felderinfo_id from masken_felder_bez where maskeninfo_id = 71200) order by tid;
-select * from masken_felder_bez where maskeninfo_id = 71200;
+select maskeninfo_id, felderinfo_id from masken_felder_bez where maskeninfo_id = 71200 order by 1,2;
-select * from sachgeb_maske_bez where maskeninfo_id = 71200;
+select sachgebiete_id, maskeninfo_id from sachgeb_maske_bez where maskeninfo_id = 71200 order by 1,2;
-select * from maske_system_bez where maskeninfo_id = 71200;
+select maskeninfo_id, systeminfo_id from maske_system_bez where maskeninfo_id = 71200 order by 1,2;
@@ -1125,28 +1089,28 @@
select * from felderinfo where tid in
-(select felderinfo_id from masken_felder_bez where maskeninfo_id = 71260);
+(select felderinfo_id from masken_felder_bez where maskeninfo_id = 71260) order by tid;
-select * from masken_felder_bez where maskeninfo_id = 71260;
+select maskeninfo_id, felderinfo_id from masken_felder_bez where maskeninfo_id = 71260 order by 1,2;
-select * from sachgeb_maske_bez where maskeninfo_id = 71260;
+select sachgebiete_id, maskeninfo_id from sachgeb_maske_bez where maskeninfo_id = 71260 order by 1,2;
-select * from maske_system_bez where maskeninfo_id = 71260;
+select maskeninfo_id, systeminfo_id from maske_system_bez where maskeninfo_id = 71260 order by 1,2;
@@ -1161,28 +1125,28 @@
select * from felderinfo where tid in
-(select felderinfo_id from masken_felder_bez where maskeninfo_id = 71280);
+(select felderinfo_id from masken_felder_bez where maskeninfo_id = 71280) order by tid;
-select * from masken_felder_bez where maskeninfo_id = 71280;
+select maskeninfo_id, felderinfo_id from masken_felder_bez where maskeninfo_id = 71280 order by 1,2;
-select * from sachgeb_maske_bez where maskeninfo_id = 71280;
+select sachgebiete_id, maskeninfo_id from sachgeb_maske_bez where maskeninfo_id = 71280 order by 1,2;
-select * from maske_system_bez where maskeninfo_id = 71280;
+select maskeninfo_id, systeminfo_id from maske_system_bez where maskeninfo_id = 71280 order by 1,2;
@@ -1197,28 +1161,28 @@
select * from felderinfo where tid in
-(select felderinfo_id from masken_felder_bez where maskeninfo_id = 71300);
+(select felderinfo_id from masken_felder_bez where maskeninfo_id = 71300) order by tid;
-select * from masken_felder_bez where maskeninfo_id = 71300;
+select maskeninfo_id, felderinfo_id from masken_felder_bez where maskeninfo_id = 71300 order by 1,2;
-select * from sachgeb_maske_bez where maskeninfo_id = 71300;
+select sachgebiete_id, maskeninfo_id from sachgeb_maske_bez where maskeninfo_id = 71300 order by 1,2;
-select * from maske_system_bez where maskeninfo_id = 71300;
+select maskeninfo_id, systeminfo_id from maske_system_bez where maskeninfo_id = 71300 order by 1,2;
@@ -1233,28 +1197,28 @@
select * from felderinfo where tid in
-(select felderinfo_id from masken_felder_bez where maskeninfo_id = 71410);
+(select felderinfo_id from masken_felder_bez where maskeninfo_id = 71410) order by tid;
-select * from masken_felder_bez where maskeninfo_id = 71410;
+select maskeninfo_id, felderinfo_id from masken_felder_bez where maskeninfo_id = 71410 order by 1,2;
-select * from sachgeb_maske_bez where maskeninfo_id = 71410;
+select sachgebiete_id, maskeninfo_id from sachgeb_maske_bez where maskeninfo_id = 71410 order by 1,2;
-select * from maske_system_bez where maskeninfo_id = 71410;
+select maskeninfo_id, systeminfo_id from maske_system_bez where maskeninfo_id = 71410 order by 1,2;
@@ -1269,28 +1233,28 @@
select * from felderinfo where tid in
-(select felderinfo_id from masken_felder_bez where maskeninfo_id = 71320);
+(select felderinfo_id from masken_felder_bez where maskeninfo_id = 71320) order by tid;
-select * from masken_felder_bez where maskeninfo_id = 71320;
+select maskeninfo_id, felderinfo_id from masken_felder_bez where maskeninfo_id = 71320 order by 1,2;
-select * from sachgeb_maske_bez where maskeninfo_id = 71320;
+select sachgebiete_id, maskeninfo_id from sachgeb_maske_bez where maskeninfo_id = 71320 order by 1,2;
-select * from maske_system_bez where maskeninfo_id = 71320;
+select maskeninfo_id, systeminfo_id from maske_system_bez where maskeninfo_id = 71320 order by 1,2;
@@ -1305,28 +1269,28 @@
select * from felderinfo where tid in
-(select felderinfo_id from masken_felder_bez where maskeninfo_id = 71340);
+(select felderinfo_id from masken_felder_bez where maskeninfo_id = 71340) order by tid;
-select * from masken_felder_bez where maskeninfo_id = 71340;
+select maskeninfo_id, felderinfo_id from masken_felder_bez where maskeninfo_id = 71340 order by 1,2;
-select * from sachgeb_maske_bez where maskeninfo_id = 71340;
+select sachgebiete_id, maskeninfo_id from sachgeb_maske_bez where maskeninfo_id = 71340 order by 1,2;
-select * from maske_system_bez where maskeninfo_id = 71340;
+select maskeninfo_id, systeminfo_id from maske_system_bez where maskeninfo_id = 71340 order by 1,2;
@@ -1341,28 +1305,28 @@
select * from felderinfo where tid in
-(select felderinfo_id from masken_felder_bez where maskeninfo_id = 71360);
+(select felderinfo_id from masken_felder_bez where maskeninfo_id = 71360) order by tid;
-select * from masken_felder_bez where maskeninfo_id = 71360;
+select maskeninfo_id, felderinfo_id from masken_felder_bez where maskeninfo_id = 71360 order by 1,2;
-select * from sachgeb_maske_bez where maskeninfo_id = 71360;
+select sachgebiete_id, maskeninfo_id from sachgeb_maske_bez where maskeninfo_id = 71360 order by 1,2;
-select * from maske_system_bez where maskeninfo_id = 71360;
+select maskeninfo_id, systeminfo_id from maske_system_bez where maskeninfo_id = 71360 order by 1,2;
@@ -1377,28 +1341,28 @@
select * from felderinfo where tid in
-(select felderinfo_id from masken_felder_bez where maskeninfo_id = 71380);
+(select felderinfo_id from masken_felder_bez where maskeninfo_id = 71380) order by tid;
-select * from masken_felder_bez where maskeninfo_id = 71380;
+select maskeninfo_id, felderinfo_id from masken_felder_bez where maskeninfo_id = 71380 order by 1,2;
-select * from sachgeb_maske_bez where maskeninfo_id = 71380;
+select sachgebiete_id, maskeninfo_id from sachgeb_maske_bez where maskeninfo_id = 71380 order by 1,2;
-select * from maske_system_bez where maskeninfo_id = 71380;
+select maskeninfo_id, systeminfo_id from maske_system_bez where maskeninfo_id = 71380 order by 1,2;
@@ -1413,28 +1377,28 @@
select * from felderinfo where tid in
-(select felderinfo_id from masken_felder_bez where maskeninfo_id = 71400);
+(select felderinfo_id from masken_felder_bez where maskeninfo_id = 71400) order by tid;
-select * from masken_felder_bez where maskeninfo_id = 71400;
+select maskeninfo_id, felderinfo_id from masken_felder_bez where maskeninfo_id = 71400 order by 1,2;
-select * from sachgeb_maske_bez where maskeninfo_id = 71400;
+select sachgebiete_id, maskeninfo_id from sachgeb_maske_bez where maskeninfo_id = 71400 order by 1,2;
-select * from maske_system_bez where maskeninfo_id = 71400;
+select maskeninfo_id, systeminfo_id from maske_system_bez where maskeninfo_id = 71400 order by 1,2;
@@ -1449,28 +1413,28 @@
select * from felderinfo where tid in
-(select felderinfo_id from masken_felder_bez where maskeninfo_id = 71420);
+(select felderinfo_id from masken_felder_bez where maskeninfo_id = 71420) order by tid;
-select * from masken_felder_bez where maskeninfo_id = 71420;
+select maskeninfo_id, felderinfo_id from masken_felder_bez where maskeninfo_id = 71420 order by 1,2;
-select * from sachgeb_maske_bez where maskeninfo_id = 71420;
+select sachgebiete_id, maskeninfo_id from sachgeb_maske_bez where maskeninfo_id = 71420 order by 1,2;
-select * from maske_system_bez where maskeninfo_id = 71420;
+select maskeninfo_id, systeminfo_id from maske_system_bez where maskeninfo_id = 71420 order by 1,2;
@@ -1485,28 +1449,28 @@
select * from felderinfo where tid in
-(select felderinfo_id from masken_felder_bez where maskeninfo_id = 71440);
+(select felderinfo_id from masken_felder_bez where maskeninfo_id = 71440) order by tid;
-select * from masken_felder_bez where maskeninfo_id = 71440;
+select maskeninfo_id, felderinfo_id from masken_felder_bez where maskeninfo_id = 71440 order by 1,2;
-select * from sachgeb_maske_bez where maskeninfo_id = 71440;
+select sachgebiete_id, maskeninfo_id from sachgeb_maske_bez where maskeninfo_id = 71440 order by 1,2;
-select * from maske_system_bez where maskeninfo_id = 71440;
+select maskeninfo_id, systeminfo_id from maske_system_bez where maskeninfo_id = 71440 order by 1,2;
@@ -1521,28 +1485,28 @@
select * from felderinfo where tid in
-(select felderinfo_id from masken_felder_bez where maskeninfo_id = 71480);
+(select felderinfo_id from masken_felder_bez where maskeninfo_id = 71480) order by tid;
-select * from masken_felder_bez where maskeninfo_id = 71480;
+select maskeninfo_id, felderinfo_id from masken_felder_bez where maskeninfo_id = 71480 order by 1,2;
-select * from sachgeb_maske_bez where maskeninfo_id = 71480;
+select sachgebiete_id, maskeninfo_id from sachgeb_maske_bez where maskeninfo_id = 71480 order by 1,2;
-select * from maske_system_bez where maskeninfo_id = 71480;
+select maskeninfo_id, systeminfo_id from maske_system_bez where maskeninfo_id = 71480 order by 1,2;
@@ -1557,28 +1521,28 @@
select * from felderinfo where tid in
-(select felderinfo_id from masken_felder_bez where maskeninfo_id = 71500);
+(select felderinfo_id from masken_felder_bez where maskeninfo_id = 71500) order by tid;
-select * from masken_felder_bez where maskeninfo_id = 71500;
+select maskeninfo_id, felderinfo_id from masken_felder_bez where maskeninfo_id = 71500 order by 1,2;
-select * from sachgeb_maske_bez where maskeninfo_id = 71500;
+select sachgebiete_id, maskeninfo_id from sachgeb_maske_bez where maskeninfo_id = 71500 order by 1,2;
-select * from maske_system_bez where maskeninfo_id = 71500;
+select maskeninfo_id, systeminfo_id from maske_system_bez where maskeninfo_id = 71500 order by 1,2;
@@ -1593,28 +1557,28 @@
select * from felderinfo where tid in
-(select felderinfo_id from masken_felder_bez where maskeninfo_id = 71520);
+(select felderinfo_id from masken_felder_bez where maskeninfo_id = 71520) order by tid;
-select * from masken_felder_bez where maskeninfo_id = 71520;
+select maskeninfo_id, felderinfo_id from masken_felder_bez where maskeninfo_id = 71520 order by 1,2;
-select * from sachgeb_maske_bez where maskeninfo_id = 71520;
+select sachgebiete_id, maskeninfo_id from sachgeb_maske_bez where maskeninfo_id = 71520 order by 1,2;
-select * from maske_system_bez where maskeninfo_id = 71520;
+select maskeninfo_id, systeminfo_id from maske_system_bez where maskeninfo_id = 71520 order by 1,2;
@@ -1629,28 +1593,28 @@
select * from felderinfo where tid in
-(select felderinfo_id from masken_felder_bez where maskeninfo_id = 71540);
+(select felderinfo_id from masken_felder_bez where maskeninfo_id = 71540) order by tid;
-select * from masken_felder_bez where maskeninfo_id = 71540;
+select maskeninfo_id, felderinfo_id from masken_felder_bez where maskeninfo_id = 71540 order by 1,2;
-select * from sachgeb_maske_bez where maskeninfo_id = 71540;
+select sachgebiete_id, maskeninfo_id from sachgeb_maske_bez where maskeninfo_id = 71540 order by 1,2;
-select * from maske_system_bez where maskeninfo_id = 71540;
+select maskeninfo_id, systeminfo_id from maske_system_bez where maskeninfo_id = 71540 order by 1,2;
@@ -1665,28 +1629,28 @@
select * from felderinfo where tid in
-(select felderinfo_id from masken_felder_bez where maskeninfo_id = 71560);
+(select felderinfo_id from masken_felder_bez where maskeninfo_id = 71560) order by tid;
-select * from masken_felder_bez where maskeninfo_id = 71560;
+select maskeninfo_id, felderinfo_id from masken_felder_bez where maskeninfo_id = 71560 order by 1,2;
-select * from sachgeb_maske_bez where maskeninfo_id = 71560;
+select sachgebiete_id, maskeninfo_id from sachgeb_maske_bez where maskeninfo_id = 71560 order by 1,2;
-select * from maske_system_bez where maskeninfo_id = 71560;
+select maskeninfo_id, systeminfo_id from maske_system_bez where maskeninfo_id = 71560 order by 1,2;
@@ -1701,28 +1665,28 @@
select * from felderinfo where tid in
-(select felderinfo_id from masken_felder_bez where maskeninfo_id = 71580);
+(select felderinfo_id from masken_felder_bez where maskeninfo_id = 71580) order by tid;
-select * from masken_felder_bez where maskeninfo_id = 71580;
+select maskeninfo_id, felderinfo_id from masken_felder_bez where maskeninfo_id = 71580 order by 1,2;
-select * from sachgeb_maske_bez where maskeninfo_id = 71580;
+select sachgebiete_id, maskeninfo_id from sachgeb_maske_bez where maskeninfo_id = 71580 order by 1,2;
-select * from maske_system_bez where maskeninfo_id = 71580;
+select maskeninfo_id, systeminfo_id from maske_system_bez where maskeninfo_id = 71580 order by 1,2;
@@ -1737,28 +1701,28 @@
select * from felderinfo where tid in
-(select felderinfo_id from masken_felder_bez where maskeninfo_id = 71600);
+(select felderinfo_id from masken_felder_bez where maskeninfo_id = 71600) order by tid;
-select * from masken_felder_bez where maskeninfo_id = 71600;
+select maskeninfo_id, felderinfo_id from masken_felder_bez where maskeninfo_id = 71600 order by 1,2;
-select * from sachgeb_maske_bez where maskeninfo_id = 71600;
+select sachgebiete_id, maskeninfo_id from sachgeb_maske_bez where maskeninfo_id = 71600 order by 1,2;
-select * from maske_system_bez where maskeninfo_id = 71600;
+select maskeninfo_id, systeminfo_id from maske_system_bez where maskeninfo_id = 71600 order by 1,2;
@@ -1773,28 +1737,28 @@
select * from felderinfo where tid in
-(select felderinfo_id from masken_felder_bez where maskeninfo_id = 71620);
+(select felderinfo_id from masken_felder_bez where maskeninfo_id = 71620) order by tid;
-select * from masken_felder_bez where maskeninfo_id = 71620;
+select maskeninfo_id, felderinfo_id from masken_felder_bez where maskeninfo_id = 71620 order by 1,2;
-select * from sachgeb_maske_bez where maskeninfo_id = 71620;
+select sachgebiete_id, maskeninfo_id from sachgeb_maske_bez where maskeninfo_id = 71620 order by 1,2;
-select * from maske_system_bez where maskeninfo_id = 71620;
+select maskeninfo_id, systeminfo_id from maske_system_bez where maskeninfo_id = 71620 order by 1,2;
@@ -1809,28 +1773,28 @@
select * from felderinfo where tid in
-(select felderinfo_id from masken_felder_bez where maskeninfo_id = 71640);
+(select felderinfo_id from masken_felder_bez where maskeninfo_id = 71640) order by tid;
-select * from masken_felder_bez where maskeninfo_id = 71640;
+select maskeninfo_id, felderinfo_id from masken_felder_bez where maskeninfo_id = 71640 order by 1,2;
-select * from sachgeb_maske_bez where maskeninfo_id = 71640;
+select sachgebiete_id, maskeninfo_id from sachgeb_maske_bez where maskeninfo_id = 71640 order by 1,2;
-select * from maske_system_bez where maskeninfo_id = 71640;
+select maskeninfo_id, systeminfo_id from maske_system_bez where maskeninfo_id = 71640 order by 1,2;
@@ -1845,28 +1809,28 @@
select * from felderinfo where tid in
-(select felderinfo_id from masken_felder_bez where maskeninfo_id = 71660);
+(select felderinfo_id from masken_felder_bez where maskeninfo_id = 71660) order by tid;
-select * from masken_felder_bez where maskeninfo_id = 71660;
+select maskeninfo_id, felderinfo_id from masken_felder_bez where maskeninfo_id = 71660 order by 1,2;
-select * from sachgeb_maske_bez where maskeninfo_id = 71660;
+select sachgebiete_id, maskeninfo_id from sachgeb_maske_bez where maskeninfo_id = 71660 order by 1,2;
-select * from maske_system_bez where maskeninfo_id = 71660;
+select maskeninfo_id, systeminfo_id from maske_system_bez where maskeninfo_id = 71660 order by 1,2;
@@ -1881,28 +1845,28 @@
select * from felderinfo where tid in
-(select felderinfo_id from masken_felder_bez where maskeninfo_id = 71680);
+(select felderinfo_id from masken_felder_bez where maskeninfo_id = 71680) order by tid;
-select * from masken_felder_bez where maskeninfo_id = 71680;
+select maskeninfo_id, felderinfo_id from masken_felder_bez where maskeninfo_id = 71680 order by 1,2;
-select * from sachgeb_maske_bez where maskeninfo_id = 71680;
+select sachgebiete_id, maskeninfo_id from sachgeb_maske_bez where maskeninfo_id = 71680 order by 1,2;
-select * from maske_system_bez where maskeninfo_id = 71680;
+select maskeninfo_id, systeminfo_id from maske_system_bez where maskeninfo_id = 71680 order by 1,2;
@@ -1917,28 +1881,28 @@
select * from felderinfo where tid in
-(select felderinfo_id from masken_felder_bez where maskeninfo_id = 71770);
+(select felderinfo_id from masken_felder_bez where maskeninfo_id = 71770) order by tid;
-select * from masken_felder_bez where maskeninfo_id = 71770;
+select maskeninfo_id, felderinfo_id from masken_felder_bez where maskeninfo_id = 71770 order by 1,2;
-select * from sachgeb_maske_bez where maskeninfo_id = 71770;
+select sachgebiete_id, maskeninfo_id from sachgeb_maske_bez where maskeninfo_id = 71770 order by 1,2;
-select * from maske_system_bez where maskeninfo_id = 71770;
+select maskeninfo_id, systeminfo_id from maske_system_bez where maskeninfo_id = 71770 order by 1,2;
@@ -1953,28 +1917,28 @@
select * from felderinfo where tid in
-(select felderinfo_id from masken_felder_bez where maskeninfo_id = 71800);
+(select felderinfo_id from masken_felder_bez where maskeninfo_id = 71800) order by tid;
-select * from masken_felder_bez where maskeninfo_id = 71800;
+select maskeninfo_id, felderinfo_id from masken_felder_bez where maskeninfo_id = 71800 order by 1,2;
-select * from sachgeb_maske_bez where maskeninfo_id = 71800;
+select sachgebiete_id, maskeninfo_id from sachgeb_maske_bez where maskeninfo_id = 71800 order by 1,2;
-select * from maske_system_bez where maskeninfo_id = 71800;
+select maskeninfo_id, systeminfo_id from maske_system_bez where maskeninfo_id = 71800 order by 1,2;
@@ -1989,28 +1953,28 @@
select * from felderinfo where tid in
-(select felderinfo_id from masken_felder_bez where maskeninfo_id = 71820);
+(select felderinfo_id from masken_felder_bez where maskeninfo_id = 71820) order by tid;
-select * from masken_felder_bez where maskeninfo_id = 71820;
+select maskeninfo_id, felderinfo_id from masken_felder_bez where maskeninfo_id = 71820 order by 1,2;
-select * from sachgeb_maske_bez where maskeninfo_id = 71820;
+select sachgebiete_id, maskeninfo_id from sachgeb_maske_bez where maskeninfo_id = 71820 order by 1,2;
-select * from maske_system_bez where maskeninfo_id = 71820;
+select maskeninfo_id, systeminfo_id from maske_system_bez where maskeninfo_id = 71820 order by 1,2;
diff --git a/superx/WEB-INF/conf/edustore/db/install/conf/his1/edustore_install/edustore_kern_masken_loeschen.sql b/superx/WEB-INF/conf/edustore/db/install/conf/his1/edustore_install/edustore_kern_masken_loeschen.sql
new file mode 100644
index 0000000..2e6be8d
--- /dev/null
+++ b/superx/WEB-INF/conf/edustore/db/install/conf/his1/edustore_install/edustore_kern_masken_loeschen.sql
@@ -0,0 +1,330 @@
+delete from maskeninfo where tid = 750;
+delete from felderinfo where tid in
+(select felderinfo_id from masken_felder_bez where maskeninfo_id = 750);
+delete from masken_felder_bez where maskeninfo_id = 750;
+delete from sachgeb_maske_bez where maskeninfo_id = 750;
+delete from maske_system_bez where maskeninfo_id = 750;
+delete from maskeninfo where tid = 70460;
+delete from felderinfo where tid in
+(select felderinfo_id from masken_felder_bez where maskeninfo_id = 70460);
+delete from masken_felder_bez where maskeninfo_id = 70460;
+delete from sachgeb_maske_bez where maskeninfo_id = 70460;
+delete from maske_system_bez where maskeninfo_id = 70460;
+delete from maskeninfo where tid = 70350;
+delete from felderinfo where tid in
+(select felderinfo_id from masken_felder_bez where maskeninfo_id = 70350);
+delete from masken_felder_bez where maskeninfo_id = 70350;
+delete from sachgeb_maske_bez where maskeninfo_id = 70350;
+delete from maske_system_bez where maskeninfo_id = 70350;
+delete from maskeninfo where tid = 70370;
+delete from felderinfo where tid in
+(select felderinfo_id from masken_felder_bez where maskeninfo_id = 70370);
+delete from masken_felder_bez where maskeninfo_id = 70370;
+delete from sachgeb_maske_bez where maskeninfo_id = 70370;
+delete from maske_system_bez where maskeninfo_id = 70370;
+delete from maskeninfo where tid = 70510;
+delete from felderinfo where tid in
+(select felderinfo_id from masken_felder_bez where maskeninfo_id = 70510);
+delete from masken_felder_bez where maskeninfo_id = 70510;
+delete from sachgeb_maske_bez where maskeninfo_id = 70510;
+delete from maske_system_bez where maskeninfo_id = 70510;
+delete from maskeninfo where tid = 70630;
+delete from felderinfo where tid in
+(select felderinfo_id from masken_felder_bez where maskeninfo_id = 70630);
+delete from masken_felder_bez where maskeninfo_id = 70630;
+delete from sachgeb_maske_bez where maskeninfo_id = 70630;
+delete from maske_system_bez where maskeninfo_id = 70630;
+delete from maskeninfo where tid = 70620;
+delete from felderinfo where tid in
+(select felderinfo_id from masken_felder_bez where maskeninfo_id = 70620);
+delete from masken_felder_bez where maskeninfo_id = 70620;
+delete from sachgeb_maske_bez where maskeninfo_id = 70620;
+delete from maske_system_bez where maskeninfo_id = 70620;
+delete from maskeninfo where tid = 70570;
+delete from felderinfo where tid in
+(select felderinfo_id from masken_felder_bez where maskeninfo_id = 70570);
+delete from masken_felder_bez where maskeninfo_id = 70570;
+delete from sachgeb_maske_bez where maskeninfo_id = 70570;
+delete from maske_system_bez where maskeninfo_id = 70570;
+delete from maskeninfo where tid = 70580;
+delete from felderinfo where tid in
+(select felderinfo_id from masken_felder_bez where maskeninfo_id = 70580);
+delete from masken_felder_bez where maskeninfo_id = 70580;
+delete from sachgeb_maske_bez where maskeninfo_id = 70580;
+delete from maske_system_bez where maskeninfo_id = 70580;
+delete from maskeninfo where tid = 70640;
+delete from felderinfo where tid in
+(select felderinfo_id from masken_felder_bez where maskeninfo_id = 70640);
+delete from masken_felder_bez where maskeninfo_id = 70640;
+delete from sachgeb_maske_bez where maskeninfo_id = 70640;
+delete from maske_system_bez where maskeninfo_id = 70640;
+delete from maskeninfo where tid = 70970;
+delete from felderinfo where tid in
+(select felderinfo_id from masken_felder_bez where maskeninfo_id = 70970);
+delete from masken_felder_bez where maskeninfo_id = 70970;
+delete from sachgeb_maske_bez where maskeninfo_id = 70970;
+delete from maske_system_bez where maskeninfo_id = 70970;
+delete from maskeninfo where tid = 70990;
+delete from felderinfo where tid in
+(select felderinfo_id from masken_felder_bez where maskeninfo_id = 70990);
+delete from masken_felder_bez where maskeninfo_id = 70990;
+delete from sachgeb_maske_bez where maskeninfo_id = 70990;
+delete from maske_system_bez where maskeninfo_id = 70990;
+delete from maskeninfo where tid = 70060;
+delete from felderinfo where tid in
+(select felderinfo_id from masken_felder_bez where maskeninfo_id = 70060);
+delete from masken_felder_bez where maskeninfo_id = 70060;
+delete from sachgeb_maske_bez where maskeninfo_id = 70060;
+delete from maske_system_bez where maskeninfo_id = 70060;
+delete from maskeninfo where tid = 71000;
+delete from felderinfo where tid in
+(select felderinfo_id from masken_felder_bez where maskeninfo_id = 71000);
+delete from masken_felder_bez where maskeninfo_id = 71000;
+delete from sachgeb_maske_bez where maskeninfo_id = 71000;
+delete from maske_system_bez where maskeninfo_id = 71000;
+delete from maskeninfo where tid = 71010;
+delete from felderinfo where tid in
+(select felderinfo_id from masken_felder_bez where maskeninfo_id = 71010);
+delete from masken_felder_bez where maskeninfo_id = 71010;
+delete from sachgeb_maske_bez where maskeninfo_id = 71010;
+delete from maske_system_bez where maskeninfo_id = 71010;
+delete from maskeninfo where tid = 71040;
+delete from felderinfo where tid in
+(select felderinfo_id from masken_felder_bez where maskeninfo_id = 71040);
+delete from masken_felder_bez where maskeninfo_id = 71040;
+delete from sachgeb_maske_bez where maskeninfo_id = 71040;
+delete from maske_system_bez where maskeninfo_id = 71040;
+delete from maskeninfo where tid = 71030;
+delete from felderinfo where tid in
+(select felderinfo_id from masken_felder_bez where maskeninfo_id = 71030);
+delete from masken_felder_bez where maskeninfo_id = 71030;
+delete from sachgeb_maske_bez where maskeninfo_id = 71030;
+delete from maske_system_bez where maskeninfo_id = 71030;
+delete from maskeninfo where tid = 71050;
+delete from felderinfo where tid in
+(select felderinfo_id from masken_felder_bez where maskeninfo_id = 71050);
+delete from masken_felder_bez where maskeninfo_id = 71050;
+delete from sachgeb_maske_bez where maskeninfo_id = 71050;
+delete from maske_system_bez where maskeninfo_id = 71050;
+delete from maskeninfo where tid = 70160;
+delete from felderinfo where tid in
+(select felderinfo_id from masken_felder_bez where maskeninfo_id = 70160);
+delete from masken_felder_bez where maskeninfo_id = 70160;
+delete from sachgeb_maske_bez where maskeninfo_id = 70160;
+delete from maske_system_bez where maskeninfo_id = 70160;
+delete from maskeninfo where tid = 70170;
+delete from felderinfo where tid in
+(select felderinfo_id from masken_felder_bez where maskeninfo_id = 70170);
+delete from masken_felder_bez where maskeninfo_id = 70170;
+delete from sachgeb_maske_bez where maskeninfo_id = 70170;
+delete from maske_system_bez where maskeninfo_id = 70170;
+delete from maskeninfo where tid = 71080;
+delete from felderinfo where tid in
+(select felderinfo_id from masken_felder_bez where maskeninfo_id = 71080);
+delete from masken_felder_bez where maskeninfo_id = 71080;
+delete from sachgeb_maske_bez where maskeninfo_id = 71080;
+delete from maske_system_bez where maskeninfo_id = 71080;
+delete from maskeninfo where tid = 71090;
+delete from felderinfo where tid in
+(select felderinfo_id from masken_felder_bez where maskeninfo_id = 71090);
+delete from masken_felder_bez where maskeninfo_id = 71090;
+delete from sachgeb_maske_bez where maskeninfo_id = 71090;
+delete from maske_system_bez where maskeninfo_id = 71090;
+delete from maskeninfo where tid = 71100;
+delete from felderinfo where tid in
+(select felderinfo_id from masken_felder_bez where maskeninfo_id = 71100);
+delete from masken_felder_bez where maskeninfo_id = 71100;
+delete from sachgeb_maske_bez where maskeninfo_id = 71100;
+delete from maske_system_bez where maskeninfo_id = 71100;
+delete from maskeninfo where tid = 71120;
+delete from felderinfo where tid in
+(select felderinfo_id from masken_felder_bez where maskeninfo_id = 71120);
+delete from masken_felder_bez where maskeninfo_id = 71120;
+delete from sachgeb_maske_bez where maskeninfo_id = 71120;
+delete from maske_system_bez where maskeninfo_id = 71120;
+delete from maskeninfo where tid = 71140;
+delete from felderinfo where tid in
+(select felderinfo_id from masken_felder_bez where maskeninfo_id = 71140);
+delete from masken_felder_bez where maskeninfo_id = 71140;
+delete from sachgeb_maske_bez where maskeninfo_id = 71140;
+delete from maske_system_bez where maskeninfo_id = 71140;
+delete from maskeninfo where tid = 71220;
+delete from felderinfo where tid in
+(select felderinfo_id from masken_felder_bez where maskeninfo_id = 71220);
+delete from masken_felder_bez where maskeninfo_id = 71220;
+delete from sachgeb_maske_bez where maskeninfo_id = 71220;
+delete from maske_system_bez where maskeninfo_id = 71220;
+delete from maskeninfo where tid = 71240;
+delete from felderinfo where tid in
+(select felderinfo_id from masken_felder_bez where maskeninfo_id = 71240);
+delete from masken_felder_bez where maskeninfo_id = 71240;
+delete from sachgeb_maske_bez where maskeninfo_id = 71240;
+delete from maske_system_bez where maskeninfo_id = 71240;
+delete from maskeninfo where tid = 71180;
+delete from felderinfo where tid in
+(select felderinfo_id from masken_felder_bez where maskeninfo_id = 71180);
+delete from masken_felder_bez where maskeninfo_id = 71180;
+delete from sachgeb_maske_bez where maskeninfo_id = 71180;
+delete from maske_system_bez where maskeninfo_id = 71180;
+delete from maskeninfo where tid = 71190;
+delete from felderinfo where tid in
+(select felderinfo_id from masken_felder_bez where maskeninfo_id = 71190);
+delete from masken_felder_bez where maskeninfo_id = 71190;
+delete from sachgeb_maske_bez where maskeninfo_id = 71190;
+delete from maske_system_bez where maskeninfo_id = 71190;
+delete from maskeninfo where tid = 71200;
+delete from felderinfo where tid in
+(select felderinfo_id from masken_felder_bez where maskeninfo_id = 71200);
+delete from masken_felder_bez where maskeninfo_id = 71200;
+delete from sachgeb_maske_bez where maskeninfo_id = 71200;
+delete from maske_system_bez where maskeninfo_id = 71200;
+delete from maskeninfo where tid = 71260;
+delete from felderinfo where tid in
+(select felderinfo_id from masken_felder_bez where maskeninfo_id = 71260);
+delete from masken_felder_bez where maskeninfo_id = 71260;
+delete from sachgeb_maske_bez where maskeninfo_id = 71260;
+delete from maske_system_bez where maskeninfo_id = 71260;
+delete from maskeninfo where tid = 71280;
+delete from felderinfo where tid in
+(select felderinfo_id from masken_felder_bez where maskeninfo_id = 71280);
+delete from masken_felder_bez where maskeninfo_id = 71280;
+delete from sachgeb_maske_bez where maskeninfo_id = 71280;
+delete from maske_system_bez where maskeninfo_id = 71280;
+delete from maskeninfo where tid = 71300;
+delete from felderinfo where tid in
+(select felderinfo_id from masken_felder_bez where maskeninfo_id = 71300);
+delete from masken_felder_bez where maskeninfo_id = 71300;
+delete from sachgeb_maske_bez where maskeninfo_id = 71300;
+delete from maske_system_bez where maskeninfo_id = 71300;
+delete from maskeninfo where tid = 71410;
+delete from felderinfo where tid in
+(select felderinfo_id from masken_felder_bez where maskeninfo_id = 71410);
+delete from masken_felder_bez where maskeninfo_id = 71410;
+delete from sachgeb_maske_bez where maskeninfo_id = 71410;
+delete from maske_system_bez where maskeninfo_id = 71410;
+delete from maskeninfo where tid = 71320;
+delete from felderinfo where tid in
+(select felderinfo_id from masken_felder_bez where maskeninfo_id = 71320);
+delete from masken_felder_bez where maskeninfo_id = 71320;
+delete from sachgeb_maske_bez where maskeninfo_id = 71320;
+delete from maske_system_bez where maskeninfo_id = 71320;
+delete from maskeninfo where tid = 71340;
+delete from felderinfo where tid in
+(select felderinfo_id from masken_felder_bez where maskeninfo_id = 71340);
+delete from masken_felder_bez where maskeninfo_id = 71340;
+delete from sachgeb_maske_bez where maskeninfo_id = 71340;
+delete from maske_system_bez where maskeninfo_id = 71340;
+delete from maskeninfo where tid = 71360;
+delete from felderinfo where tid in
+(select felderinfo_id from masken_felder_bez where maskeninfo_id = 71360);
+delete from masken_felder_bez where maskeninfo_id = 71360;
+delete from sachgeb_maske_bez where maskeninfo_id = 71360;
+delete from maske_system_bez where maskeninfo_id = 71360;
+delete from maskeninfo where tid = 71380;
+delete from felderinfo where tid in
+(select felderinfo_id from masken_felder_bez where maskeninfo_id = 71380);
+delete from masken_felder_bez where maskeninfo_id = 71380;
+delete from sachgeb_maske_bez where maskeninfo_id = 71380;
+delete from maske_system_bez where maskeninfo_id = 71380;
+delete from maskeninfo where tid = 71400;
+delete from felderinfo where tid in
+(select felderinfo_id from masken_felder_bez where maskeninfo_id = 71400);
+delete from masken_felder_bez where maskeninfo_id = 71400;
+delete from sachgeb_maske_bez where maskeninfo_id = 71400;
+delete from maske_system_bez where maskeninfo_id = 71400;
+delete from maskeninfo where tid = 71420;
+delete from felderinfo where tid in
+(select felderinfo_id from masken_felder_bez where maskeninfo_id = 71420);
+delete from masken_felder_bez where maskeninfo_id = 71420;
+delete from sachgeb_maske_bez where maskeninfo_id = 71420;
+delete from maske_system_bez where maskeninfo_id = 71420;
+delete from maskeninfo where tid = 71440;
+delete from felderinfo where tid in
+(select felderinfo_id from masken_felder_bez where maskeninfo_id = 71440);
+delete from masken_felder_bez where maskeninfo_id = 71440;
+delete from sachgeb_maske_bez where maskeninfo_id = 71440;
+delete from maske_system_bez where maskeninfo_id = 71440;
+delete from maskeninfo where tid = 71480;
+delete from felderinfo where tid in
+(select felderinfo_id from masken_felder_bez where maskeninfo_id = 71480);
+delete from masken_felder_bez where maskeninfo_id = 71480;
+delete from sachgeb_maske_bez where maskeninfo_id = 71480;
+delete from maske_system_bez where maskeninfo_id = 71480;
+delete from maskeninfo where tid = 71500;
+delete from felderinfo where tid in
+(select felderinfo_id from masken_felder_bez where maskeninfo_id = 71500);
+delete from masken_felder_bez where maskeninfo_id = 71500;
+delete from sachgeb_maske_bez where maskeninfo_id = 71500;
+delete from maske_system_bez where maskeninfo_id = 71500;
+delete from maskeninfo where tid = 71520;
+delete from felderinfo where tid in
+(select felderinfo_id from masken_felder_bez where maskeninfo_id = 71520);
+delete from masken_felder_bez where maskeninfo_id = 71520;
+delete from sachgeb_maske_bez where maskeninfo_id = 71520;
+delete from maske_system_bez where maskeninfo_id = 71520;
+delete from maskeninfo where tid = 71540;
+delete from felderinfo where tid in
+(select felderinfo_id from masken_felder_bez where maskeninfo_id = 71540);
+delete from masken_felder_bez where maskeninfo_id = 71540;
+delete from sachgeb_maske_bez where maskeninfo_id = 71540;
+delete from maske_system_bez where maskeninfo_id = 71540;
+delete from maskeninfo where tid = 71560;
+delete from felderinfo where tid in
+(select felderinfo_id from masken_felder_bez where maskeninfo_id = 71560);
+delete from masken_felder_bez where maskeninfo_id = 71560;
+delete from sachgeb_maske_bez where maskeninfo_id = 71560;
+delete from maske_system_bez where maskeninfo_id = 71560;
+delete from maskeninfo where tid = 71580;
+delete from felderinfo where tid in
+(select felderinfo_id from masken_felder_bez where maskeninfo_id = 71580);
+delete from masken_felder_bez where maskeninfo_id = 71580;
+delete from sachgeb_maske_bez where maskeninfo_id = 71580;
+delete from maske_system_bez where maskeninfo_id = 71580;
+delete from maskeninfo where tid = 71600;
+delete from felderinfo where tid in
+(select felderinfo_id from masken_felder_bez where maskeninfo_id = 71600);
+delete from masken_felder_bez where maskeninfo_id = 71600;
+delete from sachgeb_maske_bez where maskeninfo_id = 71600;
+delete from maske_system_bez where maskeninfo_id = 71600;
+delete from maskeninfo where tid = 71620;
+delete from felderinfo where tid in
+(select felderinfo_id from masken_felder_bez where maskeninfo_id = 71620);
+delete from masken_felder_bez where maskeninfo_id = 71620;
+delete from sachgeb_maske_bez where maskeninfo_id = 71620;
+delete from maske_system_bez where maskeninfo_id = 71620;
+delete from maskeninfo where tid = 71640;
+delete from felderinfo where tid in
+(select felderinfo_id from masken_felder_bez where maskeninfo_id = 71640);
+delete from masken_felder_bez where maskeninfo_id = 71640;
+delete from sachgeb_maske_bez where maskeninfo_id = 71640;
+delete from maske_system_bez where maskeninfo_id = 71640;
+delete from maskeninfo where tid = 71660;
+delete from felderinfo where tid in
+(select felderinfo_id from masken_felder_bez where maskeninfo_id = 71660);
+delete from masken_felder_bez where maskeninfo_id = 71660;
+delete from sachgeb_maske_bez where maskeninfo_id = 71660;
+delete from maske_system_bez where maskeninfo_id = 71660;
+delete from maskeninfo where tid = 71680;
+delete from felderinfo where tid in
+(select felderinfo_id from masken_felder_bez where maskeninfo_id = 71680);
+delete from masken_felder_bez where maskeninfo_id = 71680;
+delete from sachgeb_maske_bez where maskeninfo_id = 71680;
+delete from maske_system_bez where maskeninfo_id = 71680;
+delete from maskeninfo where tid = 71770;
+delete from felderinfo where tid in
+(select felderinfo_id from masken_felder_bez where maskeninfo_id = 71770);
+delete from masken_felder_bez where maskeninfo_id = 71770;
+delete from sachgeb_maske_bez where maskeninfo_id = 71770;
+delete from maske_system_bez where maskeninfo_id = 71770;
+delete from maskeninfo where tid = 71800;
+delete from felderinfo where tid in
+(select felderinfo_id from masken_felder_bez where maskeninfo_id = 71800);
+delete from masken_felder_bez where maskeninfo_id = 71800;
+delete from sachgeb_maske_bez where maskeninfo_id = 71800;
+delete from maske_system_bez where maskeninfo_id = 71800;
+delete from maskeninfo where tid = 71820;
+delete from felderinfo where tid in
+(select felderinfo_id from masken_felder_bez where maskeninfo_id = 71820);
+delete from masken_felder_bez where maskeninfo_id = 71820;
+delete from sachgeb_maske_bez where maskeninfo_id = 71820;
+delete from maske_system_bez where maskeninfo_id = 71820;
diff --git a/superx/WEB-INF/conf/edustore/db/install/conf/his1/edustore_install/edustore_kern_masken_loeschen.xml b/superx/WEB-INF/conf/edustore/db/install/conf/his1/edustore_install/edustore_kern_masken_loeschen.xml
index 0dc5041..9e997b7 100644
--- a/superx/WEB-INF/conf/edustore/db/install/conf/his1/edustore_install/edustore_kern_masken_loeschen.xml
+++ b/superx/WEB-INF/conf/edustore/db/install/conf/his1/edustore_install/edustore_kern_masken_loeschen.xml
@@ -87,17 +87,6 @@
eduetl:delete from maske_system_bez where maskeninfo_id = 70570;
-eduetl:delete from maskeninfo where tid = 70520;
-
-eduetl:delete from felderinfo where tid in
-(select felderinfo_id from masken_felder_bez where maskeninfo_id = 70520);
-
-eduetl:delete from masken_felder_bez where maskeninfo_id = 70520;
-
-eduetl:delete from sachgeb_maske_bez where maskeninfo_id = 70520;
-
-eduetl:delete from maske_system_bez where maskeninfo_id = 70520;
-eduetl:delete from maskeninfo where tid = 70580;
eduetl:delete from felderinfo where tid in
diff --git a/superx/WEB-INF/conf/edustore/db/install/conf/his1/edustore_install/edustore_kern_upgrade2_pg.xml b/superx/WEB-INF/conf/edustore/db/install/conf/his1/edustore_install/edustore_kern_upgrade2_pg.xml
index 8c91944..716de0c 100644
--- a/superx/WEB-INF/conf/edustore/db/install/conf/his1/edustore_install/edustore_kern_upgrade2_pg.xml
+++ b/superx/WEB-INF/conf/edustore/db/install/conf/his1/edustore_install/edustore_kern_upgrade2_pg.xml
@@ -3,6 +3,9 @@
+
+
+
@@ -23,19 +26,54 @@
-
+eduetl:truncate table tmp_captions cascade;
+eduetl:truncate table k_astat_studienfach_land cascade;
+
+eduetl:truncate table k_astat_abschluss3steller_land cascade;
+
+eduetl:truncate table k_astat_abschluss2steller cascade;
+
+eduetl:truncate table k_astat_studienfach cascade;
+
+eduetl:truncate table k_astat_studienbereich cascade;
+
-
+
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -108,22 +146,22 @@
-
+
-
+
-
+
-
+
@@ -174,17 +212,17 @@
-
+eduetl:truncate table aggre_bland cascade;
-
+
-eduetl:UPDATE db_version SET version = '5.0b'
+eduetl:UPDATE db_version SET version = '5.0'
WHERE his_system = 'kern';
eduetl:select setval('themenbaum_tid_seq',(select max(tid)+1 from themenbaum));
@@ -193,9 +231,6 @@
-
-
-
diff --git a/superx/WEB-INF/conf/edustore/db/install/conf/his1/edustore_update/edustore_kern_load_pg.xml b/superx/WEB-INF/conf/edustore/db/install/conf/his1/edustore_update/edustore_kern_load_pg.xml
index 87c871d..0b67f54 100644
--- a/superx/WEB-INF/conf/edustore/db/install/conf/his1/edustore_update/edustore_kern_load_pg.xml
+++ b/superx/WEB-INF/conf/edustore/db/install/conf/his1/edustore_update/edustore_kern_load_pg.xml
@@ -7,7 +7,7 @@
-
+
diff --git a/superx/WEB-INF/conf/edustore/db/install/conf/kern.html b/superx/WEB-INF/conf/edustore/db/install/conf/kern.html
index 1416bd8..7188903 100644
--- a/superx/WEB-INF/conf/edustore/db/install/conf/kern.html
+++ b/superx/WEB-INF/conf/edustore/db/install/conf/kern.html
@@ -2,6 +2,9 @@
Modul-Beschreibung
+
+
+
\ No newline at end of file
+
+
diff --git a/superx/impressum.htm.sam b/superx/impressum.htm.sam
new file mode 100644
index 0000000..47175aa
--- /dev/null
+++ b/superx/impressum.htm.sam
@@ -0,0 +1,11 @@
+
+
+
+
+
+ Titel
+
+
+
Hier das Impressum eintragen.
+
+
diff --git a/superx/index.jsp b/superx/index.jsp
index 0447a11..4e2456d 100644
--- a/superx/index.jsp
+++ b/superx/index.jsp
@@ -178,7 +178,7 @@ if (request.getSession()!=null&&request.getSession().getAttribute("sessiontype")