Bugfix Kern build hi1-patch Paket, Sonderzeichen in Staaten Tabelle korr. #6

(cherry picked from commit 1b14b58d18)

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

@@ -557,9 +557,8 @@ xmlns:HtmlUtils="de.superx.util.HtmlUtils">
     </antcall>
    </target> 
    <target name="kern_patch_his1" if="isPlatformHIS1" >
-    <!--<mkdir dir="${ZIELPFAD_PATCH}/db/module"/>
-    <mkdir dir="${ZIELPFAD_PATCH}/webserver/tomcat"/>-->
-    <property name="PATCH_EXCLUSIVE" value="superx/WEB-INF/classes/edustore/edustore.xml,superx/WEB-INF/classes/edustore/custom.xml,superx/WEB-INF/classes/saiku-datasources/edustore,superx/WEB-INF/web.xml,superx/xml/pageComponents_html_final.xsl,superx/index.htm,superx/WEB-INF/mandanten.cfg,superx/WEB-INF/log4j.properties,superx/WEB-INF/db.properties,superx/WEB-INF/dbforms-config.xml,superx/META-INF/context.xml,superx/WEB-INF/conf/edustore/db/bin/SQL_ENV,superx/WEB-INF/lib/ifxjdbc.jar"/>
+    <!--<property name="PATCH_EXCLUSIVE" value="superx/WEB-INF/classes/edustore/edustore.xml,superx/WEB-INF/classes/edustore/custom.xml,superx/WEB-INF/classes/saiku-datasources/edustore,superx/WEB-INF/web.xml,superx/xml/pageComponents_html_final.xsl,superx/index.htm,superx/WEB-INF/mandanten.cfg,superx/WEB-INF/log4j.properties,superx/WEB-INF/db.properties,superx/WEB-INF/dbforms-config.xml,superx/META-INF/context.xml,superx/WEB-INF/conf/edustore/db/bin/SQL_ENV,superx/WEB-INF/lib/ifxjdbc.jar"/>-->
+    <property name="PATCH_EXCLUSIVE" value="webserver/tomcat/webapps/superx/WEB-INF/classes/edustore/edustore.xml,webserver/tomcat/webapps/superx/WEB-INF/classes/saiku-datasources/edustore,webserver/tomcat/webapps/superx/WEB-INF/web.xml,webserver/tomcat/webapps/superx/xml/pageComponents_html_final.xsl,webserver/tomcat/webapps/superx/index.htm,webserver/tomcat/webapps/superx/WEB-INF/mandanten.cfg,webserver/tomcat/webapps/superx/WEB-INF/log4j.properties,webserver/tomcat/common/classes/log4j.properties,webserver/tomcat/webapps/superx/xml/index.htm"/>
     <sync todir="${ZIELPFAD_PATCH}" overwrite="true" includeEmptyDirs="true" >
      <fileset dir="${ZIELPFAD}" excludes="${PATCH_EXCLUSIVE}"></fileset>
     </sync>

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

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

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

@@ -1 +1 @@
-05.09.2024
+19.09.2024

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

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

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

@@ -147,7 +147,7 @@ create table db_version(
 his_system NVARCHAR(255) , 
 version CHAR(8) , 
 kern_system CHAR(1) , 
-version_hash VARCHAR() , 
+version_hash VARCHAR , 
 systeminfo_id INTEGER ,
 	primary key (his_system, version)
 	constraint c_db_version

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

@@ -162,7 +162,7 @@ create table db_version(
 his_system VARCHAR(255) , 
 version CHAR(8) , 
 kern_system CHAR(1) , 
-version_hash VARCHAR() , 
+version_hash VARCHAR , 
 systeminfo_id INTEGER , 
 	constraint c_db_version primary key (his_system, version)
 

superx/WEB-INF/conf/edustore/db/install/schluesseltabellen/release_unloads/k_astat_staat.unl

@@ -137,7 +137,6 @@
 341^3925^St. Martin (niederländischer Teil) (Niederländisches Überseegebiet)^0^3^
 342^3930^Grönland (Dänisches Überseegebiet)^0^3^
 343^3970^Navassa (US-Überseegebiet)^0^3^
-344^3915^Bonaire, Saba, St. Eustatius (Niederländisches Überseegebiet)^0^3^
 345^3350^Guatemala^0^3^
 346^3400^Haiti^0^3^
 347^3425^Honduras^0^3^
@@ -249,3 +248,4 @@
 997^9000^Staatenlos^0^9^
 998^9200^Ungeklärt^0^9^
 999^9400^Ohne Angabe^0^9^
+344^3915^Bonaire, Saba, St. Eustatius (Niederländisches Überseegebiet)^0^3^

superx/WEB-INF/conf/edustore/db/install/schluesseltabellen/release_unloads/userinfo.unl

@@ -1,3 +1,3 @@
-1^admin^b0f5fa4ab4722cb6^Administrator^5^0^^1^1^0533a66a3e9bea16f3139bfe4f6ce50ced591dea^^^^^^
-10^testuser^4bd14efa1663a08f^Testuser^5^0^J.doe@memtext.de^0^0^0533a66a3e9bea16f3139bfe4f6ce50ced591dea^Beta-Tester^^^^^
-4^superx^1234567^SuperX^5^0^^1^1^0533a66a3e9bea16f3139bfe4f6ce50ced591dea^SuperX-Administrator^^^^^
+1^admin^b0f5fa4ab4722cb6^Administrator^5^0^^1^1^0533a66a3e9bea16f3139bfe4f6ce50ced591dea^^^^^^^^
+10^testuser^4bd14efa1663a08f^Testuser^5^0^J.doe@memtext.de^0^0^0533a66a3e9bea16f3139bfe4f6ce50ced591dea^Beta-Tester^^^^^^^
+4^superx^1234567^SuperX^5^0^^1^1^0533a66a3e9bea16f3139bfe4f6ce50ced591dea^SuperX-Administrator^^^^^^^

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

@@ -436,7 +436,7 @@ alter table db_version add ( kern_system CHAR(1) );
 ! echo "field db_version.version_hash will be added"
 ! echo `date`
  
-alter table db_version add ( version_hash VARCHAR() );
+alter table db_version add ( version_hash VARCHAR );
 
 </#if>
 

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

@@ -544,7 +544,7 @@ alter table db_version add column kern_system CHAR(1) ;
 
 select now(), 'field db_version.version_hash will be added';
 
-alter table db_version add column version_hash VARCHAR() ;
+alter table db_version add column version_hash VARCHAR ;
 
 </#if>
 

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

@@ -356,7 +356,7 @@ create table db_version(
 his_system NVARCHAR(255) , 
 version CHAR(8) , 
 kern_system CHAR(1) , 
-version_hash VARCHAR() , 
+version_hash VARCHAR , 
 systeminfo_id INTEGER ,
 	primary key (his_system, version)
 	constraint c_db_version

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

@@ -501,7 +501,7 @@ create table db_version(
 his_system VARCHAR(255) , 
 version CHAR(8) , 
 kern_system CHAR(1) , 
-version_hash VARCHAR() , 
+version_hash VARCHAR , 
 systeminfo_id INTEGER , 
 	constraint c_db_version primary key (his_system, version)