Bladeren bron

poprawki , tested locally

a.binder 7 jaren geleden
bovenliggende
commit
97f29770e2

+ 23 - 1
SE/build_SE.xml

@@ -232,13 +232,35 @@
         <!--<antcall target="build_SE.install_dirs.symlink"/>-->
     </target>
     
-    <target name="install_dirs.symlink">
+    <target name="install_dirs.symlink" depends="install_dirs.symlink.configuration.dir,install_dirs.symlink.repository,install_dirs.symlink.temp,install_dirs.symlink.debug " >
         <echo>#266 Symlink created for  ${p5build_SE.INSTALL_ROOT.temp.symlink} , ${p5build_SE.INSTALL_ROOT.configuration.dir}, ${p5build_SE.INSTALL_ROOT.repository}</echo>
         <symlink resource="${p5build_SE.INSTALL_ROOT.temp}" link="${p5build_SE.INSTALL_ROOT.temp.symlink}" failonerror="false"/>
         <symlink resource="${p5build_SE.INSTALL_ROOT.configuration.dir}" link="${p5build_SE.INSTALL_ROOT.configuration.dir.symlink}" failonerror="false"/>
         <symlink resource="${p5build_SE.INSTALL_ROOT.repository}" link="${p5build_SE.INSTALL_ROOT.repository.symlink}" failonerror="false"/>
     </target>
     
+    <target name="install_dirs.symlink.configuration.dir" unless="p5build_SE.INSTALL_ROOT.configuration.dir.symlink__x3A__exists">
+        <echo>#266-configuration.dir Symlink created for  ${p5build_SE.INSTALL_ROOT.temp.symlink} , ${p5build_SE.INSTALL_ROOT.configuration.dir}, ${p5build_SE.INSTALL_ROOT.repository}</echo>
+        <symlink resource="${p5build_SE.INSTALL_ROOT.configuration.dir}" link="${p5build_SE.INSTALL_ROOT.configuration.dir.symlink}" failonerror="false"/>
+    </target>
+    <target name="install_dirs.symlink.repository" unless="p5build_SE.INSTALL_ROOT.repository.symlink__x3A__exists">
+        <echo>#266-repository Symlink created for  ${p5build_SE.INSTALL_ROOT.repository}</echo>
+        <symlink resource="${p5build_SE.INSTALL_ROOT.repository}" link="${p5build_SE.INSTALL_ROOT.repository.symlink}" failonerror="false"/>
+    </target>
+    <target name="install_dirs.symlink.temp" unless="p5build_SE.INSTALL_ROOT.temp.symlink__x3A__exists">
+        
+        <echo>#266-temp Symlink created for  ${p5build_SE.INSTALL_ROOT.temp.symlink} </echo>
+        <symlink resource="${p5build_SE.INSTALL_ROOT.temp}" link="${p5build_SE.INSTALL_ROOT.temp.symlink}" failonerror="false"/>
+    </target>
+    
+    <target name="install_dirs.symlink.debug" unless="p5build_SE.INSTALL_ROOT.debug.symlink__x3A__exists">
+        
+        <echo>#266-debug Symlink created for  ${p5build_SE.INSTALL_ROOT.debug.symlink} </echo>
+        <symlink resource="${p5build_SE.INSTALL_ROOT.debug}" link="${p5build_SE.INSTALL_ROOT.debug.symlink}" failonerror="false"/>
+    </target>
+    
+    
+    
     <target name="build_SE_read_procesy5_file_properties_check" description="Detect if there are procesy5_config.folders.server configured (in Procesy5 installation folder) ">
         <condition property="build_SE_read_procesy5_file_properties_check" taskname="build_SE_read_procesy5_file_properties">
             <available file="${procesy5_config.folders.server}" />

+ 1 - 1
SE/projects/bocian

@@ -1 +1 @@
-Subproject commit b91300478fd6594a32737bb5e489967ada0b06ba
+Subproject commit 09de8ee7713ab6e03872a7d1fe73759e74bb61ef

+ 22 - 0
SE/schema/Types/build.p5Type.PRODUCT.xml

