merge

SE/schema/default_db_xml_cache.public/build_recurse_ant_merge_dita_from_temp.xsl

@@ -103,7 +103,7 @@
         <!-- podstawamy dane z xml na podstawie path -->
         <xsl:param name="loop_xpath" select="'root'"/>
         <xsl:param name="feature_pos_child"  select="1"/> <!-- pierwsze wyzwolenie narzuca 1 - kolejne sa z related -->
-        <xsl:param name="dita_with_id" select="."/>
+        <!--<xsl:param name="dita_with_id" select="."/>--> <!-- TODO  jest błąd - z RelatedFeatureLoop trzeba wziac mape lokalna obiektu -->
         <xsl:variable name="xml_id" select="@xml_id"/>
         <xsl:variable name="RelatedFeaturePos" select="position()"/>
         <xsl:variable name="featureID_name" select="substring-after(@typeName,':')"/>
@@ -142,7 +142,7 @@
                 <xsl:for-each select="$dita_fragment">
                     <xsl:apply-templates mode="RelatedFeature" select="$dita_fragment/RelatedFeatureRoot/*">
                         <xsl:with-param name="loop_xpath" select="$loop_xpath"/>
-                        <xsl:with-param name="dita_with_id" select="$dita_with_id"/>
+                        <!--<xsl:with-param name="dita_with_id" select="$dita_with_id"/>-->
                     </xsl:apply-templates>
                 </xsl:for-each>
         <!--</RelatedFeatureRoot>-->
@@ -154,7 +154,7 @@
         <!-- podstawamy dane z xml na podstawie path -->
         <xsl:param name="path" select="$temp"/> <!-- budowa sciezki do wchodzenia do struktur - domyslnie zaczyna sie od $temp-->
         <xsl:param name="feature_pos_child"  select="1"/>
-        <xsl:param name="dita_with_id" required="yes"/>
+        <!--<xsl:param name="dita_with_id" required="yes"/>-->
         
         <xsl:if test="$with_RelatedFeatureLoop">
                     <xsl:variable name="xml_id" select="@xml_id"/>
@@ -170,7 +170,7 @@
                         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($basedir,'/temp/',$uuid,'.',$loop_xpath,'.',$RelatedFeaturePos,'.dita.xml.vals.dita'))"/>-->
-                    
+                    <xsl:comment>#174 look in <xsl:value-of select="concat($temp,'/',$xml_id,'.',$uuid,'.',$feature_pos_child,'/',$uuid,'.out_task.dita.final.xml')"/>;</xsl:comment>
                     <xsl:variable name="dita_fragment">
                         <xsl:choose>
                             <xsl:when test=" doc-available(concat($temp,'/',$xml_id,'.',$uuid,'.',$feature_pos_child,'/',$uuid,'.out_task.dita.final.xml'))">
@@ -178,15 +178,26 @@
                                 <xsl:copy-of select="doc(concat($temp,'/',$xml_id,'.',$uuid,'.',$feature_pos_child,'/',$uuid,'.out_task.dita.final.xml'))"/>
                             </xsl:when>
                             <xsl:otherwise>
-                                <xsl:comment>#156 INFO no Related leaf xml file <xsl:value-of select="concat($temp,'/',$xml_id,'.',$uuid,'.',$feature_pos_child,'/',$uuid,'.out_task.dita.final.xml')"/>;</xsl:comment>
+                                <!--<xsl:comment>#156 INFO no Related leaf xml file <xsl:value-of select="concat($temp,'/',$xml_id,'.',$uuid,'.',$feature_pos_child,'/',$uuid,'.out_task.dita.final.xml')"/>;</xsl:comment>-->
                                 <xsl:message>#156 INFO no Related leaf xml file <xsl:value-of select="concat($temp,'/',$xml_id,'.',$uuid,'.',$feature_pos_child,'/',$uuid,'.out_task.dita.final.xml')"/></xsl:message>
                             </xsl:otherwise>
                         </xsl:choose>
                     </xsl:variable>
