Anpassung HISinOne BI 2026.12 #2

src/de/superx/common/Maske.java

@@ -12,6 +12,7 @@ import java.io.StringReader;
 import java.io.StringWriter;
 import java.math.BigDecimal;
 import java.sql.Connection;
+import java.sql.PreparedStatement;
 import java.sql.SQLException;
 import java.text.DateFormat;
 import java.text.ParseException;
@@ -1101,6 +1102,10 @@ public class Maske extends NamedIdObject {
         sharedData.setErgebnisElementOrdNr(0);
         HashMap map = new HashMap();
         map.putAll(user.getBasicMap());
+        if (SxPools.get(mandantenID).getRepository().containsKey("K_Nutzungsstatistiken")&&SxPools.get(mandantenID).getRepository().get("K_Nutzungsstatistiken").toString().equals("2"))
+        			{
+        				insertIntoMaskenProtokoll(user,dbCon);
+        			}
         if (!isReuseResult()) {
             String keyfieldsused = ServletHelper.getParameter(request, RequestParameter.keyfieldsused);
             if (EqualsUtil.areEqual(keyfieldsused, "true")) {
@@ -1184,7 +1189,22 @@ public class Maske extends NamedIdObject {
         return resultstr;
     }
 
-   
+	private void insertIntoMaskenProtokoll(SxUser user, Connection dbCon) throws SQLException {
+		Connection con=dbCon;
+		boolean conUebergeben=true;
+		if (dbCon==null)
+		{
+			conUebergeben=false;
+			con=SxPools.get(mandantenID).getConnection();
+		}
+		PreparedStatement pst=con.prepareStatement("insert into masken_protokoll (maskeninfo_id,user_id,zeitpunkt) values (?,?,now());");
+		pst.setInt(1, Integer.parseInt(this.getId().toString()));
+		pst.setInt(2, Integer.parseInt(user.getId().toString()));
+		pst.executeUpdate();
+		pst.close();
+		if (!conUebergeben) {con.close();}
+		
+	}
     // MB 17.8.2011 Defaultsicht setzen falls gewünscht
 
     public void setFieldsDefaultSichten(SxUser user, HttpServletRequest request) throws SQLException, DBServletException, KeyParentEqualException, CloneNotSupportedException,

src/de/superx/saiku/SuperxRepositoryDataSourceManager.java

@@ -116,6 +116,8 @@ public class SuperxRepositoryDataSourceManager implements IDatasourceManager {
 
 	@Override
 	public void load() {
+		if(SuperXManager.isHis1)
+		{
 		String myConfigurationPath = servletContext.getRealPath(configurationpath);
 		String myDataDir = servletContext.getRealPath(datadir);
 		this.webinfPath = servletContext.getRealPath("/");
@@ -229,6 +231,7 @@ public class SuperxRepositoryDataSourceManager implements IDatasourceManager {
             log.error("Couldn't load Saiku Repository Manager: ", e);
             InitStatus.setStatus(SubSystem.SaikuSchema, Optional.of(e));
 		}
+		}
 	}
 
     private void createSaikuDatasourcesForExportedDatasources(Properties ext) {

src/de/superx/servlet/SxPool.java

@@ -793,11 +793,31 @@ public class SxPool extends GenericObjectPool implements NamedObjectI {
 			InitStatus.setStatus(SubSystem.HasKontierungsRechte, initHasKontierungsrechte());
 			InitStatus.setStatus(SubSystem.HasImplicitOrgunitsRightTable, inithasImplicitOrgUnitRightsTable());
 			InitStatus.setStatus(SubSystem.JasperReports, initJasper());
+			deleteMaskenProtokoll();
 		} finally {
 			SuperXmlAnmeldung.waitForPoolInit = false;
 		}
 	}
-	
+	private void deleteMaskenProtokoll()  {
+		if (this.getRepository().containsKey("K_Nutzungsstatistiken loeschen nach Tagen")&&Integer.parseInt(getRepository().get("K_Nutzungsstatistiken loeschen nach Tagen").toString())>0)
+		{
+		
+       
+       try {
+    	   Connection con=this.getConnection();
+           PreparedStatement pst=con.prepareStatement("delete from masken_protokoll where CURRENT_DATE - Zeitpunkt::date>=?");
+           pst.setInt(1, Integer.parseInt(getRepository().get("K_Nutzungsstatistiken loeschen nach Tagen").toString()));
+           pst.executeUpdate();
+           pst.close();
+           con.close();
+	} catch (SQLException e) {
+		Logger.getLogger("superx_" + getName()).log(Level.WARN,
+				"Fehler Nutzungsstatistiken loeschen nach Tagen");
+		e.printStackTrace();
+	}
+		}
+		
+	}
 	private Optional<Throwable> initJasper() {
 		boolean useJaxen=true;
 		try (Connection dbConnection = SxPools.getConnection(getName());

superx/WEB-INF/conf/edustore/db/conf/module_dbforms-config.xsl

@@ -54,8 +54,8 @@
 <!--Nun ggf. die Forms -->
 <xsl:copy-of select="/module/dbforms" />
 <xsl:comment>Hier endet Moduldefinition</xsl:comment>
-<dbconnection conClass="org.apache.commons.dbcp.PoolingDriver" name="jdbc:apache:commons:dbcp:default" isJndi="false"/>
-
+<dbconnection id="datasourceBean" connectionProviderClass="de.superx.db.SpringBeanConnectionProvider"
+     isPow2="true" isJndi="false" default="true" /> 
 </dbforms-config>
 
  </xsl:template>

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

@@ -1 +1 @@
-05.10.2026
+26.10.2026

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

@@ -3,5 +3,6 @@ create table aggre_bland(
 	tid INTEGER , 
 bland CHAR(2) , 
 text CHAR(40)  not null
+, primary key (tid)
 );
 	

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

@@ -5,5 +5,6 @@ ord SMALLINT ,
 name CHAR(50) , 
 kategorie CHAR(30) , 
 wert NCHAR(255) 
+, primary key (tid)
 );
 	

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

@@ -13,6 +13,7 @@ lang_2 NCHAR(150) ,
 lang_3 NCHAR(250) , 
 sort1 INTEGER , 
 uniquename NVARCHAR(255) 
+, primary key (tid)
 );
 	
 comment on column cif.uniquename is 'Schlüssel';

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

@@ -35,6 +35,7 @@ struktur_c CHAR(50) ,
 ebene INTEGER , 
 lid NVARCHAR(255) , 
 parent_lid NVARCHAR(255) 
+, primary key (tid)
 );
 	
 comment on column cifx.druck is 'Drucktext';

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

@@ -10,6 +10,7 @@ lang_1 NVARCHAR(255) ,
 uniquename NVARCHAR(255) , 
 sort1 INTEGER , 
 struktur_c VARCHAR(50) 
+, primary key (tid)
 );
 	
 comment on column cifx_customize.tid is 'Laufnr.';

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

@@ -21,6 +21,7 @@ processed SMALLINT  default 0 ,
 processor_email NVARCHAR(255) , 
 processed_date DATE , 
 processed_noted SMALLINT  default 0 
+, primary key (tid)
 );
 	
 comment on column data_upload.tablename is 'Tabellenname';

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

@@ -6,5 +6,6 @@ tablename NCHAR(100) ,
 form_path NCHAR(255) , 
 caption NCHAR(200) , 
 description NCHAR(255) 
+, primary key (tid)
 );
 	

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

