Jelajahi Sumber

merge z xmlschema procesy5

a.binder 8 tahun lalu
induk
melakukan
fddfb8c62c

+ 1 - 1
SE/schema/ant-url_action/default_db.in7_dziennik_koresp/test-druk/IN7_MK_BAZA_DYSTRYBUCJI.dita

@@ -15,7 +15,7 @@
     
     <p><ph>ID</ph><ph xpath="ID"/></p>
     <p><ph>Opis</ph><ph xpath="M_DIST_DESC"/></p>
-    <p><ph>Firma</ph><ph xpath="M_DISTRIBUTOR"/></p>
+    <p><ph>Firma</ph><ph xpath="M_DISTRIBUTOR"/><ph> kontakt:</ph><ph xpath="M_DISTRIBUTOR_CONTACT"/> adres:</ph><ph xpath="M_DISTRIBUTOR_ADDRESS"/></p>
     <p><ph>Notatki</ph><ph xpath="L_APPOITMENT_INFO"/><ph> </ph> <ph xpath="L_APPOITMENT_DATE"/></p>
     <RelatedFeature xpath="ADM_ACCOUNT" xpath_value="../L_APPOITMENT_USER" typeName="p5_default_db:ADMIN_USERS"><!-- oznacza to refa z w $var=ID_BILLING_OWNER jest FeatureID=BILLING_OWNER.$var do sciagniecia z p5_default_db:BILLING_OWNER -->
       <p><simpletable frame="all" relcolwidth="1.0* 1.0*" id="simpletable_b2r_ldr_cz_ref_spr">

+ 1 - 0
SE/schema/default_db_xml_cache.public/build_ant_universal_by_xsl_match.xsl

@@ -47,6 +47,7 @@
     <xsl:template mode="build_element_complexType.xml" match="build_cache">
         <sequential>
         <tempfile property="{with-param/@select}{with-param/@name}" deleteonexit="yes"><xsl:attribute name="destdir" select="'${detect_resource_type.local}'"/></tempfile>
+            <echo>creating <xsl:value-of select="with-param/@select"/>:<xsl:value-of select="with-param/@name"/></echo>
         <xslt basedir="./"    destdir="./"   out="${with-param/@select}{with-param/@name}">
             <xsl:attribute name="style" select="'${build_complexType.xsl}'"/>
             <xsl:attribute name="in" select="'${empty.xml}'"/>

+ 14 - 14
SE/schema/default_db_xml_cache.public/build_recurse_ant.xsl

@@ -79,7 +79,7 @@
     <xsl:param name="process_locks"/>
     <xsl:param name="get_wfs" required="yes"/>
     <xsl:param name="debug_xsl_out_filename" required="yes" />  
-    <xsl:param name="debug" select="6"/>
+    <xsl:param name="debug" select="1"/>
     <!--<xsl:variable name="temp_current">
         <xsl:choose>
             <xsl:when test="$temp='temp'">
@@ -389,10 +389,10 @@
                             </xsl:element>
                         </condition>
                     </target>
-                    <delete>
+                    <delete quiet="true">
                         <xsl:attribute name="file" select="concat('${',$temp,'-',$wfs_output.xml,'__test_featureID_name_dita.xml',$feature_pos_parent,$feature_pos,'}')"/>
                     </delete>
-                    <delete>
+                    <delete quiet="true">
                         <xsl:attribute name="file" select="concat('${',$temp,'-',$wfs_output.xml,'__test_featureID_name_dita_out.xml',$feature_pos_parent,$feature_pos,'}')"/>
                     </delete>
                     <target name="get_related_feature_run_child_ant_if{$loop_xpath_real}" depends="get_related_feature_run_child_ant_check{$loop_xpath_real}">
@@ -480,7 +480,7 @@
                             <xsl:attribute name="property" select="concat('builds_to_ant_set_parallel_java_process_max_loadfile_xsl',$loop_path_recurs,$loop_xpath_real)"/>
                             <xsl:attribute name="srcfile" select="concat('${builds_to_ant_set_parallel_java_process_max_xsl',$loop_path_recurs,$loop_xpath_real,'}')"/>
                         </loadfile>
-                        <delete>
+                        <delete quiet="true">
                             <xsl:attribute name="file" select="concat('${builds_to_ant_set_parallel_java_process_max_xsl',$loop_path_recurs,$loop_xpath_real,'}')"/>
                         </delete>
                         <parallel>