-                        <!--<Loop_dita_fragment>
-                            <xsl:copy-of select="$dita_fragment"/>
-                        </Loop_dita_fragment>-->
-                    <xsl:comment>#180 loop $xml_id=<xsl:value-of select="$xml_id"/>; $RelatedFeaturePos=<xsl:value-of select="$RelatedFeaturePos"/>;  </xsl:comment>
+                    <xsl:variable name="dita_with_id" >
+                        <xsl:choose>
+                            <xsl:when test="doc-available(concat($temp,'/',$xml_id,'.',$uuid,'.',$feature_pos_child,'/',$featureID_name,'.with_id.xml'))">
+                                <xsl:message>#189 we load get $dita_fragment for <xsl:value-of select="$featureID_name"/>; </xsl:message>
+                                <xsl:value-of select="doc(concat($temp,'/',$xml_id,'.',$uuid,'.',$feature_pos_child,'/',$featureID_name,'.with_id.xml'))"/>
+                            </xsl:when>
+                        </xsl:choose>
+                    </xsl:variable>
+                    <Loop_dita_with_id>
+                        <xsl:copy-of select="$dita_with_id"/>
+                    </Loop_dita_with_id>
+                    <Loop_dita_fragment>
+                        <xsl:copy-of select="$dita_fragment"/>
+                    </Loop_dita_fragment>
+                    <xsl:comment>#180 loop $xml_id=<xsl:value-of select="$xml_id"/>; $feature_pos_child=<xsl:value-of select="$feature_pos_child"/>; $RelatedFeaturePos=<xsl:value-of select="$RelatedFeaturePos"/>; $dita_fragment(empty)=<xsl:value-of select="empty($dita_fragment)"/> empty($dita_with_id)=<xsl:value-of select="empty($dita_with_id)"/>; </xsl:comment>
                     
                     <xsl:for-each select="$dita_fragment">
                         <xsl:for-each select="$dita_fragment">
@@ -301,7 +312,7 @@
     
     <xsl:template mode="RelatedFeature" match="*">
         <xsl:param name="loop_xpath" required="yes"/>
-        <xsl:param name="dita_with_id" required="yes"/>
+        <!--<xsl:param name="dita_with_id" required="yes"/>-->
         <!--<xsl:element name="{name()}">-->
             <!--<xsl:copy-of select="@*"/>-->
             <!--<xsl:apply-templates select="@*"/>-->
@@ -309,7 +320,7 @@
             <xsl:apply-templates mode="RelatedFeatureChild" select=".">
                 <xsl:with-param name="loop_xpath" select="$loop_xpath"/>
                 <xsl:with-param name="feature_pos_child" select="position()"/>
-                <xsl:with-param name="dita_with_id" select="$dita_with_id"/>
+                <!--<xsl:with-param name="dita_with_id" select="$dita_with_id"/>-->
             </xsl:apply-templates>
         <!--</xsl:element>-->
     </xsl:template>
@@ -317,14 +328,14 @@
     <xsl:template mode="RelatedFeatureChild" match="*">
         <xsl:param name="loop_xpath" required="yes"/>
         <xsl:param name="feature_pos_child" required="yes"/>
-        <xsl:param name="dita_with_id" required="yes"/>
+        <!--<xsl:param name="dita_with_id" required="yes"/>-->
         <xsl:element name="{name()}">
             <!--<xsl:copy-of select="@*"/>-->
             <xsl:apply-templates select="@*"/>
             <xsl:apply-templates mode="RelatedFeatureChild">
                 <xsl:with-param name="loop_xpath" select="$loop_xpath"/>
                 <xsl:with-param name="feature_pos_child" select="$feature_pos_child"/>
-                <xsl:with-param name="dita_with_id" select="$dita_with_id"/>
+                <!--<xsl:with-param name="dita_with_id" select="$dita_with_id"/>-->
             </xsl:apply-templates>
         </xsl:element>
     </xsl:template>
@@ -332,24 +343,24 @@
     <xsl:template mode="RelatedFeatureChild" match="RelatedFeature">
         <xsl:param name="loop_xpath" required="yes"/>
         <xsl:param name="feature_pos_child" required="yes"/>
-        <xsl:param name="dita_with_id"  required="yes"/>
+        <!--<xsl:param name="dita_with_id"  required="yes"/>-->
         <xsl:apply-templates select=".">
             <xsl:with-param name="loop_xpath" select="$loop_xpath"/>
             <xsl:with-param name="feature_pos_child" select="$feature_pos_child"/>
-            <xsl:with-param name="dita_with_id" select="$dita_with_id"/>
+            <!--<xsl:with-param name="dita_with_id" select="$dita_with_id"/>-->
         </xsl:apply-templates>
     </xsl:template>
     
     <xsl:template match="*" >
         <xsl:param name="loop_xpath"/>
         <xsl:param name="feature_pos_child" required="yes"/>
-        <xsl:param name="dita_with_id" required="yes"/>
+        <!--<xsl:param name="dita_with_id" required="yes"/>-->
         <xsl:element name="{name()}">
             <xsl:copy-of select="@*"/>
             <xsl:apply-templates>
                 <xsl:with-param name="loop_xpath" select="$loop_xpath"/>
                 <xsl:with-param name="feature_pos_child" select="$feature_pos_child"/>
-                <xsl:with-param name="dita_with_id" select="$dita_with_id"/>
+                <!--<xsl:with-param name="dita_with_id" select="$dita_with_id"/>-->
             </xsl:apply-templates>
         </xsl:element>
     </xsl:template>