Naprawa ścieżek w silniku B po aktualizacjach Arka w ant

SE/se-lib/Route/UrlAction/BiAuditGenerate.php

@@ -3041,9 +3041,11 @@ class BiAuditPowiazania {
 		$antDir = "/Library/Server/Web/Data/Sites/Default/SE/schema/WPS_Functions/default_db/recurse_ant/out";
 		$antXmlFilename = "relations-{$id_part}.out_task.dita.final_with_RelatedFeatureLoop.xml";
 		$antXmlFile = $antDir . "/" . $antXmlFilename;
-		$ditamapFile = "/Library/Server/Web/Data/Sites/Default/SE/schema/WPS_Functions/default_db/CRM_PROCES_tree/temp/relations-{$id_part}/relations-{$id_part}.ditamap";
-		$pdfFile = "/Library/Server/Web/Data/Sites/Default/SE/schema/WPS_Functions/default_db/CRM_PROCES_tree/temp/relations-{$id_part}/pdf/relations-{$id_part}.pdf";
-		$htmlDir = "/Library/Server/Web/Data/Sites/Default/SE/schema/WPS_Functions/default_db/CRM_PROCES_tree/temp/relations-{$id_part}/html";
+		//$baseDir = "/Library/Server/Web/Data/Sites/Default/SE/schema/WPS_Functions/default_db/CRM_PROCES_tree/temp/relations-{$id_part}";
+		$baseDir = "/opt/local/pl.procesy5/p5build_SE/temp/WPS_Functions/temp/default_db/CRM_PROCES_tree/relations-{$id_part}";
+		$ditamapFile = "{$baseDir}/relations-{$id_part}.ditamap";
+		$pdfFile = "{$baseDir}/pdf/relations-{$id_part}.pdf";
+		$htmlDir = "{$baseDir}/html";
 		$htmlFile = "{$htmlDir}/relations-{$id_part}.html";
 
 		//if (!file_exists($xmlFile))
@@ -3070,7 +3072,7 @@ class BiAuditPowiazania {
 		}
 
 		self::saveToLog("Generuję plik PDF ({$resultsPart})");
-		self::exec("cd \"/Library/Server/Web/Data/Sites/Default/SE/schema/WPS_Functions/default_db/CRM_PROCES_tree/temp/relations-{$id_part}\" && /Library/Server/Web/Data/Sites/Default/SE/stuff/dita-ot-2.3.3/bin/dita -o pdf -i relations-{$id_part}.ditamap -f pdf");
+		self::exec("cd \"{$baseDir}\" && /Library/Server/Web/Data/Sites/Default/SE/stuff/dita-ot-2.3.3/bin/dita -o pdf -i relations-{$id_part}.ditamap -f pdf");
 		if (file_exists($pdfFile)) {
 			rename($pdfFile, $pdfDestFile);
 			self::saveToLog("Wygenerowano plik PDF ({$resultsPart})");
@@ -3078,9 +3080,9 @@ class BiAuditPowiazania {
 		$this->saveProgress(['reportsCreated' => 0.45]);
 
 		self::saveToLog("Generuję pliki HTML ({$resultsPart})");
-		self::exec("cd \"/Library/Server/Web/Data/Sites/Default/SE/schema/WPS_Functions/default_db/CRM_PROCES_tree/temp/relations-{$id_part}\" && /Library/Server/Web/Data/Sites/Default/SE/stuff/dita-ot-2.3.3/bin/dita -o html -i relations-{$id_part}.ditamap -f tocjs");
+		self::exec("cd \"{$baseDir}\" && /Library/Server/Web/Data/Sites/Default/SE/stuff/dita-ot-2.3.3/bin/dita -o html -i relations-{$id_part}.ditamap -f tocjs");
 		if (file_exists($htmlDir) && is_dir($htmlDir) && file_exists($htmlFile)) {
-			self::exec("cd \"/Library/Server/Web/Data/Sites/Default/SE/schema/WPS_Functions/default_db/CRM_PROCES_tree/temp/relations-{$id_part}\" && zip -r \"{$htmlZipDestFile}\" html");
+			self::exec("cd \"{$baseDir}\" && zip -r \"{$htmlZipDestFile}\" html");
 			if (file_exists($htmlDestDir)) self::exec("rm -rf \"{$htmlDestDir}\"");
 			self::exec("mv \"{$htmlDir}\" \"{$htmlDestDir}\"");
 			self::saveToLog("Wygenerowano pliki HTML ({$resultsPart})");