@@ -516,7 +516,7 @@
                     <!-- task do polaczenia zaglebien -->
                     
                     <!-- jak nie ma zaglebien to generujemy pdf i dajemy uzytkownikowi linka  -->
-                    <delete>
+                    <delete quiet="true">
                         <xsl:attribute name="file" select="concat('${builds_to_ant_lock_proj',$loop_path_recurs,$loop_xpath,'}')"/>
                     </delete>
                 </project>
@@ -936,7 +936,7 @@
                             | $loop_path_recurs = <xsl:value-of select="$loop_path_recurs"/>
                             *-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*
                         </echo></xsl:if>
-                        <delete>
+                        <delete quiet="true">
                             <xsl:attribute name="file" select="concat('${process_lock_loop',$loop_xpath,'_',$loop_path_recurs,@xml_id,'.',$feature_pos_parent,'.',$feature_pos,$featureID_name_dita,$parallel_pos,'}')"/>
                         </delete>
                          <ant antfile="{$recurse_ant_basedir}/build_recurse_ant.xml" target="xml_recursed_from_tr_map" inheritall="true" />
@@ -1135,16 +1135,16 @@
                 <classpath location="/opt/local/share/java/saxon9he.jar"/>
             </xsl:element>
             <!-- delete tempfiles -->
-            <delete>
+            <delete quiet="true">
                 <xsl:attribute name="file" select="concat('${builds_to_ant__test_query__featureID_name_dita.xml',$loop_path_recurs,$loop_xpath_real,@xml_id,'.',$feature_pos_parent,'.',$feature_pos,'}')"/>
             </delete>
-            <delete>
+            <delete quiet="true">
                 <xsl:attribute name="file" select="concat('${builds_to_ant__test_query__featureID_name_dita_out.xml',$loop_path_recurs,$loop_xpath_real,@xml_id,'.',$feature_pos_parent,'.',$feature_pos,'}')"/>
             </delete>
-            <delete>
+            <delete quiet="true">
                 <xsl:attribute name="file" select="concat('${builds_to_ant.xml',$loop_path_recurs,$loop_xpath_real,@xml_id,'.',$feature_pos_parent,'.',$feature_pos,'}')"/>
             </delete>
-            <delete>
+            <delete quiet="true">
                 <xsl:attribute name="file" select="concat('${builds_to_ant__test_query__featureID_name_dita_out.xml',$loop_path_recurs,$loop_xpath_real,@xml_id,'.',$feature_pos_parent,'.',$feature_pos,'}')"/>
             </delete>
             
@@ -1169,7 +1169,7 @@
                         <xsl:attribute name="value" select="concat('${builds_to_ant_file.xml',$loop_path_recurs,$loop_xpath_real,@xml_id,'.',$feature_pos_parent,'.',$feature_pos,'}')"/>
                     </arg>
             </java>-->
-            <delete>
+            <delete quiet="true">
                 <xsl:attribute name="file" select="concat('${builds_to_ant_file.xml',$loop_path_recurs,$loop_xpath_real,@xml_id,'.',$feature_pos_parent,'.',$feature_pos,'}')"/>
             </delete>
             <!--<ant antfile="{$temp}/${builds_to_ant_file.xml}" dir="."/>-->
@@ -1325,7 +1325,7 @@
                 <classpath location="/opt/local/share/java/saxon9he.jar"/>
                 <param name="featureID_name_dita" expression="{$featureID_name_dita}"/>
             </xsl:element>-->
-            <delete>
+            <delete quiet="true">
                 <xsl:attribute name="file" select="concat('${builds_to_ant__test_query__featureID_name_dita.xml',$loop_path_recurs,$loop_xpath,@xml_id,'.',$feature_pos_parent,'.',$feature_pos,$featureID_name_dita,$parallel_pos,'}')"/>
             </delete>
             
@@ -1832,8 +1832,8 @@
         <!-- first assign xpath to features from  -->
             <xsl:variable name="wfs_output_nodes" select="doc($wfs_output)"/>
         <xsl:variable name="current_RelatedFeature" select="*"/>
-        <xsl:variable name="xml_id" select="@xml_id"/>
-        <xsl:variable name="feature_pos_parent" select="@feature_pos"/>
+       <xsl:variable name="xml_id" select="@xml_id"/>
+       <xsl:variable name="feature_pos_parent" select="@feature_pos"/>
         <!--<input_obj_with_xpath_debug>
             <xsl:copy-of select="$wfs_output_nodes"/>
         </input_obj_with_xpath_debug>-->