@@ -4,5 +4,6 @@ create table db_tabellen(
 tabellen_id SERIAL  not null, 
 name CHAR(50) , 
 protokollierung SMALLINT 
+, primary key (tabellen_id)
 );
 	

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

@@ -6,5 +6,6 @@ version CHAR(8) ,
 kern_system CHAR(1) , 
 version_hash VARCHAR , 
 systeminfo_id INTEGER 
+, primary key (his_system, version)
 );
 	

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

@@ -10,5 +10,6 @@ minidle SMALLINT ,
 maxidle SMALLINT , 
 maxactive SMALLINT , 
 testsql NVARCHAR(255) 
+, primary key (id)
 );
 	

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

@@ -16,5 +16,6 @@ day_desc VARCHAR(25) ,
 day_date DATE , 
 semester VARCHAR(25) , 
 semester_key INTEGER 
+, primary key (id)
 );
 	

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

@@ -12,6 +12,7 @@ lang_2 NVARCHAR(255) ,
 lang_3 NVARCHAR(255) , 
 sourcefilter NVARCHAR(255) , 
 system_key NVARCHAR(255) 
+, primary key (tid)
 );
 	
 comment on column dimension.druck is 'Drucktext';

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

@@ -17,6 +17,7 @@ sortfield NVARCHAR(255) ,
 source NVARCHAR(255) , 
 sourcefilter NVARCHAR(255) , 
 system_key NVARCHAR(255) 
