From 072354ab8efc411613e51eaae421b79efdd20ecf Mon Sep 17 00:00:00 2001
From: Daniel Quathamer <danielq@memtext.de>
Date: Mon, 17 Apr 2023 12:43:55 +0200
Subject: [PATCH] =?UTF-8?q?Umgebung=20und=20Script=20f=C3=BCr=20Modulupgra?=
 =?UTF-8?q?des=20#1?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 env/BI_ENV.sam                                   | 2 +-
 upgrade/hisinone_bi_qisserver/modules_upgrade.sh | 8 ++++----
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/env/BI_ENV.sam b/env/BI_ENV.sam
index c0ee0a8..5e3a751 100644
--- a/env/BI_ENV.sam
+++ b/env/BI_ENV.sam
@@ -19,7 +19,7 @@ export MEM
 
 QISSERVER_PFAD=$WEBAPP/../qisserver
 QISSERVER_LIB_PFAD=$QISSERVER_PFAD/WEB-INF/lib
-QIS_CLASSPATH="$TOMCAT_PATH/lib/servlet-api.jar:$QISSERVER_PFAD/WEB-INF/classes" ; for i in `ls $QISSERVER_LIB_PFAD/*.jar` ; do QIS_CLASSPATH=$QIS_CLASSPATH:$i ; done 
+QIS_CLASSPATH="$WEBAPP/WEB-INF/lib_ext/servlet-api.jar:$QISSERVER_PFAD/WEB-INF/classes" ; for i in `ls $QISSERVER_LIB_PFAD/*.jar` ; do QIS_CLASSPATH=$QIS_CLASSPATH:$i ; done 
 export QIS_CLASSPATH
 
 
diff --git a/upgrade/hisinone_bi_qisserver/modules_upgrade.sh b/upgrade/hisinone_bi_qisserver/modules_upgrade.sh
index 68f93cd..0cf84ab 100755
--- a/upgrade/hisinone_bi_qisserver/modules_upgrade.sh
+++ b/upgrade/hisinone_bi_qisserver/modules_upgrade.sh
@@ -35,8 +35,6 @@ echo "Start BI-Upgrades  " >$MASTERLOG
 date >>$MASTERLOG
 
 #
-cd $WEBAPP
-java -Xmx${MEM} -cp "$QIS_CLASSPATH" -Dfile.encoding=UTF-8 de.his.edustore.modules.WebFrontendForModuleInstall kern upgrade '$SUPERX_DIR=/disk1/webapps/superx/WEB-INF/conf/edustore'
 
 
 executeUpgrade()
@@ -48,10 +46,12 @@ executeUpgrade()
  MODULLOG=$LOGPFAD/"$MODUL_UPPER"_upgrade.log
  echo "Start MODUL $MODUL_UPPER " >>$MYMASTERLOG
  date >>$MYMASTERLOG
- java -Xmx${MEM} -cp "$QIS_CLASSPATH" -Dfile.encoding=UTF-8 de.his.edustore.modules.WebFrontendForModuleInstall $MODUL upgrade '$SUPERX_DIR='$WEBAPP'/WEB-INF/conf/edustore $'$MODUL_UPPER'_PFAD='$WEBAPP'/WEB-INF/conf/edustore/db/module/sos'
+ echo Executing java -Xmx${MEM} -cp "$QIS_CLASSPATH" -Dfile.encoding=UTF-8 de.his.edustore.modules.WebFrontendForModuleInstall $MODUL upgrade '$SUPERX_DIR='$WEBAPP'/WEB-INF/conf/edustore $'$MODUL_UPPER'_PFAD='$WEBAPP'/WEB-INF/conf/edustore/db/module/sos' >>$MYMASTERLOG 2>&1
+
+ java -Xmx${MEM} -cp "$QIS_CLASSPATH" -Dfile.encoding=UTF-8 de.his.edustore.modules.WebFrontendForModuleInstall $MODUL upgrade '$SUPERX_DIR='$WEBAPP'/WEB-INF/conf/edustore $'$MODUL_UPPER'_PFAD='$WEBAPP'/WEB-INF/conf/edustore/db/module/sos' >>$MYMASTERLOG 2>&1
 
  RETURN_CODE=$?
- echo "End Upgrade $MODUL " >>$MYMASTERLOG
+ echo "End Upgrade $MODUL with RETURN_CODE $RETURN_CODE" >>$MYMASTERLOG
  date >>$MYMASTERLOG
  if [ $RETURN_CODE -eq 0 -a "$MAILPROG" != "" ]     
 then