From 68e05ad7f07a803b044039088f67d4a3df51f754 Mon Sep 17 00:00:00 2001
From: Daniel Quathamer <danielq@memtext.de>
Date: Fri, 22 Sep 2023 09:33:02 +0200
Subject: [PATCH] =?UTF-8?q?Stabile=20und=20schnellere=20Maskenausf=C3=BChr?=
 =?UTF-8?q?ung=20#6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src-modules/module/qa/conf/includes.txt       |   1 +
 src-modules/module/qa/conf/qa.xml             |  15 +-
 .../qa_mask_execution_result_purge.sql        |   9 +-
 .../module/qa/datentabellen/vacuum_pg.sql     |  11 +
 .../module/qa/masken/37020_maskeninfo.unl     |   2 +-
 .../module/qa/masken/37040_maskeninfo.unl     |   6 +-
 .../module/qa/qa_mask_execution_loop.x        |  27 +++
 src-modules/module/qa/qa_update.x             |   5 +-
 .../module/qa/upgrade/qa_upgrade_man.sql      |  15 ++
 src/de/superx/qa/bin/QaTestcaseExecutor.java  | 218 ++++++++++++++----
 .../conf/edustore/db/bin/qa_mask_execution.x  |  20 +-
 superx/WEB-INF/lib/superx-qa.jar              | Bin 8105 -> 9410 bytes
 superx/xml/tabelle_html_qa.xsl                | 197 ++++++++++++++++
 13 files changed, 457 insertions(+), 69 deletions(-)
 create mode 100644 src-modules/module/qa/datentabellen/vacuum_pg.sql
 create mode 100755 src-modules/module/qa/qa_mask_execution_loop.x
 create mode 100644 src-modules/module/qa/upgrade/qa_upgrade_man.sql
 create mode 100644 superx/xml/tabelle_html_qa.xsl

diff --git a/src-modules/module/qa/conf/includes.txt b/src-modules/module/qa/conf/includes.txt
index 68ef154..5057796 100644
--- a/src-modules/module/qa/conf/includes.txt
+++ b/src-modules/module/qa/conf/includes.txt
@@ -3,3 +3,4 @@ WEB-INF/conf/edustore/db/bin/SQL_ENV_qa.sam
 WEB-INF/conf/edustore/db/bin/qa_mask_execution.x
 WEB-INF/conf/edustore/db/bin/qa_tc_execution_mail.x
 WEB-INF/lib/superx-qa.jar
+xml/tabelle_html_qa.xsl
diff --git a/src-modules/module/qa/conf/qa.xml b/src-modules/module/qa/conf/qa.xml
index b832487..89109b2 100644
--- a/src-modules/module/qa/conf/qa.xml
+++ b/src-modules/module/qa/conf/qa.xml
@@ -213,11 +213,11 @@ notnull="true">
 <column name="result_log" type="TEXT" size="" default=""  description="Logdatei Ausführung" notnull="false">
 <comment></comment>
 </column>
-<column name="result_stream" type="TEXT" size="255" default="" notnull="false" description="Ausgabe">
-<comment>CSV oder XML</comment>
+<column name="result_xml" type="TEXT" size="255" default="" notnull="false" description="Ausgabe (XML)">
+<comment>XML</comment>
 </column>
-<column name="result_stream_contenttype" type="VARCHAR" size="255" default="" notnull="false" description="Ausgabeformat">
-<comment>HTML, Text, CSV oder XML</comment>
+<column name="result_html" type="TEXT" size="255" default="" notnull="false" description="Ausgabe (HTML)">
+<comment>HTML</comment>
 </column>
 <!--
 <column name="result_value" type="VARCHAR" size="255" default=""  description="Rückgabewert" notnull="false">
@@ -985,7 +985,11 @@ format="%s">
 	database=""/>
 <nativeaction sql="" scriptfile="$QA_PFAD/datentabellen/qa_dbtest_ausfuehren.sql" 
 	database=""/>
-<nativeaction sql="update systeminfo set datum=today() where tid in (260)" scriptfile="" database=""/>
+<nativeaction sql="update systeminfo set datum=today() where tid in (260);" scriptfile="" database=""/>
+</action>
+<action error="stop">
+<nativeaction sql="" scriptfile="$QA_PFAD/datentabellen/vacuum_pg.sql"
+	database="POSTGRES"/>
 </action>
 </etl-step>
 </etl>
@@ -1006,6 +1010,7 @@ format="%s">
 <action error="stop">
 <nativeaction sql="" scriptfile="$QA_PFAD/schluesseltabellen/sx_jobs_fuellen.sql" database=""/>
 <nativeaction sql="" scriptfile="$QA_PFAD/schluesseltabellen/sachgebiete_fuellen.sql" database=""/>
+<nativeaction sql="" scriptfile="$QA_PFAD/upgrade/qa_upgrade_man.sql" database=""/>
 
 </action>
 </upgrade-step>
diff --git a/src-modules/module/qa/datentabellen/qa_mask_execution_result_purge.sql b/src-modules/module/qa/datentabellen/qa_mask_execution_result_purge.sql
index ce1960c..f9525dc 100644
--- a/src-modules/module/qa/datentabellen/qa_mask_execution_result_purge.sql
+++ b/src-modules/module/qa/datentabellen/qa_mask_execution_result_purge.sql
@@ -1,7 +1,8 @@
 
 
 