+, primary key (tid)
 );
 	
 comment on column dimension_bp.druck is 'Drucktext';

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

@@ -2,5 +2,6 @@
 create table download_group_bez(
 	groupinfo_id INTEGER , 
 download_id INTEGER 
+, primary key (groupinfo_id, download_id)
 );
 	

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

@@ -2,5 +2,6 @@
 create table download_keyw_bez(
 	keyword_id INTEGER , 
 download_id INTEGER 
+, primary key (keyword_id, download_id)
 );
 	

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

@@ -2,5 +2,6 @@
 create table download_user_bez(
 	userinfo_id INTEGER , 
 download_id INTEGER 
+, primary key (userinfo_id, download_id)
 );
 	

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

@@ -6,6 +6,7 @@ caption NVARCHAR(255) ,
 systeminfo_id INTEGER  not null, 
 logfile NVARCHAR(255) , 
 custom_job SMALLINT  default 1 
+, primary key (tid)
 );
 	
 comment on column etl_job.tid is 'tid';

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

@@ -5,6 +5,7 @@ etl_job_id INTEGER  not null,
 uniquename NVARCHAR(255)  not null, 
 name NVARCHAR(255) , 
 param_default NVARCHAR(255) 
+, primary key (tid)
 );
 	
 comment on column etl_job_param.tid is 'tid';

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

@@ -7,6 +7,7 @@ systeminfo_id INTEGER  not null,
 step_type_id INTEGER  not null, 
 logfile NVARCHAR(255) , 
 custom_step SMALLINT  default 1 
+, primary key (tid)
 );
 	
 comment on column etl_step.tid is 'tid';

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

@@ -4,6 +4,7 @@ create table etl_step_property(
 etl_step_id INTEGER  not null, 
 prop_name NVARCHAR(255) , 
 prop_value TEXT 
+, primary key (tid)
 );
 	
 comment on column etl_step_property.tid is 'tid';

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

@@ -8,6 +8,7 @@ force_continue SMALLINT  default 1 ,
 step_active SMALLINT  default 1 , 
 sortnr INTEGER  default 1 , 
 custom_step SMALLINT  default 1 
+, primary key (tid)
 );
 	
 comment on column etl_step_relation.tid is 'tid';

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

@@ -4,6 +4,7 @@ create table etl_step_type(
 uniquename NVARCHAR(255)  not null, 
 caption NVARCHAR(255) , 
 handler NVARCHAR(255) 
+, primary key (tid)
 );
 	
 comment on column etl_step_type.tid is 'tid';

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

@@ -5,6 +5,7 @@ etl_step_type_id INTEGER  not null,
 uniquename NVARCHAR(255)  not null, 
 name NVARCHAR(255) , 
 param_default NVARCHAR(255) 
+, primary key (tid)
 );
 	
 comment on column etl_step_type_param.tid is 'tid';

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

@@ -15,5 +15,6 @@ art INTEGER ,
 relation text , 
 attribut NCHAR(100) , 
 defaultwert TEXT 
+, primary key (tid)
 );
 	

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

@@ -6,5 +6,6 @@ content text  not null,
 description NCHAR(200) , 
 comment NCHAR(200) , 
 version integer  default 1 
+, primary key (tid)
 );
 	

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

@@ -11,5 +11,6 @@ linex INTEGER  not null,
 liney INTEGER  not null, 
 showvalues INTEGER  not null, 
 moreattribs TEXT 
+, primary key (id)
 );
 	

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