+ 1 - 1
SE/schema/default_db_xml_cache.public/builds_to_ant.xsl

@@ -366,7 +366,7 @@
                     <echo>
                         xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx #350  FIXING BAD RELATEDLOOP EXECUTION for <xsl:value-of select="concat($temp,'/',$loop_xpath,'/',.,'build_root.xml')"/>
                     </echo>
-                    <delete includeEmptyDirs="true">
+                    <delete includeEmptyDirs="true" quiet="true">
                         <fileset dir="{$temp}/{$loop_xpath}/{.}">
                             <include name="*"/>
                             <exclude name="build_root.xml"/>

+ 9 - 0
SE/schema/default_db_xml_cache.public/default_db/CRM_PROCES/CRM_PRZYPADEK.xsl

@@ -11,6 +11,12 @@
             <xsl:when test="../CRM_LISTA_ZASOBOW/TYPE='STANOWISKO' and contains(FORM_TREAT,'X')">
                 <p>Stanowisko odpowiedzialne</p>
             </xsl:when>
+            <xsl:when test="../CRM_LISTA_ZASOBOW/TYPE='URZADZENIE' and contains(FORM_TREAT,'X')">
+                <p>Użyj wskazanego urządzenia</p>
+            </xsl:when>
+            <xsl:when test="../CRM_LISTA_ZASOBOW/TYPE='WYPOSAZENIE' and contains(FORM_TREAT,'X')">
+                <p>Użyj wskazanego wyposażenia</p>
+            </xsl:when>
             <xsl:when test="../CRM_LISTA_ZASOBOW/TYPE='STANOWISKO' and contains(FORM_TREAT,'R')">
                 <p>Stanowisko posiada uprawnienie do kontrolowania procedury</p>
             </xsl:when>
@@ -23,6 +29,9 @@
             <xsl:when test="../CRM_LISTA_ZASOBOW/TYPE='KOMORKA' and contains(FORM_TREAT,'C') and contains(FORM_TREAT,'R') ">
                 <p>Wprowadź informację do formularza: (do nowego rekordu) </p>
             </xsl:when>
+            <xsl:when test="../CRM_LISTA_ZASOBOW/TYPE='KOMORKA' and contains(FORM_TREAT,'R') and contains(FORM_TREAT,'X') ">
+                <p>Wprowadź informację do formularza w miejscu filtra: (w celu wyszukania oczekiwanej wartości w tym polu) </p>
+            </xsl:when>
             <xsl:otherwise>
                 <p>Wprowadz inforamcję: (<xsl:value-of select="FORM_TREAT"/>)</p>
             </xsl:otherwise>

+ 96 - 23
SE/schema/default_db_xml_cache.public/default_db/CRM_PROCES/PROCES_INIT_tree_to_dita.xsl

@@ -16,6 +16,7 @@
     
     
     <xsl:param name="PROCES_INIT_tree.ditamap" select="'PROCES_INIT_tree.ditamap'"/> <!-- file behind will be created dita files -->
+    <xsl:param name="TargetNamespaceBindings" select="'https://biuro.biall-net.pl'"/>
    <!-- <xsl:param name="temp" required="yes"/>
     <xsl:param name="uuid" required="yes"/>-->
     
@@ -41,7 +42,7 @@
         
     
     
-    <xsl:template match="CRM_IMAGE_CRM_PROCES" mode="postprocess_images">
+    <xsl:template match="CRM_IMAGE_CRM_PROCES|CRM_IMAGE_CRM_LISTA_ZASOBOW" mode="postprocess_images">
         <xsl:variable name="ext" select="substring-after(TYPE,'/')"/>
         <base64_to_image srcfile="{$temp}/{$uuid}/{ID}_image.base64.{$ext}" dstfile="{$temp}/{$uuid}/{ID}_image.{$ext}" />
     </xsl:template>
@@ -59,7 +60,7 @@
         <xsl:apply-templates mode="#current"/>
     </xsl:template>-->
     
-    <xsl:template match="PROCES_TREE|PROCES_INIT" mode="ditamap_root">
+    <xsl:template match="PROCES_TREE|PROCES_INIT|PROCES_GROUP_1|PROCES_GROUP_2" mode="ditamap_root">
         <map xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
             xsi:noNamespaceSchemaLocation="urn:oasis:names:tc:dita:xsd:map.xsd">
             <title>