---Speicherplatz sparen bei Erfolg:
-update qa_mask_execution_result set result_stream=null,
-result_stream_contenttype=null
-where result_code=0; 
+--Speicherplatz sparen: leeren der TEXT Spalten nach 6 Monaten:
+update qa_mask_execution_result set result_log=null,
+result_xml=null,
+result_html=null
+where date(execution_start) < today()-180; 
diff --git a/src-modules/module/qa/datentabellen/vacuum_pg.sql b/src-modules/module/qa/datentabellen/vacuum_pg.sql
new file mode 100644
index 0000000..c10df98
--- /dev/null
+++ b/src-modules/module/qa/datentabellen/vacuum_pg.sql
@@ -0,0 +1,11 @@
+
+select * from xdummy;
+
+--bei Postgres in HIS1 laufen alle Scripte in Transaktionen, daher muss man 
+--für vacuum erst committen
+
+commit;
+
+vacuum qa_mask_execution_result;
+vacuum qa_mask_execution_assert_result;
+
diff --git a/src-modules/module/qa/masken/37020_maskeninfo.unl b/src-modules/module/qa/masken/37020_maskeninfo.unl
index 8515dd4..165788f 100644
--- a/src-modules/module/qa/masken/37020_maskeninfo.unl
+++ b/src-modules/module/qa/masken/37020_maskeninfo.unl
@@ -363,4 +363,4 @@ Column CID=1 heading_text="Bearbeiten" center_heading\
    row_selectable col_selectable heading_platform readonly\
    width=5 text_size=200\
 </#if>\
-@@@^^^Protokoll der Masken-Ausführung ausgeben^drop table tmp_testcase;^^1^440^360^0^1^^
+@@@^^^Protokoll der Testfall-Ausführung ausgeben^drop table tmp_testcase;^^1^440^360^0^1^^
diff --git a/src-modules/module/qa/masken/37040_maskeninfo.unl b/src-modules/module/qa/masken/37040_maskeninfo.unl
index 8dedf35..ba27ebb 100644
--- a/src-modules/module/qa/masken/37040_maskeninfo.unl
+++ b/src-modules/module/qa/masken/37040_maskeninfo.unl
@@ -64,7 +64,8 @@ result_log,\
 result_value_min,\
 result_value_max,\
 result_value,\
-result_status_str\
+result_status_str,\
+'../edit/qa/qa_show_mask_execution_result.jsp|tid=' || tid as nextedit\
 from tmp_qa_mask_execution\
 order by 1,2,3;^XIL List\
    drop_and_delete movable_columns sizable_columns horizontal_scrolling\
@@ -94,4 +95,7 @@ Column CID=1 heading_text="Wert" center_heading\
 Column CID=1 heading_text="Ausführungsstatus" center_heading\
    row_selectable col_selectable heading_platform readonly\
    width=15 text_size=200\
+Column CID=1 heading_text="Ergebnis-HTML" center_heading\
+   row_selectable col_selectable heading_platform readonly\
+   width=15 text_size=200\
 @@@^^^Detailausgabe des Protokolls einer Maskenausführung^drop table tmp_qa_mask_execution;^^1^440^360^0^1^^
diff --git a/src-modules/module/qa/qa_mask_execution_loop.x b/src-modules/module/qa/qa_mask_execution_loop.x
new file mode 100755
index 0000000..5864e2a
--- /dev/null
+++ b/src-modules/module/qa/qa_mask_execution_loop.x
@@ -0,0 +1,27 @@
+#!/bin/bash
+
+function exitAfterError
+{
+  echo "Testfall Error"
+  date
+}
+trap exitAfterError ERR
+
+
+TC_ALL=`psql --dbname=$DBNAME --tuples-only -c "select uniquename from qa_mask_execution where is_active=1 order by 1"`
+
+cd $WEBAPP/WEB-INF
+
+for TC in ${TC_ALL} ; do
+echo -e "-- Start Testfall $TC `date`" 
+echo -e "######################################\n\n" 
+
+
+qa_mask_execution.x "-tc:$TC"
+
+
+echo -e "-- Ende Testfall $TC `date`" 
+
+echo -e "######################################\n\n" 
+
+done
diff --git a/src-modules/module/qa/qa_update.x b/src-modules/module/qa/qa_update.x
index 5968d9c..d1860b7 100755
--- a/src-modules/module/qa/qa_update.x
+++ b/src-modules/module/qa/qa_update.x
@@ -37,10 +37,9 @@ fi
 date +'%d.%m.%Y' > $QA_LOAD_PFAD/superx.datum
 echo "qa-Update startet" >$QA_ERRORDAT
 
+cd $QA_PFAD
+qa_mask_execution_loop.x  > $QA_PFAD/L_QA_update_Masken$MANDANTID.log 2>&1 
 
-
-cd $WEBAPP/WEB-INF 
-qa_mask_execution.x > $QA_PFAD/L_QA_update_Masken$MANDANTID.log 2>&1 
 runAndCheck.x $QA_PFAD "module_etl.x qa $QA_PFAD $QA_LOAD_PFAD" EXIT_ON_ERROR SEND_ERRORMAIL SEND_LOGMAIL "QA update$MANDANTID"
 cat $QA_PFAD/L_QA_update_Masken$MANDANTID.log >>$QA_PFAD/L_QA_update$MANDANTID.log
 echo "---------------------------Beginn Prüfroutine-----------------------------------" >>$QA_ERRORDAT
