Главная Обзор Помощь
Вход
bn
/
se
2
0
Ответвить 0
Файлы Задачи 0 Запросы на слияние 0 Вики
Просмотр исходного кода

dzialajaca ditamap

a.binder 9 лет назад
Родитель
14c93a823e
Сommit
a21dd3143b
2 измененных файлов с 76 добавлено и 45 удалено
Разделённый вид Показать статистику Diff
  1. 38 34
      SE/schema/ant-url_action/default_db.in7_dziennik_koresp/umowa/IN7_MK_BAZA_DYSTRYBUCJI.dita
  2. 38 11
      SE/schema/default_db_xml_cache.public/build_recurse_ant_merge_dita_from_temp.xsl

+ 38 - 34
SE/schema/ant-url_action/default_db.in7_dziennik_koresp/umowa/IN7_MK_BAZA_DYSTRYBUCJI.dita
Просмотреть файл 

@@ -124,15 +124,17 @@
 
                 xsi:noNamespaceSchemaLocation="urn:oasis:names:tc:dita:xsd:topic.xsd">
 
                 <title>Pisma</title>
 
                 <body>
 
-                  <RelatedFeature xpath="ID_PROJECT" xpath_value="../ID" typeName="p5_default_db:IN7_DZIENNIK_KORESP"><!-- test sciagniecia powiazanych pism do sprawy -->
 
-                    <row>
 
-                      <entry></entry>
 
-                      <entry xpath="ID" />
 
-                      <entry/>
 
-                      <entry xpath="K_DATA_OTRZYMANEJ_KORESP"/>
 
-                      <entry xpath="K_ZAWARTOS"/>
 
-                    </row>
 
-                  </RelatedFeature>
 
+                  <simpletable frame="all" relcolwidth="1.0* 1.0*" >
 
+                    <RelatedFeature xpath="ID_PROJECT" xpath_value="../ID" typeName="p5_default_db:IN7_DZIENNIK_KORESP"><!-- test sciagniecia powiazanych pism do sprawy -->
 
+                      <strow>
 
+                        <stentry></stentry>
 
+                        <stentry xpath="ID" />
 
+                        <stentry/>
 
+                        <stentry xpath="K_DATA_OTRZYMANEJ_KORESP"/>
 
+                        <stentry xpath="K_ZAWARTOS"/>
 
+                      </strow>
 
+                    </RelatedFeature>
 
+                  </simpletable>
 
                 </body>
 
               </topic>
 
               <topichead navtitle="podsprawy">
 
@@ -144,31 +146,33 @@
 
                       xsi:noNamespaceSchemaLocation="urn:oasis:names:tc:dita:xsd:topic.xsd">
 
                       <title>Sprawa <ph xpath="ID"/> <ph xpath="M_DIST_DESC"/> <ph/> <ph/> </title>
 
                       <body>
 
-                        <row>
 
-                          <entry>---sprawy</entry>
 
-                          <entry xpath="ID" />
 
-                          <entry xpath="M_DIST_DESC"/>
 
-                          <entry xpath="M_DISTRIBUTOR"/>
 
-                          <entry xpath="L_APPOITMENT_INFO"/>
 
-                        </row>
 
-                        <RelatedFeature xpath="ID_PROJECT" xpath_value="../ID" typeName="p5_default_db:IN7_DZIENNIK_KORESP"><!-- test sciagniecia powiazanych pism do sprawy -->
 
-                          <row>
 
-                            <entry>------pisma</entry>
 
-                            <entry xpath="ID" />
 
-                            <entry xpath="A_STATUS"/>
 
-                            <entry xpath="K_DATA_OTRZYMANEJ_KORESP"/>
 
-                            <entry xpath="K_ZAWARTOS"/>
 
-                          </row>
 
-                        </RelatedFeature>
 
-                        <RelatedFeature xpath="ID_PROJECT" xpath_value="../ID" typeName="p5_default_db:PROBLEMS">  <!-- test sciagniecia powiazanych pism do sprawy -->
 
-                          <row>
 
-                            <entry>-----zadania</entry>
 
-                            <entry xpath="ID" />
 
-                            <entry xpath="A_STATUS"/>
 
-                            <entry xpath="A_PROBLEM_DESC"/>
 
-                            <entry xpath="L_APPOITMENT_USER"/>
 
-                          </row>
 
-                        </RelatedFeature>
 
+                        <simpletable frame="all" relcolwidth="1.0* 1.0*" >
 
