Backport Organigrammbearbeitung (287360) und Ladejobvorschau (303663)

src/de/superx/bin/KettleExecutor.java

@@ -7,11 +7,13 @@ import java.util.HashMap;
 import java.util.Iterator;
 import java.util.List;
 import java.util.Map;
+import java.util.StringTokenizer;
 
 import org.pentaho.di.core.KettleEnvironment;
 import org.pentaho.di.core.exception.KettleException;
 
 import de.memtext.util.GetOpts;
+import de.memtext.util.StringUtils;
 import de.superx.bin.fm.EtlStarter;
 import de.superx.common.DBServletException;
 import de.superx.common.SuperX_el;
@@ -22,178 +24,220 @@ import de.superx.servlet.SuperXManager;
 import de.superx.servlet.SxPools;
 
 public class KettleExecutor {
-	private String mandantenID;
-	private SxJob sxJob;
-	private boolean isPostgres = true;
-	private StringBuffer resultMessages=new StringBuffer("");
-	private Map<String, String> jobParams = new HashMap<String, String>();
-
-	public KettleExecutor(String mandantenID) {
-		this.mandantenID = mandantenID;
-		isPostgres = SxPools.get(mandantenID).getDatabaseAbbr().equals(("PG"));
-	}
-
-	public void setParams(Map<String, String> jobParams) {
-		this.jobParams = jobParams;
-	}
-
-	public StringBuffer perform() throws IOException, SQLException, DBServletException {
-		try {
-			initSxJob();
-			EtlStarter es = new EtlStarter();
-			check_sql("vor");
-			resultMessages.append(es.kettleCallEmbedded(mandantenID, sxJob.getFilepath(), jobParams, isPostgres));
-			check_sql("nach");
-
-		} catch (Exception e) {
-			throw new IOException(e);
-		}
-		return resultMessages;
-	}
-
-	private void check_sql(String pos) throws SQLException, DBServletException {
-		if (sxJob.check_sql != null) {
-			SuperX_el el=ServletUtils.execute_el("check_sql "+pos+" Durchführung von Ladejob "+sxJob.getCaption(), sxJob.check_sql, false,mandantenID);
-			SxResultSet rs=el.getResultSet();
-			for (Iterator it = rs.iterator(); it.hasNext();) {
-				SxResultRow row = (SxResultRow) it.next();
-				Object erg = row.get(0);
-				if (erg!=null) {
-					resultMessages.append("Prüfselektion "+pos+" Durchführung von Ladejob "+sxJob.getCaption());
-					resultMessages.append("\n"+erg.toString()+"\n");
-				}
-			}
-		}
-
-	}
-
-
-	private void initSxJob() throws SQLException, DBServletException {
-		SxResultSet rs = ServletUtils.execute("Einlesen von SxJob)",
-				"select caption,filepath,params,check_sql from sx_jobs where tid=" + jobParams.get("Job"), mandantenID);
-		sxJob = new SxJob();
-		for (Iterator it = rs.iterator(); it.hasNext();) {
-			SxResultRow row = (SxResultRow) it.next();
-			sxJob.setCaption(row.get(0).toString());
-			sxJob.setFilepath("file://" + SuperXManager.getModuleDir() + File.separator + row.get(1).toString());
-			sxJob.setParams((String) row.get(2));
-			sxJob.setCheck_sql((String) row.get(3));
-		}
-	}
-
-	public static void main(String args[]) {
-		String usage="usage: -mandantenID:default -MODULE_PFAD:/home/superx/db/module -WEB_INF_PFAD:/home/superx/webserver/tomcat/webapps/superx/WEB-INF -job_uniquename:abc -path_to_uploadfile:/home/superx (optional)" ;
-		GetOpts.setOpts(args);
-	        String isdrin = GetOpts.isAllRequiredOptionsPresent("-mandantenID,-WEB_INF_PFAD,-MODULE_PFAD,-job_uniquename");
-	        if (isdrin != null) {
-
-	            System.err.println(usage);
-	            System.exit(1);
-	        }
-	       
-		String mandantenID = GetOpts.getValue("-mandantenID");
-		String job_uniquename=GetOpts.getValue("-job_uniquename");
-		SuperXManager.setWEB_INFPfad(GetOpts.getValue("-WEB_INF_PFAD"));
-		SuperXManager.setModuleDir(GetOpts.getValue("-MODULE_PFAD"));
-		String path_to_uploadfile="";
-		if (GetOpts.isPresent("-path_to_uploadfile")) 
-			{
-			path_to_uploadfile=GetOpts.getValue("-path_to_uploadfile");
-			if (!new File(path_to_uploadfile).exists())
-			{
-				System.out.println("Fehler: Datei "+path_to_uploadfile+" nicht gefunden");
-				System.exit(-1);
-			}
-			}
-		try {
-			//muss vor SxPools init ausgeführt werden, sonst kann kein kettleDatabaseMeta-Objekt erzeugt werden java.lang.RuntimeException: Database type not found!
-		   KettleEnvironment.init();
-				
-			SxPools.init();
-			SxPools.get(mandantenID).init();
-			//SxPools.get(mandantenID).initLogging(true);
-			SxPools.resetAllPools();
-		} catch (Exception e) {
-			System.out.println("Fehler beim Datenbankverbindungsaufbau " + e);
-			e.printStackTrace();;
-			
-			System.exit(-1);
-		}
-		try {
-		String jobtid=getJobTid(job_uniquename,mandantenID);
-		KettleExecutor ke = new KettleExecutor(mandantenID);
-		Map<String, String> jobParams = new HashMap<String, String>();
-		jobParams.put("Job", jobtid);
-		jobParams.put("PATH_TO_UPLOADFILE", path_to_uploadfile);
-		ke.setParams(jobParams);
-		
-			ke.perform();
-			System.out.println("Keine Fehler aufgefallen");
-		} catch (Exception e) {
-
-			System.out.println("Fehler bei Verarbeitung " + e);
-			e.printStackTrace();
-			System.exit(-1);
-
-		}
-	}
-
-	private static String getJobTid(String job_uniquename,String mandantenID) throws SQLException, DBServletException {
-   String tid="";
-	String sql="select tid from sx_jobs where uniquename='"+job_uniquename+"'";
-	SxResultSet rs=ServletUtils.execute("Suche tid für sx_job mit uniquename "+job_uniquename, sql, mandantenID);
-	if (rs.size()==0)
-		throw new RuntimeException("Kein sx_job mit uniquename "+job_uniquename+" gefunden");
-	if (rs.size()>1)
-		throw new RuntimeException("Mehrere sx_jobs mit uniquename "+job_uniquename+" gefunden");
-	
-		for (Iterator it = rs.iterator(); it.hasNext();) {
-			SxResultRow row = (SxResultRow) it.next();
-			Object erg = row.get(0);
-			if (erg!=null) tid=erg.toString();
-		}
-		return tid;
-	}
-
-	private class SxJob {
-		private String filepath;
-		private String params;
-		private String check_sql;
-		private String caption;
-		public String getCaption() {
-			return caption;
-		}
-
-		public void setCaption(String caption) {
-			this.caption = caption;
-		}
-
-		public String getFilepath() {
-			return filepath;
-		}
-
-		public void setFilepath(String filepath) {
-			this.filepath = filepath;
-		}
-
-		public String getParams() {
-			return params;
-		}
-
-		public void setParams(String params) {
-			this.params = params;
-		}
-
-		public String getCheck_sql() {
-			return check_sql;
-		}
-
-		public void setCheck_sql(String check_sql) {
-			this.check_sql = check_sql;
-		}
-
-		
-
-	}
+    private String mandantenID;
+
+    private SxJob sxJob;
+
+    private boolean isPostgres = true;
+
+    private StringBuffer resultMessages = new StringBuffer("");
+
+    private Map<String, String> jobParams = new HashMap<String, String>();
+
+    public KettleExecutor(String mandantenID) {
+        this.mandantenID = mandantenID;
+        isPostgres = SxPools.get(mandantenID).getDatabaseAbbr().equals(("PG"));
+    }
+
+    public void setParams(Map<String, String> jobParams) {
+        this.jobParams = jobParams;
+    }
+
+    public StringBuffer perform() throws IOException, SQLException, DBServletException {
+        try {
+            initSxJob();
+            EtlStarter es = new EtlStarter();
+            if (!isModusVorschau()) {
+                check_sql("vor");
+            }
+            resultMessages.append(es.kettleCallEmbedded(mandantenID, sxJob.getFilepath(), jobParams, isPostgres));
+            if (isModusVorschau()) {
+                //Vor Ergebnis Vorschau einfügen
+                resultMessages.insert(0, getPreviewInfo());
+            } else {
+                check_sql("nach");
+            }
+
+
+        } catch (Exception e) {
+            throw new IOException(e);
+        }
+        return resultMessages;
+    }
+
+    private boolean isModusVorschau() {
+        return jobParams.containsKey("Modus") && jobParams.get("Modus") != null && jobParams.get("Modus").equals("3");
+    }
+
+    private StringBuilder getPreviewInfo() throws IOException {
+        StringBuilder result = new StringBuilder();
+        File loadjoblog = new File(new File(sxJob.getFilepath().replaceAll("file:", "")).getParentFile().getPath() + File.separator + "ladejob.log");
+        if (loadjoblog.exists()) {
+            String rawpreview = StringUtils.readFile(loadjoblog);
+            StringTokenizer st = new StringTokenizer(rawpreview, "\n");
+            result.append("Vorschau\n");
+            String currentHeader = "";
+            while (st.hasMoreTokens()) {
+                String line = st.nextToken();
+                if (line.indexOf("|") > -1) {
+                    String firstpart = line.substring(0, line.indexOf("|"));
+                    if (!firstpart.equals(currentHeader)) {
+                        result.append(firstpart + "\n");
+                        currentHeader = firstpart;
+                        result.append("-->" + line.substring(line.indexOf("|") + 1) + "\n");
+                    } else {
+                        result.append("-->" + StringUtils.replace(line, firstpart + "|", "") + "\n");
+                    }
+                }
+            }
+
+        }
+        return result;
+    }
+
+    private void check_sql(String pos) throws SQLException, DBServletException {
+        if (sxJob.check_sql != null) {
+            SuperX_el el = ServletUtils.execute_el("check_sql " + pos + " Durchführung von Ladejob " + sxJob.getCaption(), sxJob.check_sql, false, mandantenID);
+            SxResultSet rs = el.getResultSet();
+            for (Iterator it = rs.iterator(); it.hasNext();) {
+                SxResultRow row = (SxResultRow) it.next();
+                Object erg = row.get(0);
+                if (erg != null) {
+                    resultMessages.append("Prüfselektion " + pos + " Durchführung von Ladejob " + sxJob.getCaption());
+                    resultMessages.append("\n" + erg.toString() + "\n");
+                }
+            }
+        }
+
+    }
+
+
+    private void initSxJob() throws SQLException, DBServletException {
+        SxResultSet rs = ServletUtils.execute("Einlesen von SxJob)", "select caption,filepath,params,check_sql from sx_jobs where tid=" + jobParams.get("Job"), mandantenID);
+        sxJob = new SxJob();
+        for (Iterator it = rs.iterator(); it.hasNext();) {
+            SxResultRow row = (SxResultRow) it.next();
+            sxJob.setCaption(row.get(0).toString());
+            sxJob.setFilepath("file://" + SuperXManager.getModuleDir() + File.separator + row.get(1).toString());
+            sxJob.setParams((String) row.get(2));
+            sxJob.setCheck_sql((String) row.get(3));
+        }
+    }
+
+    public static void main(String args[]) {
+        String usage = "usage: -mandantenID:default -MODULE_PFAD:/home/superx/db/module -WEB_INF_PFAD:/home/superx/webserver/tomcat/webapps/superx/WEB-INF -job_uniquename:abc -path_to_uploadfile:/home/superx (optional)";
+        GetOpts.setOpts(args);
+        String isdrin = GetOpts.isAllRequiredOptionsPresent("-mandantenID,-WEB_INF_PFAD,-MODULE_PFAD,-job_uniquename");
+        if (isdrin != null) {
+
+            System.err.println(usage);
+            System.exit(1);
+        }
+
+        String mandantenID = GetOpts.getValue("-mandantenID");
+        String job_uniquename = GetOpts.getValue("-job_uniquename");
+        SuperXManager.setWEB_INFPfad(GetOpts.getValue("-WEB_INF_PFAD"));
+        SuperXManager.setModuleDir(GetOpts.getValue("-MODULE_PFAD"));
+        String path_to_uploadfile = "";
+        if (GetOpts.isPresent("-path_to_uploadfile")) {
+            path_to_uploadfile = GetOpts.getValue("-path_to_uploadfile");
+            if (!new File(path_to_uploadfile).exists()) {
+                System.out.println("Fehler: Datei " + path_to_uploadfile + " nicht gefunden");
+                System.exit(-1);
+            }
+        }
+        try {
+            //muss vor SxPools init ausgeführt werden, sonst kann kein kettleDatabaseMeta-Objekt erzeugt werden java.lang.RuntimeException: Database type not found!
+            KettleEnvironment.init();
+
+            SxPools.init();
+            SxPools.get(mandantenID).init();
+            //SxPools.get(mandantenID).initLogging(true);
+            SxPools.resetAllPools();
+        } catch (Exception e) {
+            System.out.println("Fehler beim Datenbankverbindungsaufbau " + e);
+            e.printStackTrace();
+            ;
+
+            System.exit(-1);
+        }
+        try {
+            String jobtid = getJobTid(job_uniquename, mandantenID);
+            KettleExecutor ke = new KettleExecutor(mandantenID);
+            Map<String, String> jobParams = new HashMap<String, String>();
+            jobParams.put("Job", jobtid);
+            jobParams.put("PATH_TO_UPLOADFILE", path_to_uploadfile);
+            ke.setParams(jobParams);
+
+            ke.perform();
+            System.out.println("Keine Fehler aufgefallen");
+        } catch (Exception e) {
+
+            System.out.println("Fehler bei Verarbeitung " + e);
+            e.printStackTrace();
+            System.exit(-1);
+
+        }
+    }
+
+    private static String getJobTid(String job_uniquename, String mandantenID) throws SQLException, DBServletException {
+        String tid = "";
+        String sql = "select tid from sx_jobs where uniquename='" + job_uniquename + "'";
+        SxResultSet rs = ServletUtils.execute("Suche tid für sx_job mit uniquename " + job_uniquename, sql, mandantenID);
+        if (rs.size() == 0) throw new RuntimeException("Kein sx_job mit uniquename " + job_uniquename + " gefunden");
+        if (rs.size() > 1) throw new RuntimeException("Mehrere sx_jobs mit uniquename " + job_uniquename + " gefunden");
+
+        for (Iterator it = rs.iterator(); it.hasNext();) {
+            SxResultRow row = (SxResultRow) it.next();
+            Object erg = row.get(0);
+            if (erg != null) tid = erg.toString();
+        }
+        return tid;
+    }
+
+    private class SxJob {
+        private String filepath;
+
+        private String params;
+
+        private String check_sql;
+
+        private String caption;
+
+        public String getCaption() {
+            return caption;
+        }
+
+        public void setCaption(String caption) {
+            this.caption = caption;
+        }
+
+        public String getFilepath() {
+            return filepath;
+        }
+
+        public void setFilepath(String filepath) {
+            this.filepath = filepath;
+        }
+
+        public String getParams() {
+            return params;
+        }
+
+        public void setParams(String params) {
+            this.params = params;
+        }
+
+        public String getCheck_sql() {
+            return check_sql;
+        }
+
+        public void setCheck_sql(String check_sql) {
+            this.check_sql = check_sql;
+        }
+
+
+
+    }
 
 }

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

@@ -312,7 +312,9 @@
     <antcall target="sync_doc_paket" >
         <param name="ZIEL_DOC_PFAD" value="${ZIELPFAD}/webserver/tomcat/webapps/superx/doku"/>
         </antcall>
-   <antcall target="copy_src" >
+   <antcall target="copy_src_superx" >
+   </antcall>	
+   <antcall target="copy_src_his1" >
    </antcall>	
     <antcall target="kern_utf2isoSuperX" >
     </antcall>
@@ -1286,13 +1288,21 @@ failonerror="false">
 	<filterset refid="LizenzFilter" />
 	</copy>
        </target>
-       <target name="copy_src" if="isPlatformSuperX">
+       <target name="copy_src_superx" if="isPlatformSuperX">
        <copy todir="${ZIELPFAD}/webserver/tomcat/webapps/superx/WEB-INF/src"
  filtering="false" preservelastmodified="true" overwrite="true">
 	<fileset dir="${WEBAPP_DIR}/../src" />
 	
 	</copy>
        </target>
+       <target name="copy_src_his1" if="isPlatformHIS1">
+       <copy todir="${ZIELPFAD}/superx/WEB-INF/src"
+ filtering="false" preservelastmodified="true" overwrite="true">
+	<fileset dir="${WEBAPP_DIR}/../src" />
+	
+	</copy>
+       </target>
+       
        <target name="copy_saiku" if="isPlatformSuperX">
        <copy todir="${ZIELPFAD}/webserver/tomcat/webapps/superx/saiku"
  filtering="false" preservelastmodified="true" overwrite="true">

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

@@ -1,10 +1,10 @@
 {### organigramm -  automatisch generiert #########}
 create table organigramm(
-	tid INTEGER  not null, 
+	tid SERIAL  not null, 
 key_apnr CHAR(10) , 
 parent CHAR(10) , 
-drucktext CHAR(50) , 
-name NCHAR(150) , 
+drucktext NVARCHAR(255) , 
+name NVARCHAR(255) , 
 ebene INTEGER , 
 lehre SMALLINT  not null, 
 gueltig_seit DATE  not null, 

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

@@ -3,8 +3,8 @@ create table organigramm_bak(
 	tid INTEGER  not null, 
 key_apnr CHAR(10) , 
 parent CHAR(10) , 
-drucktext CHAR(50) , 
-name NCHAR(150) , 
+drucktext NVARCHAR(255) , 
+name NVARCHAR(255) , 
 ebene INTEGER , 
 lehre SMALLINT  not null, 
 gueltig_seit DATE  not null, 

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

@@ -1,45 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?><dbi:dbactions xmlns:dsd="http://www.his.de/Abt1/Interfaces/dsd_V1.0" xmlns:dbi="http://www.his.de/Abt1/Interfaces/dbi_V1.0" dbi:want-result="true" dbi:autocommit="true">
-<dbi:dbaction dbi:action="sqlexec">eduetl:drop view user_groups;
-	
-</dbi:dbaction>
-<dbi:dbaction dbi:action="sqlexec">eduetl:drop view menu_element_fieldmode;
-	
-</dbi:dbaction>
-<dbi:dbaction dbi:action="sqlexec">eduetl:drop view menu_element_mandatory;
-	
-</dbi:dbaction>
-<dbi:dbaction dbi:action="sqlexec">eduetl:drop view menu_element_nature;
-	
-</dbi:dbaction>
-<dbi:dbaction dbi:action="sqlexec">eduetl:drop view menu_element_orgstructure;
-	
-</dbi:dbaction>
-<dbi:dbaction dbi:action="sqlexec">eduetl:drop view user_inst_org;
-	
-</dbi:dbaction>
-<dbi:dbaction dbi:action="sqlexec">eduetl:drop view hochschulen;
-	
-</dbi:dbaction>
-<dbi:dbaction dbi:action="sqlexec">eduetl:drop view dimension_view;
-	
-</dbi:dbaction>
-<dbi:dbaction dbi:action="sqlexec">eduetl:drop view fact_table;
-	
-</dbi:dbaction>
-<dbi:dbaction dbi:action="sqlexec">eduetl:drop view dim_staat;
-	
-</dbi:dbaction>
-<dbi:dbaction dbi:action="sqlexec">eduetl:drop view dim_stg;
-	
-</dbi:dbaction>
-<dbi:dbaction dbi:action="sqlexec">eduetl:drop view dim_abschluss;
-	
-</dbi:dbaction>
-<dbi:dbaction dbi:action="sqlexec">eduetl:drop view dim_kost;
-	
-</dbi:dbaction>
-<dbi:dbaction dbi:action="sqlexec">eduetl:drop view dim_kotr;
-	
+<dbi:dbaction dbi:action="executeFile">
+<dbi:file database="eduetl" encoding="UTF-8" withNativeClient="n" structure="SQL" filename="$SUPERX_DIR/db/install/conf/module_drop_views.sql"/>
 </dbi:dbaction>
 <dbi:dbaction dbi:action="sqlexec">eduetl:drop procedure sp_user_themen(integer, date, smallint);
 			
@@ -112,6 +73,9 @@
 </dbi:dbaction>
 <dbi:dbaction dbi:action="sqlexec">eduetl:drop procedure sp_set_organigramm_lehr();
 			
+</dbi:dbaction>
+<dbi:dbaction dbi:action="sqlexec">eduetl:drop function trim_all_whitespace(varchar);
+			
 </dbi:dbaction>
 <dbi:dbaction dbi:action="sqlexec">eduetl:drop table sichtart_rechttabelle;
 
@@ -196,6 +160,9 @@
 </dbi:dbaction>
 <dbi:dbaction dbi:action="sqlexec">eduetl:drop table trans_cif;
 
+</dbi:dbaction>
+<dbi:dbaction dbi:action="sqlexec">eduetl:drop table cifx_customize;
+
 </dbi:dbaction>
 <dbi:dbaction dbi:action="sqlexec">eduetl:drop table felderinfo;
 
@@ -271,6 +238,9 @@
 </dbi:dbaction>
 <dbi:dbaction dbi:action="sqlexec">eduetl:drop table sx_mask_style;
 
+</dbi:dbaction>
+<dbi:dbaction dbi:action="sqlexec">eduetl:drop table sx_stylesheet_param;
+
 </dbi:dbaction>
 <dbi:dbaction dbi:action="sqlexec">eduetl:drop table sx_captions;
 
@@ -403,6 +373,9 @@
 </dbi:dbaction>
 <dbi:dbaction dbi:action="sqlexec">eduetl:drop table group_portlet_bez;
 
+</dbi:dbaction>
+<dbi:dbaction dbi:action="sqlexec">eduetl:drop table kern_cifx_neu;
+
 </dbi:dbaction>
 <dbi:dbaction dbi:action="sqlexec">eduetl:drop table sieve;
 
@@ -418,6 +391,63 @@
 </dbi:dbaction>
 <dbi:dbaction dbi:action="sqlexec">eduetl:drop table sx_jobs;
 
+</dbi:dbaction>
+<dbi:dbaction dbi:action="sqlexec">eduetl:drop table orgunit_mapping;
+
+</dbi:dbaction>
+<dbi:dbaction dbi:action="sqlexec">eduetl:drop table implicit_orgunit_rights;
+
+</dbi:dbaction>
+<dbi:dbaction dbi:action="sqlexec">eduetl:drop table kern_pruefrout;
+
+</dbi:dbaction>
+<dbi:dbaction dbi:action="sqlexec">eduetl:drop table masken_statistik;
+
+</dbi:dbaction>
+<dbi:dbaction dbi:action="sqlexec">eduetl:drop table dim_datum;
+
+</dbi:dbaction>
+<dbi:dbaction dbi:action="sqlexec">eduetl:drop table hisinone_deleted_entity;
+
+</dbi:dbaction>
+<dbi:dbaction dbi:action="sqlexec">eduetl:drop table etl_step;
+
+</dbi:dbaction>
+<dbi:dbaction dbi:action="sqlexec">eduetl:drop table etl_step_type;
+
+</dbi:dbaction>
+<dbi:dbaction dbi:action="sqlexec">eduetl:drop table etl_step_type_param;
+
+</dbi:dbaction>
+<dbi:dbaction dbi:action="sqlexec">eduetl:drop table etl_step_property;
+
+</dbi:dbaction>
+<dbi:dbaction dbi:action="sqlexec">eduetl:drop table etl_step_relation;
+
+</dbi:dbaction>
+<dbi:dbaction dbi:action="sqlexec">eduetl:drop table etl_job;
+
+</dbi:dbaction>
+<dbi:dbaction dbi:action="sqlexec">eduetl:drop table etl_job_param;
+
+</dbi:dbaction>
+<dbi:dbaction dbi:action="sqlexec">eduetl:drop table k_astat_studienfach_land;
+
+</dbi:dbaction>
+<dbi:dbaction dbi:action="sqlexec">eduetl:drop table k_astat_abschluss3steller_land;
+
+</dbi:dbaction>
+<dbi:dbaction dbi:action="sqlexec">eduetl:drop table k_astat_abschluss2steller;
+
+</dbi:dbaction>
+<dbi:dbaction dbi:action="sqlexec">eduetl:drop table k_astat_studienbereich;
+
+</dbi:dbaction>
+<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:dbaction dbi:action="sqlexec">eduetl:drop table sx_mail;
 
@@ -431,4 +461,7 @@
 <dbi:dbaction dbi:action="executeFile">
 <dbi:file structure="SQL" withNativeClient="n" encoding="UTF-8" database="eduetl" filename="$KERN_PFAD/conf/unload_params_loeschen.sql"/>
 </dbi:dbaction>
+<dbi:dbaction dbi:action="executeFile">
+<dbi:file structure="SQL" withNativeClient="n" encoding="UTF-8" database="eduetl" filename="$KERN_PFAD/conf/dimensions_drop.sql"/>
+</dbi:dbaction>
 </dbi:dbactions>

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

@@ -77,199 +77,234 @@
 </dbi:dbaction>
 <dbi:dbaction dbi:action="sqlexec">eduetl:delete from sx_repository;
 </dbi:dbaction>
+<dbi:dbaction dbi:action="sqlexec">eduetl:delete from k_astat_studienfach_land;
+</dbi:dbaction>
+<dbi:dbaction dbi:action="sqlexec">eduetl:delete from k_astat_abschluss3steller_land;
+</dbi:dbaction>
+<dbi:dbaction dbi:action="sqlexec">eduetl:delete from k_astat_abschluss2steller;
+</dbi:dbaction>
+<dbi:dbaction dbi:action="sqlexec">eduetl:delete from k_astat_studienfach;
+</dbi:dbaction>
+<dbi:dbaction dbi:action="sqlexec">eduetl:delete from k_astat_studienbereich;
+</dbi:dbaction>
 <dbi:dbaction dbi:action="importFile">
 <dbi:data database="eduetl" table="aggregierung">
-<dbi:file encoding="UTF-8" separator="^" trailingSeparator="y" withNativeClient="y" firstLinedescription="n" structure="CSV" filename="$SUPERX_DIR/db/install/schluesseltabellen/release_unloads/aggregierung.unl"/>
+<dbi:file encoding="UTF-8" separator="^" trailingSeparator="y" withNativeClient="n" firstLinedescription="n" structure="CSV" filename="$SUPERX_DIR/db/install/schluesseltabellen/release_unloads/aggregierung.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="y" firstLinedescription="n" structure="CSV" filename="$SUPERX_DIR/db/install/schluesseltabellen/release_unloads/masken_felder_bez.unl"/>
+<dbi:file encoding="UTF-8" separator="^" trailingSeparator="y" withNativeClient="n" firstLinedescription="n" structure="CSV" filename="$SUPERX_DIR/db/install/schluesseltabellen/release_unloads/masken_felder_bez.unl"/>
 </dbi:data>
 </dbi:dbaction>
 <dbi:dbaction dbi:action="importFile">
 <dbi:data database="eduetl" table="sachgebiete">
-<dbi:file encoding="UTF-8" separator="^" trailingSeparator="y" withNativeClient="y" firstLinedescription="n" structure="CSV" filename="$SUPERX_DIR/db/install/schluesseltabellen/release_unloads/sachgebiete.unl"/>
+<dbi:file encoding="UTF-8" separator="^" trailingSeparator="y" withNativeClient="n" firstLinedescription="n" structure="CSV" filename="$SUPERX_DIR/db/install/schluesseltabellen/release_unloads/sachgebiete.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="y" firstLinedescription="n" structure="CSV" filename="$SUPERX_DIR/db/install/schluesseltabellen/release_unloads/sachgeb_maske_bez.unl"/>
+<dbi:file encoding="UTF-8" separator="^" trailingSeparator="y" withNativeClient="n" firstLinedescription="n" structure="CSV" filename="$SUPERX_DIR/db/install/schluesseltabellen/release_unloads/sachgeb_maske_bez.unl"/>
 </dbi:data>
 </dbi:dbaction>
 <dbi:dbaction dbi:action="importFile">
 <dbi:data database="eduetl" table="user_masken_bez">
-<dbi:file encoding="UTF-8" separator="^" trailingSeparator="y" withNativeClient="y" firstLinedescription="n" structure="CSV" filename="$SUPERX_DIR/db/install/schluesseltabellen/release_unloads/user_masken_bez.unl"/>
+<dbi:file encoding="UTF-8" separator="^" trailingSeparator="y" withNativeClient="n" firstLinedescription="n" structure="CSV" filename="$SUPERX_DIR/db/install/schluesseltabellen/release_unloads/user_masken_bez.unl"/>
 </dbi:data>
 </dbi:dbaction>
 <dbi:dbaction dbi:action="importFile">
 <dbi:data database="eduetl" table="user_sachgeb_bez">
-<dbi:file encoding="UTF-8" separator="^" trailingSeparator="y" withNativeClient="y" firstLinedescription="n" structure="CSV" filename="$SUPERX_DIR/db/install/schluesseltabellen/release_unloads/user_sachgeb_bez.unl"/>
+<dbi:file encoding="UTF-8" separator="^" trailingSeparator="y" withNativeClient="n" firstLinedescription="n" structure="CSV" filename="$SUPERX_DIR/db/install/schluesseltabellen/release_unloads/user_sachgeb_bez.unl"/>
 </dbi:data>
 </dbi:dbaction>
 <dbi:dbaction dbi:action="importFile">
 <dbi:data database="eduetl" table="xdummy">
-<dbi:file encoding="UTF-8" separator="^" trailingSeparator="y" withNativeClient="y" firstLinedescription="n" structure="CSV" filename="$SUPERX_DIR/db/install/schluesseltabellen/release_unloads/xdummy.unl"/>
+<dbi:file encoding="UTF-8" separator="^" trailingSeparator="y" withNativeClient="n" firstLinedescription="n" structure="CSV" filename="$SUPERX_DIR/db/install/schluesseltabellen/release_unloads/xdummy.unl"/>
 </dbi:data>
 </dbi:dbaction>
 <dbi:dbaction dbi:action="importFile">
 <dbi:data database="eduetl" table="groupinfo">
-<dbi:file encoding="UTF-8" separator="^" trailingSeparator="y" withNativeClient="y" firstLinedescription="n" structure="CSV" filename="$SUPERX_DIR/db/install/schluesseltabellen/release_unloads/groupinfo.unl"/>
+<dbi:file encoding="UTF-8" separator="^" trailingSeparator="y" withNativeClient="n" firstLinedescription="n" structure="CSV" filename="$SUPERX_DIR/db/install/schluesseltabellen/release_unloads/groupinfo.unl"/>
 </dbi:data>
 </dbi:dbaction>
 <dbi:dbaction dbi:action="importFile">
 <dbi:data database="eduetl" table="user_group_bez">
-<dbi:file encoding="UTF-8" separator="^" trailingSeparator="y" withNativeClient="y" firstLinedescription="n" structure="CSV" filename="$SUPERX_DIR/db/install/schluesseltabellen/release_unloads/user_group_bez.unl"/>
+<dbi:file encoding="UTF-8" separator="^" trailingSeparator="y" withNativeClient="n" firstLinedescription="n" structure="CSV" filename="$SUPERX_DIR/db/install/schluesseltabellen/release_unloads/user_group_bez.unl"/>
 </dbi:data>
 </dbi:dbaction>
 <dbi:dbaction dbi:action="importFile">
 <dbi:data database="eduetl" table="group_sachgeb_bez">
-<dbi:file encoding="UTF-8" separator="^" trailingSeparator="y" withNativeClient="y" firstLinedescription="n" structure="CSV" filename="$SUPERX_DIR/db/install/schluesseltabellen/release_unloads/group_sachgeb_bez.unl"/>
+<dbi:file encoding="UTF-8" separator="^" trailingSeparator="y" withNativeClient="n" firstLinedescription="n" structure="CSV" filename="$SUPERX_DIR/db/install/schluesseltabellen/release_unloads/group_sachgeb_bez.unl"/>
 </dbi:data>
 </dbi:dbaction>
 <dbi:dbaction dbi:action="importFile">
 <dbi:data database="eduetl" table="group_masken_bez">
-<dbi:file encoding="UTF-8" separator="^" trailingSeparator="y" withNativeClient="y" firstLinedescription="n" structure="CSV" filename="$SUPERX_DIR/db/install/schluesseltabellen/release_unloads/group_masken_bez.unl"/>
+<dbi:file encoding="UTF-8" separator="^" trailingSeparator="y" withNativeClient="n" firstLinedescription="n" structure="CSV" filename="$SUPERX_DIR/db/install/schluesseltabellen/release_unloads/group_masken_bez.unl"/>
 </dbi:data>
 </dbi:dbaction>
 <dbi:dbaction dbi:action="importFile">
 <dbi:data database="eduetl" table="aggre_bland">
-<dbi:file encoding="UTF-8" separator="^" trailingSeparator="y" withNativeClient="y" firstLinedescription="n" structure="CSV" filename="$SUPERX_DIR/db/install/schluesseltabellen/release_unloads/aggre_bland.unl"/>
+<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="importFile">
 <dbi:data database="eduetl" table="cif">
-<dbi:file encoding="UTF-8" separator="^" trailingSeparator="y" withNativeClient="y" firstLinedescription="n" structure="CSV" filename="$SUPERX_DIR/db/install/schluesseltabellen/release_unloads/cif.unl"/>
+<dbi:file encoding="UTF-8" separator="^" trailingSeparator="y" withNativeClient="n" firstLinedescription="n" structure="CSV" filename="$SUPERX_DIR/db/install/schluesseltabellen/release_unloads/cif.unl"/>
 </dbi:data>
 </dbi:dbaction>
 <dbi:dbaction dbi:action="importFile">
 <dbi:data database="eduetl" table="cifx">
-<dbi:file encoding="UTF-8" separator="^" trailingSeparator="y" withNativeClient="y" firstLinedescription="n" structure="CSV" filename="$SUPERX_DIR/db/install/schluesseltabellen/release_unloads/cifx.unl"/>
+<dbi:file encoding="UTF-8" separator="^" trailingSeparator="y" withNativeClient="n" firstLinedescription="n" structure="CSV" filename="$SUPERX_DIR/db/install/schluesseltabellen/release_unloads/cifx.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="y" firstLinedescription="n" structure="CSV" filename="$SUPERX_DIR/db/install/schluesseltabellen/release_unloads/felderinfo.unl"/>
+<dbi:file encoding="UTF-8" separator="^" trailingSeparator="y" withNativeClient="n" firstLinedescription="n" structure="CSV" filename="$SUPERX_DIR/db/install/schluesseltabellen/release_unloads/felderinfo.unl"/>
 </dbi:data>
 </dbi:dbaction>
 <dbi:dbaction dbi:action="importFile">
 <dbi:data database="eduetl" table="hochschulinfo">
-<dbi:file encoding="UTF-8" separator="^" trailingSeparator="y" withNativeClient="y" firstLinedescription="n" structure="CSV" filename="$SUPERX_DIR/db/install/schluesseltabellen/release_unloads/hochschulinfo.unl"/>
+<dbi:file encoding="UTF-8" separator="^" trailingSeparator="y" withNativeClient="n" firstLinedescription="n" structure="CSV" filename="$SUPERX_DIR/db/install/schluesseltabellen/release_unloads/hochschulinfo.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="y" firstLinedescription="n" structure="CSV" filename="$SUPERX_DIR/db/install/schluesseltabellen/release_unloads/maske_system_bez.unl"/>
+<dbi:file encoding="UTF-8" separator="^" trailingSeparator="y" withNativeClient="n" firstLinedescription="n" structure="CSV" filename="$SUPERX_DIR/db/install/schluesseltabellen/release_unloads/maske_system_bez.unl"/>
 </dbi:data>
 </dbi:dbaction>
 <dbi:dbaction dbi:action="importFile">
 <dbi:data database="eduetl" table="maskeninfo">
-<dbi:file encoding="UTF-8" separator="^" trailingSeparator="y" withNativeClient="y" firstLinedescription="n" structure="CSV" filename="$SUPERX_DIR/db/install/schluesseltabellen/release_unloads/maskeninfo.unl"/>
+<dbi:file encoding="UTF-8" separator="^" trailingSeparator="y" withNativeClient="n" firstLinedescription="n" structure="CSV" filename="$SUPERX_DIR/db/install/schluesseltabellen/release_unloads/maskeninfo.unl"/>
 </dbi:data>
 </dbi:dbaction>
 <dbi:dbaction dbi:action="importFile">
 <dbi:data database="eduetl" table="proto_funktion">
-<dbi:file encoding="UTF-8" separator="^" trailingSeparator="y" withNativeClient="y" firstLinedescription="n" structure="CSV" filename="$SUPERX_DIR/db/install/schluesseltabellen/release_unloads/proto_funktion.unl"/>
+<dbi:file encoding="UTF-8" separator="^" trailingSeparator="y" withNativeClient="n" firstLinedescription="n" structure="CSV" filename="$SUPERX_DIR/db/install/schluesseltabellen/release_unloads/proto_funktion.unl"/>
 </dbi:data>
 </dbi:dbaction>
 <dbi:dbaction dbi:action="importFile">
 <dbi:data database="eduetl" table="systeminfo">
-<dbi:file encoding="UTF-8" separator="^" trailingSeparator="y" withNativeClient="y" firstLinedescription="n" structure="CSV" filename="$SUPERX_DIR/db/install/schluesseltabellen/release_unloads/systeminfo.unl"/>
+<dbi:file encoding="UTF-8" separator="^" trailingSeparator="y" withNativeClient="n" firstLinedescription="n" structure="CSV" filename="$SUPERX_DIR/db/install/schluesseltabellen/release_unloads/systeminfo.unl"/>
 </dbi:data>
 </dbi:dbaction>
 <dbi:dbaction dbi:action="importFile">
 <dbi:data database="eduetl" table="user_einstellungen">
-<dbi:file encoding="UTF-8" separator="^" trailingSeparator="y" withNativeClient="y" firstLinedescription="n" structure="CSV" filename="$SUPERX_DIR/db/install/schluesseltabellen/release_unloads/user_einstellungen.unl"/>
+<dbi:file encoding="UTF-8" separator="^" trailingSeparator="y" withNativeClient="n" firstLinedescription="n" structure="CSV" filename="$SUPERX_DIR/db/install/schluesseltabellen/release_unloads/user_einstellungen.unl"/>
 </dbi:data>
 </dbi:dbaction>
 <dbi:dbaction dbi:action="importFile">
 <dbi:data database="eduetl" table="userinfo">
-<dbi:file encoding="UTF-8" separator="^" trailingSeparator="y" withNativeClient="y" firstLinedescription="n" structure="CSV" filename="$SUPERX_DIR/db/install/schluesseltabellen/release_unloads/userinfo.unl"/>
+<dbi:file encoding="UTF-8" separator="^" trailingSeparator="y" withNativeClient="n" firstLinedescription="n" structure="CSV" filename="$SUPERX_DIR/db/install/schluesseltabellen/release_unloads/userinfo.unl"/>
 </dbi:data>
 </dbi:dbaction>
 <dbi:dbaction dbi:action="importFile">
 <dbi:data database="eduetl" table="themenbaum">
-<dbi:file encoding="UTF-8" separator="^" trailingSeparator="y" withNativeClient="y" firstLinedescription="n" structure="CSV" filename="$SUPERX_DIR/db/install/schluesseltabellen/release_unloads/themenbaum.unl"/>
+<dbi:file encoding="UTF-8" separator="^" trailingSeparator="y" withNativeClient="n" firstLinedescription="n" structure="CSV" filename="$SUPERX_DIR/db/install/schluesseltabellen/release_unloads/themenbaum.unl"/>
 </dbi:data>
 </dbi:dbaction>
 <dbi:dbaction dbi:action="importFile">
 <dbi:data database="eduetl" table="themenbaum_bak">
-<dbi:file encoding="UTF-8" separator="^" trailingSeparator="y" withNativeClient="y" firstLinedescription="n" structure="CSV" filename="$SUPERX_DIR/db/install/schluesseltabellen/release_unloads/themenbaum_bak.unl"/>
+<dbi:file encoding="UTF-8" separator="^" trailingSeparator="y" withNativeClient="n" firstLinedescription="n" structure="CSV" filename="$SUPERX_DIR/db/install/schluesseltabellen/release_unloads/themenbaum_bak.unl"/>
 </dbi:data>
 </dbi:dbaction>
 <dbi:dbaction dbi:action="importFile">
 <dbi:data database="eduetl" table="nachricht">
-<dbi:file encoding="UTF-8" separator="^" trailingSeparator="y" withNativeClient="y" firstLinedescription="n" structure="CSV" filename="$SUPERX_DIR/db/install/schluesseltabellen/release_unloads/nachricht.unl"/>
+<dbi:file encoding="UTF-8" separator="^" trailingSeparator="y" withNativeClient="n" firstLinedescription="n" structure="CSV" filename="$SUPERX_DIR/db/install/schluesseltabellen/release_unloads/nachricht.unl"/>
 </dbi:data>
 </dbi:dbaction>
 <dbi:dbaction dbi:action="importFile">
 <dbi:data database="eduetl" table="menu_element">
-<dbi:file encoding="UTF-8" separator="^" trailingSeparator="y" withNativeClient="y" firstLinedescription="n" structure="CSV" filename="$SUPERX_DIR/db/install/schluesseltabellen/release_unloads/menu_element.unl"/>
+<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"/>
 </dbi:data>
 </dbi:dbaction>
 <dbi:dbaction dbi:action="importFile">
 <dbi:data database="eduetl" table="organigramm">
-<dbi:file encoding="UTF-8" separator="^" trailingSeparator="y" withNativeClient="y" firstLinedescription="n" structure="CSV" filename="$SUPERX_DIR/db/install/schluesseltabellen/release_unloads/organigramm.unl"/>
+<dbi:file encoding="UTF-8" separator="^" trailingSeparator="y" withNativeClient="n" firstLinedescription="n" structure="CSV" filename="$SUPERX_DIR/db/install/schluesseltabellen/release_unloads/organigramm.unl"/>
 </dbi:data>
 </dbi:dbaction>
 <dbi:dbaction dbi:action="importFile">
 <dbi:data database="eduetl" table="organigramm_bak">
-<dbi:file encoding="UTF-8" separator="^" trailingSeparator="y" withNativeClient="y" firstLinedescription="n" structure="CSV" filename="$SUPERX_DIR/db/install/schluesseltabellen/release_unloads/organigramm_bak.unl"/>
+<dbi:file encoding="UTF-8" separator="^" trailingSeparator="y" withNativeClient="n" firstLinedescription="n" structure="CSV" filename="$SUPERX_DIR/db/install/schluesseltabellen/release_unloads/organigramm_bak.unl"/>
 </dbi:data>
 </dbi:dbaction>
 <dbi:dbaction dbi:action="importFile">
 <dbi:data database="eduetl" table="user_institution">
-<dbi:file encoding="UTF-8" separator="^" trailingSeparator="y" withNativeClient="y" firstLinedescription="n" structure="CSV" filename="$SUPERX_DIR/db/install/schluesseltabellen/release_unloads/user_institution.unl"/>
+<dbi:file encoding="UTF-8" separator="^" trailingSeparator="y" withNativeClient="n" firstLinedescription="n" structure="CSV" filename="$SUPERX_DIR/db/install/schluesseltabellen/release_unloads/user_institution.unl"/>
 </dbi:data>
 </dbi:dbaction>
 <dbi:dbaction dbi:action="importFile">
 <dbi:data database="eduetl" table="protokoll">
-<dbi:file encoding="UTF-8" separator="^" trailingSeparator="y" withNativeClient="y" firstLinedescription="n" structure="CSV" filename="$SUPERX_DIR/db/install/schluesseltabellen/release_unloads/protokoll.unl"/>
+<dbi:file encoding="UTF-8" separator="^" trailingSeparator="y" withNativeClient="n" firstLinedescription="n" structure="CSV" filename="$SUPERX_DIR/db/install/schluesseltabellen/release_unloads/protokoll.unl"/>
 </dbi:data>
 </dbi:dbaction>
 <dbi:dbaction dbi:action="importFile">
 <dbi:data database="eduetl" table="trans_inst">
-<dbi:file encoding="UTF-8" separator="^" trailingSeparator="y" withNativeClient="y" firstLinedescription="n" structure="CSV" filename="$SUPERX_DIR/db/install/schluesseltabellen/release_unloads/trans_inst.unl"/>
+<dbi:file encoding="UTF-8" separator="^" trailingSeparator="y" withNativeClient="n" firstLinedescription="n" structure="CSV" filename="$SUPERX_DIR/db/install/schluesseltabellen/release_unloads/trans_inst.unl"/>
 </dbi:data>
 </dbi:dbaction>
 <dbi:dbaction dbi:action="importFile">
 <dbi:data database="eduetl" table="konstanten">
-<dbi:file encoding="UTF-8" separator="^" trailingSeparator="y" withNativeClient="y" firstLinedescription="n" structure="CSV" filename="$SUPERX_DIR/db/install/schluesseltabellen/release_unloads/konstanten.unl"/>
+<dbi:file encoding="UTF-8" separator="^" trailingSeparator="y" withNativeClient="n" firstLinedescription="n" structure="CSV" filename="$SUPERX_DIR/db/install/schluesseltabellen/release_unloads/konstanten.unl"/>
 </dbi:data>
 </dbi:dbaction>
 <dbi:dbaction dbi:action="importFile">
 <dbi:data database="eduetl" table="lehreinheit_inst">
-<dbi:file encoding="UTF-8" separator="^" trailingSeparator="y" withNativeClient="y" firstLinedescription="n" structure="CSV" filename="$SUPERX_DIR/db/install/schluesseltabellen/release_unloads/lehreinheit_inst.unl"/>
+<dbi:file encoding="UTF-8" separator="^" trailingSeparator="y" withNativeClient="n" firstLinedescription="n" structure="CSV" filename="$SUPERX_DIR/db/install/schluesseltabellen/release_unloads/lehreinheit_inst.unl"/>
 </dbi:data>
 </dbi:dbaction>
 <dbi:dbaction dbi:action="importFile">
 <dbi:data database="eduetl" table="sx_mask_style">
-<dbi:file encoding="UTF-8" separator="^" trailingSeparator="y" withNativeClient="y" firstLinedescription="n" structure="CSV" filename="$SUPERX_DIR/db/install/schluesseltabellen/release_unloads/sx_mask_style.unl"/>
+<dbi:file encoding="UTF-8" separator="^" trailingSeparator="y" withNativeClient="n" firstLinedescription="n" structure="CSV" filename="$SUPERX_DIR/db/install/schluesseltabellen/release_unloads/sx_mask_style.unl"/>
 </dbi:data>
 </dbi:dbaction>
 <dbi:dbaction dbi:action="importFile">
 <dbi:data database="eduetl" table="sichten">
-<dbi:file encoding="UTF-8" separator="^" trailingSeparator="y" withNativeClient="y" firstLinedescription="n" structure="CSV" filename="$SUPERX_DIR/db/install/schluesseltabellen/release_unloads/sichten.unl"/>
+<dbi:file encoding="UTF-8" separator="^" trailingSeparator="y" withNativeClient="n" firstLinedescription="n" structure="CSV" filename="$SUPERX_DIR/db/install/schluesseltabellen/release_unloads/sichten.unl"/>
 </dbi:data>
 </dbi:dbaction>
 <dbi:dbaction dbi:action="importFile">
 <dbi:data database="eduetl" table="fm_templates">
-<dbi:file encoding="UTF-8" separator="^" trailingSeparator="y" withNativeClient="y" firstLinedescription="n" structure="CSV" filename="$SUPERX_DIR/db/install/schluesseltabellen/release_unloads/fm_templates.unl"/>
+<dbi:file encoding="UTF-8" separator="^" trailingSeparator="y" withNativeClient="n" firstLinedescription="n" structure="CSV" filename="$SUPERX_DIR/db/install/schluesseltabellen/release_unloads/fm_templates.unl"/>
 </dbi:data>
 </dbi:dbaction>
 <dbi:dbaction dbi:action="importFile">
 <dbi:data database="eduetl" table="sx_captions">
-<dbi:file encoding="UTF-8" separator="^" trailingSeparator="y" withNativeClient="y" firstLinedescription="n" structure="CSV" filename="$SUPERX_DIR/db/install/schluesseltabellen/release_unloads/sx_captions.unl"/>
+<dbi:file encoding="UTF-8" separator="^" trailingSeparator="y" withNativeClient="n" firstLinedescription="n" structure="CSV" filename="$SUPERX_DIR/db/install/schluesseltabellen/release_unloads/sx_captions.unl"/>
 </dbi:data>
 </dbi:dbaction>
 <dbi:dbaction dbi:action="importFile">
 <dbi:data database="eduetl" table="sx_portlet">
-<dbi:file encoding="UTF-8" separator="^" trailingSeparator="y" withNativeClient="y" firstLinedescription="n" structure="CSV" filename="$SUPERX_DIR/db/install/schluesseltabellen/release_unloads/sx_portlet.unl"/>
+<dbi:file encoding="UTF-8" separator="^" trailingSeparator="y" withNativeClient="n" firstLinedescription="n" structure="CSV" filename="$SUPERX_DIR/db/install/schluesseltabellen/release_unloads/sx_portlet.unl"/>
 </dbi:data>
 </dbi:dbaction>
 <dbi:dbaction dbi:action="importFile">
 <dbi:data database="eduetl" table="sx_repository">
-<dbi:file encoding="UTF-8" separator="^" trailingSeparator="y" withNativeClient="y" firstLinedescription="n" structure="CSV" filename="$SUPERX_DIR/db/install/schluesseltabellen/release_unloads/sx_repository.unl"/>
+<dbi:file encoding="UTF-8" separator="^" trailingSeparator="y" withNativeClient="n" firstLinedescription="n" structure="CSV" filename="$SUPERX_DIR/db/install/schluesseltabellen/release_unloads/sx_repository.unl"/>
+</dbi:data>
+</dbi:dbaction>
+<dbi:dbaction dbi:action="importFile">
+<dbi:data database="eduetl" table="k_astat_studienfach_land">
+<dbi:file encoding="UTF-8" separator="^" trailingSeparator="y" withNativeClient="n" firstLinedescription="n" structure="CSV" filename="$SUPERX_DIR/db/install/schluesseltabellen/release_unloads/k_astat_studienfach_land.unl"/>
+</dbi:data>
+</dbi:dbaction>
+<dbi:dbaction dbi:action="importFile">
+<dbi:data database="eduetl" table="k_astat_abschluss3steller_land">
+<dbi:file encoding="UTF-8" separator="^" trailingSeparator="y" withNativeClient="n" firstLinedescription="n" structure="CSV" filename="$SUPERX_DIR/db/install/schluesseltabellen/release_unloads/k_astat_abschluss3steller_land.unl"/>
+</dbi:data>
+</dbi:dbaction>
+<dbi:dbaction dbi:action="importFile">
+<dbi:data database="eduetl" table="k_astat_abschluss2steller">
+<dbi:file encoding="UTF-8" separator="^" trailingSeparator="y" withNativeClient="n" firstLinedescription="n" structure="CSV" filename="$SUPERX_DIR/db/install/schluesseltabellen/release_unloads/k_astat_abschluss2steller.unl"/>
+</dbi:data>
+</dbi:dbaction>
+<dbi:dbaction dbi:action="importFile">
+<dbi:data database="eduetl" table="k_astat_studienfach">
+<dbi:file encoding="UTF-8" separator="^" trailingSeparator="y" withNativeClient="n" firstLinedescription="n" structure="CSV" filename="$SUPERX_DIR/db/install/schluesseltabellen/release_unloads/k_astat_studienfach.unl"/>
+</dbi:data>
+</dbi:dbaction>
+<dbi:dbaction dbi:action="importFile">
+<dbi:data database="eduetl" table="k_astat_studienbereich">
+<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="executeFile">
@@ -279,10 +314,10 @@
 <dbi:file database="eduetl" encoding="UTF-8" withNativeClient="n" structure="SQL" filename="$SUPERX_DIR/db/install/schluesseltabellen/sx_stylesheets_fuellen_init.sql"/>
 </dbi:dbaction>
 <dbi:dbaction dbi:action="executeFile">
-<dbi:file structure="SQL" withNativeClient="n" encoding="UTF-8" database="eduetl" filename="$SUPERX_DIR/db/install/conf/sx_tables_fuellen.sql"/>
+<dbi:file structure="SQL" withNativeClient="n" encoding="UTF-8" database="eduetl" filename="$SUPERX_DIR/db/install/conf/sx_fields_fuellen.sql"/>
 </dbi:dbaction>
 <dbi:dbaction dbi:action="executeFile">
-<dbi:file structure="SQL" withNativeClient="n" encoding="UTF-8" database="eduetl" filename="$SUPERX_DIR/db/install/conf/sx_fields_fuellen.sql"/>
+<dbi:file structure="SQL" withNativeClient="n" encoding="UTF-8" database="eduetl" filename="$SUPERX_DIR/db/install/conf/sx_tables_fuellen.sql"/>
 </dbi:dbaction>
 <dbi:dbaction dbi:action="executeFile">
 <dbi:file structure="SQL" withNativeClient="n" encoding="UTF-8" database="eduetl" filename="$SUPERX_DIR/db/install/conf/unload_params_fuellen.sql"/>

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

@@ -4,14 +4,18 @@
 --Integrieren: 
 
 
--- Fülle db_version
+select now(),'Fülle db_version'
+from xdummy;
+
 
 delete from db_version  where his_system='kern';
-insert into db_version (his_system,version) values('kern','4.9');
+insert into db_version (his_system,version,systeminfo_id) values('kern','5.0',9);
+
 
 
+select now(),'Fülle db_tabellen'
+from xdummy;
 
--- Fülle db_tabellen
 delete from db_tabellen where name='sichtart_rechttabelle';
 insert into db_tabellen (name,protokollierung) values('sichtart_rechttabelle',0);
 delete from db_tabellen where name='group_field_pref';
@@ -68,6 +72,8 @@ delete from db_tabellen where name='trans_cifx';
 insert into db_tabellen (name,protokollierung) values('trans_cifx',0);
 delete from db_tabellen where name='trans_cif';
 insert into db_tabellen (name,protokollierung) values('trans_cif',0);
+delete from db_tabellen where name='cifx_customize';
+insert into db_tabellen (name,protokollierung) values('cifx_customize',0);
 delete from db_tabellen where name='felderinfo';
 insert into db_tabellen (name,protokollierung) values('felderinfo',0);
 delete from db_tabellen where name='hochschulinfo';
@@ -118,6 +124,8 @@ delete from db_tabellen where name='sx_stylesheets';
 insert into db_tabellen (name,protokollierung) values('sx_stylesheets',0);
 delete from db_tabellen where name='sx_mask_style';
 insert into db_tabellen (name,protokollierung) values('sx_mask_style',0);
+delete from db_tabellen where name='sx_stylesheet_param';
+insert into db_tabellen (name,protokollierung) values('sx_stylesheet_param',0);
 delete from db_tabellen where name='sx_captions';
 insert into db_tabellen (name,protokollierung) values('sx_captions',0);
 delete from db_tabellen where name='fm_templates';
@@ -206,6 +214,8 @@ delete from db_tabellen where name='user_portlet_bez';
 insert into db_tabellen (name,protokollierung) values('user_portlet_bez',0);
 delete from db_tabellen where name='group_portlet_bez';
 insert into db_tabellen (name,protokollierung) values('group_portlet_bez',0);
+delete from db_tabellen where name='kern_cifx_neu';
+insert into db_tabellen (name,protokollierung) values('kern_cifx_neu',0);
 delete from db_tabellen where name='sieve';
 insert into db_tabellen (name,protokollierung) values('sieve',0);
 delete from db_tabellen where name='sieve_column_def';
@@ -216,21 +226,63 @@ delete from db_tabellen where name='sieve_field';
 insert into db_tabellen (name,protokollierung) values('sieve_field',0);
 delete from db_tabellen where name='sx_jobs';
 insert into db_tabellen (name,protokollierung) values('sx_jobs',0);
+delete from db_tabellen where name='orgunit_mapping';
+insert into db_tabellen (name,protokollierung) values('orgunit_mapping',0);
+delete from db_tabellen where name='implicit_orgunit_rights';
+insert into db_tabellen (name,protokollierung) values('implicit_orgunit_rights',0);
+delete from db_tabellen where name='kern_pruefrout';
+insert into db_tabellen (name,protokollierung) values('kern_pruefrout',0);
+delete from db_tabellen where name='masken_statistik';
+insert into db_tabellen (name,protokollierung) values('masken_statistik',0);
+delete from db_tabellen where name='dim_datum';
+insert into db_tabellen (name,protokollierung) values('dim_datum',0);
+delete from db_tabellen where name='hisinone_deleted_entity';
+insert into db_tabellen (name,protokollierung) values('hisinone_deleted_entity',0);
+delete from db_tabellen where name='etl_step';
+insert into db_tabellen (name,protokollierung) values('etl_step',0);
+delete from db_tabellen where name='etl_step_type';
+insert into db_tabellen (name,protokollierung) values('etl_step_type',0);
+delete from db_tabellen where name='etl_step_type_param';
+insert into db_tabellen (name,protokollierung) values('etl_step_type_param',0);
+delete from db_tabellen where name='etl_step_property';
+insert into db_tabellen (name,protokollierung) values('etl_step_property',0);
+delete from db_tabellen where name='etl_step_relation';
+insert into db_tabellen (name,protokollierung) values('etl_step_relation',0);
+delete from db_tabellen where name='etl_job';
+insert into db_tabellen (name,protokollierung) values('etl_job',0);
+delete from db_tabellen where name='etl_job_param';
+insert into db_tabellen (name,protokollierung) values('etl_job_param',0);
+delete from db_tabellen where name='k_astat_studienfach_land';
+insert into db_tabellen (name,protokollierung) values('k_astat_studienfach_land',0);
+delete from db_tabellen where name='k_astat_abschluss3steller_land';
+insert into db_tabellen (name,protokollierung) values('k_astat_abschluss3steller_land',0);
+delete from db_tabellen where name='k_astat_abschluss2steller';
+insert into db_tabellen (name,protokollierung) values('k_astat_abschluss2steller',0);
+delete from db_tabellen where name='k_astat_studienbereich';
+insert into db_tabellen (name,protokollierung) values('k_astat_studienbereich',0);
+delete from db_tabellen where name='k_astat_studienfach';
+insert into db_tabellen (name,protokollierung) values('k_astat_studienfach',0);
+delete from db_tabellen where name='colorscheme';
+insert into db_tabellen (name,protokollierung) values('colorscheme',0);
 delete from db_tabellen where name='sx_mail';
 insert into db_tabellen (name,protokollierung) values('sx_mail',0);
 
 
--- Fülle sachgebiete, systeminfo und themenbaum
+select now(),'Fülle sachgebiete, systeminfo und themenbaum'
+from xdummy;
+
 
 
 --Das Sachgebiet wird erzeugt, ggf. vorherige Sachgebiete sichern.
 
-delete from sachgebiete where tid=0;
-insert into sachgebiete(tid,name) values (0,'Administration');
--- den admins die Rechte geben
-delete from group_sachgeb_bez where sachgebiete_id=0;
+
+insert into sachgebiete(tid,name) select 0,'Administration'
+from xdummy
+where 0=(select count(*) from sachgebiete S where S.tid=0);
 insert into group_sachgeb_bez 
-select G.tid,0 from groupinfo G where G.name='Administratoren' or G.name='superx' ;
+select G.tid,0 from groupinfo G 
+where (G.name='Administratoren' or G.name='superx')
+and 0=(select count(*) from group_sachgeb_bez G where G.sachgebiete_id=0);
 
 -- his1 rightname fuer Sachgebiete nachtragen
 
@@ -242,12 +294,17 @@ update sachgebiete set rightname='CS_BIA_ADMINISTRATE_TOPIC_AREA[CORE_OU]' where
 update sachgebiete set rightname='CS_BIA_ADMINISTRATE_TOPIC_AREA[CORE_USERINFO]' where tid=53;
 update sachgebiete set rightname='CS_BIA_ADMINISTRATE_TOPIC_AREA[CORE_LOAD]' where tid=54;
 
- -- wird auch noch mal als template aufgerufen in sx_tables_fuellen.sql vergl. http://ics/ilias3/goto.php?target=wiki_40_SingleSignOn-Rechteuebernahme&client_id=memtext --Das system wird erzeugt, ggf. vorherige systeme sichern.
-delete from systeminfo where tid=9;
-insert into systeminfo(tid,name,datum) values (9,'Administration',date('1.1.1900'));
+ -- wird auch noch mal als template aufgerufen in sx_tables_fuellen.sql  --Das system wird erzeugt, ggf. vorherige systeme sichern.
+
+insert into systeminfo(tid,name,datum) select 9,'Administration',date('1.1.1900')
+from xdummy
+where 0=(select count(*) from systeminfo S where S.tid=9);
+
+
 
+select now(),'Das Thema und die Masken in den Themenbaum einfügen'
+from xdummy;
 
--- Das Thema und die Masken in den Themenbaum einfügen
 
 --Das Thema und die Masken in den Themenbaum einfügen
 --zunaechst werden die Eintraege in den themenbaum_bak eingefuegt, default ist parent=themenbaum_root
@@ -278,7 +335,9 @@ create temp table tmp_themenbaum
   
 
 
--- root für das Modul einfügen und in den Themenbaum einhängen:
+select now(),'root für das Modul einfügen und in den Themenbaum einhängen:'
+from xdummy;
+
 
 insert into tmp_themenbaum
 (  tid,name, gueltig_seit,gueltig_bis )
@@ -333,6 +392,18 @@ insert into tmp_themenbaum(name, parentname, gueltig_seit,gueltig_bis,erlaeuteru
 --gibt es das Thema schon?
 delete from tmp_themenbaum where name in (select T.name from themenbaum  T where T.name='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');
+
+--gibt es das Thema schon?
+delete from tmp_themenbaum where name in (select T.name from themenbaum  T where T.name='Entwicklung' 
+or T.name='Administration');
+insert into tmp_themenbaum(name, parentname, gueltig_seit,gueltig_bis,erlaeuterung)
+ values('Stammdaten verwalten','Administration','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='Stammdaten verwalten' 
+or T.name='Administration');
 
 --root für das Modul einfügen und in den Themenbaum einhängen
 --update themenbaum_bak set parent=(select tid from themenbaum where parent is null)
@@ -346,7 +417,9 @@ or T.name='Administration');
 --Nun die einzelnen Masken
 
 
--- Nun die einzelnen Masken:
+select now(),'Nun die einzelnen Masken:'
+from xdummy;
+
 
 insert into tmp_themenbaum
 (  name  ,maskeninfo_id, parentname,
@@ -390,12 +463,6 @@ 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 ,
@@ -448,7 +515,7 @@ insert into tmp_themenbaum
 (  name  ,maskeninfo_id, parentname,
    gueltig_seit ,
    gueltig_bis)
-values('Institution suchen','71080','Administration','01.01.1900','01.01.3000');
+values('Organisationseinheiten suchen','71080','Administration','01.01.1900','01.01.3000');
 
 insert into tmp_themenbaum
 (  name  ,maskeninfo_id, parentname,
@@ -508,7 +575,7 @@ insert into tmp_themenbaum
 (  name  ,maskeninfo_id, parentname,
    gueltig_seit ,
    gueltig_bis)
-values('Entladeparameter suchen','71260','Administration','01.01.1900','01.01.3000');
+values('Entladeparameter bearbeiten','71260','Administration','01.01.1900','01.01.3000');
 
 insert into tmp_themenbaum
 (  name  ,maskeninfo_id, parentname,
@@ -570,12 +637,24 @@ insert into tmp_themenbaum
    gueltig_bis)
 values('Bericht Gruppenrahmen','71440','Benutzerinfo verwalten','01.01.1900','01.01.3000');
 
+insert into tmp_themenbaum
+(  name  ,maskeninfo_id, parentname,
+   gueltig_seit ,
+   gueltig_bis)
+values('Organigrammquelle bearbeiten','71480','Administration','01.01.1900','01.01.3000');
+
 insert into tmp_themenbaum
 (  name  ,maskeninfo_id, parentname,
    gueltig_seit ,
    gueltig_bis)
 values('Konstanten bearbeiten','71500','Administration','01.01.1900','01.01.3000');
 
+insert into tmp_themenbaum
+(  name  ,maskeninfo_id, parentname,
+   gueltig_seit ,
+   gueltig_bis)
+values('Datensieb erstellen','71520','Administration','01.01.1900','01.01.3000');
+
 insert into tmp_themenbaum
 (  name  ,maskeninfo_id, parentname,
    gueltig_seit ,
@@ -592,19 +671,39 @@ insert into tmp_themenbaum
 (  name  ,maskeninfo_id, parentname,
    gueltig_seit ,
    gueltig_bis)
-values('Datenanalyse Würfel entwerfen','71580','Masken verwalten','01.01.1900','01.01.3000');
+values('Stammdatenverwaltung','71620','Administration','01.01.1900','01.01.3000');
 
 insert into tmp_themenbaum
 (  name  ,maskeninfo_id, parentname,
    gueltig_seit ,
    gueltig_bis)
-values('Stammdatenverwaltung','71620','Administration','01.01.1900','01.01.3000');
+values('OrgUnitTests','71640','Entwicklung','01.01.1900','01.01.3000');
+
+insert into tmp_themenbaum
+(  name  ,maskeninfo_id, parentname,
+   gueltig_seit ,
+   gueltig_bis)
+values('Prüfprotokoll Administration','71660','Administration','01.01.1900','01.01.3000');
+
+insert into tmp_themenbaum
+(  name  ,maskeninfo_id, parentname,
+   gueltig_seit ,
+   gueltig_bis)
+values('Nutzungsstatistik - Berichte','71680','Administration','01.01.1900','01.01.3000');
+
+insert into tmp_themenbaum
+(  name  ,maskeninfo_id, parentname,
+   gueltig_seit ,
+   gueltig_bis)
+values('Gastzugang einrichten','71770','Administration','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);
 
 
--- Die einzelnen Masken sind eingefügt.
+select now(),'Die einzelnen Masken sind eingefügt.'
+from xdummy;
+
 
 
 insert into tmp_themenbaum2 select * from tmp_themenbaum;
@@ -629,9 +728,13 @@ 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';
+
 
+select now(),'db_forms einfügen'
+from xdummy;
 
--- db_forms einfügen
  
 CREATE temp TABLE tmp_db_forms (
     tid serial NOT NULL,
@@ -642,109 +745,115 @@ CREATE temp TABLE tmp_db_forms (
     description character(255)
 );
 insert into tmp_db_forms (name, tablename,form_path,caption,description)
-values ('sachgebiete','sachgebiete','/edit/kern/sachgebiete_edit.jsp','Sachgebiete verwalten','In diesem Formular können Sie Sachgebiete verwalten.');
+values ('sachgebiete','sachgebiete','/edit/kern/sachgebiete_edit.jsp','Sachgebiete verwalten'::varchar(200),'In diesem Formular können Sie Sachgebiete verwalten.'::varchar(255));
+insert into tmp_db_forms (name, tablename,form_path,caption,description)
+values ('sx_stylesheets','sx_stylesheets','/edit/kern/sx_stylesheets_edit.jsp','Stylesheets verwalten'::varchar(200),'In diesem Formular können Sie XSL-Stylesheets verwalten.'::varchar(255));
+insert into tmp_db_forms (name, tablename,form_path,caption,description)
+values ('organigramm','organigramm','/edit/kern/organigramm_edit.jsp','Organigramm verwalten'::varchar(200),'In diesem Formular können Sie Organisationseinheiten verwalten.'::varchar(255));
+insert into tmp_db_forms (name, tablename,form_path,caption,description)
+values ('organigramm_nodeattrib','organigramm','/edit/kern/organigramm_editnodeattrib.jsp','Organigramm Sichtbarkeit verwalten'::varchar(200),'In diesem Formular können Sie die Sichtbarkeit von Organisationseinheiten verwalten.'::varchar(255));
 insert into tmp_db_forms (name, tablename,form_path,caption,description)
-values ('sx_stylesheets','sx_stylesheets','/edit/kern/sx_stylesheets_edit.jsp','Stylesheets verwalten','In diesem Formular können Sie XSL-Stylesheets verwalten.');
+values ('maskeninfo','maskeninfo','/edit/kern/maskeninfo_edit.jsp','Maskeninfo verwalten'::varchar(200),'In diesem Formular können Sie Maskendefinitionen verwalten.'::varchar(255));
 insert into tmp_db_forms (name, tablename,form_path,caption,description)
-values ('organigramm','organigramm','/edit/kern/organigramm_edit.jsp','Organigramm verwalten','In diesem Formular können Sie Institutionen verwalten.');
+values ('macro_feld_wert_list','macro_feld_wert','/edit/kern/macro_feld_wert_list.jsp','Feld-Vorbelegung von Makro-Masken'::varchar(200),'In diesem Formular können Sie Feld-Vorbelegung von Makro-Masken verwalten.'::varchar(255));
 insert into tmp_db_forms (name, tablename,form_path,caption,description)
-values ('organigramm_nodeattrib','organigramm','/edit/kern/organigramm_editnodeattrib.jsp','Organigramm Sichtbarkeit verwalten','In diesem Formular können Sie die Sichtbarkeit von Organisationseinheiten verwalten.');
+values ('felderinfo','felderinfo','/edit/kern/felderinfo_edit.jsp','Felderinfo verwalten'::varchar(200),'In diesem Formular können Sie Felder verwalten.'::varchar(255));
 insert into tmp_db_forms (name, tablename,form_path,caption,description)
-values ('maskeninfo','maskeninfo','/edit/kern/maskeninfo_edit.jsp','Maskeninfo verwalten','In diesem Formular können Sie Masken verwalten.');
+values ('systeminfo','systeminfo','/edit/kern/systeminfo_edit.jsp','Systeminfo verwalten'::varchar(200),'In diesem Formular können Sie Quellsysteme verwalten.'::varchar(255));
 insert into tmp_db_forms (name, tablename,form_path,caption,description)
-values ('felderinfo','felderinfo','/edit/kern/felderinfo_edit.jsp','Felderinfo verwalten','In diesem Formular können Sie Felder verwalten.');
+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 ('systeminfo','systeminfo','/edit/kern/systeminfo_edit.jsp','Systeminfo verwalten','In diesem Formular können Sie Quellsysteme verwalten.');
+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_sachgeb_bez','user_sachgeb_bez','/edit/kern/user_sachgeb_bez_edit.jsp','Benutzer und Sachgebiete verwalten','In diesem Formular können Sie Benutzern Sachgebietsrechte geben. Achtung: Einträge von externem System (HisInOne) werden bei Neuanmeldung überschrieben');
+values ('user_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_group_bez','user_group_bez','/edit/kern/user_group_bez_edit.jsp','Benutzer und Gruppen verwalten','In diesem Formular können Sie Benutzer zu Gruppen zuordnen. Achtung: Zuordnung zur Gruppe Administratoren für admins von externem System (HisInOne) werden bei Neuanmeldung überschrieben');
+values ('user_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 ('user_masken_bez','user_masken_bez','/edit/kern/user_masken_bez_edit.jsp','Maskenrechte von Benutzern','In diesem Formular können Sie Benutzern Rechte auf einzelne Masken geben.');
+values ('themenbaum_edit','themenbaum','/edit/kern/themenbaum_edit.jsp','Themenbaum'::varchar(200),'In diesem Formular können Sie den Themenbaum bearbeiten. Bitte beachten Sie: bei Änderungen muss der Themenbaum neu geladen werden (SuperXManager)'::varchar(255));
 insert into tmp_db_forms (name, tablename,form_path,caption,description)
-values ('user_institution','user_institution','/edit/kern/user_institution_edit.jsp','Institutionsrechte von Benutzern','In diesem Formular können Sie Benutzern Rechte auf einzelne Insitutionen geben. Achtung: Einträge von externem System (HisInOne) werden bei Neuanmeldung überschrieben');
+values ('sichten','sichten','/edit/kern/sichten_edit.jsp','Sichten'::varchar(200),'In diesem Formular können Sie Sichten auf das Organigramm verwalten.'::varchar(255));
 insert into tmp_db_forms (name, tablename,form_path,caption,description)
-values ('themenbaum_edit','themenbaum','/edit/kern/themenbaum_edit.jsp','Themenbaum','In diesem Formular können Sie den Themenbaum bearbeiten. Bitte beachten Sie: bei Änderungen muss der Themenbaum neu geladen werden (SuperXManager)');
+values ('sachgeb_maske_bez','sachgeb_maske_bez','/edit/kern/sachgeb_maske_bez_edit.jsp','Masken und Sachgebiete'::varchar(200),'In diesem Formular können Sie Masken zu Sachgebieten zuordnen.'::varchar(255));
 insert into tmp_db_forms (name, tablename,form_path,caption,description)
-values ('sichten','sichten','/edit/kern/sichten_edit.jsp','Sichten','In diesem Formular können Sie Sichten auf das Organigramm verwalten.');
+values ('masken_felder_bez','masken_felder_bez','/edit/kern/masken_felder_bez_edit.jsp','Masken und Felder'::varchar(200),'In diesem Formular können Sie Felder zu Masken zuordnen.'::varchar(255));
 insert into tmp_db_forms (name, tablename,form_path,caption,description)
-values ('sachgeb_maske_bez','sachgeb_maske_bez','/edit/kern/sachgeb_maske_bez_edit.jsp','Masken und Sachgebiete','In diesem Formular können Sie Masken zu Sachgebieten zuordnen.');
+values ('maske_system_bez','maske_system_bez','/edit/kern/maske_system_bez_edit.jsp','Masken und Systeme'::varchar(200),'In diesem Formular können Sie Masken zu Quellsystemen zuordnen.'::varchar(255));
 insert into tmp_db_forms (name, tablename,form_path,caption,description)
-values ('masken_felder_bez','masken_felder_bez','/edit/kern/masken_felder_bez_edit.jsp','Masken und Felder','In diesem Formular können Sie Felder zu Masken zuordnen.');
+values ('macro_masken_bez','macro_masken_bez','/edit/kern/macro_masken_bez_edit.jsp','Masken und Makros'::varchar(200),'In diesem Formular können Sie Masken zu Makros zuordnen.'::varchar(255));
 insert into tmp_db_forms (name, tablename,form_path,caption,description)
-values ('maske_system_bez','maske_system_bez','/edit/kern/maske_system_bez_edit.jsp','Masken und Systeme','In diesem Formular können Sie Masken zu Quellsystemen zuordnen.');
+values ('macro_masken_bez_list','macro_masken_bez','/edit/kern/macro_masken_bez_list.jsp','Masken und Makros'::varchar(200),'In diesem Formular können Sie Masken zu Makros zuordnen.'::varchar(255));
 insert into tmp_db_forms (name, tablename,form_path,caption,description)
-values ('macro_masken_bez','macro_masken_bez','/edit/kern/macro_masken_bez_edit.jsp','Masken und Makros (Einzelbearbeitung)','In diesem Formular können Sie Masken zu Makros zuordnen.');
+values ('konstanten','konstanten','/edit/kern/konstanten_edit.jsp','Konstanten'::varchar(200),'In diesem Formular können Sie Konstanten verwalten.'::varchar(255));
 insert into tmp_db_forms (name, tablename,form_path,caption,description)
-values ('macro_masken_bez_list','macro_masken_bez','/edit/kern/macro_masken_bez_list.jsp','Masken und Makros (Liste)','In diesem Formular können Sie Masken zu Makros zuordnen.');
+values ('konstante','konstanten','/edit/kern/konstante_edit.jsp','Konstante verwalten'::varchar(200),''::varchar(255));
 insert into tmp_db_forms (name, tablename,form_path,caption,description)
-values ('konstanten','konstanten','/edit/kern/konstanten_edit.jsp','Konstanten','In diesem Formular können Sie Konstanten verwalten.');
+values ('hochschulinfo','hochschulinfo','/edit/kern/hochschulinfo_edit.jsp','Hochschulinfo'::varchar(200),'In diesem Formular können Infos zu Ihrer Hochschule speichern. Bitte ordnen Sie Ihre Hochschule im Feld Hochschulnummer (HIS) zu.'::varchar(255));
 insert into tmp_db_forms (name, tablename,form_path,caption,description)
-values ('konstante','konstanten','/edit/kern/konstante_edit.jsp','Konstante verwalten','');
+values ('group_sachgeb_bez','group_sachgeb_bez','/edit/kern/group_sachgeb_bez_edit.jsp','Gruppen und Sachgebiete'::varchar(200),'In diesem Formular können Sie Gruppen zu Sachgebieten zuordnen.'::varchar(255));
 insert into tmp_db_forms (name, tablename,form_path,caption,description)
-values ('hochschulinfo','hochschulinfo','/edit/kern/hochschulinfo_edit.jsp','Hochschulinfo','In diesem Formular können Infos zu Ihrer Hochschule speichern. Bitte ordnen Sie Ihre Hochschule im Feld Hochschulnummer (HIS) zu.');
+values ('group_masken_bez','group_masken_bez','/edit/kern/group_masken_bez_edit.jsp','Gruppen und Masken'::varchar(200),'In diesem Formular können Sie Gruppen zu einzelnen Masken zuordnen.'::varchar(255));
 insert into tmp_db_forms (name, tablename,form_path,caption,description)
-values ('group_sachgeb_bez','group_sachgeb_bez','/edit/kern/group_sachgeb_bez_edit.jsp','Gruppen und Sachgebiete','In diesem Formular können Sie Gruppen zu Sachgebieten zuordnen.');
+values ('group_masken_bez','group_masken_bez','/edit/kern/group_masken_bez_edit.jsp','Gruppen und Masken'::varchar(200),'In diesem Formular können Sie Gruppen zu einzelnen Masken zuordnen.'::varchar(255));
 insert into tmp_db_forms (name, tablename,form_path,caption,description)
-values ('group_masken_bez','group_masken_bez','/edit/kern/group_masken_bez_edit.jsp','Gruppen und Masken','In diesem Formular können Sie Gruppen zu einzelnen Masken zuordnen.');
+values ('user_sichten','user_sichten','/edit/kern/user_sichten_edit.jsp','Benutzer und Sichten'::varchar(200),'In diesem Formular können Sie User-Rechte für Sichten bearbeiten. Bitte beachten Sie: bei Änderungen an den Sichten muss der Themenbaum neu geladen werden (SuperXManager)'::varchar(255));
 insert into tmp_db_forms (name, tablename,form_path,caption,description)
-values ('group_masken_bez','group_masken_bez','/edit/kern/group_masken_bez_edit.jsp','Gruppen und Masken','In diesem Formular können Sie Gruppen zu einzelnen Masken zuordnen.');
+values ('group_sichten','group_sichten','/edit/kern/group_sichten_edit.jsp','Gruppen und Sichten'::varchar(200),'In diesem Formular können Sie Gruppen-Rechte für Sichten bearbeiten. Bitte beachten Sie: bei Änderungen an den Sichten muss der Themenbaum neu geladen werden (SuperXManager)'::varchar(255));
 insert into tmp_db_forms (name, tablename,form_path,caption,description)
-values ('user_sichten','user_sichten','/edit/kern/user_sichten_edit.jsp','Benutzer und Sichten','In diesem Formular können Sie User-Rechte für Sichten bearbeiten. Bitte beachten Sie: bei Änderungen an den Sichten muss der Themenbaum neu geladen werden (SuperXManager)');
+values ('sx_captions','sx_captions','/edit/kern/sx_captions_edit.jsp','Beschriftungen'::varchar(200),'In diesem Formular können Sie Beschriftungen bearbeiten. Für Masken- und Spalten- und Felderläuterungen.'::varchar(255));
 insert into tmp_db_forms (name, tablename,form_path,caption,description)
-values ('group_sichten','group_sichten','/edit/kern/group_sichten_edit.jsp','Gruppen und Sichten','In diesem Formular können Sie Gruppen-Rechte für Sichten bearbeiten. Bitte beachten Sie: bei Änderungen an den Sichten muss der Themenbaum neu geladen werden (SuperXManager)');
+values ('user_sichtarten','user_sichtarten','/edit/kern/user_sichtarten_edit.jsp','Benutzer und Sichtarten'::varchar(200),'In diesem Formular können Sie User-Rechte für Sichtarten bearbeiten. Bitte beachten Sie: bei Änderungen an den Sichten muss der Themenbaum neu geladen werden (SuperXManager)'::varchar(255));
 insert into tmp_db_forms (name, tablename,form_path,caption,description)
-values ('sx_captions','sx_captions','/edit/kern/sx_captions_edit.jsp','Beschriftungen','In diesem Formular können Sie Beschriftungen bearbeiten. Für Masken- und Spalten- und Felderläuterungen.');
+values ('group_sichtarten','group_sichtarten','/edit/kern/group_sichtarten_edit.jsp','Gruppen und Sichtarten'::varchar(200),'In diesem Formular können Sie Gruppen-Rechte für Sichtarten bearbeiten. Bitte beachten Sie: bei Änderungen an den Sichten muss der Themenbaum neu geladen werden (SuperXManager)'::varchar(255));
 insert into tmp_db_forms (name, tablename,form_path,caption,description)
-values ('user_sichtarten','user_sichtarten','/edit/kern/user_sichtarten_edit.jsp','Benutzer und Sichtarten','In diesem Formular können Sie User-Rechte für Sichtarten bearbeiten. Bitte beachten Sie: bei Änderungen an den Sichten muss der Themenbaum neu geladen werden (SuperXManager)');
+values ('sx_repository_edit','sx_repository','/edit/kern/sx_repository_edit.jsp','Hochschul-Repository'::varchar(200),'In diesem Formular können Sie hochschulspezifische Konstanten oder SQL-Ausdrücke bearbeiten.'::varchar(255));
 insert into tmp_db_forms (name, tablename,form_path,caption,description)
-values ('group_sichtarten','group_sichtarten','/edit/kern/group_sichtarten_edit.jsp','Gruppen und Sichtarten','In diesem Formular können Sie Gruppen-Rechte für Sichtarten bearbeiten. Bitte beachten Sie: bei Änderungen an den Sichten muss der Themenbaum neu geladen werden (SuperXManager)');
+values ('sx_repository_list','sx_repository','/edit/kern/sx_repository_list.jsp','Hochschul-Repository'::varchar(200),'In diesem Formular können Sie hochschulspezifische Konstanten oder SQL-Ausdrücke bearbeiten.'::varchar(255));
 insert into tmp_db_forms (name, tablename,form_path,caption,description)
-values ('sx_repository_edit','sx_repository','/edit/kern/sx_repository_edit.jsp','Hochschul-Repository','In diesem Formular können Sie hochschulspezifische Konstanten oder SQL-Ausdrücke bearbeiten.');
+values ('sx_downloads','sx_downloads','/edit/kern/sx_downloads_edit.jsp','Downloads'::varchar(200),'In diesem Formular können Sie Downloads bearbeiten. '::varchar(255));
 insert into tmp_db_forms (name, tablename,form_path,caption,description)
-values ('sx_repository_list','sx_repository','/edit/kern/sx_repository_list.jsp','Hochschul-Repository','In diesem Formular können Sie hochschulspezifische Konstanten oder SQL-Ausdrücke bearbeiten.');
+values ('sx_keywords','sx_keywords','/edit/kern/sx_keywords_edit.jsp','Stichworte'::varchar(200),'In diesem Formular können Sie Stichworte bearbeiten. '::varchar(255));
 insert into tmp_db_forms (name, tablename,form_path,caption,description)
-values ('sx_downloads','sx_downloads','/edit/kern/sx_downloads_edit.jsp','Downloads','In diesem Formular können Sie Downloads bearbeiten. ');
+values ('sachgeb_sichten','sachgeb_sichten','/edit/kern/sachgeb_sichten_edit.jsp','Zuordnung Sichten zu Sachgebieten'::varchar(200),'In diesem Formular können Sie Sichten zu Sachgebieten zuordnen. '::varchar(255));
 insert into tmp_db_forms (name, tablename,form_path,caption,description)
-values ('sx_keywords','sx_keywords','/edit/kern/sx_keywords_edit.jsp','Stichworte','In diesem Formular können Sie Stichworte bearbeiten. ');
+values ('sachgeb_sichtarten','sachgeb_sichtarten','/edit/kern/sachgeb_sichtarten_edit.jsp','Zuordnung Sichtarten zu Sachgebieten'::varchar(200),'In diesem Formular können Sie Sichtarten zu Sachgebieten zuordnen. '::varchar(255));
 insert into tmp_db_forms (name, tablename,form_path,caption,description)
-values ('sachgeb_sichten','sachgeb_sichten','/edit/kern/sachgeb_sichten_edit.jsp','Zuordnung Sichten zu Sachgebieten','In diesem Formular können Sie Sichten zu Sachgebieten zuordnen. ');
+values ('unload_params','unload_params','/edit/kern/unload_params_edit.jsp','Entladeparameter verwalten'::varchar(200),''::varchar(255));
 insert into tmp_db_forms (name, tablename,form_path,caption,description)
-values ('sachgeb_sichtarten','sachgeb_sichtarten','/edit/kern/sachgeb_sichtarten_edit.jsp','Zuordnung Sichtarten zu Sachgebieten','In diesem Formular können Sie Sichtarten zu Sachgebieten zuordnen. ');
+values ('trans_inst_list','trans_inst','/edit/kern/trans_inst_list.jsp','Kostenstellen transformieren (Liste)'::varchar(200),'In diesem Formular können Sie Kostenstellen umschlüsseln.'::varchar(255));
 insert into tmp_db_forms (name, tablename,form_path,caption,description)
-values ('unload_params','unload_params','/edit/kern/unload_params_edit.jsp','Entladeparameter verwalten','');
+values ('trans_inst_edit','trans_inst','/edit/kern/trans_inst_edit.jsp','Kostenstellen transformieren (Details)'::varchar(200),'In diesem Formular können Sie Kostenstellen umschlüsseln.'::varchar(255));
 insert into tmp_db_forms (name, tablename,form_path,caption,description)
-values ('trans_inst_list','trans_inst','/edit/kern/trans_inst_list.jsp','Kostenstellen transformieren (Liste)','In diesem Formular können Sie Kostenstellen umschlüsseln.');
+values ('data_upload_edit','data_upload','/edit/kern/data_upload_edit.jsp','Verzeichnis der Datei-Uploads'::varchar(200),'In diesem Formular können Sie Uploads bearbeiten. '::varchar(255));
 insert into tmp_db_forms (name, tablename,form_path,caption,description)
-values ('trans_inst_edit','trans_inst','/edit/kern/trans_inst_edit.jsp','Kostenstellen transformieren (Details)','In diesem Formular können Sie Kostenstellen umschlüsseln.');
+values ('stylesheet_field_edit','stylesheet_field','/edit/kern/stylesheet_field_edit.jsp','Stylesheets und zugehörige Felder'::varchar(200),'In diesem Formular können Sie von Stylesheets benötigte Felder entsprechend zuordnen.'::varchar(255));
 insert into tmp_db_forms (name, tablename,form_path,caption,description)
-values ('data_upload_edit','data_upload','/edit/kern/data_upload_edit.jsp','Verzeichnis der Datei-Uploads','In diesem Formular können Sie Uploads bearbeiten. ');
+values ('stylesheet_field_list','stylesheet_field','/edit/kern/stylesheet_field_list.jsp','Stylesheets und zugehörige Felder'::varchar(200),'In diesem Formular können Sie von Stylesheets benötigte Felder entsprechend zuordnen.'::varchar(255));
 insert into tmp_db_forms (name, tablename,form_path,caption,description)
-values ('stylesheet_field_edit','stylesheet_field','/edit/kern/stylesheet_field_edit.jsp','Stylesheets und zugehörige Felder','In diesem Formular können Sie von Stylesheets benötigte Felder entsprechend zuordnen.');
+values ('group_field_pref_edit','group_field_pref','/edit/kern/group_field_pref_edit.jsp','Gruppen Feldattribute zuweisen'::varchar(200),'In diesem Formular können Sie Feldern in Masken für bestimmte Gruppen Attribute wie Verstecken zuweisen.'::varchar(255));
 insert into tmp_db_forms (name, tablename,form_path,caption,description)
-values ('stylesheet_field_list','stylesheet_field','/edit/kern/stylesheet_field_list.jsp','Stylesheets und zugehörige Felder','In diesem Formular können Sie von Stylesheets benötigte Felder entsprechend zuordnen.');
+values ('group_field_pref_list','group_field_pref','/edit/kern/group_field_pref_list.jsp','Gruppen Felderattribute zuweisen'::varchar(200),'In diesem Formular können Sie Feldern in Masken für bestimmte Gruppen Attribute wie Verstecken zuweisen.'::varchar(255));
 insert into tmp_db_forms (name, tablename,form_path,caption,description)
-values ('group_field_pref_edit','group_field_pref','/edit/kern/group_field_pref_edit.jsp','Gruppen Feldattribute zuweisen','In diesem Formular können Sie Feldern in Masken für bestimmte Gruppen Attribute wie Verstecken zuweisen.');
+values ('fm_templates_list','fm_templates','/edit/kern/fm_templates_list.jsp','Freemarker-Templates bearbeiten'::varchar(200),'In diesem Formular können Sie Freemarker-Templates verwalten.'::varchar(255));
 insert into tmp_db_forms (name, tablename,form_path,caption,description)
-values ('group_field_pref_list','group_field_pref','/edit/kern/group_field_pref_list.jsp','Gruppen Felderattribute zuweisen','In diesem Formular können Sie Feldern in Masken für bestimmte Gruppen Attribute wie Verstecken zuweisen.');
+values ('fm_templates_edit','fm_templates','/edit/kern/fm_templates_edit.jsp','Freemarker-Templates bearbeiten'::varchar(200),'In diesem Formular können Sie Freemarker-Templates verwalten.'::varchar(255));
 insert into tmp_db_forms (name, tablename,form_path,caption,description)
-values ('fm_templates_list','fm_templates','/edit/kern/fm_templates_list.jsp','Freemarker-Templates bearbeiten','In diesem Formular können Sie Freemarker-Templates verwalten.');
+values ('dbconnections_list','dbconnections','/edit/kern/dbconnections_list.jsp','DB-Connections'::varchar(200),'In diesem Formular können Sie DB Connections bearbeiten.'::varchar(255));
 insert into tmp_db_forms (name, tablename,form_path,caption,description)
-values ('fm_templates_edit','fm_templates','/edit/kern/fm_templates_edit.jsp','Freemarker-Templates bearbeiten','In diesem Formular können Sie Freemarker-Templates verwalten.');
+values ('portlets_list','sx_portlet','/edit/kern/portlets_list.jsp','Portlets'::varchar(200),'In diesem Formular können Sie Portlets bearbeiten.'::varchar(255));
 insert into tmp_db_forms (name, tablename,form_path,caption,description)
-values ('dbconnections_list','dbconnections','/edit/kern/dbconnections_list.jsp','DB-Connections','In diesem Formular können Sie DB Connections bearbeiten.');
+values ('sichtart_rechttabelle_list','sichtart_rechttabelle','/edit/kern/sichtart_rechttabelle_list.jsp','Spezielle Sichtart-Rechte'::varchar(200),'In diesem Formular können Sie Rechtetabellen für Sichtarten bearbeiten.'::varchar(255));
 insert into tmp_db_forms (name, tablename,form_path,caption,description)
-values ('portlets_list','sx_portlet','/edit/kern/portlets_list.jsp','Portlets','In diesem Formular können Sie Portlets bearbeiten.');
+values ('sichtart_rechttabelle_edit','sichtart_rechttabelle','/edit/kern/sichtart_rechttabelle_edit.jsp','Spezielle Sichtart-Rechte Einzelbarbeitung'::varchar(200),'In diesem Formular können Sie Rechtetabellen für Sichtarten bearbeiten.'::varchar(255));
 insert into tmp_db_forms (name, tablename,form_path,caption,description)
-values ('sichtart_rechttabelle_list','sichtart_rechttabelle','/edit/kern/sichtart_rechttabelle_list.jsp','Spezielle Sichtart-Rechte','In diesem Formular können Sie Rechtetabellen für Sichtarten bearbeiten.');
+values ('sx_jobs_edit','sx_jobs','/edit/kern/sx_jobs_edit.jsp','Ladejobs verwalten'::varchar(200),'In diesem Formular können Sie Ladejobs verwalten'::varchar(255));
 insert into tmp_db_forms (name, tablename,form_path,caption,description)
-values ('sichtart_rechttabelle_edit','sichtart_rechttabelle','/edit/kern/sichtart_rechttabelle_edit.jsp','Spezielle Sichtart-Rechte Einzelbarbeitung','In diesem Formular können Sie Rechtetabellen für Sichtarten bearbeiten.');
+values ('sx_jobs_list','sx_jobs','/edit/kern/sx_jobs_list.jsp','Ladejobs verwalten'::varchar(200),'In diesem Formular können Sie Ladejobs verwalten'::varchar(255));
 insert into tmp_db_forms (name, tablename,form_path,caption,description)
-values ('sx_jobs_edit','sx_jobs','/edit/kern/sx_jobs_edit.jsp','Ladejobs verwalten','In diesem Formular können Sie Ladejobs verwalten');
+values ('organigramm_list','organigramm','/edit/kern/organigramm_list.jsp','Organigramm'::varchar(200),'In diesem Formular können Sie das Organigramm aufrufen'::varchar(255));
 insert into tmp_db_forms (name, tablename,form_path,caption,description)
-values ('sx_jobs_list','sx_jobs','/edit/kern/sx_jobs_list.jsp','Ladejobs verwalten','In diesem Formular können Sie Ladejobs verwalten');
+values ('sx_stylesheet_param_edit','sx_stylesheet_param','/edit/kern/sx_stylesheet_param_edit.jsp','Stylesheet-Parameter'::varchar(200),'In diesem Formular können Sie Stylesheet-Parameter bearbeiten.'::varchar(255));
 insert into tmp_db_forms (name, tablename,form_path,caption,description)
-values ('organigramm_list','organigramm','/edit/kern/organigramm_list.jsp','Organigramm','In diesem Formular können Sie das Organigramm aufrufen');
+values ('sx_stylesheet_param_list','sx_stylesheet_param','/edit/kern/sx_stylesheet_param_list.jsp','Stylesheet-Parameter'::varchar(200),'In diesem Formular können Sie Stylesheet-Parameter bearbeiten.'::varchar(255));
 
 create temp table tmp_hilf(tid integer);
 insert into tmp_hilf select max(tid) from db_forms;

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

@@ -3,6 +3,9 @@
 <dbi:file structure="SQL" withNativeClient="n" encoding="UTF-8" database="eduetl" filename="$SUPERX_DIR/db/install/upgrade/kern_upgrade_indexes_ids.sql"/>
 </dbi:dbaction>
 <dbi:dbaction dbi:action="executeFile">
+<dbi:file structure="SQL" withNativeClient="n" encoding="UTF-8" database="eduetl" filename="$SUPERX_DIR/db/install/conf/sx_fields_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/schluesseltabellen/macro_masken_bez_fuellen.sql"/>
 </dbi:dbaction>
 <dbi:dbaction dbi:action="executeFile">
@@ -11,31 +14,66 @@
 <dbi:dbaction dbi:action="executeFile">
 <dbi:file database="eduetl" encoding="UTF-8" withNativeClient="n" structure="SQL" filename="$SUPERX_DIR/db/install/schluesseltabellen/dimension_view_erzeugen_ids.sql"/>
 </dbi:dbaction>
-<dbi:dbaction dbi:action="sqlexec">eduetl:create table tmp_templates(tid integer,  id char(200)  not null,  content text  not null,  description char(200) ,  comment char(200) ,  version integer   )  ;
+<dbi:dbaction dbi:action="sqlexec">eduetl:create table tmp_templates(tid integer,  id char(200)  not null, content text  not null, description char(200) , comment char(200) , version integer ) ;
 </dbi:dbaction>
 <dbi:dbaction dbi:action="sqlexec">eduetl:CREATE TABLE tmp_menu_element (     id integer NOT NULL,     element character(255),     element_value character(255),     description character(255),     nature character(255),     annotation character(255) );
 </dbi:dbaction>
-<dbi:dbaction dbi:action="sqlexec">eduetl:create table tmp_captions ( tid INTEGER, id CHAR(200) ,  table_name CHAR(200) ,  field_name CHAR(200) ,  record_no INTEGER ,  locale CHAR(10) ,  contents_short CHAR(255) ,  contents_long text ,  equalitystatus SMALLINT ,  sachgebiete_id INTEGER, doku_link VARCHAR, export_to_glossar INTEGER );
+<dbi:dbaction dbi:action="sqlexec">eduetl:create table tmp_captions ( tid INTEGER, id CHAR(200) , table_name CHAR(200) , field_name CHAR(200) , record_no INTEGER , locale CHAR(10) , contents_short CHAR(255) , contents_long text , equalitystatus SMALLINT , sachgebiete_id INTEGER, doku_link VARCHAR, export_to_glossar INTEGER );
 </dbi:dbaction>
-<dbi:dbaction dbi:action="sqlexec">eduetl:create table tmp_repository(  tid SERIAL  not null,  id CHAR(200)  not null,  content TEXT ,  caption CHAR(200) ,  comment TEXT ,  version SMALLINT ,  art CHAR(200) ,  art2 CHAR(200) ,  art3 CHAR(200) ,  sachgebiete_id INTEGER ,  sort1 INTEGER ,  sort2 INTEGER ,  sort3 INTEGER ,  geaendert_am DATE ,  aktiv smallint ,  gueltig_seit DATE ,  gueltig_bis DATE  );
+<dbi:dbaction dbi:action="sqlexec">eduetl:create table tmp_repository(  tid SERIAL  not null, id CHAR(200)  not null, content TEXT , caption CHAR(200) , comment TEXT , version SMALLINT , art CHAR(200) , art2 CHAR(200) , art3 CHAR(200) , sachgebiete_id INTEGER , sort1 INTEGER , sort2 INTEGER , sort3 INTEGER , geaendert_am DATE , aktiv smallint , gueltig_seit DATE , gueltig_bis DATE );
 </dbi:dbaction>
 <dbi:dbaction dbi:action="sqlexec">eduetl:delete from tmp_templates;
 </dbi:dbaction>
 <dbi:dbaction dbi:action="importFile">
 <dbi:data database="eduetl" table="tmp_templates">
-<dbi:file encoding="UTF-8" separator="^" trailingSeparator="y" withNativeClient="y" firstLinedescription="n" structure="CSV" filename="$SUPERX_DIR/db/install/schluesseltabellen/release_unloads/fm_templates.unl"/>
+<dbi:file encoding="UTF-8" separator="^" trailingSeparator="y" withNativeClient="n" firstLinedescription="n" structure="CSV" filename="$SUPERX_DIR/db/install/schluesseltabellen/release_unloads/fm_templates.unl"/>
 </dbi:data>
 </dbi:dbaction>
 <dbi:dbaction dbi:action="sqlexec">eduetl:delete from tmp_captions;
 </dbi:dbaction>
+<dbi:dbaction dbi:action="sqlexec">eduetl:delete from k_astat_studienfach_land;
+</dbi:dbaction>
+<dbi:dbaction dbi:action="sqlexec">eduetl:delete from k_astat_abschluss3steller_land;
+</dbi:dbaction>
+<dbi:dbaction dbi:action="sqlexec">eduetl:delete from k_astat_abschluss2steller;
+</dbi:dbaction>
+<dbi:dbaction dbi:action="sqlexec">eduetl:delete from k_astat_studienfach;
+</dbi:dbaction>
+<dbi:dbaction dbi:action="sqlexec">eduetl:delete from k_astat_studienbereich;
+</dbi:dbaction>
 <dbi:dbaction dbi:action="importFile">
 <dbi:data database="eduetl" table="tmp_menu_element">
-<dbi:file encoding="UTF-8" separator="^" trailingSeparator="y" withNativeClient="y" firstLinedescription="n" structure="CSV" filename="$SUPERX_DIR/db/install/schluesseltabellen/release_unloads/menu_element.unl"/>
+<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"/>
 </dbi:data>
 </dbi:dbaction>
 <dbi:dbaction dbi:action="importFile">
 <dbi:data database="eduetl" table="tmp_captions">
-<dbi:file encoding="UTF-8" separator="^" trailingSeparator="y" withNativeClient="y" firstLinedescription="n" structure="CSV" filename="$SUPERX_DIR/db/install/schluesseltabellen/release_unloads/sx_captions.unl"/>
+<dbi:file encoding="UTF-8" separator="^" trailingSeparator="y" withNativeClient="n" firstLinedescription="n" structure="CSV" filename="$SUPERX_DIR/db/install/schluesseltabellen/release_unloads/sx_captions.unl"/>
+</dbi:data>
+</dbi:dbaction>
+<dbi:dbaction dbi:action="importFile">
+<dbi:data database="eduetl" table="k_astat_studienfach_land">
+<dbi:file encoding="UTF-8" separator="^" trailingSeparator="y" withNativeClient="n" firstLinedescription="n" structure="CSV" filename="$SUPERX_DIR/db/install/schluesseltabellen/release_unloads/k_astat_studienfach_land.unl"/>
+</dbi:data>
+</dbi:dbaction>
+<dbi:dbaction dbi:action="importFile">
+<dbi:data database="eduetl" table="k_astat_abschluss3steller_land">
+<dbi:file encoding="UTF-8" separator="^" trailingSeparator="y" withNativeClient="n" firstLinedescription="n" structure="CSV" filename="$SUPERX_DIR/db/install/schluesseltabellen/release_unloads/k_astat_abschluss3steller_land.unl"/>
+</dbi:data>
+</dbi:dbaction>
+<dbi:dbaction dbi:action="importFile">
+<dbi:data database="eduetl" table="k_astat_abschluss2steller">
+<dbi:file encoding="UTF-8" separator="^" trailingSeparator="y" withNativeClient="n" firstLinedescription="n" structure="CSV" filename="$SUPERX_DIR/db/install/schluesseltabellen/release_unloads/k_astat_abschluss2steller.unl"/>
+</dbi:data>
+</dbi:dbaction>
+<dbi:dbaction dbi:action="importFile">
+<dbi:data database="eduetl" table="k_astat_studienfach">
+<dbi:file encoding="UTF-8" separator="^" trailingSeparator="y" withNativeClient="n" firstLinedescription="n" structure="CSV" filename="$SUPERX_DIR/db/install/schluesseltabellen/release_unloads/k_astat_studienfach.unl"/>
+</dbi:data>
+</dbi:dbaction>
+<dbi:dbaction dbi:action="importFile">
+<dbi:data database="eduetl" table="k_astat_studienbereich">
+<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="executeFile">
@@ -85,11 +123,11 @@
 </dbi:dbaction>
 <dbi:dbaction dbi:action="sqlexec">eduetl:alter table sx_fields modify (is_primarykey integer default 0);
 </dbi:dbaction>
-<dbi:dbaction dbi:action="sqlexec">eduetl:create table tmp_cifx_load (  tid INTEGER  not null,  hs INTEGER  not null,  key SMALLINT  not null,  apnr CHAR(10)  not null,  d_akt_von DATE ,  d_akt_bis DATE ,  kurz CHAR(10) ,  druck CHAR(100) ,  lang_1 CHAR(100) ,  lang_2 CHAR(150) ,  lang_3 CHAR(250) ,  parent CHAR(10) , parent_int integer, filter CHAR(10) ,  refapnr CHAR(10) ,  astat CHAR(10) ,  bund_apnr CHAR(10) ,  land_apnr CHAR(10) ,  hiskey_id VARCHAR(255) ,  uniquename VARCHAR(255) ,  sort1 INTEGER ,  sort2 INTEGER ,  sort3 INTEGER ,  sortc1 CHAR(10) ,  sortc2 CHAR(10) ,  sourcesystem integer ,  sourcesystem_id VARCHAR(255) ,  intern_int INTEGER ,  intern_c CHAR(10) ,  sprache CHAR(3) ,  struktur_int INTEGER ,  struktur_c CHAR(50) ,  ebene INTEGER, lid  VARCHAR(255), parent_lid  VARCHAR(255) );
+<dbi:dbaction dbi:action="sqlexec">eduetl:create table tmp_cifx_load (  tid INTEGER  not null, hs INTEGER  not null, key SMALLINT  not null, apnr CHAR(10)  not null, d_akt_von DATE , d_akt_bis DATE , kurz CHAR(10) , druck CHAR(100) , lang_1 CHAR(100) , lang_2 CHAR(150) , lang_3 CHAR(250) , parent CHAR(10) , parent_int integer, filter CHAR(10) , refapnr CHAR(10) , astat CHAR(10) , bund_apnr CHAR(10) , land_apnr CHAR(10) , hiskey_id VARCHAR(255) , uniquename VARCHAR(255) , sort1 INTEGER , sort2 INTEGER , sort3 INTEGER , sortc1 CHAR(10) , sortc2 CHAR(10) , sourcesystem integer , sourcesystem_id VARCHAR(255) , intern_int INTEGER , intern_c CHAR(10) , sprache CHAR(3) , struktur_int INTEGER , struktur_c CHAR(50) , ebene INTEGER, lid  VARCHAR(255), parent_lid  VARCHAR(255) );
 </dbi:dbaction>
-<dbi:dbaction dbi:action="sqlexec">eduetl:create table tmp_cif_load (  tid INTEGER  not null,  hs INTEGER  not null,  key SMALLINT  not null,  apnr INTEGER  not null,  d_akt_von DATE ,  d_akt_bis DATE ,  kurz CHAR(10) ,  druck CHAR(100) ,  lang_1 CHAR(100) ,  lang_2 CHAR(150) ,  lang_3 CHAR(250), sort1 INTEGER  )  ;
+<dbi:dbaction dbi:action="sqlexec">eduetl:create table tmp_cif_load (  tid INTEGER  not null, hs INTEGER  not null, key SMALLINT  not null, apnr INTEGER  not null, d_akt_von DATE , d_akt_bis DATE , kurz CHAR(10) , druck CHAR(100) , lang_1 CHAR(100) , lang_2 CHAR(150) , lang_3 CHAR(250), sort1 INTEGER ) ;
 </dbi:dbaction>
-<dbi:dbaction dbi:action="sqlexec">eduetl:create table tmp_portlet( tid SERIAL  not null,  name VARCHAR(255) ,  type VARCHAR(255) ,  class VARCHAR(255) ,  icon VARCHAR(255) ,  content TEXT ,  sortnr_initial INTEGER ,  visible VARCHAR(255) ,  gueltig_von DATE,  gueltig_bis DATE )  ;
+<dbi:dbaction dbi:action="sqlexec">eduetl:create table tmp_portlet( tid SERIAL  not null, name VARCHAR(255) , type VARCHAR(255) , class VARCHAR(255) , icon VARCHAR(255) , content TEXT , sortnr_initial INTEGER , visible VARCHAR(255) , gueltig_von DATE, gueltig_bis DATE ) ;
 </dbi:dbaction>
 <dbi:dbaction dbi:action="sqlexec">eduetl:delete from tmp_cifx_load;
 </dbi:dbaction>
@@ -101,22 +139,22 @@
 </dbi:dbaction>
 <dbi:dbaction dbi:action="importFile">
 <dbi:data database="eduetl" table="tmp_cifx_load">
-<dbi:file encoding="UTF-8" separator="^" trailingSeparator="y" withNativeClient="y" firstLinedescription="n" structure="CSV" filename="$SUPERX_DIR/db/install/schluesseltabellen/release_unloads/cifx.unl"/>
+<dbi:file encoding="UTF-8" separator="^" trailingSeparator="y" withNativeClient="n" firstLinedescription="n" structure="CSV" filename="$SUPERX_DIR/db/install/schluesseltabellen/release_unloads/cifx.unl"/>
 </dbi:data>
 </dbi:dbaction>
 <dbi:dbaction dbi:action="importFile">
 <dbi:data database="eduetl" table="tmp_cif_load">
-<dbi:file encoding="UTF-8" separator="^" trailingSeparator="y" withNativeClient="y" firstLinedescription="n" structure="CSV" filename="$SUPERX_DIR/db/install/schluesseltabellen/release_unloads/cif.unl"/>
+<dbi:file encoding="UTF-8" separator="^" trailingSeparator="y" withNativeClient="n" firstLinedescription="n" structure="CSV" filename="$SUPERX_DIR/db/install/schluesseltabellen/release_unloads/cif.unl"/>
 </dbi:data>
 </dbi:dbaction>
 <dbi:dbaction dbi:action="importFile">
 <dbi:data database="eduetl" table="tmp_portlet">
-<dbi:file encoding="UTF-8" separator="^" trailingSeparator="y" withNativeClient="y" firstLinedescription="n" structure="CSV" filename="$SUPERX_DIR/db/install/schluesseltabellen/release_unloads/sx_portlet.unl"/>
+<dbi:file encoding="UTF-8" separator="^" trailingSeparator="y" withNativeClient="n" firstLinedescription="n" structure="CSV" filename="$SUPERX_DIR/db/install/schluesseltabellen/release_unloads/sx_portlet.unl"/>
 </dbi:data>
 </dbi:dbaction>
 <dbi:dbaction dbi:action="importFile">
 <dbi:data database="eduetl" table="tmp_repository">
-<dbi:file encoding="UTF-8" separator="^" trailingSeparator="y" withNativeClient="y" firstLinedescription="n" structure="CSV" filename="$SUPERX_DIR/db/install/schluesseltabellen/release_unloads/sx_repository.unl"/>
+<dbi:file encoding="UTF-8" separator="^" trailingSeparator="y" withNativeClient="n" firstLinedescription="n" structure="CSV" filename="$SUPERX_DIR/db/install/schluesseltabellen/release_unloads/sx_repository.unl"/>
 </dbi:data>
 </dbi:dbaction>
 <dbi:dbaction dbi:action="executeFile">
@@ -160,16 +198,27 @@
 <dbi:dbaction dbi:action="executeFile">
 <dbi:file database="eduetl" encoding="UTF-8" withNativeClient="n" structure="SQL" filename="$SUPERX_DIR/db/install/masken/remove_obsolete_masks.sql"/>
 </dbi:dbaction>
-<dbi:dbaction dbi:action="sqlexec">eduetl:UPDATE db_version SET version = '4.9'
+<dbi:dbaction dbi:action="sqlexec">eduetl:delete from dim_datum;
+</dbi:dbaction>
+<dbi:dbaction dbi:action="importFile">
+<dbi:data database="eduetl" table="dim_datum">
+<dbi:file encoding="UTF-8" separator="^" trailingSeparator="y" withNativeClient="n" firstLinedescription="n" structure="CSV" filename="$SUPERX_DIR/db/install/schluesseltabellen/release_unloads/dim_datum.unl"/>
+</dbi:data>
+</dbi:dbaction>
+<dbi:dbaction dbi:action="sqlexec">eduetl:delete from aggre_bland;
+</dbi:dbaction>
+<dbi:dbaction dbi:action="importFile">
+<dbi:data database="eduetl" table="aggre_bland">
+<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'
   WHERE his_system = 'kern';
 </dbi:dbaction>
 <dbi:dbaction dbi:action="executeFile">
 <dbi:file structure="SQL" withNativeClient="n" encoding="UTF-8" database="eduetl" filename="$SUPERX_DIR/db/install/conf/sx_tables_fuellen.sql"/>
 </dbi:dbaction>
 <dbi:dbaction dbi:action="executeFile">
-<dbi:file structure="SQL" withNativeClient="n" encoding="UTF-8" database="eduetl" filename="$SUPERX_DIR/db/install/conf/sx_fields_fuellen.sql"/>
-</dbi:dbaction>
-<dbi:dbaction dbi:action="executeFile">
 <dbi:file structure="SQL" withNativeClient="n" encoding="UTF-8" database="eduetl" filename="$SUPERX_DIR/db/install/conf/unload_params_fuellen.sql"/>
 </dbi:dbaction>
 <dbi:dbaction dbi:action="executeFile">

superx/WEB-INF/conf/edustore/db/install/conf/his1/edustore_update/edustore_kern_load_ids.xml

@@ -1,333 +1,15 @@
 <?xml version="1.0" encoding="UTF-8"?><dbi:dbactions dbi:want-result="true" dbi:autocommit="true" xmlns:dsd="http://www.his.de/Abt1/Interfaces/dsd_V1.0" xmlns:dbi="http://www.his.de/Abt1/Interfaces/dbi_V1.0">
-<!--Automatisch generiert von Edustore für mode=load,database=eduetl und dbsystem=INFORMIX--><!--ETL-Step Action Nr. 1/home/superx/git/superx/superx/WEB-INF/conf/edustore/db/conf/../install: --><dbi:dbaction dbi:action="sqlexec">eduetl:CREATE TABLE tmp_userinfo (tid integer, benutzer char(30), kennwort char(16), name char(50), max_versuch smallint, akt_versuch smallint, email char(255), administration smallint, archiv_recht smallint, passwd_sha char(40), info char(255), extern_account_id varchar(255), extern_person_id varchar(255),sieht_projekte SMALLINT);
+<!--Automatisch generiert von Edustore für mode=load,database=eduetl und dbsystem=INFORMIX--><!--ETL-Step Action Nr. 1/home/superx/git/kern/superx/WEB-INF/conf/edustore/db/conf/../install: --><dbi:dbaction dbi:action="executeFile">
+<dbi:file database="eduetl" encoding="UTF-8" withNativeClient="n" structure="SQL" filename="$SUPERX_DIR/db/install/schluesseltabellen/organigrammquelle_pruefen.sql"/>
 </dbi:dbaction>
-<dbi:dbaction dbi:action="sqlexec">eduetl:CREATE TABLE tmp_user_group_bez (userinfo_id integer, groupinfo_id integer, external_entry smallint);
-</dbi:dbaction>
-<dbi:dbaction dbi:action="sqlexec">eduetl:CREATE TABLE tmp_user_institution (userid integer, name char(50), ch110_institut char(10), hierarchie smallint, gueltig_seit date, gueltig_bis date, lehre smallint, external_entry smallint, externalid varchar(200));
-</dbi:dbaction>
-<dbi:dbaction dbi:action="sqlexec">eduetl:CREATE TABLE tmp_user_masken_bez (userinfo_id integer, maskeninfo_id integer, external_entry smallint);
-</dbi:dbaction>
-<dbi:dbaction dbi:action="sqlexec">eduetl:CREATE TABLE tmp_user_pw (userinfo_id integer, pw_gueltig_bis date, last_login datetime year to second, old_sha1 char(40), zeitpunkt1 datetime year to second, old_sha2 char(40), zeitpunkt2 datetime year to second, old_sha3 char(40), zeitpunkt3 datetime year to second, old_sha4 char(40), zeitpunkt4 datetime year to second, old_sha5 char(40), zeitpunkt5 datetime year to second, old_sha6 char(40), zeitpunkt6 datetime year to second, old_sha7 char(40), zeitpunkt7 datetime year to second);
-</dbi:dbaction>
-<dbi:dbaction dbi:action="sqlexec">eduetl:CREATE TABLE tmp_user_sachgeb_bez (userinfo_id integer, sachgebiete_id integer, external_entry smallint);
-</dbi:dbaction>
-<dbi:dbaction dbi:action="sqlexec">eduetl:CREATE TABLE tmp_user_sichtarten (userinfo_id integer, sichtart char(255), external_entry smallint);
-</dbi:dbaction>
-<dbi:dbaction dbi:action="sqlexec">eduetl:CREATE TABLE tmp_user_sichten (userinfo_id integer, sicht_name_intern char(200), external_entry smallint);
-</dbi:dbaction>
-<dbi:dbaction dbi:action="sqlexec">eduetl:CREATE TABLE tmp_group_field_pref (tid integer, groupinfo_id integer, field_id integer, pref varchar(255));
-</dbi:dbaction>
-<dbi:dbaction dbi:action="sqlexec">eduetl:CREATE TABLE tmp_group_masken_bez (groupinfo_id integer, maskeninfo_id integer);
-</dbi:dbaction>
-<dbi:dbaction dbi:action="sqlexec">eduetl:CREATE TABLE tmp_group_sachgeb_bez (groupinfo_id integer, sachgebiete_id integer);
-</dbi:dbaction>
-<dbi:dbaction dbi:action="sqlexec">eduetl:CREATE TABLE tmp_group_sichtarten (groupinfo_id integer, sichtart char(255));
-</dbi:dbaction>
-<dbi:dbaction dbi:action="sqlexec">eduetl:CREATE TABLE tmp_group_sichten (groupinfo_id integer, sicht_name_intern char(200));
-</dbi:dbaction>
-<dbi:dbaction dbi:action="sqlexec">eduetl:CREATE TABLE tmp_groupinfo (tid integer, name char(255));
-</dbi:dbaction>
-<dbi:dbaction dbi:action="sqlexec">eduetl:CREATE TABLE tmp_fin_user_kam (tid integer, userid integer, buchungsab_fb char(10), projnr_ins char(255), kapitel char(5), dr char(5), titel char(255), untertitel char(5), kostenstellen char(255), ins2 char(10), ins3 char(10), gueltig_von date, gueltig_bis date);
-</dbi:dbaction>
-<dbi:dbaction dbi:action="sqlexec">eduetl:create table tmp_hochschulinfo (name char(100), adresse char(200), hs_nr integer, kapitel char(5), superx_server char(100), kennung char(8), passwd char(16) );
-</dbi:dbaction>
-<dbi:dbaction dbi:action="sqlexec">eduetl:CREATE TABLE tmp_konstanten (tid integer, apnr integer, beschreibung char(25));
-</dbi:dbaction>
-<dbi:dbaction dbi:action="sqlexec">eduetl:CREATE TABLE tmp_unload_params (tid integer, param_id varchar(255), param_val varchar(255), default_val varchar(255), description varchar(255), systeminfo_id integer);
-</dbi:dbaction>
-<dbi:dbaction dbi:action="sqlexec">eduetl:CREATE TABLE tmp_sx_repository (tid integer, id char(200), content text, caption char(200), comment text, version smallint, art char(200), art2 char(200), art3 char(200), sachgebiete_id integer, sort1 integer, sort2 integer, sort3 integer, geaendert_am date, aktiv smallint, gueltig_seit date, gueltig_bis date);
-</dbi:dbaction>
-<dbi:dbaction dbi:action="sqlexec">eduetl:CREATE TABLE tmp_themenbaum (tid integer, name varchar(255), maskeninfo_id integer, parent integer, gueltig_seit date, gueltig_bis date, erlaeuterung char(240), sort integer, css_class character varying(255));
-</dbi:dbaction>
-<dbi:dbaction dbi:action="sqlexec">eduetl:CREATE TABLE tmp_maskeninfo (tid integer, name char(255), select_stmt text, xil_proplist text, chart_xtitel char(50), chart_ytitel char(50), erlaeuterung char(255), cleanup_stmt char(240), default_file char(200), macro smallint, breite integer, hoehe integer, ampel smallint, hilfe smallint, hinweis text);
-</dbi:dbaction>
-<dbi:dbaction dbi:action="sqlexec">eduetl:CREATE TABLE tmp_felderinfo (tid integer, name char(50), nummer integer, x integer, y integer, buttonbreite integer, feldbreite integer, zeilenanzahl integer, typ char(15), laenge integer, obligatorisch integer, art integer, relation text, attribut char(100), defaultwert char(255));
-</dbi:dbaction>
-<dbi:dbaction dbi:action="sqlexec">eduetl:CREATE TABLE tmp_masken_felder_bez (maskeninfo_id integer, felderinfo_id integer);
-</dbi:dbaction>
-<dbi:dbaction dbi:action="sqlexec">eduetl:CREATE TABLE tmp_maske_system_bez (maskeninfo_id integer, systeminfo_id integer);
-</dbi:dbaction>
-<dbi:dbaction dbi:action="sqlexec">eduetl:CREATE TABLE tmp_sachgeb_maske_bez (sachgebiete_id integer, maskeninfo_id integer);
-</dbi:dbaction>
-<dbi:dbaction dbi:action="sqlexec">eduetl:CREATE TABLE tmp_sx_stylesheets (tid integer, filename char(255), caption char(255), description char(255), relation char(10), useragent char(255), contenttype char(200));
-</dbi:dbaction>
-<dbi:dbaction dbi:action="sqlexec">eduetl:CREATE TABLE tmp_sx_mask_style (tid integer, maskeninfo_id integer, stylesheet_id integer, ord smallint);
-</dbi:dbaction>
-<dbi:dbaction dbi:action="sqlexec">eduetl:CREATE TABLE tmp_stylesheet_field (tid integer, stylesheet_id integer, tablename varchar(255), fieldname varchar(255));
-</dbi:dbaction>
-<dbi:dbaction dbi:action="sqlexec">eduetl:CREATE TABLE tmp_macro_masken_bez (maskeninfo_id1 integer, maskeninfo_id2 integer, active integer, sortnr smallint, schleifenrelation char(255), schleifenfeldname char(255), alias char(255), schleifenfstand char(255), schleifenfsicht char(255), aktion char(255));
-</dbi:dbaction>
-<dbi:dbaction dbi:action="sqlexec">eduetl:CREATE TABLE tmp_macro_feld_wert (macro integer, sortnr integer, feldname char(255), alias char(255), value char(255), value_caption char(255), feldstand char(255), feldsicht char(255), active integer);
-</dbi:dbaction>
-<dbi:dbaction dbi:action="sqlexec">eduetl:CREATE TABLE tmp_sx_captions (tid integer, id char(200), table_name char(200), field_name char(200), record_no integer, locale char(10), contents_short char(255), contents_long text, equalitystatus smallint, sachgebiete_id integer, doku_link varchar(255), export_to_glossar integer);
-</dbi:dbaction>
-<dbi:dbaction dbi:action="sqlexec">eduetl:CREATE TABLE tmp_sichten (tid integer, parent char(255), systeminfoid integer, art char(40), type integer, name_intern char(200), name char(200), beschreibung char(255), sortnr integer, quelle char(255), alt_hier_id char(150), treecfgtable char(255), treecfgid char(150), label smallint, user_rechte smallint, rechtequelle char(255), sesamkey char(100), standbutton smallint, attribut1 char(255), attribut2 char(255), attribut3 integer, attribut4 integer, xmlmaxentries integer, gueltig_seit date, gueltig_bis date, cacheapplet char(255), cachexml char(255), aktiv smallint);
-</dbi:dbaction>
-<dbi:dbaction dbi:action="sqlexec">eduetl:CREATE TABLE tmp_man_catalogue (tid integer NOT NULL, id character varying(100) NOT NULL, shortname character varying(255), name character varying(255), description text, timeunit character varying(3), decimalplaces smallint, sqlchunk text, linksub text, linktimeline text, restrictedgroupids character(255), ismanual smallint, requiredfields character varying(255), calcratio smallint, gueltig_von date, gueltig_bis date, cleanup text, preparation text, techdetails text, moreinfo text, attrib1 integer DEFAULT 0 NOT NULL, fld_semester character varying(255), fld_jahr character varying(255), fld_studiengang character varying(255), fld_institut character varying(255), fld_geschlecht character varying(255), fromclause character varying(255), whereclause text, aggrfunction character varying(255), cacheing integer DEFAULT 0 NOT NULL, linktable character varying(255), linkmask character varying(255));
-</dbi:dbaction>
-<dbi:dbaction dbi:action="sqlexec">eduetl:CREATE TABLE tmp_man_catalogue_rpt (tid integer, report_id varchar(40), catalogue_id varchar(100), description text, sortnr integer, sortnr2 integer, grouping1 char(40), grouping2 char(40), valid_from date, valid_till date, active smallint);
-</dbi:dbaction>
-<dbi:dbaction dbi:action="sqlexec">eduetl:CREATE TABLE tmp_man_zahl_wert (tid integer, hs_nr integer, kenn_zahl char(40), jahr smallint, sem smallint, ch110_institut char(10), stugkey char(20), stg char(10), bund_fachgebiet char(10), wert numeric(14,2), geschlecht smallint, abschluss char(10), kz_fach char(10) );
-</dbi:dbaction>
-<dbi:dbaction dbi:action="sqlexec">eduetl:CREATE TABLE tmp_kenn_zahl_wert (tid integer, hs_nr integer, kenn_zahl char(40), jahr smallint, sem smallint, ch110_institut char(10), stugkey char(20), bund_fachgebiet char(10), wert numeric(14,2), titel char(10), wert_str varchar(255), geschlecht SMALLINT , ca12_staat SMALLINT);
-</dbi:dbaction>
-<!--ETL-Step Action Nr. 2/home/superx/git/superx/superx/WEB-INF/conf/edustore/db/conf/../install: -->
-<dbi:dbaction dbi:action="sqlexec">eduetl:delete from tmp_hochschulinfo;
-</dbi:dbaction>
-<dbi:dbaction dbi:action="sqlexec">eduetl:delete from tmp_userinfo;
-</dbi:dbaction>
-<dbi:dbaction dbi:action="sqlexec">eduetl:delete from tmp_user_group_bez;
-</dbi:dbaction>
-<dbi:dbaction dbi:action="sqlexec">eduetl:delete from tmp_user_institution;
-</dbi:dbaction>
-<dbi:dbaction dbi:action="sqlexec">eduetl:delete from tmp_user_masken_bez;
-</dbi:dbaction>
-<dbi:dbaction dbi:action="sqlexec">eduetl:delete from tmp_user_pw;
-</dbi:dbaction>
-<dbi:dbaction dbi:action="sqlexec">eduetl:delete from tmp_user_sachgeb_bez;
-</dbi:dbaction>
-<dbi:dbaction dbi:action="sqlexec">eduetl:delete from tmp_user_sichtarten;
-</dbi:dbaction>
-<dbi:dbaction dbi:action="sqlexec">eduetl:delete from tmp_user_sichten;
-</dbi:dbaction>
-<dbi:dbaction dbi:action="sqlexec">eduetl:delete from tmp_group_field_pref;
-</dbi:dbaction>
-<dbi:dbaction dbi:action="sqlexec">eduetl:delete from tmp_group_masken_bez;
-</dbi:dbaction>
-<dbi:dbaction dbi:action="sqlexec">eduetl:delete from tmp_group_sachgeb_bez;
-</dbi:dbaction>
-<dbi:dbaction dbi:action="sqlexec">eduetl:delete from tmp_group_sichtarten;
-</dbi:dbaction>
-<dbi:dbaction dbi:action="sqlexec">eduetl:delete from tmp_group_sichten;
-</dbi:dbaction>
-<dbi:dbaction dbi:action="sqlexec">eduetl:delete from tmp_groupinfo;
-</dbi:dbaction>
-<dbi:dbaction dbi:action="sqlexec">eduetl:delete from tmp_fin_user_kam;
-</dbi:dbaction>
-<dbi:dbaction dbi:action="sqlexec">eduetl:delete from tmp_konstanten;
-</dbi:dbaction>
-<dbi:dbaction dbi:action="sqlexec">eduetl:delete from tmp_unload_params;
-</dbi:dbaction>
-<dbi:dbaction dbi:action="sqlexec">eduetl:delete from tmp_sx_repository;
-</dbi:dbaction>
-<dbi:dbaction dbi:action="sqlexec">eduetl:delete from tmp_themenbaum;
-</dbi:dbaction>
-<dbi:dbaction dbi:action="sqlexec">eduetl:delete from tmp_maskeninfo;
-</dbi:dbaction>
-<dbi:dbaction dbi:action="sqlexec">eduetl:delete from tmp_felderinfo;
-</dbi:dbaction>
-<dbi:dbaction dbi:action="sqlexec">eduetl:delete from tmp_masken_felder_bez;
-</dbi:dbaction>
-<dbi:dbaction dbi:action="sqlexec">eduetl:delete from tmp_maske_system_bez;
-</dbi:dbaction>
-<dbi:dbaction dbi:action="sqlexec">eduetl:delete from tmp_sachgeb_maske_bez;
-</dbi:dbaction>
-<dbi:dbaction dbi:action="sqlexec">eduetl:delete from tmp_sx_stylesheets;
-</dbi:dbaction>
-<dbi:dbaction dbi:action="sqlexec">eduetl:delete from tmp_sx_mask_style;
-</dbi:dbaction>
-<dbi:dbaction dbi:action="sqlexec">eduetl:delete from tmp_stylesheet_field;
-</dbi:dbaction>
-<dbi:dbaction dbi:action="sqlexec">eduetl:delete from tmp_macro_masken_bez;
-</dbi:dbaction>
-<dbi:dbaction dbi:action="sqlexec">eduetl:delete from tmp_macro_feld_wert;
-</dbi:dbaction>
-<dbi:dbaction dbi:action="sqlexec">eduetl:delete from tmp_sx_captions;
-</dbi:dbaction>
-<dbi:dbaction dbi:action="sqlexec">eduetl:delete from tmp_sichten;
-</dbi:dbaction>
-<dbi:dbaction dbi:action="sqlexec">eduetl:delete from tmp_man_catalogue;
-</dbi:dbaction>
-<dbi:dbaction dbi:action="sqlexec">eduetl:delete from tmp_man_catalogue_rpt;
-</dbi:dbaction>
-<dbi:dbaction dbi:action="sqlexec">eduetl:delete from tmp_man_zahl_wert;
-</dbi:dbaction>
-<dbi:dbaction dbi:action="sqlexec">eduetl:delete from tmp_kenn_zahl_wert;
-</dbi:dbaction>
-<dbi:dbaction dbi:action="importFile">
-<dbi:data database="eduetl" table="tmp_hochschulinfo">
-<dbi:file encoding="UTF-8" separator="^" trailingSeparator="y" withNativeClient="y" firstLinedescription="n" structure="CSV" filename="$SUPERX_DIR/db/install/rohdaten/unl/hochschulinfo.unl"/>
-</dbi:data>
-</dbi:dbaction>
-<dbi:dbaction dbi:action="importFile">
-<dbi:data database="eduetl" table="tmp_userinfo">
-<dbi:file encoding="UTF-8" separator="^" trailingSeparator="y" withNativeClient="y" firstLinedescription="n" structure="CSV" filename="$SUPERX_DIR/db/install/rohdaten/unl/userinfo.unl"/>
-</dbi:data>
-</dbi:dbaction>
-<dbi:dbaction dbi:action="importFile">
-<dbi:data database="eduetl" table="tmp_user_group_bez">
-<dbi:file encoding="UTF-8" separator="^" trailingSeparator="y" withNativeClient="y" firstLinedescription="n" structure="CSV" filename="$SUPERX_DIR/db/install/rohdaten/unl/user_group_bez.unl"/>
-</dbi:data>
-</dbi:dbaction>
-<dbi:dbaction dbi:action="importFile">
-<dbi:data database="eduetl" table="tmp_user_institution">
-<dbi:file encoding="UTF-8" separator="^" trailingSeparator="y" withNativeClient="y" firstLinedescription="n" structure="CSV" filename="$SUPERX_DIR/db/install/rohdaten/unl/user_institution.unl"/>
-</dbi:data>
+<!--ETL-Step Action Nr. 2/home/superx/git/kern/superx/WEB-INF/conf/edustore/db/conf/../install: -->
+<dbi:dbaction dbi:action="sqlexec">eduetl:delete from kern_cifx_neu;
 </dbi:dbaction>
 <dbi:dbaction dbi:action="importFile">
-<dbi:data database="eduetl" table="tmp_user_masken_bez">
-<dbi:file encoding="UTF-8" separator="^" trailingSeparator="y" withNativeClient="y" firstLinedescription="n" structure="CSV" filename="$SUPERX_DIR/db/install/rohdaten/unl/user_masken_bez.unl"/>
+<dbi:data database="eduetl" table="kern_cifx_neu">
+<dbi:file encoding="UTF-8" separator="^" trailingSeparator="y" withNativeClient="n" firstLinedescription="n" structure="CSV" filename="$KERN_LOAD_PFAD/unl/cifx.unl"/>
 </dbi:data>
 </dbi:dbaction>
-<dbi:dbaction dbi:action="importFile">
-<dbi:data database="eduetl" table="tmp_user_pw">
-<dbi:file encoding="UTF-8" separator="^" trailingSeparator="y" withNativeClient="y" firstLinedescription="n" structure="CSV" filename="$SUPERX_DIR/db/install/rohdaten/unl/user_pw.unl"/>
-</dbi:data>
-</dbi:dbaction>
-<dbi:dbaction dbi:action="importFile">
-<dbi:data database="eduetl" table="tmp_user_sachgeb_bez">
-<dbi:file encoding="UTF-8" separator="^" trailingSeparator="y" withNativeClient="y" firstLinedescription="n" structure="CSV" filename="$SUPERX_DIR/db/install/rohdaten/unl/user_sachgeb_bez.unl"/>
-</dbi:data>
-</dbi:dbaction>
-<dbi:dbaction dbi:action="importFile">
-<dbi:data database="eduetl" table="tmp_user_sichtarten">
-<dbi:file encoding="UTF-8" separator="^" trailingSeparator="y" withNativeClient="y" firstLinedescription="n" structure="CSV" filename="$SUPERX_DIR/db/install/rohdaten/unl/user_sichtarten.unl"/>
-</dbi:data>
-</dbi:dbaction>
-<dbi:dbaction dbi:action="importFile">
-<dbi:data database="eduetl" table="tmp_user_sichten">
-<dbi:file encoding="UTF-8" separator="^" trailingSeparator="y" withNativeClient="y" firstLinedescription="n" structure="CSV" filename="$SUPERX_DIR/db/install/rohdaten/unl/user_sichten.unl"/>
-</dbi:data>
-</dbi:dbaction>
-<dbi:dbaction dbi:action="importFile">
-<dbi:data database="eduetl" table="tmp_group_field_pref">
-<dbi:file encoding="UTF-8" separator="^" trailingSeparator="y" withNativeClient="y" firstLinedescription="n" structure="CSV" filename="$SUPERX_DIR/db/install/rohdaten/unl/group_field_pref.unl"/>
-</dbi:data>
-</dbi:dbaction>
-<dbi:dbaction dbi:action="importFile">
-<dbi:data database="eduetl" table="tmp_group_masken_bez">
-<dbi:file encoding="UTF-8" separator="^" trailingSeparator="y" withNativeClient="y" firstLinedescription="n" structure="CSV" filename="$SUPERX_DIR/db/install/rohdaten/unl/group_masken_bez.unl"/>
-</dbi:data>
-</dbi:dbaction>
-<dbi:dbaction dbi:action="importFile">
-<dbi:data database="eduetl" table="tmp_group_sachgeb_bez">
-<dbi:file encoding="UTF-8" separator="^" trailingSeparator="y" withNativeClient="y" firstLinedescription="n" structure="CSV" filename="$SUPERX_DIR/db/install/rohdaten/unl/group_sachgeb_bez.unl"/>
-</dbi:data>
-</dbi:dbaction>
-<dbi:dbaction dbi:action="importFile">
-<dbi:data database="eduetl" table="tmp_group_sichtarten">
-<dbi:file encoding="UTF-8" separator="^" trailingSeparator="y" withNativeClient="y" firstLinedescription="n" structure="CSV" filename="$SUPERX_DIR/db/install/rohdaten/unl/group_sichtarten.unl"/>
-</dbi:data>
-</dbi:dbaction>
-<dbi:dbaction dbi:action="importFile">
-<dbi:data database="eduetl" table="tmp_group_sichten">
-<dbi:file encoding="UTF-8" separator="^" trailingSeparator="y" withNativeClient="y" firstLinedescription="n" structure="CSV" filename="$SUPERX_DIR/db/install/rohdaten/unl/group_sichten.unl"/>
-</dbi:data>
-</dbi:dbaction>
-<dbi:dbaction dbi:action="importFile">
-<dbi:data database="eduetl" table="tmp_groupinfo">
-<dbi:file encoding="UTF-8" separator="^" trailingSeparator="y" withNativeClient="y" firstLinedescription="n" structure="CSV" filename="$SUPERX_DIR/db/install/rohdaten/unl/groupinfo.unl"/>
-</dbi:data>
-</dbi:dbaction>
-<dbi:dbaction dbi:action="importFile">
-<dbi:data database="eduetl" table="tmp_fin_user_kam">
-<dbi:file encoding="UTF-8" separator="^" trailingSeparator="y" withNativeClient="y" firstLinedescription="n" structure="CSV" filename="$SUPERX_DIR/db/install/rohdaten/unl/fin_user_kam.unl"/>
-</dbi:data>
-</dbi:dbaction>
-<dbi:dbaction dbi:action="importFile">
-<dbi:data database="eduetl" table="tmp_konstanten">
-<dbi:file encoding="UTF-8" separator="^" trailingSeparator="y" withNativeClient="y" firstLinedescription="n" structure="CSV" filename="$SUPERX_DIR/db/install/rohdaten/unl/konstanten.unl"/>
-</dbi:data>
-</dbi:dbaction>
-<dbi:dbaction dbi:action="importFile">
-<dbi:data database="eduetl" table="tmp_unload_params">
-<dbi:file encoding="UTF-8" separator="^" trailingSeparator="y" withNativeClient="y" firstLinedescription="n" structure="CSV" filename="$SUPERX_DIR/db/install/rohdaten/unl/unload_params.unl"/>
-</dbi:data>
-</dbi:dbaction>
-<dbi:dbaction dbi:action="importFile">
-<dbi:data database="eduetl" table="tmp_sx_repository">
-<dbi:file encoding="UTF-8" separator="^" trailingSeparator="y" withNativeClient="y" firstLinedescription="n" structure="CSV" filename="$SUPERX_DIR/db/install/rohdaten/unl/sx_repository.unl"/>
-</dbi:data>
-</dbi:dbaction>
-<dbi:dbaction dbi:action="importFile">
-<dbi:data database="eduetl" table="tmp_themenbaum">
-<dbi:file encoding="UTF-8" separator="^" trailingSeparator="y" withNativeClient="y" firstLinedescription="n" structure="CSV" filename="$SUPERX_DIR/db/install/rohdaten/unl/themenbaum.unl"/>
-</dbi:data>
-</dbi:dbaction>
-<dbi:dbaction dbi:action="importFile">
-<dbi:data database="eduetl" table="tmp_maskeninfo">
-<dbi:file encoding="UTF-8" separator="^" trailingSeparator="y" withNativeClient="y" firstLinedescription="n" structure="CSV" filename="$SUPERX_DIR/db/install/rohdaten/unl/maskeninfo.unl"/>
-</dbi:data>
-</dbi:dbaction>
-<dbi:dbaction dbi:action="importFile">
-<dbi:data database="eduetl" table="tmp_felderinfo">
-<dbi:file encoding="UTF-8" separator="^" trailingSeparator="y" withNativeClient="y" firstLinedescription="n" structure="CSV" filename="$SUPERX_DIR/db/install/rohdaten/unl/felderinfo.unl"/>
-</dbi:data>
-</dbi:dbaction>
-<dbi:dbaction dbi:action="importFile">
-<dbi:data database="eduetl" table="tmp_masken_felder_bez">
-<dbi:file encoding="UTF-8" separator="^" trailingSeparator="y" withNativeClient="y" firstLinedescription="n" structure="CSV" filename="$SUPERX_DIR/db/install/rohdaten/unl/masken_felder_bez.unl"/>
-</dbi:data>
-</dbi:dbaction>
-<dbi:dbaction dbi:action="importFile">
-<dbi:data database="eduetl" table="tmp_maske_system_bez">
-<dbi:file encoding="UTF-8" separator="^" trailingSeparator="y" withNativeClient="y" firstLinedescription="n" structure="CSV" filename="$SUPERX_DIR/db/install/rohdaten/unl/maske_system_bez.unl"/>
-</dbi:data>
-</dbi:dbaction>
-<dbi:dbaction dbi:action="importFile">
-<dbi:data database="eduetl" table="tmp_sachgeb_maske_bez">
-<dbi:file encoding="UTF-8" separator="^" trailingSeparator="y" withNativeClient="y" firstLinedescription="n" structure="CSV" filename="$SUPERX_DIR/db/install/rohdaten/unl/sachgeb_maske_bez.unl"/>
-</dbi:data>
-</dbi:dbaction>
-<dbi:dbaction dbi:action="importFile">
-<dbi:data database="eduetl" table="tmp_sx_stylesheets">
-<dbi:file encoding="UTF-8" separator="^" trailingSeparator="y" withNativeClient="y" firstLinedescription="n" structure="CSV" filename="$SUPERX_DIR/db/install/rohdaten/unl/sx_stylesheets.unl"/>
-</dbi:data>
-</dbi:dbaction>
-<dbi:dbaction dbi:action="importFile">
-<dbi:data database="eduetl" table="tmp_sx_mask_style">
-<dbi:file encoding="UTF-8" separator="^" trailingSeparator="y" withNativeClient="y" firstLinedescription="n" structure="CSV" filename="$SUPERX_DIR/db/install/rohdaten/unl/sx_mask_style.unl"/>
-</dbi:data>
-</dbi:dbaction>
-<dbi:dbaction dbi:action="importFile">
-<dbi:data database="eduetl" table="tmp_stylesheet_field">
-<dbi:file encoding="UTF-8" separator="^" trailingSeparator="y" withNativeClient="y" firstLinedescription="n" structure="CSV" filename="$SUPERX_DIR/db/install/rohdaten/unl/stylesheet_field.unl"/>
-</dbi:data>
-</dbi:dbaction>
-<dbi:dbaction dbi:action="importFile">
-<dbi:data database="eduetl" table="tmp_macro_masken_bez">
-<dbi:file encoding="UTF-8" separator="^" trailingSeparator="y" withNativeClient="y" firstLinedescription="n" structure="CSV" filename="$SUPERX_DIR/db/install/rohdaten/unl/macro_masken_bez.unl"/>
-</dbi:data>
-</dbi:dbaction>
-<dbi:dbaction dbi:action="importFile">
-<dbi:data database="eduetl" table="tmp_macro_feld_wert">
-<dbi:file encoding="UTF-8" separator="^" trailingSeparator="y" withNativeClient="y" firstLinedescription="n" structure="CSV" filename="$SUPERX_DIR/db/install/rohdaten/unl/macro_feld_wert.unl"/>
-</dbi:data>
-</dbi:dbaction>
-<dbi:dbaction dbi:action="importFile">
-<dbi:data database="eduetl" table="tmp_sx_captions">
-<dbi:file encoding="UTF-8" separator="^" trailingSeparator="y" withNativeClient="y" firstLinedescription="n" structure="CSV" filename="$SUPERX_DIR/db/install/rohdaten/unl/sx_captions.unl"/>
-</dbi:data>
-</dbi:dbaction>
-<dbi:dbaction dbi:action="importFile">
-<dbi:data database="eduetl" table="tmp_sichten">
-<dbi:file encoding="UTF-8" separator="^" trailingSeparator="y" withNativeClient="y" firstLinedescription="n" structure="CSV" filename="$SUPERX_DIR/db/install/rohdaten/unl/sichten.unl"/>
-</dbi:data>
-</dbi:dbaction>
-<dbi:dbaction dbi:action="importFile">
-<dbi:data database="eduetl" table="tmp_man_catalogue">
-<dbi:file encoding="UTF-8" separator="^" trailingSeparator="y" withNativeClient="y" firstLinedescription="n" structure="CSV" filename="$SUPERX_DIR/db/install/rohdaten/unl/man_catalogue.unl"/>
-</dbi:data>
-</dbi:dbaction>
-<dbi:dbaction dbi:action="importFile">
-<dbi:data database="eduetl" table="tmp_man_catalogue_rpt">
-<dbi:file encoding="UTF-8" separator="^" trailingSeparator="y" withNativeClient="y" firstLinedescription="n" structure="CSV" filename="$SUPERX_DIR/db/install/rohdaten/unl/man_catalogue_rpt.unl"/>
-</dbi:data>
-</dbi:dbaction>
-<dbi:dbaction dbi:action="importFile">
-<dbi:data database="eduetl" table="tmp_man_zahl_wert">
-<dbi:file encoding="UTF-8" separator="^" trailingSeparator="y" withNativeClient="y" firstLinedescription="n" structure="CSV" filename="$SUPERX_DIR/db/install/rohdaten/unl/man_zahl_wert.unl"/>
-</dbi:data>
-</dbi:dbaction>
-<dbi:dbaction dbi:action="importFile">
-<dbi:data database="eduetl" table="tmp_kenn_zahl_wert">
-<dbi:file encoding="UTF-8" separator="^" trailingSeparator="y" withNativeClient="y" firstLinedescription="n" structure="CSV" filename="$SUPERX_DIR/db/install/rohdaten/unl/kenn_zahl_wert.unl"/>
-</dbi:data>
-</dbi:dbaction>
-<!--ETL-Step Action Nr. 3/home/superx/git/superx/superx/WEB-INF/conf/edustore/db/conf/../install: -->
-<dbi:dbaction dbi:action="executeFile">
-<dbi:file database="eduetl" encoding="UTF-8" withNativeClient="n" structure="SQL" filename="$SUPERX_DIR/db/install/schluesseltabellen/trans_tables.sql"/>
-</dbi:dbaction>
 <dbi:dbaction dbi:action="executeFile">
 <dbi:file database="eduetl" encoding="UTF-8" withNativeClient="n" structure="SQL" filename="$SUPERX_DIR/db/install/kern_load_custom.sql"/>
 </dbi:dbaction>

superx/WEB-INF/conf/edustore/db/install/conf/his1/edustore_update/edustore_kern_system_ids.xml

@@ -17,6 +17,12 @@ update systeminfo set datum=today()
 where 2007 > (select distinct year(datum) from tmp_datum)
 and name='Administration';
 
+</dbi:dbaction>
+<dbi:dbaction dbi:action="sqlexec">eduetl:insert into kern_pruefrout(datum,problem,aktion) select today(),'Datei superx.datum steht auf veraltetem Datum. Stellen Sie sicher, dass superx.datum auf den SuperX-Server kopiert wurde','Warnung'
+ from tmp_datum where year(datum) &lt; 2007
+ or datum is null;
+
+
 </dbi:dbaction>
 <dbi:dbaction dbi:action="sqlexec">eduetl:drop table tmp_datum;
 

superx/WEB-INF/conf/edustore/db/install/conf/his1/edustore_update/edustore_kern_trans_ids.xml

@@ -1,5 +1,16 @@
 <?xml version="1.0" encoding="UTF-8"?><dbi:dbactions dbi:want-result="true" dbi:autocommit="true" xmlns:dsd="http://www.his.de/Abt1/Interfaces/dsd_V1.0" xmlns:dbi="http://www.his.de/Abt1/Interfaces/dbi_V1.0">
-<!--Automatisch generiert von Edustore für mode=trans,database=eduetl und dbsystem=INFORMIX--><dbi:dbaction dbi:action="executeFile">
+<!--Automatisch generiert von Edustore für mode=trans,database=eduetl und dbsystem=INFORMIX--><!--ETL-Step Action Nr. 1: --><dbi:dbaction dbi:action="sqlexec">eduetl:truncate table kern_pruefrout;
+</dbi:dbaction>
+<dbi:dbaction dbi:action="executeFile">
+<dbi:file database="eduetl" encoding="UTF-8" withNativeClient="n" structure="SQL" filename="$SUPERX_DIR/db/install/schluesseltabellen/cifx_fuellen2.sql"/>
+</dbi:dbaction>
+<dbi:dbaction dbi:action="executeFile">
+<dbi:file database="eduetl" encoding="UTF-8" withNativeClient="n" structure="SQL" filename="$SUPERX_DIR/db/install/schluesseltabellen/trans_organigramm_kern.sql"/>
+</dbi:dbaction>
+<dbi:dbaction dbi:action="executeFile">
+<dbi:file database="eduetl" encoding="UTF-8" withNativeClient="n" structure="SQL" filename="$SUPERX_DIR/db/install/schluesseltabellen/orgunit_live_mapping_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/kern_trans_custom.sql"/>
 </dbi:dbaction>
 </dbi:dbactions>

superx/WEB-INF/conf/edustore/db/install/conf/his1/edustore_update/edustore_kern_unload_cob_ids.xml

@@ -0,0 +1,128 @@
+<?xml version="1.0" encoding="UTF-8"?><dbi:dbactions dbi:want-result="true" dbi:autocommit="true" xmlns:dsd="http://www.his.de/Abt1/Interfaces/dsd_V1.0" xmlns:dbi="http://www.his.de/Abt1/Interfaces/dbi_V1.0">
+<!--Automatisch generiert von Edustore für mode=unload,database=eduetl und dbsystem=INFORMIX--><!--Unload-Job Nr. 1 id=preparation1: --><!--Unload-Job Nr. 2 id=cifx: --><dbi:dbaction dbi:action="exportFile">
+<dbi:data sqlVarDatabase="eduetl" database="cob">
+<extraction-sql>--freemarker template
+&lt;sqlvars&gt;
+&lt;sqlvar name="VERSION"&gt;
+
+select param_val from unload_params where systeminfo_id=9 and param_id='VERSION';&lt;/sqlvar&gt;
+&lt;sqlvar name="UNLOAD_USERRIGHTS"&gt;
+
+select param_val from unload_params where systeminfo_id=9 and param_id='UNLOAD_USERRIGHTS';&lt;/sqlvar&gt;
+&lt;sqlvar name="UNLOAD_FIN_USER_KAM"&gt;
+
+select param_val from unload_params where systeminfo_id=9 and param_id='UNLOAD_FIN_USER_KAM';&lt;/sqlvar&gt;
+&lt;sqlvar name="UNLOAD_KONSTANTEN"&gt;
+
+select param_val from unload_params where systeminfo_id=9 and param_id='UNLOAD_KONSTANTEN';&lt;/sqlvar&gt;
+&lt;sqlvar name="UNLOAD_UNLOAD_PARAMS"&gt;
+
+select param_val from unload_params where systeminfo_id=9 and param_id='UNLOAD_UNLOAD_PARAMS';&lt;/sqlvar&gt;
+&lt;sqlvar name="UNLOAD_REPOSITORY"&gt;
+
+select param_val from unload_params where systeminfo_id=9 and param_id='UNLOAD_REPOSITORY';&lt;/sqlvar&gt;
+&lt;sqlvar name="UNLOAD_HOCHSCHULINFO"&gt;
+
+select param_val from unload_params where systeminfo_id=9 and param_id='UNLOAD_HOCHSCHULINFO';&lt;/sqlvar&gt;
+&lt;sqlvar name="UNLOAD_THEMENBAUM"&gt;
+
+select param_val from unload_params where systeminfo_id=9 and param_id='UNLOAD_THEMENBAUM';&lt;/sqlvar&gt;
+&lt;sqlvar name="UNLOAD_MASKEN"&gt;
+
+select param_val from unload_params where systeminfo_id=9 and param_id='UNLOAD_MASKEN';&lt;/sqlvar&gt;
+&lt;sqlvar name="UNLOAD_STYLESHEETS"&gt;
+
+select param_val from unload_params where systeminfo_id=9 and param_id='UNLOAD_STYLESHEETS';&lt;/sqlvar&gt;
+&lt;sqlvar name="UNLOAD_MAKROS"&gt;
+
+select param_val from unload_params where systeminfo_id=9 and param_id='UNLOAD_MAKROS';&lt;/sqlvar&gt;
+&lt;sqlvar name="UNLOAD_CAPTIONS"&gt;
+
+select param_val from unload_params where systeminfo_id=9 and param_id='UNLOAD_CAPTIONS';&lt;/sqlvar&gt;
+&lt;sqlvar name="UNLOAD_SICHTEN"&gt;
+
+select param_val from unload_params where systeminfo_id=9 and param_id='UNLOAD_SICHTEN';&lt;/sqlvar&gt;
+&lt;sqlvar name="UNLOAD_MAN_CATALOGUE"&gt;
+
+select param_val from unload_params where systeminfo_id=9 and param_id='UNLOAD_MAN_CATALOGUE';&lt;/sqlvar&gt;
+&lt;sqlvar name="UNLOAD_MAN_ZAHL_WERT"&gt;
+
+select param_val from unload_params where systeminfo_id=9 and param_id='UNLOAD_MAN_ZAHL_WERT';&lt;/sqlvar&gt;
+&lt;sqlvar name="UNLOAD_KENN_ZAHL_WERT"&gt;
+
+select param_val from unload_params where systeminfo_id=9 and param_id='UNLOAD_KENN_ZAHL_WERT';&lt;/sqlvar&gt;
+&lt;sqlvar name="COB_VONBIS_INST"&gt;
+
+select param_val from unload_params where systeminfo_id=9 and param_id='COB_VONBIS_INST';&lt;/sqlvar&gt;
+&lt;sqlvar name="COB_REL_INST"&gt;
+
+select param_val from unload_params where systeminfo_id=9 and param_id='COB_REL_INST';&lt;/sqlvar&gt;
+&lt;sqlvar name="JDBC_PARAM"&gt;
+
+select param_val from unload_params where systeminfo_id=9 and param_id='JDBC_PARAM';&lt;/sqlvar&gt;
+&lt;sqlvar name="SOURCESYSTEM"&gt;
+select param_val from unload_params where systeminfo_id=9 and param_id='SOURCESYSTEM';&lt;/sqlvar&gt;
+&lt;/sqlvars&gt;
+
+&lt;#if JDBC_PARAM?exists&gt;
+${JDBC_PARAM}
+&lt;/#if&gt;
+
+--Institut ohne Zeitbezug:
+select 110,--key
+0, --hs
+inst_nr,
+kname,
+dname,
+substring(lname1 from 1 for 100),
+land_institut, --astat
+uebinst_nr ,--parent
+inst_nr,--uniquename
+bund_fachgebiet,--bund_apnr
+null::date, --key_von,
+null::date, --key_bis,
+inst_nr ,--sourcesystem_id
+null::char(1),--hiskey_id
+orgstruktur::char(10), --struktur_c
+null::char(1), --lid,
+null::char(1) , --parent_lid
+null::integer as sortorder
+FROM inst
+where (
+('${COB_REL_INST}'='1' and cobrel='1')
+or ('${COB_REL_INST}'='2' and migrel='1')
+or '${COB_REL_INST}'='0')
+and '${COB_VONBIS_INST}'='0'
+union
+--Institut mit Zeitbezug
+select 110,--key
+0, --hs
+inst_nr,
+kname,
+dname,
+substring(lname1 from 1 for 100),
+land_institut, --astat
+uebinst_nr ,--parent
+inst_nr,--uniquename
+bund_fachgebiet,--bund_apnr
+key_von,
+key_bis,
+inst_nr ,--sourcesystem_id
+null::char(1),--hiskey_id
+orgstruktur::char(10), --struktur_c
+null::char(1), --lid,
+null::char(1) , --parent_lid
+null::integer as sortorder
+FROM inst
+where(
+('${COB_REL_INST}'='1' and cobrel='1')
+or ('${COB_REL_INST}'='2' and migrel='1')
+or '${COB_REL_INST}'='0')
+and '${COB_VONBIS_INST}'='1'
+     
+	</extraction-sql>
+<dbi:file encoding="UTF-8" separator="^" trailingSeparator="y" withNativeClient="y" firstLinedescription="n" structure="CSV" filename="$KERN_LOAD_PFAD/unl/cifx.unl"/>
+</dbi:data>
+</dbi:dbaction>
+<!--Unload-Job Nr. 3 id=finalize1: -->
+</dbi:dbactions>

superx/WEB-INF/conf/edustore/db/install/conf/his1/edustore_update/edustore_kern_unload_hisinone_ids.xml

@@ -0,0 +1,412 @@
+<?xml version="1.0" encoding="UTF-8"?><dbi:dbactions dbi:want-result="true" dbi:autocommit="true" xmlns:dsd="http://www.his.de/Abt1/Interfaces/dsd_V1.0" xmlns:dbi="http://www.his.de/Abt1/Interfaces/dbi_V1.0">
+<!--Automatisch generiert von Edustore für mode=unload,database=eduetl und dbsystem=INFORMIX--><!--Unload-Job Nr. 1 id=preparation1: --><dbi:dbaction dbi:action="exportFile">
+<dbi:data sqlVarDatabase="eduetl" database="hisinone">
+<extraction-sql>--freemarker template
+&lt;sqlvars&gt;
+&lt;sqlvar name="VERSION"&gt;
+
+select param_val from unload_params where systeminfo_id=9 and param_id='VERSION';&lt;/sqlvar&gt;
+&lt;sqlvar name="UNLOAD_USERRIGHTS"&gt;
+
+select param_val from unload_params where systeminfo_id=9 and param_id='UNLOAD_USERRIGHTS';&lt;/sqlvar&gt;
+&lt;sqlvar name="UNLOAD_FIN_USER_KAM"&gt;
+
+select param_val from unload_params where systeminfo_id=9 and param_id='UNLOAD_FIN_USER_KAM';&lt;/sqlvar&gt;
+&lt;sqlvar name="UNLOAD_KONSTANTEN"&gt;
+
+select param_val from unload_params where systeminfo_id=9 and param_id='UNLOAD_KONSTANTEN';&lt;/sqlvar&gt;
+&lt;sqlvar name="UNLOAD_UNLOAD_PARAMS"&gt;
+
+select param_val from unload_params where systeminfo_id=9 and param_id='UNLOAD_UNLOAD_PARAMS';&lt;/sqlvar&gt;
+&lt;sqlvar name="UNLOAD_REPOSITORY"&gt;
+
+select param_val from unload_params where systeminfo_id=9 and param_id='UNLOAD_REPOSITORY';&lt;/sqlvar&gt;
+&lt;sqlvar name="UNLOAD_HOCHSCHULINFO"&gt;
+
+select param_val from unload_params where systeminfo_id=9 and param_id='UNLOAD_HOCHSCHULINFO';&lt;/sqlvar&gt;
+&lt;sqlvar name="UNLOAD_THEMENBAUM"&gt;
+
+select param_val from unload_params where systeminfo_id=9 and param_id='UNLOAD_THEMENBAUM';&lt;/sqlvar&gt;
+&lt;sqlvar name="UNLOAD_MASKEN"&gt;
+
+select param_val from unload_params where systeminfo_id=9 and param_id='UNLOAD_MASKEN';&lt;/sqlvar&gt;
+&lt;sqlvar name="UNLOAD_STYLESHEETS"&gt;
+
+select param_val from unload_params where systeminfo_id=9 and param_id='UNLOAD_STYLESHEETS';&lt;/sqlvar&gt;
+&lt;sqlvar name="UNLOAD_MAKROS"&gt;
+
+select param_val from unload_params where systeminfo_id=9 and param_id='UNLOAD_MAKROS';&lt;/sqlvar&gt;
+&lt;sqlvar name="UNLOAD_CAPTIONS"&gt;
+
+select param_val from unload_params where systeminfo_id=9 and param_id='UNLOAD_CAPTIONS';&lt;/sqlvar&gt;
+&lt;sqlvar name="UNLOAD_SICHTEN"&gt;
+
+select param_val from unload_params where systeminfo_id=9 and param_id='UNLOAD_SICHTEN';&lt;/sqlvar&gt;
+&lt;sqlvar name="UNLOAD_MAN_CATALOGUE"&gt;
+
+select param_val from unload_params where systeminfo_id=9 and param_id='UNLOAD_MAN_CATALOGUE';&lt;/sqlvar&gt;
+&lt;sqlvar name="UNLOAD_MAN_ZAHL_WERT"&gt;
+
+select param_val from unload_params where systeminfo_id=9 and param_id='UNLOAD_MAN_ZAHL_WERT';&lt;/sqlvar&gt;
+&lt;sqlvar name="UNLOAD_KENN_ZAHL_WERT"&gt;
+
+select param_val from unload_params where systeminfo_id=9 and param_id='UNLOAD_KENN_ZAHL_WERT';&lt;/sqlvar&gt;
+&lt;sqlvar name="COB_VONBIS_INST"&gt;
+
+select param_val from unload_params where systeminfo_id=9 and param_id='COB_VONBIS_INST';&lt;/sqlvar&gt;
+&lt;sqlvar name="COB_REL_INST"&gt;
+
+select param_val from unload_params where systeminfo_id=9 and param_id='COB_REL_INST';&lt;/sqlvar&gt;
+&lt;sqlvar name="JDBC_PARAM"&gt;
+
+select param_val from unload_params where systeminfo_id=9 and param_id='JDBC_PARAM';&lt;/sqlvar&gt;
+&lt;sqlvar name="SOURCESYSTEM"&gt;
+select param_val from unload_params where systeminfo_id=9 and param_id='SOURCESYSTEM';&lt;/sqlvar&gt;
+&lt;/sqlvars&gt;
+
+&lt;#if JDBC_PARAM?exists&gt;
+${JDBC_PARAM}
+&lt;/#if&gt;
+
+
+
+    DROP TABLE IF EXISTS tmp_orgunit;
+
+	CREATE TABLE tmp_orgunit (
+    id integer NOT NULL,
+    lid integer NOT NULL,
+    k_orgunittype_id integer,
+    valid_from date,
+    valid_to date,
+    astat character varying,
+    companynumber character varying,
+    description text,
+    shorttext character varying,
+    defaulttext character varying NOT NULL,
+    longtext character varying,
+    sortorder integer,
+    k_language_id integer NOT NULL,
+    parent_lid integer,
+    uniquename character varying,
+    obj_guid character varying,
+    lock_version integer,
+    parent_id integer,
+    cost_center_id integer,
+    subject_area_k_subject_area_id integer,
+    k_astat_orgunit_category_id integer
+);
+insert into tmp_orgunit(id,
+       lid,
+       k_orgunittype_id,
+       valid_from,
+       valid_to,
+       astat,
+       companynumber,
+       description,
+       shorttext,
+       defaulttext,
+       longtext,
+       sortorder,
+       k_language_id,
+       parent_lid,
+       uniquename,
+       subject_area_k_subject_area_id ,
+    k_astat_orgunit_category_id ,
+       obj_guid,
+       lock_version
+       )
+       select
+        o.id,
+       o.lid,
+       o.k_orgunittype_id,
+       o.valid_from,
+       o.valid_to,
+       o.astat,
+       o.companynumber,
+       o.description,
+       o.shorttext,
+       o.defaulttext,
+       o.longtext,
+       o.sortorder,
+       o.k_language_id,
+       o.parent_lid,
+       o.uniquename,
+       osa.k_subject_area_id ,
+       o.k_astat_orgunit_category_id ,
+       o.obj_guid,
+       o.lock_version
+       from orgunit o left join orgunit_subject_area osa
+       on o.lid = osa.orgunit_lid;
+
+update tmp_orgunit set parent_id=(select min(O.id) from orgunit O
+where tmp_orgunit.parent_lid=O.lid
+   and (tmp_orgunit.valid_from &gt;=O.valid_from
+   or (tmp_orgunit.valid_from is null and O.valid_from is null))
+   and (tmp_orgunit.valid_to &lt;=O.valid_to
+   or (tmp_orgunit.valid_to is null and O.valid_to is null))
+   );
+update tmp_orgunit set cost_center_id=(select min(C.id) from cost_center C
+where tmp_orgunit.lid=C.orgunit_lid);
+
+
+
+
+
+</extraction-sql>
+<dbi:file encoding="UTF-8" separator="^" trailingSeparator="y" withNativeClient="y" firstLinedescription="n" structure="CSV" filename=""/>
+</dbi:data>
+</dbi:dbaction>
+<!--Unload-Job Nr. 2 id=cifx: -->
+<dbi:dbaction dbi:action="exportFile">
+<dbi:data sqlVarDatabase="eduetl" database="hisinone">
+<extraction-sql>--freemarker template
+&lt;sqlvars&gt;
+&lt;sqlvar name="VERSION"&gt;
+
+select param_val from unload_params where systeminfo_id=9 and param_id='VERSION';&lt;/sqlvar&gt;
+&lt;sqlvar name="UNLOAD_USERRIGHTS"&gt;
+
+select param_val from unload_params where systeminfo_id=9 and param_id='UNLOAD_USERRIGHTS';&lt;/sqlvar&gt;
+&lt;sqlvar name="UNLOAD_FIN_USER_KAM"&gt;
+
+select param_val from unload_params where systeminfo_id=9 and param_id='UNLOAD_FIN_USER_KAM';&lt;/sqlvar&gt;
+&lt;sqlvar name="UNLOAD_KONSTANTEN"&gt;
+
+select param_val from unload_params where systeminfo_id=9 and param_id='UNLOAD_KONSTANTEN';&lt;/sqlvar&gt;
+&lt;sqlvar name="UNLOAD_UNLOAD_PARAMS"&gt;
+
+select param_val from unload_params where systeminfo_id=9 and param_id='UNLOAD_UNLOAD_PARAMS';&lt;/sqlvar&gt;
+&lt;sqlvar name="UNLOAD_REPOSITORY"&gt;
+
+select param_val from unload_params where systeminfo_id=9 and param_id='UNLOAD_REPOSITORY';&lt;/sqlvar&gt;
+&lt;sqlvar name="UNLOAD_HOCHSCHULINFO"&gt;
+
+select param_val from unload_params where systeminfo_id=9 and param_id='UNLOAD_HOCHSCHULINFO';&lt;/sqlvar&gt;
+&lt;sqlvar name="UNLOAD_THEMENBAUM"&gt;
+
+select param_val from unload_params where systeminfo_id=9 and param_id='UNLOAD_THEMENBAUM';&lt;/sqlvar&gt;
+&lt;sqlvar name="UNLOAD_MASKEN"&gt;
+
+select param_val from unload_params where systeminfo_id=9 and param_id='UNLOAD_MASKEN';&lt;/sqlvar&gt;
+&lt;sqlvar name="UNLOAD_STYLESHEETS"&gt;
+
+select param_val from unload_params where systeminfo_id=9 and param_id='UNLOAD_STYLESHEETS';&lt;/sqlvar&gt;
+&lt;sqlvar name="UNLOAD_MAKROS"&gt;
+
+select param_val from unload_params where systeminfo_id=9 and param_id='UNLOAD_MAKROS';&lt;/sqlvar&gt;
+&lt;sqlvar name="UNLOAD_CAPTIONS"&gt;
+
+select param_val from unload_params where systeminfo_id=9 and param_id='UNLOAD_CAPTIONS';&lt;/sqlvar&gt;
+&lt;sqlvar name="UNLOAD_SICHTEN"&gt;
+
+select param_val from unload_params where systeminfo_id=9 and param_id='UNLOAD_SICHTEN';&lt;/sqlvar&gt;
+&lt;sqlvar name="UNLOAD_MAN_CATALOGUE"&gt;
+
+select param_val from unload_params where systeminfo_id=9 and param_id='UNLOAD_MAN_CATALOGUE';&lt;/sqlvar&gt;
+&lt;sqlvar name="UNLOAD_MAN_ZAHL_WERT"&gt;
+
+select param_val from unload_params where systeminfo_id=9 and param_id='UNLOAD_MAN_ZAHL_WERT';&lt;/sqlvar&gt;
+&lt;sqlvar name="UNLOAD_KENN_ZAHL_WERT"&gt;
+
+select param_val from unload_params where systeminfo_id=9 and param_id='UNLOAD_KENN_ZAHL_WERT';&lt;/sqlvar&gt;
+&lt;sqlvar name="COB_VONBIS_INST"&gt;
+
+select param_val from unload_params where systeminfo_id=9 and param_id='COB_VONBIS_INST';&lt;/sqlvar&gt;
+&lt;sqlvar name="COB_REL_INST"&gt;
+
+select param_val from unload_params where systeminfo_id=9 and param_id='COB_REL_INST';&lt;/sqlvar&gt;
+&lt;sqlvar name="JDBC_PARAM"&gt;
+
+select param_val from unload_params where systeminfo_id=9 and param_id='JDBC_PARAM';&lt;/sqlvar&gt;
+&lt;sqlvar name="SOURCESYSTEM"&gt;
+select param_val from unload_params where systeminfo_id=9 and param_id='SOURCESYSTEM';&lt;/sqlvar&gt;
+&lt;/sqlvars&gt;
+
+&lt;#if JDBC_PARAM?exists&gt;
+${JDBC_PARAM}
+&lt;/#if&gt;
+
+--Merkmal Institution: zuerst FBs, dann LE, dann Institut,dann alle anderen
+--Fachbereiche
+SELECT
+ 110 ,
+ 0,--hs
+   '' || O.id,
+   substring(O.shorttext from 1 for 10),
+   substring(O.defaulttext from 1 for 100),
+   substring(O.longtext from 1 for 150),
+substring(O.astat from 1 for 10),
+O.parent_id,
+replace(O.uniquename,',',''), --uniquename
+'' || O.subject_area_k_subject_area_id,--bund_apnr
+valid_from,
+valid_to,
+O.id, --sourcesystem_id
+'' || O.k_astat_orgunit_category_id,--hiskey_id
+20::char(5), --orgstruktur , struktur_c
+lid::char(255),
+parent_lid::char(255),
+null::integer as sortorder
+FROM k_orgunittype T,tmp_orgunit O
+   where
+   O.k_orgunittype_id=T.id
+   and T.hiskey_id=4 --Fachbereich
+   union
+   --Lehreinheiten
+SELECT
+ 110 ,
+ 0,--hs
+   '' || O.id,
+   substring(O.shorttext from 1 for 10),
+   substring(O.defaulttext from 1 for 100),
+   substring(O.longtext from 1 for 150),
+substring(O.astat from 1 for 10),
+O.parent_id,
+replace(O.uniquename,',',''), --uniquename
+'' || O.subject_area_k_subject_area_id,--bund_apnr
+valid_from,
+valid_to,
+O.id, --sourcesystem_id
+'' || O.k_astat_orgunit_category_id,--hiskey_id
+30::char(5), --orgstruktur , struktur_c
+lid::char(255),
+parent_lid::char(255),
+null::integer as sortorder
+   FROM k_orgunittype T,tmp_orgunit O
+   where
+   O.k_orgunittype_id=T.id
+
+   and T.hiskey_id=7 --Lehreinheit
+   union
+   --Institut
+SELECT
+ 110 ,
+ 0,--hs
+   '' || O.id,
+   substring(O.shorttext from 1 for 10),
+   substring(O.defaulttext from 1 for 100),
+   substring(O.longtext from 1 for 150),
+substring(O.astat from 1 for 10),
+O.parent_id,
+replace(O.uniquename,',',''), --uniquename
+'' || O.subject_area_k_subject_area_id,--bund_apnr
+valid_from,
+valid_to,
+O.id, --sourcesystem_id
+'' || O.k_astat_orgunit_category_id,--hiskey_id
+40::char(5), --orgstruktur , struktur_c
+lid::char(255),
+parent_lid::char(255),
+null::integer as sortorder
+   FROM k_orgunittype T,tmp_orgunit O
+   where
+   O.k_orgunittype_id=T.id
+   and T.hiskey_id=5 --Institut
+   union
+   --alle anderen Inst.-Typen
+SELECT
+
+ 110 ,
+ 0,--hs
+   '' || O.id,
+   substring(O.shorttext from 1 for 10),
+   substring(O.defaulttext from 1 for 100),
+   substring(O.longtext from 1 for 150),
+substring(O.astat from 1 for 10),
+O.parent_id,
+replace(O.uniquename,',','') , --uniquename
+'' || O.subject_area_k_subject_area_id,--bund_apnr
+valid_from,
+valid_to,
+O.id, --sourcesystem_id
+'' || O.k_astat_orgunit_category_id,--hiskey_id
+null::char(50), --orgstruktur , struktur_c
+lid::char(255),
+parent_lid::char(255),
+null::integer as sortorder
+    FROM tmp_orgunit O left outer join k_orgunittype T
+   on(O.k_orgunittype_id=T.id)
+   where (T.hiskey_id is null or T.hiskey_id not in (4,7,5)) --Fachbereich, LE, Inst.
+     
+	</extraction-sql>
+<dbi:file encoding="UTF-8" separator="^" trailingSeparator="y" withNativeClient="y" firstLinedescription="n" structure="CSV" filename="$KERN_LOAD_PFAD/unl/cifx.unl"/>
+</dbi:data>
+</dbi:dbaction>
+<!--Unload-Job Nr. 3 id=finalize1: -->
+<dbi:dbaction dbi:action="exportFile">
+<dbi:data sqlVarDatabase="eduetl" database="hisinone">
+<extraction-sql>--freemarker template
+&lt;sqlvars&gt;
+&lt;sqlvar name="VERSION"&gt;
+
+select param_val from unload_params where systeminfo_id=9 and param_id='VERSION';&lt;/sqlvar&gt;
+&lt;sqlvar name="UNLOAD_USERRIGHTS"&gt;
+
+select param_val from unload_params where systeminfo_id=9 and param_id='UNLOAD_USERRIGHTS';&lt;/sqlvar&gt;
+&lt;sqlvar name="UNLOAD_FIN_USER_KAM"&gt;
+
+select param_val from unload_params where systeminfo_id=9 and param_id='UNLOAD_FIN_USER_KAM';&lt;/sqlvar&gt;
+&lt;sqlvar name="UNLOAD_KONSTANTEN"&gt;
+
+select param_val from unload_params where systeminfo_id=9 and param_id='UNLOAD_KONSTANTEN';&lt;/sqlvar&gt;
+&lt;sqlvar name="UNLOAD_UNLOAD_PARAMS"&gt;
+
+select param_val from unload_params where systeminfo_id=9 and param_id='UNLOAD_UNLOAD_PARAMS';&lt;/sqlvar&gt;
+&lt;sqlvar name="UNLOAD_REPOSITORY"&gt;
+
+select param_val from unload_params where systeminfo_id=9 and param_id='UNLOAD_REPOSITORY';&lt;/sqlvar&gt;
+&lt;sqlvar name="UNLOAD_HOCHSCHULINFO"&gt;
+
+select param_val from unload_params where systeminfo_id=9 and param_id='UNLOAD_HOCHSCHULINFO';&lt;/sqlvar&gt;
+&lt;sqlvar name="UNLOAD_THEMENBAUM"&gt;
+
+select param_val from unload_params where systeminfo_id=9 and param_id='UNLOAD_THEMENBAUM';&lt;/sqlvar&gt;
+&lt;sqlvar name="UNLOAD_MASKEN"&gt;
+
+select param_val from unload_params where systeminfo_id=9 and param_id='UNLOAD_MASKEN';&lt;/sqlvar&gt;
+&lt;sqlvar name="UNLOAD_STYLESHEETS"&gt;
+
+select param_val from unload_params where systeminfo_id=9 and param_id='UNLOAD_STYLESHEETS';&lt;/sqlvar&gt;
+&lt;sqlvar name="UNLOAD_MAKROS"&gt;
+
+select param_val from unload_params where systeminfo_id=9 and param_id='UNLOAD_MAKROS';&lt;/sqlvar&gt;
+&lt;sqlvar name="UNLOAD_CAPTIONS"&gt;
+
+select param_val from unload_params where systeminfo_id=9 and param_id='UNLOAD_CAPTIONS';&lt;/sqlvar&gt;
+&lt;sqlvar name="UNLOAD_SICHTEN"&gt;
+
+select param_val from unload_params where systeminfo_id=9 and param_id='UNLOAD_SICHTEN';&lt;/sqlvar&gt;
+&lt;sqlvar name="UNLOAD_MAN_CATALOGUE"&gt;
+
+select param_val from unload_params where systeminfo_id=9 and param_id='UNLOAD_MAN_CATALOGUE';&lt;/sqlvar&gt;
+&lt;sqlvar name="UNLOAD_MAN_ZAHL_WERT"&gt;
+
+select param_val from unload_params where systeminfo_id=9 and param_id='UNLOAD_MAN_ZAHL_WERT';&lt;/sqlvar&gt;
+&lt;sqlvar name="UNLOAD_KENN_ZAHL_WERT"&gt;
+
+select param_val from unload_params where systeminfo_id=9 and param_id='UNLOAD_KENN_ZAHL_WERT';&lt;/sqlvar&gt;
+&lt;sqlvar name="COB_VONBIS_INST"&gt;
+
+select param_val from unload_params where systeminfo_id=9 and param_id='COB_VONBIS_INST';&lt;/sqlvar&gt;
+&lt;sqlvar name="COB_REL_INST"&gt;
+
+select param_val from unload_params where systeminfo_id=9 and param_id='COB_REL_INST';&lt;/sqlvar&gt;
+&lt;sqlvar name="JDBC_PARAM"&gt;
+
+select param_val from unload_params where systeminfo_id=9 and param_id='JDBC_PARAM';&lt;/sqlvar&gt;
+&lt;sqlvar name="SOURCESYSTEM"&gt;
+select param_val from unload_params where systeminfo_id=9 and param_id='SOURCESYSTEM';&lt;/sqlvar&gt;
+&lt;/sqlvars&gt;
+
+&lt;#if JDBC_PARAM?exists&gt;
+${JDBC_PARAM}
+&lt;/#if&gt;
+
+
+drop table tmp_orgunit;
+
+</extraction-sql>
+<dbi:file encoding="UTF-8" separator="^" trailingSeparator="y" withNativeClient="y" firstLinedescription="n" structure="CSV" filename=""/>
+</dbi:data>
+</dbi:dbaction>
+</dbi:dbactions>

superx/WEB-INF/conf/edustore/db/install/conf/his1/edustore_update/edustore_kern_unload_mbs_ids.xml

@@ -0,0 +1,95 @@
+<?xml version="1.0" encoding="UTF-8"?><dbi:dbactions dbi:want-result="true" dbi:autocommit="true" xmlns:dsd="http://www.his.de/Abt1/Interfaces/dsd_V1.0" xmlns:dbi="http://www.his.de/Abt1/Interfaces/dbi_V1.0">
+<!--Automatisch generiert von Edustore für mode=unload,database=eduetl und dbsystem=INFORMIX--><!--Unload-Job Nr. 1 id=preparation1: --><!--Unload-Job Nr. 2 id=cifx: --><dbi:dbaction dbi:action="exportFile">
+<dbi:data sqlVarDatabase="eduetl" database="mbs">
+<extraction-sql>--freemarker template
+&lt;sqlvars&gt;
+&lt;sqlvar name="VERSION"&gt;
+
+select param_val from unload_params where systeminfo_id=9 and param_id='VERSION';&lt;/sqlvar&gt;
+&lt;sqlvar name="UNLOAD_USERRIGHTS"&gt;
+
+select param_val from unload_params where systeminfo_id=9 and param_id='UNLOAD_USERRIGHTS';&lt;/sqlvar&gt;
+&lt;sqlvar name="UNLOAD_FIN_USER_KAM"&gt;
+
+select param_val from unload_params where systeminfo_id=9 and param_id='UNLOAD_FIN_USER_KAM';&lt;/sqlvar&gt;
+&lt;sqlvar name="UNLOAD_KONSTANTEN"&gt;
+
+select param_val from unload_params where systeminfo_id=9 and param_id='UNLOAD_KONSTANTEN';&lt;/sqlvar&gt;
+&lt;sqlvar name="UNLOAD_UNLOAD_PARAMS"&gt;
+
+select param_val from unload_params where systeminfo_id=9 and param_id='UNLOAD_UNLOAD_PARAMS';&lt;/sqlvar&gt;
+&lt;sqlvar name="UNLOAD_REPOSITORY"&gt;
+
+select param_val from unload_params where systeminfo_id=9 and param_id='UNLOAD_REPOSITORY';&lt;/sqlvar&gt;
+&lt;sqlvar name="UNLOAD_HOCHSCHULINFO"&gt;
+
+select param_val from unload_params where systeminfo_id=9 and param_id='UNLOAD_HOCHSCHULINFO';&lt;/sqlvar&gt;
+&lt;sqlvar name="UNLOAD_THEMENBAUM"&gt;
+
+select param_val from unload_params where systeminfo_id=9 and param_id='UNLOAD_THEMENBAUM';&lt;/sqlvar&gt;
+&lt;sqlvar name="UNLOAD_MASKEN"&gt;
+
+select param_val from unload_params where systeminfo_id=9 and param_id='UNLOAD_MASKEN';&lt;/sqlvar&gt;
+&lt;sqlvar name="UNLOAD_STYLESHEETS"&gt;
+
+select param_val from unload_params where systeminfo_id=9 and param_id='UNLOAD_STYLESHEETS';&lt;/sqlvar&gt;
+&lt;sqlvar name="UNLOAD_MAKROS"&gt;
+
+select param_val from unload_params where systeminfo_id=9 and param_id='UNLOAD_MAKROS';&lt;/sqlvar&gt;
+&lt;sqlvar name="UNLOAD_CAPTIONS"&gt;
+
+select param_val from unload_params where systeminfo_id=9 and param_id='UNLOAD_CAPTIONS';&lt;/sqlvar&gt;
+&lt;sqlvar name="UNLOAD_SICHTEN"&gt;
+
+select param_val from unload_params where systeminfo_id=9 and param_id='UNLOAD_SICHTEN';&lt;/sqlvar&gt;
+&lt;sqlvar name="UNLOAD_MAN_CATALOGUE"&gt;
+
+select param_val from unload_params where systeminfo_id=9 and param_id='UNLOAD_MAN_CATALOGUE';&lt;/sqlvar&gt;
+&lt;sqlvar name="UNLOAD_MAN_ZAHL_WERT"&gt;
+
+select param_val from unload_params where systeminfo_id=9 and param_id='UNLOAD_MAN_ZAHL_WERT';&lt;/sqlvar&gt;
+&lt;sqlvar name="UNLOAD_KENN_ZAHL_WERT"&gt;
+
+select param_val from unload_params where systeminfo_id=9 and param_id='UNLOAD_KENN_ZAHL_WERT';&lt;/sqlvar&gt;
+&lt;sqlvar name="COB_VONBIS_INST"&gt;
+
+select param_val from unload_params where systeminfo_id=9 and param_id='COB_VONBIS_INST';&lt;/sqlvar&gt;
+&lt;sqlvar name="COB_REL_INST"&gt;
+
+select param_val from unload_params where systeminfo_id=9 and param_id='COB_REL_INST';&lt;/sqlvar&gt;
+&lt;sqlvar name="JDBC_PARAM"&gt;
+
+select param_val from unload_params where systeminfo_id=9 and param_id='JDBC_PARAM';&lt;/sqlvar&gt;
+&lt;sqlvar name="SOURCESYSTEM"&gt;
+select param_val from unload_params where systeminfo_id=9 and param_id='SOURCESYSTEM';&lt;/sqlvar&gt;
+&lt;/sqlvars&gt;
+
+&lt;#if JDBC_PARAM?exists&gt;
+${JDBC_PARAM}
+&lt;/#if&gt;
+
+	SELECT  110 ,0,
+ inst_nr,
+kname,
+ dname,
+substring(lname1 from 1 for 100),
+null::char(1),  --land_institut, --astat
+uebinst_nr,
+inst_nr,--uniquename
+bund_fachgebiet,
+ key_von,
+ key_bis,
+inst_nr, --sourcesystem_id
+null::char(1),--hiskey_id
+orgstruktur::char(10), --struktur_c
+null::char(1), --lid,
+null::char(1) , --parent_lid
+null::integer as sortorder
+FROM inst
+where mbsrel='1' 
+	</extraction-sql>
+<dbi:file encoding="UTF-8" separator="^" trailingSeparator="y" withNativeClient="y" firstLinedescription="n" structure="CSV" filename="$KERN_LOAD_PFAD/unl/cifx.unl"/>
+</dbi:data>
+</dbi:dbaction>
+<!--Unload-Job Nr. 3 id=finalize1: -->
+</dbi:dbactions>

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

@@ -4338,7 +4338,7 @@ frontend<br>
 <th>Feldname</th><th>Feldtyp</th><th>Gr&ouml;&szlig;e</th><th>Default</th><th>Not Null</th><th>Beschreibung</th><th>Kommentar</th><th>Fremdschl&uuml;ssel</th>
 </tr>
 <tr>
-<td class="tabellenzeile">tid</td><td class="tabellenzeile">INTEGER</td><td class="tabellenzeile">4</td><td class="tabellenzeile"></td><td class="tabellenzeile">true</td><td class="tabellenzeile">Tupelidentifier</td><td class="tabellenzeile"></td><td class="tabellenzeile"></td>
+<td class="tabellenzeile">tid</td><td class="tabellenzeile">SERIAL</td><td class="tabellenzeile">4</td><td class="tabellenzeile"></td><td class="tabellenzeile">true</td><td class="tabellenzeile">Tupelidentifier</td><td class="tabellenzeile"></td><td class="tabellenzeile"></td>
 </tr>
 <tr>
 <td class="tabellenzeile">key_apnr</td><td class="tabellenzeile">CHAR</td><td class="tabellenzeile">10</td><td class="tabellenzeile"></td><td class="tabellenzeile">false</td><td class="tabellenzeile">Schl&uuml;ssel</td><td class="tabellenzeile"></td><td class="tabellenzeile"></td>
@@ -4349,10 +4349,10 @@ frontend<br>
 </td>
 </tr>
 <tr>
-<td class="tabellenzeile">drucktext</td><td class="tabellenzeile">CHAR</td><td class="tabellenzeile">50</td><td class="tabellenzeile"></td><td class="tabellenzeile">false</td><td class="tabellenzeile">Drucktext</td><td class="tabellenzeile"></td><td class="tabellenzeile"></td>
+<td class="tabellenzeile">drucktext</td><td class="tabellenzeile">VARCHAR</td><td class="tabellenzeile">255</td><td class="tabellenzeile"></td><td class="tabellenzeile">false</td><td class="tabellenzeile">Drucktext</td><td class="tabellenzeile"></td><td class="tabellenzeile"></td>
 </tr>
 <tr>
-<td class="tabellenzeile">name</td><td class="tabellenzeile">CHAR</td><td class="tabellenzeile">150</td><td class="tabellenzeile"></td><td class="tabellenzeile">false</td><td class="tabellenzeile">Name</td><td class="tabellenzeile"></td><td class="tabellenzeile"></td>
+<td class="tabellenzeile">name</td><td class="tabellenzeile">VARCHAR</td><td class="tabellenzeile">255</td><td class="tabellenzeile"></td><td class="tabellenzeile">false</td><td class="tabellenzeile">Name</td><td class="tabellenzeile"></td><td class="tabellenzeile"></td>
 </tr>
 <tr>
 <td class="tabellenzeile">ebene</td><td class="tabellenzeile">INTEGER</td><td class="tabellenzeile">4</td><td class="tabellenzeile"></td><td class="tabellenzeile">false</td><td class="tabellenzeile">Ebene im Baum</td><td class="tabellenzeile"></td><td class="tabellenzeile"></td>
@@ -4422,10 +4422,10 @@ gueltig_bis );
 <td class="tabellenzeile">parent</td><td class="tabellenzeile">CHAR</td><td class="tabellenzeile">10</td><td class="tabellenzeile"></td><td class="tabellenzeile">false</td><td class="tabellenzeile">&Uuml;bergeordneter Knoten im Baum</td><td class="tabellenzeile"></td><td class="tabellenzeile"></td>
 </tr>
 <tr>
-<td class="tabellenzeile">drucktext</td><td class="tabellenzeile">CHAR</td><td class="tabellenzeile">50</td><td class="tabellenzeile"></td><td class="tabellenzeile">false</td><td class="tabellenzeile">Drucktext</td><td class="tabellenzeile"></td><td class="tabellenzeile"></td>
+<td class="tabellenzeile">drucktext</td><td class="tabellenzeile">VARCHAR</td><td class="tabellenzeile">255</td><td class="tabellenzeile"></td><td class="tabellenzeile">false</td><td class="tabellenzeile">Drucktext</td><td class="tabellenzeile"></td><td class="tabellenzeile"></td>
 </tr>
 <tr>
-<td class="tabellenzeile">name</td><td class="tabellenzeile">CHAR</td><td class="tabellenzeile">150</td><td class="tabellenzeile"></td><td class="tabellenzeile">false</td><td class="tabellenzeile">Name</td><td class="tabellenzeile"></td><td class="tabellenzeile"></td>
+<td class="tabellenzeile">name</td><td class="tabellenzeile">VARCHAR</td><td class="tabellenzeile">255</td><td class="tabellenzeile"></td><td class="tabellenzeile">false</td><td class="tabellenzeile">Name</td><td class="tabellenzeile"></td><td class="tabellenzeile"></td>
 </tr>
 <tr>
 <td class="tabellenzeile">ebene</td><td class="tabellenzeile">INTEGER</td><td class="tabellenzeile">4</td><td class="tabellenzeile"></td><td class="tabellenzeile">false</td><td class="tabellenzeile">Ebene im Baum</td><td class="tabellenzeile"></td><td class="tabellenzeile"></td>

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

@@ -1946,15 +1946,15 @@
 		<table name="organigramm" version="2.0" thema="Administration"
 			typ="Schlüsseltabelle" releaseUnload="demo">
 			<columns>
-				<column name="tid" type="INTEGER" size="4" default=""
+				<column name="tid" type="SERIAL" size="4" default=""
 					notnull="true" isKey="true" description="Tupelidentifier" />
 				<column name="key_apnr" type="CHAR" size="10" default=""
 					notnull="false" description="Schlüssel" />
 				<column name="parent" type="CHAR" size="10" default=""
 					notnull="false" description="Übergeordneter Knoten im Baum" />
-				<column name="drucktext" type="CHAR" size="50" default=""
+				<column name="drucktext" type="VARCHAR" size="255" default=""
 					notnull="false" description="Drucktext" />
-				<column name="name" type="CHAR" size="150" default=""
+				<column name="name" type="VARCHAR" size="255" default=""
 					notnull="false" description="Name" />
 				<column name="ebene" type="INTEGER" size="4" default=""
 					notnull="false" description="Ebene im Baum" />
@@ -2023,9 +2023,9 @@
 					notnull="false" description="Schlüssel" />
 				<column name="parent" type="CHAR" size="10" default=""
 					notnull="false" description="Übergeordneter Knoten im Baum" />
-				<column name="drucktext" type="CHAR" size="50" default=""
+				<column name="drucktext" type="VARCHAR" size="255" default=""
 					notnull="false" description="Drucktext" />
-				<column name="name" type="CHAR" size="150" default=""
+				<column name="name" type="VARCHAR" size="255" default=""
 					notnull="false" description="Name" />
 				<column name="ebene" type="INTEGER" size="4" default=""
 					notnull="false" description="Ebene im Baum" />
@@ -10657,23 +10657,25 @@ mode="full">
  gotoHt=""
  helpfile=""
 maxRows="1"
-mode="full">
+mode="full"
+javascriptFieldsArray="true">
 <description>In diesem Formular können Sie Organisationseinheiten verwalten.</description>
 <filters>
 <filter mandatory="false" type="contains">name</filter>
 <filter mandatory="false" type="equals">tid</filter>
 </filters>
 <field-selection complete="false"/>
- <customfield name="tid"  type="include" path="/edit/kern/organigramm_tid.inc"/>
+ <customfield name="tid"/>
  <customfield name="key_apnr"   nullFieldValue="" visibleSize="40" />
-<customfield name="parent"   nullFieldValue=""  visibleSize="40"/>
-<customfield name="drucktext"   nullFieldValue=""  visibleSize="200"/>
-<customfield name="name"   nullFieldValue=""  visibleSize="200"/>
-<customfield name="ebene"   nullFieldValue=""  visibleSize="20"/>
-<customfield name="lehre"   nullFieldValue=""  visibleSize="20"/>
-<customfield name="gueltig_seit"   nullFieldValue=""  visibleSize="100"/>
+<!--<customfield name="parent"   nullFieldValue=""  visibleSize="40"/>-->
+<customfield name="parent" type="include" path="/edit/kern/organigramm_edit_parent.inc"/>
+<customfield name="drucktext"   nullFieldValue=""  visibleSize="30"/>
+<customfield name="name"   nullFieldValue=""  visibleSize="50"/>
+<customfield name="ebene"   nullFieldValue=""  visibleSize="10"/>
+<customfield name="lehre"   nullFieldValue=""  visibleSize="10"/>
+<customfield name="gueltig_seit"   nullFieldValue=""  visibleSize="10"/>
 <customfield name="gueltig_bis"   nullFieldValue=""  visibleSize="10"/>
-<customfield name="orgstruktur"   nullFieldValue=""  visibleSize="20"/>
+<customfield name="orgstruktur"   nullFieldValue=""  visibleSize="10"/>
 <customfield name="lid"   nullFieldValue=""  visibleSize="40"/>
 <customfield name="parent_lid"   nullFieldValue=""  visibleSize="40"/>
 <customfield name="uniquename"   nullFieldValue=""  visibleSize="40"/>

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

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?><module xmlns:dbi="http://www.his.de/Abt1/Interfaces/dbi_V1.0">
 <database>
-<!--Automatisch generiert von Edustore für database=eduetl und dbsystem=POSTGRES 
+<!--Automatisch generiert von Edustore für database=eduetl und dbsystem=INFORMIX 
 Sie können diese Tabellen als Vorlage für Ladetabellen in EDUDATA benutzen--></database>
 </module>

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

@@ -101,6 +101,12 @@ DOQUERY "grant $RIGHT on nachricht to $GRANTEE;"
 DOQUERY "grant $RIGHT on menu_element to $GRANTEE;"
 DOQUERY "grant $RIGHT on dbconnections to $GRANTEE;"
 DOQUERY "grant $RIGHT on organigramm to $GRANTEE;"
+
+if [ "$DATABASE" == "POSTGRES" -a "$RIGHT" != "select" ]
+	then
+DOQUERY "grant  update on organigramm_tid_seq to $GRANTEE;"
+fi
+
 DOQUERY "grant $RIGHT on organigramm_bak to $GRANTEE;"
 DOQUERY "grant $RIGHT on user_institution to $GRANTEE;"
 DOQUERY "grant $RIGHT on kostentraeger to $GRANTEE;"

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

@@ -101,6 +101,12 @@ DOQUERY "revoke $RIGHT on nachricht from $GRANTEE;"
 DOQUERY "revoke $RIGHT on menu_element from $GRANTEE;"
 DOQUERY "revoke $RIGHT on dbconnections from $GRANTEE;"
 DOQUERY "revoke $RIGHT on organigramm from $GRANTEE;"
+
+if [ "$DATABASE" == "POSTGRES" -a "$RIGHT" != "select" ]
+	then
+DOQUERY "revoke  update on organigramm_tid_seq from $GRANTEE;"
+fi
+
 DOQUERY "revoke $RIGHT on organigramm_bak from $GRANTEE;"
 DOQUERY "revoke $RIGHT on user_institution from $GRANTEE;"
 DOQUERY "revoke $RIGHT on kostentraeger from $GRANTEE;"

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

@@ -10550,7 +10550,7 @@ values('organigramm',
 'tid',
 'Tupelidentifier',
 '',
-'INTEGER',
+'SERIAL',
 '4',
 1,
 1,
@@ -10622,8 +10622,8 @@ values('organigramm',
 'drucktext',
 'Drucktext',
 '',
-'CHAR',
-'50',
+'VARCHAR',
+'255',
 0,
 1,
 0,
@@ -10644,8 +10644,8 @@ values('organigramm',
 'name',
 'Name',
 '',
-'CHAR',
-'150',
+'VARCHAR',
+'255',
 0,
 1,
 0,
@@ -11002,8 +11002,8 @@ values('organigramm_bak',
 'drucktext',
 'Drucktext',
 '',
-'CHAR',
-'50',
+'VARCHAR',
+'255',
 0,
 1,
 0,
@@ -11024,8 +11024,8 @@ values('organigramm_bak',
 'name',
 'Name',
 '',
-'CHAR',
-'150',
+'VARCHAR',
+'255',
 0,
 1,
 0,

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

@@ -1,27 +1,14 @@
 -- XML-generiertes SQL-Script fuer dbaccess-- von module_drop.xsl
 
 
-! echo "Dropping views"
-! echo `date`
+select now(),'Dropping views'
+from xdummy;
 
-drop view user_groups;
-	drop view menu_element_fieldmode;
-	drop view menu_element_mandatory;
-	drop view menu_element_nature;
-	drop view menu_element_orgstructure;
-	drop view user_inst_org;
-	drop view hochschulen;
-	drop view dimension_view;
-	drop view fact_table;
-	drop view dim_staat;
-	drop view dim_stg;
-	drop view dim_abschluss;
-	drop view dim_kost;
-	drop view dim_kotr;
-	
+! DOSQL $SUPERX_DIR/db/install/conf/module_drop_views.sql
 
-! echo "Dropping functions"
-! echo `date`
+
+select now(),'Dropping functions'
+from xdummy;
 
 drop procedure sp_user_themen(integer, date, smallint);
 			drop procedure sp_user_orga(integer, date, smallint);
@@ -47,118 +34,141 @@ drop procedure sp_user_themen(integer, date, smallint);
 			drop function sp_get_dbform_right(char, integer);
 			drop procedure sp_set_organigramm_eb();
 			drop procedure sp_set_organigramm_lehr();
+			drop function trim_all_whitespace(varchar);
 			
 
-! echo "Dropping tables"
-! echo `date`
+select now(),'Dropping tables'
+from xdummy;
 
-drop table sichtart_rechttabelle;
-drop table group_field_pref;
-drop table stylesheet_field;
-drop table db_tabellen;
-drop table db_forms;
-drop table db_version;
-drop table aggregierung;
-drop table sichten;
-drop table lehr_orga_bez;
-drop table masken_felder_bez;
-drop table sachgebiete;
-drop table sachgeb_maske_bez;
-drop table sachgeb_dbform_bez;
-drop table user_masken_bez;
-drop table user_sachgeb_bez;
-drop table xdummy;
-drop table macro_masken_bez;
-drop table graphicformat;
-drop table macro_feld_wert;
-drop table groupinfo;
-drop table user_group_bez;
-drop table group_sachgeb_bez;
-drop table group_masken_bez;
-drop table aggre_bland;
-drop table cif;
-drop table cifx;
-drop table trans_cifx;
-drop table trans_cif;
-drop table felderinfo;
-drop table hochschulinfo;
-drop table maske_system_bez;
-drop table maskeninfo;
-drop table proto_funktion;
-drop table systeminfo;
-drop table user_einstellungen;
-drop table userinfo;
-drop table themenbaum;
-drop table themenbaum_bak;
-drop table nachricht;
-drop table menu_element;
-drop table dbconnections;
-drop table organigramm;
-drop table organigramm_bak;
-drop table user_institution;
-drop table kostentraeger;
-drop table user_kostentraeger;
-drop table kotr_to_inst;
-drop table protokoll;
-drop table trans_inst;
-drop table konstanten;
-drop table lehreinheit_inst;
-drop table sx_stylesheets;
-drop table sx_mask_style;
-drop table sx_captions;
-drop table fm_templates;
-drop table user_sichten;
-drop table user_sichtarten;
-drop table group_sichten;
-drop table group_sichtarten;
-drop table sachgeb_sichten;
-drop table sachgeb_sichtarten;
-drop table sx_repository;
-drop table user_pw;
-drop table sx_downloads;
-drop table download_group_bez;
-drop table download_user_bez;
-drop table download_keyw_bez;
-drop table sx_keywords;
-drop table user_startpage;
-drop table user_startfields;
-drop table user_dialog;
-drop table user_dialog_accept;
-drop table user_hinweis;
-drop table group_hinweis;
-drop table unload_params;
-drop table sx_tables;
-drop table sx_fields;
-drop table dimension_bp;
-drop table dimension;
-drop table dim_bp_apnr;
-drop table dim_bp_altsicht_apnr;
-drop table dim_closure;
-drop table mondrian_schema;
-drop table trans_dim_bp_apnr;
-drop table masken_protokoll;
-drop table masken_prot_feld;
-drop table data_upload;
-drop table update_prot;
-drop table update_prot_neu;
-drop table personattribute_neu;
-drop table personattribute;
-drop table personattributetype;
-drop table personattribute_value_list;
-drop table user_preset_values;
-drop table sx_portlet;
-drop table user_portlet_bez;
-drop table group_portlet_bez;
-drop table sieve;
-drop table sieve_column_def;
-drop table sieve_column;
-drop table sieve_field;
-drop table sx_jobs;
-drop table sx_mail;
+drop table sichtart_rechttabelle cascade;
+drop table group_field_pref cascade;
+drop table stylesheet_field cascade;
+drop table db_tabellen cascade;
+drop table db_forms cascade;
+drop table db_version cascade;
+drop table aggregierung cascade;
+drop table sichten cascade;
+drop table lehr_orga_bez cascade;
+drop table masken_felder_bez cascade;
+drop table sachgebiete cascade;
+drop table sachgeb_maske_bez cascade;
+drop table sachgeb_dbform_bez cascade;
+drop table user_masken_bez cascade;
+drop table user_sachgeb_bez cascade;
+drop table xdummy cascade;
+drop table macro_masken_bez cascade;
+drop table graphicformat cascade;
+drop table macro_feld_wert cascade;
+drop table groupinfo cascade;
+drop table user_group_bez cascade;
+drop table group_sachgeb_bez cascade;
+drop table group_masken_bez cascade;
+drop table aggre_bland cascade;
+drop table cif cascade;
+drop table cifx cascade;
+drop table trans_cifx cascade;
+drop table trans_cif cascade;
+drop table cifx_customize cascade;
+drop table felderinfo cascade;
+drop table hochschulinfo cascade;
+drop table maske_system_bez cascade;
+drop table maskeninfo cascade;
+drop table proto_funktion cascade;
+drop table systeminfo cascade;
+drop table user_einstellungen cascade;
+drop table userinfo cascade;
+drop table themenbaum cascade;
+drop table themenbaum_bak cascade;
+drop table nachricht cascade;
+drop table menu_element cascade;
+drop table dbconnections cascade;
+drop table organigramm cascade;
+drop table organigramm_bak cascade;
+drop table user_institution cascade;
+drop table kostentraeger cascade;
+drop table user_kostentraeger cascade;
+drop table kotr_to_inst cascade;
+drop table protokoll cascade;
+drop table trans_inst cascade;
+drop table konstanten cascade;
+drop table lehreinheit_inst cascade;
+drop table sx_stylesheets cascade;
+drop table sx_mask_style cascade;
+drop table sx_stylesheet_param cascade;
+drop table sx_captions cascade;
+drop table fm_templates cascade;
+drop table user_sichten cascade;
+drop table user_sichtarten cascade;
+drop table group_sichten cascade;
+drop table group_sichtarten cascade;
+drop table sachgeb_sichten cascade;
+drop table sachgeb_sichtarten cascade;
+drop table sx_repository cascade;
+drop table user_pw cascade;
+drop table sx_downloads cascade;
+drop table download_group_bez cascade;
+drop table download_user_bez cascade;
+drop table download_keyw_bez cascade;
+drop table sx_keywords cascade;
+drop table user_startpage cascade;
+drop table user_startfields cascade;
+drop table user_dialog cascade;
+drop table user_dialog_accept cascade;
+drop table user_hinweis cascade;
+drop table group_hinweis cascade;
+drop table unload_params cascade;
+drop table sx_tables cascade;
+drop table sx_fields cascade;
+drop table dimension_bp cascade;
+drop table dimension cascade;
+drop table dim_bp_apnr cascade;
+drop table dim_bp_altsicht_apnr cascade;
+drop table dim_closure cascade;
+drop table mondrian_schema cascade;
+drop table trans_dim_bp_apnr cascade;
+drop table masken_protokoll cascade;
+drop table masken_prot_feld cascade;
+drop table data_upload cascade;
+drop table update_prot cascade;
+drop table update_prot_neu cascade;
+drop table personattribute_neu cascade;
+drop table personattribute cascade;
+drop table personattributetype cascade;
+drop table personattribute_value_list cascade;
+drop table user_preset_values cascade;
+drop table sx_portlet cascade;
+drop table user_portlet_bez cascade;
+drop table group_portlet_bez cascade;
+drop table kern_cifx_neu cascade;
+drop table sieve cascade;
+drop table sieve_column_def cascade;
+drop table sieve_column cascade;
+drop table sieve_field cascade;
+drop table sx_jobs cascade;
+drop table orgunit_mapping cascade;
+drop table implicit_orgunit_rights cascade;
+drop table kern_pruefrout cascade;
+drop table masken_statistik cascade;
+drop table dim_datum cascade;
+drop table hisinone_deleted_entity cascade;
+drop table etl_step cascade;
+drop table etl_step_type cascade;
+drop table etl_step_type_param cascade;
+drop table etl_step_property cascade;
+drop table etl_step_relation cascade;
+drop table etl_job cascade;
+drop table etl_job_param cascade;
+drop table k_astat_studienfach_land cascade;
+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 sx_mail cascade;
 
 
-! echo "Uninstall-Actions"
-! echo `date`
+select now(),'Uninstall-Actions'
+from xdummy;
 
 --Aktionen: 
 	

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

@@ -1,278 +1,308 @@
 -- XML-generiertes SQL-Script fuer dbaccess--
 
 
-! echo "Creating indexes for tables"
-! echo `date`
+select now(),'Creating indexes for tables'
+from xdummy;
 
 
 
-! echo "Erzeuge Index ix_group_felder2"
-! echo `date`
+select now(),'Erzeuge Index ix_group_felder2'
+from xdummy;
 
 create  index ix_group_felder2 on group_field_pref (groupinfo_id );
 
 
-! echo "Erzeuge Index ix_style_feld2"
-! echo `date`
+select now(),'Erzeuge Index ix_style_feld2'
+from xdummy;
 
 create  index ix_style_feld2 on stylesheet_field (stylesheet_id );
 
 
-! echo "Erzeuge Index uxdb_tabellen_name"
-! echo `date`
+select now(),'Erzeuge Index uxdb_tabellen_name'
+from xdummy;
 
 create  unique  index uxdb_tabellen_name on db_tabellen (name );
 
 
-! echo "Erzeuge Index xdb_tabellen_efm"
-! echo `date`
+select now(),'Erzeuge Index xdb_tabellen_efm'
+from xdummy;
 
 create  index xdb_tabellen_efm on db_tabellen (db_einfuegemarke );
 
 
-! echo "Erzeuge Index xdb_version_efm"
-! echo `date`
+select now(),'Erzeuge Index uxdb_version'
+from xdummy;
+
+create  unique  index uxdb_version on db_version (his_system );
+
+
+select now(),'Erzeuge Index xdb_version_efm'
+from xdummy;
 
 create  index xdb_version_efm on db_version (db_einfuegemarke );
 
 
-! echo "Erzeuge Index ix_name_intern"
-! echo `date`
+select now(),'Erzeuge Index ix_name_intern'
+from xdummy;
 
 create  unique  index ix_name_intern on sichten (name_intern );
 
 
-! echo "Erzeuge Index cif_ind"
-! echo `date`
+select now(),'Erzeuge Index cif_ind'
+from xdummy;
 
 create  unique  index cif_ind on cif (hs, 
 key, 
 apnr );
 
 
-! echo "Erzeuge Index cifx_ind"
-! echo `date`
+select now(),'Erzeuge Index cifx_ind'
+from xdummy;
 
 create  unique  index cifx_ind on cifx (hs, 
 key, 
 apnr );
 
 
-! echo "Erzeuge Index cifx_ind2"
-! echo `date`
+select now(),'Erzeuge Index cifx_ind2'
+from xdummy;
 
 create  index cifx_ind2 on cifx (uniquename );
 
 
-! echo "Erzeuge Index trans_cifx_ind"
-! echo `date`
+select now(),'Erzeuge Index trans_cifx_ind'
+from xdummy;
 
 create  index trans_cifx_ind on trans_cifx (sourcesystem_id );
 
 
-! echo "Erzeuge Index trans_cif_ind"
-! echo `date`
+select now(),'Erzeuge Index trans_cif_ind'
+from xdummy;
 
 create  index trans_cif_ind on trans_cif (sourcesystem_id );
 
 
-! echo "Erzeuge Index i_userinfo"
-! echo `date`
+select now(),'Erzeuge Index i_userinfo'
+from xdummy;
 
 create  unique  index i_userinfo on userinfo (benutzer );
 
 
-! echo "Erzeuge Index i_orga"
-! echo `date`
+select now(),'Erzeuge Index i_orga'
+from xdummy;
 
 create  unique  index i_orga on organigramm (key_apnr, 
 gueltig_seit, 
 gueltig_bis );
 
 
-! echo "Erzeuge Index ix130_3"
-! echo `date`
+select now(),'Erzeuge Index ix130_3'
+from xdummy;
 
 create  index ix130_3 on organigramm (parent );
 
 
-! echo "Erzeuge Index i_orga_bak"
-! echo `date`
+select now(),'Erzeuge Index i_orga_bak'
+from xdummy;
 
 create  unique  index i_orga_bak on organigramm_bak (key_apnr, 
 gueltig_seit, 
 gueltig_bis );
 
 
-! echo "Erzeuge Index ix_user_inst1"
-! echo `date`
+select now(),'Erzeuge Index ix_user_inst1'
+from xdummy;
 
 create  index ix_user_inst1 on user_institution (ch110_institut );
 
 
-! echo "Erzeuge Index ix_user_inst2"
-! echo `date`
+select now(),'Erzeuge Index ix_user_inst2'
+from xdummy;
 
 create  index ix_user_inst2 on user_institution (userid );
 
 
-! echo "Erzeuge Index ix_user_inst3"
-! echo `date`
+select now(),'Erzeuge Index ix_user_inst3'
+from xdummy;
 
 create  index ix_user_inst3 on user_institution (gueltig_seit, 
 gueltig_bis );
 
 
-! echo "Erzeuge Index kostentr_ixktr"
-! echo `date`
+select now(),'Erzeuge Index kostentr_ixktr'
+from xdummy;
 
 create  index kostentr_ixktr on kostentraeger (key_apnr );
 
 
-! echo "Erzeuge Index ix_user_ktr"
-! echo `date`
+select now(),'Erzeuge Index ix_user_ktr'
+from xdummy;
 
 create  index ix_user_ktr on user_kostentraeger (key_apnr );
 
 
-! echo "Erzeuge Index ix_user_ktr2"
-! echo `date`
+select now(),'Erzeuge Index ix_user_ktr2'
+from xdummy;
 
 create  index ix_user_ktr2 on user_kostentraeger (userid );
 
 
-! echo "Erzeuge Index ix_kotr_to_inst1"
-! echo `date`
+select now(),'Erzeuge Index ix_kotr_to_inst1'
+from xdummy;
 
 create  index ix_kotr_to_inst1 on kotr_to_inst (projnr );
 
 
-! echo "Erzeuge Index ix_sx_captions"
-! echo `date`
+select now(),'Erzeuge Index ix_sx_captions'
+from xdummy;
 
 create  index ix_sx_captions on sx_captions (field_name );
 
 
-! echo "Erzeuge Index ix_sx_captions2"
-! echo `date`
+select now(),'Erzeuge Index ix_sx_captions2'
+from xdummy;
 
 create  index ix_sx_captions2 on sx_captions (table_name );
 
 
-! echo "Erzeuge Index ix_sx_captions3"
-! echo `date`
+select now(),'Erzeuge Index ix_sx_captions3'
+from xdummy;
 
 create  index ix_sx_captions3 on sx_captions (record_no );
 
 
-! echo "Erzeuge Index ix_sx_captions4"
-! echo `date`
+select now(),'Erzeuge Index ix_sx_captions4'
+from xdummy;
 
 create  index ix_sx_captions4 on sx_captions (locale );
 
 
-! echo "Erzeuge Index ix_fm_templates_tid"
-! echo `date`
+select now(),'Erzeuge Index ix_fm_templates_tid'
+from xdummy;
 
 create  unique  index ix_fm_templates_tid on fm_templates (id );
 
 
-! echo "Erzeuge Index ix_sx_down_inst"
-! echo `date`
+select now(),'Erzeuge Index ix_sx_down_inst'
+from xdummy;
 
 create  index ix_sx_down_inst on sx_downloads (ch110_institut );
 
 
-! echo "Erzeuge Index ix_sx_down_dbat"
-! echo `date`
+select now(),'Erzeuge Index ix_sx_down_dbat'
+from xdummy;
 
 create  index ix_sx_down_dbat on sx_downloads (bezugsdatum, 
 gueltig_seit, 
 gueltig_bis );
 
 
-! echo "Erzeuge Index ix_ussp"
-! echo `date`
+select now(),'Erzeuge Index ix_ussp'
+from xdummy;
 
 create  index ix_ussp on user_startpage (userid );
 
 
-! echo "Erzeuge Index ix_ussf"
-! echo `date`
+select now(),'Erzeuge Index ix_ussf'
+from xdummy;
 
 create  index ix_ussf on user_startfields (userid );
 
 
-! echo "Erzeuge Index ix_sx_tables"
-! echo `date`
+select now(),'Erzeuge Index ix_sx_tables'
+from xdummy;
 
 create  unique  index ix_sx_tables on sx_tables (name );
 
 
-! echo "Erzeuge Index ix_dim_bp_apnr"
-! echo `date`
+select now(),'Erzeuge Index ix_dim_bp_apnr'
+from xdummy;
 
 create  unique  index ix_dim_bp_apnr on dim_bp_apnr (dimension_bp_id, 
 apnr );
 
 
-! echo "Erzeuge Index ix_dim_bp_apnr2"
-! echo `date`
+select now(),'Erzeuge Index ix_dim_bp_apnr2'
+from xdummy;
 
 create  index ix_dim_bp_apnr2 on dim_bp_apnr (systeminfo_id );
 
 
-! echo "Erzeuge Index ix_level1_int1"
-! echo `date`
+select now(),'Erzeuge Index ix_level1_int1'
+from xdummy;
 
 create  index ix_level1_int1 on dim_bp_apnr (level1_int, 
 level1_char );
 
 
-! echo "Erzeuge Index ix_level1_int2"
-! echo `date`
+select now(),'Erzeuge Index ix_level1_int2'
+from xdummy;
 
 create  index ix_level1_int2 on dim_bp_apnr (level2_int, 
 level2_char );
 
 
-! echo "Erzeuge Index ix_level3_int1"
-! echo `date`
+select now(),'Erzeuge Index ix_level3_int1'
+from xdummy;
 
 create  index ix_level3_int1 on dim_bp_apnr (level3_int, 
 level3_char );
 
 
-! echo "Erzeuge Index ix_dim_bp_alts1"
-! echo `date`
+select now(),'Erzeuge Index ix_dim_bp_alts1'
+from xdummy;
 
 create  index ix_dim_bp_alts1 on dim_bp_altsicht_apnr (hierarchie_id );
 
 
-! echo "Erzeuge Index ix_dim_c1"
-! echo `date`
+select now(),'Erzeuge Index ix_dim_c1'
+from xdummy;
 
 create  index ix_dim_c1 on dim_closure (hierarchie_id, 
 key );
 
 
-! echo "Erzeuge Index ix_dim_c2"
-! echo `date`
+select now(),'Erzeuge Index ix_dim_c2'
+from xdummy;
 
 create  index ix_dim_c2 on dim_closure (hierarchie_id, 
 parent, 
 key );
 
 
-! echo "Erzeuge Index ix_tr_dim_bp_apnr"
-! echo `date`
+select now(),'Erzeuge Index ix_tr_dim_bp_apnr'
+from xdummy;
 
 create  index ix_tr_dim_bp_apnr on trans_dim_bp_apnr (dimension_bp_id, 
 sourcesystem_id, 
 systeminfo_id );
 
 
-! echo "Erzeuge Index ix_sx_jobs_un"
-! echo `date`
+select now(),'Erzeuge Index ix_sieve_column_defm'
+from xdummy;
+
+create  unique  index ix_sieve_column_defm on sieve_column_def (m_id );
+
+
+select now(),'Erzeuge Index ix_sx_jobs_un'
+from xdummy;
 
 create  unique  index ix_sx_jobs_un on sx_jobs (uniquename );
+
+
+select now(),'Erzeuge Index ix_implicit_orgrights1'
+from xdummy;
+
+create  index ix_implicit_orgrights1 on implicit_orgunit_rights (userinfo_id );
+
+
+select now(),'Erzeuge Index ix_dim_datum_day_date'
+from xdummy;
+
+create  index ix_dim_datum_day_date on dim_datum (day_date );
+
+
+select now(),'Erzeuge Index ix_etl_job1'
+from xdummy;
+
+create  unique  index ix_etl_job1 on etl_job (uniquename );

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

@@ -1266,11 +1266,11 @@ select now(),'Erzeuge Tabelle organigramm'
 from xdummy;
 
 create table organigramm(
-	tid INTEGER  not null, 
+	tid SERIAL  not null, 
 key_apnr CHAR(10) , 
 parent CHAR(10) , 
-drucktext CHAR(50) , 
-name CHAR(150) , 
+drucktext VARCHAR(255) , 
+name VARCHAR(255) , 
 ebene INTEGER , 
 lehre SMALLINT  not null, 
 gueltig_seit DATE  not null, 
@@ -1349,8 +1349,8 @@ create table organigramm_bak(
 	tid INTEGER  not null, 
 key_apnr CHAR(10) , 
 parent CHAR(10) , 
-drucktext CHAR(50) , 
-name CHAR(150) , 
+drucktext VARCHAR(255) , 
+name VARCHAR(255) , 
 ebene INTEGER , 
 lehre SMALLINT  not null, 
 gueltig_seit DATE  not null, 

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

@@ -1,443 +1,17 @@
 -- XML-generiertes SQL-Script fuer dbaccess--von module_etl.xsl
---ETL-Schritt load:  Upload der KERN-Rohdaten
+--ETL-Schritt load:  
 
 
-! echo "SQL-Ausdruck CREATE TABLE tmp_userinfo (tid integer, benutzer char(30), kennwort char(16), name char(50), max_versuch smallint, akt_versuch smallint, email char(255), administration smallint, archiv_recht smallint, passwd_sha char(40), info char(255), extern_account_id varchar(255), extern_person_id varchar(255),sieht_projekte SMALLINT); ausführen"
-! echo `date`
+select now(),'Scriptfile $SUPERX_DIR/db/install/schluesseltabellen/organigrammquelle_pruefen.sql ausführen'
+from xdummy;
 
-CREATE TABLE tmp_userinfo (tid integer, benutzer char(30), kennwort char(16), name char(50), max_versuch smallint, akt_versuch smallint, email char(255), administration smallint, archiv_recht smallint, passwd_sha char(40), info char(255), extern_account_id varchar(255), extern_person_id varchar(255),sieht_projekte SMALLINT);
-		
 
-! echo "SQL-Ausdruck CREATE TABLE tmp_user_group_bez (userinfo_id integer, groupinfo_id integer, external_entry smallint); ausführen"
-! echo `date`
+!  DOSQL $SUPERX_DIR/db/install/schluesseltabellen/organigrammquelle_pruefen.sql
 
-CREATE TABLE tmp_user_group_bez (userinfo_id integer, groupinfo_id integer, external_entry smallint);
-		
 
-! echo "SQL-Ausdruck CREATE TABLE tmp_user_institution (userid integer, name char(50), ch110_institut char(10), hierarchie smallint, gueltig_seit date, gueltig_bis date, lehre smallint, external_entry smallint, externalid varchar(200)); ausführen"
-! echo `date`
+select now(),'Lade Tabelle kern_cifx_neu'
+from xdummy;
 
-CREATE TABLE tmp_user_institution (userid integer, name char(50), ch110_institut char(10), hierarchie smallint, gueltig_seit date, gueltig_bis date, lehre smallint, external_entry smallint, externalid varchar(200));
-		
-
-! echo "SQL-Ausdruck CREATE TABLE tmp_user_masken_bez (userinfo_id integer, maskeninfo_id integer, external_entry smallint); ausführen"
-! echo `date`
-
-CREATE TABLE tmp_user_masken_bez (userinfo_id integer, maskeninfo_id integer, external_entry smallint);
-		
-
-! echo "SQL-Ausdruck CREATE TABLE tmp_user_pw (userinfo_id integer, pw_gueltig_bis date, last_login datetime year to second, old_sha1 char(40), zeitpunkt1 datetime year to second, old_sha2 char(40), zeitpunkt2 datetime year to second, old_sha3 char(40), zeitpunkt3 datetime year to second, old_sha4 char(40), zeitpunkt4 datetime year to second, old_sha5 char(40), zeitpunkt5 datetime year to second, old_sha6 char(40), zeitpunkt6 datetime year to second, old_sha7 char(40), zeitpunkt7 datetime year to second); ausführen"
-! echo `date`
-
-CREATE TABLE tmp_user_pw (userinfo_id integer, pw_gueltig_bis date, last_login datetime year to second, old_sha1 char(40), zeitpunkt1 datetime year to second, old_sha2 char(40), zeitpunkt2 datetime year to second, old_sha3 char(40), zeitpunkt3 datetime year to second, old_sha4 char(40), zeitpunkt4 datetime year to second, old_sha5 char(40), zeitpunkt5 datetime year to second, old_sha6 char(40), zeitpunkt6 datetime year to second, old_sha7 char(40), zeitpunkt7 datetime year to second);
-
-
-! echo "SQL-Ausdruck CREATE TABLE tmp_user_sachgeb_bez (userinfo_id integer, sachgebiete_id integer, external_entry smallint); ausführen"
-! echo `date`
-
-CREATE TABLE tmp_user_sachgeb_bez (userinfo_id integer, sachgebiete_id integer, external_entry smallint);
-		
-
-! echo "SQL-Ausdruck CREATE TABLE tmp_user_sichtarten (userinfo_id integer, sichtart char(255), external_entry smallint); ausführen"
-! echo `date`
-
-CREATE TABLE tmp_user_sichtarten (userinfo_id integer, sichtart char(255), external_entry smallint);
-		
-
-! echo "SQL-Ausdruck CREATE TABLE tmp_user_sichten (userinfo_id integer, sicht_name_intern char(200), external_entry smallint); ausführen"
-! echo `date`
-
-CREATE TABLE tmp_user_sichten (userinfo_id integer, sicht_name_intern char(200), external_entry smallint);
-		
-
-! echo "SQL-Ausdruck CREATE TABLE tmp_group_field_pref (tid integer, groupinfo_id integer, field_id integer, pref varchar(255)); ausführen"
-! echo `date`
-
-CREATE TABLE tmp_group_field_pref (tid integer, groupinfo_id integer, field_id integer, pref varchar(255));
-		
-
-! echo "SQL-Ausdruck CREATE TABLE tmp_group_masken_bez (groupinfo_id integer, maskeninfo_id integer); ausführen"
-! echo `date`
-
-CREATE TABLE tmp_group_masken_bez (groupinfo_id integer, maskeninfo_id integer);
-		
-
-! echo "SQL-Ausdruck CREATE TABLE tmp_group_sachgeb_bez (groupinfo_id integer, sachgebiete_id integer); ausführen"
-! echo `date`
-
-CREATE TABLE tmp_group_sachgeb_bez (groupinfo_id integer, sachgebiete_id integer);
-		
-
-! echo "SQL-Ausdruck CREATE TABLE tmp_group_sichtarten (groupinfo_id integer, sichtart char(255)); ausführen"
-! echo `date`
-
-CREATE TABLE tmp_group_sichtarten (groupinfo_id integer, sichtart char(255));
-		
-
-! echo "SQL-Ausdruck CREATE TABLE tmp_group_sichten (groupinfo_id integer, sicht_name_intern char(200)); ausführen"
-! echo `date`
-
-CREATE TABLE tmp_group_sichten (groupinfo_id integer, sicht_name_intern char(200));
-		
-
-! echo "SQL-Ausdruck CREATE TABLE tmp_groupinfo (tid integer, name char(255)); ausführen"
-! echo `date`
-
-CREATE TABLE tmp_groupinfo (tid integer, name char(255));
-		
-
-! echo "SQL-Ausdruck CREATE TABLE tmp_fin_user_kam (tid integer, userid integer, buchungsab_fb char(10), projnr_ins char(255), kapitel char(5), dr char(5), titel char(255), untertitel char(5), kostenstellen char(255), ins2 char(10), ins3 char(10), gueltig_von date, gueltig_bis date); ausführen"
-! echo `date`
-
-CREATE TABLE tmp_fin_user_kam (tid integer, userid integer, buchungsab_fb char(10), projnr_ins char(255), kapitel char(5), dr char(5), titel char(255), untertitel char(5), kostenstellen char(255), ins2 char(10), ins3 char(10), gueltig_von date, gueltig_bis date);
-		
-
-! echo "SQL-Ausdruck create table tmp_hochschulinfo (name char(100), adresse char(200), hs_nr integer, kapitel char(5), superx_server char(100), kennung char(8), passwd char(16) ); ausführen"
-! echo `date`
-
-create table tmp_hochschulinfo (name char(100), adresse char(200), hs_nr integer, kapitel char(5), superx_server char(100), kennung char(8), passwd char(16) );
-		
-
-! echo "SQL-Ausdruck CREATE TABLE tmp_konstanten (tid integer, apnr integer, beschreibung char(25)); ausführen"
-! echo `date`
-
-CREATE TABLE tmp_konstanten (tid integer, apnr integer, beschreibung char(25));
-		
-
-! echo "SQL-Ausdruck CREATE TABLE tmp_unload_params (tid integer, param_id varchar(255), param_val varchar(255), default_val varchar(255), description varchar(255), systeminfo_id integer); ausführen"
-! echo `date`
-
-CREATE TABLE tmp_unload_params (tid integer, param_id varchar(255), param_val varchar(255), default_val varchar(255), description varchar(255), systeminfo_id integer);
-		
-
-! echo "SQL-Ausdruck CREATE TABLE tmp_sx_repository (tid integer, id char(200), content text, caption char(200), comment text, version smallint, art char(200), art2 char(200), art3 char(200), sachgebiete_id integer, sort1 integer, sort2 integer, sort3 integer, geaendert_am date, aktiv smallint, gueltig_seit date, gueltig_bis date); ausführen"
-! echo `date`
-
-CREATE TABLE tmp_sx_repository (tid integer, id char(200), content text, caption char(200), comment text, version smallint, art char(200), art2 char(200), art3 char(200), sachgebiete_id integer, sort1 integer, sort2 integer, sort3 integer, geaendert_am date, aktiv smallint, gueltig_seit date, gueltig_bis date);
-		
-
-! echo "SQL-Ausdruck CREATE TABLE tmp_themenbaum (tid integer, name varchar(255), maskeninfo_id integer, parent integer, gueltig_seit date, gueltig_bis date, erlaeuterung char(240), sort integer, css_class character varying(255)); ausführen"
-! echo `date`
-
-CREATE TABLE tmp_themenbaum (tid integer, name varchar(255), maskeninfo_id integer, parent integer, gueltig_seit date, gueltig_bis date, erlaeuterung char(240), sort integer, css_class character varying(255));
-		
-
-! echo "SQL-Ausdruck CREATE TABLE tmp_maskeninfo (tid integer, name char(255), select_stmt text, xil_proplist text, chart_xtitel char(50), chart_ytitel char(50), erlaeuterung char(255), cleanup_stmt char(240), default_file char(200), macro smallint, breite integer, hoehe integer, ampel smallint, hilfe smallint, hinweis text); ausführen"
-! echo `date`
-
-CREATE TABLE tmp_maskeninfo (tid integer, name char(255), select_stmt text, xil_proplist text, chart_xtitel char(50), chart_ytitel char(50), erlaeuterung char(255), cleanup_stmt char(240), default_file char(200), macro smallint, breite integer, hoehe integer, ampel smallint, hilfe smallint, hinweis text);
-		
-
-! echo "SQL-Ausdruck CREATE TABLE tmp_felderinfo (tid integer, name char(50), nummer integer, x integer, y integer, buttonbreite integer, feldbreite integer, zeilenanzahl integer, typ char(15), laenge integer, obligatorisch integer, art integer, relation text, attribut char(100), defaultwert char(255)); ausführen"
-! echo `date`
-
-CREATE TABLE tmp_felderinfo (tid integer, name char(50), nummer integer, x integer, y integer, buttonbreite integer, feldbreite integer, zeilenanzahl integer, typ char(15), laenge integer, obligatorisch integer, art integer, relation text, attribut char(100), defaultwert char(255));
-		
-
-! echo "SQL-Ausdruck CREATE TABLE tmp_masken_felder_bez (maskeninfo_id integer, felderinfo_id integer); ausführen"
-! echo `date`
-
-CREATE TABLE tmp_masken_felder_bez (maskeninfo_id integer, felderinfo_id integer);
-		
-
-! echo "SQL-Ausdruck CREATE TABLE tmp_maske_system_bez (maskeninfo_id integer, systeminfo_id integer); ausführen"
-! echo `date`
-
-CREATE TABLE tmp_maske_system_bez (maskeninfo_id integer, systeminfo_id integer);
-		
-
-! echo "SQL-Ausdruck CREATE TABLE tmp_sachgeb_maske_bez (sachgebiete_id integer, maskeninfo_id integer); ausführen"
-! echo `date`
-
-CREATE TABLE tmp_sachgeb_maske_bez (sachgebiete_id integer, maskeninfo_id integer);
-		
-
-! echo "SQL-Ausdruck CREATE TABLE tmp_sx_stylesheets (tid integer, filename char(255), caption char(255), description char(255), relation char(10), useragent char(255), contenttype char(200)); ausführen"
-! echo `date`
-
-CREATE TABLE tmp_sx_stylesheets (tid integer, filename char(255), caption char(255), description char(255), relation char(10), useragent char(255), contenttype char(200));
-		
-
-! echo "SQL-Ausdruck CREATE TABLE tmp_sx_mask_style (tid integer, maskeninfo_id integer, stylesheet_id integer, ord smallint); ausführen"
-! echo `date`
-
-CREATE TABLE tmp_sx_mask_style (tid integer, maskeninfo_id integer, stylesheet_id integer, ord smallint);
-		
-
-! echo "SQL-Ausdruck CREATE TABLE tmp_stylesheet_field (tid integer, stylesheet_id integer, tablename varchar(255), fieldname varchar(255)); ausführen"
-! echo `date`
-
-CREATE TABLE tmp_stylesheet_field (tid integer, stylesheet_id integer, tablename varchar(255), fieldname varchar(255));
-		
-
-! echo "SQL-Ausdruck CREATE TABLE tmp_macro_masken_bez (maskeninfo_id1 integer, maskeninfo_id2 integer, active integer, sortnr smallint, schleifenrelation char(255), schleifenfeldname char(255), alias char(255), schleifenfstand char(255), schleifenfsicht char(255), aktion char(255)); ausführen"
-! echo `date`
-
-CREATE TABLE tmp_macro_masken_bez (maskeninfo_id1 integer, maskeninfo_id2 integer, active integer, sortnr smallint, schleifenrelation char(255), schleifenfeldname char(255), alias char(255), schleifenfstand char(255), schleifenfsicht char(255), aktion char(255));
-		
-
-! echo "SQL-Ausdruck CREATE TABLE tmp_macro_feld_wert (macro integer, sortnr integer, feldname char(255), alias char(255), value char(255), value_caption char(255), feldstand char(255), feldsicht char(255), active integer); ausführen"
-! echo `date`
-
-CREATE TABLE tmp_macro_feld_wert (macro integer, sortnr integer, feldname char(255), alias char(255), value char(255), value_caption char(255), feldstand char(255), feldsicht char(255), active integer);
-		
-
-! echo "SQL-Ausdruck CREATE TABLE tmp_sx_captions (tid integer, id char(200), table_name char(200), field_name char(200), record_no integer, locale char(10), contents_short char(255), contents_long text, equalitystatus smallint, sachgebiete_id integer, doku_link varchar(255), export_to_glossar integer); ausführen"
-! echo `date`
-
-CREATE TABLE tmp_sx_captions (tid integer, id char(200), table_name char(200), field_name char(200), record_no integer, locale char(10), contents_short char(255), contents_long text, equalitystatus smallint, sachgebiete_id integer, doku_link varchar(255), export_to_glossar integer);
-		
-
-! echo "SQL-Ausdruck CREATE TABLE tmp_sichten (tid integer, parent char(255), systeminfoid integer, art char(40), type integer, name_intern char(200), name char(200), beschreibung char(255), sortnr integer, quelle char(255), alt_hier_id char(150), treecfgtable char(255), treecfgid char(150), label smallint, user_rechte smallint, rechtequelle char(255), sesamkey char(100), standbutton smallint, attribut1 char(255), attribut2 char(255), attribut3 integer, attribut4 integer, xmlmaxentries integer, gueltig_seit date, gueltig_bis date, cacheapplet char(255), cachexml char(255), aktiv smallint); ausführen"
-! echo `date`
-
-CREATE TABLE tmp_sichten (tid integer, parent char(255), systeminfoid integer, art char(40), type integer, name_intern char(200), name char(200), beschreibung char(255), sortnr integer, quelle char(255), alt_hier_id char(150), treecfgtable char(255), treecfgid char(150), label smallint, user_rechte smallint, rechtequelle char(255), sesamkey char(100), standbutton smallint, attribut1 char(255), attribut2 char(255), attribut3 integer, attribut4 integer, xmlmaxentries integer, gueltig_seit date, gueltig_bis date, cacheapplet char(255), cachexml char(255), aktiv smallint);
-		
-
-! echo "SQL-Ausdruck CREATE TABLE tmp_man_catalogue (tid integer NOT NULL, id character varying(100) NOT NULL, shortname character varying(255), name character varying(255), description text, timeunit character varying(3), decimalplaces smallint, sqlchunk text, linksub text, linktimeline text, restrictedgroupids character(255), ismanual smallint, requiredfields character varying(255), calcratio smallint, gueltig_von date, gueltig_bis date, cleanup text, preparation text, techdetails text, moreinfo text, attrib1 integer DEFAULT 0 NOT NULL, fld_semester character varying(255), fld_jahr character varying(255), fld_studiengang character varying(255), fld_institut character varying(255), fld_geschlecht character varying(255), fromclause character varying(255), whereclause text, aggrfunction character varying(255), cacheing integer DEFAULT 0 NOT NULL, linktable character varying(255), linkmask character varying(255)); ausführen"
-! echo `date`
-
-CREATE TABLE tmp_man_catalogue (tid integer NOT NULL, id character varying(100) NOT NULL, shortname character varying(255), name character varying(255), description text, timeunit character varying(3), decimalplaces smallint, sqlchunk text, linksub text, linktimeline text, restrictedgroupids character(255), ismanual smallint, requiredfields character varying(255), calcratio smallint, gueltig_von date, gueltig_bis date, cleanup text, preparation text, techdetails text, moreinfo text, attrib1 integer DEFAULT 0 NOT NULL, fld_semester character varying(255), fld_jahr character varying(255), fld_studiengang character varying(255), fld_institut character varying(255), fld_geschlecht character varying(255), fromclause character varying(255), whereclause text, aggrfunction character varying(255), cacheing integer DEFAULT 0 NOT NULL, linktable character varying(255), linkmask character varying(255));
-		
-
-! echo "SQL-Ausdruck CREATE TABLE tmp_man_catalogue_rpt (tid integer, report_id varchar(40), catalogue_id varchar(100), description text, sortnr integer, sortnr2 integer, grouping1 char(40), grouping2 char(40), valid_from date, valid_till date, active smallint); ausführen"
-! echo `date`
-
-CREATE TABLE tmp_man_catalogue_rpt (tid integer, report_id varchar(40), catalogue_id varchar(100), description text, sortnr integer, sortnr2 integer, grouping1 char(40), grouping2 char(40), valid_from date, valid_till date, active smallint);
-		
-
-! echo "SQL-Ausdruck CREATE TABLE tmp_man_zahl_wert (tid integer, hs_nr integer, kenn_zahl char(40), jahr smallint, sem smallint, ch110_institut char(10), stugkey char(20), stg char(10), bund_fachgebiet char(10), wert numeric(14,2), geschlecht smallint, abschluss char(10), kz_fach char(10) ); ausführen"
-! echo `date`
-
-CREATE TABLE tmp_man_zahl_wert (tid integer, hs_nr integer, kenn_zahl char(40), jahr smallint, sem smallint, ch110_institut char(10), stugkey char(20), stg char(10), bund_fachgebiet char(10), wert numeric(14,2), geschlecht smallint, abschluss char(10), kz_fach char(10) );
-		
-
-! echo "SQL-Ausdruck CREATE TABLE tmp_kenn_zahl_wert (tid integer, hs_nr integer, kenn_zahl char(40), jahr smallint, sem smallint, ch110_institut char(10), stugkey char(20), bund_fachgebiet char(10), wert numeric(14,2), titel char(10), wert_str varchar(255), geschlecht SMALLINT , ca12_staat SMALLINT); ausführen"
-! echo `date`
-
-CREATE TABLE tmp_kenn_zahl_wert (tid integer, hs_nr integer, kenn_zahl char(40), jahr smallint, sem smallint, ch110_institut char(10), stugkey char(20), bund_fachgebiet char(10), wert numeric(14,2), titel char(10), wert_str varchar(255), geschlecht SMALLINT , ca12_staat SMALLINT);
-		
-
-! echo "Lade Tabelle tmp_hochschulinfo"
-! echo `date`
-
-!sx_auto_upload_table.x tmp_hochschulinfo $SUPERX_DIR/db/install/rohdaten/unl/hochschulinfo.unl
-
-
-! echo "Lade Tabelle tmp_userinfo"
-! echo `date`
-
-!sx_auto_upload_table.x tmp_userinfo $SUPERX_DIR/db/install/rohdaten/unl/userinfo.unl
-
-
-! echo "Lade Tabelle tmp_user_group_bez"
-! echo `date`
-
-!sx_auto_upload_table.x tmp_user_group_bez $SUPERX_DIR/db/install/rohdaten/unl/user_group_bez.unl
-
-
-! echo "Lade Tabelle tmp_user_institution"
-! echo `date`
-
-!sx_auto_upload_table.x tmp_user_institution $SUPERX_DIR/db/install/rohdaten/unl/user_institution.unl
-
-
-! echo "Lade Tabelle tmp_user_masken_bez"
-! echo `date`
-
-!sx_auto_upload_table.x tmp_user_masken_bez $SUPERX_DIR/db/install/rohdaten/unl/user_masken_bez.unl
-
-
-! echo "Lade Tabelle tmp_user_pw"
-! echo `date`
-
-!sx_auto_upload_table.x tmp_user_pw $SUPERX_DIR/db/install/rohdaten/unl/user_pw.unl
-
-
-! echo "Lade Tabelle tmp_user_sachgeb_bez"
-! echo `date`
-
-!sx_auto_upload_table.x tmp_user_sachgeb_bez $SUPERX_DIR/db/install/rohdaten/unl/user_sachgeb_bez.unl
-
-
-! echo "Lade Tabelle tmp_user_sichtarten"
-! echo `date`
-
-!sx_auto_upload_table.x tmp_user_sichtarten $SUPERX_DIR/db/install/rohdaten/unl/user_sichtarten.unl
-
-
-! echo "Lade Tabelle tmp_user_sichten"
-! echo `date`
-
-!sx_auto_upload_table.x tmp_user_sichten $SUPERX_DIR/db/install/rohdaten/unl/user_sichten.unl
-
-
-! echo "Lade Tabelle tmp_group_field_pref"
-! echo `date`
-
-!sx_auto_upload_table.x tmp_group_field_pref $SUPERX_DIR/db/install/rohdaten/unl/group_field_pref.unl
-
-
-! echo "Lade Tabelle tmp_group_masken_bez"
-! echo `date`
-
-!sx_auto_upload_table.x tmp_group_masken_bez $SUPERX_DIR/db/install/rohdaten/unl/group_masken_bez.unl
-
-
-! echo "Lade Tabelle tmp_group_sachgeb_bez"
-! echo `date`
-
-!sx_auto_upload_table.x tmp_group_sachgeb_bez $SUPERX_DIR/db/install/rohdaten/unl/group_sachgeb_bez.unl
-
-
-! echo "Lade Tabelle tmp_group_sichtarten"
-! echo `date`
-
-!sx_auto_upload_table.x tmp_group_sichtarten $SUPERX_DIR/db/install/rohdaten/unl/group_sichtarten.unl
-
-
-! echo "Lade Tabelle tmp_group_sichten"
-! echo `date`
-
-!sx_auto_upload_table.x tmp_group_sichten $SUPERX_DIR/db/install/rohdaten/unl/group_sichten.unl
-
-
-! echo "Lade Tabelle tmp_groupinfo"
-! echo `date`
-
-!sx_auto_upload_table.x tmp_groupinfo $SUPERX_DIR/db/install/rohdaten/unl/groupinfo.unl
-
-
-! echo "Lade Tabelle tmp_fin_user_kam"
-! echo `date`
-
-!sx_auto_upload_table.x tmp_fin_user_kam $SUPERX_DIR/db/install/rohdaten/unl/fin_user_kam.unl
-
-
-! echo "Lade Tabelle tmp_konstanten"
-! echo `date`
-
-!sx_auto_upload_table.x tmp_konstanten $SUPERX_DIR/db/install/rohdaten/unl/konstanten.unl
-
-
-! echo "Lade Tabelle tmp_unload_params"
-! echo `date`
-
-!sx_auto_upload_table.x tmp_unload_params $SUPERX_DIR/db/install/rohdaten/unl/unload_params.unl
-
-
-! echo "Lade Tabelle tmp_sx_repository"
-! echo `date`
-
-!sx_auto_upload_table.x tmp_sx_repository $SUPERX_DIR/db/install/rohdaten/unl/sx_repository.unl
-
-
-! echo "Lade Tabelle tmp_themenbaum"
-! echo `date`
-
-!sx_auto_upload_table.x tmp_themenbaum $SUPERX_DIR/db/install/rohdaten/unl/themenbaum.unl
-
-
-! echo "Lade Tabelle tmp_maskeninfo"
-! echo `date`
-
-!sx_auto_upload_table.x tmp_maskeninfo $SUPERX_DIR/db/install/rohdaten/unl/maskeninfo.unl
-
-
-! echo "Lade Tabelle tmp_felderinfo"
-! echo `date`
-
-!sx_auto_upload_table.x tmp_felderinfo $SUPERX_DIR/db/install/rohdaten/unl/felderinfo.unl
-
-
-! echo "Lade Tabelle tmp_masken_felder_bez"
-! echo `date`
-
-!sx_auto_upload_table.x tmp_masken_felder_bez $SUPERX_DIR/db/install/rohdaten/unl/masken_felder_bez.unl
-
-
-! echo "Lade Tabelle tmp_maske_system_bez"
-! echo `date`
-
-!sx_auto_upload_table.x tmp_maske_system_bez $SUPERX_DIR/db/install/rohdaten/unl/maske_system_bez.unl
-
-
-! echo "Lade Tabelle tmp_sachgeb_maske_bez"
-! echo `date`
-
-!sx_auto_upload_table.x tmp_sachgeb_maske_bez $SUPERX_DIR/db/install/rohdaten/unl/sachgeb_maske_bez.unl
-
-
-! echo "Lade Tabelle tmp_sx_stylesheets"
-! echo `date`
-
-!sx_auto_upload_table.x tmp_sx_stylesheets $SUPERX_DIR/db/install/rohdaten/unl/sx_stylesheets.unl
-
-
-! echo "Lade Tabelle tmp_sx_mask_style"
-! echo `date`
-
-!sx_auto_upload_table.x tmp_sx_mask_style $SUPERX_DIR/db/install/rohdaten/unl/sx_mask_style.unl
-
-
-! echo "Lade Tabelle tmp_stylesheet_field"
-! echo `date`
-
-!sx_auto_upload_table.x tmp_stylesheet_field $SUPERX_DIR/db/install/rohdaten/unl/stylesheet_field.unl
-
-
-! echo "Lade Tabelle tmp_macro_masken_bez"
-! echo `date`
-
-!sx_auto_upload_table.x tmp_macro_masken_bez $SUPERX_DIR/db/install/rohdaten/unl/macro_masken_bez.unl
-
-
-! echo "Lade Tabelle tmp_macro_feld_wert"
-! echo `date`
-
-!sx_auto_upload_table.x tmp_macro_feld_wert $SUPERX_DIR/db/install/rohdaten/unl/macro_feld_wert.unl
-
-
-! echo "Lade Tabelle tmp_sx_captions"
-! echo `date`
-
-!sx_auto_upload_table.x tmp_sx_captions $SUPERX_DIR/db/install/rohdaten/unl/sx_captions.unl
-
-
-! echo "Lade Tabelle tmp_sichten"
-! echo `date`
-
-!sx_auto_upload_table.x tmp_sichten $SUPERX_DIR/db/install/rohdaten/unl/sichten.unl
-
-
-! echo "Lade Tabelle tmp_man_catalogue"
-! echo `date`
-
-!sx_auto_upload_table.x tmp_man_catalogue $SUPERX_DIR/db/install/rohdaten/unl/man_catalogue.unl
-
-
-! echo "Lade Tabelle tmp_man_catalogue_rpt"
-! echo `date`
-
-!sx_auto_upload_table.x tmp_man_catalogue_rpt $SUPERX_DIR/db/install/rohdaten/unl/man_catalogue_rpt.unl
-
-
-! echo "Lade Tabelle tmp_man_zahl_wert"
-! echo `date`
-
-!sx_auto_upload_table.x tmp_man_zahl_wert $SUPERX_DIR/db/install/rohdaten/unl/man_zahl_wert.unl
-
-
-! echo "Lade Tabelle tmp_kenn_zahl_wert"
-! echo `date`
-
-!sx_auto_upload_table.x tmp_kenn_zahl_wert $SUPERX_DIR/db/install/rohdaten/unl/kenn_zahl_wert.unl
-
-
-! echo "Scriptfile $SUPERX_DIR/db/install/schluesseltabellen/trans_tables.sql ausführen"
-! echo `date`
-
-
-!  DOSQL $SUPERX_DIR/db/install/schluesseltabellen/trans_tables.sql
+!sx_auto_upload_table.x kern_cifx_neu $KERN_LOAD_PFAD/unl/cifx.unl
 
 ! DOSQL $SUPERX_DIR/db/install/kern_load_custom.sql

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

@@ -35,10 +35,8 @@ sx_auto_insert_mask 70620
 echo "Maske Nr.  70570 einfügen:"
 cd $SUPERX_DIR/db/install/masken
 sx_auto_insert_mask 70570
-#Maske Nr.70520 Maske ansehen
 #Maske Nr.70580 Feld ansehen
 #Maske Nr.70640 Feld bearbeiten
-#Maske Nr.70550 Tabellenfeld bearbeiten (Text)
 #Maske Nr.70970 User einrichten
 echo "Maske Nr.  70970 einfügen:"
 cd $SUPERX_DIR/db/install/masken
@@ -79,7 +77,7 @@ sx_auto_insert_mask 70160
 echo "Maske Nr.  70170 einfügen:"
 cd $SUPERX_DIR/db/install/masken
 sx_auto_insert_mask 70170
-#Maske Nr.71080 Institution suchen
+#Maske Nr.71080 Organisationseinheiten suchen
 echo "Maske Nr.  71080 einfügen:"
 cd $SUPERX_DIR/db/install/masken
 sx_auto_insert_mask 71080
@@ -119,7 +117,7 @@ sx_auto_insert_mask 71190
 echo "Maske Nr.  71200 einfügen:"
 cd $SUPERX_DIR/db/install/masken
 sx_auto_insert_mask 71200
-#Maske Nr.71260 Entladeparameter suchen
+#Maske Nr.71260 Entladeparameter bearbeiten
 echo "Maske Nr.  71260 einfügen:"
 cd $SUPERX_DIR/db/install/masken
 sx_auto_insert_mask 71260
@@ -163,10 +161,15 @@ sx_auto_insert_mask 71420
 echo "Maske Nr.  71440 einfügen:"
 cd $SUPERX_DIR/db/install/masken
 sx_auto_insert_mask 71440
+#Maske Nr.71480 Organigrammquelle bearbeiten
+echo "Maske Nr.  71480 einfügen:"
+cd $SUPERX_DIR/db/install/masken
+sx_auto_insert_mask 71480
 #Maske Nr.71500 Konstanten bearbeiten
 echo "Maske Nr.  71500 einfügen:"
 cd $SUPERX_DIR/db/install/masken
 sx_auto_insert_mask 71500
+#Maske Nr.71520 Datensieb erstellen
 #Maske Nr.71540 Ladejob ausführen
 echo "Maske Nr.  71540 einfügen:"
 cd $SUPERX_DIR/db/install/masken
@@ -175,11 +178,39 @@ sx_auto_insert_mask 71540
 echo "Maske Nr.  71560 einfügen:"
 cd $SUPERX_DIR/db/install/masken
 sx_auto_insert_mask 71560
-#Maske Nr.71580 Datenanalyse Würfel entwerfen
+#Maske Nr.71580 Verwundbarkeitstest
 echo "Maske Nr.  71580 einfügen:"
 cd $SUPERX_DIR/db/install/masken
 sx_auto_insert_mask 71580
+#Maske Nr.71600 Test abhaengiger Felder
+echo "Maske Nr.  71600 einfügen:"
+cd $SUPERX_DIR/db/install/masken
+sx_auto_insert_mask 71600
 #Maske Nr.71620 Stammdatenverwaltung
 echo "Maske Nr.  71620 einfügen:"
 cd $SUPERX_DIR/db/install/masken
 sx_auto_insert_mask 71620
+#Maske Nr.71640 OrgUnitTests
+echo "Maske Nr.  71640 einfügen:"
+cd $SUPERX_DIR/db/install/masken
+sx_auto_insert_mask 71640
+#Maske Nr.71660 Prüfprotokoll Administration
+echo "Maske Nr.  71660 einfügen:"
+cd $SUPERX_DIR/db/install/masken
+sx_auto_insert_mask 71660
+#Maske Nr.71680 Nutzungsstatistik - Berichte
+echo "Maske Nr.  71680 einfügen:"
+cd $SUPERX_DIR/db/install/masken
+sx_auto_insert_mask 71680
+#Maske Nr.71770 Gastzugang einrichten
+echo "Maske Nr.  71770 einfügen:"
+cd $SUPERX_DIR/db/install/masken
+sx_auto_insert_mask 71770
+#Maske Nr.71800 Stammdaten umschlüsseln
+echo "Maske Nr.  71800 einfügen:"
+cd $SUPERX_DIR/db/install/masken
+sx_auto_insert_mask 71800
+#Maske Nr.71820 Archivierte Daten
+echo "Maske Nr.  71820 einfügen:"
+cd $SUPERX_DIR/db/install/masken
+sx_auto_insert_mask 71820

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

@@ -27,10 +27,8 @@ sx_select_mask 70620
 #Maske Nr.70570 Feld suchen
 cd "$SUPERX_DIR/db/install/masken"
 sx_select_mask 70570
-#Maske Nr.70520 Maske ansehen
 #Maske Nr.70580 Feld ansehen
 #Maske Nr.70640 Feld bearbeiten
-#Maske Nr.70550 Tabellenfeld bearbeiten (Text)
 #Maske Nr.70970 User einrichten
 cd "$SUPERX_DIR/db/install/masken"
 sx_select_mask 70970
@@ -61,7 +59,7 @@ sx_select_mask 70160
 #Maske Nr.70170 Beschriftung suchen 
 cd "$SUPERX_DIR/db/install/masken"
 sx_select_mask 70170
-#Maske Nr.71080 Institution suchen
+#Maske Nr.71080 Organisationseinheiten suchen
 cd "$SUPERX_DIR/db/install/masken"
 sx_select_mask 71080
 #Maske Nr.71090 Themenbaum-Eintrag suchen
@@ -91,7 +89,7 @@ sx_select_mask 71190
 #Maske Nr.71200 Downloadstatistik 
 cd "$SUPERX_DIR/db/install/masken"
 sx_select_mask 71200
-#Maske Nr.71260 Entladeparameter suchen
+#Maske Nr.71260 Entladeparameter bearbeiten
 cd "$SUPERX_DIR/db/install/masken"
 sx_select_mask 71260
 #Maske Nr.71280 Tabelle ausgeben
@@ -124,18 +122,43 @@ sx_select_mask 71420
 #Maske Nr.71440 Bericht Gruppenrahmen
 cd "$SUPERX_DIR/db/install/masken"
 sx_select_mask 71440
+#Maske Nr.71480 Organigrammquelle bearbeiten
+cd "$SUPERX_DIR/db/install/masken"
+sx_select_mask 71480
 #Maske Nr.71500 Konstanten bearbeiten
 cd "$SUPERX_DIR/db/install/masken"
 sx_select_mask 71500
+#Maske Nr.71520 Datensieb erstellen
 #Maske Nr.71540 Ladejob ausführen
 cd "$SUPERX_DIR/db/install/masken"
 sx_select_mask 71540
 #Maske Nr.71560 Hochschul-Repository
 cd "$SUPERX_DIR/db/install/masken"
 sx_select_mask 71560
-#Maske Nr.71580 Datenanalyse Würfel entwerfen
+#Maske Nr.71580 Verwundbarkeitstest
 cd "$SUPERX_DIR/db/install/masken"
 sx_select_mask 71580
+#Maske Nr.71600 Test abhaengiger Felder
+cd "$SUPERX_DIR/db/install/masken"
+sx_select_mask 71600
 #Maske Nr.71620 Stammdatenverwaltung
 cd "$SUPERX_DIR/db/install/masken"
 sx_select_mask 71620
+#Maske Nr.71640 OrgUnitTests
+cd "$SUPERX_DIR/db/install/masken"
+sx_select_mask 71640
+#Maske Nr.71660 Prüfprotokoll Administration
+cd "$SUPERX_DIR/db/install/masken"
+sx_select_mask 71660
+#Maske Nr.71680 Nutzungsstatistik - Berichte
+cd "$SUPERX_DIR/db/install/masken"
+sx_select_mask 71680
+#Maske Nr.71770 Gastzugang einrichten
+cd "$SUPERX_DIR/db/install/masken"
+sx_select_mask 71770
+#Maske Nr.71800 Stammdaten umschlüsseln
+cd "$SUPERX_DIR/db/install/masken"
+sx_select_mask 71800
+#Maske Nr.71820 Archivierte Daten
+cd "$SUPERX_DIR/db/install/masken"
+sx_select_mask 71820

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

@@ -27,14 +27,10 @@ sx_auto_delete_mask 70620
 #Maske Nr.70570 Feld suchen
 sx_auto_delete_mask 70570
 sx_auto_delete_mask 70570
-#Maske Nr.70520 Maske ansehen
-sx_auto_delete_mask 70520
 #Maske Nr.70580 Feld ansehen
 sx_auto_delete_mask 70580
 #Maske Nr.70640 Feld bearbeiten
 sx_auto_delete_mask 70640
-#Maske Nr.70550 Tabellenfeld bearbeiten (Text)
-sx_auto_delete_mask 70550
 #Maske Nr.70970 User einrichten
 sx_auto_delete_mask 70970
 sx_auto_delete_mask 70970
@@ -65,7 +61,7 @@ sx_auto_delete_mask 70160
 #Maske Nr.70170 Beschriftung suchen 
 sx_auto_delete_mask 70170
 sx_auto_delete_mask 70170
-#Maske Nr.71080 Institution suchen
+#Maske Nr.71080 Organisationseinheiten suchen
 sx_auto_delete_mask 71080
 sx_auto_delete_mask 71080
 #Maske Nr.71090 Themenbaum-Eintrag suchen
@@ -95,7 +91,7 @@ sx_auto_delete_mask 71190
 #Maske Nr.71200 Downloadstatistik 
 sx_auto_delete_mask 71200
 sx_auto_delete_mask 71200
-#Maske Nr.71260 Entladeparameter suchen
+#Maske Nr.71260 Entladeparameter bearbeiten
 sx_auto_delete_mask 71260
 sx_auto_delete_mask 71260
 #Maske Nr.71280 Tabelle ausgeben
@@ -128,17 +124,43 @@ sx_auto_delete_mask 71420
 #Maske Nr.71440 Bericht Gruppenrahmen
 sx_auto_delete_mask 71440
 sx_auto_delete_mask 71440
+#Maske Nr.71480 Organigrammquelle bearbeiten
+sx_auto_delete_mask 71480
+sx_auto_delete_mask 71480
 #Maske Nr.71500 Konstanten bearbeiten
 sx_auto_delete_mask 71500
 sx_auto_delete_mask 71500
+#Maske Nr.71520 Datensieb erstellen
+sx_auto_delete_mask 71520
 #Maske Nr.71540 Ladejob ausführen
 sx_auto_delete_mask 71540
 sx_auto_delete_mask 71540
 #Maske Nr.71560 Hochschul-Repository
 sx_auto_delete_mask 71560
 sx_auto_delete_mask 71560
-#Maske Nr.71580 Datenanalyse Würfel entwerfen
+#Maske Nr.71580 Verwundbarkeitstest
 sx_auto_delete_mask 71580
 sx_auto_delete_mask 71580
+#Maske Nr.71600 Test abhaengiger Felder
+sx_auto_delete_mask 71600
+sx_auto_delete_mask 71600
 #Maske Nr.71620 Stammdatenverwaltung
 sx_auto_delete_mask 71620
+#Maske Nr.71640 OrgUnitTests
+sx_auto_delete_mask 71640
+sx_auto_delete_mask 71640
+#Maske Nr.71660 Prüfprotokoll Administration
+sx_auto_delete_mask 71660
+sx_auto_delete_mask 71660
+#Maske Nr.71680 Nutzungsstatistik - Berichte
+sx_auto_delete_mask 71680
+sx_auto_delete_mask 71680
+#Maske Nr.71770 Gastzugang einrichten
+sx_auto_delete_mask 71770
+sx_auto_delete_mask 71770
+#Maske Nr.71800 Stammdaten umschlüsseln
+sx_auto_delete_mask 71800
+sx_auto_delete_mask 71800
+#Maske Nr.71820 Archivierte Daten
+sx_auto_delete_mask 71820
+sx_auto_delete_mask 71820

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

@@ -10,3 +10,7 @@ delete from personattributetype;
 delete from personattribute_value_list;
 delete from user_preset_values;
 delete from sx_portlet;
+delete from kern_cifx_neu;
+delete from kern_pruefrout;
+delete from masken_statistik;
+delete from hisinone_deleted_entity;

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

@@ -1,21 +1,27 @@
 -- XML-generiertes SQL-Script fuer dbaccess--von module_etl.xsl
 --ETL-Schritte erfolgreich beendet.
 create table tmp_datum (datum date);
-
-! if [ -f $KERN_LOAD_PFAD/superx.datum ]; then read DATUM < $KERN_LOAD_PFAD/superx.datum ; echo "$DATUM^" > $KERN_LOAD_PFAD/superx.datum.tmp1; fi 
-! if [ -f $KERN_LOAD_PFAD/superx.datum.tmp1 ]; then sx_auto_upload_table.x tmp_datum $KERN_LOAD_PFAD/superx.datum.tmp1; fi 
-! if [ -f $KERN_LOAD_PFAD/superx.datum.tmp1 ]; then rm $KERN_LOAD_PFAD/superx.datum.tmp1; fi
+! if [ -f $KERN_LOAD_PFAD/superx.datum ]; then sx_auto_upload_table.x tmp_datum $KERN_LOAD_PFAD/superx.datum ; fi 
  
 update systeminfo set datum=(select distinct datum from tmp_datum)
-where 2006 < (select distinct year(datum) from tmp_datum)
+where 1=(select count(*) from tmp_datum)
+and 2006 < (select distinct year(datum) from tmp_datum)
 and name='Administration';
 update systeminfo set datum=today()
-where 2007 > (select distinct year(datum) from tmp_datum)
+where 1=(select count(*) from tmp_datum)
+and 2007 > (select distinct year(datum) from tmp_datum)
 and name='Administration';
+ 
+insert into kern_pruefrout(datum,problem,aktion) select today(),'Datei superx.datum steht auf veraltetem Datum. Stellen Sie sicher, dass superx.datum auf den SuperX-Server kopiert wurde','Warnung'
+ from tmp_datum where year(datum) < 2007
+ or datum is null;
+
 
 
 drop table tmp_datum;
 
+
+
 delete from protokoll where zeitpunkt < 
 (select today()-apnr from konstanten where beschreibung='Löschung Protokoll (Tage)');
 

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

@@ -1,4 +1,31 @@
 -- XML-generiertes SQL-Script fuer dbaccess--von module_etl.xsl
 --ETL-Schritt trans:  Transformation der KERN-Rohdaten
 
+
+select now(),'SQL-Ausdruck truncate table kern_pruefrout; ausführen'
+from xdummy;
+
+truncate table kern_pruefrout;
+		
+
+select now(),'Scriptfile $SUPERX_DIR/db/install/schluesseltabellen/cifx_fuellen2.sql ausführen'
+from xdummy;
+
+
+!  DOSQL $SUPERX_DIR/db/install/schluesseltabellen/cifx_fuellen2.sql
+
+
+select now(),'Scriptfile $SUPERX_DIR/db/install/schluesseltabellen/trans_organigramm_kern.sql ausführen'
+from xdummy;
+
+
+!  DOSQL $SUPERX_DIR/db/install/schluesseltabellen/trans_organigramm_kern.sql
+
+
+select now(),'Scriptfile $SUPERX_DIR/db/install/schluesseltabellen/orgunit_live_mapping_fuellen.sql ausführen'
+from xdummy;
+
+
+!  DOSQL $SUPERX_DIR/db/install/schluesseltabellen/orgunit_live_mapping_fuellen.sql
+
 ! DOSQL $SUPERX_DIR/db/install/kern_trans_custom.sql

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

@@ -1,9 +1,14 @@
 71540^Modus^30^0^0^150^150^1^char^200^0^1^<<SQL>> select distinct '1','Hinzufügen' from sx_jobs where 1=1\
 /* and tid=<<Job>> */\
-and modus_supported=1  union \
+and modus_supported in (1,3)  union \
 select distinct '2','Löschen und Hinzufügen' from sx_jobs where 1=1\
 /* and tid=<<Job>> */\
-and modus_supported=2 order by 1^^^
+and modus_supported in (1,3)\
+union\
+select distinct '3','Vorschau' from sx_jobs where 1=1\
+/* and tid=<<Job>> */\
+and modus_supported=3\
+ order by 1^^^
 71541^Job^20^0^0^150^150^1^integer^200^1^1^<<SQL>> select tid,caption from sx_jobs where\
 sachgebiete_id in (-1 ${UserSachgebiete} -1)\
 /* and sachgebiete_id=<<Sachgebiet>> */\

superx/WEB-INF/conf/edustore/db/install/upgrade/alter_columntype_with_view_deps_pg.sql

@@ -4,7 +4,7 @@
 WITH RECURSIVE vlist AS (
 SELECT c.oid::REGCLASS AS view_name
   FROM pg_class c
- WHERE c.relname IN ('cifx','userinfo','konstanten')
+ WHERE c.relname IN ('cifx','userinfo','konstanten','organigramm')
  UNION ALL
 SELECT DISTINCT r.ev_class::REGCLASS AS view_name
   FROM pg_depend d
@@ -17,7 +17,7 @@ SELECT view_name::text as view_name, v.view_definition,
 from information_schema.columns col where col.table_name::text=vl.view_name::text 
 group by col.table_name) as columns
 FROM vlist vl, information_schema.views v 
-where view_name::text = v.table_name and view_name::text NOT IN ('cifx','userinfo','konstanten');
+where view_name::text = v.table_name and view_name::text NOT IN ('cifx','userinfo','konstanten','organigramm');
 </sqlvar>
 </sqlvars>
 
@@ -35,6 +35,8 @@ alter table cifx alter column lang_3 type varchar(255);
 alter table userinfo alter column benutzer type varchar(255);
 alter table userinfo alter column passwd_sha type varchar(255);
 alter table konstanten alter column beschreibung type varchar(255);
+alter table organigramm alter column drucktext type varchar(255);
+alter table organigramm alter column name type varchar(255);
 
 
 <#foreach view in dependent_views>

superx/WEB-INF/conf/edustore/db/install/upgrade/kern_upgrade_fields_pg.sql

@@ -3156,7 +3156,7 @@ alter table dbconnections add column testsql VARCHAR(255) ;
 select now(),'field organigramm.tid will be added'
 from xdummy;
 
-alter table organigramm add column tid INTEGER  not null;
+alter table organigramm add column tid SERIAL  not null;
 
 </#if>
 
@@ -3186,7 +3186,7 @@ alter table organigramm add column parent CHAR(10) ;
 select now(),'field organigramm.drucktext will be added'
 from xdummy;
 
-alter table organigramm add column drucktext CHAR(50) ;
+alter table organigramm add column drucktext VARCHAR(255) ;
 
 </#if>
 
@@ -3196,7 +3196,7 @@ alter table organigramm add column drucktext CHAR(50) ;
 select now(),'field organigramm.name will be added'
 from xdummy;
 
-alter table organigramm add column name CHAR(150) ;
+alter table organigramm add column name VARCHAR(255) ;
 
 </#if>
 
@@ -3356,7 +3356,7 @@ alter table organigramm_bak add column parent CHAR(10) ;
 select now(),'field organigramm_bak.drucktext will be added'
 from xdummy;
 
-alter table organigramm_bak add column drucktext CHAR(50) ;
+alter table organigramm_bak add column drucktext VARCHAR(255) ;
 
 </#if>
 
@@ -3366,7 +3366,7 @@ alter table organigramm_bak add column drucktext CHAR(50) ;
 select now(),'field organigramm_bak.name will be added'
 from xdummy;
 
-alter table organigramm_bak add column name CHAR(150) ;
+alter table organigramm_bak add column name VARCHAR(255) ;
 
 </#if>
 

superx/WEB-INF/conf/edustore/db/install/upgrade/kern_upgrade_functions_ids.sql

@@ -3,65 +3,65 @@
 --Funktion / Prozedur sp_user_themen
 
 
-! echo "Erzeuge Funktion sp_user_themen"
-! echo `date`
+select now(),'Erzeuge Funktion sp_user_themen'
+from xdummy;
 
 ! DOSQL $SUPERX_DIR/db/install/prozeduren/proc_sp_user_themen_ids.sql
 			--Funktion / Prozedur sp_user_orga
 
 
-! echo "Erzeuge Funktion sp_user_orga"
-! echo `date`
+select now(),'Erzeuge Funktion sp_user_orga'
+from xdummy;
 
 ! DOSQL $SUPERX_DIR/db/install/prozeduren/proc_sp_user_orga_ids.sql
 			--Funktion / Prozedur sp_user_orga_child
 
 
-! echo "Erzeuge Funktion sp_user_orga_child"
-! echo `date`
+select now(),'Erzeuge Funktion sp_user_orga_child'
+from xdummy;
 
 ! DOSQL $SUPERX_DIR/db/install/prozeduren/proc_sp_user_orga_child_ids.sql
 			--Funktion / Prozedur day
 
 
-! echo "Erzeuge Funktion day"
-! echo `date`
+select now(),'Erzeuge Funktion day'
+from xdummy;
 
 --Funktion / Prozedur day
 
 
-! echo "Erzeuge Funktion day"
-! echo `date`
+select now(),'Erzeuge Funktion day'
+from xdummy;
 
 --Funktion / Prozedur month
 
 
-! echo "Erzeuge Funktion month"
-! echo `date`
+select now(),'Erzeuge Funktion month'
+from xdummy;
 
 --Funktion / Prozedur month
 
 
-! echo "Erzeuge Funktion month"
-! echo `date`
+select now(),'Erzeuge Funktion month'
+from xdummy;
 
 --Funktion / Prozedur year
 
 
-! echo "Erzeuge Funktion year"
-! echo `date`
+select now(),'Erzeuge Funktion year'
+from xdummy;
 
 --Funktion / Prozedur year
 
 
-! echo "Erzeuge Funktion year"
-! echo `date`
+select now(),'Erzeuge Funktion year'
+from xdummy;
 
 --Funktion / Prozedur week
 
 
-! echo "Erzeuge Funktion week"
-! echo `date`
+select now(),'Erzeuge Funktion week'
+from xdummy;
 
 
 CREATE FUNCTION week(dt date)
@@ -81,86 +81,86 @@ END FUNCTION;
 --Funktion / Prozedur week
 
 
-! echo "Erzeuge Funktion week"
-! echo `date`
+select now(),'Erzeuge Funktion week'
+from xdummy;
 
 --Funktion / Prozedur second
 
 
-! echo "Erzeuge Funktion second"
-! echo `date`
+select now(),'Erzeuge Funktion second'
+from xdummy;
 
 --Funktion / Prozedur second
 
 
-! echo "Erzeuge Funktion second"
-! echo `date`
+select now(),'Erzeuge Funktion second'
+from xdummy;
 
 --Funktion / Prozedur minute
 
 
-! echo "Erzeuge Funktion minute"
-! echo `date`
+select now(),'Erzeuge Funktion minute'
+from xdummy;
 
 --Funktion / Prozedur minute
 
 
-! echo "Erzeuge Funktion minute"
-! echo `date`
+select now(),'Erzeuge Funktion minute'
+from xdummy;
 
 --Funktion / Prozedur hour
 
 
-! echo "Erzeuge Funktion hour"
-! echo `date`
+select now(),'Erzeuge Funktion hour'
+from xdummy;
 
 --Funktion / Prozedur hour
 
 
-! echo "Erzeuge Funktion hour"
-! echo `date`
+select now(),'Erzeuge Funktion hour'
+from xdummy;
 
 --Funktion / Prozedur current
 
 
-! echo "Erzeuge Funktion current"
-! echo `date`
+select now(),'Erzeuge Funktion current'
+from xdummy;
 
 --Funktion / Prozedur today
 
 
-! echo "Erzeuge Funktion today"
-! echo `date`
+select now(),'Erzeuge Funktion today'
+from xdummy;
 
 --Funktion / Prozedur suchen_ersetzen
 
 
-! echo "Erzeuge Funktion suchen_ersetzen"
-! echo `date`
+select now(),'Erzeuge Funktion suchen_ersetzen'
+from xdummy;
 
 --Funktion / Prozedur weekday
 
 
-! echo "Erzeuge Funktion weekday"
-! echo `date`
+select now(),'Erzeuge Funktion weekday'
+from xdummy;
 
 --Funktion / Prozedur weekday
 
 
-! echo "Erzeuge Funktion weekday"
-! echo `date`
+select now(),'Erzeuge Funktion weekday'
+from xdummy;
 
 --Funktion / Prozedur time_stamp
 
 
-! echo "Erzeuge Funktion time_stamp"
-! echo `date`
+select now(),'Erzeuge Funktion time_stamp'
+from xdummy;
 
 --Funktion / Prozedur date_val
 
 
-! echo "Erzeuge Funktion date_val"
-! echo `date`
+select now(),'Erzeuge Funktion date_val'
+from xdummy;
 
  create procedure date_val(datstr char(100))
     returning date;
@@ -172,50 +172,50 @@ END FUNCTION;
 					--Funktion / Prozedur date
 
 
-! echo "Erzeuge Funktion date"
-! echo `date`
+select now(),'Erzeuge Funktion date'
+from xdummy;
 
 --Funktion / Prozedur nvl
 
 
-! echo "Erzeuge Funktion nvl"
-! echo `date`
+select now(),'Erzeuge Funktion nvl'
+from xdummy;
 
 --Funktion / Prozedur nvl
 
 
-! echo "Erzeuge Funktion nvl"
-! echo `date`
+select now(),'Erzeuge Funktion nvl'
+from xdummy;
 
 --Funktion / Prozedur nvl
 
 
-! echo "Erzeuge Funktion nvl"
-! echo `date`
+select now(),'Erzeuge Funktion nvl'
+from xdummy;
 
 --Funktion / Prozedur nvl
 
 
-! echo "Erzeuge Funktion nvl"
-! echo `date`
+select now(),'Erzeuge Funktion nvl'
+from xdummy;
 
 --Funktion / Prozedur nvl
 
 
-! echo "Erzeuge Funktion nvl"
-! echo `date`
+select now(),'Erzeuge Funktion nvl'
+from xdummy;
 
 --Funktion / Prozedur nvl
 
 
-! echo "Erzeuge Funktion nvl"
-! echo `date`
+select now(),'Erzeuge Funktion nvl'
+from xdummy;
 
 --Funktion / Prozedur now
 
 
-! echo "Erzeuge Funktion now"
-! echo `date`
+select now(),'Erzeuge Funktion now'
+from xdummy;
 
  create procedure now()
     returning datetime year to second;
@@ -225,14 +225,14 @@ end procedure;
 					--Funktion / Prozedur timestamp_to_date
 
 
-! echo "Erzeuge Funktion timestamp_to_date"
-! echo `date`
+select now(),'Erzeuge Funktion timestamp_to_date'
+from xdummy;
 
 --Funktion / Prozedur string_not_null
 
 
-! echo "Erzeuge Funktion string_not_null"
-! echo `date`
+select now(),'Erzeuge Funktion string_not_null'
+from xdummy;
 
 create procedure string_not_null(p_str char(255))
     returning char(255);
@@ -242,32 +242,32 @@ end procedure;
  --Funktion / Prozedur string_not_null
 
 
-! echo "Erzeuge Funktion string_not_null"
-! echo `date`
+select now(),'Erzeuge Funktion string_not_null'
+from xdummy;
 
 --Funktion / Prozedur string_not_null
 
 
-! echo "Erzeuge Funktion string_not_null"
-! echo `date`
+select now(),'Erzeuge Funktion string_not_null'
+from xdummy;
 
 --Funktion / Prozedur string_not_null
 
 
-! echo "Erzeuge Funktion string_not_null"
-! echo `date`
+select now(),'Erzeuge Funktion string_not_null'
+from xdummy;
 
 --Funktion / Prozedur timestamp_str
 
 
-! echo "Erzeuge Funktion timestamp_str"
-! echo `date`
+select now(),'Erzeuge Funktion timestamp_str'
+from xdummy;
 
 --Funktion / Prozedur date_str
 
 
-! echo "Erzeuge Funktion date_str"
-! echo `date`
+select now(),'Erzeuge Funktion date_str'
+from xdummy;
 
 CREATE procedure date_str(datum date) RETURNING varchar(255);
   return '' || datum;
@@ -275,14 +275,14 @@ end procedure;
  --Funktion / Prozedur val
 
 
-! echo "Erzeuge Funktion val"
-! echo `date`
+select now(),'Erzeuge Funktion val'
+from xdummy;
 
 --Funktion / Prozedur val
 
 
-! echo "Erzeuge Funktion val"
-! echo `date`
+select now(),'Erzeuge Funktion val'
+from xdummy;
 
 
  create procedure val(p_str char(255))
@@ -294,26 +294,26 @@ end procedure;
  --Funktion / Prozedur val
 
 
-! echo "Erzeuge Funktion val"
-! echo `date`
+select now(),'Erzeuge Funktion val'
+from xdummy;
 
 --Funktion / Prozedur val
 
 
-! echo "Erzeuge Funktion val"
-! echo `date`
+select now(),'Erzeuge Funktion val'
+from xdummy;
 
 --Funktion / Prozedur val
 
 
-! echo "Erzeuge Funktion val"
-! echo `date`
+select now(),'Erzeuge Funktion val'
+from xdummy;
 
 --Funktion / Prozedur decval
 
 
-! echo "Erzeuge Funktion decval"
-! echo `date`
+select now(),'Erzeuge Funktion decval'
+from xdummy;
 
 
  create procedure decval(p_str varchar(255))
@@ -324,14 +324,14 @@ end procedure;
  --Funktion / Prozedur decval
 
 
-! echo "Erzeuge Funktion decval"
-! echo `date`
+select now(),'Erzeuge Funktion decval'
+from xdummy;
 
 --Funktion / Prozedur decval
 
 
-! echo "Erzeuge Funktion decval"
-! echo `date`
+select now(),'Erzeuge Funktion decval'
+from xdummy;
 
 
  create procedure decval(p_str char(255))
@@ -342,134 +342,147 @@ end procedure;
  --Funktion / Prozedur sp_filter_orga
 
 
-! echo "Erzeuge Funktion sp_filter_orga"
-! echo `date`
+select now(),'Erzeuge Funktion sp_filter_orga'
+from xdummy;
 
 ! DOSQL $SUPERX_DIR/db/install/prozeduren/proc_sp_filter_orga_ids.sql
 			--Funktion / Prozedur sp_update_sequence
 
 
-! echo "Erzeuge Funktion sp_update_sequence"
-! echo `date`
+select now(),'Erzeuge Funktion sp_update_sequence'
+from xdummy;
 
 --Funktion / Prozedur sp_bool_to_smallint
 
 
-! echo "Erzeuge Funktion sp_bool_to_smallint"
-! echo `date`
+select now(),'Erzeuge Funktion sp_bool_to_smallint'
+from xdummy;
 
 --Funktion / Prozedur nvl
 
 
-! echo "Erzeuge Funktion nvl"
-! echo `date`
+select now(),'Erzeuge Funktion nvl'
+from xdummy;
 
 --Funktion / Prozedur nvl
 
 
-! echo "Erzeuge Funktion nvl"
-! echo `date`
+select now(),'Erzeuge Funktion nvl'
+from xdummy;
 
 --Funktion / Prozedur nvl
 
 
-! echo "Erzeuge Funktion nvl"
-! echo `date`
+select now(),'Erzeuge Funktion nvl'
+from xdummy;
 
 --Funktion / Prozedur nvl
 
 
-! echo "Erzeuge Funktion nvl"
-! echo `date`
+select now(),'Erzeuge Funktion nvl'
+from xdummy;
 
 --Funktion / Prozedur sp_get_subquery_str
 
 
-! echo "Erzeuge Funktion sp_get_subquery_str"
-! echo `date`
+select now(),'Erzeuge Funktion sp_get_subquery_str'
+from xdummy;
 
 ! DOSQL $SUPERX_DIR/db/install/prozeduren/proc_get_subquery_str_ids.sql
 			--Funktion / Prozedur sp_get_keylist_str
 
 
-! echo "Erzeuge Funktion sp_get_keylist_str"
-! echo `date`
+select now(),'Erzeuge Funktion sp_get_keylist_str'
+from xdummy;
 
 ! DOSQL $SUPERX_DIR/db/install/prozeduren/proc_get_keylist_str_ids.sql
 			--Funktion / Prozedur sp_get_keylist_str
 
 
-! echo "Erzeuge Funktion sp_get_keylist_str"
-! echo `date`
+select now(),'Erzeuge Funktion sp_get_keylist_str'
+from xdummy;
 
 ! DOSQL $SUPERX_DIR/db/install/prozeduren/proc_get_keylist_str_short_ids.sql
 			--Funktion / Prozedur sp_get_benutzer
 
 
-! echo "Erzeuge Funktion sp_get_benutzer"
-! echo `date`
+select now(),'Erzeuge Funktion sp_get_benutzer'
+from xdummy;
 
 ! DOSQL $SUPERX_DIR/db/install/prozeduren/proc_get_benutzer_ids.sql
 			--Funktion / Prozedur sp_trunc_string
 
 
-! echo "Erzeuge Funktion sp_trunc_string"
-! echo `date`
+select now(),'Erzeuge Funktion sp_trunc_string'
+from xdummy;
 
 --Funktion / Prozedur sp_trunc_string
 
 
-! echo "Erzeuge Funktion sp_trunc_string"
-! echo `date`
+select now(),'Erzeuge Funktion sp_trunc_string'
+from xdummy;
 
 ! DOSQL $SUPERX_DIR/db/install/prozeduren/proc_trunc_string_ids.sql
 			--Funktion / Prozedur sp_table_exists
 
 
-! echo "Erzeuge Funktion sp_table_exists"
-! echo `date`
+select now(),'Erzeuge Funktion sp_table_exists'
+from xdummy;
 
 ! DOSQL $SUPERX_DIR/db/install/prozeduren/proc_sp_table_exists_ids.sql
 			--Funktion / Prozedur sp_view_exists
 
 
-! echo "Erzeuge Funktion sp_view_exists"
-! echo `date`
+select now(),'Erzeuge Funktion sp_view_exists'
+from xdummy;
 
 ! DOSQL $SUPERX_DIR/db/install/prozeduren/proc_sp_view_exists_ids.sql
 			--Funktion / Prozedur today
 
 
-! echo "Erzeuge Funktion today"
-! echo `date`
+select now(),'Erzeuge Funktion today'
+from xdummy;
 
 ! DOSQL $SUPERX_DIR/db/install/prozeduren/proc_today_ids.sql
 			--Funktion / Prozedur to_number
 
 
-! echo "Erzeuge Funktion to_number"
-! echo `date`
+select now(),'Erzeuge Funktion to_number'
+from xdummy;
 
 ! DOSQL $SUPERX_DIR/db/install/prozeduren/proc_to_number_ids.sql
 			--Funktion / Prozedur sp_get_dbform_right
 
 
-! echo "Erzeuge Funktion sp_get_dbform_right"
-! echo `date`
+select now(),'Erzeuge Funktion sp_get_dbform_right'
+from xdummy;
 
 ! DOSQL $SUPERX_DIR/db/install/prozeduren/proc_get_dbform_right_ids.sql
-			--Funktion / Prozedur sp_set_organigramm_eb
+			--Funktion / Prozedur add_sem
 
 
-! echo "Erzeuge Funktion sp_set_organigramm_eb"
-! echo `date`
+select now(),'Erzeuge Funktion add_sem'
+from xdummy;
+
+--Funktion / Prozedur sp_set_organigramm_eb
+
+
+select now(),'Erzeuge Funktion sp_set_organigramm_eb'
+from xdummy;
 
 ! DOSQL $SUPERX_DIR/db/install/prozeduren/proc_set_organigramm_eb_ids.sql
 			--Funktion / Prozedur sp_set_organigramm_lehr
 
 
-! echo "Erzeuge Funktion sp_set_organigramm_lehr"
-! echo `date`
+select now(),'Erzeuge Funktion sp_set_organigramm_lehr'
+from xdummy;
 
 ! DOSQL $SUPERX_DIR/db/install/prozeduren/proc_set_organigramm_lehr_ids.sql
+			--Funktion / Prozedur trim_all_whitespace
+
+
+select now(),'Erzeuge Funktion trim_all_whitespace'
+from xdummy;
+
+! DOSQL $SUPERX_DIR/db/install/prozeduren/trim_all_whitespace_ids.sql
 			

superx/WEB-INF/conf/edustore/db/install/upgrade/kern_upgrade_ids.sql

@@ -1,353 +1,396 @@
 
 --SQL Script automatisch generiert von SuperX module_upgrade.xsl
 
+! DOSQL $SUPERX_DIR/db/install/conf/sx_fields_fuellen.sql
+
 
-! echo "Scriptfile $SUPERX_DIR/db/install/schluesseltabellen/macro_masken_bez_fuellen.sql ausführen"
-! echo `date`
+select now(),'Scriptfile $SUPERX_DIR/db/install/schluesseltabellen/macro_masken_bez_fuellen.sql ausführen'
+from xdummy;
 
 
 !  DOSQL $SUPERX_DIR/db/install/schluesseltabellen/macro_masken_bez_fuellen.sql
 
 
-! echo "Scriptfile $SUPERX_DIR/db/install/schluesseltabellen/dimension_view_droppen.sql ausführen"
-! echo `date`
+select now(),'Scriptfile $SUPERX_DIR/db/install/schluesseltabellen/dimension_view_droppen.sql ausführen'
+from xdummy;
 
 
 !  DOSQL $SUPERX_DIR/db/install/schluesseltabellen/dimension_view_droppen.sql
 
 
-! echo "SQL-Script $SUPERX_DIR/db/install/schluesseltabellen/dimension_view_erzeugen_ids.sql ausführen"
-! echo `date`
+select now(),'SQL-Script $SUPERX_DIR/db/install/schluesseltabellen/dimension_view_erzeugen_ids.sql ausführen'
+from xdummy;
 
 
 !  DOSQL $SUPERX_DIR/db/install/schluesseltabellen/dimension_view_erzeugen_ids.sql
 
 
-! echo "SQL-Ausdruck create table tmp_templates(tid integer,  id char(200)  not null,  content text  not null,  description char(200) ,  comment char(200) ,  version integer   )  ; ausführen"
-! echo `date`
+select now(),'SQL-Ausdruck create table tmp_templates(tid integer,  id char(200)  not null, content text  not null, description char(200) , comment char(200) , version integer ) ; ausführen'
+from xdummy;
 
-create table tmp_templates(tid integer,  id char(200)  not null,  content text  not null,  description char(200) ,  comment char(200) ,  version integer   )  ;
+create table tmp_templates(tid integer,  id char(200)  not null, content text  not null, description char(200) , comment char(200) , version integer ) ;
 		
 
-! echo "SQL-Ausdruck CREATE TABLE tmp_menu_element (     id integer NOT NULL,     element character(255),     element_value character(255),     description character(255),     nature character(255),     annotation character(255) ); ausführen"
-! echo `date`
+select now(),'SQL-Ausdruck CREATE TABLE tmp_menu_element (     id integer NOT NULL,     element character(255),     element_value character(255),     description character(255),     nature character(255),     annotation character(255) ); ausführen'
+from xdummy;
 
 CREATE TABLE tmp_menu_element (     id integer NOT NULL,     element character(255),     element_value character(255),     description character(255),     nature character(255),     annotation character(255) );
 		
 
-! echo "SQL-Ausdruck create table tmp_captions ( tid INTEGER, id CHAR(200) ,  table_name CHAR(200) ,  field_name CHAR(200) ,  record_no INTEGER ,  locale CHAR(10) ,  contents_short CHAR(255) ,  contents_long text ,  equalitystatus SMALLINT ,  sachgebiete_id INTEGER, doku_link VARCHAR, export_to_glossar INTEGER ); ausführen"
-! echo `date`
+select now(),'SQL-Ausdruck create table tmp_captions ( tid INTEGER, id CHAR(200) , table_name CHAR(200) , field_name CHAR(200) , record_no INTEGER , locale CHAR(10) , contents_short CHAR(255) , contents_long text , equalitystatus SMALLINT , sachgebiete_id INTEGER, doku_link VARCHAR, export_to_glossar INTEGER ); ausführen'
+from xdummy;
 
-create table tmp_captions ( tid INTEGER, id CHAR(200) ,  table_name CHAR(200) ,  field_name CHAR(200) ,  record_no INTEGER ,  locale CHAR(10) ,  contents_short CHAR(255) ,  contents_long text ,  equalitystatus SMALLINT ,  sachgebiete_id INTEGER, doku_link VARCHAR, export_to_glossar INTEGER );
+create table tmp_captions ( tid INTEGER, id CHAR(200) , table_name CHAR(200) , field_name CHAR(200) , record_no INTEGER , locale CHAR(10) , contents_short CHAR(255) , contents_long text , equalitystatus SMALLINT , sachgebiete_id INTEGER, doku_link VARCHAR, export_to_glossar INTEGER );
 		
 
-! echo "SQL-Ausdruck create table tmp_repository(  tid SERIAL  not null,  id CHAR(200)  not null,  content TEXT ,  caption CHAR(200) ,  comment TEXT ,  version SMALLINT ,  art CHAR(200) ,  art2 CHAR(200) ,  art3 CHAR(200) ,  sachgebiete_id INTEGER ,  sort1 INTEGER ,  sort2 INTEGER ,  sort3 INTEGER ,  geaendert_am DATE ,  aktiv smallint ,  gueltig_seit DATE ,  gueltig_bis DATE  ); ausführen"
-! echo `date`
+select now(),'SQL-Ausdruck create table tmp_repository(  tid SERIAL  not null, id CHAR(200)  not null, content TEXT , caption CHAR(200) , comment TEXT , version SMALLINT , art CHAR(200) , art2 CHAR(200) , art3 CHAR(200) , sachgebiete_id INTEGER , sort1 INTEGER , sort2 INTEGER , sort3 INTEGER , geaendert_am DATE , aktiv smallint , gueltig_seit DATE , gueltig_bis DATE ); ausführen'
+from xdummy;
 
-create table tmp_repository(  tid SERIAL  not null,  id CHAR(200)  not null,  content TEXT ,  caption CHAR(200) ,  comment TEXT ,  version SMALLINT ,  art CHAR(200) ,  art2 CHAR(200) ,  art3 CHAR(200) ,  sachgebiete_id INTEGER ,  sort1 INTEGER ,  sort2 INTEGER ,  sort3 INTEGER ,  geaendert_am DATE ,  aktiv smallint ,  gueltig_seit DATE ,  gueltig_bis DATE  );
+create table tmp_repository(  tid SERIAL  not null, id CHAR(200)  not null, content TEXT , caption CHAR(200) , comment TEXT , version SMALLINT , art CHAR(200) , art2 CHAR(200) , art3 CHAR(200) , sachgebiete_id INTEGER , sort1 INTEGER , sort2 INTEGER , sort3 INTEGER , geaendert_am DATE , aktiv smallint , gueltig_seit DATE , gueltig_bis DATE );
 		
 
-! echo "Lade Tabelle tmp_templates"
-! echo `date`
+select now(),'Lade Tabelle tmp_templates'
+from xdummy;
 
 !sx_auto_upload_table.x tmp_templates $SUPERX_DIR/db/install/schluesseltabellen/release_unloads/fm_templates.unl
 
 
-! echo "Lade Tabelle tmp_menu_element"
-! echo `date`
+select now(),'Lade Tabelle tmp_menu_element'
+from xdummy;
 
 !sx_upload_records.x tmp_menu_element $SUPERX_DIR/db/install/schluesseltabellen/release_unloads/menu_element.unl
 
 
-! echo "Lade Tabelle tmp_captions"
-! echo `date`
+select now(),'Lade Tabelle tmp_captions'
+from xdummy;
 
 !sx_auto_upload_table.x tmp_captions $SUPERX_DIR/db/install/schluesseltabellen/release_unloads/sx_captions.unl
 
 
-! echo "SQL-Script $SUPERX_DIR/db/install/upgrade/kern_drop_views_ids.sql ausführen"
-! echo `date`
+select now(),'Lade Tabelle k_astat_studienfach_land'
+from xdummy;
+
+!sx_auto_upload_table.x k_astat_studienfach_land $SUPERX_DIR/db/install/schluesseltabellen/release_unloads/k_astat_studienfach_land.unl
+
+
+select now(),'Lade Tabelle k_astat_abschluss3steller_land'
+from xdummy;
+
+!sx_auto_upload_table.x k_astat_abschluss3steller_land $SUPERX_DIR/db/install/schluesseltabellen/release_unloads/k_astat_abschluss3steller_land.unl
+
+
+select now(),'Lade Tabelle k_astat_abschluss2steller'
+from xdummy;
+
+!sx_auto_upload_table.x k_astat_abschluss2steller $SUPERX_DIR/db/install/schluesseltabellen/release_unloads/k_astat_abschluss2steller.unl
+
+
+select now(),'Lade Tabelle k_astat_studienfach'
+from xdummy;
+
+!sx_auto_upload_table.x k_astat_studienfach $SUPERX_DIR/db/install/schluesseltabellen/release_unloads/k_astat_studienfach.unl
+
+
+select now(),'Lade Tabelle k_astat_studienbereich'
+from xdummy;
+
+!sx_auto_upload_table.x k_astat_studienbereich $SUPERX_DIR/db/install/schluesseltabellen/release_unloads/k_astat_studienbereich.unl
+
+
+select now(),'SQL-Script $SUPERX_DIR/db/install/upgrade/kern_drop_views_ids.sql ausführen'
+from xdummy;
 
 
 !  DOSQL $SUPERX_DIR/db/install/upgrade/kern_drop_views_ids.sql
 
 
-! echo "Scriptfile $SUPERX_DIR/db/install/upgrade/kernmodul_upgrade_man.sql ausführen"
-! echo `date`
+select now(),'Scriptfile $SUPERX_DIR/db/install/upgrade/kernmodul_upgrade_man.sql ausführen'
+from xdummy;
 
 
 !  DOSQL $SUPERX_DIR/db/install/upgrade/kernmodul_upgrade_man.sql
 
 
-! echo "SQL-Script $SUPERX_DIR/db/install/upgrade/kern_upgrade_views_ids.sql ausführen"
-! echo `date`
+select now(),'SQL-Script $SUPERX_DIR/db/install/upgrade/kern_upgrade_views_ids.sql ausführen'
+from xdummy;
 
 
 !  DOSQL $SUPERX_DIR/db/install/upgrade/kern_upgrade_views_ids.sql
 
 
-! echo "Scriptfile $SUPERX_DIR/db/install/schluesseltabellen/fm_templates_fuellen.sql ausführen"
-! echo `date`
+select now(),'Scriptfile $SUPERX_DIR/db/install/schluesseltabellen/fm_templates_fuellen.sql ausführen'
+from xdummy;
 
 
 !  DOSQL $SUPERX_DIR/db/install/schluesseltabellen/fm_templates_fuellen.sql
 
 
-! echo "SQL-Ausdruck drop table tmp_templates; ausführen"
-! echo `date`
+select now(),'SQL-Ausdruck drop table tmp_templates; ausführen'
+from xdummy;
 
 drop table tmp_templates;
 		
 
-! echo "Scriptfile $SUPERX_DIR/db/install/upgrade/sx_caption_hs_name.sql ausführen"
-! echo `date`
+select now(),'Scriptfile $SUPERX_DIR/db/install/upgrade/sx_caption_hs_name.sql ausführen'
+from xdummy;
 
 
 !  DOSQL $SUPERX_DIR/db/install/upgrade/sx_caption_hs_name.sql
 
 
-! echo "Scriptfile $SUPERX_DIR/db/install/upgrade/hinweise_entfernen.sql ausführen"
-! echo `date`
+select now(),'Scriptfile $SUPERX_DIR/db/install/upgrade/hinweise_entfernen.sql ausführen'
+from xdummy;
 
 
 !  DOSQL $SUPERX_DIR/db/install/upgrade/hinweise_entfernen.sql
 
 
-! echo "Scriptfile $SUPERX_DIR/db/install/schluesseltabellen/kern_feste_konstanten_fuellen.sql ausführen"
-! echo `date`
+select now(),'Scriptfile $SUPERX_DIR/db/install/schluesseltabellen/kern_feste_konstanten_fuellen.sql ausführen'
+from xdummy;
 
 
 !  DOSQL $SUPERX_DIR/db/install/schluesseltabellen/kern_feste_konstanten_fuellen.sql
 
 
-! echo "Scriptfile $SUPERX_DIR/db/install/schluesseltabellen/proto_funktion_fuellen.sql ausführen"
-! echo `date`
+select now(),'Scriptfile $SUPERX_DIR/db/install/schluesseltabellen/proto_funktion_fuellen.sql ausführen'
+from xdummy;
 
 
 !  DOSQL $SUPERX_DIR/db/install/schluesseltabellen/proto_funktion_fuellen.sql
 
 
-! echo "Scriptfile $SUPERX_DIR/db/install/schluesseltabellen/dbforms_fuellen.sql ausführen"
-! echo `date`
+select now(),'Scriptfile $SUPERX_DIR/db/install/schluesseltabellen/dbforms_fuellen.sql ausführen'
+from xdummy;
 
 
 !  DOSQL $SUPERX_DIR/db/install/schluesseltabellen/dbforms_fuellen.sql
 
 
-! echo "Scriptfile $SUPERX_DIR/db/install/schluesseltabellen/kern_stylesheet_upgrade.sql ausführen"
-! echo `date`
+select now(),'Scriptfile $SUPERX_DIR/db/install/schluesseltabellen/kern_stylesheet_upgrade.sql ausführen'
+from xdummy;
 
 
 !  DOSQL $SUPERX_DIR/db/install/schluesseltabellen/kern_stylesheet_upgrade.sql
 
 
-! echo "Scriptfile $SUPERX_DIR/db/install/upgrade/alter_tid_integer_to_serial.sql ausführen"
-! echo `date`
+select now(),'Scriptfile $SUPERX_DIR/db/install/upgrade/alter_tid_integer_to_serial.sql ausführen'
+from xdummy;
 
 
 !  DOSQL $SUPERX_DIR/db/install/upgrade/alter_tid_integer_to_serial.sql
 
 
-! echo "Scriptfile $SUPERX_DIR/db/install/schluesseltabellen/sichten_fuellen.sql ausführen"
-! echo `date`
+select now(),'Scriptfile $SUPERX_DIR/db/install/schluesseltabellen/sichten_fuellen.sql ausführen'
+from xdummy;
 
 
 !  DOSQL $SUPERX_DIR/db/install/schluesseltabellen/sichten_fuellen.sql
 
 
-! echo "Scriptfile $SUPERX_DIR/db/install/schluesseltabellen/captions_fuellen.sql ausführen"
-! echo `date`
+select now(),'Scriptfile $SUPERX_DIR/db/install/schluesseltabellen/captions_fuellen.sql ausführen'
+from xdummy;
 
 
 !  DOSQL $SUPERX_DIR/db/install/schluesseltabellen/captions_fuellen.sql
 
 
-! echo "SQL-Ausdruck alter table groupinfo modify (name char(255)); ausführen"
-! echo `date`
+select now(),'SQL-Ausdruck alter table groupinfo modify (name char(255)); ausführen'
+from xdummy;
 
 alter table groupinfo modify (name char(255));
 
 
-! echo "SQL-Ausdruck alter table db_tabellen modify (name char(50)); ausführen"
-! echo `date`
+select now(),'SQL-Ausdruck alter table db_tabellen modify (name char(50)); ausführen'
+from xdummy;
 
 alter table db_tabellen modify (name char(50));
 
 
-! echo "SQL-Ausdruck alter table sx_fields modify (is_primarykey integer default 0); ausführen"
-! echo `date`
+select now(),'SQL-Ausdruck alter table sx_fields modify (is_primarykey integer default 0); ausführen'
+from xdummy;
 
 alter table sx_fields modify (is_primarykey integer default 0);
 
 
-! echo "SQL-Ausdruck create table tmp_cifx_load (  tid INTEGER  not null,  hs INTEGER  not null,  key SMALLINT  not null,  apnr CHAR(10)  not null,  d_akt_von DATE ,  d_akt_bis DATE ,  kurz CHAR(10) ,  druck CHAR(100) ,  lang_1 CHAR(100) ,  lang_2 CHAR(150) ,  lang_3 CHAR(250) ,  parent CHAR(10) , parent_int integer, filter CHAR(10) ,  refapnr CHAR(10) ,  astat CHAR(10) ,  bund_apnr CHAR(10) ,  land_apnr CHAR(10) ,  hiskey_id VARCHAR(255) ,  uniquename VARCHAR(255) ,  sort1 INTEGER ,  sort2 INTEGER ,  sort3 INTEGER ,  sortc1 CHAR(10) ,  sortc2 CHAR(10) ,  sourcesystem integer ,  sourcesystem_id VARCHAR(255) ,  intern_int INTEGER ,  intern_c CHAR(10) ,  sprache CHAR(3) ,  struktur_int INTEGER ,  struktur_c CHAR(50) ,  ebene INTEGER, lid  VARCHAR(255), parent_lid  VARCHAR(255) ); ausführen"
-! echo `date`
+select now(),'SQL-Ausdruck create table tmp_cifx_load (  tid INTEGER  not null, hs INTEGER  not null, key SMALLINT  not null, apnr CHAR(10)  not null, d_akt_von DATE , d_akt_bis DATE , kurz CHAR(10) , druck CHAR(100) , lang_1 CHAR(100) , lang_2 CHAR(150) , lang_3 CHAR(250) , parent CHAR(10) , parent_int integer, filter CHAR(10) , refapnr CHAR(10) , astat CHAR(10) , bund_apnr CHAR(10) , land_apnr CHAR(10) , hiskey_id VARCHAR(255) , uniquename VARCHAR(255) , sort1 INTEGER , sort2 INTEGER , sort3 INTEGER , sortc1 CHAR(10) , sortc2 CHAR(10) , sourcesystem integer , sourcesystem_id VARCHAR(255) , intern_int INTEGER , intern_c CHAR(10) , sprache CHAR(3) , struktur_int INTEGER , struktur_c CHAR(50) , ebene INTEGER, lid  VARCHAR(255), parent_lid  VARCHAR(255) ); ausführen'
+from xdummy;
 
-create table tmp_cifx_load (  tid INTEGER  not null,  hs INTEGER  not null,  key SMALLINT  not null,  apnr CHAR(10)  not null,  d_akt_von DATE ,  d_akt_bis DATE ,  kurz CHAR(10) ,  druck CHAR(100) ,  lang_1 CHAR(100) ,  lang_2 CHAR(150) ,  lang_3 CHAR(250) ,  parent CHAR(10) , parent_int integer, filter CHAR(10) ,  refapnr CHAR(10) ,  astat CHAR(10) ,  bund_apnr CHAR(10) ,  land_apnr CHAR(10) ,  hiskey_id VARCHAR(255) ,  uniquename VARCHAR(255) ,  sort1 INTEGER ,  sort2 INTEGER ,  sort3 INTEGER ,  sortc1 CHAR(10) ,  sortc2 CHAR(10) ,  sourcesystem integer ,  sourcesystem_id VARCHAR(255) ,  intern_int INTEGER ,  intern_c CHAR(10) ,  sprache CHAR(3) ,  struktur_int INTEGER ,  struktur_c CHAR(50) ,  ebene INTEGER, lid  VARCHAR(255), parent_lid  VARCHAR(255) );
+create table tmp_cifx_load (  tid INTEGER  not null, hs INTEGER  not null, key SMALLINT  not null, apnr CHAR(10)  not null, d_akt_von DATE , d_akt_bis DATE , kurz CHAR(10) , druck CHAR(100) , lang_1 CHAR(100) , lang_2 CHAR(150) , lang_3 CHAR(250) , parent CHAR(10) , parent_int integer, filter CHAR(10) , refapnr CHAR(10) , astat CHAR(10) , bund_apnr CHAR(10) , land_apnr CHAR(10) , hiskey_id VARCHAR(255) , uniquename VARCHAR(255) , sort1 INTEGER , sort2 INTEGER , sort3 INTEGER , sortc1 CHAR(10) , sortc2 CHAR(10) , sourcesystem integer , sourcesystem_id VARCHAR(255) , intern_int INTEGER , intern_c CHAR(10) , sprache CHAR(3) , struktur_int INTEGER , struktur_c CHAR(50) , ebene INTEGER, lid  VARCHAR(255), parent_lid  VARCHAR(255) );
 		
 
-! echo "SQL-Ausdruck create table tmp_cif_load (  tid INTEGER  not null,  hs INTEGER  not null,  key SMALLINT  not null,  apnr INTEGER  not null,  d_akt_von DATE ,  d_akt_bis DATE ,  kurz CHAR(10) ,  druck CHAR(100) ,  lang_1 CHAR(100) ,  lang_2 CHAR(150) ,  lang_3 CHAR(250), sort1 INTEGER  )  ; ausführen"
-! echo `date`
+select now(),'SQL-Ausdruck create table tmp_cif_load (  tid INTEGER  not null, hs INTEGER  not null, key SMALLINT  not null, apnr INTEGER  not null, d_akt_von DATE , d_akt_bis DATE , kurz CHAR(10) , druck CHAR(100) , lang_1 CHAR(100) , lang_2 CHAR(150) , lang_3 CHAR(250), sort1 INTEGER ) ; ausführen'
+from xdummy;
 
-create table tmp_cif_load (  tid INTEGER  not null,  hs INTEGER  not null,  key SMALLINT  not null,  apnr INTEGER  not null,  d_akt_von DATE ,  d_akt_bis DATE ,  kurz CHAR(10) ,  druck CHAR(100) ,  lang_1 CHAR(100) ,  lang_2 CHAR(150) ,  lang_3 CHAR(250), sort1 INTEGER  )  ;
+create table tmp_cif_load (  tid INTEGER  not null, hs INTEGER  not null, key SMALLINT  not null, apnr INTEGER  not null, d_akt_von DATE , d_akt_bis DATE , kurz CHAR(10) , druck CHAR(100) , lang_1 CHAR(100) , lang_2 CHAR(150) , lang_3 CHAR(250), sort1 INTEGER ) ;
 		
 
-! echo "SQL-Ausdruck create table tmp_portlet( tid SERIAL  not null,  name VARCHAR(255) ,  type VARCHAR(255) ,  class VARCHAR(255) ,  icon VARCHAR(255) ,  content TEXT ,  sortnr_initial INTEGER ,  visible VARCHAR(255) ,  gueltig_von DATE,  gueltig_bis DATE )  ; ausführen"
-! echo `date`
+select now(),'SQL-Ausdruck create table tmp_portlet( tid SERIAL  not null, name VARCHAR(255) , type VARCHAR(255) , class VARCHAR(255) , icon VARCHAR(255) , content TEXT , sortnr_initial INTEGER , visible VARCHAR(255) , gueltig_von DATE, gueltig_bis DATE ) ; ausführen'
+from xdummy;
 
-create table tmp_portlet( tid SERIAL  not null,  name VARCHAR(255) ,  type VARCHAR(255) ,  class VARCHAR(255) ,  icon VARCHAR(255) ,  content TEXT ,  sortnr_initial INTEGER ,  visible VARCHAR(255) ,  gueltig_von DATE,  gueltig_bis DATE )  ;
+create table tmp_portlet( tid SERIAL  not null, name VARCHAR(255) , type VARCHAR(255) , class VARCHAR(255) , icon VARCHAR(255) , content TEXT , sortnr_initial INTEGER , visible VARCHAR(255) , gueltig_von DATE, gueltig_bis DATE ) ;
 		
 
-! echo "Lade Tabelle tmp_cifx_load"
-! echo `date`
+select now(),'Lade Tabelle tmp_cifx_load'
+from xdummy;
 
 !sx_auto_upload_table.x tmp_cifx_load $SUPERX_DIR/db/install/schluesseltabellen/release_unloads/cifx.unl
 
 
-! echo "Lade Tabelle tmp_cif_load"
-! echo `date`
+select now(),'Lade Tabelle tmp_cif_load'
+from xdummy;
 
 !sx_auto_upload_table.x tmp_cif_load $SUPERX_DIR/db/install/schluesseltabellen/release_unloads/cif.unl
 
 
-! echo "Lade Tabelle tmp_portlet"
-! echo `date`
+select now(),'Lade Tabelle tmp_portlet'
+from xdummy;
 
 !sx_auto_upload_table.x tmp_portlet $SUPERX_DIR/db/install/schluesseltabellen/release_unloads/sx_portlet.unl
 
 
-! echo "Lade Tabelle tmp_repository"
-! echo `date`
+select now(),'Lade Tabelle tmp_repository'
+from xdummy;
 
 !sx_auto_upload_table.x tmp_repository $SUPERX_DIR/db/install/schluesseltabellen/release_unloads/sx_repository.unl
 
 
-! echo "Scriptfile $SUPERX_DIR/db/install/schluesseltabellen/cifx_fuellen.sql ausführen"
-! echo `date`
+select now(),'Scriptfile $SUPERX_DIR/db/install/schluesseltabellen/cifx_fuellen.sql ausführen'
+from xdummy;
 
 
 !  DOSQL $SUPERX_DIR/db/install/schluesseltabellen/cifx_fuellen.sql
 
 
-! echo "SQL-Ausdruck alter table trans_inst modify (tid serial); ausführen"
-! echo `date`
+select now(),'SQL-Ausdruck alter table trans_inst modify (tid serial); ausführen'
+from xdummy;
 
 alter table trans_inst modify (tid serial);
 
 
-! echo "Scriptfile $SUPERX_DIR/db/install/schluesseltabellen/sx_stylesheets_fuellen.sql ausführen"
-! echo `date`
+select now(),'Scriptfile $SUPERX_DIR/db/install/schluesseltabellen/sx_stylesheets_fuellen.sql ausführen'
+from xdummy;
 
 
 !  DOSQL $SUPERX_DIR/db/install/schluesseltabellen/sx_stylesheets_fuellen.sql
 
 
-! echo "Scriptfile $SUPERX_DIR/db/install/schluesseltabellen/sx_portlet_fuellen.sql ausführen"
-! echo `date`
+select now(),'Scriptfile $SUPERX_DIR/db/install/schluesseltabellen/sx_portlet_fuellen.sql ausführen'
+from xdummy;
 
 
 !  DOSQL $SUPERX_DIR/db/install/schluesseltabellen/sx_portlet_fuellen.sql
 
 
-! echo "Scriptfile $SUPERX_DIR/db/install/schluesseltabellen/menu_element_fuellen.sql ausführen"
-! echo `date`
+select now(),'Scriptfile $SUPERX_DIR/db/install/schluesseltabellen/menu_element_fuellen.sql ausführen'
+from xdummy;
 
 
 !  DOSQL $SUPERX_DIR/db/install/schluesseltabellen/menu_element_fuellen.sql
 
 
-! echo "SQL-Ausdruck update sx_fields set is_primarykey=0 where is_primarykey is null; ausführen"
-! echo `date`
+select now(),'SQL-Ausdruck update sx_fields set is_primarykey=0 where is_primarykey is null; ausführen'
+from xdummy;
 
 update sx_fields set is_primarykey=0 where is_primarykey is null;
 		
 
-! echo "SQL-Ausdruck drop table tmp_cifx_load; ausführen"
-! echo `date`
+select now(),'SQL-Ausdruck drop table tmp_cifx_load; ausführen'
+from xdummy;
 
 drop table tmp_cifx_load;
 		
 
-! echo "Scriptfile $SUPERX_DIR/db/install/schluesseltabellen/cif_fuellen.sql ausführen"
-! echo `date`
+select now(),'Scriptfile $SUPERX_DIR/db/install/schluesseltabellen/cif_fuellen.sql ausführen'
+from xdummy;
 
 
 !  DOSQL $SUPERX_DIR/db/install/schluesseltabellen/cif_fuellen.sql
 
 
-! echo "Scriptfile $SUPERX_DIR/db/install/upgrade/menu_element_upgrade.sql ausführen"
-! echo `date`
+select now(),'Scriptfile $SUPERX_DIR/db/install/upgrade/menu_element_upgrade.sql ausführen'
+from xdummy;
 
 
 !  DOSQL $SUPERX_DIR/db/install/upgrade/menu_element_upgrade.sql
 
 
-! echo "Scriptfile $SUPERX_DIR/db/install/schluesseltabellen/sx_captions_fuellen.sql ausführen"
-! echo `date`
+select now(),'Scriptfile $SUPERX_DIR/db/install/schluesseltabellen/sx_captions_fuellen.sql ausführen'
+from xdummy;
 
 
 !  DOSQL $SUPERX_DIR/db/install/schluesseltabellen/sx_captions_fuellen.sql
 
 
-! echo "Scriptfile $SUPERX_DIR/db/install/schluesseltabellen/sx_repository_fuellen.sql ausführen"
-! echo `date`
+select now(),'Scriptfile $SUPERX_DIR/db/install/schluesseltabellen/sx_repository_fuellen.sql ausführen'
+from xdummy;
 
 
 !  DOSQL $SUPERX_DIR/db/install/schluesseltabellen/sx_repository_fuellen.sql
 
 
-! echo "Scriptfile $SUPERX_DIR/db/install/schluesseltabellen/sachgebiete_fuellen.sql ausführen"
-! echo `date`
+select now(),'Scriptfile $SUPERX_DIR/db/install/schluesseltabellen/sachgebiete_fuellen.sql ausführen'
+from xdummy;
 
 
 !  DOSQL $SUPERX_DIR/db/install/schluesseltabellen/sachgebiete_fuellen.sql
 
 
-! echo "SQL-Ausdruck drop table tmp_cif_load; ausführen"
-! echo `date`
+select now(),'SQL-Ausdruck drop table tmp_cif_load; ausführen'
+from xdummy;
 
 drop table tmp_cif_load;
 		
 
-! echo "Scriptfile $SUPERX_DIR/db/install/schluesseltabellen/adapt_target_platform.sql ausführen"
-! echo `date`
+select now(),'Scriptfile $SUPERX_DIR/db/install/schluesseltabellen/adapt_target_platform.sql ausführen'
+from xdummy;
 
 
 !  DOSQL $SUPERX_DIR/db/install/schluesseltabellen/adapt_target_platform.sql
 
 
-! echo "Scriptfile $SUPERX_DIR/db/install/masken/remove_obsolete_masks.sql ausführen"
-! echo `date`
+select now(),'Scriptfile $SUPERX_DIR/db/install/masken/remove_obsolete_masks.sql ausführen'
+from xdummy;
 
 
 !  DOSQL $SUPERX_DIR/db/install/masken/remove_obsolete_masks.sql
 
 
-! echo "Fülle db_version"
-! echo `date`
+select now(),'Lade Tabelle dim_datum'
+from xdummy;
+
+!sx_auto_upload_table.x dim_datum $SUPERX_DIR/db/install/schluesseltabellen/release_unloads/dim_datum.unl
+
+
+select now(),'Lade Tabelle aggre_bland'
+from xdummy;
+
+!sx_auto_upload_table.x aggre_bland $SUPERX_DIR/db/install/schluesseltabellen/release_unloads/aggre_bland.unl
+
+
+select now(),'Fülle db_version'
+from xdummy;
 
 
 delete from db_version  where his_system='kern';
-insert into db_version (his_system,version) values('kern','4.9');
+insert into db_version (his_system,version,systeminfo_id) values('kern','5.0',9);
 
 
 
-! echo "Fülle sx_tables, sx_fields und unload_params"
-! echo `date`
+select now(),'Fülle sx_tables und unload_params'
+from xdummy;
 
 
 ! DOSQL $SUPERX_DIR/db/install/conf/sx_tables_fuellen.sql
-! DOSQL $SUPERX_DIR/db/install/conf/sx_fields_fuellen.sql
 ! DOSQL $SUPERX_DIR/db/install/conf/unload_params_fuellen.sql
 
 
-! echo "Fülle db_forms"
-! echo `date`
+select now(),'Fülle db_forms'
+from xdummy;
 
 
 
-! echo "db_forms einfügen"
-! echo `date`
+select now(),'db_forms einfügen'
+from xdummy;
 
  
 CREATE temp TABLE tmp_db_forms (
@@ -359,109 +402,115 @@ CREATE temp TABLE tmp_db_forms (
     description character(255)
 );
 insert into tmp_db_forms (name, tablename,form_path,caption,description)
-values ('sachgebiete','sachgebiete','/edit/kern/sachgebiete_edit.jsp','Sachgebiete verwalten','In diesem Formular können Sie Sachgebiete verwalten.');
+values ('sachgebiete','sachgebiete','/edit/kern/sachgebiete_edit.jsp','Sachgebiete verwalten'::varchar(200),'In diesem Formular können Sie Sachgebiete verwalten.'::varchar(255));
+insert into tmp_db_forms (name, tablename,form_path,caption,description)
+values ('sx_stylesheets','sx_stylesheets','/edit/kern/sx_stylesheets_edit.jsp','Stylesheets verwalten'::varchar(200),'In diesem Formular können Sie XSL-Stylesheets verwalten.'::varchar(255));
 insert into tmp_db_forms (name, tablename,form_path,caption,description)
-values ('sx_stylesheets','sx_stylesheets','/edit/kern/sx_stylesheets_edit.jsp','Stylesheets verwalten','In diesem Formular können Sie XSL-Stylesheets verwalten.');
+values ('organigramm','organigramm','/edit/kern/organigramm_edit.jsp','Organigramm verwalten'::varchar(200),'In diesem Formular können Sie Organisationseinheiten verwalten.'::varchar(255));
 insert into tmp_db_forms (name, tablename,form_path,caption,description)
-values ('organigramm','organigramm','/edit/kern/organigramm_edit.jsp','Organigramm verwalten','In diesem Formular können Sie Institutionen verwalten.');
+values ('organigramm_nodeattrib','organigramm','/edit/kern/organigramm_editnodeattrib.jsp','Organigramm Sichtbarkeit verwalten'::varchar(200),'In diesem Formular können Sie die Sichtbarkeit von Organisationseinheiten verwalten.'::varchar(255));
 insert into tmp_db_forms (name, tablename,form_path,caption,description)
-values ('organigramm_nodeattrib','organigramm','/edit/kern/organigramm_editnodeattrib.jsp','Organigramm Sichtbarkeit verwalten','In diesem Formular können Sie die Sichtbarkeit von Organisationseinheiten verwalten.');
+values ('maskeninfo','maskeninfo','/edit/kern/maskeninfo_edit.jsp','Maskeninfo verwalten'::varchar(200),'In diesem Formular können Sie Maskendefinitionen verwalten.'::varchar(255));
 insert into tmp_db_forms (name, tablename,form_path,caption,description)
-values ('maskeninfo','maskeninfo','/edit/kern/maskeninfo_edit.jsp','Maskeninfo verwalten','In diesem Formular können Sie Masken verwalten.');
+values ('macro_feld_wert_list','macro_feld_wert','/edit/kern/macro_feld_wert_list.jsp','Feld-Vorbelegung von Makro-Masken'::varchar(200),'In diesem Formular können Sie Feld-Vorbelegung von Makro-Masken verwalten.'::varchar(255));
 insert into tmp_db_forms (name, tablename,form_path,caption,description)
-values ('felderinfo','felderinfo','/edit/kern/felderinfo_edit.jsp','Felderinfo verwalten','In diesem Formular können Sie Felder verwalten.');
+values ('felderinfo','felderinfo','/edit/kern/felderinfo_edit.jsp','Felderinfo verwalten'::varchar(200),'In diesem Formular können Sie Felder verwalten.'::varchar(255));
 insert into tmp_db_forms (name, tablename,form_path,caption,description)
-values ('systeminfo','systeminfo','/edit/kern/systeminfo_edit.jsp','Systeminfo verwalten','In diesem Formular können Sie Quellsysteme verwalten.');
+values ('systeminfo','systeminfo','/edit/kern/systeminfo_edit.jsp','Systeminfo verwalten'::varchar(200),'In diesem Formular können Sie Quellsysteme verwalten.'::varchar(255));
 insert into tmp_db_forms (name, tablename,form_path,caption,description)
-values ('user_sachgeb_bez','user_sachgeb_bez','/edit/kern/user_sachgeb_bez_edit.jsp','Benutzer und Sachgebiete verwalten','In diesem Formular können Sie Benutzern Sachgebietsrechte geben. Achtung: Einträge von externem System (HisInOne) werden bei Neuanmeldung überschrieben');
+values ('user_sachgeb_bez','user_sachgeb_bez','/edit/kern/user_sachgeb_bez_edit.jsp','Benutzer und Sachgebiete verwalten'::varchar(200),'In diesem Formular können Sie Benutzern Sachgebietsrechte geben. Achtung: Einträge von externem System (HisInOne) werden bei Neuanmeldung überschrieben'::varchar(255));
 insert into tmp_db_forms (name, tablename,form_path,caption,description)
-values ('user_group_bez','user_group_bez','/edit/kern/user_group_bez_edit.jsp','Benutzer und Gruppen verwalten','In diesem Formular können Sie Benutzer zu Gruppen zuordnen. Achtung: Zuordnung zur Gruppe Administratoren für admins von externem System (HisInOne) werden bei Neuanmeldung überschrieben');
+values ('user_group_bez','user_group_bez','/edit/kern/user_group_bez_edit.jsp','Benutzer und Gruppen verwalten'::varchar(200),'In diesem Formular können Sie Benutzer zu Gruppen zuordnen. Achtung: Zuordnung zur Gruppe Administratoren für admins von externem System (HisInOne) werden bei Neuanmeldung überschrieben'::varchar(255));
 insert into tmp_db_forms (name, tablename,form_path,caption,description)
-values ('user_masken_bez','user_masken_bez','/edit/kern/user_masken_bez_edit.jsp','Maskenrechte von Benutzern','In diesem Formular können Sie Benutzern Rechte auf einzelne Masken geben.');
+values ('user_masken_bez','user_masken_bez','/edit/kern/user_masken_bez_edit.jsp','Maskenrechte von Benutzern'::varchar(200),'In diesem Formular können Sie Benutzern Rechte auf einzelne Masken geben.'::varchar(255));
 insert into tmp_db_forms (name, tablename,form_path,caption,description)
-values ('user_institution','user_institution','/edit/kern/user_institution_edit.jsp','Institutionsrechte von Benutzern','In diesem Formular können Sie Benutzern Rechte auf einzelne Insitutionen geben. Achtung: Einträge von externem System (HisInOne) werden bei Neuanmeldung überschrieben');
+values ('user_institution','user_institution','/edit/kern/user_institution_edit.jsp','Institutionsrechte von Benutzern'::varchar(200),'In diesem Formular können Sie Benutzern Rechte auf einzelne Insitutionen geben. Achtung: Einträge von externem System (HisInOne) werden bei Neuanmeldung überschrieben'::varchar(255));
 insert into tmp_db_forms (name, tablename,form_path,caption,description)
-values ('themenbaum_edit','themenbaum','/edit/kern/themenbaum_edit.jsp','Themenbaum','In diesem Formular können Sie den Themenbaum bearbeiten. Bitte beachten Sie: bei Änderungen muss der Themenbaum neu geladen werden (SuperXManager)');
+values ('themenbaum_edit','themenbaum','/edit/kern/themenbaum_edit.jsp','Themenbaum'::varchar(200),'In diesem Formular können Sie den Themenbaum bearbeiten. Bitte beachten Sie: bei Änderungen muss der Themenbaum neu geladen werden (SuperXManager)'::varchar(255));
 insert into tmp_db_forms (name, tablename,form_path,caption,description)
-values ('sichten','sichten','/edit/kern/sichten_edit.jsp','Sichten','In diesem Formular können Sie Sichten auf das Organigramm verwalten.');
+values ('sichten','sichten','/edit/kern/sichten_edit.jsp','Sichten'::varchar(200),'In diesem Formular können Sie Sichten auf das Organigramm verwalten.'::varchar(255));
 insert into tmp_db_forms (name, tablename,form_path,caption,description)
-values ('sachgeb_maske_bez','sachgeb_maske_bez','/edit/kern/sachgeb_maske_bez_edit.jsp','Masken und Sachgebiete','In diesem Formular können Sie Masken zu Sachgebieten zuordnen.');
+values ('sachgeb_maske_bez','sachgeb_maske_bez','/edit/kern/sachgeb_maske_bez_edit.jsp','Masken und Sachgebiete'::varchar(200),'In diesem Formular können Sie Masken zu Sachgebieten zuordnen.'::varchar(255));
 insert into tmp_db_forms (name, tablename,form_path,caption,description)
-values ('masken_felder_bez','masken_felder_bez','/edit/kern/masken_felder_bez_edit.jsp','Masken und Felder','In diesem Formular können Sie Felder zu Masken zuordnen.');
+values ('masken_felder_bez','masken_felder_bez','/edit/kern/masken_felder_bez_edit.jsp','Masken und Felder'::varchar(200),'In diesem Formular können Sie Felder zu Masken zuordnen.'::varchar(255));
 insert into tmp_db_forms (name, tablename,form_path,caption,description)
-values ('maske_system_bez','maske_system_bez','/edit/kern/maske_system_bez_edit.jsp','Masken und Systeme','In diesem Formular können Sie Masken zu Quellsystemen zuordnen.');
+values ('maske_system_bez','maske_system_bez','/edit/kern/maske_system_bez_edit.jsp','Masken und Systeme'::varchar(200),'In diesem Formular können Sie Masken zu Quellsystemen zuordnen.'::varchar(255));
 insert into tmp_db_forms (name, tablename,form_path,caption,description)
-values ('macro_masken_bez','macro_masken_bez','/edit/kern/macro_masken_bez_edit.jsp','Masken und Makros (Einzelbearbeitung)','In diesem Formular können Sie Masken zu Makros zuordnen.');
+values ('macro_masken_bez','macro_masken_bez','/edit/kern/macro_masken_bez_edit.jsp','Masken und Makros'::varchar(200),'In diesem Formular können Sie Masken zu Makros zuordnen.'::varchar(255));
 insert into tmp_db_forms (name, tablename,form_path,caption,description)
-values ('macro_masken_bez_list','macro_masken_bez','/edit/kern/macro_masken_bez_list.jsp','Masken und Makros (Liste)','In diesem Formular können Sie Masken zu Makros zuordnen.');
+values ('macro_masken_bez_list','macro_masken_bez','/edit/kern/macro_masken_bez_list.jsp','Masken und Makros'::varchar(200),'In diesem Formular können Sie Masken zu Makros zuordnen.'::varchar(255));
 insert into tmp_db_forms (name, tablename,form_path,caption,description)
-values ('konstanten','konstanten','/edit/kern/konstanten_edit.jsp','Konstanten','In diesem Formular können Sie Konstanten verwalten.');
+values ('konstanten','konstanten','/edit/kern/konstanten_edit.jsp','Konstanten'::varchar(200),'In diesem Formular können Sie Konstanten verwalten.'::varchar(255));
 insert into tmp_db_forms (name, tablename,form_path,caption,description)
-values ('konstante','konstanten','/edit/kern/konstante_edit.jsp','Konstante verwalten','');
+values ('konstante','konstanten','/edit/kern/konstante_edit.jsp','Konstante verwalten'::varchar(200),''::varchar(255));
 insert into tmp_db_forms (name, tablename,form_path,caption,description)
-values ('hochschulinfo','hochschulinfo','/edit/kern/hochschulinfo_edit.jsp','Hochschulinfo','In diesem Formular können Infos zu Ihrer Hochschule speichern. Bitte ordnen Sie Ihre Hochschule im Feld Hochschulnummer (HIS) zu.');
+values ('hochschulinfo','hochschulinfo','/edit/kern/hochschulinfo_edit.jsp','Hochschulinfo'::varchar(200),'In diesem Formular können Infos zu Ihrer Hochschule speichern. Bitte ordnen Sie Ihre Hochschule im Feld Hochschulnummer (HIS) zu.'::varchar(255));
 insert into tmp_db_forms (name, tablename,form_path,caption,description)
-values ('group_sachgeb_bez','group_sachgeb_bez','/edit/kern/group_sachgeb_bez_edit.jsp','Gruppen und Sachgebiete','In diesem Formular können Sie Gruppen zu Sachgebieten zuordnen.');
+values ('group_sachgeb_bez','group_sachgeb_bez','/edit/kern/group_sachgeb_bez_edit.jsp','Gruppen und Sachgebiete'::varchar(200),'In diesem Formular können Sie Gruppen zu Sachgebieten zuordnen.'::varchar(255));
 insert into tmp_db_forms (name, tablename,form_path,caption,description)
-values ('group_masken_bez','group_masken_bez','/edit/kern/group_masken_bez_edit.jsp','Gruppen und Masken','In diesem Formular können Sie Gruppen zu einzelnen Masken zuordnen.');
+values ('group_masken_bez','group_masken_bez','/edit/kern/group_masken_bez_edit.jsp','Gruppen und Masken'::varchar(200),'In diesem Formular können Sie Gruppen zu einzelnen Masken zuordnen.'::varchar(255));
 insert into tmp_db_forms (name, tablename,form_path,caption,description)
-values ('group_masken_bez','group_masken_bez','/edit/kern/group_masken_bez_edit.jsp','Gruppen und Masken','In diesem Formular können Sie Gruppen zu einzelnen Masken zuordnen.');
+values ('group_masken_bez','group_masken_bez','/edit/kern/group_masken_bez_edit.jsp','Gruppen und Masken'::varchar(200),'In diesem Formular können Sie Gruppen zu einzelnen Masken zuordnen.'::varchar(255));
 insert into tmp_db_forms (name, tablename,form_path,caption,description)
-values ('user_sichten','user_sichten','/edit/kern/user_sichten_edit.jsp','Benutzer und Sichten','In diesem Formular können Sie User-Rechte für Sichten bearbeiten. Bitte beachten Sie: bei Änderungen an den Sichten muss der Themenbaum neu geladen werden (SuperXManager)');
+values ('user_sichten','user_sichten','/edit/kern/user_sichten_edit.jsp','Benutzer und Sichten'::varchar(200),'In diesem Formular können Sie User-Rechte für Sichten bearbeiten. Bitte beachten Sie: bei Änderungen an den Sichten muss der Themenbaum neu geladen werden (SuperXManager)'::varchar(255));
 insert into tmp_db_forms (name, tablename,form_path,caption,description)
-values ('group_sichten','group_sichten','/edit/kern/group_sichten_edit.jsp','Gruppen und Sichten','In diesem Formular können Sie Gruppen-Rechte für Sichten bearbeiten. Bitte beachten Sie: bei Änderungen an den Sichten muss der Themenbaum neu geladen werden (SuperXManager)');
+values ('group_sichten','group_sichten','/edit/kern/group_sichten_edit.jsp','Gruppen und Sichten'::varchar(200),'In diesem Formular können Sie Gruppen-Rechte für Sichten bearbeiten. Bitte beachten Sie: bei Änderungen an den Sichten muss der Themenbaum neu geladen werden (SuperXManager)'::varchar(255));
 insert into tmp_db_forms (name, tablename,form_path,caption,description)
-values ('sx_captions','sx_captions','/edit/kern/sx_captions_edit.jsp','Beschriftungen','In diesem Formular können Sie Beschriftungen bearbeiten. Für Masken- und Spalten- und Felderläuterungen.');
+values ('sx_captions','sx_captions','/edit/kern/sx_captions_edit.jsp','Beschriftungen'::varchar(200),'In diesem Formular können Sie Beschriftungen bearbeiten. Für Masken- und Spalten- und Felderläuterungen.'::varchar(255));
 insert into tmp_db_forms (name, tablename,form_path,caption,description)
-values ('user_sichtarten','user_sichtarten','/edit/kern/user_sichtarten_edit.jsp','Benutzer und Sichtarten','In diesem Formular können Sie User-Rechte für Sichtarten bearbeiten. Bitte beachten Sie: bei Änderungen an den Sichten muss der Themenbaum neu geladen werden (SuperXManager)');
+values ('user_sichtarten','user_sichtarten','/edit/kern/user_sichtarten_edit.jsp','Benutzer und Sichtarten'::varchar(200),'In diesem Formular können Sie User-Rechte für Sichtarten bearbeiten. Bitte beachten Sie: bei Änderungen an den Sichten muss der Themenbaum neu geladen werden (SuperXManager)'::varchar(255));
 insert into tmp_db_forms (name, tablename,form_path,caption,description)
-values ('group_sichtarten','group_sichtarten','/edit/kern/group_sichtarten_edit.jsp','Gruppen und Sichtarten','In diesem Formular können Sie Gruppen-Rechte für Sichtarten bearbeiten. Bitte beachten Sie: bei Änderungen an den Sichten muss der Themenbaum neu geladen werden (SuperXManager)');
+values ('group_sichtarten','group_sichtarten','/edit/kern/group_sichtarten_edit.jsp','Gruppen und Sichtarten'::varchar(200),'In diesem Formular können Sie Gruppen-Rechte für Sichtarten bearbeiten. Bitte beachten Sie: bei Änderungen an den Sichten muss der Themenbaum neu geladen werden (SuperXManager)'::varchar(255));
 insert into tmp_db_forms (name, tablename,form_path,caption,description)
-values ('sx_repository_edit','sx_repository','/edit/kern/sx_repository_edit.jsp','Hochschul-Repository','In diesem Formular können Sie hochschulspezifische Konstanten oder SQL-Ausdrücke bearbeiten.');
+values ('sx_repository_edit','sx_repository','/edit/kern/sx_repository_edit.jsp','Hochschul-Repository'::varchar(200),'In diesem Formular können Sie hochschulspezifische Konstanten oder SQL-Ausdrücke bearbeiten.'::varchar(255));
 insert into tmp_db_forms (name, tablename,form_path,caption,description)
-values ('sx_repository_list','sx_repository','/edit/kern/sx_repository_list.jsp','Hochschul-Repository','In diesem Formular können Sie hochschulspezifische Konstanten oder SQL-Ausdrücke bearbeiten.');
+values ('sx_repository_list','sx_repository','/edit/kern/sx_repository_list.jsp','Hochschul-Repository'::varchar(200),'In diesem Formular können Sie hochschulspezifische Konstanten oder SQL-Ausdrücke bearbeiten.'::varchar(255));
 insert into tmp_db_forms (name, tablename,form_path,caption,description)
-values ('sx_downloads','sx_downloads','/edit/kern/sx_downloads_edit.jsp','Downloads','In diesem Formular können Sie Downloads bearbeiten. ');
+values ('sx_downloads','sx_downloads','/edit/kern/sx_downloads_edit.jsp','Downloads'::varchar(200),'In diesem Formular können Sie Downloads bearbeiten. '::varchar(255));
 insert into tmp_db_forms (name, tablename,form_path,caption,description)
-values ('sx_keywords','sx_keywords','/edit/kern/sx_keywords_edit.jsp','Stichworte','In diesem Formular können Sie Stichworte bearbeiten. ');
+values ('sx_keywords','sx_keywords','/edit/kern/sx_keywords_edit.jsp','Stichworte'::varchar(200),'In diesem Formular können Sie Stichworte bearbeiten. '::varchar(255));
 insert into tmp_db_forms (name, tablename,form_path,caption,description)
-values ('sachgeb_sichten','sachgeb_sichten','/edit/kern/sachgeb_sichten_edit.jsp','Zuordnung Sichten zu Sachgebieten','In diesem Formular können Sie Sichten zu Sachgebieten zuordnen. ');
+values ('sachgeb_sichten','sachgeb_sichten','/edit/kern/sachgeb_sichten_edit.jsp','Zuordnung Sichten zu Sachgebieten'::varchar(200),'In diesem Formular können Sie Sichten zu Sachgebieten zuordnen. '::varchar(255));
 insert into tmp_db_forms (name, tablename,form_path,caption,description)
-values ('sachgeb_sichtarten','sachgeb_sichtarten','/edit/kern/sachgeb_sichtarten_edit.jsp','Zuordnung Sichtarten zu Sachgebieten','In diesem Formular können Sie Sichtarten zu Sachgebieten zuordnen. ');
+values ('sachgeb_sichtarten','sachgeb_sichtarten','/edit/kern/sachgeb_sichtarten_edit.jsp','Zuordnung Sichtarten zu Sachgebieten'::varchar(200),'In diesem Formular können Sie Sichtarten zu Sachgebieten zuordnen. '::varchar(255));
 insert into tmp_db_forms (name, tablename,form_path,caption,description)
-values ('unload_params','unload_params','/edit/kern/unload_params_edit.jsp','Entladeparameter verwalten','');
+values ('unload_params','unload_params','/edit/kern/unload_params_edit.jsp','Entladeparameter verwalten'::varchar(200),''::varchar(255));
 insert into tmp_db_forms (name, tablename,form_path,caption,description)
-values ('trans_inst_list','trans_inst','/edit/kern/trans_inst_list.jsp','Kostenstellen transformieren (Liste)','In diesem Formular können Sie Kostenstellen umschlüsseln.');
+values ('trans_inst_list','trans_inst','/edit/kern/trans_inst_list.jsp','Kostenstellen transformieren (Liste)'::varchar(200),'In diesem Formular können Sie Kostenstellen umschlüsseln.'::varchar(255));
 insert into tmp_db_forms (name, tablename,form_path,caption,description)
-values ('trans_inst_edit','trans_inst','/edit/kern/trans_inst_edit.jsp','Kostenstellen transformieren (Details)','In diesem Formular können Sie Kostenstellen umschlüsseln.');
+values ('trans_inst_edit','trans_inst','/edit/kern/trans_inst_edit.jsp','Kostenstellen transformieren (Details)'::varchar(200),'In diesem Formular können Sie Kostenstellen umschlüsseln.'::varchar(255));
 insert into tmp_db_forms (name, tablename,form_path,caption,description)
-values ('data_upload_edit','data_upload','/edit/kern/data_upload_edit.jsp','Verzeichnis der Datei-Uploads','In diesem Formular können Sie Uploads bearbeiten. ');
+values ('data_upload_edit','data_upload','/edit/kern/data_upload_edit.jsp','Verzeichnis der Datei-Uploads'::varchar(200),'In diesem Formular können Sie Uploads bearbeiten. '::varchar(255));
 insert into tmp_db_forms (name, tablename,form_path,caption,description)
-values ('stylesheet_field_edit','stylesheet_field','/edit/kern/stylesheet_field_edit.jsp','Stylesheets und zugehörige Felder','In diesem Formular können Sie von Stylesheets benötigte Felder entsprechend zuordnen.');
+values ('stylesheet_field_edit','stylesheet_field','/edit/kern/stylesheet_field_edit.jsp','Stylesheets und zugehörige Felder'::varchar(200),'In diesem Formular können Sie von Stylesheets benötigte Felder entsprechend zuordnen.'::varchar(255));
 insert into tmp_db_forms (name, tablename,form_path,caption,description)
-values ('stylesheet_field_list','stylesheet_field','/edit/kern/stylesheet_field_list.jsp','Stylesheets und zugehörige Felder','In diesem Formular können Sie von Stylesheets benötigte Felder entsprechend zuordnen.');
+values ('stylesheet_field_list','stylesheet_field','/edit/kern/stylesheet_field_list.jsp','Stylesheets und zugehörige Felder'::varchar(200),'In diesem Formular können Sie von Stylesheets benötigte Felder entsprechend zuordnen.'::varchar(255));
 insert into tmp_db_forms (name, tablename,form_path,caption,description)
-values ('group_field_pref_edit','group_field_pref','/edit/kern/group_field_pref_edit.jsp','Gruppen Feldattribute zuweisen','In diesem Formular können Sie Feldern in Masken für bestimmte Gruppen Attribute wie Verstecken zuweisen.');
+values ('group_field_pref_edit','group_field_pref','/edit/kern/group_field_pref_edit.jsp','Gruppen Feldattribute zuweisen'::varchar(200),'In diesem Formular können Sie Feldern in Masken für bestimmte Gruppen Attribute wie Verstecken zuweisen.'::varchar(255));
 insert into tmp_db_forms (name, tablename,form_path,caption,description)
-values ('group_field_pref_list','group_field_pref','/edit/kern/group_field_pref_list.jsp','Gruppen Felderattribute zuweisen','In diesem Formular können Sie Feldern in Masken für bestimmte Gruppen Attribute wie Verstecken zuweisen.');
+values ('group_field_pref_list','group_field_pref','/edit/kern/group_field_pref_list.jsp','Gruppen Felderattribute zuweisen'::varchar(200),'In diesem Formular können Sie Feldern in Masken für bestimmte Gruppen Attribute wie Verstecken zuweisen.'::varchar(255));
 insert into tmp_db_forms (name, tablename,form_path,caption,description)
-values ('fm_templates_list','fm_templates','/edit/kern/fm_templates_list.jsp','Freemarker-Templates bearbeiten','In diesem Formular können Sie Freemarker-Templates verwalten.');
+values ('fm_templates_list','fm_templates','/edit/kern/fm_templates_list.jsp','Freemarker-Templates bearbeiten'::varchar(200),'In diesem Formular können Sie Freemarker-Templates verwalten.'::varchar(255));
 insert into tmp_db_forms (name, tablename,form_path,caption,description)
-values ('fm_templates_edit','fm_templates','/edit/kern/fm_templates_edit.jsp','Freemarker-Templates bearbeiten','In diesem Formular können Sie Freemarker-Templates verwalten.');
+values ('fm_templates_edit','fm_templates','/edit/kern/fm_templates_edit.jsp','Freemarker-Templates bearbeiten'::varchar(200),'In diesem Formular können Sie Freemarker-Templates verwalten.'::varchar(255));
 insert into tmp_db_forms (name, tablename,form_path,caption,description)
-values ('dbconnections_list','dbconnections','/edit/kern/dbconnections_list.jsp','DB-Connections','In diesem Formular können Sie DB Connections bearbeiten.');
+values ('dbconnections_list','dbconnections','/edit/kern/dbconnections_list.jsp','DB-Connections'::varchar(200),'In diesem Formular können Sie DB Connections bearbeiten.'::varchar(255));
 insert into tmp_db_forms (name, tablename,form_path,caption,description)
-values ('portlets_list','sx_portlet','/edit/kern/portlets_list.jsp','Portlets','In diesem Formular können Sie Portlets bearbeiten.');
+values ('portlets_list','sx_portlet','/edit/kern/portlets_list.jsp','Portlets'::varchar(200),'In diesem Formular können Sie Portlets bearbeiten.'::varchar(255));
 insert into tmp_db_forms (name, tablename,form_path,caption,description)
-values ('sichtart_rechttabelle_list','sichtart_rechttabelle','/edit/kern/sichtart_rechttabelle_list.jsp','Spezielle Sichtart-Rechte','In diesem Formular können Sie Rechtetabellen für Sichtarten bearbeiten.');
+values ('sichtart_rechttabelle_list','sichtart_rechttabelle','/edit/kern/sichtart_rechttabelle_list.jsp','Spezielle Sichtart-Rechte'::varchar(200),'In diesem Formular können Sie Rechtetabellen für Sichtarten bearbeiten.'::varchar(255));
 insert into tmp_db_forms (name, tablename,form_path,caption,description)
-values ('sichtart_rechttabelle_edit','sichtart_rechttabelle','/edit/kern/sichtart_rechttabelle_edit.jsp','Spezielle Sichtart-Rechte Einzelbarbeitung','In diesem Formular können Sie Rechtetabellen für Sichtarten bearbeiten.');
+values ('sichtart_rechttabelle_edit','sichtart_rechttabelle','/edit/kern/sichtart_rechttabelle_edit.jsp','Spezielle Sichtart-Rechte Einzelbarbeitung'::varchar(200),'In diesem Formular können Sie Rechtetabellen für Sichtarten bearbeiten.'::varchar(255));
 insert into tmp_db_forms (name, tablename,form_path,caption,description)
-values ('sx_jobs_edit','sx_jobs','/edit/kern/sx_jobs_edit.jsp','Ladejobs verwalten','In diesem Formular können Sie Ladejobs verwalten');
+values ('sx_jobs_edit','sx_jobs','/edit/kern/sx_jobs_edit.jsp','Ladejobs verwalten'::varchar(200),'In diesem Formular können Sie Ladejobs verwalten'::varchar(255));
 insert into tmp_db_forms (name, tablename,form_path,caption,description)
-values ('sx_jobs_list','sx_jobs','/edit/kern/sx_jobs_list.jsp','Ladejobs verwalten','In diesem Formular können Sie Ladejobs verwalten');
+values ('sx_jobs_list','sx_jobs','/edit/kern/sx_jobs_list.jsp','Ladejobs verwalten'::varchar(200),'In diesem Formular können Sie Ladejobs verwalten'::varchar(255));
 insert into tmp_db_forms (name, tablename,form_path,caption,description)
-values ('organigramm_list','organigramm','/edit/kern/organigramm_list.jsp','Organigramm','In diesem Formular können Sie das Organigramm aufrufen');
+values ('organigramm_list','organigramm','/edit/kern/organigramm_list.jsp','Organigramm'::varchar(200),'In diesem Formular können Sie das Organigramm aufrufen'::varchar(255));
+insert into tmp_db_forms (name, tablename,form_path,caption,description)
+values ('sx_stylesheet_param_edit','sx_stylesheet_param','/edit/kern/sx_stylesheet_param_edit.jsp','Stylesheet-Parameter'::varchar(200),'In diesem Formular können Sie Stylesheet-Parameter bearbeiten.'::varchar(255));
+insert into tmp_db_forms (name, tablename,form_path,caption,description)
+values ('sx_stylesheet_param_list','sx_stylesheet_param','/edit/kern/sx_stylesheet_param_list.jsp','Stylesheet-Parameter'::varchar(200),'In diesem Formular können Sie Stylesheet-Parameter bearbeiten.'::varchar(255));
 
 create temp table tmp_hilf(tid integer);
 insert into tmp_hilf select max(tid) from db_forms;
@@ -475,5 +524,3 @@ from tmp_db_forms D, tmp_hilf H;
 
 drop table tmp_hilf;
 drop table tmp_db_forms;
-
-! DOSQL $SUPERX_DIR/db/install/kern_install_custom.sql

superx/WEB-INF/conf/edustore/db/install/upgrade/kern_upgrade_indexes_ids.sql

@@ -38,6 +38,7 @@ and (systables.tabname
 'cifx',
 'trans_cifx',
 'trans_cif',
+'cifx_customize',
 'felderinfo',
 'hochschulinfo',
 'maske_system_bez',
@@ -63,6 +64,7 @@ and (systables.tabname
 'lehreinheit_inst',
 'sx_stylesheets',
 'sx_mask_style',
+'sx_stylesheet_param',
 'sx_captions',
 'fm_templates',
 'user_sichten',
@@ -107,18 +109,38 @@ and (systables.tabname
 'sx_portlet',
 'user_portlet_bez',
 'group_portlet_bez',
+'kern_cifx_neu',
 'sieve',
 'sieve_column_def',
 'sieve_column',
 'sieve_field',
 'sx_jobs',
+'orgunit_mapping',
+'implicit_orgunit_rights',
+'kern_pruefrout',
+'masken_statistik',
+'dim_datum',
+'hisinone_deleted_entity',
+'etl_step',
+'etl_step_type',
+'etl_step_type_param',
+'etl_step_property',
+'etl_step_relation',
+'etl_job',
+'etl_job_param',
+'k_astat_studienfach_land',
+'k_astat_abschluss3steller_land',
+'k_astat_abschluss2steller',
+'k_astat_studienbereich',
+'k_astat_studienfach',
+'colorscheme',
 'sx_mail'
 ));</sqlvar>
 </sqlvars>
 
 
-! echo "Checking indexes"
-! echo `date`
+select now(),'Checking indexes'
+from xdummy;
 
 
 <#assign exists="false" />
@@ -131,15 +153,15 @@ and (systables.tabname
 <#if exists="true" >
 
 
-! echo "index ix_group_felder2 exists - fine"
-! echo `date`
+select now(),'index ix_group_felder2 exists - fine'
+from xdummy;
 
 
 <#else>
 
 
-! echo "Erzeuge Index ix_group_felder2"
-! echo `date`
+select now(),'Erzeuge Index ix_group_felder2'
+from xdummy;
 
 create  index ix_group_felder2 on group_field_pref (groupinfo_id );
 
@@ -155,15 +177,15 @@ create  index ix_group_felder2 on group_field_pref (groupinfo_id );
 <#if exists="true" >
 
 
-! echo "index ix_style_feld2 exists - fine"
-! echo `date`
+select now(),'index ix_style_feld2 exists - fine'
+from xdummy;
 
 
 <#else>
 
 
-! echo "Erzeuge Index ix_style_feld2"
-! echo `date`
+select now(),'Erzeuge Index ix_style_feld2'
+from xdummy;
 
 create  index ix_style_feld2 on stylesheet_field (stylesheet_id );
 
@@ -179,15 +201,15 @@ create  index ix_style_feld2 on stylesheet_field (stylesheet_id );
 <#if exists="true" >
 
 
-! echo "index uxdb_tabellen_name exists - fine"
-! echo `date`
+select now(),'index uxdb_tabellen_name exists - fine'
+from xdummy;
 
 
 <#else>
 
 
-! echo "Erzeuge Index uxdb_tabellen_name"
-! echo `date`
+select now(),'Erzeuge Index uxdb_tabellen_name'
+from xdummy;
 
 create  unique  index uxdb_tabellen_name on db_tabellen (name );
 
@@ -203,20 +225,44 @@ create  unique  index uxdb_tabellen_name on db_tabellen (name );
 <#if exists="true" >
 
 
-! echo "index xdb_tabellen_efm exists - fine"
-! echo `date`
+select now(),'index xdb_tabellen_efm exists - fine'
+from xdummy;
 
 
 <#else>
 
 
-! echo "Erzeuge Index xdb_tabellen_efm"
-! echo `date`
+select now(),'Erzeuge Index xdb_tabellen_efm'
+from xdummy;
 
 create  index xdb_tabellen_efm on db_tabellen (db_einfuegemarke );
 
 </#if>
 
+<#assign exists="false" />
+<#list indexes as i>
+<#if i.getName()="uxdb_version">
+<#assign exists="true" />
+</#if>
+</#list>
+
+<#if exists="true" >
+
+
+select now(),'index uxdb_version exists - fine'
+from xdummy;
+
+
+<#else>
+
+
+select now(),'Erzeuge Index uxdb_version'
+from xdummy;
+
+create  unique  index uxdb_version on db_version (his_system );
+
+</#if>
+
 <#assign exists="false" />
 <#list indexes as i>
 <#if i.getName()="xdb_version_efm">
@@ -227,15 +273,15 @@ create  index xdb_tabellen_efm on db_tabellen (db_einfuegemarke );
 <#if exists="true" >
 
 
-! echo "index xdb_version_efm exists - fine"
-! echo `date`
+select now(),'index xdb_version_efm exists - fine'
+from xdummy;
 
 
 <#else>
 
 
-! echo "Erzeuge Index xdb_version_efm"
-! echo `date`
+select now(),'Erzeuge Index xdb_version_efm'
+from xdummy;
 
 create  index xdb_version_efm on db_version (db_einfuegemarke );
 
@@ -251,15 +297,15 @@ create  index xdb_version_efm on db_version (db_einfuegemarke );
 <#if exists="true" >
 
 
-! echo "index ix_name_intern exists - fine"
-! echo `date`
+select now(),'index ix_name_intern exists - fine'
+from xdummy;
 
 
 <#else>
 
 
-! echo "Erzeuge Index ix_name_intern"
-! echo `date`
+select now(),'Erzeuge Index ix_name_intern'
+from xdummy;
 
 create  unique  index ix_name_intern on sichten (name_intern );
 
@@ -275,15 +321,15 @@ create  unique  index ix_name_intern on sichten (name_intern );
 <#if exists="true" >
 
 
-! echo "index cif_ind exists - fine"
-! echo `date`
+select now(),'index cif_ind exists - fine'
+from xdummy;
 
 
 <#else>
 
 
-! echo "Erzeuge Index cif_ind"
-! echo `date`
+select now(),'Erzeuge Index cif_ind'
+from xdummy;
 
 create  unique  index cif_ind on cif (hs, 
 key, 
@@ -301,15 +347,15 @@ apnr );
 <#if exists="true" >
 
 
-! echo "index cifx_ind exists - fine"
-! echo `date`
+select now(),'index cifx_ind exists - fine'
+from xdummy;
 
 
 <#else>
 
 
-! echo "Erzeuge Index cifx_ind"
-! echo `date`
+select now(),'Erzeuge Index cifx_ind'
+from xdummy;
 
 create  unique  index cifx_ind on cifx (hs, 
 key, 
@@ -327,15 +373,15 @@ apnr );
 <#if exists="true" >
 
 
-! echo "index cifx_ind2 exists - fine"
-! echo `date`
+select now(),'index cifx_ind2 exists - fine'
+from xdummy;
 
 
 <#else>
 
 
-! echo "Erzeuge Index cifx_ind2"
-! echo `date`
+select now(),'Erzeuge Index cifx_ind2'
+from xdummy;
 
 create  index cifx_ind2 on cifx (uniquename );
 
@@ -351,15 +397,15 @@ create  index cifx_ind2 on cifx (uniquename );
 <#if exists="true" >
 
 
-! echo "index trans_cifx_ind exists - fine"
-! echo `date`
+select now(),'index trans_cifx_ind exists - fine'
+from xdummy;
 
 
 <#else>
 
 
-! echo "Erzeuge Index trans_cifx_ind"
-! echo `date`
+select now(),'Erzeuge Index trans_cifx_ind'
+from xdummy;
 
 create  index trans_cifx_ind on trans_cifx (sourcesystem_id );
 
@@ -375,15 +421,15 @@ create  index trans_cifx_ind on trans_cifx (sourcesystem_id );
 <#if exists="true" >
 
 
-! echo "index trans_cif_ind exists - fine"
-! echo `date`
+select now(),'index trans_cif_ind exists - fine'
+from xdummy;
 
 
 <#else>
 
 
-! echo "Erzeuge Index trans_cif_ind"
-! echo `date`
+select now(),'Erzeuge Index trans_cif_ind'
+from xdummy;
 
 create  index trans_cif_ind on trans_cif (sourcesystem_id );
 
@@ -399,15 +445,15 @@ create  index trans_cif_ind on trans_cif (sourcesystem_id );
 <#if exists="true" >
 
 
-! echo "index i_userinfo exists - fine"
-! echo `date`
+select now(),'index i_userinfo exists - fine'
+from xdummy;
 
 
 <#else>
 
 
-! echo "Erzeuge Index i_userinfo"
-! echo `date`
+select now(),'Erzeuge Index i_userinfo'
+from xdummy;
 
 create  unique  index i_userinfo on userinfo (benutzer );
 
@@ -423,15 +469,15 @@ create  unique  index i_userinfo on userinfo (benutzer );
 <#if exists="true" >
 
 
-! echo "index i_orga exists - fine"
-! echo `date`
+select now(),'index i_orga exists - fine'
+from xdummy;
 
 
 <#else>
 
 
-! echo "Erzeuge Index i_orga"
-! echo `date`
+select now(),'Erzeuge Index i_orga'
+from xdummy;
 
 create  unique  index i_orga on organigramm (key_apnr, 
 gueltig_seit, 
@@ -449,15 +495,15 @@ gueltig_bis );
 <#if exists="true" >
 
 
-! echo "index ix130_3 exists - fine"
-! echo `date`
+select now(),'index ix130_3 exists - fine'
+from xdummy;
 
 
 <#else>
 
 
-! echo "Erzeuge Index ix130_3"
-! echo `date`
+select now(),'Erzeuge Index ix130_3'
+from xdummy;
 
 create  index ix130_3 on organigramm (parent );
 
@@ -473,15 +519,15 @@ create  index ix130_3 on organigramm (parent );
 <#if exists="true" >
 
 
-! echo "index i_orga_bak exists - fine"
-! echo `date`
+select now(),'index i_orga_bak exists - fine'
+from xdummy;
 
 
 <#else>
 
 
-! echo "Erzeuge Index i_orga_bak"
-! echo `date`
+select now(),'Erzeuge Index i_orga_bak'
+from xdummy;
 
 create  unique  index i_orga_bak on organigramm_bak (key_apnr, 
 gueltig_seit, 
@@ -499,15 +545,15 @@ gueltig_bis );
 <#if exists="true" >
 
 
-! echo "index ix_user_inst1 exists - fine"
-! echo `date`
+select now(),'index ix_user_inst1 exists - fine'
+from xdummy;
 
 
 <#else>
 
 
-! echo "Erzeuge Index ix_user_inst1"
-! echo `date`
+select now(),'Erzeuge Index ix_user_inst1'
+from xdummy;
 
 create  index ix_user_inst1 on user_institution (ch110_institut );
 
@@ -523,15 +569,15 @@ create  index ix_user_inst1 on user_institution (ch110_institut );
 <#if exists="true" >
 
 
-! echo "index ix_user_inst2 exists - fine"
-! echo `date`
+select now(),'index ix_user_inst2 exists - fine'
+from xdummy;
 
 
 <#else>
 
 
-! echo "Erzeuge Index ix_user_inst2"
-! echo `date`
+select now(),'Erzeuge Index ix_user_inst2'
+from xdummy;
 
 create  index ix_user_inst2 on user_institution (userid );
 
@@ -547,15 +593,15 @@ create  index ix_user_inst2 on user_institution (userid );
 <#if exists="true" >
 
 
-! echo "index ix_user_inst3 exists - fine"
-! echo `date`
+select now(),'index ix_user_inst3 exists - fine'
+from xdummy;
 
 
 <#else>
 
 
-! echo "Erzeuge Index ix_user_inst3"
-! echo `date`
+select now(),'Erzeuge Index ix_user_inst3'
+from xdummy;
 
 create  index ix_user_inst3 on user_institution (gueltig_seit, 
 gueltig_bis );
@@ -572,15 +618,15 @@ gueltig_bis );
 <#if exists="true" >
 
 
-! echo "index kostentr_ixktr exists - fine"
-! echo `date`
+select now(),'index kostentr_ixktr exists - fine'
+from xdummy;
 
 
 <#else>
 
 
-! echo "Erzeuge Index kostentr_ixktr"
-! echo `date`
+select now(),'Erzeuge Index kostentr_ixktr'
+from xdummy;
 
 create  index kostentr_ixktr on kostentraeger (key_apnr );
 
@@ -596,15 +642,15 @@ create  index kostentr_ixktr on kostentraeger (key_apnr );
 <#if exists="true" >
 
 
-! echo "index ix_user_ktr exists - fine"
-! echo `date`
+select now(),'index ix_user_ktr exists - fine'
+from xdummy;
 
 
 <#else>
 
 
-! echo "Erzeuge Index ix_user_ktr"
-! echo `date`
+select now(),'Erzeuge Index ix_user_ktr'
+from xdummy;
 
 create  index ix_user_ktr on user_kostentraeger (key_apnr );
 
@@ -620,15 +666,15 @@ create  index ix_user_ktr on user_kostentraeger (key_apnr );
 <#if exists="true" >
 
 
-! echo "index ix_user_ktr2 exists - fine"
-! echo `date`
+select now(),'index ix_user_ktr2 exists - fine'
+from xdummy;
 
 
 <#else>
 
 
-! echo "Erzeuge Index ix_user_ktr2"
-! echo `date`
+select now(),'Erzeuge Index ix_user_ktr2'
+from xdummy;
 
 create  index ix_user_ktr2 on user_kostentraeger (userid );
 
@@ -644,15 +690,15 @@ create  index ix_user_ktr2 on user_kostentraeger (userid );
 <#if exists="true" >
 
 
-! echo "index ix_kotr_to_inst1 exists - fine"
-! echo `date`
+select now(),'index ix_kotr_to_inst1 exists - fine'
+from xdummy;
 
 
 <#else>
 
 
-! echo "Erzeuge Index ix_kotr_to_inst1"
-! echo `date`
+select now(),'Erzeuge Index ix_kotr_to_inst1'
+from xdummy;
 
 create  index ix_kotr_to_inst1 on kotr_to_inst (projnr );
 
@@ -668,15 +714,15 @@ create  index ix_kotr_to_inst1 on kotr_to_inst (projnr );
 <#if exists="true" >
 
 
-! echo "index ix_sx_captions exists - fine"
-! echo `date`
+select now(),'index ix_sx_captions exists - fine'
+from xdummy;
 
 
 <#else>
 
 
-! echo "Erzeuge Index ix_sx_captions"
-! echo `date`
+select now(),'Erzeuge Index ix_sx_captions'
+from xdummy;
 
 create  index ix_sx_captions on sx_captions (field_name );
 
@@ -692,15 +738,15 @@ create  index ix_sx_captions on sx_captions (field_name );
 <#if exists="true" >
 
 
-! echo "index ix_sx_captions2 exists - fine"
-! echo `date`
+select now(),'index ix_sx_captions2 exists - fine'
+from xdummy;
 
 
 <#else>
 
 
-! echo "Erzeuge Index ix_sx_captions2"
-! echo `date`
+select now(),'Erzeuge Index ix_sx_captions2'
+from xdummy;
 
 create  index ix_sx_captions2 on sx_captions (table_name );
 
@@ -716,15 +762,15 @@ create  index ix_sx_captions2 on sx_captions (table_name );
 <#if exists="true" >
 
 
-! echo "index ix_sx_captions3 exists - fine"
-! echo `date`
+select now(),'index ix_sx_captions3 exists - fine'
+from xdummy;
 
 
 <#else>
 
 
-! echo "Erzeuge Index ix_sx_captions3"
-! echo `date`
+select now(),'Erzeuge Index ix_sx_captions3'
+from xdummy;
 
 create  index ix_sx_captions3 on sx_captions (record_no );
 
@@ -740,15 +786,15 @@ create  index ix_sx_captions3 on sx_captions (record_no );
 <#if exists="true" >
 
 
-! echo "index ix_sx_captions4 exists - fine"
-! echo `date`
+select now(),'index ix_sx_captions4 exists - fine'
+from xdummy;
 
 
 <#else>
 
 
-! echo "Erzeuge Index ix_sx_captions4"
-! echo `date`
+select now(),'Erzeuge Index ix_sx_captions4'
+from xdummy;
 
 create  index ix_sx_captions4 on sx_captions (locale );
 
@@ -764,15 +810,15 @@ create  index ix_sx_captions4 on sx_captions (locale );
 <#if exists="true" >
 
 
-! echo "index ix_fm_templates_tid exists - fine"
-! echo `date`
+select now(),'index ix_fm_templates_tid exists - fine'
+from xdummy;
 
 
 <#else>
 
 
-! echo "Erzeuge Index ix_fm_templates_tid"
-! echo `date`
+select now(),'Erzeuge Index ix_fm_templates_tid'
+from xdummy;
 
 create  unique  index ix_fm_templates_tid on fm_templates (id );
 
@@ -788,15 +834,15 @@ create  unique  index ix_fm_templates_tid on fm_templates (id );
 <#if exists="true" >
 
 
-! echo "index ix_sx_down_inst exists - fine"
-! echo `date`
+select now(),'index ix_sx_down_inst exists - fine'
+from xdummy;
 
 
 <#else>
 
 
-! echo "Erzeuge Index ix_sx_down_inst"
-! echo `date`
+select now(),'Erzeuge Index ix_sx_down_inst'
+from xdummy;
 
 create  index ix_sx_down_inst on sx_downloads (ch110_institut );
 
@@ -812,15 +858,15 @@ create  index ix_sx_down_inst on sx_downloads (ch110_institut );
 <#if exists="true" >
 
 
-! echo "index ix_sx_down_dbat exists - fine"
-! echo `date`
+select now(),'index ix_sx_down_dbat exists - fine'
+from xdummy;
 
 
 <#else>
 
 
-! echo "Erzeuge Index ix_sx_down_dbat"
-! echo `date`
+select now(),'Erzeuge Index ix_sx_down_dbat'
+from xdummy;
 
 create  index ix_sx_down_dbat on sx_downloads (bezugsdatum, 
 gueltig_seit, 
@@ -838,15 +884,15 @@ gueltig_bis );
 <#if exists="true" >
 
 
-! echo "index ix_ussp exists - fine"
-! echo `date`
+select now(),'index ix_ussp exists - fine'
+from xdummy;
 
 
 <#else>
 
 
-! echo "Erzeuge Index ix_ussp"
-! echo `date`
+select now(),'Erzeuge Index ix_ussp'
+from xdummy;
 
 create  index ix_ussp on user_startpage (userid );
 
@@ -862,15 +908,15 @@ create  index ix_ussp on user_startpage (userid );
 <#if exists="true" >
 
 
-! echo "index ix_ussf exists - fine"
-! echo `date`
+select now(),'index ix_ussf exists - fine'
+from xdummy;
 
 
 <#else>
 
 
-! echo "Erzeuge Index ix_ussf"
-! echo `date`
+select now(),'Erzeuge Index ix_ussf'
+from xdummy;
 
 create  index ix_ussf on user_startfields (userid );
 
@@ -886,15 +932,15 @@ create  index ix_ussf on user_startfields (userid );
 <#if exists="true" >
 
 
-! echo "index ix_sx_tables exists - fine"
-! echo `date`
+select now(),'index ix_sx_tables exists - fine'
+from xdummy;
 
 
 <#else>
 
 
-! echo "Erzeuge Index ix_sx_tables"
-! echo `date`
+select now(),'Erzeuge Index ix_sx_tables'
+from xdummy;
 
 create  unique  index ix_sx_tables on sx_tables (name );
 
@@ -910,15 +956,15 @@ create  unique  index ix_sx_tables on sx_tables (name );
 <#if exists="true" >
 
 
-! echo "index ix_dim_bp_apnr exists - fine"
-! echo `date`
+select now(),'index ix_dim_bp_apnr exists - fine'
+from xdummy;
 
 
 <#else>
 
 
-! echo "Erzeuge Index ix_dim_bp_apnr"
-! echo `date`
+select now(),'Erzeuge Index ix_dim_bp_apnr'
+from xdummy;
 
 create  unique  index ix_dim_bp_apnr on dim_bp_apnr (dimension_bp_id, 
 apnr );
@@ -935,15 +981,15 @@ apnr );
 <#if exists="true" >
 
 
-! echo "index ix_dim_bp_apnr2 exists - fine"
-! echo `date`
+select now(),'index ix_dim_bp_apnr2 exists - fine'
+from xdummy;
 
 
 <#else>
 
 
-! echo "Erzeuge Index ix_dim_bp_apnr2"
-! echo `date`
+select now(),'Erzeuge Index ix_dim_bp_apnr2'
+from xdummy;
 
 create  index ix_dim_bp_apnr2 on dim_bp_apnr (systeminfo_id );
 
@@ -959,15 +1005,15 @@ create  index ix_dim_bp_apnr2 on dim_bp_apnr (systeminfo_id );
 <#if exists="true" >
 
 
-! echo "index ix_level1_int1 exists - fine"
-! echo `date`
+select now(),'index ix_level1_int1 exists - fine'
+from xdummy;
 
 
 <#else>
 
 
-! echo "Erzeuge Index ix_level1_int1"
-! echo `date`
+select now(),'Erzeuge Index ix_level1_int1'
+from xdummy;
 
 create  index ix_level1_int1 on dim_bp_apnr (level1_int, 
 level1_char );
@@ -984,15 +1030,15 @@ level1_char );
 <#if exists="true" >
 
 
-! echo "index ix_level1_int2 exists - fine"
-! echo `date`
+select now(),'index ix_level1_int2 exists - fine'
+from xdummy;
 
 
 <#else>
 
 
-! echo "Erzeuge Index ix_level1_int2"
-! echo `date`
+select now(),'Erzeuge Index ix_level1_int2'
+from xdummy;
 
 create  index ix_level1_int2 on dim_bp_apnr (level2_int, 
 level2_char );
@@ -1009,15 +1055,15 @@ level2_char );
 <#if exists="true" >
 
 
-! echo "index ix_level3_int1 exists - fine"
-! echo `date`
+select now(),'index ix_level3_int1 exists - fine'
+from xdummy;
 
 
 <#else>
 
 
-! echo "Erzeuge Index ix_level3_int1"
-! echo `date`
+select now(),'Erzeuge Index ix_level3_int1'
+from xdummy;
 
 create  index ix_level3_int1 on dim_bp_apnr (level3_int, 
 level3_char );
@@ -1034,15 +1080,15 @@ level3_char );
 <#if exists="true" >
 
 
-! echo "index ix_dim_bp_alts1 exists - fine"
-! echo `date`
+select now(),'index ix_dim_bp_alts1 exists - fine'
+from xdummy;
 
 
 <#else>
 
 
-! echo "Erzeuge Index ix_dim_bp_alts1"
-! echo `date`
+select now(),'Erzeuge Index ix_dim_bp_alts1'
+from xdummy;
 
 create  index ix_dim_bp_alts1 on dim_bp_altsicht_apnr (hierarchie_id );
 
@@ -1058,15 +1104,15 @@ create  index ix_dim_bp_alts1 on dim_bp_altsicht_apnr (hierarchie_id );
 <#if exists="true" >
 
 
-! echo "index ix_dim_c1 exists - fine"
-! echo `date`
+select now(),'index ix_dim_c1 exists - fine'
+from xdummy;
 
 
 <#else>
 
 
-! echo "Erzeuge Index ix_dim_c1"
-! echo `date`
+select now(),'Erzeuge Index ix_dim_c1'
+from xdummy;
 
 create  index ix_dim_c1 on dim_closure (hierarchie_id, 
 key );
@@ -1083,15 +1129,15 @@ key );
 <#if exists="true" >
 
 
-! echo "index ix_dim_c2 exists - fine"
-! echo `date`
+select now(),'index ix_dim_c2 exists - fine'
+from xdummy;
 
 
 <#else>
 
 
-! echo "Erzeuge Index ix_dim_c2"
-! echo `date`
+select now(),'Erzeuge Index ix_dim_c2'
+from xdummy;
 
 create  index ix_dim_c2 on dim_closure (hierarchie_id, 
 parent, 
@@ -1109,15 +1155,15 @@ key );
 <#if exists="true" >
 
 
-! echo "index ix_tr_dim_bp_apnr exists - fine"
-! echo `date`
+select now(),'index ix_tr_dim_bp_apnr exists - fine'
+from xdummy;
 
 
 <#else>
 
 
-! echo "Erzeuge Index ix_tr_dim_bp_apnr"
-! echo `date`
+select now(),'Erzeuge Index ix_tr_dim_bp_apnr'
+from xdummy;
 
 create  index ix_tr_dim_bp_apnr on trans_dim_bp_apnr (dimension_bp_id, 
 sourcesystem_id, 
@@ -1125,6 +1171,30 @@ systeminfo_id );
 
 </#if>
 
+<#assign exists="false" />
+<#list indexes as i>
+<#if i.getName()="ix_sieve_column_defm">
+<#assign exists="true" />
+</#if>
+</#list>
+
+<#if exists="true" >
+
+
+select now(),'index ix_sieve_column_defm exists - fine'
+from xdummy;
+
+
+<#else>
+
+
+select now(),'Erzeuge Index ix_sieve_column_defm'
+from xdummy;
+
+create  unique  index ix_sieve_column_defm on sieve_column_def (m_id );
+
+</#if>
+
 <#assign exists="false" />
 <#list indexes as i>
 <#if i.getName()="ix_sx_jobs_un">
@@ -1135,16 +1205,88 @@ systeminfo_id );
 <#if exists="true" >
 
 
-! echo "index ix_sx_jobs_un exists - fine"
-! echo `date`
+select now(),'index ix_sx_jobs_un exists - fine'
+from xdummy;
 
 
 <#else>
 
 
-! echo "Erzeuge Index ix_sx_jobs_un"
-! echo `date`
+select now(),'Erzeuge Index ix_sx_jobs_un'
+from xdummy;
 
 create  unique  index ix_sx_jobs_un on sx_jobs (uniquename );
 
 </#if>
+
+<#assign exists="false" />
+<#list indexes as i>
+<#if i.getName()="ix_implicit_orgrights1">
+<#assign exists="true" />
+</#if>
+</#list>
+
+<#if exists="true" >
+
+
+select now(),'index ix_implicit_orgrights1 exists - fine'
+from xdummy;
+
+
+<#else>
+
+
+select now(),'Erzeuge Index ix_implicit_orgrights1'
+from xdummy;
+
+create  index ix_implicit_orgrights1 on implicit_orgunit_rights (userinfo_id );
+
+</#if>
+
+<#assign exists="false" />
+<#list indexes as i>
+<#if i.getName()="ix_dim_datum_day_date">
+<#assign exists="true" />
+</#if>
+</#list>
+
+<#if exists="true" >
+
+
+select now(),'index ix_dim_datum_day_date exists - fine'
+from xdummy;
+
+
+<#else>
+
+
+select now(),'Erzeuge Index ix_dim_datum_day_date'
+from xdummy;
+
+create  index ix_dim_datum_day_date on dim_datum (day_date );
+
+</#if>
+
+<#assign exists="false" />
+<#list indexes as i>
+<#if i.getName()="ix_etl_job1">
+<#assign exists="true" />
+</#if>
+</#list>
+
+<#if exists="true" >
+
+
+select now(),'index ix_etl_job1 exists - fine'
+from xdummy;
+
+
+<#else>
+
+
+select now(),'Erzeuge Index ix_etl_job1'
+from xdummy;
+
+create  unique  index ix_etl_job1 on etl_job (uniquename );
+
+</#if>

superx/WEB-INF/conf/edustore/db/install/upgrade/kern_upgrade_tables_pg.sql

@@ -1884,11 +1884,11 @@ select now(),'Erzeuge Tabelle organigramm'
 from xdummy;
 
 create table organigramm(
-	tid INTEGER  not null, 
+	tid SERIAL  not null, 
 key_apnr CHAR(10) , 
 parent CHAR(10) , 
-drucktext CHAR(50) , 
-name CHAR(150) , 
+drucktext VARCHAR(255) , 
+name VARCHAR(255) , 
 ebene INTEGER , 
 lehre SMALLINT  not null, 
 gueltig_seit DATE  not null, 
@@ -1975,8 +1975,8 @@ create table organigramm_bak(
 	tid INTEGER  not null, 
 key_apnr CHAR(10) , 
 parent CHAR(10) , 
-drucktext CHAR(50) , 
-name CHAR(150) , 
+drucktext VARCHAR(255) , 
+name VARCHAR(255) , 
 ebene INTEGER , 
 lehre SMALLINT  not null, 
 gueltig_seit DATE  not null, 

superx/WEB-INF/conf/edustore/db/install/upgrade/kern_upgrade_views_ids.sql

@@ -19,13 +19,14 @@ tabid,tabname  as tabelle from systables where tabname
 'dim_stg',
 'dim_abschluss',
 'dim_kost',
-'dim_kotr'
+'dim_kotr',
+'dim_kreis'
 );</sqlvar>
 </sqlvars>
 
 
-! echo "Checking views"
-! echo `date`
+select now(),'Checking views'
+from xdummy;
 
 
 <#if views?has_content>
@@ -33,15 +34,15 @@ tabid,tabname  as tabelle from systables where tabname
 <#if views?seq_contains("user_groups") >
 
 
-! echo "view user_groups exists - fine"
-! echo `date`
+select now(),'view user_groups exists - fine'
+from xdummy;
 
 
 <#else>
 
 
-! echo "Erzeuge View user_groups"
-! echo `date`
+select now(),'Erzeuge View user_groups'
+from xdummy;
 
 create view user_groups(
 	userinfo_id, 
@@ -58,15 +59,15 @@ and U.akt_versuch <= U.max_versuch ;
 <#if views?seq_contains("menu_element_fieldmode") >
 
 
-! echo "view menu_element_fieldmode exists - fine"
-! echo `date`
+select now(),'view menu_element_fieldmode exists - fine'
+from xdummy;
 
 
 <#else>
 
 
-! echo "Erzeuge View menu_element_fieldmode"
-! echo `date`
+select now(),'Erzeuge View menu_element_fieldmode'
+from xdummy;
 
 create view menu_element_fieldmode(
 	id, 
@@ -90,15 +91,15 @@ annotation) as
 <#if views?seq_contains("menu_element_mandatory") >
 
 
-! echo "view menu_element_mandatory exists - fine"
-! echo `date`
+select now(),'view menu_element_mandatory exists - fine'
+from xdummy;
 
 
 <#else>
 
 
-! echo "Erzeuge View menu_element_mandatory"
-! echo `date`
+select now(),'Erzeuge View menu_element_mandatory'
+from xdummy;
 
 create view menu_element_mandatory(
 	id, 
@@ -123,15 +124,15 @@ annotation) as
 <#if views?seq_contains("menu_element_nature") >
 
 
-! echo "view menu_element_nature exists - fine"
-! echo `date`
+select now(),'view menu_element_nature exists - fine'
+from xdummy;
 
 
 <#else>
 
 
-! echo "Erzeuge View menu_element_nature"
-! echo `date`
+select now(),'Erzeuge View menu_element_nature'
+from xdummy;
 
 create view menu_element_nature(
 	id, 
@@ -156,23 +157,23 @@ annotation) as
 <#if views?seq_contains("menu_element_orgstructure") >
 
 
-! echo "view menu_element_orgstructure exists - fine"
-! echo `date`
+select now(),'view menu_element_orgstructure exists - fine'
+from xdummy;
 
 
 <#else>
 
 
-! echo "Erzeuge View menu_element_orgstructure"
-! echo `date`
+select now(),'Erzeuge View menu_element_orgstructure'
+from xdummy;
 
 create view menu_element_orgstructure(
 	orgstruktur, 
 description) as
 	
 	
-		select element as orgstruktur, description  
-        from menu_element 
+		select element as orgstruktur, description
+        from menu_element
   		where element='orgstruktur'
 				;
 	
@@ -181,15 +182,15 @@ description) as
 <#if views?seq_contains("user_inst_org") >
 
 
-! echo "view user_inst_org exists - fine"
-! echo `date`
+select now(),'view user_inst_org exists - fine'
+from xdummy;
 
 
 <#else>
 
 
-! echo "Erzeuge View user_inst_org"
-! echo `date`
+select now(),'Erzeuge View user_inst_org'
+from xdummy;
 
 create view user_inst_org(
 	userid, 
@@ -218,15 +219,15 @@ where O.key_apnr=U.ch110_institut
 <#if views?seq_contains("hochschulen") >
 
 
-! echo "view hochschulen exists - fine"
-! echo `date`
+select now(),'view hochschulen exists - fine'
+from xdummy;
 
 
 <#else>
 
 
-! echo "Erzeuge View hochschulen"
-! echo `date`
+select now(),'Erzeuge View hochschulen'
+from xdummy;
 
 create view hochschulen(
 	hs_nr, 
@@ -253,15 +254,15 @@ or trim(substring(apnr from 4 for 1)) ='')
 <#if views?seq_contains("dimension_view") >
 
 
-! echo "view dimension_view exists - fine"
-! echo `date`
+select now(),'view dimension_view exists - fine'
+from xdummy;
 
 
 <#else>
 
 
-! echo "Erzeuge View dimension_view"
-! echo `date`
+select now(),'Erzeuge View dimension_view'
+from xdummy;
 
 create view dimension_view(
 	id, 
@@ -296,10 +297,10 @@ SELECT D.tid as id,
        D.sourcefilter,
        D.system_key,
        ''::varchar(255) as view_reference,
-       ('select C.' || F.foreignkey_int || '  as id,T.sourcesystem_id, C.' || F.foreignkey_col || ' as apnr,C.' || F.foreignkey_cap || ' as name' 
+       ('select C.' || F.foreignkey_int || '  as id,T.sourcesystem_id, C.' || F.foreignkey_col || ' as apnr,C.' || F.foreignkey_cap || ' as name'
        ||',' || D.system_key || '::integer as mschluessel,T.apnr as aschluessel,null::VARCHAR(255) as obj_guid	,null::integer as lock_version'
        || ' from ' || F.foreignkey_tab || ' C,trans_dim_bp_apnr T'
-       || ' where T.sourcesystem_id=C.' || F.foreignkey_col || '::varchar(255)' 
+       || ' where T.sourcesystem_id=C.' || F.foreignkey_col || '::varchar(255)'
        || nvl(' and ' || F.foreignkey_cond || ' ','')
        || 'and ' || D.dimension_bp_id ||' =T.dimension_bp_id'
      )::lvarchar as sourcesql,
@@ -324,10 +325,10 @@ SELECT D.tid as id,
        D.sourcefilter,
        D.system_key,
        ''::varchar(255) as view_reference,
-       ('select C.' || F.foreignkey_col || ' as id,T.sourcesystem_id, C.' || F.foreignkey_col || ' as apnr,C.' || F.foreignkey_cap || ' as name' 
+       ('select C.' || F.foreignkey_col || ' as id,T.sourcesystem_id, C.' || F.foreignkey_col || ' as apnr,C.' || F.foreignkey_cap || ' as name'
        ||',' || D.system_key || '::integer as mschluessel,T.apnr as aschluessel,null::VARCHAR(255) as obj_guid	,null::integer as lock_version '
        || 'from ' || F.foreignkey_tab || ' C,trans_dim_bp_apnr T '
-       || 'where T.sourcesystem_id=C.' || F.foreignkey_col || '::varchar(255) ' 
+       || 'where T.sourcesystem_id=C.' || F.foreignkey_col || '::varchar(255) '
        || nvl(' and ' || F.foreignkey_cond || ' ','')
        || 'and ' || D.dimension_bp_id ||' =T.dimension_bp_id '
          )::lvarchar as sourcesql,
@@ -356,7 +357,7 @@ SELECT distinct T.tid+1000000 as id,
        null::VARCHAR(255) as obj_guid	,
 	null::integer as lock_version
 	FROM dimension D inner join sx_tables T on (T.name=D.fact_table)
-	
+
 	union
 SELECT distinct T.tid+2000000 as id,
       D.dimension_bp_id,
@@ -377,7 +378,7 @@ SELECT distinct T.tid+2000000 as id,
 	null::integer as lock_version
 	FROM dimension D inner join sx_tables T on (T.name=D.fact_table)
 	where D.fact_table='sva_pers_cube'
-	and D.name='ca108_amtsbez'  
+	and D.name='ca108_amtsbez'
  ;
 	
 </#if>
@@ -385,15 +386,15 @@ SELECT distinct T.tid+2000000 as id,
 <#if views?seq_contains("fact_table") >
 
 
-! echo "view fact_table exists - fine"
-! echo `date`
+select now(),'view fact_table exists - fine'
+from xdummy;
 
 
 <#else>
 
 
-! echo "Erzeuge View fact_table"
-! echo `date`
+select now(),'Erzeuge View fact_table'
+from xdummy;
 
 create view fact_table(
 	id, 
@@ -424,15 +425,15 @@ where T.name in (select distinct fact_table from dimension)
 <#if views?seq_contains("dim_staat") >
 
 
-! echo "view dim_staat exists - fine"
-! echo `date`
+select now(),'view dim_staat exists - fine'
+from xdummy;
 
 
 <#else>
 
 
-! echo "Erzeuge View dim_staat"
-! echo `date`
+select now(),'Erzeuge View dim_staat'
+from xdummy;
 
 create view dim_staat(
 	apnr, 
@@ -442,7 +443,7 @@ kontinent,
 inl_ausl_kurz, 
 inl_ausl_lang) as
 	
-SELECT 
+SELECT
        apnr,
        druck,
        uniquename::integer as astat,
@@ -461,15 +462,15 @@ and apnr !=0 --nur für Abwärtskompatibilität zu FLEDA
 <#if views?seq_contains("dim_stg") >
 
 
-! echo "view dim_stg exists - fine"
-! echo `date`
+select now(),'view dim_stg exists - fine'
+from xdummy;
 
 
 <#else>
 
 
-! echo "Erzeuge View dim_stg"
-! echo `date`
+select now(),'Erzeuge View dim_stg'
+from xdummy;
 
 create view dim_stg(
 	apnr, 
@@ -480,7 +481,7 @@ stg_ltxt,
 stg_astgrp, 
 stg_astgrp_str) as
 	
-SELECT 
+SELECT
        apnr,
        druck,
        uniquename as stg,
@@ -500,15 +501,15 @@ where dimension_bp_id=(select D.tid from dimension_bp D where D.apnr='bluep_stg'
 <#if views?seq_contains("dim_abschluss") >
 
 
-! echo "view dim_abschluss exists - fine"
-! echo `date`
+select now(),'view dim_abschluss exists - fine'
+from xdummy;
 
 
 <#else>
 
 
-! echo "Erzeuge View dim_abschluss"
-! echo `date`
+select now(),'Erzeuge View dim_abschluss'
+from xdummy;
 
 create view dim_abschluss(
 	apnr, 
@@ -523,7 +524,7 @@ abschlussart_str,
 abschluss_grp, 
 abschluss_grp_str) as
 	
-SELECT 
+SELECT
        apnr,
        druck,
        uniquename as abschluss,
@@ -547,15 +548,15 @@ where dimension_bp_id=(select D.tid from dimension_bp D where D.apnr='bluep_absc
 <#if views?seq_contains("dim_kost") >
 
 
-! echo "view dim_kost exists - fine"
-! echo `date`
+select now(),'view dim_kost exists - fine'
+from xdummy;
 
 
 <#else>
 
 
-! echo "Erzeuge View dim_kost"
-! echo `date`
+select now(),'Erzeuge View dim_kost'
+from xdummy;
 
 create view dim_kost(
 	apnr, 
@@ -572,31 +573,56 @@ key) as
 <#if views?seq_contains("dim_kotr") >
 
 
-! echo "view dim_kotr exists - fine"
-! echo `date`
+select now(),'view dim_kotr exists - fine'
+from xdummy;
 
 
 <#else>
 
 
-! echo "Erzeuge View dim_kotr"
-! echo `date`
+select now(),'Erzeuge View dim_kotr'
+from xdummy;
 
 create view dim_kotr(
 	apnr, 
 druck, 
 key) as
-	 SELECT dim_bp_apnr.apnr, dim_bp_apnr.druck, dim_bp_apnr.uniquename AS key 
+	 SELECT dim_bp_apnr.apnr, dim_bp_apnr.druck, dim_bp_apnr.uniquename AS key
 	FROM dim_bp_apnr WHERE dim_bp_apnr.dimension_bp_id = ( SELECT d.tid
      FROM dimension_bp d WHERE d.apnr = 'bluep_kotr');
 	
 </#if>
 
+<#if views?seq_contains("dim_kreis") >
+
+
+select now(),'view dim_kreis exists - fine'
+from xdummy;
+
+
+<#else>
+
+
+select now(),'Erzeuge View dim_kreis'
+from xdummy;
+
+create view dim_kreis(
+	apnr, 
+astat, 
+druck, 
+kfz, 
+bland_druck, 
+bland_kurz, 
+bland_astat) as
+	;
+	
+</#if>
+
 <#else>
 
 
-! echo "Erzeuge View user_groups"
-! echo `date`
+select now(),'Erzeuge View user_groups'
+from xdummy;
 
 create view user_groups(
 	userinfo_id, 
@@ -609,8 +635,8 @@ and G.tid=B.groupinfo_id
 and U.akt_versuch <= U.max_versuch ;
 	
 
-! echo "Erzeuge View menu_element_fieldmode"
-! echo `date`
+select now(),'Erzeuge View menu_element_fieldmode'
+from xdummy;
 
 create view menu_element_fieldmode(
 	id, 
@@ -630,8 +656,8 @@ annotation) as
 				;
 	
 
-! echo "Erzeuge View menu_element_mandatory"
-! echo `date`
+select now(),'Erzeuge View menu_element_mandatory'
+from xdummy;
 
 create view menu_element_mandatory(
 	id, 
@@ -652,8 +678,8 @@ annotation) as
 				;
 	
 
-! echo "Erzeuge View menu_element_nature"
-! echo `date`
+select now(),'Erzeuge View menu_element_nature'
+from xdummy;
 
 create view menu_element_nature(
 	id, 
@@ -674,22 +700,22 @@ annotation) as
 				;
 	
 
-! echo "Erzeuge View menu_element_orgstructure"
-! echo `date`
+select now(),'Erzeuge View menu_element_orgstructure'
+from xdummy;
 
 create view menu_element_orgstructure(
 	orgstruktur, 
 description) as
 	
 	
-		select element as orgstruktur, description  
-        from menu_element 
+		select element as orgstruktur, description
+        from menu_element
   		where element='orgstruktur'
 				;
 	
 
-! echo "Erzeuge View user_inst_org"
-! echo `date`
+select now(),'Erzeuge View user_inst_org'
+from xdummy;
 
 create view user_inst_org(
 	userid, 
@@ -714,8 +740,8 @@ where O.key_apnr=U.ch110_institut
  ;
 	
 
-! echo "Erzeuge View hochschulen"
-! echo `date`
+select now(),'Erzeuge View hochschulen'
+from xdummy;
 
 create view hochschulen(
 	hs_nr, 
@@ -738,8 +764,8 @@ or trim(substring(apnr from 4 for 1)) ='')
  ;
 	
 
-! echo "Erzeuge View dimension_view"
-! echo `date`
+select now(),'Erzeuge View dimension_view'
+from xdummy;
 
 create view dimension_view(
 	id, 
@@ -774,10 +800,10 @@ SELECT D.tid as id,
        D.sourcefilter,
        D.system_key,
        ''::varchar(255) as view_reference,
-       ('select C.' || F.foreignkey_int || '  as id,T.sourcesystem_id, C.' || F.foreignkey_col || ' as apnr,C.' || F.foreignkey_cap || ' as name' 
+       ('select C.' || F.foreignkey_int || '  as id,T.sourcesystem_id, C.' || F.foreignkey_col || ' as apnr,C.' || F.foreignkey_cap || ' as name'
        ||',' || D.system_key || '::integer as mschluessel,T.apnr as aschluessel,null::VARCHAR(255) as obj_guid	,null::integer as lock_version'
        || ' from ' || F.foreignkey_tab || ' C,trans_dim_bp_apnr T'
-       || ' where T.sourcesystem_id=C.' || F.foreignkey_col || '::varchar(255)' 
+       || ' where T.sourcesystem_id=C.' || F.foreignkey_col || '::varchar(255)'
        || nvl(' and ' || F.foreignkey_cond || ' ','')
        || 'and ' || D.dimension_bp_id ||' =T.dimension_bp_id'
      )::lvarchar as sourcesql,
@@ -802,10 +828,10 @@ SELECT D.tid as id,
        D.sourcefilter,
        D.system_key,
        ''::varchar(255) as view_reference,
-       ('select C.' || F.foreignkey_col || ' as id,T.sourcesystem_id, C.' || F.foreignkey_col || ' as apnr,C.' || F.foreignkey_cap || ' as name' 
+       ('select C.' || F.foreignkey_col || ' as id,T.sourcesystem_id, C.' || F.foreignkey_col || ' as apnr,C.' || F.foreignkey_cap || ' as name'
        ||',' || D.system_key || '::integer as mschluessel,T.apnr as aschluessel,null::VARCHAR(255) as obj_guid	,null::integer as lock_version '
        || 'from ' || F.foreignkey_tab || ' C,trans_dim_bp_apnr T '
-       || 'where T.sourcesystem_id=C.' || F.foreignkey_col || '::varchar(255) ' 
+       || 'where T.sourcesystem_id=C.' || F.foreignkey_col || '::varchar(255) '
        || nvl(' and ' || F.foreignkey_cond || ' ','')
        || 'and ' || D.dimension_bp_id ||' =T.dimension_bp_id '
          )::lvarchar as sourcesql,
@@ -834,7 +860,7 @@ SELECT distinct T.tid+1000000 as id,
        null::VARCHAR(255) as obj_guid	,
 	null::integer as lock_version
 	FROM dimension D inner join sx_tables T on (T.name=D.fact_table)
-	
+
 	union
 SELECT distinct T.tid+2000000 as id,
       D.dimension_bp_id,
@@ -855,12 +881,12 @@ SELECT distinct T.tid+2000000 as id,
 	null::integer as lock_version
 	FROM dimension D inner join sx_tables T on (T.name=D.fact_table)
 	where D.fact_table='sva_pers_cube'
-	and D.name='ca108_amtsbez'  
+	and D.name='ca108_amtsbez'
  ;
 	
 
-! echo "Erzeuge View fact_table"
-! echo `date`
+select now(),'Erzeuge View fact_table'
+from xdummy;
 
 create view fact_table(
 	id, 
@@ -887,8 +913,8 @@ where T.name in (select distinct fact_table from dimension)
  ;
 	
 
-! echo "Erzeuge View dim_staat"
-! echo `date`
+select now(),'Erzeuge View dim_staat'
+from xdummy;
 
 create view dim_staat(
 	apnr, 
@@ -898,7 +924,7 @@ kontinent,
 inl_ausl_kurz, 
 inl_ausl_lang) as
 	
-SELECT 
+SELECT
        apnr,
        druck,
        uniquename::integer as astat,
@@ -913,8 +939,8 @@ and apnr !=0 --nur für Abwärtskompatibilität zu FLEDA
  ;
 	
 
-! echo "Erzeuge View dim_stg"
-! echo `date`
+select now(),'Erzeuge View dim_stg'
+from xdummy;
 
 create view dim_stg(
 	apnr, 
@@ -925,7 +951,7 @@ stg_ltxt,
 stg_astgrp, 
 stg_astgrp_str) as
 	
-SELECT 
+SELECT
        apnr,
        druck,
        uniquename as stg,
@@ -941,8 +967,8 @@ where dimension_bp_id=(select D.tid from dimension_bp D where D.apnr='bluep_stg'
  ;
 	
 
-! echo "Erzeuge View dim_abschluss"
-! echo `date`
+select now(),'Erzeuge View dim_abschluss'
+from xdummy;
 
 create view dim_abschluss(
 	apnr, 
@@ -957,7 +983,7 @@ abschlussart_str,
 abschluss_grp, 
 abschluss_grp_str) as
 	
-SELECT 
+SELECT
        apnr,
        druck,
        uniquename as abschluss,
@@ -977,8 +1003,8 @@ where dimension_bp_id=(select D.tid from dimension_bp D where D.apnr='bluep_absc
  ;
 	
 
-! echo "Erzeuge View dim_kost"
-! echo `date`
+select now(),'Erzeuge View dim_kost'
+from xdummy;
 
 create view dim_kost(
 	apnr, 
@@ -991,15 +1017,29 @@ key) as
      );
 	
 
-! echo "Erzeuge View dim_kotr"
-! echo `date`
+select now(),'Erzeuge View dim_kotr'
+from xdummy;
 
 create view dim_kotr(
 	apnr, 
 druck, 
 key) as
-	 SELECT dim_bp_apnr.apnr, dim_bp_apnr.druck, dim_bp_apnr.uniquename AS key 
+	 SELECT dim_bp_apnr.apnr, dim_bp_apnr.druck, dim_bp_apnr.uniquename AS key
 	FROM dim_bp_apnr WHERE dim_bp_apnr.dimension_bp_id = ( SELECT d.tid
      FROM dimension_bp d WHERE d.apnr = 'bluep_kotr');
 	
+
+select now(),'Erzeuge View dim_kreis'
+from xdummy;
+
+create view dim_kreis(
+	apnr, 
+astat, 
+druck, 
+kfz, 
+bland_druck, 
+bland_kurz, 
+bland_astat) as
+	;
+	
 </#if>

superx/WEB-INF/conf/edustore/db/install/upgrade/kernmodul_upgrade_man.sql

@@ -1,4 +1,17 @@
 --freemarker template
+<sqlvars>
+<sqlvar name="konstanten">
+select apnr,beschreibung from konstanten
+</sqlvar>
+<sqlvar name="organigramm_tid_seq_exists">
+select sp_table_exists('organigramm_tid_seq')
+</sqlvar>
+
+
+
+</sqlvars>
+
+--konstanten fuellen:
 
 select '${SQLdialect}' from xdummy;
 
@@ -57,9 +70,15 @@ alter table user_pw alter column old_sha4 type char(255);
 alter table user_pw alter column old_sha5 type char(255);
 alter table user_pw alter column old_sha6 type char(255);
 alter table user_pw alter column old_sha7 type char(255);
-alter table systeminfo  alter column datum type timestamp;
-alter table db_version  alter column db_einfuegemarke type varchar(255);
-alter table db_version  alter column his_system type varchar(255);
+
+<#if organigramm_tid_seq_exists==0>
+create sequence organigramm_tid_seq ;
+select setval('organigramm_tid_seq',(select max(tid) from organigramm));
+alter table organigramm alter column tid set default nextval('organigramm_tid_seq');
+</#if>
+
+alter table organigramm_bak alter column drucktext type varchar(255);
+alter table organigramm_bak alter column name type varchar(255);
 
 </#if>
 <#if '${SQLdialect}'='Informix' >
@@ -79,6 +98,11 @@ alter table user_pw modify(old_sha5 char(255));
 alter table user_pw modify(old_sha6 char(255));
 alter table user_pw modify(old_sha7 char(255));
 alter table systeminfo modify(datum datetime year to second);
+alter table organigramm modify(tid serial);
+alter table organigramm modify(drucktext VARCHAR(255));
+alter table organigramm modify(name VARCHAR(255));
+alter table organigramm_bak modify(drucktext VARCHAR(255));
+alter table organigramm_bak modify(name VARCHAR(255));
 </#if>
 
 DELETE FROM menu_element WHERE element = 'contenttype' AND element_value = 'text/html; charset=ISO-8859-1';

superx/WEB-INF/kern_dbforms-config_pg.xml

@@ -850,11 +850,11 @@
 <interceptor className="de.superx.servlet.DbformInterceptor"/>
 </table>
 <table name="organigramm">
-<field name="tid" description="Tupelidentifier" fieldType="int" size="6" isKey="true" sortable=""/>
+<field name="tid" description="Tupelidentifier" fieldType="int" size="4" isKey="true" autoInc="true" sortable=""/>
 <field name="key_apnr" description="Schlüssel" fieldType="char" size="10" isKey="" sortable="true"/>
 <field name="parent" description="Übergeordneter Knoten im Baum" fieldType="char" size="10" isKey="" sortable="true"/>
-<field name="drucktext" description="Drucktext" fieldType="char" size="50" isKey="" sortable=""/>
-<field name="name" description="Name" fieldType="char" size="150" isKey="" sortable=""/>
+<field name="drucktext" description="Drucktext" fieldType="varchar" size="255" isKey="" sortable=""/>
+<field name="name" description="Name" fieldType="varchar" size="255" isKey="" sortable=""/>
 <field name="ebene" description="Ebene im Baum" fieldType="int" size="6" isKey="" sortable=""/>
 <field name="lehre" description="Lehre (1=ja)" fieldType="int" size="6" isKey="" sortable=""/>
 <field name="gueltig_seit" description="Gültig von" fieldType="date" size="4" isKey="" sortable="true"/>
@@ -885,8 +885,8 @@
 <field name="tid" description="Tupelidentifier" fieldType="int" size="6" isKey="" sortable=""/>
 <field name="key_apnr" description="Schlüssel" fieldType="char" size="10" isKey="" sortable="true"/>
 <field name="parent" description="Übergeordneter Knoten im Baum" fieldType="char" size="10" isKey="" sortable=""/>
-<field name="drucktext" description="Drucktext" fieldType="char" size="50" isKey="" sortable=""/>
-<field name="name" description="Name" fieldType="char" size="150" isKey="" sortable=""/>
+<field name="drucktext" description="Drucktext" fieldType="varchar" size="255" isKey="" sortable=""/>
+<field name="name" description="Name" fieldType="varchar" size="255" isKey="" sortable=""/>
 <field name="ebene" description="Ebene im Baum" fieldType="int" size="6" isKey="" sortable=""/>
 <field name="lehre" description="Lehre (1=ja)" fieldType="int" size="6" isKey="" sortable=""/>
 <field name="gueltig_seit" description="Gültig von" fieldType="date" size="4" isKey="" sortable="true"/>
@@ -2153,23 +2153,24 @@ Außerdem können Sie hier dem Benutzer Berechtigungen über Gruppen, Sachgebiet
 <!--<customfield name="toolbar_icon_filepath" visibleSize="50" nullFieldValue="" />-->
 </form>
 
-<form name="organigramm" table="organigramm" path="/edit/kern/organigramm_edit.jsp" followUp="" caption="Organigramm verwalten" orderBy="name" gotoHt="" helpfile="" maxRows="1" mode="full">
+<form name="organigramm" table="organigramm" path="/edit/kern/organigramm_edit.jsp" followUp="" caption="Organigramm verwalten" orderBy="name" gotoHt="" helpfile="" maxRows="1" mode="full" javascriptFieldsArray="true">
 <description>In diesem Formular können Sie Organisationseinheiten verwalten.</description>
 <filters>
 <filter mandatory="false" type="contains">name</filter>
 <filter mandatory="false" type="equals">tid</filter>
 </filters>
 <field-selection complete="false"/>
- <customfield name="tid" type="include" path="/edit/kern/organigramm_tid.inc"/>
+ <customfield name="tid"/>
  <customfield name="key_apnr" nullFieldValue="" visibleSize="40"/>
-<customfield name="parent" nullFieldValue="" visibleSize="40"/>
-<customfield name="drucktext" nullFieldValue="" visibleSize="200"/>
-<customfield name="name" nullFieldValue="" visibleSize="200"/>
-<customfield name="ebene" nullFieldValue="" visibleSize="20"/>
-<customfield name="lehre" nullFieldValue="" visibleSize="20"/>
-<customfield name="gueltig_seit" nullFieldValue="" visibleSize="100"/>
+<!--<customfield name="parent"   nullFieldValue=""  visibleSize="40"/>-->
+<customfield name="parent" type="include" path="/edit/kern/organigramm_edit_parent.inc"/>
+<customfield name="drucktext" nullFieldValue="" visibleSize="30"/>
+<customfield name="name" nullFieldValue="" visibleSize="50"/>
+<customfield name="ebene" nullFieldValue="" visibleSize="10"/>
+<customfield name="lehre" nullFieldValue="" visibleSize="10"/>
+<customfield name="gueltig_seit" nullFieldValue="" visibleSize="10"/>
 <customfield name="gueltig_bis" nullFieldValue="" visibleSize="10"/>
-<customfield name="orgstruktur" nullFieldValue="" visibleSize="20"/>
+<customfield name="orgstruktur" nullFieldValue="" visibleSize="10"/>
 <customfield name="lid" nullFieldValue="" visibleSize="40"/>
 <customfield name="parent_lid" nullFieldValue="" visibleSize="40"/>
 <customfield name="uniquename" nullFieldValue="" visibleSize="40"/>

superx/edit/kern/organigramm_edit.jsp

@@ -91,7 +91,8 @@ if(tid != null && !tid.equals("null")){
 }
 %>
 <db:dbform tableName="organigramm" maxRows="1" autoUpdate="false"  captionResource="true" multipart="false" followUp="/edit/kern/organigramm_edit.jsp" filter="<%= filter %>" orderBy="name"
-dbConnectionName="<%= mandantenid %>" ><input type="hidden" name="${_csrf.parameterName}" value="${_csrf.token}"/><db:header/>
+dbConnectionName="<%= mandantenid %>" javascriptFieldsArray="true"
+ ><input type="hidden" name="${_csrf.parameterName}" value="${_csrf.token}"/><db:header/>
 <db:errors/>
 <db:body allowNew="true">
 <table border="0" align="right" cellpadding="0" cellspacing="0">
@@ -117,28 +118,23 @@ dbConnectionName="<%= mandantenid %>" ><input type="hidden" name="${_csrf.parame
 </p>
 <table class="db_form_table" cellspacing="0" cellpadding="0" width="100%" border="0">
 <td>
-<table cellspacing="0" cellpadding="0" width="100%" border="0"><%@ include file="/edit/kern/organigramm_tid.inc" %><tr>
+<table cellspacing="0" cellpadding="0" width="100%" border="0">
+<tr>
+<td class="db_label">Tupelidentifier</td><td>
+<db:label nullFieldValue="" fieldName="tid"/></td>
+</tr>
+<tr>
 <td class="db_label">
 <db:message key="Schl&uuml;ssel"/></td><td align="left">
 <div id="fld_key_apnr">
 <db:textField nullFieldValue="" styleClass="clsInputStyle" onBlur="" maxlength="10" size="40" id="inp_organigrammkey_apnr" fieldName="key_apnr"/>
 </div>
 </td>
-</tr>
-<tr>
-<td class="db_label">
-<db:message key="&Uuml;bergeordneter Knoten im Baum"/></td><td align="left">
-<div id="fld_parent"> 
-<input onblur="updateSelect(this)" style="display:none" size="10" name="key_organigrammparent" class="schluesselfeld" type="text">
-<db:select id="inp_organigrammparent" styleClass="clsInputStyle" readOnly="false" onChange="updateKeyfield(this)" fieldName="parent" customEntry=",,true"><%  sql = "select key_apnr::char(10), name from organigramm order by name;"; %><db:queryData name="organigramm_organigramm10" query="<%= sql %>" dbConnectionName="<%= mandantenid %>" /> </db:select>
-</div>
-</td>
-</tr>
-<tr>
+</tr><%@ include file="/edit/kern/organigramm_edit_parent.inc" %><tr>
 <td class="db_label">
 <db:message key="Drucktext"/></td><td align="left">
 <div id="fld_drucktext">
-<db:textField nullFieldValue="" styleClass="clsInputStyle" onBlur="" maxlength="50" size="200" id="inp_organigrammdrucktext" fieldName="drucktext"/>
+<db:textField nullFieldValue="" styleClass="clsInputStyle" onBlur="" maxlength="255" size="30" id="inp_organigrammdrucktext" fieldName="drucktext"/>
 </div>
 </td>
 </tr>
@@ -146,7 +142,7 @@ dbConnectionName="<%= mandantenid %>" ><input type="hidden" name="${_csrf.parame
 <td class="db_label">
 <db:message key="Name"/></td><td align="left">
 <div id="fld_name">
-<db:textField nullFieldValue="" styleClass="clsInputStyle" onBlur="" maxlength="150" size="200" id="inp_organigrammname" fieldName="name"/>
+<db:textField nullFieldValue="" styleClass="clsInputStyle" onBlur="" maxlength="255" size="50" id="inp_organigrammname" fieldName="name"/>
 </div>
 </td>
 </tr>

superx/edit/kern/organigramm_edit_parent.inc

@@ -0,0 +1,34 @@
+<script type="text/javascript">
+function validateInst(fld)
+{
+	fld.value=fld.value.trim();
+}
+</script>
+
+<tr>
+<td class="db_label">
+<db:message key="&Uuml;bergeordneter Knoten im Baum"/></td><td align="left">
+
+<db:textField fieldName="parent" size="10" id="inp_inst" />
+
+<span id="instLabel">
+<% 
+sql = "SELECT '0'::char(10),'Alle Institutionen'::char(255) from xdummy union SELECT key_apnr,trim(key_apnr) || '-' || name from organigramm  order by 1; "; 
+%>  
+<db:dataLabel fieldName="parent">
+<db:queryData name="k_institution" query="<%= sql %>" dbConnectionName="<%= mandantenid %>" />
+</db:dataLabel>
+</span> 
+<a href="javascript:instWaehlen();"  style="cursor: pointer;">Ausw&auml;hlen</a>
+<script language="Javascript">
+
+function instWaehlen()
+{
+	javascript:neu=window.open('organigramm_parent_dialog.jsp','_blank','directories=no,location=no,menubar=no,scrollbars=yes,resizable=yes,toolbar=no,width=800,height=660');
+}
+
+
+</script>
+</td>
+</tr>
+

superx/edit/kern/organigramm_parent_dialog.jsp

@@ -0,0 +1,146 @@
+<%@ taglib uri="/WEB-INF/dbforms.tld" prefix="db" %>
+<%@page pageEncoding="utf-8" contentType="text/html; charset=UTF-8" %>
+<html>
+<!--Automatically generated by module_scripts_create.x (SuperX)-->
+<head>
+<META http-equiv="Content-Type" content="text/html; charset=UTF-8">
+<meta content="text/html; charset=utf-8" http-equiv="Content-Type">
+<meta content="0" http-equiv="expires">
+<LINK href="/superx/style/superx.css" type="text/css" REL="stylesheet">
+<LINK href="/superx/xml/superxml_html.css" type="text/css" REL="stylesheet">
+<LINK href="/superx/xml/maske_html.css" type="text/css" REL="stylesheet">
+<LINK href="/superx/style/dbforms_40.css" type="text/css" REL="stylesheet">
+<link rel="stylesheet" type="text/css" href="/superx/xml/css/start_portlet.css"/>
+<link rel="stylesheet" type="text/css" href="/superx/xml/css/fontello-codes.css"/>
+<title>Formular Organigramm</title>
+<script type="text/javascript">
+	var djConfig = {isDebug: false };
+	//djConfig.debugAtAllCosts = true;
+	</script><script src="/superx/xml/js/dojo/dojo.js" type="text/javascript">&nbsp;</script><script type="text/javascript">
+            	dojo.require("dojo.widget.Dialog");
+            dojo.require("dojo.widget.Button");
+			dojo.require("dojo.widget.Tooltip");
+			dojo.require("dojo.string.common");
+
+			dojo.hostenv.writeIncludes();
+function inst_uebernehmen(inst_nr,inst_name)
+{
+var myWindow=window.opener;
+/*
+var myForm=myWindow.document.forms[0];
+if(myWindow.getDbFormFieldName)
+{
+var inputElem=myForm.elements[myWindow.getDbFormFieldName('parent')];
+if(inputElem)
+	inputElem.value=inst_nr;
+window.close();
+}
+*/
+myWindow.document.getElementById('inp_inst').value=inst_nr;
+myWindow.document.getElementById('instLabel').innerHTML=inst_name;
+window.close();
+}
+			</script><script src="/superx/xml/js/memtext/dbforms.js" type="text/javascript">&nbsp;</script>
+<db:base/>
+</head>
+<body class="clsPageBody"><%@ page import ="java.util.Hashtable" %>
+<%
+//HttpSession session=request.getSession(true);
+if (request.getCharacterEncoding() == null) 
+        request.setCharacterEncoding("UTF-8");
+Object userobject=request.getSession().getAttribute("UserID");
+String userid;
+String filter="";
+String sql="";
+if(userobject == null)
+{
+%>
+
+<jsp:forward page="/edit/not_authenticated.htm"/>
+<%
+}
+else
+	userid=userobject.toString();
+Object mandantobject=request.getSession().getAttribute("MandantenID");
+String mandantenid="";
+if(mandantobject != null)
+	mandantenid=mandantobject.toString();
+//der superx-Default-Mandant ist bei dbforms ein Leerstring
+if(mandantenid.equals("default"))
+	mandantenid="";
+String db_form_name="organigramm";
+String erlaubt="0";
+%>
+<%@ include file="/edit/check_authentication.inc" %>
+<%
+if(erlaubt.equals("0"))
+{
+%>
+
+<jsp:forward page="/edit/not_authorized.htm"/>
+<%
+}
+
+String keyfieldsused="false";
+Object kf=request.getParameter("keyfieldsused");
+if(kf != null)
+keyfieldsused=kf.toString();
+
+%>	
+
+
+
+<p align="right">
+<a target="_parent" href="http://www.superx-projekt.de"><img border="0" alt="Logo" src="../../images/logo.gif"></a>
+<br><% if(!mandantenid.equals("default") && !mandantenid.equals("")) 
+out.println("<strong>Mandant: " + mandantenid +"</strong>"); 
+%></p>
+<div style="margin: 0px; padding: 0px; overflow: hidden; width: 100%;" id="menuCaption">
+<span class="menuCaptionTitle" id="menuCaptionTitle">Bitte w&auml;hlen Sie eine Institution aus:</span><img border="0" alt="Erl&auml;uterung" src="/superx/images/info.png"><span style="display:none" connectId="menuCaption" dojoType="tooltip">In diesem Formular k&ouml;nnen Sie das Organigramm aufrufen</span>
+</div><db:dbform tableName="organigramm" 
+maxRows="*" autoUpdate="false"  
+captionResource="true" multipart="false"
+followUp="/edit/kern/organigramm_list.jsp"
+orderBy="key_apnr" 
+sqlFilter="gueltig_bis >= today()"
+dbConnectionName="<%= mandantenid %>" >
+<input type="hidden" name="${_csrf.parameterName}" value="${_csrf.token}"/>
+<db:header>
+<table class="dbform_tab" border="1" >
+<tr><td /><td>Filtern</td><td><db:search fieldName="drucktext" searchAlgo="weakEnd"/></td><td /> </tr>
+
+<tr>
+<th></th><th align="left">
+<db:message key="Schl&uuml;ssel"/></th><th align="left">
+<db:message key="Drucktext"/></th>
+<th align="left">
+<db:message key="Gültig von"/></th>
+<th align="left">
+<db:message key="Gültig bis"/></th>
+<th>&Uuml;bernehmen</th>
+</tr>
+<tr><td /><td>0</td><td>Alle Institutionen</td>
+	<td />
+	<td />
+
+<td><a onclick="inst_uebernehmen('0','Alle Institutionen');" class="icon icon-left-big" style="color:blue;cursor: pointer;" title="Zuweisen und schlie&szlig;en">&nbsp;</a>
+	</td>
+	</tr>
+</db:header>
+<db:errors/>
+<db:body allowNew="false">
+<tr>
+<td></td><td><db:label nullFieldValue="" fieldName="key_apnr" />
+	</td><td><db:label nullFieldValue="" fieldName="drucktext" />
+	</td><td><db:dateLabel nullFieldValue="" fieldName="gueltig_seit" />
+	</td>
+	<td><db:dateLabel nullFieldValue="" fieldName="gueltig_bis" />
+	</td>
+	<td><a onclick="<%= "inst_uebernehmen('"+currentRow_organigramm.get("key_apnr").toString()+"','"+currentRow_organigramm.get("drucktext").toString()+"');" %>" class="icon icon-left-big" style="color:blue;cursor: pointer;" title="Zuweisen und schlie&szlig;en">&nbsp;</a>
+	</td>
+</tr>
+</db:body>
+<db:footer><tr></tr>
+</table>
+</db:footer></db:dbform></body>
+</html>

superx/xml/js/memtext/sx_functions.js

@@ -1830,10 +1830,10 @@ function maskSubmit(event) {
 	//event.preventDefault();
 }
 
-$(document).ready(function() {
+/*$(document).ready(function() {
 	$("#SuperXMaske").submit(maskSubmit);
 });
-
+*/
 function toggleCheckbox(fldname)
 {
 	//alert(fldname);