@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns:p5Type="http://biuro.biall-net.pl/p5/schema/types"
+         xmlns:p5xsl="http://biuro.biall-net.pl/xmlschema_procesy5/WPS_Functions/xsl_interface/xsl_interface.xsd"
+         basedir="../."
+         name="p5Type.PRODUCT">
+   <description>Types - prototypes schema folder functions </description>
+   
+   <include file="../build.p5build.PRODUCT.xml"/>
+   
+   <property name="p5Type.PRODUCT.name"
+      value="${p5build.PRODUCT.name}.Types"/>
+   <property name="p5Type.PRODUCT.vendor-domain"
+      value="${p5build.PRODUCT.name}.p5Type"/>
+   
+   <property name="p5Type.basedir" location="${p5build.basedir}/Types"/>
+   <property name="p5Type.repository" location="${p5build_SE.INSTALL_ROOT.repository}/Types"/>   
+   <property name="p5Type.temp" location="${p5build_SE.INSTALL_ROOT.temp}/Types"/>
+   
+   
+   
+   
+</project>

+ 19 - 4
SE/schema/WPS_Functions/build.WPS_Functions.PRODUCT.xml

@@ -75,11 +75,26 @@
     <property name="WPS_Functions.parent.name" value="${p5build.PRODUCT.name}"/>
     <property name="WPS_Functions.parent.artifactId" value="${p5build.PRODUCT.vendor-domain}"/>
     <property name="WPS_Functions.parent.relativePath" value="../."/>
+       
+    <local name="error.SYMLINK_DANGER_LOOPS.config__x3A__debug_level"/>
+    <condition property="error.SYMLINK_DANGER_LOOPS.config__x3A__debug_level" value="debug">
+        <isset property="error.SYMLINK_DANGER_LOOPS.config"/>
+    </condition>
+    <property name="error.SYMLINK_DANGER_LOOPS.config__x3A__debug_level" value="error"/>
+    
+    <condition property="error.SYMLINK_DANGER_LOOPS.config" value="
+        #84 [ E R R O R  ] [ error.SYMLINK_DANGER_LOOPS.config ]
+        
+        error.SYMLINK_DANGER_LOOPS.config
+        
+        ${basedir}/config.symlink/config/config
+        ">
+        <available file="${basedir}/config.symlink/config/config"></available>
+    </condition>
+    <property name="error.SYMLINK_DANGER_LOOPS.config" value="#92 [ OK ] NO error.SYMLINK_DANGER_LOOPS.config"/>
+    <echo message="${error.SYMLINK_DANGER_LOOPS.config}"  level="${error.SYMLINK_DANGER_LOOPS.config__x3A__debug_level}" />
     
-    
-    
-  
-  
+ 
     <target name="WPS_Functions.parent.PRODUCT.ifdef" unless="WPS_Functions.PRODUCT.ifdef.parent">
         <fail>There is not set correct parent PRODUCT from expected file="../build.p5build.PRODUCT.xml" </fail>
     </target>

+ 2 - 1
SE/schema/build.p5build.PRODUCT.xml

@@ -40,7 +40,7 @@
     
     <!--<property name="p5build.build" location="${basedir}/build.xml"/>-->
     <property name="p5build.build" location="${p5build.basedir}/build.xml"/>
-    
+    <property name="p5build.xsl" location="${p5build.basedir}/p5build.xsl"/>
     <property name="p5build.temp" value="${p5build.basedir}/temp"/>
     <property name="p5build.repository" value="${p5build.basedir}/repository"/>
     <!--<property name="p5build.temp" location=""/>-->
@@ -193,6 +193,7 @@
     <property name="dita.dir.bin.dita" location="${dita.dir}/bin/dita"/>
     
     
+    <property name="public_html.ditamap" location="public_html.ditamap"/>  
     <!-- important xsl templates another -->
     <property name="build_ant_universal_by_xsl_match.xsl" value="${default_db_xml_cache.public}/build_ant_universal_by_xsl_match.xsl"/>
     

+ 33 - 3
SE/schema/build_SE_basedir/build.p5build_SE.INSTALL_ROOT.xml

@@ -14,9 +14,9 @@
     
     <!--<property name="p5build_SE.INSTALL_ROOT.basedir" value="${p5build.opt__local}/${p5build_SE.INSTALL_ROOT.prefix}/basedir"/>-->
     
-    <property name="p5build_SE.INSTALL_ROOT.basedir" value="${basedir}"/> <!-- temporary is current basedir working -->
+    <property name="p5build_SE.INSTALL_ROOT.basedir" location="${basedir}"/> <!-- temporary is current basedir working -->
     <property name="p5build_SE.INSTALL_ROOT.configuration.dir" value="${p5build.opt__local}/${p5build_SE.INSTALL_ROOT.prefix}/config"/>
