Merge branch 'master' of bn.git:plabudda/se

SE/schema/ant-object/default_db.BI_audit_ENERGA_RUM_UMOWY/BI_audit_ENERGA_RUM_UMOWY/BI_audit_ENERGA_RUM_UMOWY.xsd

@@ -16,9 +16,9 @@
               schemaLocation="../SystemObjects/AccessGroup.xsd"/>
    <xs:import namespace="https://biuro.biall-net.pl/wfs/default_db/SystemObjects/AccessOwner.xsd"
               schemaLocation="../SystemObjects/AccessOwner.xsd"/>-->
-   <!--<xs:import
+   <xs:import
       namespace="https://biuro.biall-net.pl/wfs/default_db/table/BI_audit_ENERGA_RUM_KONTRAHENCI.xsd"
-      schemaLocation="../../default_db.BI_audit_ENERGA_RUM_KONTRAHENCI/BI_audit_ENERGA_RUM_KONTRAHENCI/BI_audit_ENERGA_RUM_KONTRAHENCI.xsd"/>-->
+      schemaLocation="../../default_db.BI_audit_ENERGA_RUM_KONTRAHENCI/BI_audit_ENERGA_RUM_KONTRAHENCI/BI_audit_ENERGA_RUM_KONTRAHENCI.xsd"/>
    <xs:simpleType name="A_STATUS_Type" id="A_RUM_UMOWY___d4e5023-1_A_STATUS_T">
       <xs:restriction base="xs:string">
          <xs:enumeration value="NORMAL"/>
@@ -179,8 +179,9 @@
             id="A_RUM_UMOWY___d5e5414-1_A_RECORD_U"/>
          <xs:element name="A_CLASSIFIED" type="xs:string" id="A_RUM_UMOWY___d4e5046-1_A_CLASSIFI"/>
          <xs:element name="A_ADM_COMPANY" type="xs:string" id="A_RUM_UMOWY___d4e5052-1_A_ADM_COMP"/>
-         <!--<xs:element
-            ref="default_db__x3A__BI_audit_ENERGA_RUM_KONTRAHENCI:BI_audit_ENERGA_RUM_KONTRAHENCI" id="A_RUM_UMOWY___d4e5052-1_A_ADkontr"/>-->
+         <xs:element
+            ref="default_db__x3A__BI_audit_ENERGA_RUM_KONTRAHENCI:BI_audit_ENERGA_RUM_KONTRAHENCI"
+            id="A_RUM_UMOWY___d4e5052-1_A_ADkontr"/>
       </xs:sequence>
    </xs:complexType>
    <xs:element name="BI_audit_ENERGA_RUM_UMOWY"

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

@@ -1835,16 +1835,17 @@ SQL;
 		$tasksDirLocation = $powiazaniaDirLocation . "/.tasks";
 		$reloadCachePidFile = $tasksDirLocation . "/reloadCache.pid";
 		$reloadCacheResultFile = $tasksDirLocation . "/reloadCache.result";
-		file_put_contents($reloadCachePidFile, getmypid());
+		if ($full) file_put_contents($reloadCachePidFile, getmypid());
 		try {
 			//self::importPracownicy(); //TODO
 			self::reloadCache_reTeryt($full);
 			self::reloadCache_parseUmowy($full);
 			self::reloadCache_updateAll($full, $onlyBase);
-			file_put_contents($reloadCacheResultFile, "ok");
+			if ($full) file_put_contents($reloadCacheResultFile, "ok");
 		} catch (Exception $e) {
 			var_dump($e);
-			file_put_contents($reloadCacheResultFile, $e->getMessage());
+			if ($full) file_put_contents($reloadCacheResultFile, $e->getMessage());
+			else throw new Exception($e->getMessage());
 		}
 	}