@@ -4,6 +4,7 @@ create table group_field_pref(
 groupinfo_id integer , 
 field_id integer , 
 pref NVARCHAR(255) 
+, primary key (tid)
 );
 	
 comment on column group_field_pref.tid is 'Laufnummer';

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

@@ -2,5 +2,6 @@
 create table group_hinweis(
 	groupinfo_id INTEGER  not null, 
 hinweise_id integer  not null
+, primary key (groupinfo_id, hinweise_id)
 );
 	

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

@@ -2,5 +2,6 @@
 create table group_masken_bez(
 	groupinfo_id INTEGER , 
 maskeninfo_id INTEGER 
+, primary key (groupinfo_id, maskeninfo_id)
 );
 	

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

@@ -2,6 +2,7 @@
 create table group_portlet_bez(
 	groupinfo_id INTEGER , 
 portlet_id INTEGER 
+, primary key (portlet_id, groupinfo_id)
 );
 	
 comment on column group_portlet_bez.groupinfo_id is 'GroupID';

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

@@ -2,5 +2,6 @@
 create table group_sachgeb_bez(
 	groupinfo_id INTEGER , 
 sachgebiete_id INTEGER 
+, primary key (groupinfo_id, sachgebiete_id)
 );
 	

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

@@ -2,6 +2,7 @@
 create table group_sichtarten(
 	groupinfo_id INTEGER , 
 sichtart NCHAR(255) 
+, primary key (groupinfo_id, sichtart)
 );
 	
 comment on column group_sichtarten.sichtart is 'Rechte für eine Art von Sichten geben';

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

@@ -2,6 +2,7 @@
 create table group_sichten(
 	groupinfo_id INTEGER , 
 sicht_name_intern NCHAR(200) 
+, primary key (groupinfo_id, sicht_name_intern)
 );
 	
 comment on column group_sichten.sicht_name_intern is 'Rechte für eine einzelne Sicht geben';

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

@@ -2,5 +2,6 @@
 create table groupinfo(
 	tid INTEGER , 
 name NCHAR(255) 
+, primary key (tid)
 );
 	

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

@@ -7,6 +7,7 @@ kapitel CHAR(5)  not null,
 superx_server NCHAR(100)  not null, 
 kennung CHAR(8) , 
 passwd CHAR(16) 
+, primary key (hs_nr)
 );
 	
 comment on column hochschulinfo.hs_nr is 'Hochschulnummer [HIS]';

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

@@ -5,6 +5,7 @@ abschluss_astat_bund_ktxt NVARCHAR(255) ,
 abschlussart NVARCHAR(255) , 
 abschluss_grp NVARCHAR(255) , 
 ist_lehramt SMALLINT  default 0 
+, primary key (abschluss_astat_bund)
 );
 	
 comment on column k_astat_abschl_grp.abschluss_astat_bund is 'Abschluss [Bundesschlüssel]';

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

@@ -3,6 +3,7 @@ create table k_astat_kontinent(
 	schluessel INTEGER  not null, 
 nummer NVARCHAR(255) , 
 name NVARCHAR(255) 
+, primary key (schluessel)
 );
 	
 comment on column k_astat_kontinent.schluessel is 'Schlüssel';

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

@@ -9,6 +9,7 @@ fg CHAR(10) ,
 fg_str NVARCHAR(255) , 
 gueltig_von DATE , 
 gueltig_bis DATE 
+, primary key (tid)
 );
 	
 comment on column k_astat_lfb_fg.fgr is 'Fächergruppe [Schlüssel]';

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

@@ -5,6 +5,7 @@ nummer NVARCHAR(255) ,
 name NVARCHAR(255) , 
 kennz NVARCHAR(255) , 
 kontinent INTEGER 
+, primary key (schluessel)
 );
 	
 comment on column k_astat_staat.schluessel is 'Schlüssel';

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

@@ -7,6 +7,7 @@ semester_von INTEGER ,
 semester_bis INTEGER , 
 gueltig_von DATE , 
 gueltig_bis DATE 
+, primary key (tid)
 );
 	
 comment on column k_astat_staat_eu.eu is 'EU-Mitglied?';

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

@@ -8,5 +8,6 @@ tabelle_quelle CHAR(18) ,
 tabelle CHAR(18) , 
 problem NCHAR(255) , 
 aktion NCHAR(255) 