-    <property name="p5build_SE.INSTALL_ROOT.configuration.dir.symlink" value="${basedir}/config.symlink"/>
+    <property name="p5build_SE.INSTALL_ROOT.configuration.dir.symlink" location="${basedir}/config.symlink"/>
     
     <property name="p5build_SE.INSTALL_ROOT.temp" value="${p5build.opt__local}/${p5build_SE.INSTALL_ROOT.prefix}/temp"/> <!-- ${p5up5b.local.SYSTEM.BuildBase.directory}/temp -->
     <property name="p5build_SE.INSTALL_ROOT.temp.symlink" value="${basedir}/temp.symlink"/>
@@ -26,7 +26,37 @@
     <property name="p5build_SE.INSTALL_ROOT.debug" value="${p5build.opt__local}/${p5build_SE.INSTALL_ROOT.prefix}/deug"/>
     <property name="p5build_SE.INSTALL_ROOT.debug.symlink" value="${basedir}/debug.symlink"/>
     
-    
+    <condition property="p5build_SE.INSTALL_ROOT.configuration.dir.symlink__x3A__exists" value="p5build_SE.INSTALL_ROOT.configuration.dir.symlink__x3A__exists">    
+        <or>
+            <available file="${basedir}/config.symlink"></available>
+            <available file="${p5build_SE.INSTALL_ROOT.configuration.dir.symlink}"></available>
+            <available file="${p5build_SE.INSTALL_ROOT.configuration.dir.symlink}/../config"></available>
+        </or>
+    </condition>
+    
+    <condition property="p5build_SE.INSTALL_ROOT.temp.symlink__x3A__exists" value="p5build_SE.INSTALL_ROOT.temp.symlink__x3A__exists">
+        <or>
+            <available file="${basedir}/temp.symlink"></available>
+            <available file="${p5build_SE.INSTALL_ROOT.temp.symlink}"></available>
+            <available file="${p5build_SE.INSTALL_ROOT.temp.symlink}/../temp"></available>
+        </or>
+    </condition>
+    
+    <condition property="p5build_SE.INSTALL_ROOT.repository.symlink__x3A__exists" value="p5build_SE.INSTALL_ROOT.repository.symlink__x3A__exists">
+        <or>
+            <available file="${basedir}/repository.symlink"></available>
+            <available file="${p5build_SE.INSTALL_ROOT.repository.symlink}"></available>
+            <available file="${p5build_SE.INSTALL_ROOT.temp.symlink}/../repository"></available>
+        </or>
+    </condition>
+    
+    <condition property="p5build_SE.INSTALL_ROOT.debug.symlink__x3A__exists" value="p5build_SE.INSTALL_ROOT.debug.symlink__x3A__exists">
+        <or>
+            <available file="${basedir}/debug.symlink"></available>
+            <available file="${p5build_SE.INSTALL_ROOT.debug.symlink}"></available>
+            <available file="${p5build_SE.INSTALL_ROOT.debug.symlink}/../debug"></available>
+        </or>
+    </condition>
     
     
 </project>

+ 3 - 0
SE/schema/build_SE_basedir/build.p5build_SE.PRODUCT.xml

@@ -101,4 +101,7 @@
     <property name="p5build_SE.is_pid_alive" location="${p5build_SE.basedir}/build.p5build_SE.is_pid_alive.xml"/>
     <property name="p5build_SE.kill_pid" location="${p5build_SE.basedir}/build.p5build_SE.kill_pid.xml"/>
     
+    <!--<property name="p5build_SE.PRODUCT.logo__x3A__notify.png" location="${basedir}/images/logo_procesy_ost-10.png"/>-->
+    <property name="p5build_SE.PRODUCT.logo__x3A__notify.png" location="${basedir}/images/logo_procesy_ost-12_do_dita.png" />
+    
 </project>

+ 2 - 1
SE/schema/default_db_xml_cache.public/default_db/BI_audit_ENERGA_RUM_KONTRAHENCI_POWIAZANIA/BI_audit_ENERGA_RUM_KONTRAHENCI_POWIAZANIA.universal.xsl

@@ -198,7 +198,7 @@
     
     
     
