a.binder 9 лет назад
Родитель
Сommit
f6e24eca68

+ 3 - 2
SE/dev/php-cli/PE_wariant_bit_table.xsl

@@ -2,7 +2,7 @@
 <xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
     xmlns:xs="http://www.w3.org/2001/XMLSchema"
     xmlns:bp="https://procesy5.pl/biale_plamy-schema.xsd"
-    xmlns:math="http://exslt.org/math"
+    
     exclude-result-prefixes="xs"
     version="2.0">
     
@@ -129,7 +129,8 @@
         <xsl:param name="bit_max" select="63"/>
         <xsl:param name="EconomicDistanceCut2"/><!-- tabela do podstawiania danych i wyliczen -->
         <PE_wariant_bit_table>
-            <xsl:variable name="no_more_variants" select=" math:power(2,$elements_cnt)"/>
+            <!--<xsl:variable name="no_more_variants" select=" math:power(2,$elements_cnt)"/>-->
+            <xsl:variable name="no_more_variants" select="100"/>
             <xsl:attribute name="no_more_variants" select="$no_more_variants"/>
             <xsl:for-each select="1 to ($no_more_variants+1)">
             <xsl:variable name="wariant_id" select="."/>

+ 1 - 0
SE/dev/php-cli/edge_paths_with_PE_controll.xsl

@@ -158,6 +158,7 @@
                             <xsl:attribute name="distanceGr" select=" current-grouping-key()"/>
                             <xsl:attribute name="elements_cnt_Pos" select="$elements_cnt_Pos"/>
                             <xsl:attribute name="bit_max_Pos" select="$bit_max_Pos"/>
+                            <xsl:attribute name="id_path" select="@id_path"/>
                             <xsl:attribute name="point_count_Pos" select="sum(current-group()/@point_count)"/>
                                 <xsl:for-each select="current-group()">
                                     <xsl:copy-of select="."/>

+ 17 - 13
SE/dev/php-cli/joins2ways_z_ID_Way.xsl

@@ -14,18 +14,14 @@
     
     <xsl:template match="joins2ways">
         <joins2ways_z_ID_Way>
-            <xsl:variable name="joins2ways">
+            <!--<xsl:variable name="joins2ways">
                 <xsl:apply-templates/>
-            </xsl:variable>
-            <xsl:for-each select="$joins2ways/item">
-                <xsl:copy-of select="."/>
-                <xsl:result-document href="joins2ways_z_ID_Way/joins2ways_z_ID_Way.{@id}.{@ID_Way}.xml">
-                    <joins2ways_z_ID_Way>
-                        <xsl:attribute name="id" select="@id"/>
-                        <xsl:copy-of select="."/>
-                    </joins2ways_z_ID_Way>
-                </xsl:result-document>
-            </xsl:for-each>
+            </xsl:variable>-->
+           <!-- <xsl:for-each select="$joins2ways/item">-->
+               <!-- <xsl:copy-of select="."/>-->
+                
+            <!--</xsl:for-each>-->
+            <xsl:apply-templates/>
         </joins2ways_z_ID_Way>
     </xsl:template>
     <xsl:template match="item">
@@ -43,7 +39,7 @@
                             <xsl:attribute name="item_copied_pos" select="position()"/>
                             <!-- moze miec wiecej punktow-->
                             <xsl:for-each select="$points2joins/points2joins/item[text()= $id]">
-                                <Points><xsl:value-of select=" text()"/></Points>
+                                <Points><xsl:value-of select=" @id"/></Points>
                             </xsl:for-each>
 
                             <xsl:for-each select="$item/item">
@@ -57,6 +53,7 @@
             </xsl:for-each>
         </xsl:variable>
         
+        <xsl:variable name="items_grouped">
         <xsl:for-each-group select="$items/item" group-by="@ID_Way">
             <item>
                 <xsl:copy-of select="@*"/>
@@ -65,7 +62,14 @@
                 <xsl:copy-of select="Points"/>
             </item>
         </xsl:for-each-group>
-        
+        </xsl:variable>
+        <xsl:copy-of select="$items_grouped"/>
+        <xsl:result-document href="joins2ways_z_ID_Way/joins2ways_z_ID_Way.{@id}.{@ID_Way}.xml">
+            <joins2ways_z_ID_Way>
+                <xsl:attribute name="id" select="@id"/>
+                <xsl:copy-of select="$items_grouped"/>
+            </joins2ways_z_ID_Way>
+        </xsl:result-document>
         
     </xsl:template>