+, primary key (tid)
 );
 	

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

@@ -14,6 +14,7 @@ ab_version VARCHAR(20) ,
 gruppe NVARCHAR(100) , 
 priority INTEGER , 
 sourcesystem INTEGER 
+, primary key (tid)
 );
 	
 comment on column konstanten.apnr is 'aktueller Wert';

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

@@ -10,6 +10,7 @@ alias NCHAR(255) ,
 schleifenfstand NCHAR(255) , 
 schleifenfsicht NCHAR(255) , 
 aktion NCHAR(255) 
+, primary key (maskeninfo_id1, maskeninfo_id2, active, sortnr)
 );
 	
 comment on column macro_masken_bez.maskeninfo_id1 is 'Hauptmaske';

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

@@ -2,5 +2,6 @@
 create table maske_system_bez(
 	maskeninfo_id INTEGER  not null, 
 systeminfo_id INTEGER  not null
+, primary key (maskeninfo_id, systeminfo_id)
 );
 	

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

@@ -2,6 +2,7 @@
 create table masken_felder_bez(
 	maskeninfo_id INTEGER , 
 felderinfo_id INTEGER 
+, primary key (felderinfo_id, maskeninfo_id)
 );
 	
 comment on column masken_felder_bez.maskeninfo_id is 'Masken ID';

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

@@ -5,6 +5,7 @@ tid INTEGER  not null,
 counter INTEGER , 
 first_call DATE , 
 last_call DATE 
+, primary key (id)
 );
 	
 comment on column masken_statistik.id is 'Id for Spring Data JDBC';

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

@@ -15,6 +15,7 @@ hoehe INTEGER ,
 ampel SMALLINT , 
 hilfe SMALLINT , 
 hinweis text 
+, primary key (tid)
 );
 	
 comment on column maskeninfo.name is 'Name der Maske';

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

@@ -6,5 +6,6 @@ element_value NVARCHAR(255) ,
 description NVARCHAR(255) , 
 nature NVARCHAR(255) , 
 annotation NVARCHAR(255) 
+, primary key (id)
 );
 	

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

@@ -6,5 +6,6 @@ original_schema TEXT ,
 customization TEXT , 
 created datetime year to second , 
 node NVARCHAR(255) 
+, primary key (id)
 );
 	

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

@@ -2,5 +2,6 @@
 create table proto_funktion(
 	proto_fkt_id SMALLINT  not null, 
 proto_fkt CHAR(20)  not null
+, primary key (proto_fkt_id)
 );
 	

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

@@ -7,5 +7,6 @@ ip_adresse CHAR(16)  not null,
 client_name NVARCHAR(255)  not null, 
 zeitpunkt datetime year to second  not null, 
 kommentar NVARCHAR(255) 
+, primary key (protokoll_id)
 );
 	

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

@@ -2,5 +2,6 @@
 create table sachgeb_dbform_bez(
 	sachgebiete_id INTEGER , 
 dbform_id INTEGER 
+, primary key (dbform_id, sachgebiete_id)
 );
 	

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

@@ -2,5 +2,6 @@
 create table sachgeb_maske_bez(
 	sachgebiete_id INTEGER , 
 maskeninfo_id INTEGER 
+, primary key (maskeninfo_id, sachgebiete_id)
 );
 	

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

@@ -2,6 +2,7 @@
 create table sachgeb_sichtarten(
 	sachgebiete_id INTEGER , 
 sichtart NCHAR(255) 
+, primary key (sachgebiete_id, sichtart)
 );
 	
 comment on column sachgeb_sichtarten.sichtart is 'Rechte für eine Art von Sichten geben';

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

@@ -2,6 +2,7 @@
 create table sachgeb_sichten(
 	sachgebiete_id INTEGER , 
 sicht_name_intern NCHAR(200) 
+, primary key (sachgebiete_id, sicht_name_intern)
 );
 	
 comment on column sachgeb_sichten.sicht_name_intern is 'Rechte für eine einzelne Sicht geben';

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

