From 23fe418e99165f793dc91b56e830d28bb803f007 Mon Sep 17 00:00:00 2001
From: Daniel Quathamer <danielq@memtext.de>
Date: Thu, 19 Sep 2024 14:55:25 +0200
Subject: [PATCH] Bugfix Kern build hi1-patch Paket, Sonderzeichen in Staaten
 Tabelle korr. #6

---
 superx/WEB-INF/conf/edustore/db/conf/build.xml               | 5 ++---
 superx/WEB-INF/conf/edustore/db/install/conf/builddatum.txt  | 2 +-
 .../schluesseltabellen/release_unloads/k_astat_staat.unl     | 2 +-
 3 files changed, 4 insertions(+), 5 deletions(-)

diff --git a/superx/WEB-INF/conf/edustore/db/conf/build.xml b/superx/WEB-INF/conf/edustore/db/conf/build.xml
index 1e91956..358c58c 100644
--- a/superx/WEB-INF/conf/edustore/db/conf/build.xml
+++ b/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>
diff --git a/superx/WEB-INF/conf/edustore/db/install/conf/builddatum.txt b/superx/WEB-INF/conf/edustore/db/install/conf/builddatum.txt
index 5956698..afac032 100644
--- a/superx/WEB-INF/conf/edustore/db/install/conf/builddatum.txt
+++ b/superx/WEB-INF/conf/edustore/db/install/conf/builddatum.txt
@@ -1 +1 @@
-16.09.2024
+19.09.2024
diff --git a/superx/WEB-INF/conf/edustore/db/install/schluesseltabellen/release_unloads/k_astat_staat.unl b/superx/WEB-INF/conf/edustore/db/install/schluesseltabellen/release_unloads/k_astat_staat.unl
index 89568b8..4f9f23f 100644
--- a/superx/WEB-INF/conf/edustore/db/install/schluesseltabellen/release_unloads/k_astat_staat.unl
+++ b/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^