-    <xsl:template mode="system_cache__dita:BI_audit_ENERGA_RUM_KONTRAHENCI_POWIAZANIA.universal.ignore" match="text()|comment()"/>
+    <xsl:template mode="system_cache__dita:BI_audit_ENERGA_RUM_KONTRAHENCI_POWIAZANIA.universal.ignore BI_audit_ENERGA_RUM_KONTRAHENCI_POWIAZANIA_row_LISTA" match="text()|comment()"/>
     
     
     <xsl:template mode="system_cache__dita:BI_audit_ENERGA_RUM_KONTRAHENCI_POWIAZANIA.universal.last.title" match="*">
@@ -206,6 +206,7 @@
         <xsl:value-of select="system_cache__dita:localname.translate(local-name())"/>
     </xsl:template>
     
+    <xsl:template mode="system_cache__dita:BI_audit_ENERGA_RUM_KONTRAHENCI_POWIAZANIA.universal.title system_cache__dita:BI_audit_ENERGA_RUM_KONTRAHENCI_POWIAZANIA.universal.last.title" match="text()|comment()"/>
     
     <xsl:template mode="system_cache__dita:BI_audit_ENERGA_RUM_KONTRAHENCI_POWIAZANIA.universal.title" match="*">
         <xsl:param name="title" select="'Powiązań '"/>

+ 35 - 3
SE/schema/default_db_xml_cache.public/default_db/BI_audit_ENERGA_RUM_KONTRAHENCI_POWIAZANIA/BI_audit_ENERGA_RUM_KONTRAHENCI_POWIAZANIA_tree_to_dita.xsl

@@ -1622,6 +1622,10 @@
         <!--</xsl:result-document>-->
     </xsl:template>
     
+    <xsl:template mode="bocian-graph-2-html.BI_audit_ENERGA_RUM_KONTRAHENCI_POWIAZANIA_statystyka_pracownik.dita" match="comment()|text()">
+        <xsl:message>#1626 fixed text leack </xsl:message>
+    </xsl:template>
+    
     <xsl:template match="BI_audit_ENERGA_RUM_KONTRAHENCI_POWIAZANIA" mode="bocian-graph-2-html.BI_audit_ENERGA_RUM_KONTRAHENCI_POWIAZANIA_statystyka_pracownik.dita">
         <topic id="{$uuid}bocian-graph-2-html.BI_audit_ENERGA_RUM_KONTRAHENCI_POWIAZANIA_statystyka_pracownik.dita" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
             xsi:noNamespaceSchemaLocation="urn:oasis:names:tc:dita:xsd:topic.xsd">
@@ -1641,6 +1645,10 @@
         </topic>
     </xsl:template>
     
+    <xsl:template match="text()|comment()" mode="BI_audit_ENERGA_RUM_KONTRAHENCI_POWIAZANIA_statystyka_pracownik.dita">
+        <xsl:message>#1646 repaired  text node</xsl:message>
+    </xsl:template>
+    
     <xsl:template match="BI_audit_ENERGA_RUM_KONTRAHENCI_POWIAZANIA" mode="BI_audit_ENERGA_RUM_KONTRAHENCI_POWIAZANIA_statystyka_pracownik.dita">
         <topic id="{$uuid}topic_simpletable_statystyka_pracownik.dita" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
             xsi:noNamespaceSchemaLocation="urn:oasis:names:tc:dita:xsd:topic.xsd">
@@ -1776,6 +1784,9 @@
         
     </xsl:template>
     
+    <xsl:template mode="BI_audit_ENERGA_RUM_KONTRAHENCI" match="text()|comment()">
+        <xsl:message>#1788 fixed text leackage </xsl:message>
+    </xsl:template>
     
     <xsl:template match="BI_audit_ENERGA_RUM_KONTRAHENCI|BI_audit_ENERGA_PRACOWNICY|BI_audit_KRS|BI_audit_KRS_person|BI_audit_MSIG|BI_audit_MSIG_person|BI_audit_CEIDG|BI_audit_CEIDG_pelnomocnicy|BI_audit_KRS_company|BI_audit_MSIG_company" mode="BI_audit_ENERGA_RUM_KONTRAHENCI">
         <xsl:param name="group_name" required="yes"/>
@@ -2116,7 +2127,9 @@
         
     </xsl:template>
     
