lepszy druk raportu do projektu

SE/dev/sql/biale_plamy.sql

@@ -1,57 +0,0 @@
-DROP FUNCTION `test_find_shortest_way`;
-CREATE DEFINER=`root`@`94.158.130.34` FUNCTION `test_find_shortest_way`(`pID` INT) RETURNS POINT NOT DETERMINISTIC READS SQL DATA SQL SECURITY DEFINER BEGIN
-
-    DECLARE A, B, P POINT;
-    DECLARE I, N INT;
-    
-    SET P = (SELECT `the_geom` FROM `Rozdzielcza_test_bzyk_punkty_adresowe` WHERE `ID` = pID);
-
-    SET @the_geom = (SELECT `the_geom` FROM `Rozdzielcza_test_bzyk_drogi` WHERE st_distance(`the_geom`, P) < 0.01 ORDER BY st_distance(`the_geom`, P) LIMIT 1);
-    IF @the_geom IS NULL THEN
-        SET @the_geom = (SELECT `the_geom` FROM `Rozdzielcza_test_bzyk_drogi` WHERE st_distance(`the_geom`, P) < 0.1 ORDER BY st_distance(`the_geom`, P) LIMIT 1);
-    END IF;
-
-    SET N = coalesce(numpoints(@the_geom), 0);
-    IF N < 2 THEN
-        RETURN NULL;
-    END IF;
-
-    IF N = 2 THEN
-        SET @line = @the_geom;
-    ELSE
-        SET @distance = NULL;
-        SET I = 1;
-        WHILE (I < N) DO
-            SET A = pointn(@the_geom, I);
-            SET B = pointn(@the_geom, I+1);
-            SET @line_cur = LineStringFromText(concat('LineString(',X(A),' ',Y(A),',',X(B),' ',Y(B),')'));
-            SET @distance_cur = st_distance(P, @line_cur);
-            IF @distance is NULL or @distance_cur < @distance THEN
-                SET @distance = @distance_cur;
-                SET @line = @line_cur;
-            END IF;
-            SET I = I + 1;
-        END WHILE;
-    END IF;
-
-    SET A = pointn(@line, 1);
-    SET B = pointn(@line, 2);
-
-    SET @A1 = (Y(A)-(Y(B)))/(X(A)-X(B));
-    SET @B1 = Y(A)-@A1*X(A);
-    SET @A2 = -1/@A1;
-    SET @B2 = Y(P)-@A2*X(P);
-    SET @X = (@B2-@B1)/(@A1-@A2);
-    SET @Y = @A1*@X+@B1;
-
-    SET @XPOINT = geomfromtext(concat('POINT(',@X,' ',@Y,')'));
-    SET @distance = st_distance(@XPOINT, @line);
-    IF @distance = st_distance(@XPOINT, A) THEN
-        SET @result = A;
-    ELSEIF @distance = st_distance(@XPOINT, B) THEN
-        SET @result = B;
-    ELSE
-        SET @result = @XPOINT;
-    END IF;
-    RETURN @result;
-END

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

@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <RelatedFeature xpath="ID"  typeName="p5_default_db:IN7_MK_BAZA_DYSTRYBUCJI"
   xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" 
+  xmlns:ogc="http://www.opengis.net/ogc"
   xsi:noNamespaceSchemaLocation="../../../default_db_xml_cache.public/topicProcesy5.xsd">
   <!-- oznacza to refa z w $var=ID_BILLING_OWNER jest FeatureID=BILLING_OWNER.$var do sciagniecia z p5_default_db:BILLING_OWNER -->
   <!--https://biuro.biall-net.pl/SE/version-git/schema/ant-url_action/default_db.in7_dziennik_koresp/test-druk/out/null400667363.pdf-->
@@ -48,14 +49,56 @@
                 <entry xpath="L_APPOITMENT_INFO"/>
               </row>
                     <RelatedFeature xpath="ID_PROJECT" xpath_value="../ID" typeName="p5_default_db:PROBLEMS">  <!-- test sciagniecia powiazanych pism do sprawy -->
+                      <simpleTypeMakeOgcFilter name="PROBLEMS">
+                        <ogc:Or>
+                          <ogc:PropertyIsEqualTo>
+                            <ogc:PropertyName>A_STATUS</ogc:PropertyName>
+                            <ogc:Literal>WAITING</ogc:Literal>
+                          </ogc:PropertyIsEqualTo>
+                        </ogc:Or>
+                      </simpleTypeMakeOgcFilter>
                       <row>
-                        <entry>------zadania</entry>
+                        <entry>------zadania otwarte</entry>
                         <entry xpath="ID" />
                         <entry xpath="M_DIST_DESC"/>
                         <entry xpath="M_DISTRIBUTOR"/>
                         <entry xpath="L_APPOITMENT_INFO"/>
                       </row>
                     </RelatedFeature>