@@ -125,7 +126,26 @@
                 <image href="{ID}_image.{$ext}" width="{WIDTH}"></image>
             </xsl:otherwise>
         </xsl:choose>
-        
+    </xsl:template>
+    
+    <xsl:template match="IF_TRUE_GOTO" mode="example">
+        <xsl:variable name="text" select="text()"/>
+        <xsl:choose>
+            <xsl:when test="text() = '0'"/>
+            <xsl:otherwise>                
+                <xsl:choose>
+                    <xsl:when test="//PROCES_INIT[ID/text()= $text]"><note>Wyzwala procedurę: <xref href="{text()}_topic.dita"/></note></xsl:when>
+                    <xsl:when test="//PROCES[ID/text()= $text]"><note>Odniesienie do kroku: <xref href="#task_{text()}" format="dita"/></note></xsl:when>
+                    <xsl:otherwise>
+                        <note>Wyzwala do procedurę <xsl:value-of select="$text"/> (niewidoczna w tym opracowaniu)
+                            <xref
+                                href="{$TargetNamespaceBindings}/SE/version-git/procesy5.php?task=PROCES_VIEW_LIST&amp;HIDE_PANEL=1&amp;id_proces={text()}"
+                                format="html" scope="external"/>
+                        </note>
+                    </xsl:otherwise>
+                </xsl:choose>
+            </xsl:otherwise>
+        </xsl:choose>
     </xsl:template>
     
     <xsl:template match="*|text()|comment()" mode="example"/>
@@ -153,14 +173,23 @@
                 <xsl:apply-templates select="$system_cache__appinfo:escaped_html_to_xml" mode="system_cache__appinfo:extract_text"/>
                 <!--<xsl:value-of select="DESC"/>-->
             </title>
-            <shortdesc><!--<xsl:value-of select="OPIS"/>-->
+            <!--<shortdesc><!-\-<xsl:value-of select="OPIS"/>-\->
                 <xsl:variable name="system_cache__appinfo:escaped_html_to_xml">
-                    <xsl:call-template name="system_cache__appinfo:escaped_html_to_xml">
+                    <!-\-<xsl:call-template name="system_cache__appinfo:escaped_html_to_xml">
+                        <xsl:with-param name="html" select="OPIS"/>
+                    </xsl:call-template>-\->
+                    <xsl:call-template name="escaped_html_to_xml_and_surrounded_enter">
+                        <xsl:with-param name="enter_surround_to" select="'p'"/>
                         <xsl:with-param name="html" select="OPIS"/>
                     </xsl:call-template>
+                   
+                    <xsl:apply-templates mode="enter_to_ph" select="OPIS">
+                        <xsl:with-param name="element" select="'bodydiv'"/>
+                        <xsl:with-param name="count" select="2"/>
+                    </xsl:apply-templates>
                 </xsl:variable>
                 <xsl:apply-templates select="$system_cache__appinfo:escaped_html_to_xml" mode="system_cache__appinfo:extract_text"/>
-            </shortdesc>
+            </shortdesc>-->
             <prolog>
                 <author><xsl:value-of select="A_RECORD_CREATE_AUTHOR"/> w <xsl:value-of select="A_RECORD_CREATE_DATE"/></author>
                 <!--<change-historylist>
@@ -172,16 +201,41 @@
                 </change-historylist>-->
             </prolog>
             <taskbody>
+                
                 <!--<context>
                     <p></p>
                 </context>-->
+                
+                        <example>
+                            <xsl:variable name="system_cache__appinfo:escaped_html_to_xml">
+                                <xsl:call-template name="escaped_html_to_xml_and_surrounded_enter" exclude-result-prefixes="#all">
+                                    <xsl:with-param name="enter_surround_to" select="'p'"/>
+                                    <xsl:with-param name="html" select="OPIS"/>
+                                </xsl:call-template>
+                            </xsl:variable>
+                            <xsl:apply-templates mode="enter_to_ph" select="$system_cache__appinfo:escaped_html_to_xml//text()" exclude-result-prefixes="#all">
+                                <xsl:with-param name="element" select="'bodydiv'"/>
+                                <xsl:with-param name="count" select="1"/>
+                            </xsl:apply-templates>
+                            <xsl:for-each select="//IF_TRUE_GOTO[ text()= current()/ID/text()]">
+                                <note>Procedura wyzwalana z <xref href="{ ancestor::node()[ name()='PROCES_INIT'][1]/ID}_topic.dita#task_{ ../ID}"/></note>
+                            </xsl:for-each>
+                        </example>
+                
+                
                 <xsl:choose>
                     <xsl:when test="CRM_WSKAZNIK">
                         <postreq>zasoby:
-                            <ol>
-                                <li/>
+                            <xsl:variable name="task_resources_info">
                                 <xsl:apply-templates mode="task_resources_info"/>
-                            </ol>
+                            </xsl:variable>
+                            <xsl:choose>
+                                <xsl:when test="$task_resources_info/*">
+                                    <ol>
+                                        <xsl:copy-of select="$task_resources_info"/>
+                                    </ol>
+                                </xsl:when>
+                            </xsl:choose>
                         </postreq>
                     </xsl:when>
                 </xsl:choose>
@@ -237,14 +291,7 @@
                         </xsl:variable>
                         <xsl:apply-templates select="$system_cache__appinfo:escaped_html_to_xml" mode="system_cache__appinfo:extract_text"/>
                     </title>
-                    <shortdesc><!--<xsl:value-of select="OPIS"/>-->
-                        <xsl:variable name="system_cache__appinfo:escaped_html_to_xml">
-                            <xsl:call-template name="system_cache__appinfo:escaped_html_to_xml">
-                                <xsl:with-param name="html" select="OPIS"/>
-                            </xsl:call-template>
-                        </xsl:variable>
-                        <xsl:apply-templates select="$system_cache__appinfo:escaped_html_to_xml" mode="system_cache__appinfo:extract_text"/>
-                    </shortdesc>
+                    
                     <prolog>
                         <author><xsl:value-of select="A_RECORD_CREATE_AUTHOR"/></author>
                         <!--<change-historylist>
@@ -257,15 +304,36 @@
                     </prolog>
                     <taskbody>
                             <example>
-                                <xsl:apply-templates mode="example"/>
+                                
+                                <xsl:variable name="system_cache__appinfo:escaped_html_to_xml">
+                                    <xsl:call-template name="escaped_html_to_xml_and_surrounded_enter" exclude-result-prefixes="#all">
+                                        <xsl:with-param name="enter_surround_to" select="'p'"/>
+                                        <xsl:with-param name="html" select="OPIS"/>
+                                    </xsl:call-template>
+                                </xsl:variable>
+                                <xsl:apply-templates mode="enter_to_ph" select="$system_cache__appinfo:escaped_html_to_xml//text()" exclude-result-prefixes="#all">
+                                    <xsl:with-param name="element" select="'bodydiv'"/>
+                                    <xsl:with-param name="count" select="1"/>
+                                </xsl:apply-templates>
+                                <xsl:for-each select="//IF_TRUE_GOTO[ text()= current()/ID/text()]">
+                                    <note>Odwołanie wewnętrzne do procedury wyzwalane z <xref href="{ ancestor::node()[ name()='PROCES_INIT'][1]/ID}_topic.dita#task_{ ../ID}"/></note>
+                                </xsl:for-each>
+                                
+                                <xsl:apply-templates mode="example"/> <!-- obslugije m.in wyzwalane procedury -->
                             </example>
                         <xsl:choose>
                             <xsl:when test="CRM_WSKAZNIK">
+                                <xsl:variable name="task_resources_info">
+                                    <xsl:apply-templates mode="task_resources_info"/>
+                                </xsl:variable>
                                 <postreq>zasoby:
-                                    <ol>
-                                        <li/>
-                                        <xsl:apply-templates mode="task_resources_info"/>
-                                    </ol>
+                                    <xsl:choose>
+                                        <xsl:when test="$task_resources_info/*">
+                                            <ol>
+                                                <xsl:copy-of select="$task_resources_info"/>
+                                            </ol>
+                                        </xsl:when>
+                                    </xsl:choose>
                                 </postreq>
                             </xsl:when>
                         </xsl:choose>
@@ -431,6 +499,7 @@
     
     <xsl:template mode="task_resources_info" match="CRM_LISTA_ZASOBOW">
         <xsl:comment>#432 match="CRM_LISTA_ZASOBOW" mode="task_resources_info" </xsl:comment>
+        <xsl:apply-templates mode="example"/>
                 <xsl:choose>
                     <xsl:when test="TYPE='KOMORKA'">
                         <p>