diff --git a/src-modules/module/qa/upgrade/qa_upgrade_man.sql b/src-modules/module/qa/upgrade/qa_upgrade_man.sql
new file mode 100644
index 0000000..cf5737e
--- /dev/null
+++ b/src-modules/module/qa/upgrade/qa_upgrade_man.sql
@@ -0,0 +1,15 @@
+
+--mit Version 0.6 werden Erwartungen in den Protokolltabellen mitgespeichert. So wird verhindert dass ein altes Testfall-Ergebnis durch eine Änderung der Erwartung verfälscht wird.
+
+
+update qa_mask_execution_assert_result set assert_result_value_min=(select A.result_value_min
+from qa_mask_execution_assert A where A.tid=qa_mask_execution_assert_result.mask_execution_assert_id)
+where assert_result_value_min is null;
+
+update qa_mask_execution_assert_result set assert_result_value_max=(select A.result_value_max
+from qa_mask_execution_assert A where A.tid=qa_mask_execution_assert_result.mask_execution_assert_id)
+where assert_result_value_max is null;
+
+--Obsolete Maske:
+delete from themenbaum where maskeninfo_id=37100;
+
diff --git a/src/de/superx/qa/bin/QaTestcaseExecutor.java b/src/de/superx/qa/bin/QaTestcaseExecutor.java
index fd800d2..e04035f 100644
--- a/src/de/superx/qa/bin/QaTestcaseExecutor.java
+++ b/src/de/superx/qa/bin/QaTestcaseExecutor.java
@@ -7,17 +7,40 @@
  */
 package de.superx.qa.bin;
 
+import java.io.BufferedWriter;
+import java.io.ByteArrayOutputStream;
+import java.io.File;
+import java.io.FileInputStream;
+import java.io.FileWriter;
 import java.io.IOException;
+import java.io.PrintStream;
+import java.io.PrintWriter;
 import java.io.StringReader;
+import java.io.StringWriter;
+import java.net.URISyntaxException;
 import java.sql.Connection;
 import java.sql.PreparedStatement;
 import java.sql.SQLException;
 import java.sql.Statement;
+import java.text.SimpleDateFormat;
+import java.util.Date;
 import java.util.Enumeration;
 import java.util.Hashtable;
 import java.util.Iterator;
+import java.util.List;
 import java.util.Locale;
 import java.util.Properties;
+import java.util.StringTokenizer;
+
+import javax.xml.transform.TransformerConfigurationException;
+import javax.xml.transform.TransformerException;
+import javax.xml.transform.TransformerFactoryConfigurationError;
+
+import org.apache.log4j.Appender;
+import org.apache.log4j.Level;
+import org.apache.log4j.Logger;
+import org.apache.log4j.PropertyConfigurator;
+import org.slf4j.LoggerFactory;
 
 import org.jaxen.JaxenException;
 import org.jaxen.XPath;
@@ -30,8 +53,11 @@ import org.jdom.input.SAXBuilder;
 import org.springframework.mock.web.MockHttpServletRequest;
 import org.springframework.mock.web.MockHttpServletResponse;
 import org.springframework.mock.web.MockServletConfig;
+import org.w3c.dom.NodeList;
 
 import de.memtext.baseobjects.coll.NamedIdObjectList;
+import de.memtext.util.LogUtils;
+import de.superx.bin.Dosql;
 import de.superx.bin.SxConnection;
 import de.superx.common.FieldContainer;
 import de.superx.common.Maske;