@@ -3,6 +3,7 @@ create table sachgebiete(
 	tid INTEGER , 
 name CHAR(50) , 
 rightname NVARCHAR(255) 
+, primary key (tid)
 );
 	
 comment on column sachgebiete.rightname is 'Rechtename in HIS1_ das diesem Sachgebiet entspricht';

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

@@ -6,6 +6,7 @@ tabelle VARCHAR(40) ,
 feldname VARCHAR(40) , 
 additionalkeyssql NVARCHAR(255) , 
 fallback_user_inst char(1)  default '0' 
+, primary key (tid)
 );
 	
 comment on column sichtart_rechttabelle.tid is 'Laufnummer';

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

@@ -28,6 +28,7 @@ gueltig_bis DATE  default '01.01.3000'  not null,
 cacheapplet NCHAR(255) , 
 cachexml NCHAR(255) , 
 aktiv SMALLINT  default 1 
+, primary key (tid)
 );
 	
 comment on column sichten.parent is 'Übergeordnete Sicht';

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

@@ -11,6 +11,7 @@ post_insert TEXT ,
 finalize TEXT , 
 active SMALLINT  default 1 , 
 hsnr SMALLINT 
+, primary key (tid)
 );
 	
 comment on column sieve.tid is 'id';

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

@@ -6,6 +6,7 @@ def_id INTEGER ,
 in_output SMALLINT  default 1 , 
 sortnr INTEGER , 
 active SMALLINT  default 1 
+, primary key (tid)
 );
 	
 comment on column sieve_column.tid is 'id';

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

@@ -15,6 +15,7 @@ lookup_target NVARCHAR(255) ,
 lookup_cond NVARCHAR(255) , 
 lookup_func NVARCHAR(255) , 
 hinweis NVARCHAR(255) 
+, primary key (tid)
 );
 	
 comment on column sieve_column_def.tid is 'id';

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

@@ -8,6 +8,7 @@ nummer INTEGER ,
 restriction_maintable TEXT , 
 restriction_othertable TEXT , 
 active SMALLINT  default 1 
+, primary key (tid)
 );
 	
 comment on column sieve_field.tid is 'id';

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

@@ -4,6 +4,7 @@ create table stylesheet_field(
 stylesheet_id integer , 
 tablename NVARCHAR(255) , 
 fieldname NVARCHAR(255) 
+, primary key (tid)
 );
 	
 comment on column stylesheet_field.tid is 'Tid';

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

@@ -12,6 +12,7 @@ equalitystatus SMALLINT ,
 sachgebiete_id INTEGER , 
 doku_link NVARCHAR(255) , 
 export_to_glossar INTEGER 
+, primary key (tid)
 );
 	
 comment on column sx_captions.table_name is 'Tabellenname';

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

@@ -11,6 +11,7 @@ contenttype NVARCHAR(255) ,
 datei char(255)  not null, 
 gueltig_seit DATE  default '01.01.1900'  not null, 
 gueltig_bis DATE  default '01.01.3000'  not null
+, primary key (tid)
 );
 	
 comment on column sx_downloads.name is 'Name';

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

@@ -19,6 +19,7 @@ foreignkey_func NVARCHAR(255) ,
 check_integrity SMALLINT  default 0 , 
 is_sum SMALLINT  default 1 , 
 foreignkey_uniquename NVARCHAR(255) 
+, primary key (tid)
 );
 	
 comment on column sx_fields.tid is 'Laufnummer';

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

@@ -10,6 +10,7 @@ hs_nr INTEGER ,
 modus_supported SMALLINT  default 0 , 
 params NVARCHAR(255) , 
 check_sql TEXT 
+, primary key (tid)
 );
 	
 comment on column sx_jobs.tid is 'tid';

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

@@ -3,6 +3,7 @@ create table sx_keywords(
 	tid SERIAL , 
 name NCHAR(255) , 
 parent INTEGER 
+, primary key (tid)
 );
 	
 comment on column sx_keywords.tid is 'Tupelidentifier';

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

@@ -4,6 +4,7 @@ create table sx_mask_style(
 maskeninfo_id INTEGER , 
 stylesheet_id INTEGER , 
 ord SMALLINT 
+, primary key (tid)
 );
 	
 comment on column sx_mask_style.tid is 'Laufnummer';

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

