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

SE/schema/ant-url_action/default_db.in7_dziennik_koresp/test-druk/build.xml

@@ -44,11 +44,12 @@
     <property name="xpath_value" value="${xpath_value}"/> <!-- to be set initially like 1000 (to search ID=1000, if ID we get by featureID  -->
     
     <!-- variables to first transform of doc for then get related features -->
-    <property name="build_recurse_ant.xsl" value="build_recurse_ant.xsl"/>
-    <property name="build_recurse_ant_merge_dita_from_temp.xsl" value="build_recurse_ant_merge_dita_from_temp.xsl"/>
+    <property name="default_db_xml_cache.public" value="../../../default_db_xml_cache.public"/> <!-- katalog z xsl z projektu src-xmlschema.git -->
+    <property name="build_recurse_ant.xsl" value="${default_db_xml_cache.public}/build_recurse_ant.xsl"/>
+    <property name="build_recurse_ant_merge_dita_from_temp.xsl" value="${default_db_xml_cache.public}/build_recurse_ant_merge_dita_from_temp.xsl"/>
     <property name="main_build_recurse_ant.dita" value="main_build_recurse_ant.dita"/>
     <property name="main_build_recurse_ant.dita_with_id" value="${temp}/${main_build_recurse_ant.dita}.with_id.xml"/>
-    <property name="main_build_recurse_ant.dita_with_id.xsl" value="main_build_recurse_ant.dita_with_id.xsl"/>
+    <property name="main_build_recurse_ant.dita_with_id.xsl" value="${default_db_xml_cache.public}/main_build_recurse_ant.dita_with_id.xsl"/>
     <!--<tempfile property="uuid" deleteonexit="yes"/>-->
     <tempfile property="out_task.dita" deleteonexit="no"  destdir="temp"/>
     <tempfile property="out_task.dita.final" deleteonexit="no"  destdir="temp"/>
@@ -80,10 +81,12 @@
     <!-- wygenerowanie ant builda do sciagniecia niezbednego elementu na podstawie template main.dita i tam zagniezdzonego RelatedFeature-->
     <target name="build_recurse_ant.xml" depends="main_build_recurse_ant.dita_with_id">
         <!-- build do wytworzenia pierwszego przetworzenia zagniezdzen -->
+        
+        <record name="${temp}/ant.log" loglevel="verbose" append="true"/>
         <property name="loop_xpath"  value="root"/>
         <property name="build_recurse_ant.xml" value="${temp}/${uuid}.build_${loop_xpath}.xml"/>
         <!--<delete file="${build_recurse_ant.xml}"/>-->
-        <xslt basedir="./" style="${build_recurse_ant.xsl}" in="${main_build_recurse_ant.dita_with_id}"  destdir="./" out="${build_recurse_ant.xml}" >
+        <xslt basedir="./" style="${build_recurse_ant.xsl}" in="${main_build_recurse_ant.dita_with_id}"  destdir="./" out="${build_recurse_ant.xml}"  >
             <factory name="net.sf.saxon.TransformerFactoryImpl">    
                 <attribute name="http://saxon.sf.net/feature/xinclude-aware" value="true"/>
             </factory>
@@ -107,6 +110,8 @@
             <param name="loop_xpath" expression="root"/><!-- xpath sciezki przetwarzania xmla -->
             <param name="loop_xpath_save" expression="${loop_xpath}"/>
             <param name="current_leaf.dita" expression="${main_build_recurse_ant.dita_with_id}"/>
+            <param name="basedir" expression="${basedir}"/>
+            <param name="build_recurse_ant.xsl" expression="${build_recurse_ant.xsl}"/>
         </xslt>
         <!--<import file="${build_recurse_ant.xml}"/>-->
         <ant  antfile="${build_recurse_ant.xml}" dir="."/>
@@ -122,6 +127,7 @@
             <!--<param name="webRootUrl" expression="${webRootUrl}" />--> 
             <!--<param name="main_build_recurse_ant.dita" expression="${main_build_recurse_ant.dita}"/>-->
             <param name="uuid" expression="${uuid}"/>
+            <param name="basedir" expression="${basedir}"/>
         </xslt>
         <echo> zapisalem plik gotowy do utworzenia dita do ${out_task.dita}. </echo>
     </target>

SE/schema/ant-url_action/default_db.in7_dziennik_koresp/test-druk/escaped_html_to_xml.xsl

@@ -1,201 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
-    xmlns:xs="http://www.w3.org/2001/XMLSchema"
-    xmlns:system_cache__appinfo="http://biuro.biall-net.pl/xmlschema_procesy5/default_db_xml_cache/appinfo.xsd"
-    exclude-result-prefixes="xs system_cache__appinfo"
-    version="2.0">
-    
-    <xsl:output indent="yes"/>
-    
-    
-    
-    
-    
-    
-    
-    
-    <xsl:template name="system_cache__appinfo:escaped_html_to_xml">
-        <xsl:param name="html"/>
-        <xsl:param name="debug" select="false()"/>
-        <xsl:param name="loopno" select="1"/>
-        <xsl:variable name="anal_out">
-            <anal_out>
-                <xsl:for-each select=" tokenize($html,'&lt;') ">
-                    <xsl:variable name="lt_pos" select="position()"/>
-                    <lt>
-                        <xsl:attribute name="lt_pos" select="position()"/>
-                        
-                        <!--<xsl:value-of select="."/>-->
-                        <xsl:for-each select="tokenize(.,'&gt;')">
-                            <gt>
-                                <xsl:attribute name="gtnum" select="position()"/>
-                                <!--<xsl:attribute name="lt_pos" select="$lt_pos"/>-->
-                                
-                                
-                                <xsl:choose>
-                                    <xsl:when test="$lt_pos=1 and position()=1">
-                                        <xsl:attribute name="tag_place" select="'before_tag'"/>
-                                    </xsl:when>
-                                    <xsl:when test="$lt_pos=2 and position()=1">
-                                        <xsl:attribute name="tag_place" select="'first_tag'"/>
-                                    </xsl:when>
-                                </xsl:choose>
-                                <xsl:choose>
-                                    <xsl:when test="position()=1 and $lt_pos&gt;1">
-                                        <xsl:attribute name="is_tag" select="true()"/>
-                                    </xsl:when>
-                                    <xsl:otherwise><xsl:attribute name="is_string" select="true()"/></xsl:otherwise>
-                                </xsl:choose>
-                                <xsl:choose>
-                                    <xsl:when test=" contains(.,'/') and position()=1 and $lt_pos>1"><xsl:attribute name="closing" select="true()"/></xsl:when>
-                                    <xsl:when test=" not(contains(.,'/')) and position()=1 and $lt_pos>1"><xsl:attribute name="closing" select="false()"/></xsl:when>
-                                    <!--<xsl:otherwise><xsl:attribute name="closing" select="false()"/></xsl:otherwise>-->
-                                </xsl:choose>
-                                <xsl:choose>
-                                    <xsl:when test="position()=1 and $lt_pos&gt;1 and not(contains(.,'/')) and contains(.,' ')">
-                                        <xsl:variable name="attributes">
-                                            <xsl:for-each select="tokenize(.,' ')">
-                                                <el><xsl:value-of select="."/></el>
-                                            </xsl:for-each>
-                                        </xsl:variable>
-                                        <xsl:attribute name="attributes" select="$attributes/el[position()&gt;1]"/>
-                                        <xsl:copy-of select="$attributes/el[position()=1]/text()"/>
-                                    </xsl:when>
-                                    <xsl:otherwise><xsl:value-of select="."/></xsl:otherwise>
-                                </xsl:choose>
-                                <!--<xsl:value-of select="."/>-->
-                            </gt>
-                        </xsl:for-each>
-                    </lt>
-                </xsl:for-each>
-            </anal_out>
-        </xsl:variable>
-        <!--<analyse>
-            <before_tag><xsl:value-of select="$anal_out/anal_out/lt[@ltnum=1]/gt[@gtnum=1]/text()"/></before_tag>
-            <first_tag><xsl:value-of select="$anal_out/anal_out/lt[@ltnum=2]/gt[@gtnum=1]/text()"/></first_tag>
-            <closing_tag></closing_tag>
-            <after_closing_tag></after_closing_tag>
-        </analyse>-->
-        <!--<xsl:copy-of select="$anal_out"/>-->
-        <xsl:variable name="anal_num">
-            <anal_num>
-                <xsl:for-each select="$anal_out/anal_out/lt/gt">
-                    <gt><xsl:attribute name="pos" select="position()"/>
-                        <xsl:copy-of select="@attributes"/>
-                        <xsl:choose>
-                            <xsl:when test="@is_string=true()">
-                                <xsl:attribute name="level" select="0"/>                                
-                                <xsl:value-of select="text()"/></xsl:when>
-                            <xsl:when test="@is_tag=true() and @closing=false()">
-                                <xsl:attribute name="level" select="1"/>
-                                <xsl:choose>
-                                    <xsl:when test=" position()=1">
-                                        <xsl:attribute name="new_gr" select="2"/>
-                                    </xsl:when>
-                                    <xsl:otherwise>
-                                        <xsl:attribute name="new_gr" select="1"/>
-                                    </xsl:otherwise>
-                                </xsl:choose>
-                                <xsl:attribute name="element" select="text()"/>
-                            </xsl:when>
-                            <xsl:when test="@is_tag=true() and @closing=true()">
-                                <xsl:attribute name="level" select="-1"/>
-                                <xsl:attribute name="element" select="text()"/>
-                            </xsl:when>
-                        </xsl:choose>
-                    </gt>
-                </xsl:for-each>
-            </anal_num>
-        </xsl:variable>
-        <!--<xsl:copy-of select="$anal_num"/>-->
-        <xsl:variable name="anal_num1">
-            <anal_num1>
-                <xsl:for-each select="$anal_num/anal_num/gt">
-                    <gt>
-                        <xsl:copy-of select="@*"/>
-                        <xsl:choose>
-                            <xsl:when test="@level=0 and $anal_num/anal_num/gt[number(@pos)= number(current()/@pos)-1]/@level=1"><xsl:attribute name="level" select="1"/></xsl:when><!-- and $anal_num/anal_num/gt[@pos=current()/@pos-1]/@level= -->
-                            <xsl:when test="@level=0 and $anal_num/anal_num/gt[number(@pos)= number(current()/@pos)-1]/@level=-1"><xsl:attribute name="level" select="-1"/></xsl:when>
-                            <xsl:otherwise><xsl:attribute name="level" select="@level"/></xsl:otherwise>
-                        </xsl:choose>
-                        <xsl:value-of select="text()"/>
-                    </gt>
-                </xsl:for-each>
-            </anal_num1>
-        </xsl:variable>
-        <!--<xsl:copy-of select="$anal_num1"/>-->
-        <xsl:variable name="anal_num_anal">
-            <anal_num_anal>
-                <xsl:for-each select="$anal_num1/anal_num1/gt">
-                    <gt>
-                        <xsl:variable name="cur_pos" select="@pos"/>
-                        <!--<xsl:attribute name="what_sum" select="concat('sum($anal_num/anal_num/gt[@pos&lt;=',$cur_pos,']/@level')" />-->
-                        <xsl:choose>
-                            <xsl:when test="sum($anal_num1/anal_num1/gt[number(@pos)&lt;= number($cur_pos) ]/@level)&lt;0">
-                                <xsl:attribute name="sum_cur" select="1"/>
-                                <xsl:attribute name="sum_cur_293" select="true()"/>
-                            </xsl:when>
-                            <!--<xsl:when test="@level=-1">
-                                <xsl:attribute name="sum_cur" select="sum($anal_num1/anal_num1/gt[number(@pos)&lt;number($cur_pos) ]/@level)+1"/>
-                            </xsl:when>-->
-                            <xsl:otherwise><xsl:attribute name="sum_cur" select="sum($anal_num1/anal_num1/gt[number(@pos)&lt;= number($cur_pos) ]/@level)+1"/></xsl:otherwise>
-                        </xsl:choose>
-                        
-                        <xsl:copy-of select="@*"/>
-                        <xsl:value-of select="text()"/>
-                        <!--<copy>
-                            <xsl:copy-of select="$anal_num/anal_num/gt[  number(@pos)&lt;= number($cur_pos) ]"/>
-                        </copy>-->
-                    </gt>
-                </xsl:for-each>
-            </anal_num_anal>
-        </xsl:variable>
-        <!--<xsl:copy-of select="$anal_num_anal"/>-->
-        <xsl:for-each select="$anal_num_anal/anal_num_anal/gt[@sum_cur=1]"><!-- text outside of first tag -->
-            <xsl:variable name="min_pos_sum_cur_1" select="min($anal_num_anal/anal_num_anal/gt[@sum_cur=1 and number(@pos)&gt;number(current()/@pos)]/@pos)"/>
-            <xsl:value-of select="text()"/>
-            <xsl:for-each select="$anal_num_anal/anal_num_anal/gt[@sum_cur=2 and number(@pos)&gt;number(current()/@pos) and  number(@pos)&lt;number($min_pos_sum_cur_1) and @level=1 ]"><!-- first level tags -->
-                <xsl:element name="{@element}">
-                    <xsl:choose>
-                        <xsl:when test="@attributes">
-                            <xsl:variable name="attributes">
-                                <xsl:for-each select="tokenize(@attributes,' ')">
-                                    <e300><xsl:attribute name="val" select="."/>
-                                        <xsl:for-each select="tokenize(.,'=&quot;')">
-                                            <e302><xsl:attribute name="val" select="."/>
-                                                <!--<xsl:attribute name="{.}" select="true()"/>-->
-                                                <xsl:for-each select="tokenize(.,'&quot;')">
-                                                    <e307>
-                                                        <xsl:attribute name="val" select="."/>
-                                                    </e307>
-                                                </xsl:for-each>
-                                            </e302>
-                                        </xsl:for-each>
-                                    </e300>
-                                </xsl:for-each>
-                            </xsl:variable>
-                            <xsl:for-each select="$attributes/e300">
-                                <xsl:attribute name="{e302[1]/@val}" select="e302[2]/e307[1]/@val"/>
-                            </xsl:for-each>
-                            <!--<xsl:copy-of select="$attributes"/>-->
-                        </xsl:when>
-                    </xsl:choose>
-                    <xsl:variable name="html2">
-                        <xsl:for-each select="$anal_num_anal/anal_num_anal/gt[@sum_cur&gt;2 and number(@pos)&gt;number(current()/@pos) and  number(@pos)&lt;number($min_pos_sum_cur_1) ]"><!-- text of 1 level tags -->
-                            <xsl:choose>
-                                <xsl:when test="@element">&lt;<xsl:value-of select="@element"/>&gt;</xsl:when>
-                                <xsl:otherwise><xsl:copy-of select="text()"/></xsl:otherwise>
-                            </xsl:choose>
-                        </xsl:for-each>
-                    </xsl:variable>
-                    <xsl:call-template name="system_cache__appinfo:escaped_html_to_xml">
-                        <xsl:with-param name="html" select="$html2"/>
-                    </xsl:call-template>
-                </xsl:element>
-            </xsl:for-each>
-        </xsl:for-each>
-    </xsl:template>
-    
-    
-    
-</xsl:stylesheet>

SE/schema/ant-url_action/default_db.in7_dziennik_koresp/test-druk/build_recurse_ant.xsl → SE/schema/default_db_xml_cache.public/build_recurse_ant.xsl

@@ -14,7 +14,7 @@
     <xsl:strip-space elements="*"/>
     
     
-    <xsl:include href="../../../default_db_xml_cache.public/escaped_html_to_xml.xsl"/>
+    <xsl:include href="escaped_html_to_xml.xsl"/>
     <!--
     <property name="url" value="${url}"/> - to point what is record/table to download
     <property name="uuid" value="${uuid}"/> it is automatically also set to enable uinque transaction and to allow to save data with user
@@ -26,6 +26,7 @@
     <xsl:param name="passwordBase64Basic" required="yes" />
     <xsl:param name="url" />
     <xsl:param name="webRootUrl" /> 
+    <xsl:param name="basedir" required="yes"/> <!-- aktualny katalog gdzie znajduja sie pliki temp -->
     
     <!--<xsl:param name="out_task.dita"/>--> <!-- nazwa temp docelowego zrodla do wykonania pliku pdf -->
     <!--<xsl:param name="current_leaf.dita" required="yes"/>--> <!-- nazwa aktualnego przetowarzenia .dita - najpierw main_build_recurse_ant.dita potem przechodzi w  1.1.root_x2f_IN7_DZIENNIK_KORESP.1.dita.xml -->
@@ -41,8 +42,9 @@
     <xsl:param name="loop_xpath_save" required="yes"/> <!-- przekazany z template  match="RelatedFeature" mode="after_first_ant_assing_vars_childs" -->
     <!-- static project variables as default styles.dita/xsl and names-->
     <xsl:param name="main_build_recurse_ant.dita" select="'main_build_recurse_ant.dita'"/>
-    <xsl:param name="build_recurse_ant.xsl" select="'build_recurse_ant.xsl'"/>
+    
     <xsl:param name="xml_id_parent" select="@xml_id"/>
+    <xsl:param name="build_recurse_ant.xsl" required="yes"/>
     <!-- second step fist loop - with data -->
     <!--<xsl:param name="wfs_output.xml"/>--> <!-- to be set in second step by ant build generated by this style to fill by its data childs -->
     
@@ -58,7 +60,7 @@
                 <xsl:variable name="RelatedFeatureCount" select="last()"/>
                 <xsl:variable name="RelatedFeaturePos" select="position()"/>
                 <xsl:variable name="featureID_name" select="substring-after($typeName,':')"/>
-                <xsl:message>#58 bylo $loop_xpath=<xsl:value-of select="$loop_xpath"/>;</xsl:message>
+                <xsl:message>#58 bylo $loop_xpath=<xsl:value-of select="$loop_xpath"/>; $basedir=<xsl:value-of select="$basedir"/>; </xsl:message>
                 <xsl:variable name="loop_xpath">
                     <xsl:choose>
                         <xsl:when test="$loop_xpath='root'">
@@ -303,14 +305,16 @@
                                                 <attribute name="http://saxon.sf.net/feature/initialMode" value="after_first_ant_assing_vars"/>
                                             </factory>
                                             <classpath location="/opt/local/share/java/saxon9he.jar"/>
-                                            <param name="wfs_output" expression="temp/{$wfs_output.xml}"/>
+                                            <param name="wfs_output" expression="{$basedir}/temp/{$wfs_output.xml}"/>
                                             <param name="xpath" expression="{$xpath}" /> <!-- kontrolnie - nie potrzebne -->
                                             <param name="xpath_value" expression="{$xpath_value}" /> <!-- kontrolnie - nie potrzebne -->
                                             <param name="loop_xpath" expression="{$loop_xpath}"/>
                                             <param name="loop_xpath_save" expression="{$loop_xpath_save}"/>
                                             <param name="typeName" expression="{$typeName}"/><!-- kontrolnie - nie potrzebne -->
                                             <param name="uuid" expression="{$uuid}"/>
-                                        <param name="passwordBase64Basic" expression="{$passwordBase64Basic}"/>
+                                            <param name="basedir" expression="{$basedir}"/>
+                                            <param name="build_recurse_ant.xsl" expression="{$build_recurse_ant.xsl}"/>
+                                            <param name="passwordBase64Basic" expression="{$passwordBase64Basic}"/>
                                     </xslt>
                             </xsl:element>
                         <!-- zapisujemy wynik naszego biezacego przetwarzania dita element nizej do kolejnego przejechania z ant wyniku dla podstawienia danych  -->

SE/schema/ant-url_action/default_db.in7_dziennik_koresp/test-druk/build_recurse_ant_merge_dita_from_temp.xsl → SE/schema/default_db_xml_cache.public/build_recurse_ant_merge_dita_from_temp.xsl

@@ -12,6 +12,7 @@
     <xsl:strip-space elements="*"/>
     
     <xsl:param name="uuid" required="yes"/>
+    <xsl:param name="basedir" required="yes"/>
     
     <!-- template do zlaczenia wszystkich xmli z danymi z dita 
     description="z plikow temp/$uuid.* buduje $out_task.dita " -->
@@ -29,7 +30,7 @@
         <!--<debug26>
             Will try to put file=<xsl:value-of select="concat($uuid,'.',$loop_xpath,$featureID_name,'.',$RelatedFeaturePos,'.dita.xml.vals.dita')"/>;
         </debug26>-->
-        <xsl:variable name="dita_fragment" select="doc(concat('temp/',$uuid,'.',$loop_xpath,'.',$RelatedFeaturePos,'.dita.xml.vals.dita'))"/>
+        <xsl:variable name="dita_fragment" select="doc(concat($basedir,'/temp/',$uuid,'.',$loop_xpath,'.',$RelatedFeaturePos,'.dita.xml.vals.dita'))"/>
         
         <xsl:apply-templates mode="RelatedFeature" select="$dita_fragment/RelatedFeatureRoot/*">
             <xsl:with-param name="loop_xpath" select="$loop_xpath"/>