@@ -52,7 +78,7 @@ import net.sf.saxon.sxpath.XPathExpression;
 
 public class QaTestcaseExecutor {
 	private static String tcUniquename;
-	private static String systeminfoId;
+	private static int systeminfoId;
 	private static String fieldSelCmdLine;
 	private static int maskExecutionId;
 	private static String maskeninfoId;
@@ -64,19 +90,35 @@ public class QaTestcaseExecutor {
 	private static FieldContainer myFieldContainer;
 	private static Hashtable<String, String> maskFields ;
 	private static String resultXml;
+	private static String resultHtml;
 	private static String resultLog;
 	private static String pathToDbProperties;
 	private static Connection myConnection;
+	private static String logFile;
+
 	
 	public QaTestcaseExecutor() {
 			this.maskFields = new Hashtable();
+			
+			initLogging();
+			resultHtml="";
 	}
 
-	private void init() throws SQLException
+	private void init() throws SQLException, IOException, SecurityException, URISyntaxException
 	{
-
-		
 		
+		/*File f = new File(logConf);
+		if (!f.exists()) {
+			throw new IOException("Datei nicht gefunden: " + logConf);
+		}
+		FileInputStream ins = new FileInputStream(logConf);
+		LogManager MyLogManager = java.util.logging.LogManager.getLogManager();
+		MyLogManager.readConfiguration(ins);
+		String level = MyLogManager.getProperty(".level");
+		logger.info("Using Loggging-Level " + level);
+		logger.info("Start Lauf");*/
+		//initLogging(true, Level.INFO);
+		//logger.info("START");
 		try {
 			myConnection = this.getConnection(pathToDbProperties);
 		} catch (Exception e) {
@@ -89,7 +131,7 @@ public class QaTestcaseExecutor {
 		
 		//System.out.println("fieldSel:"+fieldSel);
 		
-		System.out.println("inited");
+		writeToLog("QaTestcaseExecutor inited");
 		
 	}
 	
@@ -110,45 +152,44 @@ public class QaTestcaseExecutor {
 	}
 	
 	public static void main(String[] args) {
-		String usage="usage: java de.superx.qa.bin.QaTestcaseExecutor -dbproperties:$DB_PROPERTIES -tc:abc -systeminfo_id:9 -params:TID=16000 (optional) -outfile:Ausgabedatei (optional)" ;
+		String usage="usage: java de.superx.qa.bin.QaTestcaseExecutor -userid:1(optional) -tc:abc(optional) -systeminfo_id:9(optional)" ;
 		GetOpts.setOpts(args);
 		
-		String isdrin = GetOpts.isAllRequiredOptionsPresent("-logger,-dbproperties");
-		if (isdrin != null) {
-
-			System.err.println(usage);
-			System.exit(1);
-		}
 		int returnCode=0;
 		int nrOfTestcases=0;
 		int nrOfSuccessfulTestcases=0;
-		pathToDbProperties = GetOpts.getValue("-dbproperties");
-		String tcUniquename="" ;
+		if (GetOpts.isPresent("-userid"))
+		userId = Integer.valueOf(GetOpts.getValue("-userid"));
+		
 		if (GetOpts.isPresent("-tc"))
 				tcUniquename= GetOpts.getValue("-tc");
-		String systeminfoId="";
 		if (GetOpts.isPresent("-systeminfo_id"))
-				systeminfoId= GetOpts.getValue("-systeminfo_id");
-		String loggerArg=GetOpts.getValue("-logger");
+				systeminfoId= Integer.valueOf(GetOpts.getValue("-systeminfo_id"));
 		
 	
 		QaTestcaseExecutor myExec=new QaTestcaseExecutor(); //TODO:Mandantid
 		
 		try {
 			myExec.init();
-			int[] myTestcases=getTestcases(tcUniquename,systeminfoId);
+			int[] myTestcases=getTestcases();
 			nrOfTestcases=myTestcases.length;
 			if(nrOfTestcases>0)
 			{
+				writeToLog("nrOfTestcases: "+nrOfTestcases);
 				for (int tcNr = 0;tcNr < nrOfTestcases; tcNr++) 
 				{
 					returnCode=executeTestcase(myTestcases[tcNr]);
+					//reset static variables:
+					resultLog="";
+					resultXml="";
+					resultHtml="";
+					tcUniquename="" ;
 					if(returnCode==0)
 						nrOfSuccessfulTestcases++;
 				}
 			}
 			myConnection.close();
-				
+			
 		} catch (Exception e) {
 			// TODO Auto-generated catch block
 
@@ -163,7 +204,7 @@ public class QaTestcaseExecutor {
 
 	}
 	
-	private static int[] getTestcases(String tcUniquename,String systeminfoId) throws Exception
+	private static int[] getTestcases() throws Exception
 	{
 		//TODO_ Umlaute erlauben:
 		//if(!SqlStringUtils.checkValidKeyEntry(tcUniquename) || !SqlStringUtils.checkValidKeyEntry(systeminfoId))
@@ -175,10 +216,12 @@ public class QaTestcaseExecutor {
 				+ "FROM qa_mask_execution E left outer join userinfo U\n"
 				+ " on (U.tid=E.userinfo_id)"
 				+ "where E.is_active=1";
-		if(!tcUniquename.equals(""))
+		if(tcUniquename!=null)
 			sql +=" and E.uniquename ='"+tcUniquename+"'";
-		if(!systeminfoId.equals(""))
+		if(systeminfoId>0)
 			sql +=" and E.systeminfo_id="+systeminfoId;
+		if(userId>0)
+			sql +=" and E.userinfo_id="+userId;
 		sql +=" order by 1;";
 		SuperX_el el = new SuperX_el();
 		SxSqlHelper sh=new SxSqlHelper();
@@ -211,6 +254,7 @@ public class QaTestcaseExecutor {
 		String fieldSel="";
 		String felderinfoId="";
 		String felderinfoName="";
+		String tcName="";
 		String fieldValue="";
 		String sql = ""
 				+ "SELECT \n"
@@ -221,7 +265,9 @@ public class QaTestcaseExecutor {
 				+ "S.felderinfo_id,\n"
 				+ "trim(F.name) as felderinfo_name,"
 				+ "string_not_null(S.field_value) as field_value, \n"
-				+ "U.administration "
+				+ "U.administration,  \n"
+				+ "E.name, \n"
+				+ "E.uniquename \n"
 				+ "FROM felderinfo F,qa_mask_field_sel S, qa_mask_execution E left outer join userinfo U\n"
 				+ " on (U.tid=E.userinfo_id)"
 				+ "where F.tid=S.felderinfo_id "
@@ -248,19 +294,22 @@ public class QaTestcaseExecutor {
 			felderinfoName=row.get(5).toString().trim();
 			fieldValue=row.get(6).toString().trim();
 			userAdmin=row.get(7).toString().trim();
+			tcName=row.get(8).toString().trim();
+			tcUniquename=row.get(9).toString().trim();
 			maskFields.put(felderinfoName,fieldValue);
 		}
-		System.out.println("Testcase "+ maskExecutionId+"  initialized");
+		writeToLog("Testcase "+tcName + "(Schlüssel="+tcUniquename+" ID="+ maskExecutionId+")  initialized");
 		returnCode=executeMask();
 		endtime = new java.util.Date().getTime() ;
-		int maskExecutionResultId=saveExecutionResult(returnCode,resultLog);
+		writeToLog("Mask "+maskeninfoId +" executed in "+(endtime-starttime)/1000+" sec. with return Code "+returnCode);
+		int maskExecutionResultId=saveExecutionResult(maskExecutionId,returnCode,resultLog);
 		if(returnCode ==0)
 		{
-			returnCode=checkAssertions(maskExecutionResultId);
+			returnCode=checkAssertions(maskExecutionId,maskExecutionResultId);
 			
 		}
 		else
-			throw new Exception("Testcase error in masc execution "+maskExecutionId);
+			writeToLog("Testcase error in masc execution "+maskExecutionId);
 		return returnCode;
 	}
 	private static int executeMask()
@@ -288,11 +337,11 @@ public class QaTestcaseExecutor {
 			user = UserInitializer.initUser(mandantenID, userName, userId, userAdmin);
 			
 		} catch (Exception e) {
-			System.err.println("Fehler beim Aufbau der Connection: " + e.toString());
-			System.exit(1);
+			writeToLog("Fehler beim Aufbau der Connection: " + e.toString());
+			return 1;
 		}
 		Locale desiredLocale = new Locale(de.superx.util.SqlStringUtils.getEncoding());
-		SuperXManager.maxRows = 1000000;
+		SuperXManager.maxRows = 10000;
 		Maske maske = null;
 		InputCheckRegistry.registerDefaultChecks();
 		try {
@@ -302,29 +351,40 @@ public class QaTestcaseExecutor {
 			myFieldContainer.addAll(fields);*/
 			maske.setFieldDefaults(user, mock, true);
 			resultXml=getResultXml(mock, mockResponse, maske, user, desiredLocale);
-			System.out.println("resultXml Länge " + resultXml.length() + " für Maske " + maskeninfoId + " erzeugt");
+			if(resultXml==null)
+			{
+				writeToLog("resultXml  für Maske " + maskeninfoId + " konnte nicht erzeugt werden");
+			}
+			else
+			{
+			writeToLog("resultXml Länge " + resultXml.length() + " für Maske " + maskeninfoId + " erzeugt");
+			transformResultXmltoHtml();
+			}
+			
 		} catch (Exception e) {
 			e.printStackTrace();
 			resultLog="Fehler beim Ausführen der Maske " + maskeninfoId + ": " + e.toString();
 			returnCode=1;
 		}
-		
+		user=null;
 	return returnCode;
 	}
-	private static  int checkAssertions(int maskExecutionResultId) throws Exception
+	private static  int checkAssertions(int execId,int maskExecutionResultId) throws Exception
 	{
 		int resultCode=0;
 		int assertionId,assertionRownr,assertionColnr;
 		Double minVal,maxVal,foundVal=null;
+		String caption;
 		String sql = "select "
 			+"tid,"
 			+"rownr,"
 			+"colnr,"
 			+"result_value_min,"
-			+"result_value_max"
+			+"result_value_max,"
+			+ "caption"
 			+" from qa_mask_execution_assert"
 			+ " where is_active=1"
-			+" and mask_execution_id="+maskExecutionId+";";
+			+" and mask_execution_id="+execId+";";
 		
 		
 		/*try {
@@ -353,19 +413,22 @@ public class QaTestcaseExecutor {
 			assertionColnr=(Integer) row.get(2);
 			minVal=(Double) row.get(3);
 			maxVal=(Double) row.get(4);
+			caption=(String) row.get(5).toString();
 			try {
 				foundVal=getValFromXml(assertionRownr,assertionColnr);
 			} catch (Exception e) {
-				System.err.println("Testfall ID "  +maskExecutionId+" mit Maskennr. "+maskeninfoId+ " Assertion-ID "+assertionId+ " kein Ergebnis ");
+				writeToLog("Testfall ID "  +execId+" mit Maskennr. "+maskeninfoId+ " Assertion-ID "+assertionId+ " " + caption+ " kein Ergebnis:\n" +e.toString());
+				resultCode=1;
+				return resultCode;
 			}
 			if(foundVal != null && foundVal >=minVal && foundVal<=maxVal)
 				{
-				System.out.println("Testfall ID "  +maskExecutionId+" mit Maskennr. "+maskeninfoId+ " Assertion-ID "+assertionId+ " erfolgreich");
+				writeToLog("Testfall ID "  +execId+" mit Maskennr. "+maskeninfoId+ " Assertion-ID "+assertionId+ " " + caption+ " und Wert "+ foundVal+" erfolgreich");
 				}
 			else
 			{
 				resultCode=1;
-				System.out.println("Testfall ID "  +maskExecutionId+" mit Maskennr. "+maskeninfoId+ " Assertion-ID "+assertionId+ " beendet mit Warnung/Fehler");
+				writeToLog("Testfall ID "  +execId+" mit Maskennr. "+maskeninfoId+ " Assertion-ID "+assertionId+ " " + caption +" und Wert "+ foundVal+ " beendet mit Warnung/Fehler");
 			}
 			saveAssertResult(assertionId,maskExecutionResultId,foundVal,resultCode,minVal,maxVal);
 		}
@@ -393,22 +456,22 @@ public class QaTestcaseExecutor {
 		boolean executed= st.execute();
 	
 	}
-	private static int saveExecutionResult(int maskExecutionResult,String log ) throws SQLException
+	private static int saveExecutionResult(int execId, int maskExecutionResult,String log ) throws SQLException
 	{	
 		int ret=0;
 		java.sql.Timestamp startTimeDate = new java.sql.Timestamp(starttime);
 		java.sql.Timestamp endTimeDate = new java.sql.Timestamp(endtime);
-		String sql="insert into qa_mask_execution_result(mask_execution_id, execution_start, execution_end, result_code,result_log,result_stream,result_stream_contenttype)";
+		String sql="insert into qa_mask_execution_result(mask_execution_id, execution_start, execution_end, result_code,result_log,result_xml,result_html)";
 		sql +="values(?,?,?,?,?,?,?);";
 		PreparedStatement st=myConnection.prepareStatement(sql);
-		st.setInt(1,maskExecutionId);
+		st.setInt(1,execId);
 		st.setTimestamp(2, startTimeDate);
 		st.setTimestamp(3, endTimeDate);
 		st.setInt(4,maskExecutionResult);
 		st.setString(5,log);
 			//im Fehler/Warnungsfall Ergebnis speichern:
 		st.setString(6,resultXml);
-		st.setString(7,"text/xml");
+		st.setString(7,resultHtml);
 	
 		boolean executed= st.execute();
 		//get generated tid:
@@ -435,7 +498,7 @@ public class QaTestcaseExecutor {
 	    String xpathStr = "/ergebnisse/ergebnis/ergebniselement/sqlerg/row[@no="+(assertionRownr-1)+"]/col[@id="+(assertionColnr-1)+"]/wert";
 	    XPath expression = new JDOMXPath(xpathStr);
 	    Element myNode = (Element) expression.selectSingleNode(doc);
-	    if(myNode==null)
+ 	    if(myNode==null)
 	    	return null;
 	    else
 	    {
@@ -465,6 +528,75 @@ public class QaTestcaseExecutor {
 		return currentXml_local;
 
 	}
+	public void initLogging()   {
+		File f;
+		try {
+			logFile=PathAndFileUtils.getWebinfPath()+File.separator+"logs"+File.separator+"superx_qa.log" ;
+			f = new File(logFile);
+			if(f.exists())
+					f.delete();
+			
+		} catch (Exception e) {
+			// TODO Auto-generated catch block
+			e.printStackTrace();
+				}
+		writeToLog("Start");
+		
+	}
+	
+	private static void writeToLog(String msg) 
+	{
+		FileWriter f;
+		try {
+			f = new FileWriter(logFile,true);
+			long jetzt= new java.util.Date().getTime() ;
+			Date date = new Date();
+			date.setTime(jetzt);
+			SimpleDateFormat format = new SimpleDateFormat("yyyy-MM-dd hh:mm:ss");
+			f.write(format.format(date)+": " +msg+"\n");
+			f.close();
+		} catch (IOException e) {
+			// TODO Auto-generated catch block
+			e.printStackTrace();
+			System.err.println(msg);
+		}
+		
+	}
+	private static void transformResultXmltoHtml()
+	{
+		String xslFile="";
+		ByteArrayOutputStream baos = new ByteArrayOutputStream();
+		PrintStream myStream = new PrintStream(baos);
+		try {
+			StringWriter myOutwriter= new StringWriter();
+			xslFile=PathAndFileUtils.getWebinfDirectory()+PathAndFileUtils.PATHSEP+".."+PathAndFileUtils.PATHSEP+"xml"+PathAndFileUtils.PATHSEP+"tabelle_html_qa.xsl";
+			File f=new File(xslFile);
+			//in development mode the XSL is not available:
+			if(!f.exists())
+				xslFile=PathAndFileUtils.getWebinfDirectory()+PathAndFileUtils.PATHSEP+".."+PathAndFileUtils.PATHSEP+"xml"+PathAndFileUtils.PATHSEP+"tabelle_html2.xsl";
+				
+			javax.xml.transform.TransformerFactory tFactory = javax.xml.transform.TransformerFactory.newInstance("net.sf.saxon.TransformerFactoryImpl",null);
+			javax.xml.transform.Transformer transformer = tFactory.newTransformer(new javax.xml.transform.stream.StreamSource(xslFile));
+			StringReader s1 = new StringReader(resultXml);
+			transformer.setOutputProperty(javax.xml.transform.OutputKeys.ENCODING, SqlStringUtils.getEncoding());
+			transformer.setOutputProperty(javax.xml.transform.OutputKeys.METHOD, "html");
+			/* TODO: hier Parameter einzelne Zeile übergeben:
+			 *                String paramname = param.substring(0, param.indexOf("="));
+                    String paramvalue = param.substring(param.indexOf("=") + 1, param.length());
+                    transformer.setParameter(paramname, paramvalue);
+     
+			 */
+			 transformer.transform(new javax.xml.transform.stream.StreamSource(s1), new javax.xml.transform.stream.StreamResult(myOutwriter));
+			 resultHtml=myOutwriter.toString();
+			 myOutwriter.close();
+			 s1.close();
+			 
+		} catch (Exception e) {
+				writeToLog("resultXml konnte nicht zu HTML konvertiert werden:\n"+ e.toString());
+				resultLog+=("resultXml konnte nicht zu HTML konvertiert werden:\n"+ e.toString());
+				resultHtml="resultXml konnte nicht zu HTML konvertiert werden:" + resultXml;
+		}
+	}
 }
 
 
diff --git a/superx/WEB-INF/conf/edustore/db/bin/qa_mask_execution.x b/superx/WEB-INF/conf/edustore/db/bin/qa_mask_execution.x
index 03e29a5..d93af48 100755
--- a/superx/WEB-INF/conf/edustore/db/bin/qa_mask_execution.x
+++ b/superx/WEB-INF/conf/edustore/db/bin/qa_mask_execution.x
@@ -1,19 +1,15 @@
 #!/bin/bash
 
-TC_UNIQUENAME=$1
-SYSTEMINFO=$2
 
-ARG1=""
-ARG2=""
-
-if [ "$TC_UNIQUENAME" != "" ] ; then
-	ARG1="-tc:$TC_UNIQUENAME"
-fi
-if [ "$SYSTEMINFO" != "" ] ; then
-	ARG2="-systeminfo_id:$SYSTEMINFO"
+if [ "$1" = "--help" ]
+   then echo "Aufruf: qa_mask_execution.x -tc:<Testfall-Schlüssel(optional)> -systeminfo_id:<Komponente(optioanl)> -userid:<Userid (optional)>"
+   	echo " "
+	echo "Aktion: qa_mask_execution.x führt aktive Testfälle aus"
+	echo "Das Script muss in $WEBAPP/WEB-INF ausgeführt werden"
+	echo "Logdatei: $WEBAPP/WEB-INF/logs/superx_qa.log"
+	exit 0
 fi
-
-java -cp "$JDBC_CLASSPATH" $JAVA_OPTS de.superx.qa.bin.QaTestcaseExecutor -logger:$SUPERX_DIR/db/conf/logging.properties -dbproperties:$DB_PROPERTIES "$ARG1" "$ARG2"
+java -cp "$JDBC_CLASSPATH" $JAVA_OPTS de.superx.qa.bin.QaTestcaseExecutor "$@"
 
 
 
diff --git a/superx/WEB-INF/lib/superx-qa.jar b/superx/WEB-INF/lib/superx-qa.jar
index 7ec9f0ea7dcd0c43211faf07cc2466a7621b25c2..a14b42f253c8f28cde7aea767bc8c77225755a4e 100644
GIT binary patch
delta 7761
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
WG=~3;{F8YDgnKgx;W#q?r}|&}8_E&@

delta 6470
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
D_U;$#

diff --git a/superx/xml/tabelle_html_qa.xsl b/superx/xml/tabelle_html_qa.xsl
new file mode 100644
index 0000000..4c23d34
--- /dev/null
+++ b/superx/xml/tabelle_html_qa.xsl
@@ -0,0 +1,197 @@
+<?xml version="1.0"  encoding="UTF-8"?>
+<xsl:stylesheet version="1.0"
+xmlns:xsl="http://www.w3.org/1999/XSL/Transform">
+<xsl:import href="pageComponents_html.xsl" />
+<!--In diesem Stylesheet können Sie individuelle templates unterbringen,
+  die in ihrer Präzedenz das normale Stylesheet 
+  pageComponents_html.xsl überragt. --> 
+<xsl:import href="pageComponents_html_final.xsl" />
+<xsl:import href="resultset_html.xsl" />
+<xsl:import href="interLinks_html.xsl" />
+<xsl:decimal-format name="German" grouping-separator="." NaN="" zero-digit ="0" decimal-separator="," />
+
+<xml:output method="html" />
+<xsl:template match="/">
+
+<html>
+<xsl:call-template name="head" >
+<xsl:with-param name="title" select="concat('Ergebnis ',/ergebnisse/ergebnis/ergebniselement/maskenname)" /> 
+</xsl:call-template> 
+<body onload="isReady=true">
+<xsl:choose>
+<!--MB -->
+<xsl:when test="/ergebnisse/makro/@id !=''">
+<h1><xsl:value-of select="/ergebnisse/makro/name" /></h1>
+<p><input type="hidden" name="tid">
+<xsl:attribute name="value"><xsl:value-of select="/ergebnisse/makro/@id" /></xsl:attribute>
+</input>
+</p></xsl:when>
+<xsl:otherwise> 
+<p><input type="hidden" name="tid">
+<xsl:attribute name="value"><xsl:value-of select="/ergebnisse/ergebnis/maskenname/@id" /></xsl:attribute>
+</input></p>
+</xsl:otherwise>
+</xsl:choose>
+
+<!--<xsl:call-template name="legende" />-->
+<xsl:for-each select="ergebnisse/ergebnis/ergebniselement">
+<xsl:choose>
+<xsl:when test="@typ='image'">
+<img>
+<xsl:attribute name="src"><xsl:value-of select="@url" /></xsl:attribute>
+</img>
+<hr/>
+<xsl:text>
+
+</xsl:text>
+</xsl:when>
+<xsl:when test="@typ='tabelle'">
+
+<h2><xsl:value-of select="../maskenname" /></h2>
+<!-- MB legende bei jeder Tabelle -->
+<p class="legende">
+<xsl:for-each select="../felder/feld">
+	<xsl:if test="value !=''">
+
+		<span class="feldname"><xsl:value-of select="@varname" /></span>:&#160;
+		<xsl:if test="string-length(wert/caption) &lt; 50">
+		<!-- MB 22.12.04 statt caption value_caption-->
+			<span class="feldwert"><xsl:value-of select="value_caption" /></span>
+		</xsl:if>
+		<!-- MB 22.12.04 statt caption value_caption-->
+		<xsl:if test="string-length(wert/caption) &gt; 49">
+			<span class="feldwert"><xsl:value-of select="substring(value_caption,0,50)" />...</span>
+		</xsl:if>
+	;
+	</xsl:if>
+
+</xsl:for-each>
+
+Stand: <xsl:value-of select="../stand" /></p>
+<!-- MB fehlermeldung direkt vom Servlet
+<xsl:if test="errmsg !=''"><p class="errmsg"><xsl:copy-of select="errmsg" /></p></xsl:if>
+ -->
+<table class="ergtabelle" border="1">
+<tr>
+<xsl:for-each select="sqlerg/headers/header">
+	
+	
+	<xsl:call-template name="header">
+    <xsl:with-param name="derwert" select="wert" />
+    </xsl:call-template>		
+
+</xsl:for-each>
+<!--<td></td>-->
+</tr>
+<xsl:for-each select="sqlerg/row">
+<tr>
+<xsl:for-each select="col">
+
+<td class="ergfeld">
+    <xsl:choose>
+      <!--<xsl:when test="@id='0'">
+		<xsl:attribute name="class">themenspalte</xsl:attribute>
+	</xsl:when>
+	<xsl:when test="@typ='1'"> String
+		<xsl:attribute name="class">string</xsl:attribute>
+		<xsl:value-of select="wert" />
+		</xsl:when>-->
+	<xsl:when test="@typ='2' or @typ='8' or @typ='3'"> <!-- DecimalFormat -->
+		<xsl:attribute name="class">decimal</xsl:attribute>
+		<!--<xsl:value-of select="wert" />-->
+		<xsl:choose>
+    <xsl:when test="wert != ''">
+   <xsl:value-of select="format-number(wert,'###.###.###.###.##0,00','German')" />
+    </xsl:when>
+    <xsl:otherwise>
+    <xsl:value-of select="'&#160;'" />
+    </xsl:otherwise>
+    </xsl:choose>
+		
+	</xsl:when>
+	<xsl:when test="@typ='4'"> <!-- Integer -->
+		<xsl:attribute name="class">integer</xsl:attribute>
+		<!--<xsl:value-of select="wert" />-->
+		<xsl:choose>
+    <xsl:when test="wert != ''">
+   <xsl:value-of select="format-number(wert,'###.###.###.###.###','German')" />
+    </xsl:when>
+    <xsl:otherwise>
+    <xsl:value-of select="'&#160;'" />
+    </xsl:otherwise>
+    </xsl:choose>
+		
+	</xsl:when>
+	<xsl:otherwise>
+	<!--Typ=1 ist string und wird defaultmäßig behandelt -->
+	<xsl:call-template name="field_type" />
+    <xsl:variable name="zs">
+    <xsl:call-template name="field_value">
+    </xsl:call-template>
+    </xsl:variable>
+    <xsl:variable name="zs3">
+    <xsl:call-template name="resultsetLink">
+    <xsl:with-param name="zs2" select="$zs" />
+    </xsl:call-template>
+    </xsl:variable>
+    <!--Ab hier können Benutzerspezifische Transformationen nach Feldnamen oder Typ beginnen
+    Bei leeren Zellen wird nbsp übergeben, weil
+    der IE die Zellen sonst ohne Rahmen darstellt.
+    Standardmmäßig wird der Feldinhalt nur noch kopiert.-->
+  
+    <xsl:call-template name="get_val_or_nbsp">
+    <xsl:with-param name="zs4"><xsl:copy-of select="$zs3" /></xsl:with-param>
+    
+    </xsl:call-template>
+
+    
+    
+</xsl:otherwise>
+</xsl:choose>
+
+</td>
+</xsl:for-each>
+<!--<td></td>-->
+</tr>
+</xsl:for-each>
+</table>
+</xsl:when>
+<xsl:otherwise>
+<xsl:text>
+Nicht unterstützter Ergebnistyp </xsl:text><xsl:value-of select="@type" />
+</xsl:otherwise>
+</xsl:choose>
+<xsl:call-template name="navigationsfuss" />
+</xsl:for-each>
+<!--<div id="inhalt" class="versteckt"><p><TEXTAREA NAME="content" ROWS="40" COLS="80" WRAP="off" READONLY="true">
+<ergebnis><xsl:copy-of select="/ergebnis/*|@*|text()" /></ergebnis>
+</TEXTAREA>
+</p></div>
+<script language="Javascript">
+versteckeText("inhalt");
+</script>-->
+</body>
+</html>
+</xsl:template>
+<xsl:template name="tabwert">
+    <xsl:choose>
+      <xsl:when test="wert/@type='numeric'"><xsl:value-of select="wert" />
+<!--<xsl:value-of select="format-number(wert,'#.###.##0,00','de_DE')" />-->
+</xsl:when>
+<xsl:otherwise><xsl:value-of select="wert" /></xsl:otherwise>
+</xsl:choose>
+
+</xsl:template>
+<xsl:template name="create_url">
+<xsl:param name="stylesheet"/>
+<xsl:text>/superx/servlet/SuperXmlTabelle?</xsl:text>
+<xsl:if test="$stylesheet!=''"><xsl:text>stylesheet=</xsl:text><xsl:value-of select="$stylesheet" /><xsl:text>&amp;</xsl:text>
+</xsl:if>
+<xsl:text>UserID=</xsl:text><xsl:value-of select="/ergebnis/userid" /><xsl:text>&amp;tid=</xsl:text><xsl:value-of select="/ergebnisse/ergebnis/maskenname/@id" />
+	<xsl:for-each select="/ergebnis/tabelle/felder/feld">
+	<xsl:if test="wert/value !=''">
+		<xsl:text>&amp;</xsl:text><xsl:value-of select="wert/@varname" /><xsl:text>=</xsl:text><xsl:value-of select="wert/value" />
+	</xsl:if>
+</xsl:for-each>
+</xsl:template>
+</xsl:stylesheet>