@@ -441,7 +510,11 @@
                                         <xsl:with-param name="html" select="OPIS[1]"/>
                                     </xsl:call-template>
                                 </xsl:if>
-                                <xsl:if test="not(DESC/text()=DESC_PL/text())"><ph> <xsl:value-of select="DESC_PL"/></ph></xsl:if>
+                                <xsl:if test="not(DESC/text()=DESC_PL/text())"><ph> <!--<xsl:value-of select="DESC_PL"/>-->
+                                    <xsl:call-template name="system_cache__appinfo:escaped_html_to_xml">
+                                        <xsl:with-param name="html" select="DESC_PL"/>
+                                         </xsl:call-template>
+                                    </ph></xsl:if>
                             </codeblock>
                         </p>
                     </xsl:when>

+ 4 - 0
SE/schema/default_db_xml_cache.public/default_db/enter_to_ph.xsl

@@ -29,6 +29,7 @@
         </xsl:variable>
         <xsl:choose>
             <xsl:when test=" contains(  text(),'&#13;')">
+                <!--<xsl:message>#32 contains <xsl:value-of select="text()"/> 13; and will surround with <xsl:value-of select="$surround_with"/>; </xsl:message>-->
                 <xsl:for-each select="tokenize(  text(),'&#13;')">
                     <xsl:element name="{$surround_with}"><!-- to jest przetwarzane jak jest tekst lamany -->
                         <xsl:value-of select="."/>
@@ -36,6 +37,7 @@
                 </xsl:for-each>
             </xsl:when>
             <xsl:when test=" contains(  text(),'&#xD;')">
+                <!--<xsl:message>#39 contains <xsl:value-of select="text()"/> xD;  and will surround with <xsl:value-of select="$surround_with"/>; </xsl:message>-->
                 <xsl:for-each select="tokenize(  text(),'&#xD;')">
                     <xsl:element name="{$surround_with}"><!-- to jest przetwarzane jak jest tekst lamany -->
                         <xsl:value-of select="."/>
@@ -45,6 +47,7 @@
             <xsl:otherwise>
                 <xsl:choose>
                     <xsl:when test="$count &gt;1">
+                        <!--<xsl:message>#50 codeblock with <xsl:value-of select="text()"/></xsl:message>-->
                         <codeblock>
                             <!--<xsl:attribute name="DDxpath" select="@xpath"/>-->
                             <!--DN(<xsl:value-of select="$element"/>)-->
@@ -53,6 +56,7 @@
                         </codeblock>
                     </xsl:when>
                     <xsl:otherwise>
+                        <xsl:message>#58 otherwise</xsl:message>
                         <xsl:apply-templates mode="enter_to_ph_text">
                             <xsl:with-param name="element" select="$element"/>
                         </xsl:apply-templates>

+ 3 - 1
SE/schema/default_db_xml_cache.public/default_db/tree_to_dita.xsl

@@ -9,7 +9,9 @@
     
     
     <xsl:import href="../escaped_html_to_xml.xsl"/>
-    <xsl:import href="../dita_enter_to_ph.xsl"/>
+    <!--<xsl:import href="../dita_enter_to_ph.xsl"/>-->
+    <xsl:include href="../default_db/enter_to_ph.xsl"/>
+    
     <xsl:include href="extract_text.xsl"/>
     <xsl:include href="images/images.xsl"/>
     

+ 7 - 2
SE/schema/default_db_xml_cache.public/escaped_html_to_xml.xsl

@@ -74,8 +74,6 @@
                             <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'"/>
@@ -238,6 +236,13 @@
                 </xsl:element>
             </xsl:for-each>
         </xsl:for-each>
+        <xsl:choose><!-- warunek xxxx<br>yyyy nie zwraca - daje IFa -->
+            <xsl:when test=" count($anal_num1/anal_num1/gt) = 3 
+                and $anal_num_anal/anal_num_anal/gt[1][ @sum_cur='1' and @pos='1' and @level='0']
+                and $anal_num_anal/anal_num_anal/gt[2][ @sum_cur='2' and @pos='2' and @level='1' and @new_gr='1']
+                and $anal_num_anal/anal_num_anal/gt[3][ @sum_cur='3' and @pos='3' and @level='1']
+                "><xsl:value-of select="' '"/><xsl:value-of select="$anal_num_anal/anal_num_anal/gt[3]/text()"/></xsl:when>
+        </xsl:choose>
     </xsl:template>