@@ -10,6 +10,7 @@ sortnr_initial INTEGER ,
 visible NVARCHAR(255) , 
 gueltig_von DATE  default '01.01.1900'  not null, 
 gueltig_bis DATE  default '01.01.3000'  not null
+, primary key (tid)
 );
 	
 comment on column sx_portlet.tid is 'Feld ID';

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

@@ -17,6 +17,7 @@ geaendert_am DATE ,
 aktiv SMALLINT  default 0  not null, 
 gueltig_seit DATE  default '01.01.1900'  not null, 
 gueltig_bis DATE  default '01.01.3000'  not null
+, primary key (tid)
 );
 	
 comment on column sx_repository.id is 'Variablenname';

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

@@ -6,6 +6,7 @@ param_name NVARCHAR(255)  not null,
 default_val NVARCHAR(255) , 
 description NVARCHAR(255) , 
 wertebereich NVARCHAR(255) 
+, primary key (tid)
 );
 	
 comment on column sx_stylesheet_param.tid is 'Laufnummer';

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

@@ -13,6 +13,7 @@ usage_resultset_data CHAR(10)  default 'T' ,
 stylesheet_type CHAR(10)  default 'XSL' , 
 jr_datasource CHAR(10) , 
 uniquename NVARCHAR(255) 
+, primary key (tid)
 );
 	
 comment on column sx_stylesheets.tid is 'Laufnummer';

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

@@ -9,6 +9,7 @@ systeminfo_id INTEGER ,
 systeminfo_orig INTEGER , 
 thema NVARCHAR(255) , 
 sachgebiete_id NVARCHAR(255) 
+, primary key (tid)
 );
 	
 comment on column sx_tables.tid is 'Laufnummer';

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

@@ -3,5 +3,6 @@ create table systeminfo(
 	tid INTEGER  not null, 
 name CHAR(50)  not null, 
 datum datetime year to second 
+, primary key (tid)
 );
 	

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

@@ -9,6 +9,7 @@ gueltig_bis DATE ,
 erlaeuterung NCHAR(240) , 
 sort INTEGER  default 0  not null, 
 css_class NVARCHAR(255) 
+, primary key (tid)
 );
 	
 comment on column themenbaum.tid is 'Tid';

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

@@ -7,6 +7,7 @@ cifx_tid INTEGER ,
 sourcesystem INTEGER  not null, 
 sourcesystem_id NVARCHAR(255) , 
 systeminfo_id INTEGER 
+, primary key (tid)
 );
 	
 comment on column trans_cifx.sourcesystem is 'Vorsystem';

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

@@ -7,6 +7,7 @@ name NCHAR(200) ,
 gueltig_von DATE , 
 gueltig_bis DATE , 
 systeminfo_id INTEGER 
+, primary key (tid)
 );
 	
 comment on column trans_inst.tid is 'Tupelidentifier';

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

@@ -11,6 +11,7 @@ sourcesystem INTEGER ,
 wertebereich NVARCHAR(255) , 
 ab_version VARCHAR(20) , 
 gruppe NVARCHAR(100) 
+, primary key (tid)
 );
 	
 comment on column unload_params.tid is 'Laufnummer';

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

@@ -6,6 +6,7 @@ update_entity CHAR(40) ,
 update_id INTEGER  default 10 , 
 updated_at datetime year to second , 
 update_time datetime year to second 
+, primary key (tid)
 );
 	
 comment on column update_prot.systeminfo_id is 'Systeminfo';

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

@@ -16,6 +16,7 @@ nature NVARCHAR(255) ,
 attrib1 INTEGER , 
 attrib2 NVARCHAR(255) , 
 attrib3 NVARCHAR(255) 
+, primary key (id)
 );
 	
 comment on column user_dialog.id is 'Nummer des Hinweis';

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

@@ -6,5 +6,6 @@ user_dialog_id INTEGER  not null,
 ip_address NVARCHAR(100) , 
 client_name NVARCHAR(255) , 
 timestamp datetime year to second  not null
+, primary key (userinfo_id, user_dialog_id)
 );
 	

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