-    
+    <xsl:template mode="BI_audit_ENERGA_RUM_KONTRAHENCI_POWIAZANIA_person" match="text()|comment()">
+        <xsl:message>#2128 fixed text leackage</xsl:message>
+    </xsl:template>
     
     <xsl:template match="BI_audit_KRS_person|BI_audit_MSIG_person|BI_audit_MSIG|BI_audit_KRS|TERYT_adresy|BI_audit_MSIG_adress|BI_audit_KRS_company|BI_audit_MSIG_company" mode="BI_audit_ENERGA_RUM_KONTRAHENCI_POWIAZANIA_person">
         <xsl:param name="group_name" required="yes"/>
@@ -2251,7 +2264,9 @@
     
     <!--<xsl:template mode="system_cache__dita:BI_audit_ENERGA_RUM_KONTRAHENCI_POWIAZANIA.universal" match="text()|comment()|*"/>-->
     
-    
+    <xsl:template mode="BI_audit_operational_raport_note" match="text()|comment()">
+        <xsl:message>#2263 fixed teack leackage </xsl:message>
+    </xsl:template>
     
     
     <xsl:template match="BI_audit_operational_raport_note" mode="BI_audit_operational_raport_note">
@@ -2347,6 +2362,11 @@
     
     <!--<xsl:template match="TERYT_adresy|BI_audit_MSIG_adress|BI_audit_KRS_company|BI_audit_MSIG_company" mode="BI_audit_ENERGA_RUM_KONTRAHENCI_POWIAZANIA.middle_ref"/>-->
     
+    
+    <xsl:template match="text()|comment()" mode="BI_audit_ENERGA_RUM_KONTRAHENCI_POWIAZANIA.middle_ref">
+        <xsl:message>#2362 fixed text leackage</xsl:message>
+    </xsl:template>
+    
     <xsl:template match="*" mode="BI_audit_ENERGA_RUM_KONTRAHENCI_POWIAZANIA.middle_ref">
         <xsl:param name="position_1" required="yes"/>
         <xsl:param name="position" required="yes"/>
@@ -2458,6 +2478,9 @@
         </strow>
     </xsl:template>
     
+    <xsl:template mode="BI_audit_ENERGA_RUM_KONTRAHENCI_POWIAZANIA_krs" match="text()|comment()">
+        <xsl:message>#2480 fixed text leackage</xsl:message>
+    </xsl:template>
     
     <xsl:template match="BI_audit_KRS|BI_audit_MSIG" mode="BI_audit_ENERGA_RUM_KONTRAHENCI_POWIAZANIA_krs"> <!-- TODO TO DISABLE -->
         <xsl:param name="group_name" required="yes"/> <!-- select="system_cache__dita:BI_audit_ENERGA_RUM_KONTRAHENCI_POWIAZANIA.DETECT.key(@fid,'','','1')" -->
@@ -2761,6 +2784,10 @@
         </topicref>
     </xsl:template>-->
     
+    <xsl:template mode="BI_audit_ENERGA_RUM_KONTRAHENCI_POWIAZANIA_row_do" match="text()|comment()">
+        <xsl:message>#2780 fixed text leackage</xsl:message>
+    </xsl:template>
+    
     
     <xsl:template mode="BI_audit_ENERGA_RUM_KONTRAHENCI_POWIAZANIA_row_do" match="BI_audit_ENERGA_RUM_KONTRAHENCI_POWIAZANIA_row">
         <xsl:param name="group_name" required="yes"/>
@@ -3080,6 +3107,9 @@
                 </topicref>
     </xsl:template>
     
+    <xsl:template mode="BI_audit_ENERGA_RUM_KONTRAHENCI_POWIAZANIA_row_LISTA" match="comment()|text()">
+        <xsl:message>#3100 fixed text leackage</xsl:message>
+    </xsl:template>
     
     <xsl:template mode="BI_audit_ENERGA_RUM_KONTRAHENCI_POWIAZANIA_row_LISTA" match="BI_audit_ENERGA_RUM_KONTRAHENCI_POWIAZANIA_row_object">
         
@@ -3163,7 +3193,9 @@
         </topicref>
     </xsl:template>
     
-    
+    <xsl:template mode="BI_audit_ENERGA_RUM_KONTRAHENCI_POWIAZANIA_row" match="text()|comment()">
+        <xsl:message>#3189 fixed text leackage</xsl:message>
+    </xsl:template>
     
     <xsl:template mode="BI_audit_ENERGA_RUM_KONTRAHENCI_POWIAZANIA_row" match="BI_audit_ENERGA_RUM_KONTRAHENCI_POWIAZANIA_row">
         <!--<xsl:param name="group_name" required="yes"/>-->