Merge branch 'RELEASE_kern5.3'

(cherry picked from commit d2e1c97034)

.classpath

@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <classpath>
 	<classpathentry kind="src" path="src"/>
-	<classpathentry kind="src" path="test-src"/>
 	<classpathentry exported="true" kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER">
 		<attributes>
 			<attribute name="module" value="true"/>
@@ -847,22 +846,85 @@
 			<attribute name="module" value="true"/>
 		</attributes>
 	</classpathentry>
-	<classpathentry kind="lib" path="superx/WEB-INF/lib_ext/servlet-api.jar"/>
-	<classpathentry kind="lib" path="superx/WEB-INF/lib/jasperreports-6.20.0.jar"/>
-	<classpathentry kind="lib" path="superx/WEB-INF/lib/jasperreports-chart-customizers-6.20.0.jar"/>
-	<classpathentry kind="lib" path="superx/WEB-INF/lib/jasperreports-chart-themes-6.20.0.jar"/>
-	<classpathentry kind="lib" path="superx/WEB-INF/lib/jasperreports-custom-visualization-6.20.0.jar"/>
-	<classpathentry kind="lib" path="superx/WEB-INF/lib/jasperreports-fonts-6.20.0.jar"/>
-	<classpathentry kind="lib" path="superx/WEB-INF/lib/jasperreports-functions-6.20.0.jar"/>
-	<classpathentry kind="lib" path="superx/WEB-INF/lib/jasperreports-javaflow-6.20.0.jar"/>
-	<classpathentry kind="lib" path="superx/WEB-INF/lib/jasperreports-metadata-6.20.0.jar"/>
-	<classpathentry kind="lib" path="superx/WEB-INF/lib/net.tascalate.javaflow.api-2.2.1.jar"/>
-	<classpathentry kind="lib" path="superx/WEB-INF/lib/freemarker-2.3.25.jar"/>
-	<classpathentry kind="lib" path="superx/WEB-INF/lib/postgresql-42.2.19.jar"/>
-	<classpathentry kind="lib" path="superx/WEB-INF/lib/saxon-he-10.5.jar"/>
-	<classpathentry kind="lib" path="superx/WEB-INF/lib/saxon-xqj-10.5.jar"/>
-	<classpathentry kind="lib" path="superx/WEB-INF/lib/saxon-he-test-10.5.jar"/>
-	<classpathentry kind="lib" path="superx/WEB-INF/lib/ifxjdbc-4.50.4.1.jar"/>
-	<classpathentry kind="lib" path="superx/WEB-INF/lib/commons-csv-1.8.jar"/>
+	<classpathentry kind="lib" path="superx/WEB-INF/lib_ext/servlet-api.jar">
+		<attributes>
+			<attribute name="module" value="true"/>
+		</attributes>
+	</classpathentry>
+	<classpathentry kind="lib" path="superx/WEB-INF/lib/jasperreports-6.20.0.jar">
+		<attributes>
+			<attribute name="module" value="true"/>
+		</attributes>
+	</classpathentry>
+	<classpathentry kind="lib" path="superx/WEB-INF/lib/jasperreports-chart-customizers-6.20.0.jar">
+		<attributes>
+			<attribute name="module" value="true"/>
+		</attributes>
+	</classpathentry>
+	<classpathentry kind="lib" path="superx/WEB-INF/lib/jasperreports-custom-visualization-6.20.0.jar">
+		<attributes>
+			<attribute name="module" value="true"/>
+		</attributes>
+	</classpathentry>
+	<classpathentry kind="lib" path="superx/WEB-INF/lib/jasperreports-fonts-6.20.0.jar">
+		<attributes>
+			<attribute name="module" value="true"/>
+		</attributes>
+	</classpathentry>
+	<classpathentry kind="lib" path="superx/WEB-INF/lib/jasperreports-functions-6.20.0.jar">
+		<attributes>
+			<attribute name="module" value="true"/>
+		</attributes>
+	</classpathentry>
+	<classpathentry kind="lib" path="superx/WEB-INF/lib/jasperreports-javaflow-6.20.0.jar">
+		<attributes>
+			<attribute name="module" value="true"/>
+		</attributes>
+	</classpathentry>
+	<classpathentry kind="lib" path="superx/WEB-INF/lib/jasperreports-metadata-6.20.0.jar">
+		<attributes>
+			<attribute name="module" value="true"/>
+		</attributes>
+	</classpathentry>
+	<classpathentry kind="lib" path="superx/WEB-INF/lib/net.tascalate.javaflow.api-2.2.1.jar">
+		<attributes>
+			<attribute name="module" value="true"/>
+		</attributes>
+	</classpathentry>
+	<classpathentry kind="lib" path="superx/WEB-INF/lib/freemarker-2.3.25.jar">
+		<attributes>
+			<attribute name="module" value="true"/>
+		</attributes>
+	</classpathentry>
+	<classpathentry kind="lib" path="superx/WEB-INF/lib/postgresql-42.2.19.jar">
+		<attributes>
+			<attribute name="module" value="true"/>
+		</attributes>
+	</classpathentry>
+	<classpathentry kind="lib" path="superx/WEB-INF/lib/saxon-he-10.5.jar">
+		<attributes>
+			<attribute name="module" value="true"/>
+		</attributes>
+	</classpathentry>
+	<classpathentry kind="lib" path="superx/WEB-INF/lib/saxon-xqj-10.5.jar">
+		<attributes>
+			<attribute name="module" value="true"/>
+		</attributes>
+	</classpathentry>
+	<classpathentry kind="lib" path="superx/WEB-INF/lib/saxon-he-test-10.5.jar">
+		<attributes>
+			<attribute name="module" value="true"/>
+		</attributes>
+	</classpathentry>
+	<classpathentry kind="lib" path="superx/WEB-INF/lib/ifxjdbc-4.50.4.1.jar">
+		<attributes>
+			<attribute name="module" value="true"/>
+		</attributes>
+	</classpathentry>
+	<classpathentry kind="lib" path="superx/WEB-INF/lib/commons-csv-1.8.jar">
+		<attributes>
+			<attribute name="module" value="true"/>
+		</attributes>
+	</classpathentry>
 	<classpathentry kind="output" path="superx/WEB-INF/classes"/>
 </classpath>

src/de/memtext/util/CryptUtils.java