@@ -2,5 +2,6 @@
 create table user_einstellungen(
 	tid INTEGER  not null, 
 arbeitsverzeichnis NCHAR(255) 
+, primary key (tid)
 );
 	

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

@@ -3,6 +3,7 @@ create table user_group_bez(
 	userinfo_id INTEGER , 
 groupinfo_id INTEGER , 
 external_entry SMALLINT  default 0 
+, primary key (groupinfo_id, userinfo_id)
 );
 	
 comment on column user_group_bez.userinfo_id is 'UserID';

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

@@ -2,5 +2,6 @@
 create table user_hinweis(
 	userinfo_id INTEGER  not null, 
 hinweise_id integer  not null
+, primary key (userinfo_id, hinweise_id)
 );
 	

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

@@ -9,6 +9,7 @@ gueltig_bis DATE  default '01.01.3000'  not null,
 lehre SMALLINT  default 0 , 
 external_entry SMALLINT  default 0 , 
 externalid NVARCHAR(200) 
+, primary key (ch110_institut, gueltig_bis, gueltig_seit, userid)
 );
 	
 comment on column user_institution.userid is 'UserID';

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

@@ -7,6 +7,7 @@ gueltig_seit DATE  default '01.01.1900' ,
 gueltig_bis DATE  default '01.01.3000' , 
 external_entry SMALLINT  default 0 , 
 externalid NVARCHAR(200) 
+, primary key (key_apnr, userid)
 );
 	
 comment on column user_kostentraeger.userid is 'UserID';

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

@@ -3,6 +3,7 @@ create table user_masken_bez(
 	userinfo_id INTEGER , 
 maskeninfo_id INTEGER , 
 external_entry smallint  default 0 
+, primary key (maskeninfo_id, userinfo_id)
 );
 	
 comment on column user_masken_bez.external_entry is 'Recht wird von externem System [HISinOne] gesetzt und entfernt';

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

@@ -2,6 +2,7 @@
 create table user_portlet_bez(
 	userinfo_id INTEGER , 
 portlet_id INTEGER 
+, primary key (portlet_id, userinfo_id)
 );
 	
 comment on column user_portlet_bez.userinfo_id is 'UserID';

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

@@ -3,6 +3,7 @@ create table user_preset_values(
 	userinfo_id INTEGER , 
 felderinfo_id INTEGER , 
 field_value NVARCHAR(255) 
+, primary key (userinfo_id, felderinfo_id)
 );
 	
 comment on column user_preset_values.felderinfo_id is 'Feld ID';

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

@@ -17,6 +17,7 @@ old_sha6 NCHAR(255) ,
 zeitpunkt6 datetime year to second , 
 old_sha7 NCHAR(255) , 
 zeitpunkt7 datetime year to second 
+, primary key (userinfo_id)
 );
 	
 comment on column user_pw.last_login is 'Letzter erfolgreicher Login';

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

@@ -3,6 +3,7 @@ create table user_sachgeb_bez(
 	userinfo_id INTEGER , 
 sachgebiete_id INTEGER , 
 external_entry smallint  default 0 
+, primary key (sachgebiete_id, userinfo_id)
 );
 	
 comment on column user_sachgeb_bez.external_entry is 'Recht wird von externem System [HISinOne] gesetzt und entfernt';

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

@@ -3,6 +3,7 @@ create table user_sichtarten(
 	userinfo_id INTEGER  not null, 
 sichtart NCHAR(255)  not null, 
 external_entry smallint  default 0 
+, primary key (userinfo_id, sichtart)
 );
 	
 comment on column user_sichtarten.sichtart is 'Rechte für eine Art von Sichten geben';

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

@@ -3,6 +3,7 @@ create table user_sichten(
 	userinfo_id INTEGER  not null, 
 sicht_name_intern NCHAR(200)  not null, 
 external_entry smallint  default 0 
+, primary key (userinfo_id, sicht_name_intern)
 );
 	
 comment on column user_sichten.external_entry is 'Recht wird von externem System [HISinOne] gesetzt und entfernt';

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

@@ -5,5 +5,6 @@ userid INTEGER  not null,
 fieldname NCHAR(255)  not null, 
 value NCHAR(255) , 
 active integer  not null
+, primary key (tid)
 );