+                    <RelatedFeature xpath="ID_PROJECT" xpath_value="../ID" typeName="p5_default_db:PROBLEMS">  <!-- test sciagniecia powiazanych pism do sprawy -->
+                      <simpleTypeMakeOgcFilter name="PROBLEMS">
+                        <ogc:Or>
+                          <ogc:PropertyIsEqualTo>
+                            <ogc:PropertyName>A_STATUS</ogc:PropertyName>
+                            <ogc:Literal>NORMAL</ogc:Literal>
+                          </ogc:PropertyIsEqualTo>
+                        </ogc:Or>
+                      </simpleTypeMakeOgcFilter>
+                      <row>
+                        <entry>------zadania w toku </entry>
+                        <entry xpath="ID" />
+                        <entry xpath="M_DIST_DESC"/>
+                        <entry xpath="M_DISTRIBUTOR"/>
+                        <entry xpath="L_APPOITMENT_INFO"/>
+                      </row>
+                    </RelatedFeature>
+                  <RelatedFeature xpath="ID_PROJECT" xpath_value="../ID" typeName="p5_default_db:PROBLEMS">  <!-- test sciagniecia powiazanych pism do sprawy -->
+                    <simpleTypeMakeOgcFilter name="PROBLEMS">
+                      <ogc:Or>
+                        <ogc:PropertyIsEqualTo>
+                          <ogc:PropertyName>A_STATUS</ogc:PropertyName>
+                          <ogc:Literal>OFF_HARD</ogc:Literal>
+                        </ogc:PropertyIsEqualTo>
+                      </ogc:Or>
+                    </simpleTypeMakeOgcFilter>
+                    <row>
+                      <entry>------zadania w zakończone </entry>
+                      <entry xpath="ID" />
+                      <entry xpath="M_DIST_DESC"/>
+                      <entry xpath="M_DISTRIBUTOR"/>
+                      <entry xpath="L_APPOITMENT_INFO"/>
+                    </row>
+                  </RelatedFeature>
                     <RelatedFeature xpath="ID_PROJECT" xpath_value="../ID" typeName="p5_default_db:IN7_DZIENNIK_KORESP"><!-- test sciagniecia powiazanych pism do sprawy -->
                       <row>
                         <entry>------pisma</entry>
@@ -77,7 +120,7 @@
                         <row>
                           <entry>------pisma</entry>
                           <entry xpath="ID" />
-                          <entry/>
+                          <entry xpath="A_STATUS"/>
                           <entry xpath="K_DATA_OTRZYMANEJ_KORESP"/>
                           <entry xpath="K_ZAWARTOS"/>
                         </row>
@@ -121,31 +164,78 @@
               <entry/>
             </row>
             <RelatedFeature xpath="ID_PROJECT" xpath_value="../ID" typeName="p5_default_db:PROBLEMS">  <!-- test sciagniecia powiazanych pism do sprawy -->
+              <simpleTypeMakeOgcFilter name="PROBLEMS">
+                <ogc:Or>
+                  <ogc:PropertyIsEqualTo>
+                    <ogc:PropertyName>A_STATUS</ogc:PropertyName>
+                    <ogc:Literal>WAITING</ogc:Literal>
+                  </ogc:PropertyIsEqualTo>
+                  <ogc:PropertyIsEqualTo>
+                    <ogc:PropertyName>A_STATUS</ogc:PropertyName>
+                    <ogc:Literal>NORMAL</ogc:Literal>
+                  </ogc:PropertyIsEqualTo>
+                </ogc:Or>
+              </simpleTypeMakeOgcFilter>
+              <row>
+                <entry>(oczekujace)</entry>
+                <entry xpath="ID" />
+                <entry xpath="A_STATUS"/>
+                <entry xpath="A_PROBLEM_DESC"/>
+                <entry xpath="L_APPOITMENT_USER"/>
+              </row>
+              <RelatedFeature xpath="PARENT_ID" xpath_value="../ID" typeName="p5_default_db:PROBLEMS">  <!-- test sciagniecia powiazanych pism do sprawy -->
+                <row>
+                  <entry>------</entry>
+                  <entry xpath="ID" >Parent</entry>
+                  <entry xpath="A_STATUS"/>
+                  <entry xpath="A_PROBLEM_DESC"/>
+                  <entry xpath="L_APPOITMENT_USER"/>
+                </row>
+                <RelatedFeature xpath="PARENT_ID" xpath_value="../ID" typeName="p5_default_db:PROBLEMS">  <!-- test sciagniecia powiazanych pism do sprawy -->
+                  <row>
+                    <entry>---------</entry>
+                    <entry xpath="ID" >Parent</entry>
+                    <entry xpath="A_STATUS"/>
+                    <entry xpath="A_PROBLEM_DESC"/>
+                    <entry xpath="L_APPOITMENT_USER"/>
+                  </row>
+                </RelatedFeature>
+              </RelatedFeature>
+            </RelatedFeature>
+            <RelatedFeature xpath="ID_PROJECT" xpath_value="../ID" typeName="p5_default_db:PROBLEMS">  <!-- test sciagniecia powiazanych pism do sprawy -->
+              <simpleTypeMakeOgcFilter name="PROBLEMS">
+                <ogc:Or>
+                  <ogc:PropertyIsEqualTo>
+                    <ogc:PropertyName>A_STATUS</ogc:PropertyName>
+                    <ogc:Literal>OFF_HARD</ogc:Literal>
+                  </ogc:PropertyIsEqualTo>
+                </ogc:Or>
+              </simpleTypeMakeOgcFilter>
               <row>