+                          <strow>
 
+                            <stentry>---sprawy</stentry>
 
+                            <stentry xpath="ID" />
 
+                            <stentry xpath="M_DIST_DESC"/>
 
+                            <stentry xpath="M_DISTRIBUTOR"/>
 
+                            <stentry xpath="L_APPOITMENT_INFO"/>
 
+                          </strow>
 
+                          <RelatedFeature xpath="ID_PROJECT" xpath_value="../ID" typeName="p5_default_db:IN7_DZIENNIK_KORESP"><!-- test sciagniecia powiazanych pism do sprawy -->
 
+                            <strow>
 
+                              <stentry>------pisma</stentry>
 
+                              <stentry xpath="ID" />
 
+                              <stentry xpath="A_STATUS"/>
 
+                              <stentry xpath="K_DATA_OTRZYMANEJ_KORESP"/>
 
+                              <stentry xpath="K_ZAWARTOS"/>
 
+                            </strow>
 
+                          </RelatedFeature>
 
+                          <RelatedFeature xpath="ID_PROJECT" xpath_value="../ID" typeName="p5_default_db:PROBLEMS">  <!-- test sciagniecia powiazanych pism do sprawy -->
 
+                            <strow>
 
+                              <stentry>-----zadania</stentry>
 
+                              <stentry xpath="ID" />
 
+                              <stentry xpath="A_STATUS"/>
 
+                              <stentry xpath="A_PROBLEM_DESC"/>
 
+                              <stentry xpath="L_APPOITMENT_USER"/>
 
+                            </strow>
 
+                          </RelatedFeature>
 
+                        </simpletable>
 
                       </body>
 
                     </topic>
 
                   </RelatedFeature>

+ 38 - 11
SE/schema/default_db_xml_cache.public/build_recurse_ant_merge_dita_from_temp.xsl
Просмотреть файл 

@@ -340,17 +340,29 @@
 
         <xsl:param name="feature_pos_child" required="yes"/>
 
         <xsl:param name="dita.map"/> <!-- if set we will output many files in topics -->
 
         <!--<xsl:param name="dita_with_id" required="yes"/>-->
 
-        <xsl:element name="{local-name()}" inherit-namespaces="yes">
 
-            <xsl:copy-of select="namespace::node()"/>
 
-            <!--<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.map" select="$dita.map"/>
 
-                <!--<xsl:with-param name="dita_with_id" select="$dita_with_id"/>-->
 
-            </xsl:apply-templates>
 
-        </xsl:element>
 
+        <xsl:choose>
 
+            <xsl:when test="$dita.map">
 
+                <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.map" select="$dita.map"/>
 
+                    <!--<xsl:with-param name="dita_with_id" select="$dita_with_id"/>-->
 
+                </xsl:apply-templates>
 
+            </xsl:when>
 
+            <xsl:otherwise>
 
+                <xsl:element name="{local-name()}" inherit-namespaces="yes">
 
+                    <xsl:copy-of select="namespace::node()"/>
 
+                    <!--<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.map" select="$dita.map"/>
 
+                        <!--<xsl:with-param name="dita_with_id" select="$dita_with_id"/>-->
 
+                    </xsl:apply-templates>
 
+                </xsl:element>
 
+            </xsl:otherwise>
 
+        </xsl:choose>
 
     </xsl:template>
 
     
     <xsl:template mode="RelatedFeatureChild" match="RelatedFeature">
 
@@ -526,6 +538,21 @@
 
         <xsl:copy-of select="."/>
 
     </xsl:template>
 
     
+    <xsl:template match="text()" mode="RelatedFeatureChild">
 
+        <xsl:param name="dita.map"/>
 
+        <xsl:choose>
 
+            <xsl:when test="$dita.map"/>
 
+            <xsl:otherwise><xsl:copy-of select="."/></xsl:otherwise>
 
+        </xsl:choose>
 
+    </xsl:template>
 
+    <xsl:template match="text()" >
 
+        <xsl:param name="dita.map"/>
 
+        <xsl:choose>
 
+            <xsl:when test="$dita.map"/>
 
+            <xsl:otherwise><xsl:copy-of select="."/></xsl:otherwise>
 
+        </xsl:choose>
 
+    </xsl:template>
 
+    
     <xsl:template match="@xml_id|@xpath_token_filter|@xpath_token"/>
 
         
 </xsl:stylesheet>