@@ -231,8 +231,7 @@ public class CryptUtils {
 
     private static void initDesCipher() throws NoSuchAlgorithmException,
             NoSuchPaddingException {
-        java.security.Security
-                .addProvider(new com.sun.crypto.provider.SunJCE());
+        //java.security.Security.addProvider(new com.sun.crypto.provider.SunJCE());
         desCipher = Cipher.getInstance("DES");
 
     }

src/de/superx/bin/fm/EtlStarter.java

@@ -4,6 +4,10 @@ import java.io.File;
 import java.io.IOException;
 import java.io.StringWriter;
 import java.io.Writer;
+import java.sql.Connection;
+import java.sql.PreparedStatement;
+import java.sql.ResultSet;
+import java.sql.SQLException;
 import java.util.Arrays;
 import java.util.HashMap;
 import java.util.List;
@@ -40,9 +44,11 @@ public class EtlStarter implements TemplateTransformModel {
 	private static Logger logger = Logger.getLogger(EtlStarter.class);
 	private String mandantenId = "default";
 	private LogLevel logLevel = LogLevel.BASIC;
-	   public EtlStarter(String mandantenId) {
-	        this.mandantenId = mandantenId;
-	    }
+
+	public EtlStarter(String mandantenId) {
+		this.mandantenId = mandantenId;
+	}
+
 	@Override
 	public Writer getWriter(Writer paramWriter, Map paramMap) throws TemplateModelException, IOException {
 		logger.info("**EtlStarter**");
@@ -61,11 +67,11 @@ public class EtlStarter implements TemplateTransformModel {
 		paramMap.remove(PARAM_KEY_COMP);
 		paramMap.remove(PARAM_KEY_STEP);
 		paramMap.remove(PARAM_LOGLEVEL);
-		
+
 		if (log_levelSc != null) {
 			this.logLevel = LogLevel.valueOf(log_levelSc.getAsString());
 		}
-		
+
 		Map<String, String> params = new HashMap<String, String>();
 		for (Object key : paramMap.keySet()) {
 			SimpleScalar value = (SimpleScalar) paramMap.get(key);
@@ -73,7 +79,49 @@ public class EtlStarter implements TemplateTransformModel {
 			logger.info("PARAM: " + key + " -> " + value.getAsString());
 		}
 
-		String moduleDir=SuperXManager.getModuleDir()+ File.separator + component + File.separator;
+		String moduleDir = SuperXManager.getModuleDir();
+		if (moduleDir == null || moduleDir.equals("")) {
+			if (System.getProperty("MODULE_PFAD") != null && !System.getProperty("MODULE_PFAD").toString().equals(""))
+				moduleDir = System.getProperty("MODULE_PFAD").toString();
+			else
+				throw new IOException(
+						"Module-Pfad kann nicht ermittelt werden, bitte setzen Sie den JVM Parameter -DMODULE_PFAD=...");
+		}
+		String jobFilePath = null;
+		if (component.contentEquals("manual")) {
+			jobFilePath = getFilePathFromDatabase(etl_step, moduleDir);
+		} else {
+			jobFilePath = getFilePathFromModule(component, etl_step, moduleDir);
+		}
+		logger.info("Kettle job: " + jobFilePath);
+		kettleCallEmbedded(jobFilePath, params);
+		return null;
+	}
+	
+		private String getFilePathFromDatabase(String etl_step, String moduleDir) throws IOException {
+		String jobFilePath = null;
+		try (Connection con = SxPools.get(mandantenId).getConnection();
+				PreparedStatement pst = con.prepareStatement("select filepath from sx_jobs where uniquename=?")) {
+			pst.setString(1, etl_step);
+			ResultSet rs = pst.executeQuery();
+			while (rs.next()) {
+				jobFilePath = rs.getString(1);
+			}
+			rs.close();
+		} catch (SQLException e) {
+			e.printStackTrace();
+			throw new IOException("Fehler beim Auslesen von sx_jobs mit uniquename " + etl_step + " " + e);
+		}
+		if (jobFilePath == null) {
+			throw new IOException(
+					"Fehler beim Auslesen von sx_jobs mit uniquename " + etl_step + " Kein Eintrag gefunden");
+		}
+		return moduleDir + File.separator + jobFilePath;
+	}
+
+	private String getFilePathFromModule(String component, String etl_step, String moduleDir)
+			throws TemplateModelException {
+		moduleDir += File.separator + component + File.separator;
 		if (!(new File(moduleDir)).exists()) {
 			throw new TemplateModelException("Component not found: " + component);
 		}
@@ -96,44 +144,39 @@ public class EtlStarter implements TemplateTransformModel {
 		}
 		String fileAttr = etl.attributeValue("file");
 		String jobFilePath = moduleDir + fileAttr.substring(fileAttr.indexOf('/') + 1);
-		logger.info("Kettle job: " + jobFilePath);
-		kettleCallEmbedded(jobFilePath, params);
-		return null;
+		return jobFilePath;
 	}
 
 	/**
 	 * Abarbeiten des Kettle Jobs mit kettle (Embedded).
 	 * 
-	 * @param jobfile
-	 *            Dateiname des Jobs
-	 * @param jobtype
-	 *            ktr=Transformation, kjb=Job
-	 * @param params
-	 *            Parameter
+	 * @param jobfile Dateiname des Jobs
+	 * @param jobtype ktr=Transformation, kjb=Job
+	 * @param params  Parameter
 	 * @throws Exception
 	 */
 	final StringBuffer kettleCallEmbedded(final String jobfile, final Map<String, String> jobParams) {
-		return kettleCallEmbedded("default",jobfile, jobParams, true);
+		return kettleCallEmbedded("default", jobfile, jobParams, true);
 	}
 
 	/**
 	 * Abarbeiten des Kettle Jobs mit kettle (Embedded).
 	 * 
-	 * @param jobfile
-	 *            Dateiname des Jobs
-	 * @param params
-	 *            Parameter
-	 *            @param isPostgres - für Metainformationen, wenn false dann wird Informix genommen
-	 *            @return StringBuffer mit Logging für Ausgabe im Browser
+	 * @param jobfile    Dateiname des Jobs
+	 * @param params     Parameter
+	 * @param isPostgres - für Metainformationen, wenn false dann wird Informix
+	 *                   genommen
+	 * @return StringBuffer mit Logging für Ausgabe im Browser
 	 * @throws Exception
 	 */
-	public final StringBuffer kettleCallEmbedded(final String mandantenID,final String jobfile, final Map<String, String> jobParams, boolean isPostgres) {
+	public final StringBuffer kettleCallEmbedded(final String mandantenID, final String jobfile,
+			final Map<String, String> jobParams, boolean isPostgres) {
 		StringWriter writer = new StringWriter();
-		WriterAppender appender = new WriterAppender( new SimpleLayout(), writer );
-		org.apache.log4j.Level oldLevel=logger.getLevel();
+		WriterAppender appender = new WriterAppender(new SimpleLayout(), writer);
+		org.apache.log4j.Level oldLevel = logger.getLevel();
 		logger.setLevel(org.apache.log4j.Level.ALL);
-		logger.addAppender( appender );
-		
+		logger.addAppender(appender);
+
 		try {
 			// usually we initialize kettle env in EdustoreManager
 			// but this may not have happened if HIS1 not running
@@ -146,26 +189,29 @@ public class EtlStarter implements TemplateTransformModel {
 			}
 			JndiUtil.initJNDI();
 			MemoryMetaStore metastore = new MemoryMetaStore();
-            //Dies hatte für Mandantenbetrieb nicht funktioniert, daher Umstellung auf SxPool , s.u.      
-			//DataSourceProviderFactory.setDataSourceProviderInterface(new KettleDataSourceProvider(mandantenID,logger));
+			// Dies hatte für Mandantenbetrieb nicht funktioniert, daher Umstellung auf
+			// SxPool , s.u.
+			// DataSourceProviderFactory.setDataSourceProviderInterface(new
+			// KettleDataSourceProvider(mandantenID,logger));
 			/*
-			 * get all db connections configured in databases.xml as
-			 * DataSource's by name
+			 * get all db connections configured in databases.xml as DataSource's by name
 			 */
-			     			
-	            // Enumeration<String> dbNames =
+
+			// Enumeration<String> dbNames =
 			// this.dbhandlerPool.getLogicalDatabaseNames();
 			List<String> dbNames = Arrays.asList(new String[] { "eduetl" });
 			for (String dbName : dbNames) {
-			//	Dies hatte für Mandantenbetrieb nicht funktioniert, daher Umstellung auf SxPool , s.u. 
-			
-				//DatabaseMeta dbmeta = new DatabaseMeta(dbName, isPostgres ? "POSTGRESQL" : "INFORMIX", "JNDI", null, dbName, "1521", null, null);
-				DatabaseMeta dbmeta=SxPools.get(mandantenID).getKettleDatabaseMeta();
-					DatabaseMetaStoreUtil.createDatabaseElement(metastore, dbmeta);
-				
-				logger.info("Init pdi database connection " + dbName+" (DBName:"+dbmeta.getDatabaseName()+")");
+				// Dies hatte für Mandantenbetrieb nicht funktioniert, daher Umstellung auf
+				// SxPool , s.u.
+
+				// DatabaseMeta dbmeta = new DatabaseMeta(dbName, isPostgres ? "POSTGRESQL" :
+				// "INFORMIX", "JNDI", null, dbName, "1521", null, null);
+				DatabaseMeta dbmeta = SxPools.get(mandantenID).getKettleDatabaseMeta();
+				DatabaseMetaStoreUtil.createDatabaseElement(metastore, dbmeta);
+
+				logger.info("Init pdi database connection " + dbName + " (DBName:" + dbmeta.getDatabaseName() + ")");
 			}
-			
+
 			JobMeta jobMeta = new JobMeta(null, jobfile, null, metastore, null);
 			org.pentaho.di.job.Job job = new org.pentaho.di.job.Job(null, jobMeta);
 			job.setLogLevel(this.logLevel);
@@ -204,16 +250,16 @@ public class EtlStarter implements TemplateTransformModel {
 			logger.removeAppender(appender);
 			logger.setLevel(oldLevel);
 		}
-		
+
 		return writer.getBuffer();
 	}
-	
+
 	public static void main(String args[]) {
 		String jobfile = "file:///home/superx/data-integration/exceltest.kjb";
 		Map<String, String> jobParams = new HashMap<String, String>();
 		jobParams.put("PATH_TO_EXCELFILE", "/home/superx/tmp/testexcel2.xlsx");
 		EtlStarter es = new EtlStarter("default");
-		es.kettleCallEmbedded("default",jobfile, jobParams,false);
+		es.kettleCallEmbedded("default", jobfile, jobParams, false);
 	}
 
 }

src/de/superx/common/Field.java

@@ -338,61 +338,38 @@ public class Field extends NamedIdObject implements TemplateHashModel,
 
 	private void initCaptions() throws SQLException, DBServletException {
 		String capShort = "", capLong = "";
+		boolean capIsSet=false;
 
 		/*
-		 * String sql= "select locale,contents_short, contents_long " +
-		 * " from sx_captions " + " where table_name='felderinfo' " +
-		 * " and field_name='" + getName() +
-		 * "' and (record_no is null or record_no=" + getId() + ")" +
-		 * " and (locale ='" + locale.getLanguage() +
-		 * "' or locale is null or locale='' or locale='de')";
-		 * System.out.println(sql+" union\n"); SuperX_el field_el =
-		 * ServletUtils.executeALL_el( "Caption SQL durchführen", sql,
-		 * mandantenID);
+		 * Wenn ein Feld mehrere Captions hat wird nach der Prio
+		 * vorgegangen: Zuerst mit record_no=aktuelles Feld,
+		 * dann mit record_no=null. Das Resultset kommt entsprechend sortiert 
+		 * in diese Methode, und hier wird nur noch die locale geprüft:
 		 * 
-		 * SxResultSet rs = field_el.getResultSet();
 		 */
 		for (Iterator it = captionSet.iterator(); it.hasNext();) {
 			SxResultRow row = (SxResultRow) it.next();
 			// Feldname kontrollieren
-			if (row.get(0) == null || !row.get(0).equals(getName()))
+			if (row.get(0) == null || !row.get(0).equals(getName()) || capIsSet)
 				continue;
 			// falls vorhanden gewünschte Locale bevorzugen
-			if (row.get(1) != null
-					&& row.get(1).equals(locale.getLanguage().toString())) {
-				if (row.get(2) == null)
-					capShort = "";
-				else
-					capShort = row.get(2).toString();
-				if (row.get(3) == null)
-					capLong = "";
-				else
-					capLong = row.get(3).toString();
-			}
-			// ansonsten allgemeine Locale
-			if ((row.get(1) == null || row.get(1).equals(""))
-					&& capShort.equals("")) {
-				if (row.get(2) == null)
-					capShort = "";
-				else
-					capShort = row.get(2).toString();
-				if (row.get(3) == null)
-					capLong = "";
-				else
-					capLong = row.get(3).toString();
+			String availableLocale=(String) row.get(1);
+			if(availableLocale==null || availableLocale.equals("") || availableLocale.equals(locale.getLanguage().toString()))
+			{
+				capShort= row.get(2) != null ? row.get(2).toString():"";
+				capLong= row.get(3) != null ? row.get(3).toString():"";
+				capIsSet=true;
 			}
-			// wenn immer noch nix Deutsche loake
-			if ((row.get(1) != null && row.get(1).equals("de"))
-					&& capShort.equals("")) {
-				if (row.get(2) == null)
-					capShort = "";
-				else
-					capShort = row.get(2).toString();
-				if (row.get(3) == null)
-					capLong = "";
-				else
-					capLong = row.get(3).toString();
+			// wenn immer noch nix Deutsche locale
+			if(!capIsSet)
+			{
+				if(availableLocale!=null && availableLocale.equals("de"))
+					capShort= row.get(2) != null ? row.get(2).toString():"";
+					capLong= row.get(3) != null ? row.get(3).toString():"";
+					capIsSet=true;
+					
 			}
+			
 		}
 		if (capShort != null && !capShort.equals(""))
 			setCaptionShort(capShort);
@@ -473,7 +450,7 @@ public class Field extends NamedIdObject implements TemplateHashModel,
 	}
 
 	private void setDefaultwertString(String df) throws SQLException {
-		this.defaultwertString = SxPools.get(mandantenID).checkImports(df);
+		this.defaultwertString = SxPools.get(mandantenID).checkImports(df,maskennummer.toString());
 
 	}
 
@@ -830,7 +807,7 @@ public class Field extends NamedIdObject implements TemplateHashModel,
 	public void setRelation(String relation) throws SQLException {
 		if (relation != null && relation.trim().equals(""))
 			relation = null; 
-		this.relation = SxPools.get(mandantenID).checkImports(relation);
+		this.relation = SxPools.get(mandantenID).checkImports(relation,maskennummer.toString());
 
 	}
 

src/de/superx/common/Maske.java

@@ -632,11 +632,11 @@ public class Maske extends NamedIdObject implements Serializable {
 		setName(maskRow.get(1).toString());
 
 		String tmp_select_stmt = "" + (String) maskRow.get(2);
-		tmp_select_stmt=tmp_select_stmt.replaceAll("<<Maskennummer>>", this.getId().toString());
+		//tmp_select_stmt=tmp_select_stmt.replaceAll("<<Maskennummer>>", this.getId().toString());
 		String tmp_xil = "" + (String) maskRow.get(3);
-		tmp_xil=tmp_xil.replaceAll("<<Maskennummer>>", this.getId().toString());
+		//tmp_xil=tmp_xil.replaceAll("<<Maskennummer>>", this.getId().toString());
 		String tmp_cleanup = "" + (String) maskRow.get(4);
-		tmp_cleanup=tmp_cleanup.replaceAll("<<Maskennummer>>", this.getId().toString());
+		//tmp_cleanup=tmp_cleanup.replaceAll("<<Maskennummer>>", this.getId().toString());
 		if (tmp_select_stmt.indexOf("<sximport type=\"select_stmt,cleanup,xil_proplist\">") > -1) {
 			int sourceMask = getTmpMaskNr(tmp_select_stmt);
 
@@ -644,16 +644,16 @@ public class Maske extends NamedIdObject implements Serializable {
 			tmp_cleanup = "<sximport>select cleanup_stmt from maskeninfo where tid=" + sourceMask+"</sximport>";
 			tmp_xil = "<sximport>select xil_proplist from maskeninfo where tid=" + sourceMask+"</sximport>";
 		}
-		select_stmt = SxPools.get(mandantenID).checkImports(tmp_select_stmt);
-		xilString = SxPools.get(mandantenID).checkImports(tmp_xil);
-		cleanup_stmt = SxPools.get(mandantenID).checkImports(tmp_cleanup);
+		select_stmt = SxPools.get(mandantenID).checkImports(tmp_select_stmt,this.getId().toString());
+		xilString = SxPools.get(mandantenID).checkImports(tmp_xil,this.getId().toString());
+		cleanup_stmt = SxPools.get(mandantenID).checkImports(tmp_cleanup,this.getId().toString());
 
 		standString = SqlStringUtils.getValueAsString(maskRow.get(7));
 
 		chartx = SqlStringUtils.getValueAsString(maskRow.get(8));
 		charty = SqlStringUtils.getValueAsString(maskRow.get(9));
-		explanation = SxPools.get(mandantenID).checkImports((String) maskRow.get(10));
-		setHinweis(SxPools.get(mandantenID).checkImports((String) maskRow.get(11)));
+		explanation = SxPools.get(mandantenID).checkImports((String) maskRow.get(10),this.getId().toString());
+		setHinweis(SxPools.get(mandantenID).checkImports((String) maskRow.get(11),this.getId().toString()));
 		setHinweisCaption(getHinweis());
 
 	}
@@ -870,6 +870,7 @@ public class Maske extends NamedIdObject implements Serializable {
 		result.append("<UserID admin=\"" + (user.isAdmin() ? "true" : "false") + "\">" + user.getId().toString()
 				+ "</UserID>\n");
 		result.append(addGeneralInfo());
+		result.append(ServletUtils.addCustomElementsToXml(mandantenID));
 		if (user != null) {
 			result.append(user.getThemenbaum().getMenupath(this.getId().toString()));
 			if (showNavigation) {
@@ -1063,6 +1064,7 @@ public class Maske extends NamedIdObject implements Serializable {
 		// link back to home page
 		addBacklink(request, result);
 		result.append(addGeneralInfo());
+		result.append(ServletUtils.addCustomElementsToXml(mandantenID));
 		result.append(getStylesheetXml());
 		result.append(getMaskResult(user, request, dbCon));
 		result.append("</ergebnisse>\n");
@@ -1194,7 +1196,11 @@ public class Maske extends NamedIdObject implements Serializable {
 				rownr++;
 			// completeFields.append(FieldXmlEncoder.toXml(feld,isFullXMLRequired
 			// ,rownr));
-			completeFields.append("<feld varname=\"" + feld.getName() + "\" art=\"" + feld.getArt() + "\">"
+			String isHiddenAttr="";
+			if(feld.getAttribut().equalsIgnoreCase("hidden") || feld.getArt()==13)
+				isHiddenAttr=" hidden=\"true\" ";
+			completeFields.append("<feld varname=\"" + feld.getName() + "\" art=\"" + feld.getArt() + "\""+ isHiddenAttr 
+					+ " zeilenanzahl=\""+ feld.getZeilenanzahl()+"\">"
 					+ feld.getValueXml() + "<caption_short><![CDATA[" + feld.getCaptionShort() + "]]></caption_short>"
 					+ "<caption_long><![CDATA[" + feld.getCaptionLong() + "]]></caption_long>" + "</feld>\n");
 		}
@@ -2026,6 +2032,22 @@ public class Maske extends NamedIdObject implements Serializable {
 						"Hinzufügen von " + key + ":\n " + customadd + DateUtils.getNowString());
 				result.append(customadd);
 			}
+			if (key.startsWith("CUSTOM_CSS")) {
+				String customcss = ((RepositoryItemCollection) SxPools.get(mandantenID).getRepository().get(key))
+						.get("content").toString();
+				if(customcss!=null && !customcss.trim().equals(""))
+				{
+					result.append("<custom_css><style type=\"text/css\"><![CDATA["+customcss+"]]></style></custom_css>");
+				}
+			}
+			if (key.startsWith("CUSTOM_JS")) {
+				String customjs = ((RepositoryItemCollection) SxPools.get(mandantenID).getRepository().get(key))
+						.get("content").toString();
+				if(customjs!=null && !customjs.trim().equals(""))
+					{
+					result.append("<custom_js><script language=\"javascript\"><![CDATA["+customjs+"]]></script></custom_js>");
+					}
+			}
 		}
 
 	}
@@ -2554,16 +2576,23 @@ public class Maske extends NamedIdObject implements Serializable {
 	}
 
 	/**
-	 * Normalerweise Maskenname nur bei JasperReports der Stylesheetname
-	 * 
-	 * @return
-	 */
-	public String getExportName() {
-		String result = getName();
-		if (selectedTableStylesheet != null && selectedTableStylesheet.getFilename().indexOf(".jrxml") > -1)
-			result = selectedTableStylesheet.getCaption();
-		return result;
-	}
+     * Normalerweise Maskenname nur bei JasperReports der Stylesheetname
+     * 
+     * @return
+     */
+    public String getExportName() {
+        String result = getName();
+        if (selectedTableStylesheet != null && selectedTableStylesheet.getFilename().indexOf(".jrxml") > -1) result = selectedTableStylesheet.getCaption();
+        if (map.containsKey("exportfilename"))
+        {
+            if (map.get("exportfilename")==null||map.get("exportfilename").toString().trim().equals(""))
+            {
+                throw new IllegalStateException("Die Maske definiert exportfilename, dieser ist aber leer. Masken-SQL prüfen");
+            }
+            result=map.get("exportfilename").toString();
+        }
+        return result;
+    }
 
 	public String getFullTableXml(String mandantenId, SxUser sxuser, HttpServletRequest request, Locale locale)
 			throws TransformerConfigurationException, TemplateException, IOException, SQLException,
@@ -2607,79 +2636,69 @@ public class Maske extends NamedIdObject implements Serializable {
 	}
 
 	public StringBuffer getCSV(String mandantenID) throws IOException {
-		String fld_delim1 = "";
-		String fld_delim2 = ";";
-		String row_delim1 = "";
-		String row_delim2 = "\n";// we only user unix newline, even under DOS
-		String outFormat = "txt";
-		// File f = File.createTempFile("tmp", ".csv");
-		// FileWriter fw = new FileWriter(f);
-		// BufferedWriter bfw = new BufferedWriter(fw);
-		StringBuffer result = new StringBuffer();
-		StringBuffer line = new StringBuffer("");
-		int cols = this.getResult_el().getColumnCount();
-
-		// header
-		// for (int i = 0; i < cols; i++) {
-		// String colname=this.getResult_el().getResultSet().getColumnName(i);
-		// line.append(colname+fld_delim2);
-		// }
-		List headerlist = getHeaderCaptionList(mandantenID, true);
-		for (Iterator it = headerlist.iterator(); it.hasNext();) {
-			String headername = it.next() + fld_delim2;
-			headername = headername.replaceAll("   ", " ");
-			headername = headername.replaceAll("  ", " ");
-			line.append(headername);
-		}
-		line.append("\n");
-
-		// bfw.write(line.toString());
-		result.append(line);
-		// data
-		Iterator it = this.getResult_el().getResultSet().iterator();
-		while (it.hasNext()) {
-			SxResultRow row = (SxResultRow) it.next();
-			line.setLength(0);
-			for (int i = 1; i <= cols; i++) {
-				Object o = row.get(i - 1);
-
-				// aus SxTransformer.printResult
-				String f_wert = SxDBUtils.field_value(o);
-				// MB spezifisch statt . ein , als Decimaltrenner
-				if (o instanceof Float || o instanceof Double || o instanceof BigDecimal)
-					f_wert = o.toString().replace('.', ',');
-				// MB Spezifisch Ende
-
-				if (outFormat.equals("xml")
-						&& (f_wert.indexOf("&") > -1 || f_wert.indexOf("<") > -1 || f_wert.indexOf(">") > -1))
-					f_wert = "<![CDATA[" + f_wert + "]]>";
-				// wenn der Feldwert zufällig das Zeichen
-				// "\" enthält, wird es mit "\" maskiert
-				if (outFormat.equals("txt") && f_wert != null && (f_wert.indexOf("\\n") > -1)) {
-					f_wert = de.memtext.util.StringUtils.replace(f_wert, "\\n", "\\\\n");
-				}
-				// wenn der Feldwert zufällig das Trennzeichen enthält, wird es
-				// mit "\" maskiert
-				if (outFormat.equals("txt") && f_wert != null && (f_wert.indexOf(fld_delim2) > -1))
-					f_wert = de.memtext.util.StringUtils.replace(f_wert, fld_delim2, "\\" + fld_delim2);
-				if (i < cols)
-					line.append(fld_delim1 + f_wert + fld_delim2);
-				else {
-					line.append(fld_delim1 + f_wert + fld_delim2);
-					line.append(row_delim2);
-				}
-				// aus SxTransformer.printResult
-
-			}
-			// bfw.write(line.toString());
-			result.append(line);
-		}
-
-		// bfw.close();
-		// fw.close();
-		// return f;
-		return result;
-	}
+        String fld_delim1 = "";
+        String fld_delim2 = "^";
+        boolean isCSV_Excel_ISO=false;
+       if (SxPools.get(mandantenID).getRepository().containsKey("K_CSV_Excel_ISO")&&SxPools.get(mandantenID).getRepository().get("K_CSV_Excel_ISO").toString().equals("1"))
+       {
+        	fld_delim2 = ";";
+        	isCSV_Excel_ISO=true;
+       }
+        String row_delim1 = "";
+        String row_delim2 = "\n";// we only user unix newline, even under DOS
+        String outFormat = "txt";
+        StringBuffer result = new StringBuffer();
+        StringBuffer line = new StringBuffer("");
+        int cols = this.getResult_el().getColumnCount();
+
+        // header
+        List headerlist = getHeaderCaptionList(mandantenID, true);
+        for (Iterator it = headerlist.iterator(); it.hasNext();) {
+            String headername = it.next() + fld_delim2;
+            headername = headername.replaceAll("   ", " ");
+            headername = headername.replaceAll("  ", " ");
+            line.append(headername);
+        }
+        line.append("\n");
+
+        result.append(line);
+        // data
+        Iterator it = this.getResult_el().getResultSet().iterator();
+        while (it.hasNext()) {
+            SxResultRow row = (SxResultRow) it.next();
+            line.setLength(0);
+            for (int i = 1; i <= cols; i++) {
+                Object o = row.get(i - 1);
+
+                // aus SxTransformer.printResult
+                String f_wert = SxDBUtils.field_value(o);
+                // MB spezifisch statt . ein , als Decimaltrenner
+                if (o instanceof Float || o instanceof Double || o instanceof BigDecimal) f_wert = o.toString().replace('.', ',');
+                // MB Spezifisch Ende
+
+                if (outFormat.equals("xml") && (f_wert.indexOf("&") > -1 || f_wert.indexOf("<") > -1 || f_wert.indexOf(">") > -1)) f_wert = "<![CDATA[" + f_wert + "]]>";
+               //wenn der Feldwert einen Zeilenumbruch oder Trennzeichen enthält wird der Test in "" gesetzt -> für CSV Import
+                if (outFormat.equals("txt") && f_wert != null && !f_wert.trim().equals("") && (f_wert.indexOf("\n") > -1 || isCSV_Excel_ISO || f_wert.indexOf(fld_delim2) > -1)) {
+                		//CSV-Mode, d.h. Text-Trennzeichen wird drum herum gesetzt, und " im Text verdoppelt:
+                    f_wert = "\""+de.memtext.util.StringUtils.replace(f_wert,"\"","\"\"")+"\"";
+                }
+                if (outFormat.equals("txt") && f_wert != null && (f_wert.indexOf("\\n") > -1)) {
+                    f_wert = de.memtext.util.StringUtils.replace(f_wert, "\\n", "\\\\n");
+                }
+                 if (i < cols)
+                    line.append(fld_delim1 + f_wert + fld_delim2);
+                else {
+                    line.append(fld_delim1 + f_wert + fld_delim2);
+                    line.append(row_delim2);
+                }
+                // aus SxTransformer.printResult
+
+            }
+            result.append(line);
+        }
+
+        return result;
+    }
 
 	public void updateDynamicSichten(Field f, SxUser user) throws SQLException, DBServletException,
 			KeyParentEqualException, CloneNotSupportedException, NoMainEntryException, TemplateException, IOException {

src/de/superx/servlet/ServletUtils.java

@@ -9,6 +9,7 @@ import java.text.ParseException;
 import java.text.SimpleDateFormat;
 import java.util.Collection;
 import java.util.Enumeration;
+import java.util.HashMap;
 import java.util.Hashtable;
 import java.util.Iterator;
 import java.util.List;
@@ -31,10 +32,14 @@ import de.memtext.util.DateUtils;
 import de.memtext.util.ServletHelper;
 import de.memtext.util.StringUtils;
 import de.superx.common.DBServletException;
+import de.superx.common.RepositoryItemCollection;
 import de.superx.common.SuperX_el;
 import de.superx.common.SxResultSet;
+import de.superx.common.SxUser;
 import de.superx.common.TranslationContainer;
 import de.superx.util.SqlStringUtils;
+import freemarker.template.TemplateException;
+import freemarker.template.TemplateModelException;
 
 /**
  * @author Daniel Quathamer Projektgruppe SuperX ServletUtils.java @ Diese
@@ -583,6 +588,48 @@ public class ServletUtils {
 	}
 		return result;
 	}
+	public static StringBuffer addCustomElementsToXml(String mandantenID)
+			 {
+		StringBuffer result = new StringBuffer("");
+		Iterator it = SxPools.get(mandantenID).getRepository().keySet().iterator();
+		while (it.hasNext()) {
+			String key = (String) it.next();
+			
+			if (key.startsWith("CUSTOM_CSS")) {
+				String customcss="";
+				try {
+					customcss = ((RepositoryItemCollection) SxPools.get(mandantenID).getRepository().get(key))
+							.get("content").toString();
+				} catch (TemplateModelException e) {
+					// TODO Auto-generated catch block
+					e.printStackTrace();
+				}
+				if(customcss!=null && !customcss.trim().equals(""))
+				{
+					result.append("<custom_css><style type=\"text/css\"><![CDATA["+customcss+"]]></style></custom_css>");
+				}
+			}
+			if (key.startsWith("CUSTOM_JS")) {
+				String customjs="";
+				try {
+					customjs = ((RepositoryItemCollection) SxPools.get(mandantenID).getRepository().get(key))
+							.get("content").toString();
+				} catch (TemplateModelException e) {
+					// TODO Auto-generated catch block
+					e.printStackTrace();
+				}
+				if(customjs!=null && !customjs.trim().equals(""))
+					{
+					result.append("<custom_js><script language=\"javascript\"><![CDATA["+customjs+"]]></script></custom_js>");
+					}
+			}
+		}
+		
+			
+		
+		return result;
+
+	}
 }
 
 // Created on 15.01.2004

src/de/superx/servlet/SuperXManager.java

@@ -75,7 +75,7 @@ public class SuperXManager extends HttpServlet {
 
 	private static String pageBeginning = htmlPageHead("Webanwendung Manager")+"<h1 align=center>SuperX Manager</h1><center>"
 			+ "SuperX @version@ (build:@sxtimestamp@)" + "</center>";
-	private static String pageEnd = "</body></html>";
+	public static String pageEnd = "</div></body></html>";
 	public static StringBuffer activityLog = new StringBuffer();
 	// letzter maskensql bevor FreeMarker loslegte
 	private static String lastFMMaskenSql;
@@ -777,7 +777,7 @@ public class SuperXManager extends HttpServlet {
 	                    "<META HTTP-EQUIV=\"CACHE-CONTROL\" CONTENT=\"NO-CACHE\" />"
                             + " <META HTTP-EQUIV=\"PRAGMA\" CONTENT=\"NO-CACHE\" />"
                             + " <META HTTP-EQUIV=\"EXPIRES\" CONTENT=\"0\"/>"+
-                    "<link rel=\"stylesheet\" type=\"text/css\" href=\"../xml/superxml_html.css\" /></head>\n<body>\n";
+                    "<link rel=\"stylesheet\" type=\"text/css\" href=\"../xml/superxml_html.css\" /></head>\n<body><div class=\"box\">\n";
 	    if (isHis1) {
                       ret += "<link rel='stylesheet' type='text/css' href='/superx/xml/his1/css/HISinOne.css'>\n"
                     +"<a href='/superx/servlet/SuperXmlAbmeldung' target='_parent' style='cursor:pointer; font-weight: bold;' class='ui-link'>Abmelden von Standardberichte</a>";

src/de/superx/servlet/SuperXmlPwChanger.java

@@ -80,9 +80,10 @@ public class SuperXmlPwChanger extends HttpServlet {
         } else {
 
             response.setContentType("text/html; charset="+SqlStringUtils.getEncoding());
+            output.write(de.superx.servlet.SuperXManager.htmlPageHead("Passwort ändern"));
             output.write(UserInitializer
                     .getPwChangeHtml("<h3 class=\"title\">Passwort &auml;ndern</h3>"));
-
+            output.write(de.superx.servlet.SuperXManager.pageEnd);
         }
         output.flush();
         output.close();

src/de/superx/servlet/SuperXmlTabelle.java

@@ -511,7 +511,7 @@ public class SuperXmlTabelle extends AbstractSuperXServlet {
             response.reset();
             //response.setContentType("application/vnd.ms-excel");
             response.setContentType("application/vnd.openxmlformats-officedocument.spreadsheetml.sheet");
-            response.setHeader("Content-disposition", "attachment; filename=" + FileUtils.removeProblemChars(maske.getName()) + ".xlsx");
+            response.setHeader("Content-disposition", "attachment; filename=" + FileUtils.removeProblemChars(maske.getExportName()) + ".xlsx");
             response.setHeader("Cache-Control", "expires=0");
             response.setContentLength(outStream.size());
             ServletOutputStream sos;
@@ -716,7 +716,7 @@ public class SuperXmlTabelle extends AbstractSuperXServlet {
             SuperXManager.setLastXmlMandantid(request.getSession().getAttribute("MandantenID").toString());
             XmlTransformer xmlTransformer = new XmlTransformer(getServletConfig(), request, response, getMandantenID(), getBrowser());
             xmlTransformer.setMaske(maske);
-            xmlTransformer.transform(maske.getName(), maske.getTmpFiles(), currentXml, desiredLocale, maske.getSelectedTableStylesheetFilename(), "text/html",
+            xmlTransformer.transform(maske.getExportName(), maske.getTmpFiles(), currentXml, desiredLocale, maske.getSelectedTableStylesheetFilename(), "text/html",
                                      ServletHelper.getParameter(request, "encrypt"));
 
 
@@ -931,7 +931,7 @@ public class SuperXmlTabelle extends AbstractSuperXServlet {
                     // neu MB
                     if (maske.getSelectedTableStylesheetFilename() != null && maske.getSelectedTableStylesheetFilename().equals("tabelle_xml.xsl")) {
                         response.setContentType("application/x-xml; charset=" + SqlStringUtils.getEncoding());
-                        response.setHeader("Content-disposition", "attachment; filename=" + FileUtils.removeProblemChars(maske.getName()) + ".xml");
+                        response.setHeader("Content-disposition", "attachment; filename=" + FileUtils.removeProblemChars(maske.getExportName()) + ".xml");
                         response.setHeader("Cache-Control", "expires=0");
                         // hier wird für xml-output localiziert für andere
                         // formate in xmlTransformer könnte
@@ -1021,7 +1021,7 @@ public class SuperXmlTabelle extends AbstractSuperXServlet {
 
                             // open browser download dialogue
                                 response.setContentType("application/x-xml; charset=" + SqlStringUtils.getEncoding());
-                        		response.setHeader("Content-disposition", "attachment; filename=" + FileUtils.removeProblemChars(maske.getName()) + filename_extension);
+                        		response.setHeader("Content-disposition", "attachment; filename=" + FileUtils.removeProblemChars(maske.getExportName()) + filename_extension);
                         		response.setHeader("Cache-Control", "expires=0");
                         	}
                         }
@@ -1029,7 +1029,7 @@ public class SuperXmlTabelle extends AbstractSuperXServlet {
 								getServletConfig(), request, response,
 								getMandantenID(), getBrowser());
 						xmlTransformer.setMaske(maske);
-						xmlTransformer.transform(maske.getName(),
+						xmlTransformer.transform(maske.getExportName(),
 								maske.getTmpFiles(), currentXml, desiredLocale,
 								maske.getSelectedTableStylesheetFilename(),
 								maske.getSelectedTableStylesheetContenttype(contenttype),
@@ -1069,14 +1069,29 @@ public class SuperXmlTabelle extends AbstractSuperXServlet {
         }
 
         private void csvExport() throws IOException {
-        	/* Spezieller ISO Export für MS Excel*/
-            StringBuffer csv = maske.getCSV(getMandantenID());
-            String outp = new String(csv.toString().getBytes("iso-8859-1"));
-            response.setHeader("Content-disposition", "attachment; filename=" + FileUtils.removeProblemChars(maske.getName()) + ".csv");
-            response.setHeader("Cache-Control", "expires=0");
-            response.setHeader("ContentType", "text/plain"); //; charset=ISO-8859-1
-            sendBackIso(csv.toString(), "text/csv; charset=ISO-8859-1");
+        	/* Spezieller ISO Export für MS Excel für FH DO*/
+        	StringBuffer csv = maske.getCSV(getMandantenID());
+        	String outp;
+            if (SxPools.get(getMandantenID()).getRepository().containsKey("K_CSV_Excel_ISO")&&SxPools.get(getMandantenID()).getRepository().get("K_CSV_Excel_ISO").toString().equals("1"))
+            {
+                outp = new String(csv.toString().getBytes("iso-8859-1"));
+                response.setHeader("Content-disposition", "attachment; filename=" + FileUtils.removeProblemChars(maske.getExportName()) + ".csv");
+                response.setHeader("Cache-Control", "expires=0");
+                response.setHeader("ContentType", "text/plain"); //; charset=ISO-8859-1
+                sendBackIso(csv.toString(), "text/csv; charset=ISO-8859-1");
+           }
+            else
+            {
+            	//Format bis 2024.06:
+            	
+                response.setHeader("Content-disposition", "attachment; filename=" + FileUtils.removeProblemChars(maske.getExportName()) + ".csv");
+                response.setHeader("Cache-Control", "expires=0");
 
+                sendBack(csv.toString(), "text/csv");
+
+            }
+
+ 
         }
         void sendBackIso(String txt, String contenttype) throws IOException {
 
@@ -1871,7 +1886,7 @@ public class SuperXmlTabelle extends AbstractSuperXServlet {
             StringReader s1 = new StringReader(currentXml);
             transformer.setOutputProperty(javax.xml.transform.OutputKeys.ENCODING, SqlStringUtils.getEncoding());
             transformer.setOutputProperty(javax.xml.transform.OutputKeys.METHOD, "xml");
-            
+             
             String result = null;
             if (params != null)
             	{
@@ -1889,23 +1904,41 @@ public class SuperXmlTabelle extends AbstractSuperXServlet {
             }
             String rptContentype=request.getParameter("RPTContentype");
             String rptPageFormat=request.getParameter("RPTPageFormat");
-            if(rptPageFormat!=null && rptPageFormat.equalsIgnoreCase("a4"))
+            String rptPageFormatX=request.getParameter("RPTPageFormatX");
+            String rptPageFormatY=request.getParameter("RPTPageFormatY");
+          //X- und Y Werte haben höhere Prio, das ist flexibler:
+            transformer.setParameter("RPTContentype", rptContentype);
+            
+            if(rptPageFormatX!=null && !rptPageFormatX.equalsIgnoreCase("")
+            	&&rptPageFormatY!=null && !rptPageFormatY.equalsIgnoreCase(""))
+            		
+            {
+            		transformer.setParameter("seitenbreite", rptPageFormatX);
+            		transformer.setParameter("seitenhoehe", rptPageFormatY);
+            		
+            } 
+            else
+            {
+           if(rptPageFormat!=null && rptPageFormat.equalsIgnoreCase("a4"))
             {
             		transformer.setParameter("seitenbreite", "842");
             		transformer.setParameter("seitenhoehe", "595");
+            		
             }
             if(rptPageFormat!=null && rptPageFormat.equalsIgnoreCase("a3"))
             {
             		transformer.setParameter("seitenbreite", "1191");
             		transformer.setParameter("seitenhoehe", "842");
+            		
             } 
+            }
             transformer.transform(new javax.xml.transform.stream.StreamSource(s1), new javax.xml.transform.stream.StreamResult(myOutwriter));
             if(rptContentype.equals("text/xml")) {
             	//JRXML-Sourcecode
         		String filename_extension=".jrxml";
         		OutputStream out = response.getOutputStream();
                 // open browser download dialogue
-            		response.setHeader("Content-disposition", "attachment; filename=" + FileUtils.removeProblemChars(maske.getName()) + filename_extension);
+            		response.setHeader("Content-disposition", "attachment; filename=" + FileUtils.removeProblemChars(maske.getExportName()) + filename_extension);
             		response.setHeader("Cache-Control", "expires=0");
             		
                     String jrxmlFileContent = de.memtext.util.FileUtils.getFileContentsWithEncoding(jrxmlFilePath, SqlStringUtils.getEncoding());

src/de/superx/servlet/SxPool.java

@@ -1553,9 +1553,10 @@ public class SxPool extends GenericObjectPool implements NamedObjectI {
 		return (ExternalPool) externalPools.getByName(epName);
 	}
 
-	public String checkImports(String input) throws SQLException {
+	public String checkImports(String input,String maskentid) throws SQLException {
 		String result = null;
 		if (input != null) {
+			input=input.replaceAll("<<Maskennummer>>",  maskentid);
 			StringBuffer work = new StringBuffer(input);
 			boolean importsFounds = input.indexOf("<sximport>") > -1;
 			if (importsFounds) {
@@ -1569,8 +1570,8 @@ public class SxPool extends GenericObjectPool implements NamedObjectI {
 					if (posende == -1)
 						throw new IllegalArgumentException("Tag sximport nicht ordentlich beendet");
 					String importInstruction = work.substring(posstart + 10, posende );
-
-					ResultSet rs = stm.executeQuery(importInstruction);
+					String importInstructionReplacedMaskenTid=importInstruction.replaceAll("<<Maskennummer>>",  maskentid);
+					ResultSet rs = stm.executeQuery(importInstructionReplacedMaskenTid);
 					boolean validReplaceText=false;
 					while (rs.next()) {
 						validReplaceText=true;

src/de/superx/servlet/Themenbaum.java

@@ -39,7 +39,9 @@ import de.superx.common.SuperX_el;
 import de.superx.common.SxResultRow;
 import de.superx.common.ThemenbaumI;
 import de.superx.common.TransletCache;
+import de.superx.servlet.ServletUtils;
 import de.superx.util.SqlStringUtils;
+import freemarker.template.TemplateModelException;
 
 public class Themenbaum implements ThemenbaumI, Serializable {
 
@@ -62,7 +64,12 @@ public class Themenbaum implements ThemenbaumI, Serializable {
 		this.login_name = login_name;
 		this.mandantenID = mandantenID;
 		this.isAdmin = isAdmin;
-		try {
+		
+	    /* klappt in 5.1 noch nicht: if (SxPools.get(mandantenID).getRepository().containsKey("K_aufklappbarer Themenbaum")&&SxPools.get(mandantenID).getRepository().get("K_aufklappbarer Themenbaum").toString().equals("1"))
+	        {
+	            menu.setAufklappbarerThemenbaum(true);
+	        }*/
+	      try {
 			// DQ 5.4.2007: transform-Methode war hier, ist ausgelagert nach
 			// toHtml
 			// wg. XML-Ausgabe des Themenbaums
@@ -99,12 +106,20 @@ public class Themenbaum implements ThemenbaumI, Serializable {
 	 * @throws NichtAngemeldetException 
 	 */
 	private StringBuffer getMenuXmlAndInitMenu() throws SQLException,
-			DBServletException, KeyParentEqualException, NoMainEntryException, NichtAngemeldetException {
+			DBServletException, KeyParentEqualException, NoMainEntryException,  NichtAngemeldetException {
 		StringBuffer result = new StringBuffer();
 		result.append("<menue hisinone_active=\""
 				+ (SuperXManager.isHis1 ? "true" : "false") + "\"\n" 
-				+ "hisinone_refapp=\"" + SuperXManager.his1_refapp
-				+  "\" showNavigation=\"true\">");
+				+ "hisinone_refapp=\"" + SuperXManager.his1_refapp+  "\" showNavigation=\"true\"");
+		if (SxPools.get(mandantenID).getRepository().containsKey("K_aufklappbarer Themenbaum")&&SxPools.get(mandantenID).getRepository().get("K_aufklappbarer Themenbaum").toString().equals("1"))
+		{
+			result.append(" aufklappbarer_themenbaum=\"true\"");
+		}
+		
+		result.append(">");
+		result.append(Maske.addGeneralInfo());
+		result.append(ServletUtils.addCustomElementsToXml(mandantenID));
+		
 		String welcomedPerson = login_name;
 		if (login_name == null || login_name.trim().equals(""))
 			welcomedPerson = userid.toString();
@@ -248,7 +263,7 @@ public class Themenbaum implements ThemenbaumI, Serializable {
 
 	private class Menu extends DefaultTreeModel {
 		private static final long serialVersionUID = 1L;
-
+		private boolean aufklappbarerThemenbaum=false;
 		public Menu(MenuItemNode root) {
 			super(root);
 		//printout();
@@ -267,6 +282,12 @@ public class Themenbaum implements ThemenbaumI, Serializable {
 			MenuItemNode n = getNode(tid);
 			return getMenupath(n);
 		}
+		public boolean isAufklappbarerThemenbaum() {
+		        return aufklappbarerThemenbaum;
+		    }
+	    public void setAufklappbarerThemenbaum(boolean aufklappbarerThemenbaum) {
+	        this.aufklappbarerThemenbaum = aufklappbarerThemenbaum;
+	    }
 		private String getMenupath(MenuItemNode n) {
 			
 			StringBuffer result = new StringBuffer("<menupos>\n<eintraege>\n");
@@ -322,10 +343,17 @@ public class Themenbaum implements ThemenbaumI, Serializable {
 		public String getSubmenuXml(String tid,String  navigationElement) {
 		    boolean showNavigation = !navigationElement.isEmpty();
 			StringBuffer result = new StringBuffer( "<?xml version=\"1.0\" encoding=\""+SqlStringUtils.getEncoding()+"\"?>\n<menue hisinone_active=\""
-						+ (SuperXManager.isHis1 ? "true" : "false") + "\" "
-						+ " hisinone_refapp=\"" + SuperXManager.his1_refapp+"\""
-						+ " showNavigation=\""+showNavigation+"\">\n");
+					+ (SuperXManager.isHis1 ? "true" : "false") + "\" "
+					+ " hisinone_refapp=\"" + SuperXManager.his1_refapp+"\""
+					+ " showNavigation=\""+showNavigation+"\"");
+			if (SxPools.get(mandantenID).getRepository().containsKey("K_aufklappbarer Themenbaum")&&SxPools.get(mandantenID).getRepository().get("K_aufklappbarer Themenbaum").toString().equals("1"))
+			{
+				//TODO: klappt noch nicht in Tabellen:
+				result.append(" aufklappbarer_themenbaum=\"true\"");
+			}
+			result.append(">\n");
 			result.append(Maske.addGeneralInfo());
+			result.append(ServletUtils.addCustomElementsToXml(mandantenID));
 	        result.append("<user id=\"" + Themenbaum.this.userid + "\" admin=\""
 	                        + (Themenbaum.this.isAdmin ? "true" : "false") + "\"><![CDATA["
 	                        + Themenbaum.this.login_name + "]]></user>\n");

src/de/superx/servlet/UserInitializer.java

@@ -573,7 +573,11 @@ public class UserInitializer {
 				passwort = "dummy"; // bei LDAP oder so
 			
 			boolean isPasswordOK = false;
-			if (isRemotePasswortCheck) {
+			//System.out.println("getAuthType: "+ request.getAuthType());
+			//System.out.println("isRemotePasswortCheck: "+ isRemotePasswortCheck);
+			if(request.getAuthType() !=null && request.getAuthType().equals("shibboleth")) {
+				isPasswordOK = true;
+			} else if (isRemotePasswortCheck) {
 			   	isPasswordOK = new LdapPasswordChecker().isLdapPasswordOK(false, mandantenID, user, passwort);
 			   
 			} else {
@@ -701,7 +705,7 @@ public class UserInitializer {
 	}
 
 	public static String getPwChangeHtml(String message) {
-		return de.superx.servlet.SuperXManager.htmlPageHead("Erfolg")
+		return de.superx.servlet.SuperXManager.htmlPageHead("Passwort ändern")
 
 				+ "<form action=\"de.superx.servlet.SuperXmlPwChanger\" method=post>"
 
@@ -709,7 +713,7 @@ public class UserInitializer {
 				+ "Bisheriges Passwort<br><input type=password name=\"altes_passwort\" maxlength=40 size=20><br><br>"
 				+ "Neues Passwort<br><input type=password name=\"passwort\" maxlength=40 size=20><br>"
 				+ "Erneut eingeben<br><input type=password name=\"passwort2\" maxlength=40 size=20><br>" + "<br>"
-				+ "<input type=submit value=\"Abschicken\">" + "</form>" + "</body></html>";
+				+ "<input class=\"button is-link\" type=\"submit\" value=\"Abschicken\">" + "</form>" + de.superx.servlet.SuperXManager.pageEnd;
 
 	}
 	private static boolean isGuestUser(Connection con, String kennung) throws SQLException {

superx-build/.ant-targets-build.xml

@@ -0,0 +1,5 @@
+cleanBuildPath
+compileSuperx
+distServer
+initTimestamp
+war

superx-build/build.xml

@@ -33,7 +33,7 @@
              classname="org.codehaus.groovy.ant.Groovy"
              classpathref="classpath"/>
 
-	<property name="version" value="5.0" />
+	<property name="version" value="5.2" />
 
 	
 	<target name="initTimestamp">

superx/WEB-INF/conf/edustore/db/bin/removeKettleConnection.x

@@ -0,0 +1,9 @@
+#!/bin/bash
+#sudo apt install xmlstarlet
+for file in *.kjb *.ktr; do
+ [ -f "$file" ] || continue  # Überspringt, falls keine Dateien existieren
+    ##durch das && wird bewirkt, dass bei Fehler von xmlstarlet Originaldatei nicht überschrieben wird
+    ## Connection-Knoten, bei denen auch die aufgeführten Unterknoten existieren, werden enfernt
+   xmlstarlet ed -d "//connection[name and server and type and access and database]" "$file" > "${file}.tmp" && mv "${file}.tmp" "$file"
+done
+

superx/WEB-INF/conf/edustore/db/bin/sx_jasper.x

@@ -29,6 +29,7 @@ if [ "$1" = "" -o "$1" = "--help" -o "$1" = "-?" ]
 	echo ""
 	echo "Task compile: Quelldatei.jrxml -> Quelldatei.jasper"
 	echo "Quelldatei.jasper ist kompilierte Beschreibungsdatei für den Bericht"
+	echo "Compile wird ausgeführt, wenn nur eine jrxml-Datei und der Logger übergeben wird."
 	echo ""
 	echo "Task fill/fillIgnorePagination: Quelldatei.jasper -> Quelldatei.jrprint"
 	echo "Quelldatei.jrprint enthält mit Daten gefüllte Berichtsvorlage"
@@ -43,6 +44,5 @@ if [ "$1" = "" -o "$1" = "--help" -o "$1" = "-?" ]
 fi
 
 
-
-java $JAVA_OPTS -cp "$JDBC_CLASSPATH" de.superx.bin.SxJasper -logger:$LOGGER_PROPERTIES -db_properties:$DB_PROPERTIES "$@" 
+java $JAVA_OPTS -cp "$JDBC_CLASSPATH" de.superx.bin.SxJasper -logger:$LOGGER_PROPERTIES "$@" 
 

superx/WEB-INF/conf/edustore/db/bin/sx_kitchen.x

@@ -0,0 +1,75 @@
+#!/bin/sh
+
+# **************************************************
+# ** Libraries used by Kettle:                    **
+# **************************************************
+# MB Aufruf Beispiel sx_kitchen.x -file "sospos_res1.kjb" -norep
+
+
+BASEDIR=`dirname $0`
+cd $BASEDIR
+DIR=`pwd`
+cd - > /dev/null
+
+# MB nicht benötigt . "$DIR/set-pentaho-env.sh"
+
+# MB nicht benötigt setPentahoEnv
+
+#CLASSPATH=$BASEDIR
+#CLASSPATH=$CLASSPATH:$BASEDIR/lib/kettle-core.jar
+#CLASSPATH=$CLASSPATH:$BASEDIR/lib/kettle-db.jar
+#CLASSPATH=$CLASSPATH:$BASEDIR/lib/kettle-engine.jar
+#echo $CLASSPATH
+
+# **************************************************
+# ** JDBC & other libraries used by Kettle:       **
+# **************************************************
+
+#for f in `find $BASEDIR/libext -type f -name "*.jar"` `find $BASEDIR/libext -type f -name "*.zip"`
+#do
+#  CLASSPATH=$CLASSPATH:$f
+#done
+
+
+# **************************************************
+# ** Platform specific libraries ...              **
+# **************************************************
+
+# circumvention for the IBM JVM behavior (seems to be a problem with the IBM JVM native compiler)
+if [ `uname -s` = "OS400" ]
+then
+  CLASSPATH=${CLASSPATH}:$BASEDIR/libswt/aix/swt.jar
+fi
+
+
+# ******************************************************************
+# ** Set java runtime options                                     **
+# ** Change 512m to higher values in case you run out of memory   **
+# ** or set the PENTAHO_DI_JAVA_OPTIONS environment variable      **
+# ** (JAVAMAXMEM is there for compatibility reasons)              **
+# ******************************************************************
+
+if [ -z "$JAVAMAXMEM" ]; then
+  JAVAMAXMEM="512"
+fi
+
+if [ -z "$PENTAHO_DI_JAVA_OPTIONS" ]; then
+    PENTAHO_DI_JAVA_OPTIONS="-Xmx${JAVAMAXMEM}m"
+fi
+
+OPT="$PENTAHO_DI_JAVA_OPTIONS -cp $JDBC_CLASSPATH -DKETTLE_HOME=$KETTLE_HOME -DKETTLE_REPOSITORY=$KETTLE_REPOSITORY -DKETTLE_USER=$KETTLE_USER -DKETTLE_PASSWORD=$KETTLE_PASSWORD -DKETTLE_PLUGIN_PACKAGES=$KETTLE_PLUGIN_PACKAGES -DKETTLE_LOG_SIZE_LIMIT=$KETTLE_LOG_SIZE_LIMIT"
+
+if [ "$1" = "-x" ]; then
+  set LD_LIBRARY_PATH=$LD_LIBRARY_PATH:$BASEDIR/libext
+  export LD_LIBRARY_PATH
+  OPT="-Xruntracer $OPT"
+  shift
+fi
+
+# ***************
+# ** Run...    **
+# ***************
+
+"$JAVA_HOME/bin/java" $OPT org.pentaho.di.kitchen.Kitchen "${1+$@}"
+
+

superx/WEB-INF/conf/edustore/db/conf/build.xml

@@ -63,8 +63,17 @@
     <condition property="isJoolap">
      <equals arg1="${ISJOOLAP}" arg2="joolap" casesensitive="false" trim="true"/>
     </condition>
-    <condition property="isJoolapKern">
-     <equals arg1="${MODULE}" arg2="joolap_kern" casesensitive="false" trim="true"/>
+    <condition property="isKenn">
+     <equals arg1="${MODULE}" arg2="kenn" casesensitive="false" trim="true"/>
+    </condition>
+    <condition property="isNdModuleAndIsPlatformHIS1">
+    <and>
+    <or>
+     <equals arg1="${MODULE}" arg2="rpta" casesensitive="false" trim="true"/>
+     <equals arg1="${MODULE}" arg2="etl" casesensitive="false" trim="true"/>
+     </or>
+     <equals arg1="${PLATFORM}" arg2="his1" casesensitive="false" trim="true"/>
+     </and>
     </condition>
     <condition property="isJoolapsKern">
      <equals arg1="${MODULE}" arg2="joolap_kern_s" casesensitive="false" trim="true"/>
@@ -244,17 +253,12 @@
   
   
   
-  oder für Joolap-KENN-S:
-  ant -f build.xml -DMODULE=joolap_kenn_s -DPFAD=/home/superx/fertige_module -DDATABASE=POSTGRES -DENCODING=ISO -DPLATFORM=superx -DROOT_DIR_WEBSERVER=/home/superx/devel_module/kernmodul4.0utf/webserver -DMODULE_DIR=/home/superx/svn/repos/devel_module/joolap_s/db/module/joolap_kenn_s -DROOT_DIR_WEBAPP=/home/superx/svn/repos/devel_module/joolap_s erzeuge_paket
-  oder für Joolap-Kern:
-  
-  ant -f build.xml -DMODULE=joolap_kern -DISJOOLAP=joolap -DPFAD=/home/superx/fertige_module -DDATABASE=HSQLDB -DENCODING=ISO -DPLATFORM=superx -DROOT_DIR_WEBSERVER=/home/superx/devel_module/kernmodul4.0utf/webserver -DMODULE_DIR=/home/superx/svn/repos/devel_module/joolap/db/module/joolap_kern -DROOT_DIR_WEBAPP=/home/superx/svn/repos/devel_module/joolap erzeuge_paket
-   
+     
    -->
    
    <antcall target="erzeuge_paket_kern" />
-   <antcall target="erzeuge_paket_joolap_kern" />
    <antcall target="erzeuge_paket_nicht_kern" />
+   <antcall target="add_files_nd_his1" />
    
    </target>
    
@@ -521,10 +525,7 @@ xmlns:HtmlUtils="de.superx.util.HtmlUtils">
     <target name="kopiere_kern_pakete_his1" if="isPlatformHIS1" >
     
    <antcall target="modulspezifische_daten_loeschen" />
-   <delete includeemptydirs="true">
-            <fileset dir="${ZIELPFAD}/webserver/tomcat/webapps/superx/WEB-INF/classes" includes="**/*.class,**/*.java"/>
-         </delete>
-   <sync todir="${ZIELPFAD}/superx"
+    <sync todir="${ZIELPFAD}/superx"
     overwrite="true"
     includeEmptyDirs="true"
     >
@@ -537,7 +538,10 @@ xmlns:HtmlUtils="de.superx.util.HtmlUtils">
          <delete includeemptydirs="true">
   <fileset dir="${ZIELPFAD}" includes="**/.git/,**/.settings/" defaultexcludes="false"/>
 </delete>
-	
+	  <delete includeemptydirs="true" failonerror="false">
+            <fileset dir="${ZIELPFAD}/superx/WEB-INF/classes" includes="**/*.class,**/*.java"/>
+         </delete>
+
    </target> 
    
    <target name="kern_patch_superx" if="isPlatformSuperX">
@@ -557,9 +561,8 @@ xmlns:HtmlUtils="de.superx.util.HtmlUtils">
     </antcall>
    </target> 
    <target name="kern_patch_his1" if="isPlatformHIS1" >
-    <!--<mkdir dir="${ZIELPFAD_PATCH}/db/module"/>
-    <mkdir dir="${ZIELPFAD_PATCH}/webserver/tomcat"/>-->
-    <property name="PATCH_EXCLUSIVE" value="superx/WEB-INF/classes/edustore/edustore.xml,superx/WEB-INF/classes/edustore/custom.xml,superx/WEB-INF/classes/saiku-datasources/edustore,superx/WEB-INF/web.xml,superx/xml/pageComponents_html_final.xsl,superx/index.htm,superx/WEB-INF/mandanten.cfg,superx/WEB-INF/log4j.properties,superx/WEB-INF/db.properties,superx/WEB-INF/dbforms-config.xml,superx/META-INF/context.xml,superx/WEB-INF/conf/edustore/db/bin/SQL_ENV,superx/WEB-INF/lib/ifxjdbc.jar"/>
+    <!--<property name="PATCH_EXCLUSIVE" value="superx/WEB-INF/classes/edustore/edustore.xml,superx/WEB-INF/classes/edustore/custom.xml,superx/WEB-INF/classes/saiku-datasources/edustore,superx/WEB-INF/web.xml,superx/xml/pageComponents_html_final.xsl,superx/index.htm,superx/WEB-INF/mandanten.cfg,superx/WEB-INF/log4j.properties,superx/WEB-INF/db.properties,superx/WEB-INF/dbforms-config.xml,superx/META-INF/context.xml,superx/WEB-INF/conf/edustore/db/bin/SQL_ENV,superx/WEB-INF/lib/ifxjdbc.jar"/>-->
+    <property name="PATCH_EXCLUSIVE" value="webserver/tomcat/webapps/superx/WEB-INF/classes/edustore/edustore.xml,webserver/tomcat/webapps/superx/WEB-INF/classes/saiku-datasources/edustore,webserver/tomcat/webapps/superx/WEB-INF/web.xml,webserver/tomcat/webapps/superx/xml/pageComponents_html_final.xsl,webserver/tomcat/webapps/superx/index.htm,webserver/tomcat/webapps/superx/WEB-INF/mandanten.cfg,webserver/tomcat/webapps/superx/WEB-INF/log4j.properties,webserver/tomcat/common/classes/log4j.properties,webserver/tomcat/webapps/superx/xml/index.htm"/>
     <sync todir="${ZIELPFAD_PATCH}" overwrite="true" includeEmptyDirs="true" >
      <fileset dir="${ZIELPFAD}" excludes="${PATCH_EXCLUSIVE}"></fileset>
     </sync>
@@ -572,117 +575,38 @@ xmlns:HtmlUtils="de.superx.util.HtmlUtils">
     </antcall>
    </target> 
    
-   <target name="erzeuge_paket_joolap_kern" if="isJoolapKern">
-    <property name="MODULE_DIR" value="../module/${MODULE}" />
+   <target name="add_files_nd_his1" if="isNdModuleAndIsPlatformHIS1"> 
+   <!--rpta,etl,viz benötigt unter HIS1 ein paar Stylesheets von SuperX-KERN-Standalone 5.3-->
+   <property name="MODULE_DIR" value="../module/${MODULE}" />
    <xmlproperty file="${MODULE_DIR}/conf/${MODULE}.xml"/>
-   
+    <property name="KERN_DEPENDENT_URL" value="https://git.campussource.de/git/SuperX/kern/raw/branch/RELEASE_kern5.3/superx" />
+	
    <property name="ZIELPFAD" value="${PFAD}/${MODULE}${module(version)}_${PLATFORM}_${ENCODING}_${DATABASE}"/>
    <echo message="Modul ${MODULE} Version ${module(version)} in Pfad ${ZIELPFAD} mit Encodierung ${ENCODING} erzeugen." />
- 	<!-- <antcall target="clean_zielpfad">
-    <param name="ZIELPFAD" value="${ZIELPFAD}"/>
-    
-  </antcall>-->
-  <antcall target="clean_zielpfad" />
-   
-  <antcall target="sync_his1_paket">
-    <param name="ZIELPFAD" value="${ZIELPFAD}"/>
-    <param name="MODULE_DIR" value="${MODULE_DIR}"/>
-  </antcall>
-  <antcall target="sync_superx_paket">
-    <param name="ZIELPFAD" value="${ZIELPFAD}"/>
-    <param name="MODULE_DIR" value="${MODULE_DIR}"/>
-  </antcall>
-  
-  <mkdir dir="${ZIELPFAD}/db/bin"/>
-  <mkdir dir="${ZIELPFAD}/db/server"/>
-  <mkdir dir="${ZIELPFAD}/joolap/lib"/>
-  
-  <sync todir="${ZIELPFAD}/db/bin" overwrite="true" includeEmptyDirs="true">
-   <fileset dir="${ROOT_DIR_WEBAPP}/db/bin"  casesensitive="yes" >
-    <exclude name="JOOLAP_ENV"/>
-    <exclude name="SUPERX_ENV"/>
-    <exclude name="*log*"/>
-    <exclude name="*tmp*"/>
-    <exclude name="*.alt"/>
-    <exclude name="*.out"/>
-    <exclude name="*.bak"/>
-    <exclude name="*.backup"/>
-    <exclude name="*.sichern"/>
-   </fileset>
-  </sync>
-  
-  <copy todir="${ZIELPFAD}/joolap" overwrite="true" includeEmptyDirs="true">
-   <fileset dir="${ROOT_DIR_WEBAPP}"  casesensitive="yes" >
-    <include name="*.x"/>
-    <include name="createJoolapMasterXml.xml"/>
-    <include name="createJoolapMasterXml.xsl"/>
-   </fileset>
-  </copy> 
-  <echo message="from: ${ROOT_DIR_WEBAPP}/db/module" />
-  <echo message="to  : ${ZIELPFAD}/joolap/db/module" />
-  <copy todir="${ZIELPFAD}/joolap/db/module" overwrite="true" includeEmptyDirs="true">
-   <fileset dir="${ROOT_DIR_WEBAPP}/db/module"  casesensitive="yes" >
-    <include name="*.x.sam"/>
-    <include name="*.x"/>
-   </fileset>
-  </copy>
-  
-  <sync todir="${ZIELPFAD}/db/server" overwrite="true" includeEmptyDirs="true">
-   <fileset dir="${ROOT_DIR_WEBAPP}/db/server"  casesensitive="yes" >
-    <!-- <exclude name="*.log*, *.pid, *~, *#, *.tgz, *.tar*"/> -->
-    <exclude name="*.log*"/>
-    <exclude name="*.pid"/>
-    <exclude name="joolap.script*"/>
-    <exclude name="*.bak"/>
-    <exclude name="*.old"/>
-    <exclude name="*test*"/>
-    <exclude name="*tmp*"/>
-    <exclude name="*.tgz"/>
-    <exclude name="*.tar*"/>
-    <exclude name="*.properties"/>
-   </fileset>
-  </sync>
-  
-  <sync todir="${ZIELPFAD}/joolap/lib" overwrite="true" includeEmptyDirs="true">
-   <fileset dir="${ROOT_DIR_WEBAPP}/lib"  casesensitive="yes" />
-  </sync> 
-  
-  <sync todir="${ZIELPFAD}/joolap/db/dist" overwrite="true" includeEmptyDirs="true">
-   <fileset dir="${ROOT_DIR_WEBAPP}/db/dist"  casesensitive="yes" />
-  </sync> 
-  
-  <!--<antcall target="purge_zielpfad_postgres">
-    <param name="ZIELPFAD" value="${ZIELPFAD}"/>
-  </antcall>
-  <antcall target="purge_zielpfad_informix">
-    <param name="ZIELPFAD" value="${ZIELPFAD}"/>
-  </antcall> -->
-   
-    <antcall target="copy_lizenz_files_superx" >
-   <param name="VERSION" value="${module(version)}" />
-    </antcall>
-    <antcall target="copy_lizenz_files_his1" >
-   <param name="VERSION" value="${module(version)}" />
-    </antcall>
-    <antcall target="convertToIso" >
-    <param name="ZIELPFAD" value="${ZIELPFAD}"/>
-    </antcall>
-    <antcall target="Doku_Hinweis_superx" />
-    
-     <antcall target="sync_doc_paket" >
-        <param name="ZIEL_DOC_PFAD" value="${ZIELPFAD}/webserver/tomcat/webapps/superx/doku"/>
-        </antcall>
-    
- <antcall target="rechte" >
-    <param name="ZIELPFAD" value="${ZIELPFAD}"/>
-    </antcall>
-    <chmod dir="${ZIELPFAD}" perm="u+rx" includes="**/*.sh,**/*.x,**/*.x.sam,**/*_mask,**/*_mask_xil,**/DOSQL,**/DOQUERY,**/joolapdbserver"/>
-  <!--klappt noch nicht, wg. Dateirechten:
-   <antcall target="tar_it">
-    <param name="ZIELPFAD" value="${ZIELPFAD}"/>
-    <param name="PAKET_FILENAME" value="${MODULE}${module(version)}_${PLATFORM}_${ENCODING}_${DATABASE}"/>
-    </antcall>-->
-    <antcall target="db_joolap_move" />
+   <mkdir dir="${ZIELPFAD}/superx/edit/kern"/>
+   <mkdir dir="${ZIELPFAD}/superx/images"/>
+   <mkdir dir="${ZIELPFAD}/superx/style"/>
+   <mkdir dir="${ZIELPFAD}/superx/xml/js"/>
+   <mkdir dir="${ZIELPFAD}/superx/xml/js/memtext"/>
+		<get src="${KERN_DEPENDENT_URL}/htmlhead_dialoge.inc" dest="${ZIELPFAD}/superx"/>
+		<get src="${KERN_DEPENDENT_URL}/edit/kern/maske_combo_laden.jsp" dest="${ZIELPFAD}/superx/edit/kern"/>
+		<get src="${KERN_DEPENDENT_URL}/edit/kern/maske_sicht_laden.jsp" dest="${ZIELPFAD}/superx/edit/kern"/>
+		<get src="${KERN_DEPENDENT_URL}/images/books.svg" dest="${ZIELPFAD}/superx/images"/>
+		<get src="${KERN_DEPENDENT_URL}/images/home.svg" dest="${ZIELPFAD}/superx/images"/>
+		<get src="${KERN_DEPENDENT_URL}/images/information_liberation.svg" dest="${ZIELPFAD}/superx/images"/>
+		<get src="${KERN_DEPENDENT_URL}/images/logout.svg" dest="${ZIELPFAD}/superx/images"/>
+		<get src="${KERN_DEPENDENT_URL}/images/user.svg" dest="${ZIELPFAD}/superx/images"/>
+		<get src="${KERN_DEPENDENT_URL}/images/wrenchblck.svg" dest="${ZIELPFAD}/superx/images"/>
+		<get src="${KERN_DEPENDENT_URL}/images/video.svg" dest="${ZIELPFAD}/superx/images"/>
+		<get src="${KERN_DEPENDENT_URL}/style/sx_common.css" dest="${ZIELPFAD}/superx/style"/>
+		<get src="${KERN_DEPENDENT_URL}/style/fontello-codes.css" dest="${ZIELPFAD}/superx/style"/>
+		<get src="${KERN_DEPENDENT_URL}/style/sx_field_dialogue.css" dest="${ZIELPFAD}/superx/style"/>
+		<get src="${KERN_DEPENDENT_URL}/style/sx_fontello.css" dest="${ZIELPFAD}/superx/style"/>
+		<get src="${KERN_DEPENDENT_URL}/style/sx_menue.css" dest="${ZIELPFAD}/superx/style"/>
+		<get src="${KERN_DEPENDENT_URL}/style/sx_tabelle.css" dest="${ZIELPFAD}/superx/style"/>
+		<get src="${KERN_DEPENDENT_URL}/xml/js/memtext/nd_functions.js" dest="${ZIELPFAD}/superx/xml/js/memtext"/>
+   		<get src="${KERN_DEPENDENT_URL}/xml/nd_templates.xsl" dest="${ZIELPFAD}/superx/xml"/>
+
    </target>
    
    

superx/WEB-INF/conf/edustore/db/conf/field.xsl

@@ -127,6 +127,9 @@ xmlns:xsl="http://www.w3.org/1999/XSL/Transform">
 			<!--wegen Sortierung längerer Textfelder unter informix-->
 			<xsl:value-of select="'NVARCHAR'" /><xsl:text>(</xsl:text><xsl:value-of select="@size" /><xsl:text>)</xsl:text>
 			</xsl:when>
+            <xsl:when test="@size = ''">
+			<xsl:value-of select="@type" />
+            </xsl:when>
 			<xsl:otherwise>
 			<xsl:value-of select="@type" /><xsl:text>(</xsl:text><xsl:value-of select="@size" /><xsl:text>)</xsl:text>
 			</xsl:otherwise>

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

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

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

@@ -1 +1 @@
-5.0
+5.3

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

@@ -1 +1 @@
-01.05.2024
+25.01.2026

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

@@ -0,0 +1,25 @@
+{### arch_datum -  automatisch generiert #########}
+create table arch_datum(
+	arch_table NVARCHAR(255)  not null, 
+datum datetime year to second , 
+bezugszeit_von INTEGER , 
+bezugszeit_bis INTEGER , 
+bezugsart CHAR(1)  default 'J' , 
+userinfo_id INTEGER  not null, 
+kommentar NVARCHAR(255) 
+);
+	
+comment on column arch_datum.arch_table is 'Name der archivierten Tabelle';
+	
+comment on column arch_datum.datum is 'Archivierungsdatum und -uhrzeit';
+	
+comment on column arch_datum.bezugszeit_von is 'Bezugszeit [von] der archivierten Daten';
+	
+comment on column arch_datum.bezugszeit_bis is 'Bezugszeit [bis] der archivierten Daten';
+	
+comment on column arch_datum.bezugsart is 'Bezugsart [Semester S_ Akad. Jahr A_Jahr J_ Quartal Q_ Monat M]';
+	
+comment on column arch_datum.userinfo_id is 'Userinfo ID';
+	
+comment on column arch_datum.kommentar is 'Kommentar zur Archivierung';
+	

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

@@ -0,0 +1,13 @@
+{### arch_table -  automatisch generiert #########}
+create table arch_table(
+	id SERIAL  not null, 
+name NVARCHAR(255) , 
+zeitfeld NVARCHAR(255) 
+);
+	
+comment on column arch_table.id is 'id';
+	
+comment on column arch_table.name is 'Name der archivierten Tabelle';
+	
+comment on column arch_table.zeitfeld is 'Feld für die Zeitangabe';
+	

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

@@ -5,3 +5,4 @@
 create unique index c_cifx_tid on cifx (tid);
 create  unique  index cifx_ind on cifx (hs, key, apnr );
 create  index cifx_ind2 on cifx (uniquename );
+create  index cifx_ind3 on cifx (key, apnr );

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

@@ -7,7 +7,9 @@ apnr CHAR(10)  not null,
 kurz NVARCHAR(255) , 
 druck NVARCHAR(255)  default 'Drucktext' , 
 lang_1 NVARCHAR(255) , 
-uniquename NVARCHAR(255) 
+uniquename NVARCHAR(255) , 
+sort1 INTEGER , 
+struktur_c CHAR(50) 
 );
 	
 comment on column cifx_customize.tid is 'Laufnr.';

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

@@ -4,7 +4,7 @@ create table db_version(
 his_system NVARCHAR(255) , 
 version CHAR(8) , 
 kern_system CHAR(1) , 
-version_hash VARCHAR(32) , 
+version_hash VARCHAR , 
 systeminfo_id INTEGER 
 );
 	

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

@@ -14,6 +14,6 @@ obligatorisch INTEGER ,
 art INTEGER , 
 relation text , 
 attribut NCHAR(100) , 
-defaultwert NCHAR(255) 
+defaultwert TEXT 
 );
 	

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

@@ -0,0 +1,19 @@
+{### k_astat_abschl_grp -  automatisch generiert #########}
+create table k_astat_abschl_grp(
+	abschluss_astat_bund NVARCHAR(255)  not null, 
+abschluss_astat_bund_ktxt NVARCHAR(255) , 
+abschlussart NVARCHAR(255) , 
+abschluss_grp NVARCHAR(255) , 
+ist_lehramt SMALLINT  default 0 
+);
+	
+comment on column k_astat_abschl_grp.abschluss_astat_bund is 'Abschluss [Bundesschlüssel]';
+	
+comment on column k_astat_abschl_grp.abschluss_astat_bund_ktxt is 'Abschluss [Bundesschlüssel] Kurztext';
+	
+comment on column k_astat_abschl_grp.abschlussart is 'Abschlussart';
+	
+comment on column k_astat_abschl_grp.abschluss_grp is 'Abschlussgruppe';
+	
+comment on column k_astat_abschl_grp.ist_lehramt is 'Lehramt [J/N]';
+	

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

@@ -0,0 +1,12 @@
+{### k_astat_faechergruppe -  automatisch generiert #########}
+create table k_astat_faechergruppe(
+	schluessel NVARCHAR(255)  not null, 
+name NVARCHAR(255) , 
+semester_von INTEGER , 
+semester_bis INTEGER 
+);
+	
+comment on column k_astat_faechergruppe.schluessel is 'Schlüssel';
+	
+comment on column k_astat_faechergruppe.name is 'Name';
+	

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

@@ -0,0 +1,25 @@
+{### k_astat_lfb_fg -  automatisch generiert #########}
+create table k_astat_lfb_fg(
+	tid SERIAL  not null, 
+fgr CHAR(10) , 
+fgr_str NCHAR(255) , 
+lfb CHAR(10) , 
+lfb_str NCHAR(255) , 
+fg CHAR(10) , 
+fg_str NVARCHAR(255) , 
+gueltig_von DATE , 
+gueltig_bis DATE 
+);
+	
+comment on column k_astat_lfb_fg.fgr is 'Fächergruppe [Schlüssel]';
+	
+comment on column k_astat_lfb_fg.fgr_str is 'Fächergruppe';
+	
+comment on column k_astat_lfb_fg.lfb is 'Lehr- und Forschungsbereich [Schlüssel]';
+	
+comment on column k_astat_lfb_fg.lfb_str is 'Lehr- und Forschungsbereich';
+	
+comment on column k_astat_lfb_fg.fg is 'Fachgebiet [Schlüssel]';
+	
+comment on column k_astat_lfb_fg.fg_str is 'Fachgebiet';
+	

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

@@ -0,0 +1,6 @@
+
+{### k_astat_staat_eu -  automatisch generiert ##############################################
+}
+
+create unique index pk_k_astat_staat_eu on k_astat_staat_eu (tid);
+create  index k_astat_staat_eu_idx1 on k_astat_staat_eu (astat, semester_von, semester_bis );

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

@@ -0,0 +1,13 @@
+{### k_astat_staat_eu -  automatisch generiert #########}
+create table k_astat_staat_eu(
+	tid SERIAL  not null, 
+astat CHAR(3)  not null, 
+eu CHAR(1) , 
+semester_von INTEGER , 
+semester_bis INTEGER , 
+gueltig_von DATE , 
+gueltig_bis DATE 
+);
+	
+comment on column k_astat_staat_eu.eu is 'EU-Mitglied?';
+	

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

@@ -2,7 +2,9 @@
 create table k_astat_studienbereich(
 	schluessel NVARCHAR(255)  not null, 
 name NVARCHAR(255) , 
-fgr NVARCHAR(255) 
+fgr NVARCHAR(255) , 
+semester_von INTEGER , 
+semester_bis INTEGER 
 );
 	
 comment on column k_astat_studienbereich.schluessel is 'Schlüssel';

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

@@ -2,7 +2,9 @@
 create table k_astat_studienfach(
 	schluessel NVARCHAR(255)  not null, 
 name NVARCHAR(255) , 
-sb NVARCHAR(255) 
+sb NVARCHAR(255) , 
+semester_von INTEGER , 
+semester_bis INTEGER 
 );
 	
 comment on column k_astat_studienfach.schluessel is 'Schlüssel';

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

@@ -10,4 +10,18 @@ name NVARCHAR(255) ,
 isced NVARCHAR(255) , 
 keybund NVARCHAR(255) 
 );
+	
+comment on column k_astat_studienfach_land.schluessel is 'Landesschlüssel';
+	
+comment on column k_astat_studienfach_land.gueltig_ab is 'Gültigkeitsbeginn';
+	
+comment on column k_astat_studienfach_land.land is 'Bundesland';
+	
+comment on column k_astat_studienfach_land.gueltig_bis is 'Gültigkeitsende';
+	
+comment on column k_astat_studienfach_land.name is 'Drucktext des Schlüssels';
+	
+comment on column k_astat_studienfach_land.isced is 'ISCED-Code';
+	
+comment on column k_astat_studienfach_land.keybund is 'Bundesschlüssel des Studienfaches';
 	

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

@@ -0,0 +1,13 @@
+{### k_prio_param -  automatisch generiert #########}
+create table k_prio_param(
+	id SERIAL  not null, 
+name NVARCHAR(255) , 
+sortorder NVARCHAR(255) 
+);
+	
+comment on column k_prio_param.id is 'id';
+	
+comment on column k_prio_param.name is 'Name der Priorität';
+	
+comment on column k_prio_param.sortorder is 'Sortierung der Priorität';
+	

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

@@ -0,0 +1,13 @@
+{### k_source -  automatisch generiert #########}
+create table k_source(
+	id SERIAL  not null, 
+name NVARCHAR(255) , 
+sortorder NVARCHAR(255) 
+);
+	
+comment on column k_source.id is 'id';
+	
+comment on column k_source.name is 'Name des Quellsystems';
+	
+comment on column k_source.sortorder is 'Sortierung des Quellsystems';
+	

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

@@ -4,7 +4,7 @@ create table macro_masken_bez(
 maskeninfo_id2 INTEGER  not null, 
 active INTEGER  default 1  not null, 
 sortnr SMALLINT , 
-schleifenrelation NCHAR(255) , 
+schleifenrelation TEXT , 
 schleifenfeldname NCHAR(255) , 
 alias NCHAR(255) , 
 schleifenfstand NCHAR(255) , 

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

@@ -9,9 +9,9 @@ kommentar NVARCHAR(255)
 	
 comment on column masken_protokoll.tid is 'ID';
 	
-comment on column masken_protokoll.maskeninfo_id is 'ID der Maske';
+comment on column masken_protokoll.maskeninfo_id is 'Maske';
 	
-comment on column masken_protokoll.user_id is 'ID des Users_ welcher die Maske ausgeführt hat';
+comment on column masken_protokoll.user_id is 'User';
 	
 comment on column masken_protokoll.zeitpunkt is 'Ausführungs Zeitpunkt';
 	

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

@@ -14,7 +14,7 @@ sort1 INTEGER ,
 sort2 INTEGER , 
 sort3 INTEGER , 
 geaendert_am DATE , 
-aktiv SMALLINT , 
+aktiv SMALLINT  default 0  not null, 
 gueltig_seit DATE  default '01.01.1900'  not null, 
 gueltig_bis DATE  default '01.01.3000'  not null
 );

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

@@ -11,7 +11,8 @@ is_generic SMALLINT  default 0 ,
 toolbar_icon_filepath NVARCHAR(255) , 
 usage_resultset_data CHAR(10)  default 'T' , 
 stylesheet_type CHAR(10)  default 'XSL' , 
-jr_datasource CHAR(10) 
+jr_datasource CHAR(10) , 
+uniquename NVARCHAR(255) 
 );
 	
 comment on column sx_stylesheets.tid is 'Laufnummer';
@@ -37,4 +38,6 @@ comment on column sx_stylesheets.usage_resultset_data is 'Nutzung der Ergebnisda
 comment on column sx_stylesheets.stylesheet_type is 'Art des Stylesheets';
 	
 comment on column sx_stylesheets.jr_datasource is 'Datenquelle [JR]';
+	
+comment on column sx_stylesheets.uniquename is 'Eindeutige Identifizierung des Datensatzes';
 	

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

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

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

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

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

@@ -1,4 +1,4 @@
 
 {### trans_dim_bp_apnr -  automatisch generiert ##############################################
 }
-create  index ix_tr_dim_bp_apnr on trans_dim_bp_apnr (dimension_bp_id, sourcesystem_id, systeminfo_id );
+create  index ix_tr_dim_bp_apnr on trans_dim_bp_apnr (dimension_bp_id, apnr, sourcesystem_id, systeminfo_id );

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

@@ -9,5 +9,5 @@ comment on column user_group_bez.userinfo_id is 'UserID';
 	
 comment on column user_group_bez.groupinfo_id is 'Gruppe';
 	
-comment on column user_group_bez.external_entry is 'Recht wird von externem System [HisInOne] gesetzt und entfernt';
+comment on column user_group_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_institution.tab

@@ -25,7 +25,7 @@ comment on column user_institution.gueltig_bis is 'Gültig bis';
 	
 comment on column user_institution.lehre is 'obsoletes Feld';
 	
-comment on column user_institution.external_entry is 'Recht wird von externem System [HisInOne] gesetzt und entfernt';
+comment on column user_institution.external_entry is 'Recht wird von externem System [HISinOne] gesetzt und entfernt';
 	
 comment on column user_institution.externalid is 'ID der berechtigten Kostenstelle in externem System [HISinONe: orgunitid]';
 	

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

@@ -19,7 +19,7 @@ comment on column user_kostentraeger.gueltig_seit is 'Gültig von';
 	
 comment on column user_kostentraeger.gueltig_bis is 'Gültig bis';
 	
-comment on column user_kostentraeger.external_entry is 'Recht wird von externem System [HisInOne] gesetzt und entfernt';
+comment on column user_kostentraeger.external_entry is 'Recht wird von externem System [HISinOne] gesetzt und entfernt';
 	
 comment on column user_kostentraeger.externalid is 'ID der berechtigten Kostenstelle in externem System [HISinONe: orgunitid]';
 	

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

@@ -5,5 +5,5 @@ maskeninfo_id INTEGER ,
 external_entry smallint  default 0 
 );
 	
-comment on column user_masken_bez.external_entry is 'Recht wird von externem System [HisInOne] gesetzt und entfernt';
+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_sachgeb_bez.tab

@@ -5,5 +5,5 @@ sachgebiete_id INTEGER ,
 external_entry smallint  default 0 
 );
 	
-comment on column user_sachgeb_bez.external_entry is 'Recht wird von externem System [HisInOne] gesetzt und entfernt';
+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

@@ -7,5 +7,5 @@ external_entry smallint  default 0
 	
 comment on column user_sichtarten.sichtart is 'Rechte für eine Art von Sichten geben';
 	
-comment on column user_sichtarten.external_entry is 'Recht wird von externem System [HisInOne] gesetzt und entfernt';
+comment on column user_sichtarten.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_sichten.tab

@@ -5,5 +5,5 @@ sicht_name_intern NCHAR(200)  not null,
 external_entry smallint  default 0 
 );
 	
-comment on column user_sichten.external_entry is 'Recht wird von externem System [HisInOne] gesetzt und entfernt';
+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/userinfo.tab

@@ -14,8 +14,14 @@ info NCHAR(255) ,
 extern_account_id NVARCHAR(255) , 
 extern_person_id NVARCHAR(255) , 
 sieht_projekte SMALLINT  default 0 , 
-extern_role_id INTEGER 
+extern_role_id INTEGER , 
+gueltig_von date , 
+gueltig_bis date 
 );
 	
 comment on column userinfo.sieht_projekte is 'Darf der User Projekte sehen';
+	
+comment on column userinfo.gueltig_von is 'Beginn Gültigkeit';
+	
+comment on column userinfo.gueltig_bis is 'Ende Gültigkeit';
 	

superx/WEB-INF/conf/edustore/db/install/conf/his1/dbconv/view.eduetl/dim_semester.view

@@ -0,0 +1,46 @@
+create view dim_semester(
+	tid, 
+eintrag, 
+eintrag_kurz, 
+sem_beginn, 
+sem_ende, 
+semestertyp, 
+vorsem, 
+folgesem, 
+folgesem_sem_beginn, 
+ist_zukunft, 
+akad_jahr, 
+akad_jahr_absolv, 
+akad_jahr_anf) as
+	
+			with tmp_semester as (select C.apnr as tid,
+			C.druck as eintrag,
+			C.kurz as eintrag_kurz, --TODO
+			C.d_akt_von as sem_beginn,
+			C.d_akt_bis as sem_ende,
+			val(substring(''  || C.apnr from 5 for 1)) as semestertyp,
+			add_sem(C.apnr,-1) as vorsem,
+			add_sem(C.apnr,1) as folgesem,
+			(select C2.d_akt_von from cif C2 where C2.key=661
+			and C2.apnr=add_sem(C.apnr,1)) as folgesem_sem_beginn
+			from cif C
+			where key=661
+			)
+			select tid,
+			eintrag,
+			eintrag_kurz,
+			sem_beginn,
+			sem_ende,
+			semestertyp,
+			vorsem,
+			folgesem,
+			folgesem_sem_beginn,
+			(case when sem_beginn > current_date then 1 else 0 end) as ist_zukunft,
+			case when semestertyp='1' then (tid/10)-1 when semestertyp='2' then (tid/10) end as akad_jahr,
+			case when semestertyp='1' then (tid/10) when semestertyp='2' then (tid/10)+1 end as akad_jahr_absolv,
+			case when semestertyp='1' then (tid/10) when semestertyp='2' then (tid/10) end as akad_jahr_anf
+			
+			from tmp_semester
+			
+			 ;
+	

superx/WEB-INF/conf/edustore/db/install/conf/his1/dbconv/view.eduetl/menu_element_orgstructure.view

@@ -3,7 +3,7 @@ create view menu_element_orgstructure(
 description) as
 	
 	
-		select element as orgstruktur, description
+		select element_value::integer as orgstruktur, description
         from menu_element
   		where element='orgstruktur'
 				;

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

@@ -1,12 +1,19 @@
 rem Diese Datei benenn die UNL Dateien mit Demofunktion um
+move sichtart_rechttabelle sichtart_rechttabelle_demo
+move db_version db_version_demo
 move cif cif_demo
 move cifx cifx_demo
 move trans_cifx trans_cifx_demo
 move trans_cif trans_cif_demo
 move cifx_customize cifx_customize_demo
+move hochschulinfo hochschulinfo_demo
 move organigramm organigramm_demo
 move protokoll protokoll_demo
 move sx_repository sx_repository_demo
+move sieve sieve_demo
+move sieve_column_def sieve_column_def_demo
+move sieve_column sieve_column_demo
+move sieve_field sieve_field_demo
 move sx_jobs sx_jobs_demo
 move orgunit_mapping orgunit_mapping_demo
 move dim_datum dim_datum_demo
@@ -24,3 +31,8 @@ move k_astat_studienbereich k_astat_studienbereich_demo
 move k_astat_studienfach k_astat_studienfach_demo
 move k_astat_staat k_astat_staat_demo
 move k_astat_kontinent k_astat_kontinent_demo
+move k_astat_faechergruppe k_astat_faechergruppe_demo
+move k_astat_abschl_grp k_astat_abschl_grp_demo
+move k_prio_param k_prio_param_demo
+move k_source k_source_demo
+move k_astat_lfb_fg k_astat_lfb_fg_demo

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

@@ -1,13 +1,20 @@
 # Diese Datei benenn die UNL Dateien mit Demofunktion um
 
+mv sichtart_rechttabelle sichtart_rechttabelle_demo
+mv db_version db_version_demo
 mv cif cif_demo
 mv cifx cifx_demo
 mv trans_cifx trans_cifx_demo
 mv trans_cif trans_cif_demo
 mv cifx_customize cifx_customize_demo
+mv hochschulinfo hochschulinfo_demo
 mv organigramm organigramm_demo
 mv protokoll protokoll_demo
 mv sx_repository sx_repository_demo
+mv sieve sieve_demo
+mv sieve_column_def sieve_column_def_demo
+mv sieve_column sieve_column_demo
+mv sieve_field sieve_field_demo
 mv sx_jobs sx_jobs_demo
 mv orgunit_mapping orgunit_mapping_demo
 mv dim_datum dim_datum_demo
@@ -25,3 +32,8 @@ mv k_astat_studienbereich k_astat_studienbereich_demo
 mv k_astat_studienfach k_astat_studienfach_demo
 mv k_astat_staat k_astat_staat_demo
 mv k_astat_kontinent k_astat_kontinent_demo
+mv k_astat_faechergruppe k_astat_faechergruppe_demo
+mv k_astat_abschl_grp k_astat_abschl_grp_demo
+mv k_prio_param k_prio_param_demo
+mv k_source k_source_demo
+mv k_astat_lfb_fg k_astat_lfb_fg_demo

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

@@ -28,9 +28,6 @@
 </dbi:dbaction>
 <dbi:dbaction dbi:action="sqlexec">eduetl:drop procedure val(char(255));
 			
-</dbi:dbaction>
-<dbi:dbaction dbi:action="sqlexec">eduetl:drop procedure decval(varchar(255));
-			
 </dbi:dbaction>
 <dbi:dbaction dbi:action="sqlexec">eduetl:drop procedure decval(char(255));
 			
@@ -446,11 +443,41 @@
 <dbi:dbaction dbi:action="sqlexec">eduetl:drop table k_astat_studienfach;
 
 </dbi:dbaction>
-<dbi:dbaction dbi:action="sqlexec">eduetl:drop table colorscheme;
+<dbi:dbaction dbi:action="sqlexec">eduetl:drop table k_astat_staat;
+
+</dbi:dbaction>
+<dbi:dbaction dbi:action="sqlexec">eduetl:drop table k_astat_kontinent;
+
+</dbi:dbaction>
+<dbi:dbaction dbi:action="sqlexec">eduetl:drop table k_astat_faechergruppe;
+
+</dbi:dbaction>
+<dbi:dbaction dbi:action="sqlexec">eduetl:drop table k_astat_abschl_grp;
+
+</dbi:dbaction>
+<dbi:dbaction dbi:action="sqlexec">eduetl:drop table k_astat_staat_eu;
 
 </dbi:dbaction>
 <dbi:dbaction dbi:action="sqlexec">eduetl:drop table sx_mail;
 
+</dbi:dbaction>
+<dbi:dbaction dbi:action="sqlexec">eduetl:drop table colorscheme;
+
+</dbi:dbaction>
+<dbi:dbaction dbi:action="sqlexec">eduetl:drop table arch_table;
+
+</dbi:dbaction>
+<dbi:dbaction dbi:action="sqlexec">eduetl:drop table arch_datum;
+
+</dbi:dbaction>
+<dbi:dbaction dbi:action="sqlexec">eduetl:drop table k_prio_param;
+
+</dbi:dbaction>
+<dbi:dbaction dbi:action="sqlexec">eduetl:drop table k_source;
+
+</dbi:dbaction>
+<dbi:dbaction dbi:action="sqlexec">eduetl:drop table k_astat_lfb_fg;
+
 </dbi:dbaction>
 <dbi:dbaction dbi:action="executeFile">
 <dbi:file structure="SQL" withNativeClient="n" encoding="UTF-8" database="eduetl" filename="$KERN_PFAD/conf/sx_tables_loeschen.sql"/>

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

@@ -130,12 +130,6 @@
 </dbi:dbaction>
 <dbi:dbaction dbi:action="sqlexec">eduetl:drop function val(smallint);
 			
-</dbi:dbaction>
-<dbi:dbaction dbi:action="sqlexec">eduetl:drop function decval(varchar(255));
-			
-</dbi:dbaction>
-<dbi:dbaction dbi:action="sqlexec">eduetl:drop function decval(text);
-			
 </dbi:dbaction>
 <dbi:dbaction dbi:action="sqlexec">eduetl:drop function decval(char(255));
 			
@@ -566,16 +560,40 @@
 <dbi:dbaction dbi:action="sqlexec">eduetl:drop table if exists k_astat_studienfach cascade;
 
 </dbi:dbaction>
-<dbi:dbaction dbi:action="sqlexec">eduetl:drop table if exists colorscheme cascade;
+<dbi:dbaction dbi:action="sqlexec">eduetl:drop table if exists k_astat_staat cascade;
+
+</dbi:dbaction>
+<dbi:dbaction dbi:action="sqlexec">eduetl:drop table if exists k_astat_kontinent cascade;
+
+</dbi:dbaction>
+<dbi:dbaction dbi:action="sqlexec">eduetl:drop table if exists k_astat_faechergruppe cascade;
+
+</dbi:dbaction>
+<dbi:dbaction dbi:action="sqlexec">eduetl:drop table if exists k_astat_abschl_grp cascade;
+
+</dbi:dbaction>
+<dbi:dbaction dbi:action="sqlexec">eduetl:drop table if exists k_astat_staat_eu cascade;
 
 </dbi:dbaction>
 <dbi:dbaction dbi:action="sqlexec">eduetl:drop table if exists sx_mail cascade;
 
 </dbi:dbaction>
-<dbi:dbaction dbi:action="sqlexec">eduetl:drop table if exists k_astat_staat cascade;
+<dbi:dbaction dbi:action="sqlexec">eduetl:drop table if exists colorscheme cascade;
 
 </dbi:dbaction>
-<dbi:dbaction dbi:action="sqlexec">eduetl:drop table if exists k_astat_kontinent cascade;
+<dbi:dbaction dbi:action="sqlexec">eduetl:drop table if exists arch_table cascade;
+
+</dbi:dbaction>
+<dbi:dbaction dbi:action="sqlexec">eduetl:drop table if exists arch_datum cascade;
+
+</dbi:dbaction>
+<dbi:dbaction dbi:action="sqlexec">eduetl:drop table if exists k_prio_param cascade;
+
+</dbi:dbaction>
+<dbi:dbaction dbi:action="sqlexec">eduetl:drop table if exists k_source cascade;
+
+</dbi:dbaction>
+<dbi:dbaction dbi:action="sqlexec">eduetl:drop table if exists k_astat_lfb_fg cascade;
 
 </dbi:dbaction>
 <dbi:dbaction dbi:action="executeFile">

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

@@ -85,6 +85,16 @@
 </dbi:dbaction>
 <dbi:dbaction dbi:action="sqlexec">eduetl:delete from k_astat_studienbereich;
 </dbi:dbaction>
+<dbi:dbaction dbi:action="sqlexec">eduetl:delete from k_astat_faechergruppe;
+</dbi:dbaction>
+<dbi:dbaction dbi:action="sqlexec">eduetl:delete from k_astat_staat;
+</dbi:dbaction>
+<dbi:dbaction dbi:action="sqlexec">eduetl:delete from k_astat_kontinent;
+</dbi:dbaction>
+<dbi:dbaction dbi:action="sqlexec">eduetl:delete from k_astat_abschl_grp;
+</dbi:dbaction>
+<dbi:dbaction dbi:action="sqlexec">eduetl:delete from k_astat_staat_eu;
+</dbi:dbaction>
 <dbi:dbaction dbi:action="importFile">
 <dbi:data database="eduetl" table="aggregierung">
 <dbi:file encoding="UTF-8" separator="^" trailingSeparator="y" withNativeClient="n" firstLinedescription="n" structure="CSV" filename="$SUPERX_DIR/db/install/schluesseltabellen/release_unloads/aggregierung.unl"/>
@@ -300,6 +310,31 @@
 <dbi:file encoding="UTF-8" separator="^" trailingSeparator="y" withNativeClient="n" firstLinedescription="n" structure="CSV" filename="$SUPERX_DIR/db/install/schluesseltabellen/release_unloads/k_astat_studienbereich.unl"/>
 </dbi:data>
 </dbi:dbaction>
+<dbi:dbaction dbi:action="importFile">
+<dbi:data database="eduetl" table="k_astat_faechergruppe">
+<dbi:file encoding="UTF-8" separator="^" trailingSeparator="y" withNativeClient="n" firstLinedescription="n" structure="CSV" filename="$SUPERX_DIR/db/install/schluesseltabellen/release_unloads/k_astat_faechergruppe.unl"/>
+</dbi:data>
+</dbi:dbaction>
+<dbi:dbaction dbi:action="importFile">
+<dbi:data database="eduetl" table="k_astat_staat">
+<dbi:file encoding="UTF-8" separator="^" trailingSeparator="y" withNativeClient="n" firstLinedescription="n" structure="CSV" filename="$SUPERX_DIR/db/install/schluesseltabellen/release_unloads/k_astat_staat.unl"/>
+</dbi:data>
+</dbi:dbaction>
+<dbi:dbaction dbi:action="importFile">
+<dbi:data database="eduetl" table="k_astat_kontinent">
+<dbi:file encoding="UTF-8" separator="^" trailingSeparator="y" withNativeClient="n" firstLinedescription="n" structure="CSV" filename="$SUPERX_DIR/db/install/schluesseltabellen/release_unloads/k_astat_kontinent.unl"/>
+</dbi:data>
+</dbi:dbaction>
+<dbi:dbaction dbi:action="importFile">
+<dbi:data database="eduetl" table="k_astat_abschl_grp">
+<dbi:file encoding="UTF-8" separator="^" trailingSeparator="y" withNativeClient="n" firstLinedescription="n" structure="CSV" filename="$SUPERX_DIR/db/install/schluesseltabellen/release_unloads/k_astat_abschl_grp.unl"/>
+</dbi:data>
+</dbi:dbaction>
+<dbi:dbaction dbi:action="importFile">
+<dbi:data database="eduetl" table="k_astat_staat_eu">
+<dbi:file encoding="UTF-8" separator="^" trailingSeparator="y" withNativeClient="n" firstLinedescription="n" structure="CSV" filename="$SUPERX_DIR/db/install/schluesseltabellen/release_unloads/k_astat_staat_eu.unl"/>
+</dbi:data>
+</dbi:dbaction>
 <dbi:dbaction dbi:action="executeFile">
 <dbi:file database="eduetl" encoding="UTF-8" withNativeClient="n" structure="SQL" filename="$SUPERX_DIR/db/install/schluesseltabellen/macro_masken_bez_fuellen.sql"/>
 </dbi:dbaction>

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

@@ -85,10 +85,16 @@
 </dbi:dbaction>
 <dbi:dbaction dbi:action="sqlexec">eduetl:truncate table k_astat_studienbereich cascade;
 </dbi:dbaction>
+<dbi:dbaction dbi:action="sqlexec">eduetl:truncate table k_astat_faechergruppe cascade;
+</dbi:dbaction>
 <dbi:dbaction dbi:action="sqlexec">eduetl:truncate table k_astat_staat cascade;
 </dbi:dbaction>
 <dbi:dbaction dbi:action="sqlexec">eduetl:truncate table k_astat_kontinent cascade;
 </dbi:dbaction>
+<dbi:dbaction dbi:action="sqlexec">eduetl:truncate table k_astat_abschl_grp cascade;
+</dbi:dbaction>
+<dbi:dbaction dbi:action="sqlexec">eduetl:truncate table k_astat_staat_eu cascade;
+</dbi:dbaction>
 <dbi:dbaction dbi:action="importFile">
 <dbi:data database="eduetl" table="aggregierung">
 <dbi:file encoding="UTF-8" separator="^" trailingSeparator="y" withNativeClient="n" firstLinedescription="n" structure="CSV" filename="$SUPERX_DIR/db/install/schluesseltabellen/release_unloads/aggregierung.unl"/>
@@ -305,6 +311,11 @@
 </dbi:data>
 </dbi:dbaction>
 <dbi:dbaction dbi:action="importFile">
+<dbi:data database="eduetl" table="k_astat_faechergruppe">
+<dbi:file encoding="UTF-8" separator="^" trailingSeparator="y" withNativeClient="n" firstLinedescription="n" structure="CSV" filename="$SUPERX_DIR/db/install/schluesseltabellen/release_unloads/k_astat_faechergruppe.unl"/>
+</dbi:data>
+</dbi:dbaction>
+<dbi:dbaction dbi:action="importFile">
 <dbi:data database="eduetl" table="k_astat_staat">
 <dbi:file encoding="UTF-8" separator="^" trailingSeparator="y" withNativeClient="n" firstLinedescription="n" structure="CSV" filename="$SUPERX_DIR/db/install/schluesseltabellen/release_unloads/k_astat_staat.unl"/>
 </dbi:data>
@@ -314,6 +325,16 @@
 <dbi:file encoding="UTF-8" separator="^" trailingSeparator="y" withNativeClient="n" firstLinedescription="n" structure="CSV" filename="$SUPERX_DIR/db/install/schluesseltabellen/release_unloads/k_astat_kontinent.unl"/>
 </dbi:data>
 </dbi:dbaction>
+<dbi:dbaction dbi:action="importFile">
+<dbi:data database="eduetl" table="k_astat_abschl_grp">
+<dbi:file encoding="UTF-8" separator="^" trailingSeparator="y" withNativeClient="n" firstLinedescription="n" structure="CSV" filename="$SUPERX_DIR/db/install/schluesseltabellen/release_unloads/k_astat_abschl_grp.unl"/>
+</dbi:data>
+</dbi:dbaction>
+<dbi:dbaction dbi:action="importFile">
+<dbi:data database="eduetl" table="k_astat_staat_eu">
+<dbi:file encoding="UTF-8" separator="^" trailingSeparator="y" withNativeClient="n" firstLinedescription="n" structure="CSV" filename="$SUPERX_DIR/db/install/schluesseltabellen/release_unloads/k_astat_staat_eu.unl"/>
+</dbi:data>
+</dbi:dbaction>
 <dbi:dbaction dbi:action="executeFile">
 <dbi:file database="eduetl" encoding="UTF-8" withNativeClient="n" structure="SQL" filename="$SUPERX_DIR/db/install/schluesseltabellen/macro_masken_bez_fuellen.sql"/>
 </dbi:dbaction>

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

@@ -7,7 +7,7 @@
 -- Fülle db_version
 
 delete from db_version  where his_system='kern';
-insert into db_version (his_system,version,systeminfo_id) values('kern','5.0',9);
+insert into db_version (his_system,version,systeminfo_id) values('kern','5.3',9);
 
 
 
@@ -258,10 +258,30 @@ 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='k_astat_staat';
+insert into db_tabellen (name,protokollierung) values('k_astat_staat',0);
+delete from db_tabellen where name='k_astat_kontinent';
+insert into db_tabellen (name,protokollierung) values('k_astat_kontinent',0);
+delete from db_tabellen where name='k_astat_faechergruppe';
+insert into db_tabellen (name,protokollierung) values('k_astat_faechergruppe',0);
+delete from db_tabellen where name='k_astat_abschl_grp';
+insert into db_tabellen (name,protokollierung) values('k_astat_abschl_grp',0);
+delete from db_tabellen where name='k_astat_staat_eu';
+insert into db_tabellen (name,protokollierung) values('k_astat_staat_eu',0);
 delete from db_tabellen where name='sx_mail';
 insert into db_tabellen (name,protokollierung) values('sx_mail',0);
+delete from db_tabellen where name='colorscheme';
+insert into db_tabellen (name,protokollierung) values('colorscheme',0);
+delete from db_tabellen where name='arch_table';
+insert into db_tabellen (name,protokollierung) values('arch_table',0);
+delete from db_tabellen where name='arch_datum';
+insert into db_tabellen (name,protokollierung) values('arch_datum',0);
+delete from db_tabellen where name='k_prio_param';
+insert into db_tabellen (name,protokollierung) values('k_prio_param',0);
+delete from db_tabellen where name='k_source';
+insert into db_tabellen (name,protokollierung) values('k_source',0);
+delete from db_tabellen where name='k_astat_lfb_fg';
+insert into db_tabellen (name,protokollierung) values('k_astat_lfb_fg',0);
 
 
 -- Fülle sachgebiete, systeminfo und themenbaum
@@ -383,16 +403,16 @@ insert into tmp_themenbaum(name, parentname, gueltig_seit,gueltig_bis,erlaeuteru
 delete from tmp_themenbaum where name in (select T.name from themenbaum  T where T.name='Benutzer' 
 or T.name='Administration');
 insert into tmp_themenbaum(name, parentname, gueltig_seit,gueltig_bis,erlaeuterung)
- values('Entwicklung','Administration','01.01.1900','01.01.3000','Spezielle Funktionen für die Entwicklung');
+ values('Stammdaten verwalten','Administration','01.01.1900','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='Entwicklung' 
+delete from tmp_themenbaum where name in (select T.name from themenbaum  T where T.name='Stammdaten verwalten' 
 or T.name='Administration');
 insert into tmp_themenbaum(name, parentname, gueltig_seit,gueltig_bis,erlaeuterung)
- values('Stammdaten verwalten','Administration','01.01.1900','01.01.3000','Abfragen zur Stammdatenverwaltung');
+ values('Datenmanagement','Administration','01.01.1900','01.01.3000','Abfragen zum Datenmanagement');
 
 --gibt es das Thema schon?
-delete from tmp_themenbaum where name in (select T.name from themenbaum  T where T.name='Stammdaten verwalten' 
+delete from tmp_themenbaum where name in (select T.name from themenbaum  T where T.name='Datenmanagement' 
 or T.name='Administration');
 
 --root für das Modul einfügen und in den Themenbaum einhängen
@@ -451,6 +471,12 @@ insert into tmp_themenbaum
    gueltig_bis)
 values('Feld suchen','70570','Felder','01.01.1900','01.01.3000');
 
+insert into tmp_themenbaum
+(  name  ,maskeninfo_id, parentname,
+   gueltig_seit ,
+   gueltig_bis)
+values('User einrichten','70970','Benutzer verwalten','01.01.1900','01.01.3000');
+
 insert into tmp_themenbaum
 (  name  ,maskeninfo_id, parentname,
    gueltig_seit ,
@@ -679,6 +705,18 @@ insert into tmp_themenbaum
    gueltig_bis)
 values('Gastzugang einrichten','71770','Administration','01.01.1900','01.01.3000');
 
+insert into tmp_themenbaum
+(  name  ,maskeninfo_id, parentname,
+   gueltig_seit ,
+   gueltig_bis)
+values('Datenblatt archivieren','71840','Datenmanagement','01.01.1900','01.01.3000');
+
+insert into tmp_themenbaum
+(  name  ,maskeninfo_id, parentname,
+   gueltig_seit ,
+   gueltig_bis)
+values('Übersicht Datenblatt-Archiv','71860','Datenmanagement','01.01.1900','01.01.3000');
+
 --gibt es die Maske schon?
 delete from tmp_themenbaum where maskeninfo_id in (select T.maskeninfo_id from themenbaum  T);
 
@@ -708,8 +746,8 @@ update themenbaum set erlaeuterung='Abfragen zur Maskenverwaltung' where name='M
 update themenbaum set erlaeuterung='Uploads/Downloads verwalten' where name='Uploads/Downloads verwalten';
 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';
+update themenbaum set erlaeuterung='Abfragen zum Datenmanagement' where name='Datenmanagement';
  
 CREATE temp TABLE tmp_db_forms (
     tid serial NOT NULL,
@@ -736,13 +774,13 @@ values ('felderinfo','felderinfo','/edit/kern/felderinfo_edit.jsp','Felderinfo v
 insert into tmp_db_forms (name, tablename,form_path,caption,description)
 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'::varchar(200),'In diesem Formular können Sie Benutzern Sachgebietsrechte geben. Achtung: Einträge von externem System (HisInOne) werden bei Neuanmeldung überschrieben'::varchar(255));
+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'::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));
+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'::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'::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));
+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'::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)

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

@@ -7,7 +7,7 @@
 -- Fülle db_version
 
 delete from db_version  where his_system='kern';
-insert into db_version (his_system,version,systeminfo_id) values('kern','5.0',9);
+insert into db_version (his_system,version,systeminfo_id) values('kern','5.3',9);
 
 
 
@@ -258,14 +258,30 @@ 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);
 delete from db_tabellen where name='k_astat_staat';
 insert into db_tabellen (name,protokollierung) values('k_astat_staat',0);
 delete from db_tabellen where name='k_astat_kontinent';
 insert into db_tabellen (name,protokollierung) values('k_astat_kontinent',0);
+delete from db_tabellen where name='k_astat_faechergruppe';
+insert into db_tabellen (name,protokollierung) values('k_astat_faechergruppe',0);
+delete from db_tabellen where name='k_astat_abschl_grp';
+insert into db_tabellen (name,protokollierung) values('k_astat_abschl_grp',0);
+delete from db_tabellen where name='k_astat_staat_eu';
+insert into db_tabellen (name,protokollierung) values('k_astat_staat_eu',0);
+delete from db_tabellen where name='sx_mail';
+insert into db_tabellen (name,protokollierung) values('sx_mail',0);
+delete from db_tabellen where name='colorscheme';
+insert into db_tabellen (name,protokollierung) values('colorscheme',0);
+delete from db_tabellen where name='arch_table';
+insert into db_tabellen (name,protokollierung) values('arch_table',0);
+delete from db_tabellen where name='arch_datum';
+insert into db_tabellen (name,protokollierung) values('arch_datum',0);
+delete from db_tabellen where name='k_prio_param';
+insert into db_tabellen (name,protokollierung) values('k_prio_param',0);
+delete from db_tabellen where name='k_source';
+insert into db_tabellen (name,protokollierung) values('k_source',0);
+delete from db_tabellen where name='k_astat_lfb_fg';
+insert into db_tabellen (name,protokollierung) values('k_astat_lfb_fg',0);
 
 
 -- Fülle sachgebiete, systeminfo und themenbaum
@@ -389,16 +405,16 @@ insert into tmp_themenbaum(name, parentname, gueltig_seit,gueltig_bis,erlaeuteru
 delete from tmp_themenbaum where name in (select T.name from themenbaum  T where T.name='Benutzer' 
 or T.name='Administration');
 insert into tmp_themenbaum(name, parentname, gueltig_seit,gueltig_bis,erlaeuterung)
- values('Entwicklung','Administration',date_val('01.01.1900'),date_val('01.01.3000'),'Spezielle Funktionen für die Entwicklung');
+ 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='Entwicklung' 
+delete from tmp_themenbaum where name in (select T.name from themenbaum  T where T.name='Stammdaten verwalten' 
 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');
+ values('Datenmanagement','Administration',date_val('01.01.1900'),date_val('01.01.3000'),'Abfragen zum Datenmanagement');
 
 --gibt es das Thema schon?
-delete from tmp_themenbaum where name in (select T.name from themenbaum  T where T.name='Stammdaten verwalten' 
+delete from tmp_themenbaum where name in (select T.name from themenbaum  T where T.name='Datenmanagement' 
 or T.name='Administration');
 
 --root für das Modul einfügen und in den Themenbaum einhängen
@@ -457,6 +473,12 @@ insert into tmp_themenbaum
    gueltig_bis)
 values('Feld suchen','70570','Felder',date_val('01.01.1900'),date_val('01.01.3000'));
 
+insert into tmp_themenbaum
+(  name  ,maskeninfo_id, parentname,
+   gueltig_seit ,
+   gueltig_bis)
+values('User einrichten','70970','Benutzer verwalten',date_val('01.01.1900'),date_val('01.01.3000'));
+
 insert into tmp_themenbaum
 (  name  ,maskeninfo_id, parentname,
    gueltig_seit ,
@@ -685,6 +707,18 @@ insert into tmp_themenbaum
    gueltig_bis)
 values('Gastzugang einrichten','71770','Administration',date_val('01.01.1900'),date_val('01.01.3000'));
 
+insert into tmp_themenbaum
+(  name  ,maskeninfo_id, parentname,
+   gueltig_seit ,
+   gueltig_bis)
+values('Datenblatt archivieren','71840','Datenmanagement',date_val('01.01.1900'),date_val('01.01.3000'));
+
+insert into tmp_themenbaum
+(  name  ,maskeninfo_id, parentname,
+   gueltig_seit ,
+   gueltig_bis)
+values('Übersicht Datenblatt-Archiv','71860','Datenmanagement',date_val('01.01.1900'),date_val('01.01.3000'));
+
 --gibt es die Maske schon?
 delete from tmp_themenbaum where maskeninfo_id in (select T.maskeninfo_id from themenbaum  T);
 
@@ -716,8 +750,8 @@ update themenbaum set erlaeuterung='Abfragen zur Maskenverwaltung' where name='M
 update themenbaum set erlaeuterung='Uploads/Downloads verwalten' where name='Uploads/Downloads verwalten';
 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';
+update themenbaum set erlaeuterung='Abfragen zum Datenmanagement' where name='Datenmanagement';
  
 CREATE temp TABLE tmp_db_forms (
     tid serial NOT NULL,
@@ -744,13 +778,13 @@ values ('felderinfo','felderinfo','/edit/kern/felderinfo_edit.jsp','Felderinfo v
 insert into tmp_db_forms (name, tablename,form_path,caption,description)
 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'::varchar(200),'In diesem Formular können Sie Benutzern Sachgebietsrechte geben. Achtung: Einträge von externem System (HisInOne) werden bei Neuanmeldung überschrieben'::varchar(255));
+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'::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));
+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'::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'::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));
+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'::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)

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

@@ -1979,4 +1979,112 @@
 <dbi:file encoding="UTF-8" separator="^" trailingSeparator="y" withNativeClient="n" firstLinedescription="n" structure="CSV" filename="$SUPERX_DIR/db/install/masken/71820_maske_system_bez.unl"/>
 </dbi:data>
 </dbi:dbaction>
+<dbi:dbaction dbi:action="sqlexec">eduetl:delete from maskeninfo where tid = 71840;
+</dbi:dbaction>
+<dbi:dbaction dbi:action="sqlexec">eduetl:delete from felderinfo where tid in    
+(select felderinfo_id from masken_felder_bez where maskeninfo_id = 71840);
+</dbi:dbaction>
+<dbi:dbaction dbi:action="sqlexec">eduetl:delete from masken_felder_bez where maskeninfo_id = 71840;
+</dbi:dbaction>
+<dbi:dbaction dbi:action="sqlexec">eduetl:delete from sachgeb_maske_bez where maskeninfo_id = 71840;
+</dbi:dbaction>
+<dbi:dbaction dbi:action="sqlexec">eduetl:delete from maske_system_bez where maskeninfo_id = 71840;
+</dbi:dbaction>
+<dbi:dbaction dbi:action="importFile">
+<dbi:data database="eduetl" table="maskeninfo">
+<dbi:file encoding="UTF-8" separator="^" trailingSeparator="y" withNativeClient="n" firstLinedescription="n" structure="CSV" filename="$SUPERX_DIR/db/install/masken/71840_maskeninfo.unl"/>
+</dbi:data>
+</dbi:dbaction>
+<dbi:dbaction dbi:action="importFile">
+<dbi:data database="eduetl" table="felderinfo">
+<dbi:file encoding="UTF-8" separator="^" trailingSeparator="y" withNativeClient="n" firstLinedescription="n" structure="CSV" filename="$SUPERX_DIR/db/install/masken/71840_felderinfo.unl"/>
+</dbi:data>
+</dbi:dbaction>
+<dbi:dbaction dbi:action="importFile">
+<dbi:data database="eduetl" table="masken_felder_bez">
+<dbi:file encoding="UTF-8" separator="^" trailingSeparator="y" withNativeClient="n" firstLinedescription="n" structure="CSV" filename="$SUPERX_DIR/db/install/masken/71840_masken_felder_bez.unl"/>
+</dbi:data>
+</dbi:dbaction>
+<dbi:dbaction dbi:action="importFile">
+<dbi:data database="eduetl" table="sachgeb_maske_bez">
+<dbi:file encoding="UTF-8" separator="^" trailingSeparator="y" withNativeClient="n" firstLinedescription="n" structure="CSV" filename="$SUPERX_DIR/db/install/masken/71840_sachgeb_maske_bez.unl"/>
+</dbi:data>
+</dbi:dbaction>
+<dbi:dbaction dbi:action="importFile">
+<dbi:data database="eduetl" table="maske_system_bez">
+<dbi:file encoding="UTF-8" separator="^" trailingSeparator="y" withNativeClient="n" firstLinedescription="n" structure="CSV" filename="$SUPERX_DIR/db/install/masken/71840_maske_system_bez.unl"/>
+</dbi:data>
+</dbi:dbaction>
+<dbi:dbaction dbi:action="sqlexec">eduetl:delete from maskeninfo where tid = 71860;
+</dbi:dbaction>
+<dbi:dbaction dbi:action="sqlexec">eduetl:delete from felderinfo where tid in    
+(select felderinfo_id from masken_felder_bez where maskeninfo_id = 71860);
+</dbi:dbaction>
+<dbi:dbaction dbi:action="sqlexec">eduetl:delete from masken_felder_bez where maskeninfo_id = 71860;
+</dbi:dbaction>
+<dbi:dbaction dbi:action="sqlexec">eduetl:delete from sachgeb_maske_bez where maskeninfo_id = 71860;
+</dbi:dbaction>
+<dbi:dbaction dbi:action="sqlexec">eduetl:delete from maske_system_bez where maskeninfo_id = 71860;
+</dbi:dbaction>
+<dbi:dbaction dbi:action="importFile">
+<dbi:data database="eduetl" table="maskeninfo">
+<dbi:file encoding="UTF-8" separator="^" trailingSeparator="y" withNativeClient="n" firstLinedescription="n" structure="CSV" filename="$SUPERX_DIR/db/install/masken/71860_maskeninfo.unl"/>
+</dbi:data>
+</dbi:dbaction>
+<dbi:dbaction dbi:action="importFile">
+<dbi:data database="eduetl" table="felderinfo">
+<dbi:file encoding="UTF-8" separator="^" trailingSeparator="y" withNativeClient="n" firstLinedescription="n" structure="CSV" filename="$SUPERX_DIR/db/install/masken/71860_felderinfo.unl"/>
+</dbi:data>
+</dbi:dbaction>
+<dbi:dbaction dbi:action="importFile">
+<dbi:data database="eduetl" table="masken_felder_bez">
+<dbi:file encoding="UTF-8" separator="^" trailingSeparator="y" withNativeClient="n" firstLinedescription="n" structure="CSV" filename="$SUPERX_DIR/db/install/masken/71860_masken_felder_bez.unl"/>
+</dbi:data>
+</dbi:dbaction>
+<dbi:dbaction dbi:action="importFile">
+<dbi:data database="eduetl" table="sachgeb_maske_bez">
+<dbi:file encoding="UTF-8" separator="^" trailingSeparator="y" withNativeClient="n" firstLinedescription="n" structure="CSV" filename="$SUPERX_DIR/db/install/masken/71860_sachgeb_maske_bez.unl"/>
+</dbi:data>
+</dbi:dbaction>
+<dbi:dbaction dbi:action="importFile">
+<dbi:data database="eduetl" table="maske_system_bez">
+<dbi:file encoding="UTF-8" separator="^" trailingSeparator="y" withNativeClient="n" firstLinedescription="n" structure="CSV" filename="$SUPERX_DIR/db/install/masken/71860_maske_system_bez.unl"/>
+</dbi:data>
+</dbi:dbaction>
+<dbi:dbaction dbi:action="sqlexec">eduetl:delete from maskeninfo where tid = 71880;
+</dbi:dbaction>
+<dbi:dbaction dbi:action="sqlexec">eduetl:delete from felderinfo where tid in    
+(select felderinfo_id from masken_felder_bez where maskeninfo_id = 71880);
+</dbi:dbaction>
+<dbi:dbaction dbi:action="sqlexec">eduetl:delete from masken_felder_bez where maskeninfo_id = 71880;
+</dbi:dbaction>
+<dbi:dbaction dbi:action="sqlexec">eduetl:delete from sachgeb_maske_bez where maskeninfo_id = 71880;
+</dbi:dbaction>
+<dbi:dbaction dbi:action="sqlexec">eduetl:delete from maske_system_bez where maskeninfo_id = 71880;
+</dbi:dbaction>
+<dbi:dbaction dbi:action="importFile">
+<dbi:data database="eduetl" table="maskeninfo">
+<dbi:file encoding="UTF-8" separator="^" trailingSeparator="y" withNativeClient="n" firstLinedescription="n" structure="CSV" filename="$SUPERX_DIR/db/install/masken/71880_maskeninfo.unl"/>
+</dbi:data>
+</dbi:dbaction>
+<dbi:dbaction dbi:action="importFile">
+<dbi:data database="eduetl" table="felderinfo">
+<dbi:file encoding="UTF-8" separator="^" trailingSeparator="y" withNativeClient="n" firstLinedescription="n" structure="CSV" filename="$SUPERX_DIR/db/install/masken/71880_felderinfo.unl"/>
+</dbi:data>
+</dbi:dbaction>
+<dbi:dbaction dbi:action="importFile">
+<dbi:data database="eduetl" table="masken_felder_bez">
+<dbi:file encoding="UTF-8" separator="^" trailingSeparator="y" withNativeClient="n" firstLinedescription="n" structure="CSV" filename="$SUPERX_DIR/db/install/masken/71880_masken_felder_bez.unl"/>
+</dbi:data>
+</dbi:dbaction>
+<dbi:dbaction dbi:action="importFile">
+<dbi:data database="eduetl" table="sachgeb_maske_bez">
+<dbi:file encoding="UTF-8" separator="^" trailingSeparator="y" withNativeClient="n" firstLinedescription="n" structure="CSV" filename="$SUPERX_DIR/db/install/masken/71880_sachgeb_maske_bez.unl"/>
+</dbi:data>
+</dbi:dbaction>
+<dbi:dbaction dbi:action="importFile">
+<dbi:data database="eduetl" table="maske_system_bez">
+<dbi:file encoding="UTF-8" separator="^" trailingSeparator="y" withNativeClient="n" firstLinedescription="n" structure="CSV" filename="$SUPERX_DIR/db/install/masken/71880_maske_system_bez.unl"/>
+</dbi:data>
+</dbi:dbaction>
 </dbi:dbactions>

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

@@ -1979,4 +1979,112 @@
 <dbi:file encoding="UTF-8" separator="^" trailingSeparator="y" withNativeClient="y" firstLinedescription="n" structure="CSV" filename="$SUPERX_DIR/db/install/masken/71820_maske_system_bez.unl"/>
 </dbi:data>
 </dbi:dbaction>
+<dbi:dbaction dbi:action="exportFile">
+<dbi:data sqlVarDatabase="" database="eduetl">
+<extraction-sql>select * from maskeninfo where tid = 71840;
+</extraction-sql>
+<dbi:file encoding="UTF-8" separator="^" trailingSeparator="y" withNativeClient="y" firstLinedescription="n" structure="CSV" filename="$SUPERX_DIR/db/install/masken/71840_maskeninfo.unl"/>
+</dbi:data>
+</dbi:dbaction>
+<dbi:dbaction dbi:action="exportFile">
+<dbi:data sqlVarDatabase="" database="eduetl">
+<extraction-sql>select * from felderinfo where tid in    
+(select felderinfo_id from masken_felder_bez where maskeninfo_id = 71840) order by tid;
+</extraction-sql>
+<dbi:file encoding="UTF-8" separator="^" trailingSeparator="y" withNativeClient="y" firstLinedescription="n" structure="CSV" filename="$SUPERX_DIR/db/install/masken/71840_felderinfo.unl"/>
+</dbi:data>
+</dbi:dbaction>
+<dbi:dbaction dbi:action="exportFile">
+<dbi:data sqlVarDatabase="" database="eduetl">
+<extraction-sql>select maskeninfo_id, felderinfo_id from masken_felder_bez where maskeninfo_id = 71840 order by 1,2;
+</extraction-sql>
+<dbi:file encoding="UTF-8" separator="^" trailingSeparator="y" withNativeClient="y" firstLinedescription="n" structure="CSV" filename="$SUPERX_DIR/db/install/masken/71840_masken_felder_bez.unl"/>
+</dbi:data>
+</dbi:dbaction>
+<dbi:dbaction dbi:action="exportFile">
+<dbi:data sqlVarDatabase="" database="eduetl">
+<extraction-sql>select sachgebiete_id, maskeninfo_id from sachgeb_maske_bez where maskeninfo_id = 71840 order by 1,2;
+</extraction-sql>
+<dbi:file encoding="UTF-8" separator="^" trailingSeparator="y" withNativeClient="y" firstLinedescription="n" structure="CSV" filename="$SUPERX_DIR/db/install/masken/71840_sachgeb_maske_bez.unl"/>
+</dbi:data>
+</dbi:dbaction>
+<dbi:dbaction dbi:action="exportFile">
+<dbi:data sqlVarDatabase="" database="eduetl">
+<extraction-sql>select maskeninfo_id, systeminfo_id from maske_system_bez where maskeninfo_id = 71840 order by 1,2;
+</extraction-sql>
+<dbi:file encoding="UTF-8" separator="^" trailingSeparator="y" withNativeClient="y" firstLinedescription="n" structure="CSV" filename="$SUPERX_DIR/db/install/masken/71840_maske_system_bez.unl"/>
+</dbi:data>
+</dbi:dbaction>
+<dbi:dbaction dbi:action="exportFile">
+<dbi:data sqlVarDatabase="" database="eduetl">
+<extraction-sql>select * from maskeninfo where tid = 71860;
+</extraction-sql>
+<dbi:file encoding="UTF-8" separator="^" trailingSeparator="y" withNativeClient="y" firstLinedescription="n" structure="CSV" filename="$SUPERX_DIR/db/install/masken/71860_maskeninfo.unl"/>
+</dbi:data>
+</dbi:dbaction>
+<dbi:dbaction dbi:action="exportFile">
+<dbi:data sqlVarDatabase="" database="eduetl">
+<extraction-sql>select * from felderinfo where tid in    
+(select felderinfo_id from masken_felder_bez where maskeninfo_id = 71860) order by tid;
+</extraction-sql>
+<dbi:file encoding="UTF-8" separator="^" trailingSeparator="y" withNativeClient="y" firstLinedescription="n" structure="CSV" filename="$SUPERX_DIR/db/install/masken/71860_felderinfo.unl"/>
+</dbi:data>
+</dbi:dbaction>
+<dbi:dbaction dbi:action="exportFile">
+<dbi:data sqlVarDatabase="" database="eduetl">
+<extraction-sql>select maskeninfo_id, felderinfo_id from masken_felder_bez where maskeninfo_id = 71860 order by 1,2;
+</extraction-sql>
+<dbi:file encoding="UTF-8" separator="^" trailingSeparator="y" withNativeClient="y" firstLinedescription="n" structure="CSV" filename="$SUPERX_DIR/db/install/masken/71860_masken_felder_bez.unl"/>
+</dbi:data>
+</dbi:dbaction>
+<dbi:dbaction dbi:action="exportFile">
+<dbi:data sqlVarDatabase="" database="eduetl">
+<extraction-sql>select sachgebiete_id, maskeninfo_id from sachgeb_maske_bez where maskeninfo_id = 71860 order by 1,2;
+</extraction-sql>
+<dbi:file encoding="UTF-8" separator="^" trailingSeparator="y" withNativeClient="y" firstLinedescription="n" structure="CSV" filename="$SUPERX_DIR/db/install/masken/71860_sachgeb_maske_bez.unl"/>
+</dbi:data>
+</dbi:dbaction>
+<dbi:dbaction dbi:action="exportFile">
+<dbi:data sqlVarDatabase="" database="eduetl">
+<extraction-sql>select maskeninfo_id, systeminfo_id from maske_system_bez where maskeninfo_id = 71860 order by 1,2;
+</extraction-sql>
+<dbi:file encoding="UTF-8" separator="^" trailingSeparator="y" withNativeClient="y" firstLinedescription="n" structure="CSV" filename="$SUPERX_DIR/db/install/masken/71860_maske_system_bez.unl"/>
+</dbi:data>
+</dbi:dbaction>
+<dbi:dbaction dbi:action="exportFile">
+<dbi:data sqlVarDatabase="" database="eduetl">
+<extraction-sql>select * from maskeninfo where tid = 71880;
+</extraction-sql>
+<dbi:file encoding="UTF-8" separator="^" trailingSeparator="y" withNativeClient="y" firstLinedescription="n" structure="CSV" filename="$SUPERX_DIR/db/install/masken/71880_maskeninfo.unl"/>
+</dbi:data>
+</dbi:dbaction>
+<dbi:dbaction dbi:action="exportFile">
+<dbi:data sqlVarDatabase="" database="eduetl">
+<extraction-sql>select * from felderinfo where tid in    
+(select felderinfo_id from masken_felder_bez where maskeninfo_id = 71880) order by tid;
+</extraction-sql>
+<dbi:file encoding="UTF-8" separator="^" trailingSeparator="y" withNativeClient="y" firstLinedescription="n" structure="CSV" filename="$SUPERX_DIR/db/install/masken/71880_felderinfo.unl"/>
+</dbi:data>
+</dbi:dbaction>
+<dbi:dbaction dbi:action="exportFile">
+<dbi:data sqlVarDatabase="" database="eduetl">
+<extraction-sql>select maskeninfo_id, felderinfo_id from masken_felder_bez where maskeninfo_id = 71880 order by 1,2;
+</extraction-sql>
+<dbi:file encoding="UTF-8" separator="^" trailingSeparator="y" withNativeClient="y" firstLinedescription="n" structure="CSV" filename="$SUPERX_DIR/db/install/masken/71880_masken_felder_bez.unl"/>
+</dbi:data>
+</dbi:dbaction>
+<dbi:dbaction dbi:action="exportFile">
+<dbi:data sqlVarDatabase="" database="eduetl">
+<extraction-sql>select sachgebiete_id, maskeninfo_id from sachgeb_maske_bez where maskeninfo_id = 71880 order by 1,2;
+</extraction-sql>
+<dbi:file encoding="UTF-8" separator="^" trailingSeparator="y" withNativeClient="y" firstLinedescription="n" structure="CSV" filename="$SUPERX_DIR/db/install/masken/71880_sachgeb_maske_bez.unl"/>
+</dbi:data>
+</dbi:dbaction>
+<dbi:dbaction dbi:action="exportFile">
+<dbi:data sqlVarDatabase="" database="eduetl">
+<extraction-sql>select maskeninfo_id, systeminfo_id from maske_system_bez where maskeninfo_id = 71880 order by 1,2;
+</extraction-sql>
+<dbi:file encoding="UTF-8" separator="^" trailingSeparator="y" withNativeClient="y" firstLinedescription="n" structure="CSV" filename="$SUPERX_DIR/db/install/masken/71880_maske_system_bez.unl"/>
+</dbi:data>
+</dbi:dbaction>
 </dbi:dbactions>

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

@@ -328,3 +328,21 @@ delete from felderinfo where tid in
 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;
+delete from maskeninfo where tid = 71840;
+delete from felderinfo where tid in    
+(select felderinfo_id from masken_felder_bez where maskeninfo_id = 71840);
+delete from masken_felder_bez where maskeninfo_id = 71840;
+delete from sachgeb_maske_bez where maskeninfo_id = 71840;
+delete from maske_system_bez where maskeninfo_id = 71840;
+delete from maskeninfo where tid = 71860;
+delete from felderinfo where tid in    
+(select felderinfo_id from masken_felder_bez where maskeninfo_id = 71860);
+delete from masken_felder_bez where maskeninfo_id = 71860;
+delete from sachgeb_maske_bez where maskeninfo_id = 71860;
+delete from maske_system_bez where maskeninfo_id = 71860;
+delete from maskeninfo where tid = 71880;
+delete from felderinfo where tid in    
+(select felderinfo_id from masken_felder_bez where maskeninfo_id = 71880);
+delete from masken_felder_bez where maskeninfo_id = 71880;
+delete from sachgeb_maske_bez where maskeninfo_id = 71880;
+delete from maske_system_bez where maskeninfo_id = 71880;

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

@@ -604,4 +604,37 @@
 </dbi:dbaction>
 <dbi:dbaction dbi:action="sqlexec">eduetl:delete from maske_system_bez where maskeninfo_id = 71820;
 </dbi:dbaction>
+<dbi:dbaction dbi:action="sqlexec">eduetl:delete from maskeninfo where tid = 71840;
+</dbi:dbaction>
+<dbi:dbaction dbi:action="sqlexec">eduetl:delete from felderinfo where tid in    
+(select felderinfo_id from masken_felder_bez where maskeninfo_id = 71840);
+</dbi:dbaction>
+<dbi:dbaction dbi:action="sqlexec">eduetl:delete from masken_felder_bez where maskeninfo_id = 71840;
+</dbi:dbaction>
+<dbi:dbaction dbi:action="sqlexec">eduetl:delete from sachgeb_maske_bez where maskeninfo_id = 71840;
+</dbi:dbaction>
+<dbi:dbaction dbi:action="sqlexec">eduetl:delete from maske_system_bez where maskeninfo_id = 71840;
+</dbi:dbaction>
+<dbi:dbaction dbi:action="sqlexec">eduetl:delete from maskeninfo where tid = 71860;
+</dbi:dbaction>
+<dbi:dbaction dbi:action="sqlexec">eduetl:delete from felderinfo where tid in    
+(select felderinfo_id from masken_felder_bez where maskeninfo_id = 71860);
+</dbi:dbaction>
+<dbi:dbaction dbi:action="sqlexec">eduetl:delete from masken_felder_bez where maskeninfo_id = 71860;
+</dbi:dbaction>
+<dbi:dbaction dbi:action="sqlexec">eduetl:delete from sachgeb_maske_bez where maskeninfo_id = 71860;
+</dbi:dbaction>
+<dbi:dbaction dbi:action="sqlexec">eduetl:delete from maske_system_bez where maskeninfo_id = 71860;
+</dbi:dbaction>
+<dbi:dbaction dbi:action="sqlexec">eduetl:delete from maskeninfo where tid = 71880;
+</dbi:dbaction>
+<dbi:dbaction dbi:action="sqlexec">eduetl:delete from felderinfo where tid in    
+(select felderinfo_id from masken_felder_bez where maskeninfo_id = 71880);
+</dbi:dbaction>
+<dbi:dbaction dbi:action="sqlexec">eduetl:delete from masken_felder_bez where maskeninfo_id = 71880;
+</dbi:dbaction>
+<dbi:dbaction dbi:action="sqlexec">eduetl:delete from sachgeb_maske_bez where maskeninfo_id = 71880;
+</dbi:dbaction>
+<dbi:dbaction dbi:action="sqlexec">eduetl:delete from maske_system_bez where maskeninfo_id = 71880;
+</dbi:dbaction>
 </dbi:dbactions>

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

@@ -41,6 +41,16 @@
 </dbi:dbaction>
 <dbi:dbaction dbi:action="sqlexec">eduetl:delete from k_astat_studienbereich;
 </dbi:dbaction>
+<dbi:dbaction dbi:action="sqlexec">eduetl:delete from k_astat_faechergruppe;
+</dbi:dbaction>
+<dbi:dbaction dbi:action="sqlexec">eduetl:delete from k_astat_staat;
+</dbi:dbaction>
+<dbi:dbaction dbi:action="sqlexec">eduetl:delete from k_astat_kontinent;
+</dbi:dbaction>
+<dbi:dbaction dbi:action="sqlexec">eduetl:delete from k_astat_abschl_grp;
+</dbi:dbaction>
+<dbi:dbaction dbi:action="sqlexec">eduetl:delete from k_astat_staat_eu;
+</dbi:dbaction>
 <dbi:dbaction dbi:action="importFile">
 <dbi:data database="eduetl" table="tmp_menu_element">
 <dbi:file encoding="UTF-8" separator="^" trailingSeparator="y" withNativeClient="n" firstLinedescription="n" structure="CSV" filename="$SUPERX_DIR/db/install/schluesseltabellen/release_unloads/menu_element.unl"/>
@@ -76,6 +86,31 @@
 <dbi:file encoding="UTF-8" separator="^" trailingSeparator="y" withNativeClient="n" firstLinedescription="n" structure="CSV" filename="$SUPERX_DIR/db/install/schluesseltabellen/release_unloads/k_astat_studienbereich.unl"/>
 </dbi:data>
 </dbi:dbaction>
+<dbi:dbaction dbi:action="importFile">
+<dbi:data database="eduetl" table="k_astat_faechergruppe">
+<dbi:file encoding="UTF-8" separator="^" trailingSeparator="y" withNativeClient="n" firstLinedescription="n" structure="CSV" filename="$SUPERX_DIR/db/install/schluesseltabellen/release_unloads/k_astat_faechergruppe.unl"/>
+</dbi:data>
+</dbi:dbaction>
+<dbi:dbaction dbi:action="importFile">
+<dbi:data database="eduetl" table="k_astat_staat">
+<dbi:file encoding="UTF-8" separator="^" trailingSeparator="y" withNativeClient="n" firstLinedescription="n" structure="CSV" filename="$SUPERX_DIR/db/install/schluesseltabellen/release_unloads/k_astat_staat.unl"/>
+</dbi:data>
+</dbi:dbaction>
+<dbi:dbaction dbi:action="importFile">
+<dbi:data database="eduetl" table="k_astat_kontinent">
+<dbi:file encoding="UTF-8" separator="^" trailingSeparator="y" withNativeClient="n" firstLinedescription="n" structure="CSV" filename="$SUPERX_DIR/db/install/schluesseltabellen/release_unloads/k_astat_kontinent.unl"/>
+</dbi:data>
+</dbi:dbaction>
+<dbi:dbaction dbi:action="importFile">
+<dbi:data database="eduetl" table="k_astat_abschl_grp">
+<dbi:file encoding="UTF-8" separator="^" trailingSeparator="y" withNativeClient="n" firstLinedescription="n" structure="CSV" filename="$SUPERX_DIR/db/install/schluesseltabellen/release_unloads/k_astat_abschl_grp.unl"/>
+</dbi:data>
+</dbi:dbaction>
+<dbi:dbaction dbi:action="importFile">
+<dbi:data database="eduetl" table="k_astat_staat_eu">
+<dbi:file encoding="UTF-8" separator="^" trailingSeparator="y" withNativeClient="n" firstLinedescription="n" structure="CSV" filename="$SUPERX_DIR/db/install/schluesseltabellen/release_unloads/k_astat_staat_eu.unl"/>
+</dbi:data>
+</dbi:dbaction>
 <dbi:dbaction dbi:action="executeFile">
 <dbi:file database="eduetl" encoding="UTF-8" withNativeClient="n" structure="SQL" filename="$SUPERX_DIR/db/install/upgrade/kern_drop_views_ids.sql"/>
 </dbi:dbaction>
@@ -179,9 +214,6 @@
 <dbi:file database="eduetl" encoding="UTF-8" withNativeClient="n" structure="SQL" filename="$SUPERX_DIR/db/install/schluesseltabellen/cif_fuellen.sql"/>
 </dbi:dbaction>
 <dbi:dbaction dbi:action="executeFile">
-<dbi:file database="eduetl" encoding="UTF-8" withNativeClient="n" structure="SQL" filename="$SUPERX_DIR/db/install/upgrade/cif_fuellen_key_2.sql"/>
-</dbi:dbaction>
-<dbi:dbaction dbi:action="executeFile">
 <dbi:file database="eduetl" encoding="UTF-8" withNativeClient="n" structure="SQL" filename="$SUPERX_DIR/db/install/upgrade/menu_element_upgrade.sql"/>
 </dbi:dbaction>
 <dbi:dbaction dbi:action="executeFile">
@@ -218,7 +250,10 @@
 <dbi:file encoding="UTF-8" separator="^" trailingSeparator="y" withNativeClient="n" firstLinedescription="n" structure="CSV" filename="$SUPERX_DIR/db/install/schluesseltabellen/release_unloads/aggre_bland.unl"/>
 </dbi:data>
 </dbi:dbaction>
-<dbi:dbaction dbi:action="sqlexec">eduetl:UPDATE db_version SET version = '5.0'
+<dbi:dbaction dbi:action="executeFile">
+<dbi:file database="eduetl" encoding="UTF-8" withNativeClient="n" structure="SQL" filename="$SUPERX_DIR/db/install/schluesseltabellen/themenbaum_update_logo_css.sql"/>
+</dbi:dbaction>
+<dbi:dbaction dbi:action="sqlexec">eduetl:UPDATE db_version SET version = '5.3'
   WHERE his_system = 'kern';
 </dbi:dbaction>
 <dbi:dbaction dbi:action="executeFile">

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

@@ -41,10 +41,16 @@
 </dbi:dbaction>
 <dbi:dbaction dbi:action="sqlexec">eduetl:truncate table k_astat_studienbereich cascade;
 </dbi:dbaction>
+<dbi:dbaction dbi:action="sqlexec">eduetl:truncate table k_astat_faechergruppe cascade;
+</dbi:dbaction>
 <dbi:dbaction dbi:action="sqlexec">eduetl:truncate table k_astat_staat cascade;
 </dbi:dbaction>
 <dbi:dbaction dbi:action="sqlexec">eduetl:truncate table k_astat_kontinent cascade;
 </dbi:dbaction>
+<dbi:dbaction dbi:action="sqlexec">eduetl:truncate table k_astat_abschl_grp cascade;
+</dbi:dbaction>
+<dbi:dbaction dbi:action="sqlexec">eduetl:truncate table k_astat_staat_eu cascade;
+</dbi:dbaction>
 <dbi:dbaction dbi:action="importFile">
 <dbi:data database="eduetl" table="tmp_menu_element">
 <dbi:file encoding="UTF-8" separator="^" trailingSeparator="y" withNativeClient="n" firstLinedescription="n" structure="CSV" filename="$SUPERX_DIR/db/install/schluesseltabellen/release_unloads/menu_element.unl"/>
@@ -81,6 +87,11 @@
 </dbi:data>
 </dbi:dbaction>
 <dbi:dbaction dbi:action="importFile">
+<dbi:data database="eduetl" table="k_astat_faechergruppe">
+<dbi:file encoding="UTF-8" separator="^" trailingSeparator="y" withNativeClient="n" firstLinedescription="n" structure="CSV" filename="$SUPERX_DIR/db/install/schluesseltabellen/release_unloads/k_astat_faechergruppe.unl"/>
+</dbi:data>
+</dbi:dbaction>
+<dbi:dbaction dbi:action="importFile">
 <dbi:data database="eduetl" table="k_astat_staat">
 <dbi:file encoding="UTF-8" separator="^" trailingSeparator="y" withNativeClient="n" firstLinedescription="n" structure="CSV" filename="$SUPERX_DIR/db/install/schluesseltabellen/release_unloads/k_astat_staat.unl"/>
 </dbi:data>
@@ -90,6 +101,16 @@
 <dbi:file encoding="UTF-8" separator="^" trailingSeparator="y" withNativeClient="n" firstLinedescription="n" structure="CSV" filename="$SUPERX_DIR/db/install/schluesseltabellen/release_unloads/k_astat_kontinent.unl"/>
 </dbi:data>
 </dbi:dbaction>
+<dbi:dbaction dbi:action="importFile">
+<dbi:data database="eduetl" table="k_astat_abschl_grp">
+<dbi:file encoding="UTF-8" separator="^" trailingSeparator="y" withNativeClient="n" firstLinedescription="n" structure="CSV" filename="$SUPERX_DIR/db/install/schluesseltabellen/release_unloads/k_astat_abschl_grp.unl"/>
+</dbi:data>
+</dbi:dbaction>
+<dbi:dbaction dbi:action="importFile">
+<dbi:data database="eduetl" table="k_astat_staat_eu">
+<dbi:file encoding="UTF-8" separator="^" trailingSeparator="y" withNativeClient="n" firstLinedescription="n" structure="CSV" filename="$SUPERX_DIR/db/install/schluesseltabellen/release_unloads/k_astat_staat_eu.unl"/>
+</dbi:data>
+</dbi:dbaction>
 <dbi:dbaction dbi:action="executeFile">
 <dbi:file database="eduetl" encoding="UTF-8" withNativeClient="n" structure="SQL" filename="$SUPERX_DIR/db/install/upgrade/kern_drop_views_pg.sql"/>
 </dbi:dbaction>
@@ -201,9 +222,6 @@
 <dbi:file database="eduetl" encoding="UTF-8" withNativeClient="n" structure="SQL" filename="$SUPERX_DIR/db/install/schluesseltabellen/cif_fuellen.sql"/>
 </dbi:dbaction>
 <dbi:dbaction dbi:action="executeFile">
-<dbi:file database="eduetl" encoding="UTF-8" withNativeClient="n" structure="SQL" filename="$SUPERX_DIR/db/install/upgrade/cif_fuellen_key_2.sql"/>
-</dbi:dbaction>
-<dbi:dbaction dbi:action="executeFile">
 <dbi:file database="eduetl" encoding="UTF-8" withNativeClient="n" structure="SQL" filename="$SUPERX_DIR/db/install/upgrade/menu_element_upgrade.sql"/>
 </dbi:dbaction>
 <dbi:dbaction dbi:action="executeFile">
@@ -242,7 +260,10 @@
 <dbi:file encoding="UTF-8" separator="^" trailingSeparator="y" withNativeClient="n" firstLinedescription="n" structure="CSV" filename="$SUPERX_DIR/db/install/schluesseltabellen/release_unloads/aggre_bland.unl"/>
 </dbi:data>
 </dbi:dbaction>
-<dbi:dbaction dbi:action="sqlexec">eduetl:UPDATE db_version SET version = '5.0'
+<dbi:dbaction dbi:action="executeFile">
+<dbi:file database="eduetl" encoding="UTF-8" withNativeClient="n" structure="SQL" filename="$SUPERX_DIR/db/install/schluesseltabellen/themenbaum_update_logo_css.sql"/>
+</dbi:dbaction>
+<dbi:dbaction dbi:action="sqlexec">eduetl:UPDATE db_version SET version = '5.3'
   WHERE his_system = 'kern';
 </dbi:dbaction>
 <dbi:dbaction dbi:action="sqlquery">eduetl:select setval('themenbaum_tid_seq',(select max(tid)+1 from themenbaum));

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

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

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

@@ -70,6 +70,14 @@
 <arg value="-logger:conf/edustore/db/conf/logging.properties"/>
 <classpath refid="classpath"/>
 </java>
+<!--Test Maske - tid: 70970 - Maskenname: User einrichten-->
+<java classname="de.superx.bin.ExecuteMask" fork="true" failonerror="true" classpathref="classpath" dir="${WEBAPP_DIR}/WEB-INF">
+<arg value="-tid:70970"/>
+<arg value="-out:70970.htm"/>
+<arg value="-user:admin"/>
+<arg value="-logger:conf/edustore/db/conf/logging.properties"/>
+<classpath refid="classpath"/>
+</java>
 <!--Test Maske - tid: 70990 - Maskenname: User löschen-->
 <java classname="de.superx.bin.ExecuteMask" fork="true" failonerror="true" classpathref="classpath" dir="${WEBAPP_DIR}/WEB-INF">
 <arg value="-tid:70990"/>
@@ -374,5 +382,21 @@
 <arg value="-logger:conf/edustore/db/conf/logging.properties"/>
 <classpath refid="classpath"/>
 </java>
+<!--Test Maske - tid: 71840 - Maskenname: Datenblatt archivieren-->
+<java classname="de.superx.bin.ExecuteMask" fork="true" failonerror="true" classpathref="classpath" dir="${WEBAPP_DIR}/WEB-INF">
+<arg value="-tid:71840"/>
+<arg value="-out:71840.htm"/>
+<arg value="-user:admin"/>
+<arg value="-logger:conf/edustore/db/conf/logging.properties"/>
+<classpath refid="classpath"/>
+</java>
+<!--Test Maske - tid: 71860 - Maskenname: Übersicht Datenblatt-Archiv-->
+<java classname="de.superx.bin.ExecuteMask" fork="true" failonerror="true" classpathref="classpath" dir="${WEBAPP_DIR}/WEB-INF">
+<arg value="-tid:71860"/>
+<arg value="-out:71860.htm"/>
+<arg value="-user:admin"/>
+<arg value="-logger:conf/edustore/db/conf/logging.properties"/>
+<classpath refid="classpath"/>
+</java>
 </target>
 </project>

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

@@ -133,7 +133,15 @@ DOQUERY "alter table k_astat_abschluss3steller_land SET SCHEMA $SCHEMA;"
 DOQUERY "alter table k_astat_abschluss2steller SET SCHEMA $SCHEMA;"
 DOQUERY "alter table k_astat_studienbereich SET SCHEMA $SCHEMA;"
 DOQUERY "alter table k_astat_studienfach SET SCHEMA $SCHEMA;"
-DOQUERY "alter table colorscheme SET SCHEMA $SCHEMA;"
-DOQUERY "alter table sx_mail SET SCHEMA $SCHEMA;"
 DOQUERY "alter table k_astat_staat SET SCHEMA $SCHEMA;"
 DOQUERY "alter table k_astat_kontinent SET SCHEMA $SCHEMA;"
+DOQUERY "alter table k_astat_faechergruppe SET SCHEMA $SCHEMA;"
+DOQUERY "alter table k_astat_abschl_grp SET SCHEMA $SCHEMA;"
+DOQUERY "alter table k_astat_staat_eu SET SCHEMA $SCHEMA;"
+DOQUERY "alter table sx_mail SET SCHEMA $SCHEMA;"
+DOQUERY "alter table colorscheme SET SCHEMA $SCHEMA;"
+DOQUERY "alter table arch_table SET SCHEMA $SCHEMA;"
+DOQUERY "alter table arch_datum SET SCHEMA $SCHEMA;"
+DOQUERY "alter table k_prio_param SET SCHEMA $SCHEMA;"
+DOQUERY "alter table k_source SET SCHEMA $SCHEMA;"
+DOQUERY "alter table k_astat_lfb_fg SET SCHEMA $SCHEMA;"

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

@@ -49,6 +49,9 @@ select sp_table_exists('dim_kotr') from xdummy;
 <sqlvar name="dim_kreis_view_exists">
 select sp_table_exists('dim_kreis') from xdummy;
 </sqlvar>
+<sqlvar name="dim_semester_view_exists">
+select sp_table_exists('dim_semester') from xdummy;
+</sqlvar>
 
 </sqlvars>
 
@@ -127,3 +130,8 @@ drop view dim_kotr;
 drop view dim_kreis;
 </#if>
 
+
+<#if dim_semester_view_exists ==1>
+drop view dim_semester;
+</#if>
+

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

@@ -73,6 +73,12 @@ DOQUERY "grant $RIGHT on aggre_bland to $GRANTEE;"
 DOQUERY "grant $RIGHT on cif to $GRANTEE;"
 DOQUERY "grant $RIGHT on cifx to $GRANTEE;"
 DOQUERY "grant $RIGHT on trans_cifx to $GRANTEE;"
+
+if [ "$DATABASE" == "POSTGRES" -a "$RIGHT" != "select" ]
+	then
+DOQUERY "grant  update on trans_cifx_tid_seq to $GRANTEE;"
+fi
+
 DOQUERY "grant $RIGHT on trans_cif to $GRANTEE;"
 DOQUERY "grant $RIGHT on cifx_customize to $GRANTEE;"
 
@@ -427,11 +433,15 @@ DOQUERY "grant $RIGHT on k_astat_abschluss3steller_land to $GRANTEE;"
 DOQUERY "grant $RIGHT on k_astat_abschluss2steller to $GRANTEE;"
 DOQUERY "grant $RIGHT on k_astat_studienbereich to $GRANTEE;"
 DOQUERY "grant $RIGHT on k_astat_studienfach to $GRANTEE;"
-DOQUERY "grant $RIGHT on colorscheme to $GRANTEE;"
+DOQUERY "grant $RIGHT on k_astat_staat to $GRANTEE;"
+DOQUERY "grant $RIGHT on k_astat_kontinent to $GRANTEE;"
+DOQUERY "grant $RIGHT on k_astat_faechergruppe to $GRANTEE;"
+DOQUERY "grant $RIGHT on k_astat_abschl_grp to $GRANTEE;"
+DOQUERY "grant $RIGHT on k_astat_staat_eu to $GRANTEE;"
 
 if [ "$DATABASE" == "POSTGRES" -a "$RIGHT" != "select" ]
 	then
-DOQUERY "grant  update on colorscheme_id_seq to $GRANTEE;"
+DOQUERY "grant  update on k_astat_staat_eu_tid_seq to $GRANTEE;"
 fi
 
 DOQUERY "grant $RIGHT on sx_mail to $GRANTEE;"
@@ -441,8 +451,42 @@ if [ "$DATABASE" == "POSTGRES" -a "$RIGHT" != "select" ]
 DOQUERY "grant  update on sx_mail_tid_seq to $GRANTEE;"
 fi
 
-DOQUERY "grant $RIGHT on k_astat_staat to $GRANTEE;"
-DOQUERY "grant $RIGHT on k_astat_kontinent to $GRANTEE;"
+DOQUERY "grant $RIGHT on colorscheme to $GRANTEE;"
+
+if [ "$DATABASE" == "POSTGRES" -a "$RIGHT" != "select" ]
+	then
+DOQUERY "grant  update on colorscheme_id_seq to $GRANTEE;"
+fi
+
+DOQUERY "grant $RIGHT on arch_table to $GRANTEE;"
+
+if [ "$DATABASE" == "POSTGRES" -a "$RIGHT" != "select" ]
+	then
+DOQUERY "grant  update on arch_table_id_seq to $GRANTEE;"
+fi
+
+DOQUERY "grant $RIGHT on arch_datum to $GRANTEE;"
+DOQUERY "grant $RIGHT on k_prio_param to $GRANTEE;"
+
+if [ "$DATABASE" == "POSTGRES" -a "$RIGHT" != "select" ]
+	then
+DOQUERY "grant  update on k_prio_param_id_seq to $GRANTEE;"
+fi
+
+DOQUERY "grant $RIGHT on k_source to $GRANTEE;"
+
+if [ "$DATABASE" == "POSTGRES" -a "$RIGHT" != "select" ]
+	then
+DOQUERY "grant  update on k_source_id_seq to $GRANTEE;"
+fi
+
+DOQUERY "grant $RIGHT on k_astat_lfb_fg to $GRANTEE;"
+
+if [ "$DATABASE" == "POSTGRES" -a "$RIGHT" != "select" ]
+	then
+DOQUERY "grant  update on k_astat_lfb_fg_tid_seq to $GRANTEE;"
+fi
+
 
 #Besonderheit Kernmodul: 
 #Zum Login braucht man Update Rechte auf einzelne Tabellen:"
@@ -477,6 +521,7 @@ DOQUERY "grant $RIGHT on dim_abschluss to $GRANTEE;"
 DOQUERY "grant $RIGHT on dim_kost to $GRANTEE;"
 DOQUERY "grant $RIGHT on dim_kotr to $GRANTEE;"
 DOQUERY "grant $RIGHT on dim_kreis to $GRANTEE;"
+DOQUERY "grant $RIGHT on dim_semester to $GRANTEE;"
 
 if [ "$DATABASE" == "POSTGRES" ]
 	then

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

@@ -2,7 +2,7 @@
 --SQL Script automatisch generiert von SuperX module_upgrade.xsl
 
 delete from db_version  where his_system='kern';
-insert into db_version (his_system,version,systeminfo_id) values('kern','5.0',9);
+insert into db_version (his_system,version,systeminfo_id) values('kern','5.3',9);
 
  
 CREATE temp TABLE tmp_db_forms (
@@ -30,13 +30,13 @@ values ('felderinfo','felderinfo','/edit/kern/felderinfo_edit.jsp','Felderinfo v
 insert into tmp_db_forms (name, tablename,form_path,caption,description)
 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'::varchar(200),'In diesem Formular können Sie Benutzern Sachgebietsrechte geben. Achtung: Einträge von externem System (HisInOne) werden bei Neuanmeldung überschrieben'::varchar(255));
+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'::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));
+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'::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'::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));
+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'::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)

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

@@ -73,6 +73,12 @@ DOQUERY "revoke $RIGHT on aggre_bland from $GRANTEE;"
 DOQUERY "revoke $RIGHT on cif from $GRANTEE;"
 DOQUERY "revoke $RIGHT on cifx from $GRANTEE;"
 DOQUERY "revoke $RIGHT on trans_cifx from $GRANTEE;"
+
+if [ "$DATABASE" == "POSTGRES" -a "$RIGHT" != "select" ]
+	then
+DOQUERY "revoke  update on trans_cifx_tid_seq from $GRANTEE;"
+fi
+
 DOQUERY "revoke $RIGHT on trans_cif from $GRANTEE;"
 DOQUERY "revoke $RIGHT on cifx_customize from $GRANTEE;"
 
@@ -427,11 +433,15 @@ DOQUERY "revoke $RIGHT on k_astat_abschluss3steller_land from $GRANTEE;"
 DOQUERY "revoke $RIGHT on k_astat_abschluss2steller from $GRANTEE;"
 DOQUERY "revoke $RIGHT on k_astat_studienbereich from $GRANTEE;"
 DOQUERY "revoke $RIGHT on k_astat_studienfach from $GRANTEE;"
-DOQUERY "revoke $RIGHT on colorscheme from $GRANTEE;"
+DOQUERY "revoke $RIGHT on k_astat_staat from $GRANTEE;"
+DOQUERY "revoke $RIGHT on k_astat_kontinent from $GRANTEE;"
+DOQUERY "revoke $RIGHT on k_astat_faechergruppe from $GRANTEE;"
+DOQUERY "revoke $RIGHT on k_astat_abschl_grp from $GRANTEE;"
+DOQUERY "revoke $RIGHT on k_astat_staat_eu from $GRANTEE;"
 
 if [ "$DATABASE" == "POSTGRES" -a "$RIGHT" != "select" ]
 	then
-DOQUERY "revoke  update on colorscheme_id_seq from $GRANTEE;"
+DOQUERY "revoke  update on k_astat_staat_eu_tid_seq from $GRANTEE;"
 fi
 
 DOQUERY "revoke $RIGHT on sx_mail from $GRANTEE;"
@@ -441,8 +451,42 @@ if [ "$DATABASE" == "POSTGRES" -a "$RIGHT" != "select" ]
 DOQUERY "revoke  update on sx_mail_tid_seq from $GRANTEE;"
 fi
 
-DOQUERY "revoke $RIGHT on k_astat_staat from $GRANTEE;"
-DOQUERY "revoke $RIGHT on k_astat_kontinent from $GRANTEE;"
+DOQUERY "revoke $RIGHT on colorscheme from $GRANTEE;"
+
+if [ "$DATABASE" == "POSTGRES" -a "$RIGHT" != "select" ]
+	then
+DOQUERY "revoke  update on colorscheme_id_seq from $GRANTEE;"
+fi
+
+DOQUERY "revoke $RIGHT on arch_table from $GRANTEE;"
+
+if [ "$DATABASE" == "POSTGRES" -a "$RIGHT" != "select" ]
+	then
+DOQUERY "revoke  update on arch_table_id_seq from $GRANTEE;"
+fi
+
+DOQUERY "revoke $RIGHT on arch_datum from $GRANTEE;"
+DOQUERY "revoke $RIGHT on k_prio_param from $GRANTEE;"
+
+if [ "$DATABASE" == "POSTGRES" -a "$RIGHT" != "select" ]
+	then
+DOQUERY "revoke  update on k_prio_param_id_seq from $GRANTEE;"
+fi
+
+DOQUERY "revoke $RIGHT on k_source from $GRANTEE;"
+
+if [ "$DATABASE" == "POSTGRES" -a "$RIGHT" != "select" ]
+	then
+DOQUERY "revoke  update on k_source_id_seq from $GRANTEE;"
+fi
+
+DOQUERY "revoke $RIGHT on k_astat_lfb_fg from $GRANTEE;"
+
+if [ "$DATABASE" == "POSTGRES" -a "$RIGHT" != "select" ]
+	then
+DOQUERY "revoke  update on k_astat_lfb_fg_tid_seq from $GRANTEE;"
+fi
+
 #Views:
 DOQUERY "revoke $RIGHT on user_groups from $GRANTEE;"
 DOQUERY "revoke $RIGHT on menu_element_fieldmode from $GRANTEE;"
@@ -459,6 +503,7 @@ DOQUERY "revoke $RIGHT on dim_abschluss from $GRANTEE;"
 DOQUERY "revoke $RIGHT on dim_kost from $GRANTEE;"
 DOQUERY "revoke $RIGHT on dim_kotr from $GRANTEE;"
 DOQUERY "revoke $RIGHT on dim_kreis from $GRANTEE;"
+DOQUERY "revoke $RIGHT on dim_semester from $GRANTEE;"
 
 if [ "$DATABASE" == "POSTGRES" ]
 	then

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

@@ -78,6 +78,66 @@ name)
 values('aggregierung',
 'wert');
 
+insert into tmp_fields (
+table_name,
+name) 
+values('arch_datum',
+'arch_table');
+
+insert into tmp_fields (
+table_name,
+name) 
+values('arch_datum',
+'datum');
+
+insert into tmp_fields (
+table_name,
+name) 
+values('arch_datum',
+'bezugszeit_von');
+
+insert into tmp_fields (
+table_name,
+name) 
+values('arch_datum',
+'bezugszeit_bis');
+
+insert into tmp_fields (
+table_name,
+name) 
+values('arch_datum',
+'bezugsart');
+
+insert into tmp_fields (
+table_name,
+name) 
+values('arch_datum',
+'userinfo_id');
+
+insert into tmp_fields (
+table_name,
+name) 
+values('arch_datum',
+'kommentar');
+
+insert into tmp_fields (
+table_name,
+name) 
+values('arch_table',
+'id');
+
+insert into tmp_fields (
+table_name,
+name) 
+values('arch_table',
+'name');
+
+insert into tmp_fields (
+table_name,
+name) 
+values('arch_table',
+'zeitfeld');
+
 insert into tmp_fields (
 table_name,
 name) 
@@ -414,6 +474,18 @@ name)
 values('cifx_customize',
 'uniquename');
 
+insert into tmp_fields (
+table_name,
+name) 
+values('cifx_customize',
+'sort1');
+
+insert into tmp_fields (
+table_name,
+name) 
+values('cifx_customize',
+'struktur_c');
+
 insert into tmp_fields (
 table_name,
 name) 
@@ -1842,6 +1914,36 @@ name)
 values('implicit_orgunit_rights',
 'lid');
 
+insert into tmp_fields (
+table_name,
+name) 
+values('k_astat_abschl_grp',
+'abschluss_astat_bund');
+
+insert into tmp_fields (
+table_name,
+name) 
+values('k_astat_abschl_grp',
+'abschluss_astat_bund_ktxt');
+
+insert into tmp_fields (
+table_name,
+name) 
+values('k_astat_abschl_grp',
+'abschlussart');
+
+insert into tmp_fields (
+table_name,
+name) 
+values('k_astat_abschl_grp',
+'abschluss_grp');
+
+insert into tmp_fields (
+table_name,
+name) 
+values('k_astat_abschl_grp',
+'ist_lehramt');
+
 insert into tmp_fields (
 table_name,
 name) 
@@ -1908,6 +2010,30 @@ name)
 values('k_astat_abschluss3steller_land',
 'keybund');
 
+insert into tmp_fields (
+table_name,
+name) 
+values('k_astat_faechergruppe',
+'schluessel');
+
+insert into tmp_fields (
+table_name,
+name) 
+values('k_astat_faechergruppe',
+'name');
+
+insert into tmp_fields (
+table_name,
+name) 
+values('k_astat_faechergruppe',
+'semester_von');
+
+insert into tmp_fields (
+table_name,
+name) 
+values('k_astat_faechergruppe',
+'semester_bis');
+
 insert into tmp_fields (
 table_name,
 name) 
@@ -1926,6 +2052,60 @@ name)
 values('k_astat_kontinent',
 'name');
 
+insert into tmp_fields (
+table_name,
+name) 
+values('k_astat_lfb_fg',
+'tid');
+
+insert into tmp_fields (
+table_name,
+name) 
+values('k_astat_lfb_fg',
+'fgr');
+
+insert into tmp_fields (
+table_name,
+name) 
+values('k_astat_lfb_fg',
+'fgr_str');
+
+insert into tmp_fields (
+table_name,
+name) 
+values('k_astat_lfb_fg',
+'lfb');
+
+insert into tmp_fields (
+table_name,
+name) 
+values('k_astat_lfb_fg',
+'lfb_str');
+
+insert into tmp_fields (
+table_name,
+name) 
+values('k_astat_lfb_fg',
+'fg');
+
+insert into tmp_fields (
+table_name,
+name) 
+values('k_astat_lfb_fg',
+'fg_str');
+
+insert into tmp_fields (
+table_name,
+name) 
+values('k_astat_lfb_fg',
+'gueltig_von');
+
+insert into tmp_fields (
+table_name,
+name) 
+values('k_astat_lfb_fg',
+'gueltig_bis');
+
 insert into tmp_fields (
 table_name,
 name) 
@@ -1956,6 +2136,48 @@ name)
 values('k_astat_staat',
 'kontinent');
 
+insert into tmp_fields (
+table_name,
+name) 
+values('k_astat_staat_eu',
+'tid');
+
+insert into tmp_fields (
+table_name,
+name) 
+values('k_astat_staat_eu',
+'astat');
+
+insert into tmp_fields (
+table_name,
+name) 
+values('k_astat_staat_eu',
+'eu');
+
+insert into tmp_fields (
+table_name,
+name) 
+values('k_astat_staat_eu',
+'semester_von');
+
+insert into tmp_fields (
+table_name,
+name) 
+values('k_astat_staat_eu',
+'semester_bis');
+
+insert into tmp_fields (
+table_name,
+name) 
+values('k_astat_staat_eu',
+'gueltig_von');
+
+insert into tmp_fields (
+table_name,
+name) 
+values('k_astat_staat_eu',
+'gueltig_bis');
+
 insert into tmp_fields (
 table_name,
 name) 
@@ -1974,6 +2196,18 @@ name)
 values('k_astat_studienbereich',
 'fgr');
 
+insert into tmp_fields (
+table_name,
+name) 
+values('k_astat_studienbereich',
+'semester_von');
+
+insert into tmp_fields (
+table_name,
+name) 
+values('k_astat_studienbereich',
+'semester_bis');
+
 insert into tmp_fields (
 table_name,
 name) 
@@ -1992,6 +2226,18 @@ name)
 values('k_astat_studienfach',
 'sb');
 
+insert into tmp_fields (
+table_name,
+name) 
+values('k_astat_studienfach',
+'semester_von');
+
+insert into tmp_fields (
+table_name,
+name) 
+values('k_astat_studienfach',
+'semester_bis');
+
 insert into tmp_fields (
 table_name,
 name) 
@@ -2046,6 +2292,42 @@ name)
 values('k_astat_studienfach_land',
 'keybund');
 
+insert into tmp_fields (
+table_name,
+name) 
+values('k_prio_param',
+'id');
+
+insert into tmp_fields (
+table_name,
+name) 
+values('k_prio_param',
+'name');
+
+insert into tmp_fields (
+table_name,
+name) 
+values('k_prio_param',
+'sortorder');
+
+insert into tmp_fields (
+table_name,
+name) 
+values('k_source',
+'id');
+
+insert into tmp_fields (
+table_name,
+name) 
+values('k_source',
+'name');
+
+insert into tmp_fields (
+table_name,
+name) 
+values('k_source',
+'sortorder');
+
 insert into tmp_fields (
 table_name,
 name) 
@@ -4554,6 +4836,12 @@ name)
 values('sx_stylesheets',
 'jr_datasource');
 
+insert into tmp_fields (
+table_name,
+name) 
+values('sx_stylesheets',
+'uniquename');
+
 insert into tmp_fields (
 table_name,
 name) 
@@ -4758,6 +5046,12 @@ name)
 values('trans_cif',
 'systeminfo_id');
 
+insert into tmp_fields (
+table_name,
+name) 
+values('trans_cifx',
+'tid');
+
 insert into tmp_fields (
 table_name,
 name) 
@@ -5658,6 +5952,18 @@ name)
 values('userinfo',
 'extern_role_id');
 
+insert into tmp_fields (
+table_name,
+name) 
+values('userinfo',
+'gueltig_von');
+
+insert into tmp_fields (
+table_name,
+name) 
+values('userinfo',
+'gueltig_bis');
+
 insert into tmp_fields (
 table_name,
 name) 

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

@@ -32,7 +32,23 @@ values('aggregierung','','Modulübergreifende Tabelle für Aggregierungen in
 0);
 
 insert into tmp_tables (name,caption,description,table_type,systeminfo_id,systeminfo_orig,thema,sachgebiete_id) 
-values('cif','','',
+values('arch_datum','','',
+'Datentabelle',
+9,
+9,
+'Administration',
+0);
+
+insert into tmp_tables (name,caption,description,table_type,systeminfo_id,systeminfo_orig,thema,sachgebiete_id) 
+values('arch_table','','',
+'Schlüsseltabelle',
+9,
+9,
+'Administration',
+0);
+
+insert into tmp_tables (name,caption,description,table_type,systeminfo_id,systeminfo_orig,thema,sachgebiete_id) 
+values('cif','cif','Schlüsseltabelle für numerische Schlüssel',
 'Schlüsseltabelle',
 9,
 9,
@@ -40,7 +56,7 @@ values('cif','','',
 0);
 
 insert into tmp_tables (name,caption,description,table_type,systeminfo_id,systeminfo_orig,thema,sachgebiete_id) 
-values('cifx','','',
+values('cifx','cifx','Schlüsseltabelle für alphanumerische Schlüssel',
 'Schlüsseltabelle',
 9,
 9,
@@ -56,7 +72,7 @@ values('cifx_customize','','',
 0);
 
 insert into tmp_tables (name,caption,description,table_type,systeminfo_id,systeminfo_orig,thema,sachgebiete_id) 
-values('colorscheme','','',
+values('colorscheme','Farbschema','Farbschema für Diagramm in BI-Analysen festlegen',
 'Schlüsseltabelle',
 9,
 9,
@@ -328,7 +344,7 @@ values('hisinone_deleted_entity','','Entities die in HISinOne gelöscht wurden.'
 0);
 
 insert into tmp_tables (name,caption,description,table_type,systeminfo_id,systeminfo_orig,thema,sachgebiete_id) 
-values('hochschulinfo','','',
+values('hochschulinfo','Hochschulinfo','Name und Adresse der Hochschule',
 'Schlüsseltabelle',
 9,
 9,
@@ -343,6 +359,14 @@ values('implicit_orgunit_rights','','Schlüsseltabelle für LiveMapping',
 'Administration',
 0);
 
+insert into tmp_tables (name,caption,description,table_type,systeminfo_id,systeminfo_orig,thema,sachgebiete_id) 
+values('k_astat_abschl_grp','Amtl.Abschlüsse (Bundesschlüssel) und Gruppen','',
+'Schlüsseltabelle',
+9,
+9,
+'Stammdaten verwalten',
+0);
+
 insert into tmp_tables (name,caption,description,table_type,systeminfo_id,systeminfo_orig,thema,sachgebiete_id) 
 values('k_astat_abschluss2steller','Amtl.Abschluss-Schlüssel (Bundesschlüssel)','',
 'Schlüsseltabelle',
@@ -359,6 +383,14 @@ values('k_astat_abschluss3steller_land','Amtl.Abschluss-Schlüssel (Land) zu Bun
 'Stammdaten verwalten',
 0);
 
+insert into tmp_tables (name,caption,description,table_type,systeminfo_id,systeminfo_orig,thema,sachgebiete_id) 
+values('k_astat_faechergruppe','Amtl.Fächergruppen-Schlüssel (Bundesschlüssel)','',
+'Schlüsseltabelle',
+9,
+9,
+'Stammdaten verwalten',
+0);
+
 insert into tmp_tables (name,caption,description,table_type,systeminfo_id,systeminfo_orig,thema,sachgebiete_id) 
 values('k_astat_kontinent','Kontinent-Schlüssel (Bundesschlüssel)','',
 'Schlüsseltabelle',
@@ -367,6 +399,14 @@ values('k_astat_kontinent','Kontinent-Schlüssel (Bundesschlüssel)','',
 'Stammdaten verwalten',
 0);
 
+insert into tmp_tables (name,caption,description,table_type,systeminfo_id,systeminfo_orig,thema,sachgebiete_id) 
+values('k_astat_lfb_fg','','',
+'Schlüsseltabelle',
+9,
+9,
+'Administration',
+0);
+
 insert into tmp_tables (name,caption,description,table_type,systeminfo_id,systeminfo_orig,thema,sachgebiete_id) 
 values('k_astat_staat','Amtl.Staaten-Schlüssel (Bundesschlüssel)','',
 'Schlüsseltabelle',
@@ -375,6 +415,14 @@ values('k_astat_staat','Amtl.Staaten-Schlüssel (Bundesschlüssel)','',
 'Stammdaten verwalten',
 0);
 
+insert into tmp_tables (name,caption,description,table_type,systeminfo_id,systeminfo_orig,thema,sachgebiete_id) 
+values('k_astat_staat_eu','Staaten nach EU-Mitgliedschaft','',
+'Schlüsseltabelle',
+9,
+9,
+'Studierende, Prüfungen',
+0);
+
 insert into tmp_tables (name,caption,description,table_type,systeminfo_id,systeminfo_orig,thema,sachgebiete_id) 
 values('k_astat_studienbereich','Amtl.Sudienbereich-Schlüssel (Bundesschlüssel)','',
 'Schlüsseltabelle',
@@ -399,6 +447,22 @@ values('k_astat_studienfach_land','Amtl.Fächerschlüssel (Land) zu Bundesschlü
 'Stammdaten verwalten',
 0);
 
+insert into tmp_tables (name,caption,description,table_type,systeminfo_id,systeminfo_orig,thema,sachgebiete_id) 
+values('k_prio_param','','',
+'Schlüsseltabelle',
+9,
+9,
+'Administration',
+0);
+
+insert into tmp_tables (name,caption,description,table_type,systeminfo_id,systeminfo_orig,thema,sachgebiete_id) 
+values('k_source','','',
+'Schlüsseltabelle',
+9,
+9,
+'Administration',
+0);
+
 insert into tmp_tables (name,caption,description,table_type,systeminfo_id,systeminfo_orig,thema,sachgebiete_id) 
 values('kern_cifx_neu','','LAdetabelle für zentrale Stammdaten (derzeit Kostenstellen/Orgunits) durch HLR gefüllt',
 'Datentabelle',
@@ -544,7 +608,7 @@ values('nachricht','','',
 0);
 
 insert into tmp_tables (name,caption,description,table_type,systeminfo_id,systeminfo_orig,thema,sachgebiete_id) 
-values('organigramm','','',
+values('organigramm','Organigramm','Liste der Organisationseinheiten',
 'Schlüsseltabelle',
 9,
 9,
@@ -664,7 +728,7 @@ values('sichtart_rechttabelle','','',
 0);
 
 insert into tmp_tables (name,caption,description,table_type,systeminfo_id,systeminfo_orig,thema,sachgebiete_id) 
-values('sichten','Sichten','Sichten',
+values('sichten','Sichten','Sichten und Bäume für Hierarchien ',
 'Schlüsseltabelle',
 9,
 9,
@@ -712,7 +776,7 @@ values('stylesheet_field','','Zuordnung von Tabellen und Feldern fuer 				Datenb
 0);
 
 insert into tmp_tables (name,caption,description,table_type,systeminfo_id,systeminfo_orig,thema,sachgebiete_id) 
-values('sx_captions','Beschreibungstexte, etc. in der BI pflegen','Felder und Ergebnisparameter über captions anpassen',
+values('sx_captions','Beschriftungen','Beschreibungstexte für Felder und Ergebnisparameter über captions in der BI pflegen',
 'Schlüsseltabelle',
 9,
 9,
@@ -816,7 +880,7 @@ values('systeminfo','','',
 0);
 
 insert into tmp_tables (name,caption,description,table_type,systeminfo_id,systeminfo_orig,thema,sachgebiete_id) 
-values('themenbaum','Themenbaum','Themenbaum',
+values('themenbaum','Themenbaum','Konfiguration der Menüstruktur',
 'Schlüsseltabelle',
 9,
 9,
@@ -832,7 +896,7 @@ values('themenbaum_bak','','',
 0);
 
 insert into tmp_tables (name,caption,description,table_type,systeminfo_id,systeminfo_orig,thema,sachgebiete_id) 
-values('trans_cif','','',
+values('trans_cif','trans_cif','Transfertabelle für numerische Schlüssel',
 'Schlüsseltabelle',
 9,
 9,
@@ -840,7 +904,7 @@ values('trans_cif','','',
 0);
 
 insert into tmp_tables (name,caption,description,table_type,systeminfo_id,systeminfo_orig,thema,sachgebiete_id) 
-values('trans_cifx','','',
+values('trans_cifx','trans_cifx','Transfertabelle für alphanumerische Schlüssel',
 'Schlüsseltabelle',
 9,
 9,
@@ -865,7 +929,7 @@ values('trans_inst','','Tabelle zur Umschlüsselung von Kostenstellen-Nummern
 
 insert into tmp_tables (name,caption,description,table_type,systeminfo_id,systeminfo_orig,thema,sachgebiete_id) 
 values('unload_params','Entladeparameter','Parameter zum Steuern des Entladevorgangs',
-'',
+'Datentabelle',
 9,
 9,
 'Administration',
@@ -1063,6 +1127,14 @@ values('dim_kreis','Landkreis','Landkreise',
 'Studierende',
 0);
 
+insert into tmp_tables (name,caption,description,table_type,systeminfo_id,systeminfo_orig,thema,sachgebiete_id) 
+values('dim_semester','Semester','',
+'Schlüsseltabelle',
+9,
+9,
+'Stammdaten verwalten',
+0);
+
 insert into tmp_tables (name,caption,description,table_type,systeminfo_id,systeminfo_orig,thema,sachgebiete_id) 
 values('dim_staat','Nationalität','Staaten ',
 'Schlüsseltabelle',
@@ -1185,13 +1257,13 @@ values ('felderinfo','felderinfo','/edit/kern/felderinfo_edit.jsp','Felderinfo v
 insert into tmp_db_forms (name, tablename,form_path,caption,description)
 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'::varchar(200),'In diesem Formular können Sie Benutzern Sachgebietsrechte geben. Achtung: Einträge von externem System (HisInOne) werden bei Neuanmeldung überschrieben'::varchar(255));
+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'::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));
+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'::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'::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));
+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'::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)

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

@@ -57,9 +57,9 @@ DOQUERY "select groupinfo_id, maskeninfo_id from group_masken_bez;" false $DBDEL
 DOQUERY "select tid, bland, text from aggre_bland;" false $DBDELIMITER ${BACKUP_PFAD_INDIVIDUELL_MODULE}/aggre_bland.unl txt
 DOQUERY "select tid, hs, key, apnr, d_akt_von, d_akt_bis, kurz, druck, lang_1, lang_2, lang_3, sort1, uniquename from cif;" false $DBDELIMITER ${BACKUP_PFAD_INDIVIDUELL_MODULE}/cif.unl txt
 DOQUERY "select tid, hs, key, apnr, d_akt_von, d_akt_bis, kurz, druck, lang_1, lang_2, lang_3, parent, parent_int, filter, refapnr, astat, bund_apnr, land_apnr, hiskey_id, uniquename, sort1, sort2, sort3, sortc1, sortc2, sourcesystem, sourcesystem_id, intern_int, intern_c, sprache, struktur_int, struktur_c, ebene, lid, parent_lid from cifx;" false $DBDELIMITER ${BACKUP_PFAD_INDIVIDUELL_MODULE}/cifx.unl txt
-DOQUERY "select key, apnr, cifx_tid, sourcesystem, sourcesystem_id, systeminfo_id from trans_cifx;" false $DBDELIMITER ${BACKUP_PFAD_INDIVIDUELL_MODULE}/trans_cifx.unl txt
+DOQUERY "select tid, key, apnr, cifx_tid, sourcesystem, sourcesystem_id, systeminfo_id from trans_cifx;" false $DBDELIMITER ${BACKUP_PFAD_INDIVIDUELL_MODULE}/trans_cifx.unl txt
 DOQUERY "select key, apnr, cif_tid, sourcesystem, sourcesystem_id, systeminfo_id from trans_cif;" false $DBDELIMITER ${BACKUP_PFAD_INDIVIDUELL_MODULE}/trans_cif.unl txt
-DOQUERY "select tid, cifx_table, key, apnr, kurz, druck, lang_1, uniquename from cifx_customize;" false $DBDELIMITER ${BACKUP_PFAD_INDIVIDUELL_MODULE}/cifx_customize.unl txt
+DOQUERY "select tid, cifx_table, key, apnr, kurz, druck, lang_1, uniquename, sort1, struktur_c from cifx_customize;" false $DBDELIMITER ${BACKUP_PFAD_INDIVIDUELL_MODULE}/cifx_customize.unl txt
 DOQUERY "select tid, name, nummer, x, y, buttonbreite, feldbreite, zeilenanzahl, typ, laenge, obligatorisch, art, relation, attribut, defaultwert from felderinfo;" false $DBDELIMITER ${BACKUP_PFAD_INDIVIDUELL_MODULE}/felderinfo.unl txt
 DOQUERY "select name, adresse, hs_nr, kapitel, superx_server, kennung, passwd from hochschulinfo;" false $DBDELIMITER ${BACKUP_PFAD_INDIVIDUELL_MODULE}/hochschulinfo.unl txt
 DOQUERY "select maskeninfo_id, systeminfo_id from maske_system_bez;" false $DBDELIMITER ${BACKUP_PFAD_INDIVIDUELL_MODULE}/maske_system_bez.unl txt
@@ -67,7 +67,7 @@ DOQUERY "select tid, name, select_stmt, xil_proplist, chart_xtitel, chart_ytitel
 DOQUERY "select proto_fkt_id, proto_fkt from proto_funktion;" false $DBDELIMITER ${BACKUP_PFAD_INDIVIDUELL_MODULE}/proto_funktion.unl txt
 DOQUERY "select tid, name, datum from systeminfo;" false $DBDELIMITER ${BACKUP_PFAD_INDIVIDUELL_MODULE}/systeminfo.unl txt
 DOQUERY "select tid, arbeitsverzeichnis from user_einstellungen;" false $DBDELIMITER ${BACKUP_PFAD_INDIVIDUELL_MODULE}/user_einstellungen.unl txt
-DOQUERY "select tid, benutzer, kennwort, name, max_versuch, akt_versuch, email, administration, archiv_recht, passwd_sha, info, extern_account_id, extern_person_id, sieht_projekte, extern_role_id from userinfo;" false $DBDELIMITER ${BACKUP_PFAD_INDIVIDUELL_MODULE}/userinfo.unl txt
+DOQUERY "select tid, benutzer, kennwort, name, max_versuch, akt_versuch, email, administration, archiv_recht, passwd_sha, info, extern_account_id, extern_person_id, sieht_projekte, extern_role_id, gueltig_von, gueltig_bis from userinfo;" false $DBDELIMITER ${BACKUP_PFAD_INDIVIDUELL_MODULE}/userinfo.unl txt
 DOQUERY "select tid, name, maskeninfo_id, parent, gueltig_seit, gueltig_bis, erlaeuterung, sort, css_class from themenbaum;" false $DBDELIMITER ${BACKUP_PFAD_INDIVIDUELL_MODULE}/themenbaum.unl txt
 DOQUERY "select tid, name, maskeninfo_id, parent, gueltig_seit, gueltig_bis, erlaeuterung from themenbaum_bak;" false $DBDELIMITER ${BACKUP_PFAD_INDIVIDUELL_MODULE}/themenbaum_bak.unl txt
 DOQUERY "select aktuell from nachricht;" false $DBDELIMITER ${BACKUP_PFAD_INDIVIDUELL_MODULE}/nachricht.unl txt
@@ -83,7 +83,7 @@ DOQUERY "select protokoll_id, proto_fkt_id, userinfo_id, ip_adresse, client_name
 DOQUERY "select tid, instnr, ch110_institut, name, gueltig_von, gueltig_bis, systeminfo_id from trans_inst;" false $DBDELIMITER ${BACKUP_PFAD_INDIVIDUELL_MODULE}/trans_inst.unl txt
 DOQUERY "select tid, apnr, beschreibung, defaultvalue, description, systeminfo_id, sachgebiete_id, doku_link, read_only, wertebereich, ab_version, gruppe, priority, sourcesystem from konstanten;" false $DBDELIMITER ${BACKUP_PFAD_INDIVIDUELL_MODULE}/konstanten.unl txt
 DOQUERY "select key_apnr, parent, drucktext, lehr, gueltig_seit, gueltig_bis from lehreinheit_inst;" false $DBDELIMITER ${BACKUP_PFAD_INDIVIDUELL_MODULE}/lehreinheit_inst.unl txt
-DOQUERY "select tid, filename, caption, description, relation, useragent, contenttype, is_generic, toolbar_icon_filepath, usage_resultset_data, stylesheet_type, jr_datasource from sx_stylesheets;" false $DBDELIMITER ${BACKUP_PFAD_INDIVIDUELL_MODULE}/sx_stylesheets.unl txt
+DOQUERY "select tid, filename, caption, description, relation, useragent, contenttype, is_generic, toolbar_icon_filepath, usage_resultset_data, stylesheet_type, jr_datasource, uniquename from sx_stylesheets;" false $DBDELIMITER ${BACKUP_PFAD_INDIVIDUELL_MODULE}/sx_stylesheets.unl txt
 DOQUERY "select tid, maskeninfo_id, stylesheet_id, ord from sx_mask_style;" false $DBDELIMITER ${BACKUP_PFAD_INDIVIDUELL_MODULE}/sx_mask_style.unl txt
 DOQUERY "select tid, stylesheet_id, param_name, default_val, description, wertebereich from sx_stylesheet_param;" false $DBDELIMITER ${BACKUP_PFAD_INDIVIDUELL_MODULE}/sx_stylesheet_param.unl txt
 DOQUERY "select tid, id, table_name, field_name, record_no, locale, contents_short, contents_long, equalitystatus, sachgebiete_id, doku_link, export_to_glossar from sx_captions;" false $DBDELIMITER ${BACKUP_PFAD_INDIVIDUELL_MODULE}/sx_captions.unl txt
@@ -149,12 +149,20 @@ DOQUERY "select tid, etl_job_id, uniquename, name, param_default from etl_job_pa
 DOQUERY "select schluessel, gueltig_ab, land, version, sortkey, gueltig_bis, name, isced, keybund from k_astat_studienfach_land;" false $DBDELIMITER ${BACKUP_PFAD_INDIVIDUELL_MODULE}/k_astat_studienfach_land.unl txt
 DOQUERY "select schluessel, gueltig_ab, land, version, sortkey, gueltig_bis, name, sig2steller, keybund from k_astat_abschluss3steller_land;" false $DBDELIMITER ${BACKUP_PFAD_INDIVIDUELL_MODULE}/k_astat_abschluss3steller_land.unl txt
 DOQUERY "select schluessel, name from k_astat_abschluss2steller;" false $DBDELIMITER ${BACKUP_PFAD_INDIVIDUELL_MODULE}/k_astat_abschluss2steller.unl txt
-DOQUERY "select schluessel, name, fgr from k_astat_studienbereich;" false $DBDELIMITER ${BACKUP_PFAD_INDIVIDUELL_MODULE}/k_astat_studienbereich.unl txt
-DOQUERY "select schluessel, name, sb from k_astat_studienfach;" false $DBDELIMITER ${BACKUP_PFAD_INDIVIDUELL_MODULE}/k_astat_studienfach.unl txt
-DOQUERY "select id, caption, sortorder, colors from colorscheme;" false $DBDELIMITER ${BACKUP_PFAD_INDIVIDUELL_MODULE}/colorscheme.unl txt
-DOQUERY "select tid, pop3_host, pop3_port, pop3_starttls_enable, smtp_host, smtp_port, smtp_auth, smtp_starttls_enable, username, password, userinfo_id, type, daemon1, daemon1_interval, daemon1_loglevel, daemon2, daemon2_interval, daemon3, daemon3_interval from sx_mail;" false $DBDELIMITER ${BACKUP_PFAD_INDIVIDUELL_MODULE}/sx_mail.unl txt
+DOQUERY "select schluessel, name, fgr, semester_von, semester_bis from k_astat_studienbereich;" false $DBDELIMITER ${BACKUP_PFAD_INDIVIDUELL_MODULE}/k_astat_studienbereich.unl txt
+DOQUERY "select schluessel, name, sb, semester_von, semester_bis from k_astat_studienfach;" false $DBDELIMITER ${BACKUP_PFAD_INDIVIDUELL_MODULE}/k_astat_studienfach.unl txt
 DOQUERY "select schluessel, nummer, name, kennz, kontinent from k_astat_staat;" false $DBDELIMITER ${BACKUP_PFAD_INDIVIDUELL_MODULE}/k_astat_staat.unl txt
 DOQUERY "select schluessel, nummer, name from k_astat_kontinent;" false $DBDELIMITER ${BACKUP_PFAD_INDIVIDUELL_MODULE}/k_astat_kontinent.unl txt
+DOQUERY "select schluessel, name, semester_von, semester_bis from k_astat_faechergruppe;" false $DBDELIMITER ${BACKUP_PFAD_INDIVIDUELL_MODULE}/k_astat_faechergruppe.unl txt
+DOQUERY "select abschluss_astat_bund, abschluss_astat_bund_ktxt, abschlussart, abschluss_grp, ist_lehramt from k_astat_abschl_grp;" false $DBDELIMITER ${BACKUP_PFAD_INDIVIDUELL_MODULE}/k_astat_abschl_grp.unl txt
+DOQUERY "select tid, astat, eu, semester_von, semester_bis, gueltig_von, gueltig_bis from k_astat_staat_eu;" false $DBDELIMITER ${BACKUP_PFAD_INDIVIDUELL_MODULE}/k_astat_staat_eu.unl txt
+DOQUERY "select tid, pop3_host, pop3_port, pop3_starttls_enable, smtp_host, smtp_port, smtp_auth, smtp_starttls_enable, username, password, userinfo_id, type, daemon1, daemon1_interval, daemon1_loglevel, daemon2, daemon2_interval, daemon3, daemon3_interval from sx_mail;" false $DBDELIMITER ${BACKUP_PFAD_INDIVIDUELL_MODULE}/sx_mail.unl txt
+DOQUERY "select id, caption, sortorder, colors from colorscheme;" false $DBDELIMITER ${BACKUP_PFAD_INDIVIDUELL_MODULE}/colorscheme.unl txt
+DOQUERY "select id, name, zeitfeld from arch_table;" false $DBDELIMITER ${BACKUP_PFAD_INDIVIDUELL_MODULE}/arch_table.unl txt
+DOQUERY "select arch_table, datum, bezugszeit_von, bezugszeit_bis, bezugsart, userinfo_id, kommentar from arch_datum;" false $DBDELIMITER ${BACKUP_PFAD_INDIVIDUELL_MODULE}/arch_datum.unl txt
+DOQUERY "select id, name, sortorder from k_prio_param;" false $DBDELIMITER ${BACKUP_PFAD_INDIVIDUELL_MODULE}/k_prio_param.unl txt
+DOQUERY "select id, name, sortorder from k_source;" false $DBDELIMITER ${BACKUP_PFAD_INDIVIDUELL_MODULE}/k_source.unl txt
+DOQUERY "select tid, fgr, fgr_str, lfb, lfb_str, fg, fg_str, gueltig_von, gueltig_bis from k_astat_lfb_fg;" false $DBDELIMITER ${BACKUP_PFAD_INDIVIDUELL_MODULE}/k_astat_lfb_fg.unl txt
 
 
 echo "Finished unloading"

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

@@ -19,7 +19,6 @@ drop procedure sp_user_themen(integer, date, smallint);
 			drop procedure string_not_null(char);
 			drop function date_str(date);
 			drop procedure val(char(255));
-			drop procedure decval(varchar(255));
 			drop procedure decval(char(255));
 			drop function sp_filter_orga(integer);
 			drop procedure sp_get_subquery_str(varchar, varchar, varchar, varchar, varchar, varchar);
@@ -163,8 +162,18 @@ drop table k_astat_abschluss3steller_land cascade;
 drop table k_astat_abschluss2steller cascade;
 drop table k_astat_studienbereich cascade;
 drop table k_astat_studienfach cascade;
-drop table colorscheme cascade;
+drop table k_astat_staat cascade;
+drop table k_astat_kontinent cascade;
+drop table k_astat_faechergruppe cascade;
+drop table k_astat_abschl_grp cascade;
+drop table k_astat_staat_eu cascade;
 drop table sx_mail cascade;
+drop table colorscheme cascade;
+drop table arch_table cascade;
+drop table arch_datum cascade;
+drop table k_prio_param cascade;
+drop table k_source cascade;
+drop table k_astat_lfb_fg cascade;
 
 
 ! echo "Uninstall-Actions"

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

@@ -51,8 +51,6 @@ drop function sp_user_themen(integer, date, smallint);
 			drop function val(varchar(255));
 			drop function val(integer);
 			drop function val(smallint);
-			drop function decval(varchar(255));
-			drop function decval(text);
 			drop function decval(char(255));
 			drop function sp_filter_orga(integer);
 			drop function sp_update_sequence(varchar(255));
@@ -200,10 +198,18 @@ drop table if exists k_astat_abschluss3steller_land cascade;
 drop table if exists k_astat_abschluss2steller cascade;
 drop table if exists k_astat_studienbereich cascade;
 drop table if exists k_astat_studienfach cascade;
-drop table if exists colorscheme cascade;
-drop table if exists sx_mail cascade;
 drop table if exists k_astat_staat cascade;
 drop table if exists k_astat_kontinent cascade;
+drop table if exists k_astat_faechergruppe cascade;
+drop table if exists k_astat_abschl_grp cascade;
+drop table if exists k_astat_staat_eu cascade;
+drop table if exists sx_mail cascade;
+drop table if exists colorscheme cascade;
+drop table if exists arch_table cascade;
+drop table if exists arch_datum cascade;
+drop table if exists k_prio_param cascade;
+drop table if exists k_source cascade;
+drop table if exists k_astat_lfb_fg cascade;
 
 
 select now(), 'Uninstall-Actions';

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

@@ -9,7 +9,9 @@ drop  index ix_group_felder2 ;
 	drop  index cif_ind ;
 	drop  index cifx_ind ;
 	drop  index cifx_ind2 ;
+	drop  index cifx_ind3 ;
 	drop  index trans_cifx_ind ;
+	drop  index trans_cifx_ind2 ;
 	drop  index trans_cif_ind ;
 	drop  index i_userinfo ;
 	drop  index i_orga ;
@@ -46,4 +48,5 @@ drop  index ix_group_felder2 ;
 	drop  index ix_implicit_orgrights1 ;
 	drop  index ix_dim_datum_day_date ;
 	drop  index ix_etl_job1 ;
+	drop  index k_astat_staat_eu_idx1 ;
 	

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

@@ -70,12 +70,25 @@ apnr );
 create  index cifx_ind2 on cifx (uniquename );
 
 
+! echo "Erzeuge Index cifx_ind3"
+! echo `date`
+ 
+create  index cifx_ind3 on cifx (key, 
+apnr );
+
+
 ! echo "Erzeuge Index trans_cifx_ind"
 ! echo `date`
  
 create  index trans_cifx_ind on trans_cifx (sourcesystem_id );
 
 
+! echo "Erzeuge Index trans_cifx_ind2"
+! echo `date`
+ 
+create  index trans_cifx_ind2 on trans_cifx (cifx_tid );
+
+
 ! echo "Erzeuge Index trans_cif_ind"
 ! echo `date`
  
@@ -274,6 +287,7 @@ key );
 ! echo `date`
  
 create  index ix_tr_dim_bp_apnr on trans_dim_bp_apnr (dimension_bp_id, 
+apnr, 
 sourcesystem_id, 
 systeminfo_id );
 
@@ -306,3 +320,11 @@ create  index ix_dim_datum_day_date on dim_datum (day_date );
 ! echo `date`
  
 create  unique  index ix_etl_job1 on etl_job (uniquename );
+
+
+! echo "Erzeuge Index k_astat_staat_eu_idx1"
+! echo `date`
+ 
+create  index k_astat_staat_eu_idx1 on k_astat_staat_eu (astat, 
+semester_von, 
+semester_bis );

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

@@ -59,11 +59,22 @@ select now(), 'Erzeuge Index cifx_ind2';
 create  index cifx_ind2 on cifx (uniquename );
 
 
+select now(), 'Erzeuge Index cifx_ind3';
+
+create  index cifx_ind3 on cifx (key, 
+apnr );
+
+
 select now(), 'Erzeuge Index trans_cifx_ind';
 
 create  index trans_cifx_ind on trans_cifx (sourcesystem_id );
 
 
+select now(), 'Erzeuge Index trans_cifx_ind2';
+
+create  index trans_cifx_ind2 on trans_cifx (cifx_tid );
+
+
 select now(), 'Erzeuge Index trans_cif_ind';
 
 create  index trans_cif_ind on trans_cif (sourcesystem_id );
@@ -231,6 +242,7 @@ key );
 select now(), 'Erzeuge Index ix_tr_dim_bp_apnr';
 
 create  index ix_tr_dim_bp_apnr on trans_dim_bp_apnr (dimension_bp_id, 
+apnr, 
 sourcesystem_id, 
 systeminfo_id );
 
@@ -258,3 +270,10 @@ create  index ix_dim_datum_day_date on dim_datum (day_date );
 select now(), 'Erzeuge Index ix_etl_job1';
 
 create  unique  index ix_etl_job1 on etl_job (uniquename );
+
+
+select now(), 'Erzeuge Index k_astat_staat_eu_idx1';
+
+create  index k_astat_staat_eu_idx1 on k_astat_staat_eu (astat, 
+semester_von, 
+semester_bis );

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

@@ -147,7 +147,7 @@ create table db_version(
 his_system NVARCHAR(255) , 
 version CHAR(8) , 
 kern_system CHAR(1) , 
-version_hash VARCHAR(32) , 
+version_hash VARCHAR , 
 systeminfo_id INTEGER ,
 	primary key (his_system, version)
 	constraint c_db_version
@@ -408,7 +408,7 @@ create table macro_masken_bez(
 maskeninfo_id2 INTEGER  not null, 
 active INTEGER  default 1  not null, 
 sortnr SMALLINT , 
-schleifenrelation NCHAR(255) , 
+schleifenrelation TEXT , 
 schleifenfeldname NCHAR(255) , 
 alias NCHAR(255) , 
 schleifenfstand NCHAR(255) , 
@@ -675,6 +675,13 @@ apnr );
 create  index cifx_ind2 on cifx (uniquename );
 
 
+! echo "Erzeuge Index cifx_ind3"
+! echo `date`
+ 
+create  index cifx_ind3 on cifx (key, 
+apnr );
+
+
 ! echo "Tabelle cifx erzeugt"
 ! echo `date`
  
@@ -684,12 +691,15 @@ create  index cifx_ind2 on cifx (uniquename );
 ! echo `date`
  
 create table trans_cifx(
-	key SMALLINT  not null, 
+	tid SERIAL  not null, 
+key SMALLINT  not null, 
 apnr CHAR(10)  not null, 
 cifx_tid INTEGER , 
 sourcesystem INTEGER  not null, 
 sourcesystem_id NVARCHAR(255) , 
-systeminfo_id INTEGER 
+systeminfo_id INTEGER ,
+	primary key (tid)
+	constraint pk_trans_cifx_tid
 ) 
 ;
 
@@ -702,6 +712,12 @@ systeminfo_id INTEGER
 create  index trans_cifx_ind on trans_cifx (sourcesystem_id );
 
 
+! echo "Erzeuge Index trans_cifx_ind2"
+! echo `date`
+ 
+create  index trans_cifx_ind2 on trans_cifx (cifx_tid );
+
+
 ! echo "Tabelle trans_cifx erzeugt"
 ! echo `date`
  
@@ -745,7 +761,9 @@ apnr CHAR(10)  not null,
 kurz NVARCHAR(255) , 
 druck NVARCHAR(255)  default 'Drucktext' , 
 lang_1 NVARCHAR(255) , 
-uniquename NVARCHAR(255) ,
+uniquename NVARCHAR(255) , 
+sort1 INTEGER , 
+struktur_c CHAR(50) ,
 	primary key (tid)
 	constraint c_cifx_customize
 ) 
@@ -777,7 +795,7 @@ obligatorisch INTEGER ,
 art INTEGER , 
 relation text , 
 attribut NCHAR(100) , 
-defaultwert NCHAR(255) ,
+defaultwert TEXT ,
 	primary key (tid)
 	constraint c_felderinfo
 ) 
@@ -942,7 +960,9 @@ info NCHAR(255) ,
 extern_account_id NVARCHAR(255) , 
 extern_person_id NVARCHAR(255) , 
 sieht_projekte SMALLINT  default 0 , 
-extern_role_id INTEGER ,
+extern_role_id INTEGER , 
+gueltig_von date , 
+gueltig_bis date ,
 	primary key (tid)
 	constraint c_userinfo
 ) 
@@ -1415,7 +1435,8 @@ is_generic SMALLINT  default 0 ,
 toolbar_icon_filepath NVARCHAR(255) , 
 usage_resultset_data CHAR(10)  default 'T' , 
 stylesheet_type CHAR(10)  default 'XSL' , 
-jr_datasource CHAR(10) ,
+jr_datasource CHAR(10) , 
+uniquename NVARCHAR(255) ,
 	primary key (tid)
 	constraint c_stylesheets
 ) 
@@ -1689,7 +1710,7 @@ sort1 INTEGER ,
 sort2 INTEGER , 
 sort3 INTEGER , 
 geaendert_am DATE , 
-aktiv SMALLINT , 
+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)
@@ -2346,6 +2367,7 @@ systeminfo_id INTEGER
 ! echo `date`
  
 create  index ix_tr_dim_bp_apnr on trans_dim_bp_apnr (dimension_bp_id, 
+apnr, 
 sourcesystem_id, 
 systeminfo_id );
 
@@ -3213,7 +3235,9 @@ name NVARCHAR(255)
 create table k_astat_studienbereich(
 	schluessel NVARCHAR(255)  not null, 
 name NVARCHAR(255) , 
-fgr NVARCHAR(255) 
+fgr NVARCHAR(255) , 
+semester_von INTEGER , 
+semester_bis INTEGER 
 ) 
 ;
 
@@ -3231,7 +3255,9 @@ fgr NVARCHAR(255)
 create table k_astat_studienfach(
 	schluessel NVARCHAR(255)  not null, 
 name NVARCHAR(255) , 
-sb NVARCHAR(255) 
+sb NVARCHAR(255) , 
+semester_von INTEGER , 
+semester_bis INTEGER 
 ) 
 ;
 
@@ -3243,21 +3269,117 @@ sb NVARCHAR(255)
  
 
 
-! echo "Erzeuge Tabelle colorscheme"
+! echo "Erzeuge Tabelle k_astat_staat"
 ! echo `date`
  
-create table colorscheme(
-	id SERIAL  not null, 
-caption NVARCHAR(255) , 
-sortorder INTEGER , 
-colors NVARCHAR(255) 
+create table k_astat_staat(
+	schluessel INTEGER  not null, 
+nummer NVARCHAR(255) , 
+name NVARCHAR(255) , 
+kennz NVARCHAR(255) , 
+kontinent INTEGER ,
+	primary key (schluessel)
+	constraint c_k_astat_staat
 ) 
 ;
 
 
 
 
-! echo "Tabelle colorscheme erzeugt"
+! echo "Tabelle k_astat_staat erzeugt"
+! echo `date`
+ 
+
+
+! echo "Erzeuge Tabelle k_astat_kontinent"
+! echo `date`
+ 
+create table k_astat_kontinent(
+	schluessel INTEGER  not null, 
+nummer NVARCHAR(255) , 
+name NVARCHAR(255) ,
+	primary key (schluessel)
+	constraint c_k_astat_kontinent
+) 
+;
+
+
+
+
+! echo "Tabelle k_astat_kontinent erzeugt"
+! echo `date`
+ 
+
+
+! echo "Erzeuge Tabelle k_astat_faechergruppe"
+! echo `date`
+ 
+create table k_astat_faechergruppe(
+	schluessel NVARCHAR(255)  not null, 
+name NVARCHAR(255) , 
+semester_von INTEGER , 
+semester_bis INTEGER 
+) 
+;
+
+
+
+
+! echo "Tabelle k_astat_faechergruppe erzeugt"
+! echo `date`
+ 
+
+
+! echo "Erzeuge Tabelle k_astat_abschl_grp"
+! echo `date`
+ 
+create table k_astat_abschl_grp(
+	abschluss_astat_bund NVARCHAR(255)  not null, 
+abschluss_astat_bund_ktxt NVARCHAR(255) , 
+abschlussart NVARCHAR(255) , 
+abschluss_grp NVARCHAR(255) , 
+ist_lehramt SMALLINT  default 0 ,
+	primary key (abschluss_astat_bund)
+	constraint pk_k_astat_abschl_grp
+) 
+;
+
+
+
+
+! echo "Tabelle k_astat_abschl_grp erzeugt"
+! echo `date`
+ 
+
+
+! echo "Erzeuge Tabelle k_astat_staat_eu"
+! echo `date`
+ 
+create table k_astat_staat_eu(
+	tid SERIAL  not null, 
+astat CHAR(3)  not null, 
+eu CHAR(1) , 
+semester_von INTEGER , 
+semester_bis INTEGER , 
+gueltig_von DATE , 
+gueltig_bis DATE ,
+	primary key (tid)
+	constraint pk_k_astat_staat_eu
+) 
+;
+
+
+
+
+! echo "Erzeuge Index k_astat_staat_eu_idx1"
+! echo `date`
+ 
+create  index k_astat_staat_eu_idx1 on k_astat_staat_eu (astat, 
+semester_von, 
+semester_bis );
+
+
+! echo "Tabelle k_astat_staat_eu erzeugt"
 ! echo `date`
  
 
@@ -3296,6 +3418,127 @@ daemon3_interval INTEGER
  
 
 
+! echo "Erzeuge Tabelle colorscheme"
+! echo `date`
+ 
+create table colorscheme(
+	id SERIAL  not null, 
+caption NVARCHAR(255) , 
+sortorder INTEGER , 
+colors NVARCHAR(255) 
+) 
+;
+
+
+
+
+! echo "Tabelle colorscheme erzeugt"
+! echo `date`
+ 
+
+
+! echo "Erzeuge Tabelle arch_table"
+! echo `date`
+ 
+create table arch_table(
+	id SERIAL  not null, 
+name NVARCHAR(255) , 
+zeitfeld NVARCHAR(255) 
+) 
+;
+
+
+
+
+! echo "Tabelle arch_table erzeugt"
+! echo `date`
+ 
+
+
+! echo "Erzeuge Tabelle arch_datum"
+! echo `date`
+ 
+create table arch_datum(
+	arch_table NVARCHAR(255)  not null, 
+datum datetime year to second , 
+bezugszeit_von INTEGER , 
+bezugszeit_bis INTEGER , 
+bezugsart CHAR(1)  default 'J' , 
+userinfo_id INTEGER  not null, 
+kommentar NVARCHAR(255) 
+) 
+;
+
+
+
+
+! echo "Tabelle arch_datum erzeugt"
+! echo `date`
+ 
+
+
+! echo "Erzeuge Tabelle k_prio_param"
+! echo `date`
+ 
+create table k_prio_param(
+	id SERIAL  not null, 
+name NVARCHAR(255) , 
+sortorder NVARCHAR(255) 
+) 
+;
+
+
+
+
+! echo "Tabelle k_prio_param erzeugt"
+! echo `date`
+ 
+
+
+! echo "Erzeuge Tabelle k_source"
+! echo `date`
+ 
+create table k_source(
+	id SERIAL  not null, 
+name NVARCHAR(255) , 
+sortorder NVARCHAR(255) 
+) 
+;
+
+
+
+
+! echo "Tabelle k_source erzeugt"
+! echo `date`
+ 
+
+
+! echo "Erzeuge Tabelle k_astat_lfb_fg"
+! echo `date`
+ 
+create table k_astat_lfb_fg(
+	tid SERIAL  not null, 
+fgr CHAR(10) , 
+fgr_str NCHAR(255) , 
+lfb CHAR(10) , 
+lfb_str NCHAR(255) , 
+fg CHAR(10) , 
+fg_str NVARCHAR(255) , 
+gueltig_von DATE , 
+gueltig_bis DATE ,
+	primary key (tid)
+	constraint pk_k_astat_lfb_fg
+) 
+;
+
+
+
+
+! echo "Tabelle k_astat_lfb_fg erzeugt"
+! echo `date`
+ 
+
+
 ! echo "Erzeuge View user_groups"
 ! echo `date`
  
@@ -3383,7 +3626,7 @@ create view menu_element_orgstructure(
 description) as
 	
 	
-		select element as orgstruktur, description
+		select element_value::integer as orgstruktur, description
         from menu_element
   		where element='orgstruktur'
 				;
@@ -3729,6 +3972,56 @@ bland_astat) as
 					WHERE
 					  dimension_bp_id = (SELECT tid FROM dimension_bp WHERE apnr='bluep_hzbkfz')
                  ;
+	
+
+! echo "Erzeuge View dim_semester"
+! echo `date`
+ 
+create view dim_semester(
+	tid, 
+eintrag, 
+eintrag_kurz, 
+sem_beginn, 
+sem_ende, 
+semestertyp, 
+vorsem, 
+folgesem, 
+folgesem_sem_beginn, 
+ist_zukunft, 
+akad_jahr, 
+akad_jahr_absolv, 
+akad_jahr_anf) as
+	
+			with tmp_semester as (select C.apnr as tid,
+			C.druck as eintrag,
+			C.kurz as eintrag_kurz, --TODO
+			C.d_akt_von as sem_beginn,
+			C.d_akt_bis as sem_ende,
+			val(substring(''  || C.apnr from 5 for 1)) as semestertyp,
+			add_sem(C.apnr,-1) as vorsem,
+			add_sem(C.apnr,1) as folgesem,
+			(select C2.d_akt_von from cif C2 where C2.key=661
+			and C2.apnr=add_sem(C.apnr,1)) as folgesem_sem_beginn
+			from cif C
+			where key=661
+			)
+			select tid,
+			eintrag,
+			eintrag_kurz,
+			sem_beginn,
+			sem_ende,
+			semestertyp,
+			vorsem,
+			folgesem,
+			folgesem_sem_beginn,
+			(case when sem_beginn > current_date then 1 else 0 end) as ist_zukunft,
+			case when semestertyp='1' then (tid/10)-1 when semestertyp='2' then (tid/10) end as akad_jahr,
+			case when semestertyp='1' then (tid/10) when semestertyp='2' then (tid/10)+1 end as akad_jahr_absolv,
+			case when semestertyp='1' then (tid/10) when semestertyp='2' then (tid/10) end as akad_jahr_anf
+			
+			from tmp_semester
+			
+			 ;
 	--Funktion / Prozedur sp_user_themen
 ! DOSQL $SUPERX_DIR/db/install/prozeduren/proc_sp_user_themen_ids.sql
 			--Funktion / Prozedur sp_user_orga
@@ -3819,21 +4112,8 @@ end procedure;
 --Funktion / Prozedur val
 --Funktion / Prozedur val
 --Funktion / Prozedur decval
-
- create procedure decval(p_str varchar(255))
-    returning decimal(16,2);
-
-    return p_str::decimal(16,2);
-end procedure;
- --Funktion / Prozedur decval
---Funktion / Prozedur decval
-
- create procedure decval(p_str char(255))
-    returning decimal(16,2);
-
-    return p_str::decimal(16,2);
-end procedure;
- --Funktion / Prozedur sp_filter_orga
+! DOSQL $SUPERX_DIR/db/install/prozeduren/proc_decval_ids.sql
+			--Funktion / Prozedur sp_filter_orga
 ! DOSQL $SUPERX_DIR/db/install/prozeduren/proc_sp_filter_orga_ids.sql
 			--Funktion / Prozedur sp_update_sequence
 --Funktion / Prozedur sp_bool_to_smallint
@@ -4130,6 +4410,36 @@ end procedure;
 !sx_auto_upload_table.x k_astat_studienbereich $SUPERX_DIR/db/install/schluesseltabellen/release_unloads/k_astat_studienbereich.unl
 
 
+! echo "Lade Tabelle k_astat_faechergruppe"
+! echo `date`
+ 
+!sx_auto_upload_table.x k_astat_faechergruppe $SUPERX_DIR/db/install/schluesseltabellen/release_unloads/k_astat_faechergruppe.unl
+
+
+! echo "Lade Tabelle k_astat_staat"
+! echo `date`
+ 
+!sx_auto_upload_table.x k_astat_staat $SUPERX_DIR/db/install/schluesseltabellen/release_unloads/k_astat_staat.unl
+
+
+! echo "Lade Tabelle k_astat_kontinent"
+! echo `date`
+ 
+!sx_auto_upload_table.x k_astat_kontinent $SUPERX_DIR/db/install/schluesseltabellen/release_unloads/k_astat_kontinent.unl
+
+
+! echo "Lade Tabelle k_astat_abschl_grp"
+! echo `date`
+ 
+!sx_auto_upload_table.x k_astat_abschl_grp $SUPERX_DIR/db/install/schluesseltabellen/release_unloads/k_astat_abschl_grp.unl
+
+
+! echo "Lade Tabelle k_astat_staat_eu"
+! echo `date`
+ 
+!sx_auto_upload_table.x k_astat_staat_eu $SUPERX_DIR/db/install/schluesseltabellen/release_unloads/k_astat_staat_eu.unl
+
+
 ! echo "Scriptfile $SUPERX_DIR/db/install/schluesseltabellen/macro_masken_bez_fuellen.sql ausführen"
 ! echo `date`
  
@@ -4150,7 +4460,7 @@ end procedure;
  
 
 delete from db_version  where his_system='kern';
-insert into db_version (his_system,version,systeminfo_id) values('kern','5.0',9);
+insert into db_version (his_system,version,systeminfo_id) values('kern','5.3',9);
 
 
 
@@ -4403,10 +4713,30 @@ 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='k_astat_staat';
+insert into db_tabellen (name,protokollierung) values('k_astat_staat',0);
+delete from db_tabellen where name='k_astat_kontinent';
+insert into db_tabellen (name,protokollierung) values('k_astat_kontinent',0);
+delete from db_tabellen where name='k_astat_faechergruppe';
+insert into db_tabellen (name,protokollierung) values('k_astat_faechergruppe',0);
+delete from db_tabellen where name='k_astat_abschl_grp';
+insert into db_tabellen (name,protokollierung) values('k_astat_abschl_grp',0);
+delete from db_tabellen where name='k_astat_staat_eu';
+insert into db_tabellen (name,protokollierung) values('k_astat_staat_eu',0);
 delete from db_tabellen where name='sx_mail';
 insert into db_tabellen (name,protokollierung) values('sx_mail',0);
+delete from db_tabellen where name='colorscheme';
+insert into db_tabellen (name,protokollierung) values('colorscheme',0);
+delete from db_tabellen where name='arch_table';
+insert into db_tabellen (name,protokollierung) values('arch_table',0);
+delete from db_tabellen where name='arch_datum';
+insert into db_tabellen (name,protokollierung) values('arch_datum',0);
+delete from db_tabellen where name='k_prio_param';
+insert into db_tabellen (name,protokollierung) values('k_prio_param',0);
+delete from db_tabellen where name='k_source';
+insert into db_tabellen (name,protokollierung) values('k_source',0);
+delete from db_tabellen where name='k_astat_lfb_fg';
+insert into db_tabellen (name,protokollierung) values('k_astat_lfb_fg',0);
 
 
 ! echo "Fülle sachgebiete, systeminfo und themenbaum"
@@ -4534,16 +4864,16 @@ insert into tmp_themenbaum(name, parentname, gueltig_seit,gueltig_bis,erlaeuteru
 delete from tmp_themenbaum where name in (select T.name from themenbaum  T where T.name='Benutzer' 
 or T.name='Administration');
 insert into tmp_themenbaum(name, parentname, gueltig_seit,gueltig_bis,erlaeuterung)
- values('Entwicklung','Administration','01.01.1900','01.01.3000','Spezielle Funktionen für die Entwicklung');
+ values('Stammdaten verwalten','Administration','01.01.1900','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='Entwicklung' 
+delete from tmp_themenbaum where name in (select T.name from themenbaum  T where T.name='Stammdaten verwalten' 
 or T.name='Administration');
 insert into tmp_themenbaum(name, parentname, gueltig_seit,gueltig_bis,erlaeuterung)
- values('Stammdaten verwalten','Administration','01.01.1900','01.01.3000','Abfragen zur Stammdatenverwaltung');
+ values('Datenmanagement','Administration','01.01.1900','01.01.3000','Abfragen zum Datenmanagement');
 
 --gibt es das Thema schon?
-delete from tmp_themenbaum where name in (select T.name from themenbaum  T where T.name='Stammdaten verwalten' 
+delete from tmp_themenbaum where name in (select T.name from themenbaum  T where T.name='Datenmanagement' 
 or T.name='Administration');
 
 --root für das Modul einfügen und in den Themenbaum einhängen
@@ -4604,6 +4934,12 @@ insert into tmp_themenbaum
    gueltig_bis)
 values('Feld suchen','70570','Felder','01.01.1900','01.01.3000');
 
+insert into tmp_themenbaum
+(  name  ,maskeninfo_id, parentname,
+   gueltig_seit ,
+   gueltig_bis)
+values('User einrichten','70970','Benutzer verwalten','01.01.1900','01.01.3000');
+
 insert into tmp_themenbaum
 (  name  ,maskeninfo_id, parentname,
    gueltig_seit ,
@@ -4832,6 +5168,18 @@ insert into tmp_themenbaum
    gueltig_bis)
 values('Gastzugang einrichten','71770','Administration','01.01.1900','01.01.3000');
 
+insert into tmp_themenbaum
+(  name  ,maskeninfo_id, parentname,
+   gueltig_seit ,
+   gueltig_bis)
+values('Datenblatt archivieren','71840','Datenmanagement','01.01.1900','01.01.3000');
+
+insert into tmp_themenbaum
+(  name  ,maskeninfo_id, parentname,
+   gueltig_seit ,
+   gueltig_bis)
+values('Übersicht Datenblatt-Archiv','71860','Datenmanagement','01.01.1900','01.01.3000');
+
 --gibt es die Maske schon?
 delete from tmp_themenbaum where maskeninfo_id in (select T.maskeninfo_id from themenbaum  T);
 
@@ -4863,8 +5211,8 @@ update themenbaum set erlaeuterung='Abfragen zur Maskenverwaltung' where name='M
 update themenbaum set erlaeuterung='Uploads/Downloads verwalten' where name='Uploads/Downloads verwalten';
 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';
+update themenbaum set erlaeuterung='Abfragen zum Datenmanagement' where name='Datenmanagement';
  
 CREATE temp TABLE tmp_db_forms (
     tid serial NOT NULL,
@@ -4891,13 +5239,13 @@ values ('felderinfo','felderinfo','/edit/kern/felderinfo_edit.jsp','Felderinfo v
 insert into tmp_db_forms (name, tablename,form_path,caption,description)
 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'::varchar(200),'In diesem Formular können Sie Benutzern Sachgebietsrechte geben. Achtung: Einträge von externem System (HisInOne) werden bei Neuanmeldung überschrieben'::varchar(255));
+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'::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));
+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'::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'::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));
+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'::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)

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

@@ -162,7 +162,7 @@ create table db_version(
 his_system VARCHAR(255) , 
 version CHAR(8) , 
 kern_system CHAR(1) , 
-version_hash VARCHAR(32) , 
+version_hash VARCHAR , 
 systeminfo_id INTEGER , 
 	constraint c_db_version primary key (his_system, version)
 
@@ -250,7 +250,7 @@ aktiv SMALLINT  default 1 ,
 
 
 
-comment on table sichten is 'Sichten';
+comment on table sichten is 'Sichten und Bäume für Hierarchien ';
 
 comment on column sichten.parent is 'Übergeordnete Sicht';
 
@@ -411,7 +411,7 @@ external_entry smallint  default 0 ,
 
 
 
-comment on column user_masken_bez.external_entry is 'Recht wird von externem System (HisInOne) gesetzt und entfernt';
+comment on column user_masken_bez.external_entry is 'Recht wird von externem System (HISinOne) gesetzt und entfernt';
 
 
 select now(), 'Tabelle user_masken_bez erzeugt';
@@ -431,7 +431,7 @@ external_entry smallint  default 0 ,
 
 
 
-comment on column user_sachgeb_bez.external_entry is 'Recht wird von externem System (HisInOne) gesetzt und entfernt';
+comment on column user_sachgeb_bez.external_entry is 'Recht wird von externem System (HISinOne) gesetzt und entfernt';
 
 
 select now(), 'Tabelle user_sachgeb_bez erzeugt';
@@ -459,7 +459,7 @@ create table macro_masken_bez(
 maskeninfo_id2 INTEGER  not null, 
 active INTEGER  default 1  not null, 
 sortnr SMALLINT , 
-schleifenrelation CHAR(255) , 
+schleifenrelation TEXT , 
 schleifenfeldname CHAR(255) , 
 alias CHAR(255) , 
 schleifenfstand CHAR(255) , 
@@ -583,7 +583,7 @@ comment on column user_group_bez.userinfo_id is 'UserID';
 
 comment on column user_group_bez.groupinfo_id is 'Gruppe';
 
-comment on column user_group_bez.external_entry is 'Recht wird von externem System (HisInOne) gesetzt und entfernt';
+comment on column user_group_bez.external_entry is 'Recht wird von externem System (HISinOne) gesetzt und entfernt';
 
 
 select now(), 'Tabelle user_group_bez erzeugt';
@@ -665,6 +665,8 @@ uniquename VARCHAR(255) ,
 
 
 
+comment on table cif is 'Schlüsseltabelle für numerische Schlüssel';
+
 comment on column cif.uniquename is 'Schlüssel';
 
 
@@ -724,6 +726,8 @@ parent_lid VARCHAR(255) ,
 
 
 
+comment on table cifx is 'Schlüsseltabelle für alphanumerische Schlüssel';
+
 comment on column cifx.druck is 'Drucktext';
 
 comment on column cifx.parent is 'übergeordn. Element';
@@ -761,6 +765,12 @@ select now(), 'Erzeuge Index cifx_ind2';
 create  index cifx_ind2 on cifx (uniquename );
 
 
+select now(), 'Erzeuge Index cifx_ind3';
+
+create  index cifx_ind3 on cifx (key, 
+apnr );
+
+
 select now(), 'Tabelle cifx erzeugt';
 
 
@@ -768,17 +778,22 @@ select now(), 'Tabelle cifx erzeugt';
 select now(), 'Erzeuge Tabelle trans_cifx';
 
 create table trans_cifx(
-	key SMALLINT  not null, 
+	tid SERIAL  not null, 
+key SMALLINT  not null, 
 apnr CHAR(10)  not null, 
 cifx_tid INTEGER , 
 sourcesystem INTEGER  not null, 
 sourcesystem_id VARCHAR(255) , 
-systeminfo_id INTEGER 
+systeminfo_id INTEGER , 
+	constraint pk_trans_cifx_tid primary key (tid)
+
 ) 
 ;
 
 
 
+comment on table trans_cifx is 'Transfertabelle für alphanumerische Schlüssel';
+
 comment on column trans_cifx.sourcesystem is 'Vorsystem';
 
 comment on column trans_cifx.sourcesystem_id is 'ID im Vorsystem';
@@ -789,6 +804,11 @@ select now(), 'Erzeuge Index trans_cifx_ind';
 create  index trans_cifx_ind on trans_cifx (sourcesystem_id );
 
 
+select now(), 'Erzeuge Index trans_cifx_ind2';
+
+create  index trans_cifx_ind2 on trans_cifx (cifx_tid );
+
+
 select now(), 'Tabelle trans_cifx erzeugt';
 
 
@@ -807,6 +827,8 @@ systeminfo_id INTEGER
 
 
 
+comment on table trans_cif is 'Transfertabelle für numerische Schlüssel';
+
 comment on column trans_cif.sourcesystem is 'Vorsystem';
 
 comment on column trans_cif.sourcesystem_id is 'ID im Vorsystem';
@@ -832,6 +854,8 @@ kurz VARCHAR(255) ,
 druck VARCHAR(255)  default 'Drucktext' , 
 lang_1 VARCHAR(255) , 
 uniquename VARCHAR(255) , 
+sort1 INTEGER , 
+struktur_c CHAR(50) , 
 	constraint c_cifx_customize primary key (tid)
 
 ) 
@@ -877,7 +901,7 @@ obligatorisch INTEGER ,
 art INTEGER , 
 relation text , 
 attribut CHAR(100) , 
-defaultwert CHAR(255) , 
+defaultwert TEXT , 
 	constraint c_felderinfo primary key (tid)
 
 ) 
@@ -907,6 +931,8 @@ passwd CHAR(16) ,
 
 
 
+comment on table hochschulinfo is 'Name und Adresse der Hochschule';
+
 comment on column hochschulinfo.hs_nr is 'Hochschulnummer (HIS)';
 
 
@@ -1047,6 +1073,8 @@ extern_account_id VARCHAR(255) ,
 extern_person_id VARCHAR(255) , 
 sieht_projekte SMALLINT  default 0 , 
 extern_role_id INTEGER , 
+gueltig_von date , 
+gueltig_bis date , 
 	constraint c_userinfo primary key (tid)
 
 ) 
@@ -1056,6 +1084,10 @@ extern_role_id INTEGER ,
 
 comment on column userinfo.sieht_projekte is 'Darf der User Projekte sehen';
 
+comment on column userinfo.gueltig_von is 'Beginn Gültigkeit';
+
+comment on column userinfo.gueltig_bis is 'Ende Gültigkeit';
+
 
 select now(), 'Erzeuge Index i_userinfo';
 
@@ -1085,7 +1117,7 @@ css_class VARCHAR(255) ,
 
 
 
-comment on table themenbaum is 'Themenbaum';
+comment on table themenbaum is 'Konfiguration der Menüstruktur';
 
 comment on column themenbaum.tid is 'Tid';
 
@@ -1213,6 +1245,8 @@ nodeattrib SMALLINT
 
 
 
+comment on table organigramm is 'Liste der Organisationseinheiten';
+
 comment on column organigramm.tid is 'Tupelidentifier';
 
 comment on column organigramm.key_apnr is 'Schlüssel';
@@ -1368,7 +1402,7 @@ comment on column user_institution.gueltig_bis is 'Gültig bis';
 
 comment on column user_institution.lehre is 'obsoletes Feld';
 
-comment on column user_institution.external_entry is 'Recht wird von externem System (HisInOne) gesetzt und entfernt';
+comment on column user_institution.external_entry is 'Recht wird von externem System (HISinOne) gesetzt und entfernt';
 
 comment on column user_institution.externalid is 'ID der berechtigten Kostenstelle in externem System (HISinONe: orgunitid)';
 
@@ -1472,7 +1506,7 @@ comment on column user_kostentraeger.gueltig_seit is 'Gültig von';
 
 comment on column user_kostentraeger.gueltig_bis is 'Gültig bis';
 
-comment on column user_kostentraeger.external_entry is 'Recht wird von externem System (HisInOne) gesetzt und entfernt';
+comment on column user_kostentraeger.external_entry is 'Recht wird von externem System (HISinOne) gesetzt und entfernt';
 
 comment on column user_kostentraeger.externalid is 'ID der berechtigten Kostenstelle in externem System (HISinONe: orgunitid)';
 
@@ -1672,6 +1706,7 @@ toolbar_icon_filepath VARCHAR(255) ,
 usage_resultset_data CHAR(10)  default 'T' , 
 stylesheet_type CHAR(10)  default 'XSL' , 
 jr_datasource CHAR(10) , 
+uniquename VARCHAR(255) , 
 	constraint c_stylesheets primary key (tid)
 
 ) 
@@ -1703,6 +1738,8 @@ comment on column sx_stylesheets.stylesheet_type is 'Art des Stylesheets';
 
 comment on column sx_stylesheets.jr_datasource is 'Datenquelle (JR)';
 
+comment on column sx_stylesheets.uniquename is 'Eindeutige Identifizierung des Datensatzes';
+
 
 select now(), 'Tabelle sx_stylesheets erzeugt';
 
@@ -1790,7 +1827,7 @@ export_to_glossar INTEGER ,
 
 
 
-comment on table sx_captions is 'Felder und Ergebnisparameter über captions anpassen';
+comment on table sx_captions is 'Beschreibungstexte für Felder und Ergebnisparameter über captions in der BI pflegen';
 
 comment on column sx_captions.table_name is 'Tabellenname';
 
@@ -1874,7 +1911,7 @@ external_entry smallint  default 0 ,
 
 
 
-comment on column user_sichten.external_entry is 'Recht wird von externem System (HisInOne) gesetzt und entfernt';
+comment on column user_sichten.external_entry is 'Recht wird von externem System (HISinOne) gesetzt und entfernt';
 
 
 select now(), 'Tabelle user_sichten erzeugt';
@@ -1896,7 +1933,7 @@ external_entry smallint  default 0 ,
 
 comment on column user_sichtarten.sichtart is 'Rechte für eine Art von Sichten geben';
 
-comment on column user_sichtarten.external_entry is 'Recht wird von externem System (HisInOne) gesetzt und entfernt';
+comment on column user_sichtarten.external_entry is 'Recht wird von externem System (HISinOne) gesetzt und entfernt';
 
 
 select now(), 'Tabelle user_sichtarten erzeugt';
@@ -1996,7 +2033,7 @@ sort1 INTEGER ,
 sort2 INTEGER , 
 sort3 INTEGER , 
 geaendert_am DATE , 
-aktiv SMALLINT , 
+aktiv SMALLINT  default 0  not null, 
 gueltig_seit DATE  default date('01.01.1900')  not null, 
 gueltig_bis DATE  default date('01.01.3000')  not null, 
 	constraint pk_sx_repository primary key (tid)
@@ -2883,6 +2920,7 @@ comment on column trans_dim_bp_apnr.sourcesystem_id is 'ID im Vorsystem';
 select now(), 'Erzeuge Index ix_tr_dim_bp_apnr';
 
 create  index ix_tr_dim_bp_apnr on trans_dim_bp_apnr (dimension_bp_id, 
+apnr, 
 sourcesystem_id, 
 systeminfo_id );
 
@@ -2909,9 +2947,9 @@ comment on table masken_protokoll is 'Protokolltabelle zum nachverfolgen, welche
 
 comment on column masken_protokoll.tid is 'ID';
 
-comment on column masken_protokoll.maskeninfo_id is 'ID der Maske';
+comment on column masken_protokoll.maskeninfo_id is 'Maske';
 
-comment on column masken_protokoll.user_id is 'ID des Users, welcher die Maske ausgeführt hat';
+comment on column masken_protokoll.user_id is 'User';
 
 comment on column masken_protokoll.zeitpunkt is 'Ausführungs Zeitpunkt';
 
@@ -4013,6 +4051,20 @@ keybund VARCHAR(255)
 
 
 
+comment on column k_astat_studienfach_land.schluessel is 'Landesschlüssel';
+
+comment on column k_astat_studienfach_land.gueltig_ab is 'Gültigkeitsbeginn';
+
+comment on column k_astat_studienfach_land.land is 'Bundesland';
+
+comment on column k_astat_studienfach_land.gueltig_bis is 'Gültigkeitsende';
+
+comment on column k_astat_studienfach_land.name is 'Drucktext des Schlüssels';
+
+comment on column k_astat_studienfach_land.isced is 'ISCED-Code';
+
+comment on column k_astat_studienfach_land.keybund is 'Bundesschlüssel des Studienfaches';
+
 
 select now(), 'Tabelle k_astat_studienfach_land erzeugt';
 
@@ -4074,7 +4126,9 @@ select now(), 'Erzeuge Tabelle k_astat_studienbereich';
 create table k_astat_studienbereich(
 	schluessel VARCHAR(255)  not null, 
 name VARCHAR(255) , 
-fgr VARCHAR(255) 
+fgr VARCHAR(255) , 
+semester_von INTEGER , 
+semester_bis INTEGER 
 ) 
 ;
 
@@ -4096,7 +4150,9 @@ select now(), 'Erzeuge Tabelle k_astat_studienfach';
 create table k_astat_studienfach(
 	schluessel VARCHAR(255)  not null, 
 name VARCHAR(255) , 
-sb VARCHAR(255) 
+sb VARCHAR(255) , 
+semester_von INTEGER , 
+semester_bis INTEGER 
 ) 
 ;
 
@@ -4113,28 +4169,139 @@ select now(), 'Tabelle k_astat_studienfach erzeugt';
 
 
 
-select now(), 'Erzeuge Tabelle colorscheme';
+select now(), 'Erzeuge Tabelle k_astat_staat';
+
+create table k_astat_staat(
+	schluessel INTEGER  not null, 
+nummer VARCHAR(255) , 
+name VARCHAR(255) , 
+kennz VARCHAR(255) , 
+kontinent INTEGER , 
+	constraint c_k_astat_staat primary key (schluessel)
 
-create table colorscheme(
-	id SERIAL  not null, 
-caption VARCHAR(255) , 
-sortorder INTEGER , 
-colors VARCHAR(255) 
 ) 
 ;
 
 
 
-comment on column colorscheme.id is 'id';
+comment on column k_astat_staat.schluessel is 'Schlüssel';
 
-comment on column colorscheme.caption is 'Bezeichnung';
+comment on column k_astat_staat.nummer is 'Nummer';
 
-comment on column colorscheme.sortorder is 'Sortierreihenfolge';
+comment on column k_astat_staat.name is 'Name';
 
-comment on column colorscheme.colors is 'Farben';
+comment on column k_astat_staat.kennz is 'Kennzeichen';
 
+comment on column k_astat_staat.kontinent is 'Kontinent';
+
+
+select now(), 'Tabelle k_astat_staat erzeugt';
 
-select now(), 'Tabelle colorscheme erzeugt';
+
+
+select now(), 'Erzeuge Tabelle k_astat_kontinent';
+
+create table k_astat_kontinent(
+	schluessel INTEGER  not null, 
+nummer VARCHAR(255) , 
+name VARCHAR(255) , 
+	constraint c_k_astat_kontinent primary key (schluessel)
+
+) 
+;
+
+
+
+comment on column k_astat_kontinent.schluessel is 'Schlüssel';
+
+comment on column k_astat_kontinent.nummer is 'Nummer';
+
+comment on column k_astat_kontinent.name is 'Name';
+
+
+select now(), 'Tabelle k_astat_kontinent erzeugt';
+
+
+
+select now(), 'Erzeuge Tabelle k_astat_faechergruppe';
+
+create table k_astat_faechergruppe(
+	schluessel VARCHAR(255)  not null, 
+name VARCHAR(255) , 
+semester_von INTEGER , 
+semester_bis INTEGER 
+) 
+;
+
+
+
+comment on column k_astat_faechergruppe.schluessel is 'Schlüssel';
+
+comment on column k_astat_faechergruppe.name is 'Name';
+
+
+select now(), 'Tabelle k_astat_faechergruppe erzeugt';
+
+
+
+select now(), 'Erzeuge Tabelle k_astat_abschl_grp';
+
+create table k_astat_abschl_grp(
+	abschluss_astat_bund VARCHAR(255)  not null, 
+abschluss_astat_bund_ktxt VARCHAR(255) , 
+abschlussart VARCHAR(255) , 
+abschluss_grp VARCHAR(255) , 
+ist_lehramt SMALLINT  default 0 , 
+	constraint pk_k_astat_abschl_grp primary key (abschluss_astat_bund)
+
+) 
+;
+
+
+
+comment on column k_astat_abschl_grp.abschluss_astat_bund is 'Abschluss (Bundesschlüssel)';
+
+comment on column k_astat_abschl_grp.abschluss_astat_bund_ktxt is 'Abschluss (Bundesschlüssel) Kurztext';
+
+comment on column k_astat_abschl_grp.abschlussart is 'Abschlussart';
+
+comment on column k_astat_abschl_grp.abschluss_grp is 'Abschlussgruppe';
+
+comment on column k_astat_abschl_grp.ist_lehramt is 'Lehramt (J/N)';
+
+
+select now(), 'Tabelle k_astat_abschl_grp erzeugt';
+
+
+
+select now(), 'Erzeuge Tabelle k_astat_staat_eu';
+
+create table k_astat_staat_eu(
+	tid SERIAL  not null, 
+astat CHAR(3)  not null, 
+eu CHAR(1) , 
+semester_von INTEGER , 
+semester_bis INTEGER , 
+gueltig_von DATE , 
+gueltig_bis DATE , 
+	constraint pk_k_astat_staat_eu primary key (tid)
+
+) 
+;
+
+
+
+comment on column k_astat_staat_eu.eu is 'EU-Mitglied?';
+
+
+select now(), 'Erzeuge Index k_astat_staat_eu_idx1';
+
+create  index k_astat_staat_eu_idx1 on k_astat_staat_eu (astat, 
+semester_von, 
+semester_bis );
+
+
+select now(), 'Tabelle k_astat_staat_eu erzeugt';
 
 
 
@@ -4210,57 +4377,166 @@ select now(), 'Tabelle sx_mail erzeugt';
 
 
 
-select now(), 'Erzeuge Tabelle k_astat_staat';
+select now(), 'Erzeuge Tabelle colorscheme';
 
-create table k_astat_staat(
-	schluessel INTEGER  not null, 
-nummer VARCHAR(255) , 
+create table colorscheme(
+	id SERIAL  not null, 
+caption VARCHAR(255) , 
+sortorder INTEGER , 
+colors VARCHAR(255) 
+) 
+;
+
+
+
+comment on table colorscheme is 'Farbschema für Diagramm in BI-Analysen festlegen';
+
+comment on column colorscheme.id is 'id';
+
+comment on column colorscheme.caption is 'Bezeichnung';
+
+comment on column colorscheme.sortorder is 'Sortierreihenfolge';
+
+comment on column colorscheme.colors is 'Farben';
+
+
+select now(), 'Tabelle colorscheme erzeugt';
+
+
+
+select now(), 'Erzeuge Tabelle arch_table';
+
+create table arch_table(
+	id SERIAL  not null, 
 name VARCHAR(255) , 
-kennz VARCHAR(255) , 
-kontinent INTEGER , 
-	constraint c_k_astat_staat primary key (schluessel)
+zeitfeld VARCHAR(255) 
+) 
+;
+
+
+
+comment on column arch_table.id is 'id';
+
+comment on column arch_table.name is 'Name der archivierten Tabelle';
+
+comment on column arch_table.zeitfeld is 'Feld für die Zeitangabe';
+
+
+select now(), 'Tabelle arch_table erzeugt';
+
 
+
+select now(), 'Erzeuge Tabelle arch_datum';
+
+create table arch_datum(
+	arch_table VARCHAR(255)  not null, 
+datum timestamptz , 
+bezugszeit_von INTEGER , 
+bezugszeit_bis INTEGER , 
+bezugsart CHAR(1)  default 'J' , 
+userinfo_id INTEGER  not null, 
+kommentar VARCHAR(255) 
 ) 
 ;
 
 
 
-comment on column k_astat_staat.schluessel is 'Schlüssel';
+comment on column arch_datum.arch_table is 'Name der archivierten Tabelle';
 
-comment on column k_astat_staat.nummer is 'Nummer';
+comment on column arch_datum.datum is 'Archivierungsdatum und -uhrzeit';
 
-comment on column k_astat_staat.name is 'Name';
+comment on column arch_datum.bezugszeit_von is 'Bezugszeit (von) der archivierten Daten';
 
-comment on column k_astat_staat.kennz is 'Kennzeichen';
+comment on column arch_datum.bezugszeit_bis is 'Bezugszeit (bis) der archivierten Daten';
 
-comment on column k_astat_staat.kontinent is 'Kontinent';
+comment on column arch_datum.bezugsart is 'Bezugsart (Semester S, Akad. Jahr A,Jahr J, Quartal Q, Monat M)';
 
+comment on column arch_datum.userinfo_id is 'Userinfo ID';
 
-select now(), 'Tabelle k_astat_staat erzeugt';
+comment on column arch_datum.kommentar is 'Kommentar zur Archivierung';
 
 
+select now(), 'Tabelle arch_datum erzeugt';
 
-select now(), 'Erzeuge Tabelle k_astat_kontinent';
 
-create table k_astat_kontinent(
-	schluessel INTEGER  not null, 
-nummer VARCHAR(255) , 
+
+select now(), 'Erzeuge Tabelle k_prio_param';
+
+create table k_prio_param(
+	id SERIAL  not null, 
 name VARCHAR(255) , 
-	constraint c_k_astat_kontinent primary key (schluessel)
+sortorder VARCHAR(255) 
+) 
+;
+
+
+
+comment on column k_prio_param.id is 'id';
+
+comment on column k_prio_param.name is 'Name der Priorität';
+
+comment on column k_prio_param.sortorder is 'Sortierung der Priorität';
+
 
+select now(), 'Tabelle k_prio_param erzeugt';
+
+
+
+select now(), 'Erzeuge Tabelle k_source';
+
+create table k_source(
+	id SERIAL  not null, 
+name VARCHAR(255) , 
+sortorder VARCHAR(255) 
 ) 
 ;
 
 
 
-comment on column k_astat_kontinent.schluessel is 'Schlüssel';
+comment on column k_source.id is 'id';
 
-comment on column k_astat_kontinent.nummer is 'Nummer';
+comment on column k_source.name is 'Name des Quellsystems';
 
-comment on column k_astat_kontinent.name is 'Name';
+comment on column k_source.sortorder is 'Sortierung des Quellsystems';
 
 
-select now(), 'Tabelle k_astat_kontinent erzeugt';
+select now(), 'Tabelle k_source erzeugt';
+
+
+
+select now(), 'Erzeuge Tabelle k_astat_lfb_fg';
+
+create table k_astat_lfb_fg(
+	tid SERIAL  not null, 
+fgr CHAR(10) , 
+fgr_str CHAR(255) , 
+lfb CHAR(10) , 
+lfb_str CHAR(255) , 
+fg CHAR(10) , 
+fg_str VARCHAR(255) , 
+gueltig_von DATE , 
+gueltig_bis DATE , 
+	constraint pk_k_astat_lfb_fg primary key (tid)
+
+) 
+;
+
+
+
+comment on column k_astat_lfb_fg.fgr is 'Fächergruppe (Schlüssel)';
+
+comment on column k_astat_lfb_fg.fgr_str is 'Fächergruppe';
+
+comment on column k_astat_lfb_fg.lfb is 'Lehr- und Forschungsbereich (Schlüssel)';
+
+comment on column k_astat_lfb_fg.lfb_str is 'Lehr- und Forschungsbereich';
+
+comment on column k_astat_lfb_fg.fg is 'Fachgebiet (Schlüssel)';
+
+comment on column k_astat_lfb_fg.fg_str is 'Fachgebiet';
+
+
+select now(), 'Tabelle k_astat_lfb_fg erzeugt';
 
 
 
@@ -4345,7 +4621,7 @@ create view menu_element_orgstructure(
 description) as
 	
 	
-		select element as orgstruktur, description
+		select element_value::integer as orgstruktur, description
         from menu_element
   		where element='orgstruktur'
 				;
@@ -4557,19 +4833,17 @@ kontinent,
 inl_ausl_kurz, 
 inl_ausl_lang) as
 	
-SELECT
-       apnr,
-       druck,
-       to_number(uniquename,'99999')::integer as astat,
-       level2_char as kontinent,
-       level1_char as inl_ausl_kurz,
-       level1_str as inl_ausl_lang
-FROM dim_bp_apnr
-where dimension_bp_id=(select D.tid from dimension_bp D where D.apnr='bluep_ca12_staat')
-and apnr !=0 --nur für Abwärtskompatibilität zu FLEDA
-
-
- ;
+				select A.schluessel as apnr,
+				A.name as druck,
+				A.schluessel as astat,
+				K.name as kontinent,
+				case when A.schluessel=0 then 'I' else 'A' end as inl_ausl_kurz,
+				case when A.schluessel=0 then 'Inland' else 'Ausland' end as inl_ausl_lang
+				
+				from k_astat_staat A left outer join k_astat_kontinent K
+				on (A.kontinent=K.schluessel)
+				
+				 ;
 	
 
 select now(), 'Erzeuge View dim_stg';
@@ -4682,6 +4956,55 @@ bland_astat) as
 					WHERE
 					  dimension_bp_id = (SELECT tid FROM dimension_bp WHERE apnr='bluep_hzbkfz')
                  ;
+	
+
+select now(), 'Erzeuge View dim_semester';
+
+create view dim_semester(
+	tid, 
+eintrag, 
+eintrag_kurz, 
+sem_beginn, 
+sem_ende, 
+semestertyp, 
+vorsem, 
+folgesem, 
+folgesem_sem_beginn, 
+ist_zukunft, 
+akad_jahr, 
+akad_jahr_absolv, 
+akad_jahr_anf) as
+	
+			with tmp_semester as (select C.apnr as tid,
+			C.druck as eintrag,
+			C.kurz as eintrag_kurz, --TODO
+			C.d_akt_von as sem_beginn,
+			C.d_akt_bis as sem_ende,
+			val(substring(''  || C.apnr from 5 for 1)) as semestertyp,
+			add_sem(C.apnr,-1) as vorsem,
+			add_sem(C.apnr,1) as folgesem,
+			(select C2.d_akt_von from cif C2 where C2.key=661
+			and C2.apnr=add_sem(C.apnr,1)) as folgesem_sem_beginn
+			from cif C
+			where key=661
+			)
+			select tid,
+			eintrag,
+			eintrag_kurz,
+			sem_beginn,
+			sem_ende,
+			semestertyp,
+			vorsem,
+			folgesem,
+			folgesem_sem_beginn,
+			(case when sem_beginn > current_date then 1 else 0 end) as ist_zukunft,
+			case when semestertyp='1' then (tid/10)-1 when semestertyp='2' then (tid/10) end as akad_jahr,
+			case when semestertyp='1' then (tid/10) when semestertyp='2' then (tid/10)+1 end as akad_jahr_absolv,
+			case when semestertyp='1' then (tid/10) when semestertyp='2' then (tid/10) end as akad_jahr_anf
+			
+			from tmp_semester
+			
+			 ;
 	--Funktion / Prozedur sp_user_themen
 \! DOSQL $SUPERX_DIR/db/install/prozeduren/proc_sp_user_themen_pg.sql
 			--Funktion / Prozedur sp_user_orga
@@ -4840,18 +5163,8 @@ CREATE or replace FUNCTION val(integer) RETURNS integer STABLE
 CREATE or replace FUNCTION val(smallint) RETURNS integer STABLE
   AS 'select $1::integer ' LANGUAGE sql;
  --Funktion / Prozedur decval
-
-CREATE or replace FUNCTION decval(varchar(255)) RETURNS numeric(16,2) STABLE
-  AS 'select $1::numeric  where trim($1) !='''' ' LANGUAGE sql;
- --Funktion / Prozedur decval
-
-CREATE or replace FUNCTION decval(text) RETURNS numeric(16,2) STABLE
-  AS 'select $1::numeric  where trim($1) !='''' ' LANGUAGE sql;
- --Funktion / Prozedur decval
-
-CREATE or replace FUNCTION decval(char(255)) RETURNS numeric(16,2) STABLE
-  AS 'select $1::numeric  where trim($1) !='''' ' LANGUAGE sql;
- --Funktion / Prozedur sp_filter_orga
+\! DOSQL $SUPERX_DIR/db/install/prozeduren/proc_decval_pg.sql
+			--Funktion / Prozedur sp_filter_orga
 \! DOSQL $SUPERX_DIR/db/install/prozeduren/proc_sp_filter_orga_pg.sql
 			--Funktion / Prozedur sp_update_sequence
 \! DOSQL $SUPERX_DIR/db/install/prozeduren/proc_sp_update_sequence_pg.sql
@@ -5119,6 +5432,11 @@ select now(), 'Lade Tabelle k_astat_studienbereich';
 \! sx_auto_upload_table.x k_astat_studienbereich $SUPERX_DIR/db/install/schluesseltabellen/release_unloads/k_astat_studienbereich.unl
 
 
+select now(), 'Lade Tabelle k_astat_faechergruppe';
+
+\! sx_auto_upload_table.x k_astat_faechergruppe $SUPERX_DIR/db/install/schluesseltabellen/release_unloads/k_astat_faechergruppe.unl
+
+
 select now(), 'Lade Tabelle k_astat_staat';
 
 \! sx_auto_upload_table.x k_astat_staat $SUPERX_DIR/db/install/schluesseltabellen/release_unloads/k_astat_staat.unl
@@ -5129,6 +5447,16 @@ select now(), 'Lade Tabelle k_astat_kontinent';
 \! sx_auto_upload_table.x k_astat_kontinent $SUPERX_DIR/db/install/schluesseltabellen/release_unloads/k_astat_kontinent.unl
 
 
+select now(), 'Lade Tabelle k_astat_abschl_grp';
+
+\! sx_auto_upload_table.x k_astat_abschl_grp $SUPERX_DIR/db/install/schluesseltabellen/release_unloads/k_astat_abschl_grp.unl
+
+
+select now(), 'Lade Tabelle k_astat_staat_eu';
+
+\! sx_auto_upload_table.x k_astat_staat_eu $SUPERX_DIR/db/install/schluesseltabellen/release_unloads/k_astat_staat_eu.unl
+
+
 select now(), 'Scriptfile $SUPERX_DIR/db/install/schluesseltabellen/macro_masken_bez_fuellen.sql ausführen';
 
 	
@@ -5146,7 +5474,7 @@ select now(), 'Fülle db_version';
 
 
 delete from db_version  where his_system='kern';
-insert into db_version (his_system,version,systeminfo_id) values('kern','5.0',9);
+insert into db_version (his_system,version,systeminfo_id) values('kern','5.3',9);
 
 
 
@@ -5398,14 +5726,30 @@ 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);
 delete from db_tabellen where name='k_astat_staat';
 insert into db_tabellen (name,protokollierung) values('k_astat_staat',0);
 delete from db_tabellen where name='k_astat_kontinent';
 insert into db_tabellen (name,protokollierung) values('k_astat_kontinent',0);
+delete from db_tabellen where name='k_astat_faechergruppe';
+insert into db_tabellen (name,protokollierung) values('k_astat_faechergruppe',0);
+delete from db_tabellen where name='k_astat_abschl_grp';
+insert into db_tabellen (name,protokollierung) values('k_astat_abschl_grp',0);
+delete from db_tabellen where name='k_astat_staat_eu';
+insert into db_tabellen (name,protokollierung) values('k_astat_staat_eu',0);
+delete from db_tabellen where name='sx_mail';
+insert into db_tabellen (name,protokollierung) values('sx_mail',0);
+delete from db_tabellen where name='colorscheme';
+insert into db_tabellen (name,protokollierung) values('colorscheme',0);
+delete from db_tabellen where name='arch_table';
+insert into db_tabellen (name,protokollierung) values('arch_table',0);
+delete from db_tabellen where name='arch_datum';
+insert into db_tabellen (name,protokollierung) values('arch_datum',0);
+delete from db_tabellen where name='k_prio_param';
+insert into db_tabellen (name,protokollierung) values('k_prio_param',0);
+delete from db_tabellen where name='k_source';
+insert into db_tabellen (name,protokollierung) values('k_source',0);
+delete from db_tabellen where name='k_astat_lfb_fg';
+insert into db_tabellen (name,protokollierung) values('k_astat_lfb_fg',0);
 
 
 select now(), 'Fülle sachgebiete, systeminfo und themenbaum';
@@ -5532,16 +5876,16 @@ insert into tmp_themenbaum(name, parentname, gueltig_seit,gueltig_bis,erlaeuteru
 delete from tmp_themenbaum where name in (select T.name from themenbaum  T where T.name='Benutzer' 
 or T.name='Administration');
 insert into tmp_themenbaum(name, parentname, gueltig_seit,gueltig_bis,erlaeuterung)
- values('Entwicklung','Administration',date_val('01.01.1900'),date_val('01.01.3000'),'Spezielle Funktionen für die Entwicklung');
+ 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='Entwicklung' 
+delete from tmp_themenbaum where name in (select T.name from themenbaum  T where T.name='Stammdaten verwalten' 
 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');
+ values('Datenmanagement','Administration',date_val('01.01.1900'),date_val('01.01.3000'),'Abfragen zum Datenmanagement');
 
 --gibt es das Thema schon?
-delete from tmp_themenbaum where name in (select T.name from themenbaum  T where T.name='Stammdaten verwalten' 
+delete from tmp_themenbaum where name in (select T.name from themenbaum  T where T.name='Datenmanagement' 
 or T.name='Administration');
 
 --root für das Modul einfügen und in den Themenbaum einhängen
@@ -5601,6 +5945,12 @@ insert into tmp_themenbaum
    gueltig_bis)
 values('Feld suchen','70570','Felder',date_val('01.01.1900'),date_val('01.01.3000'));
 
+insert into tmp_themenbaum
+(  name  ,maskeninfo_id, parentname,
+   gueltig_seit ,
+   gueltig_bis)
+values('User einrichten','70970','Benutzer verwalten',date_val('01.01.1900'),date_val('01.01.3000'));
+
 insert into tmp_themenbaum
 (  name  ,maskeninfo_id, parentname,
    gueltig_seit ,
@@ -5829,6 +6179,18 @@ insert into tmp_themenbaum
    gueltig_bis)
 values('Gastzugang einrichten','71770','Administration',date_val('01.01.1900'),date_val('01.01.3000'));
 
+insert into tmp_themenbaum
+(  name  ,maskeninfo_id, parentname,
+   gueltig_seit ,
+   gueltig_bis)
+values('Datenblatt archivieren','71840','Datenmanagement',date_val('01.01.1900'),date_val('01.01.3000'));
+
+insert into tmp_themenbaum
+(  name  ,maskeninfo_id, parentname,
+   gueltig_seit ,
+   gueltig_bis)
+values('Übersicht Datenblatt-Archiv','71860','Datenmanagement',date_val('01.01.1900'),date_val('01.01.3000'));
+
 --gibt es die Maske schon?
 delete from tmp_themenbaum where maskeninfo_id in (select T.maskeninfo_id from themenbaum  T);
 
@@ -5861,8 +6223,8 @@ update themenbaum set erlaeuterung='Abfragen zur Maskenverwaltung' where name='M
 update themenbaum set erlaeuterung='Uploads/Downloads verwalten' where name='Uploads/Downloads verwalten';
 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';
+update themenbaum set erlaeuterung='Abfragen zum Datenmanagement' where name='Datenmanagement';
  
 CREATE temp TABLE tmp_db_forms (
     tid serial NOT NULL,
@@ -5889,13 +6251,13 @@ values ('felderinfo','felderinfo','/edit/kern/felderinfo_edit.jsp','Felderinfo v
 insert into tmp_db_forms (name, tablename,form_path,caption,description)
 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'::varchar(200),'In diesem Formular können Sie Benutzern Sachgebietsrechte geben. Achtung: Einträge von externem System (HisInOne) werden bei Neuanmeldung überschrieben'::varchar(255));
+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'::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));
+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'::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'::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));
+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'::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)

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

@@ -214,3 +214,15 @@ sx_auto_insert_mask 71800
 echo "Maske Nr.  71820 einfügen:"
 cd $SUPERX_DIR/db/install/masken
 sx_auto_insert_mask 71820
+#Maske Nr.71840 Datenblatt archivieren
+echo "Maske Nr.  71840 einfügen:"
+cd $SUPERX_DIR/db/install/masken
+sx_auto_insert_mask 71840
+#Maske Nr.71860 Übersicht Datenblatt-Archiv
+echo "Maske Nr.  71860 einfügen:"
+cd $SUPERX_DIR/db/install/masken
+sx_auto_insert_mask 71860
+#Maske Nr.71880 Downloads löschen
+echo "Maske Nr.  71880 einfügen:"
+cd $SUPERX_DIR/db/install/masken
+sx_auto_insert_mask 71880

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

@@ -223,3 +223,15 @@ sx_auto_insert_mask 71800
 echo "Maske Nr.  71820 einfügen:"
 cd $SUPERX_DIR/db/install/masken
 sx_auto_insert_mask 71820
+#Maske Nr.71840 Datenblatt archivieren
+echo "Maske Nr.  71840 einfügen:"
+cd $SUPERX_DIR/db/install/masken
+sx_auto_insert_mask 71840
+#Maske Nr.71860 Übersicht Datenblatt-Archiv
+echo "Maske Nr.  71860 einfügen:"
+cd $SUPERX_DIR/db/install/masken
+sx_auto_insert_mask 71860
+#Maske Nr.71880 Downloads löschen
+echo "Maske Nr.  71880 einfügen:"
+cd $SUPERX_DIR/db/install/masken
+sx_auto_insert_mask 71880

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

@@ -162,3 +162,12 @@ sx_select_mask 71800
 #Maske Nr.71820 Archivierte Daten
 cd "$SUPERX_DIR/db/install/masken"
 sx_select_mask 71820
+#Maske Nr.71840 Datenblatt archivieren
+cd "$SUPERX_DIR/db/install/masken"
+sx_select_mask 71840
+#Maske Nr.71860 Übersicht Datenblatt-Archiv
+cd "$SUPERX_DIR/db/install/masken"
+sx_select_mask 71860
+#Maske Nr.71880 Downloads löschen
+cd "$SUPERX_DIR/db/install/masken"
+sx_select_mask 71880

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

@@ -168,3 +168,12 @@ sx_select_mask 71800
 #Maske Nr.71820 Archivierte Daten
 cd "$SUPERX_DIR/db/install/masken"
 sx_select_mask 71820
+#Maske Nr.71840 Datenblatt archivieren
+cd "$SUPERX_DIR/db/install/masken"
+sx_select_mask 71840
+#Maske Nr.71860 Übersicht Datenblatt-Archiv
+cd "$SUPERX_DIR/db/install/masken"
+sx_select_mask 71860
+#Maske Nr.71880 Downloads löschen
+cd "$SUPERX_DIR/db/install/masken"
+sx_select_mask 71880

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

@@ -164,3 +164,12 @@ sx_auto_delete_mask 71800
 #Maske Nr.71820 Archivierte Daten
 sx_auto_delete_mask 71820
 sx_auto_delete_mask 71820
+#Maske Nr.71840 Datenblatt archivieren
+sx_auto_delete_mask 71840
+sx_auto_delete_mask 71840
+#Maske Nr.71860 Übersicht Datenblatt-Archiv
+sx_auto_delete_mask 71860
+sx_auto_delete_mask 71860
+#Maske Nr.71880 Downloads löschen
+sx_auto_delete_mask 71880
+sx_auto_delete_mask 71880

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

@@ -164,3 +164,12 @@ sx_auto_delete_mask 71800
 #Maske Nr.71820 Archivierte Daten
 sx_auto_delete_mask 71820
 sx_auto_delete_mask 71820
+#Maske Nr.71840 Datenblatt archivieren
+sx_auto_delete_mask 71840
+sx_auto_delete_mask 71840
+#Maske Nr.71860 Übersicht Datenblatt-Archiv
+sx_auto_delete_mask 71860
+sx_auto_delete_mask 71860
+#Maske Nr.71880 Downloads löschen
+sx_auto_delete_mask 71880
+sx_auto_delete_mask 71880

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

@@ -1,4 +1,5 @@
 -- XML-generiertes SQL-Script fuer dbaccess-- Die Tabellen vom Typ "Bewegunsdaten" (also Daten- und Hilfstabellen) werden gelöscht.
+delete from unload_params;
 delete from masken_protokoll;
 delete from masken_prot_feld;
 delete from data_upload;
@@ -14,3 +15,4 @@ delete from kern_cifx_neu;
 delete from kern_pruefrout;
 delete from masken_statistik;
 delete from hisinone_deleted_entity;
+delete from arch_datum;

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

@@ -1,4 +1,6 @@
 -- XML-generiertes SQL-Script fuer psql-- Die Tabellen vom Typ "Bewegunsdaten" (also Daten- und Hilfstabellen) werden gelöscht.
+truncate table unload_params;
+vacuum full unload_params;
 truncate table masken_protokoll;
 vacuum full masken_protokoll;
 truncate table masken_prot_feld;
@@ -29,3 +31,5 @@ truncate table masken_statistik;
 vacuum full masken_statistik;
 truncate table hisinone_deleted_entity;
 vacuum full hisinone_deleted_entity;
+truncate table arch_datum;
+vacuum full arch_datum;

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

@@ -126,10 +126,18 @@ sx_auto_upload_table.x k_astat_abschluss3steller_land tmp"$MANDANTENID"/k_astat_
 sx_auto_upload_table.x k_astat_abschluss2steller tmp"$MANDANTENID"/k_astat_abschluss2steller.unl
 sx_auto_upload_table.x k_astat_studienbereich tmp"$MANDANTENID"/k_astat_studienbereich.unl
 sx_auto_upload_table.x k_astat_studienfach tmp"$MANDANTENID"/k_astat_studienfach.unl
-sx_auto_upload_table.x colorscheme tmp"$MANDANTENID"/colorscheme.unl
-sx_auto_upload_table.x sx_mail tmp"$MANDANTENID"/sx_mail.unl
 sx_auto_upload_table.x k_astat_staat tmp"$MANDANTENID"/k_astat_staat.unl
 sx_auto_upload_table.x k_astat_kontinent tmp"$MANDANTENID"/k_astat_kontinent.unl
+sx_auto_upload_table.x k_astat_faechergruppe tmp"$MANDANTENID"/k_astat_faechergruppe.unl
+sx_auto_upload_table.x k_astat_abschl_grp tmp"$MANDANTENID"/k_astat_abschl_grp.unl
+sx_auto_upload_table.x k_astat_staat_eu tmp"$MANDANTENID"/k_astat_staat_eu.unl
+sx_auto_upload_table.x sx_mail tmp"$MANDANTENID"/sx_mail.unl
+sx_auto_upload_table.x colorscheme tmp"$MANDANTENID"/colorscheme.unl
+sx_auto_upload_table.x arch_table tmp"$MANDANTENID"/arch_table.unl
+sx_auto_upload_table.x arch_datum tmp"$MANDANTENID"/arch_datum.unl
+sx_auto_upload_table.x k_prio_param tmp"$MANDANTENID"/k_prio_param.unl
+sx_auto_upload_table.x k_source tmp"$MANDANTENID"/k_source.unl
+sx_auto_upload_table.x k_astat_lfb_fg tmp"$MANDANTENID"/k_astat_lfb_fg.unl
 
 
 echo 'Finished restoring'

superx/WEB-INF/conf/edustore/db/install/masken/70350_felderinfo.unl

@@ -1,8 +1,9 @@
-70350^zu kopierende Maske^0^0^0^150^450^1^integer^30^1^1^<<SQL>> select tid, tid || ' - ' || name from maskeninfo order by name;^^^
-70351^Neuer Name^2^0^0^150^250^1^char^100^1^0^^^^
-70352^Neue tid^1^0^0^150^200^1^integer^60^1^0^^^<<SQL>> select (max(tid)+20) from maskeninfo;^
-70353^Erläuterung^12^0^0^150^400^4^char^240^0^0^^^^
+70350^zu kopierende Maske^0^0^0^150^450^1^integer^30^1^1^<<SQL>> select tid, tid || ' - ' || name from maskeninfo order by name;^ ^ ^
+70351^Neuer Name^2^0^0^150^250^1^char^100^1^0^^ ^ ^
+70352^Neue tid^1^0^0^150^200^1^integer^60^1^0^^ ^<<SQL>> select (max(tid)+20) from maskeninfo;^
+70353^Erläuterung^12^0^0^150^400^4^char^240^0^0^^ ^ ^
 70354^Art der Kopie^1065^0^0^100^150^1^char^30^1^1^<<SQL>> select 'makro','Makrobericht' from xdummy \
 union select 'sximport','SX-Importkopie' from xdummy\
 union select 'standard','Standardkopie' from xdummy\
 ;^ ^<<SQL>> select 'standard','Standardkopie' from xdummy;^
+70355^_customValidation^100^0^0^150^450^1^char^30^1^13^^ ^validiereNeueMaskennr^