-                <entry>---</entry>
+                <entry>(zakonczone)</entry>
                 <entry xpath="ID" />
                 <entry xpath="A_STATUS"/>
                 <entry xpath="A_PROBLEM_DESC"/>
                 <entry xpath="L_APPOITMENT_USER"/>
               </row>
-              <!--<RelatedFeature xpath="PARENT_ID" xpath_value="../ID" typeName="p5_default_db:PROBLEMS">  <!-\- test sciagniecia powiazanych pism do sprawy -\->
+              <RelatedFeature xpath="PARENT_ID" xpath_value="../ID" typeName="p5_default_db:PROBLEMS">  <!-- test sciagniecia powiazanych pism do sprawy -->
                 <row>
-                  <entry>-\-\-\-\-\-</entry>
+                  <entry>------</entry>
                   <entry xpath="ID" >Parent</entry>
                   <entry xpath="A_STATUS"/>
                   <entry xpath="A_PROBLEM_DESC"/>
                   <entry xpath="L_APPOITMENT_USER"/>
                 </row>
-                <RelatedFeature xpath="PARENT_ID" xpath_value="../ID" typeName="p5_default_db:PROBLEMS">  <!-\- test sciagniecia powiazanych pism do sprawy -\->
+                <RelatedFeature xpath="PARENT_ID" xpath_value="../ID" typeName="p5_default_db:PROBLEMS">  <!-- test sciagniecia powiazanych pism do sprawy -->
                   <row>
-                    <entry>-\-\-\-\-\-\-\-\-</entry>
+                    <entry>---------</entry>
                     <entry xpath="ID" >Parent</entry>
                     <entry xpath="A_STATUS"/>
                     <entry xpath="A_PROBLEM_DESC"/>
                     <entry xpath="L_APPOITMENT_USER"/>
                   </row>
                 </RelatedFeature>
-              </RelatedFeature>-->
+              </RelatedFeature>
             </RelatedFeature>
           </tbody>
         </tgroup>

SE/schema/default_db_xml_cache.public/build_recurse_ant.xsl

@@ -1082,7 +1082,8 @@
                                 </xsl:choose>
                                 
                                
-                                <echo>#1084 exec curl for $typeNameRealResource=<xsl:value-of select="$typeNameRealResource"/> and $xpath_dita=<xsl:value-of select="$xpath_dita"/>; and $xpath_value_dita=<xsl:value-of select="$xpath_value_dita"/>; </echo>
+                                <echo>#1084 exec curl for $typeNameRealResource=<xsl:value-of select="$typeNameRealResource"/> and $xpath_dita=<xsl:value-of select="$xpath_dita"/>; $xpath_value=<xsl:value-of select="$xpath_value"/>; and $xpath_value_dita=<xsl:value-of select="$xpath_value_dita"/>;
+                                    $url=<xsl:value-of select="$url"/>;</echo>
                                 
                                 <!--<tempfile property="out_task.dita" deleteonexit="no"  destdir="temp"/>-->
                                     <!--<tempfile property="wfs_output" deleteonexit="no"  destdir="temp"  suffix=".xml" />-->

SE/schema/default_db_xml_cache.public/builds_to_ant.xsl

@@ -81,8 +81,8 @@
                                     <xsl:attribute name="classname" select="'org.apache.tools.ant.Main'"/>
                                     <!--<xsl:attribute name="dir" select="'${basedir}'"/>-->
                                     <!--<xsl:attribute name="fork" select="'true'"/>-->
-                                    <xsl:attribute name="clonevm" select="'true'"/>
-                                    <xsl:attribute name="failonerror" select="'true'"/>
+                                    <xsl:attribute name="clonevm" select="'false'"/>
+                                    <!--<xsl:attribute name="failonerror" select="'true'"/>-->
                                     <!--<xsl:attribute name="append" select="'false'"/>-->
                                     <xsl:attribute name="resultproperty" select="concat(.,'_resprop')"/>
                                     <xsl:attribute name="output" select="concat(.,'_out.log')"/>