a.binder 5 年之前
父節點
當前提交
1dd225b210

+ 135 - 8
SE/schema/WPS_Functions/default_db/recurse_ant/build_recurse_ant.xml

@@ -290,8 +290,20 @@
             <available file="${user.dir}/${main_build_recurse_ant.dita.ditamap}"/>
         </condition>
         
+        <condition property="main_build_recurse_ant.dita.ditamap__x3A__flag" value="${main_build_recurse_ant.dita.ditamap}">
+            <available file="${user.dir}/${main_build_recurse_ant.dita.ditamap}"/>
+        </condition>
+        <condition property="main_build_recurse_ant.dita.ditamap__x3A__unavailable__x3A__flag" value="${main_build_recurse_ant.dita.ditamap}">
+            <not><available file="${user.dir}/${main_build_recurse_ant.dita.ditamap}"/></not>
+        </condition>
+        
         <property name="main_build_recurse_ant.dita" value="${main_build_recurse_ant.dita_sed}.dita"/>
-        <echo> Ustawiam $main_build_recurse_ant.dita na ${main_build_recurse_ant.dita} ; $uuid = ${uuid} ; $main_build_recurse_ant.dita.ditamap = ${main_build_recurse_ant.dita.ditamap} </echo>
+        <echo>#294 Ustawiam $main_build_recurse_ant.dita na ${main_build_recurse_ant.dita} ; $uuid = ${uuid} ; $main_build_recurse_ant.dita.ditamap = ${main_build_recurse_ant.dita.ditamap} 
+            BECAUSE OF $main_build_recurse_ant.dita.ditamap__x3A__flag = ${main_build_recurse_ant.dita.ditamap__x3A__flag}
+            will parse $recurse_ant.basedir.out.uuid.out_task.dita.final_with_RelatedFeatureLoop.xml ${recurse_ant.basedir.out.uuid.out_task.dita.final_with_RelatedFeatureLoop.xml}
+            todo set $out_task.dita.final - now ${out_task.dita.final}
+            
+        </echo>
         
         <property name="main_build_recurse_ant.dita_with_id" value="${temp}/${main_build_recurse_ant.dita}.with_id.xml"  />
         <property name="main_build_recurse_ant.dita_with_id.xsl" value="${default_db_xml_cache.public}/main_build_recurse_ant.dita_with_id.xsl"  />
@@ -465,6 +477,7 @@
             $out_task.dita.final.noext = ${out_task.dita.final.noext}
             $out_task.dita.final_with_RelatedFeatureLoop = ${out_task.dita.final_with_RelatedFeatureLoop}
             $CRM_PROCES_tree_basedir.temp = ${CRM_PROCES_tree_basedir.temp}
+            $temp = ${temp}
         </echo>
         <!-- 
                  [echo] #427 $out_task.dita.final = /Users/a.binder/Documents/se/SE/schema/ant-url_action/default_db.in7_dziennik_koresp/pismo/temp/Proj6782__/Proj6782___out_task_dita_final.dita , 
@@ -478,6 +491,7 @@
         <echoxml file="${empty.xml}">
             <empty>empty</empty>
         </echoxml>
+        <property name="xml_recursed_from_tr_map_with_RelatedFeatureLoop_tree_to_dita_wfs_recursed.debug" value="0"/>
         
         <xslt basedir="${default_db:recurse_ant_basedir}" style="${get_wfs_recurse_xsl.xsl}" in="${empty.xml}"  destdir="./" out="${out_task.dita.final.out}" > <!-- out_task.dita.final -->
             <factory name="net.sf.saxon.TransformerFactoryImpl">    
@@ -499,7 +513,7 @@
             <param name="php_session_id_ok.string" expression="${php_session_id}"/>
             <!--<param name="basedir" expression="${basedir}"/>-->
             <param name="temp" expression="${temp}"/>
-            <param name="debug" expression="0"/>
+            <param name="debug" expression="${xml_recursed_from_tr_map_with_RelatedFeatureLoop_tree_to_dita_wfs_recursed.debug}"/>
             <param name="simpleSchema_dir" expression="${simpleSchema_dir}"/>
             <!--<param name="simpleSchema.xml" expression="${basedir}/${main_build_recurse_ant.dita}"/>-->
             <!--<param name="noRelatedFeatureRoot" expression="1"/>-->
@@ -1084,12 +1098,19 @@
     <target name="input">
         <property name="out_task.dita"  value="${temp}/${uuid}.out_task_dita" />
         <property name="out_task.dita.final.out"   value="${temp}/${uuid}_out_task_dita_final.dita.out" />
-        <property name="out_task.dita.final"   value="${recurse_ant.basedir.out}/${uuid}.out_task.dita.final_with_RelatedFeatureLoop.xml" /><!-- value="${temp}/${uuid}_out_task_dita_final.dita" -->
+        <property name="out_task.dita.final"   value="${temp}/${uuid}.out_task.dita.final_with_RelatedFeatureLoop.xml" /><!-- recurse_ant.basedir.out --><!-- value="${temp}/${uuid}_out_task_dita_final.dita" -->
         <property name="out_task.dita.final.noext"   value="${uuid}.out_task.dita.final_with_RelatedFeatureLoop" /><!-- ${uuid}_out_task_dita_final -->
         <property name="out_task.dita.final.html"   value="${uuid}.out_task.dita.final_with_RelatedFeatureLoop.html" /> <!-- ${uuid}_out_task_dita_final.html --><!-- dita -f html5 wywala kropki -->
         <property name="out_task.dita.final_with_RelatedFeatureLoop_no_path"   value="${uuid}.out_task.dita.final_with_RelatedFeatureLoop" />
         <property name="out_task.dita.final_with_RelatedFeatureLoop"   value="${default_db:recurse_ant_basedir}/out/${uuid}.out_task.dita.final_with_RelatedFeatureLoop" />
-        
+        <echo>
+            #1095 input set 
+            $out_task.dita = ${out_task.dita}
+            $out_task.dita.final.out = ${out_task.dita.final.out}
+            $out_task.dita.final = ${out_task.dita.final}
+            $out_task.dita.final_with_RelatedFeatureLoop = ${out_task.dita.final_with_RelatedFeatureLoop}
+            $out_task.dita.final_with_RelatedFeatureLoop_no_path = ${out_task.dita.final_with_RelatedFeatureLoop_no_path}
+        </echo>
     </target>
     
     <target name="build_recursed_xsl" depends="input,install_folders,uuid_check,typeName_check,xpath_check,xpath_value_check,set_dita"  description="retrieve data styled Related and build object from api using just XSL calls - needed username and password">
@@ -1097,7 +1118,9 @@
             <empty>empty</empty>
         </echoxml>
         <property name="debug.dita-ot.dtd.catalog" refid="dita-ot.dtd.catalog"/>
-        <echo>#1075 $out_task.dita.final = ${out_task.dita.final}</echo>
+        <echo>#1075 $out_task.dita.final = ${out_task.dita.final}
+                    $out_task.dita.final.out ${out_task.dita.final.out}
+        </echo>
         <xslt basedir="${default_db:recurse_ant_basedir}" style="${get_wfs_recurse_xsl.xsl}" in="${empty.xml}"  destdir="./" out="${out_task.dita.final.out}" failonerror="true" force="true" > <!-- out_task.dita.final -->
             <factory name="net.sf.saxon.TransformerFactoryImpl">    
                 <!--<attribute name="http://saxon.sf.net/feature/xinclude-aware" value="true"/>-->
@@ -1198,7 +1221,100 @@
         <record action="stop" name="confirmAntfile.isset.log"/>
     </target>
     
-    <target name="buildpdf_recursed_xsl_mail" unless="confirmAntfile.isset" depends="input,build_recursed_xsl,confirmAntfile,php_session_id_cond"  description="URL_TASK buildpdf_recursed_xsl_mail szybki druk z wysylka mailem "  ><!-- depends="install_folders,uuid_check,typeName_check,xpath_check,xpath_value_check,set_dita,confirmAntfile,php_session_id_cond" -->
+    
+    
+    <target name="main_build_recurse_ant.dita.ditamap" if="main_build_recurse_ant.dita.ditamap__x3A__flag">
+        <property name="recurse_ant.basedir.out.uuid.out_task.dita.final_with_RelatedFeatureLoop.xml" value="${out_task.dita.final}"/>
+        <property name="CRM_PROCES_tree_basedir.temp.uuid.uuid.ditamap" value="${CRM_PROCES_tree_basedir.temp}/${uuid}/${uuid}.ditamap"/>
+        
+        <echo>
+            #1223 - override by $out_task.dita.final
+            Task main_build_recurse_ant.dita.ditamap will go due $main_build_recurse_ant.dita.ditamap__x3A__flag = ${main_build_recurse_ant.dita.ditamap__x3A__flag}
+            and now overrided $recurse_ant.basedir.out.uuid.out_task.dita.final_with_RelatedFeatureLoop.xml = ${recurse_ant.basedir.out.uuid.out_task.dita.final_with_RelatedFeatureLoop.xml}
+            and override $CRM_PROCES_tree_basedir.temp.uuid.uuid.ditamap to ${CRM_PROCES_tree_basedir.temp.uuid.uuid.ditamap}
+            calling default_db:PROCES_INIT:tree:dita
+        </echo>
+        <antcall target="CRM_PROCES_tree.default_db:PROCES_INIT:tree:dita"></antcall>
+    </target>
+    
+    
+    <target name="buildpdf_recursed_xsl_mail.ditamap" unless="confirmAntfile.isset" if="main_build_recurse_ant.dita.ditamap__x3A__flag" depends="input,build_recursed_xsl,main_build_recurse_ant.dita.ditamap,confirmAntfile,php_session_id_cond"  description="URL_TASK buildpdf_recursed_xsl_mail szybki druk z wysylka mailem "  ><!-- depends="install_folders,uuid_check,typeName_check,xpath_check,xpath_value_check,set_dita,confirmAntfile,php_session_id_cond" -->
+        <!--<description>URL_TASK buildpdf_recursed_xsl_mail szybki druk z wysylka mailem x ${primaryKey}</description>-->
+        <record name="buildpdf_recursed_xsl_mail.log" action="start" />
+        <!--<fail unless="php_session_id_tested">#1135 no php_session_id_tested</fail>-->
+        <echo>#836-B $php_session_id_tested = ${php_session_id_tested} ; $basedir = ${basedir} ; 
+            $dita.dir = ${dita.dir}
+            $confirmAntfile.isset = ${confirmAntfile.isset} will try to in $main_build_recurse_ant.dita_with_id ${main_build_recurse_ant.dita_with_id} , $empty.xml = ${empty.xml}; $uuid = ${uuid} ; $uuid_tested = ${uuid_tested}</echo>
+        <!--<echoxml file="${empty.xml}">
+            <empty>empty</empty>
+        </echoxml>-->
+        <!--<property name="debug.dita-ot.dtd.catalog" refid="dita-ot.dtd.catalog"/>-->
+        <echo>#1150-B php_session_id_ok.string = ${php_session_id_ok.string}; 
+            $dita-ot.toolkit = ${dita-ot.toolkit}
+            $debug.dita-ot.dtd.catalog = ${debug.dita-ot.dtd.catalog}
+            $temp = ${temp}
+            
+            wil not run DITA INPUT FILE $out_task.dita.final = ${out_task.dita.final}
+            OVERRIDED BY $CRM_PROCES_tree_basedir.temp.uuid.uuid.ditamap ==
+            == ${CRM_PROCES_tree_basedir.temp.uuid.uuid.ditamap}
+            OUTPUT $user.dir/$out == ${user.dir}/${out}
+            
+        </echo>
+        
+        
+        
+      
+        
+        <exec executable="${dita.dir.bin.dita}" dir="." failifexecutionfails="true">
+            <arg value="-i"/>
+            <arg value="${CRM_PROCES_tree_basedir.temp.uuid.uuid.ditamap}" />
+            <!-- <arg value="-t" />
+            <arg value="temp" />-->
+            <arg value="-f" />
+            <arg value="pdf"/>
+            <arg value="-o"/>
+            <arg value="${user.dir}/${out}"/>
+        </exec>
+        <exec  executable="bash" dir="." outputproperty="out_task_file">
+            <arg value="-c"/>
+            <arg value="echo ${out_task.dita.final} |sed 's/^.*\///'"/>
+        </exec>
+        
+        
+        
+        <echo message="OUTPUT__START"/>
+        <!--<echo>
+            &lt;br&gt;Wygenerowano wyjsciowy plik XML - sciagnij go &lt;a href=&quot;${webRootUrl}/${out_task.dita.final_with_RelatedFeatureLoop_no_path}.xml&quot; target=&quot;_blank&quot;&gt; &quot;${webRootUrl}/${out_task.dita.final_with_RelatedFeatureLoop_no_path}.xml&lt;/a&gt;&lt;/br&gt; 
+        </echo>-->
+        <echo>
+            &lt;br&gt;Wygenerowano druk pdf - sciagnij go &lt;a href=&quot;${webRootUrl}/${out}/${out_task.dita.final.noext}.pdf&quot; target=&quot;_blank&quot;&gt; &quot;${webRootUrl}/${out}/${out_task.dita.final.noext}.pdf&lt;/a&gt;&lt;/br&gt; 
+        </echo>
+        <echo>
+            &lt;br&gt;Wyslanie linka mailem : &lt;a href=&quot;mailto:?subject=Wiadomosc nr ${xpath_value}&amp;body=link do sprawy:  ${webRootUrl}/${out}/${out_task.dita.final.noext}.pdf&quot;&gt;Wyslanie linka mailem&lt;/a&gt;   &lt;/br&gt; 
+        </echo>
+        <!--<echo message="OUTPUT__END"/>-->
+        <antcall target="send_email.send_email_from_xml_parsed">
+            <param name="send_email.xml_to_parse.xml" value="${out_task.dita.final}"/>
+            <param name="antFunctionUrl" value="${antFunctionUrl}"/>
+            <param name="confirmAntfile" value="${confirmAntfile}"/>
+            <param name="confirmAntfileTarget" value="${confirmAntfileTarget}"/>
+            <param name="out.pdf" value="${user.dir}/${out}/${out_task.dita.final.noext}.pdf"/>
+        </antcall>
+        <!--<echo message="OUTPUT__START"/>-->
+        <echo>
+            
+            
+            &lt;br/&gt; 
+        </echo>
+        <!--<echo>
+            &lt;br&gt;# Wygenerowano wyjsciowy plik PDF - sciagnij go &lt;a href=&quot;${webRootUrl}/${out}/${uuid}.pdf&quot; target=&quot;_blank&quot;&gt; &quot;${webRootUrl}/${out}/${uuid}.pdf&lt;/a&gt;&lt;/br&gt; 
+        </echo>-->
+        <echo message="OUTPUT__END"/>
+        <record name="buildpdf_recursed_xsl_mail.log" action="stop" />
+    </target>
+    
+    
+    <target name="buildpdf_recursed_xsl_mail" unless="confirmAntfile.isset" if="main_build_recurse_ant.dita.ditamap__x3A__unavailable__x3A__flag" depends="input,build_recursed_xsl,main_build_recurse_ant.dita.ditamap,confirmAntfile,php_session_id_cond,buildpdf_recursed_xsl_mail.ditamap"  description="URL_TASK buildpdf_recursed_xsl_mail szybki druk z wysylka mailem "  ><!-- depends="install_folders,uuid_check,typeName_check,xpath_check,xpath_value_check,set_dita,confirmAntfile,php_session_id_cond" -->
         <!--<description>URL_TASK buildpdf_recursed_xsl_mail szybki druk z wysylka mailem x ${primaryKey}</description>-->
         <record name="buildpdf_recursed_xsl_mail.log" action="start" />
         <!--<fail unless="php_session_id_tested">#1135 no php_session_id_tested</fail>-->
@@ -1211,7 +1327,13 @@
         <!--<property name="debug.dita-ot.dtd.catalog" refid="dita-ot.dtd.catalog"/>-->
         <echo>#1150 php_session_id_ok.string = ${php_session_id_ok.string}; 
             $dita-ot.toolkit = ${dita-ot.toolkit}
-            $debug.dita-ot.dtd.catalog = ${debug.dita-ot.dtd.catalog}</echo>
+            $debug.dita-ot.dtd.catalog = ${debug.dita-ot.dtd.catalog}
+            $temp = ${temp}
+            
+            wil run DITA INPUT FILE $out_task.dita.final = ${out_task.dita.final}
+                         OUTPUT $user.dir/$out == ${user.dir}/${out}
+            
+        </echo>
         
         
         
@@ -1249,7 +1371,12 @@
             <arg value="echo ${out_task.dita.final} |sed 's/^.*\///'"/>
         </exec>
         
-        <echo>#1217 $user.dir = ${user.dir} ; $dita.dir.bin.dita = ${dita.dir.bin.dita}</echo>
+        <echo>#1217 dita cmd run: 
+            $dita.dir.bin.dita = ${dita.dir.bin.dita}
+            $out_task.dita.final = ${out_task.dita.final}
+            -o $user.dir/$out -o ${user.dir}/${out}
+        </echo>
+        
         <echo message="OUTPUT__START"/>
         <!--<echo>
             &lt;br&gt;Wygenerowano wyjsciowy plik XML - sciagnij go &lt;a href=&quot;${webRootUrl}/${out_task.dita.final_with_RelatedFeatureLoop_no_path}.xml&quot; target=&quot;_blank&quot;&gt; &quot;${webRootUrl}/${out_task.dita.final_with_RelatedFeatureLoop_no_path}.xml&lt;/a&gt;&lt;/br&gt; 

+ 2 - 0
SE/schema/WPS_Functions/get_wfs_recurse_xsl/build_get_wfs_recurse_xsl.xml

@@ -57,6 +57,8 @@
     
     
     
+    
+    
     <target name="xml_recursed_from_tr_map" depends="build_get_wfs_recurse_xsl.create_tempdir"> <!-- R read_build_properties, -->
         <property name="uuid.local" value="${uuid}" />
         <property name="typeName.local" value="${typeName}"/>

+ 10 - 0
SE/schema/WPS_Functions/get_wfs_recurse_xsl/get_wfs_recurse_xsl.xsl

@@ -684,9 +684,19 @@
             </xsl:if>
         <xsl:variable name="get_wfs_recurse_xsl:doctype-public" select="get_wfs_recurse_xsl:doctype-public($get_wfs_recurse_xsl:GetsimpleSchema)"/>
         <xsl:variable name="get_wfs_recurse_xsl:doctype-system" select="get_wfs_recurse_xsl:doctype-system($get_wfs_recurse_xsl:GetsimpleSchema)"/>
+        <xsl:if test="number($debug) &gt; 3">
+            <xsl:message>#688 $get_wfs_recurse_xsl:doctype-public == <xsl:value-of select="$get_wfs_recurse_xsl:doctype-public"/>
+                              $get_wfs_recurse_xsl:doctype-system == <xsl:value-of select="$get_wfs_recurse_xsl:doctype-system"/>
+            </xsl:message>
+        </xsl:if>
+         
          
          <xsl:choose>
              <xsl:when test="string-length($get_wfs_recurse_xsl:doctype-public) &gt;0 and string-length($get_wfs_recurse_xsl:doctype-system)">
+                 <xsl:if test="number($debug) &gt; 3">
+                     <xsl:message>#697 Will RESULT OUTPUT TO [ $out_task.dita.final == <xsl:value-of select="$out_task.dita.final"/> ]
+                     </xsl:message>
+                 </xsl:if>
                  <xsl:result-document  href="{$out_task.dita.final}" doctype-public="{$get_wfs_recurse_xsl:doctype-public}" doctype-system="{$get_wfs_recurse_xsl:doctype-system}" >
                      <xsl:choose>
                          <xsl:when test=" string-length($api_recurse) &gt; 0">

+ 46 - 8
SE/schema/WPS_Functions/mapserver_gml_to_png/build_mapserver_gml_to_png.xml

@@ -13,7 +13,7 @@
     
     <!-- eof modules WPS_Functions  -->
     
-    
+    <!-- shp2img -m /tmp/test_debugAulb/map.map  -o test.png -all_debug 5 -->
     <!-- local shared module individual properties should contain ${project.name} basedir ant its .temp -->
     <property name="mapserver_gml_to_png" location="${basedir}/WPS_Functions/mapserver_gml_to_png/build_mapserver_gml_to_png.xml"/>
     <property name="mapserver_gml_to_png_basedir" location="${basedir}/WPS_Functions/mapserver_gml_to_png"  />                         
@@ -24,6 +24,10 @@
     
     <!-- local individual module properties -->
     <property name="genpng2.sh" location="${mapserver_gml_to_png_basedir}/map/genpng2.sh"/>
+    
+    <condition property="shp2img" value="/usr/local/bin/shp2img">
+        <available file="/usr/local/bin/shp2img"/>
+    </condition>
     <property name="shp2img" value="/opt/local/bin/shp2img"/>
     <!--<property name="PATH_ADD" value="/opt/local/bin:/usr/bin:/bin"/>-->
     
@@ -51,12 +55,17 @@
         <loadproperties srcfile="${WPS_Functions.properties}"/>
     </target>
     
+    <extension-point name="gml_to_image" depends="shp2img__x3A__validate,shp2img__x3A__validate__x3A__error,gml_to_image.generate,gml_to_image.move_to_dest,gml_to_image.generate__x3A__error"/>
     
-    <target name="gml_to_image" depends="mapserver_gml_to_png:create_tempdir" description="To convert gml2image">
-        <property name="srcfile" value="${srcfile}"/>
-        <property name="dstfile" value="${dstfile}"/>
-        <property name="fileindex" value="${fileprefix}"/> <!-- to uniq name -->
-        <property name="ditadir" value="${ditadir}"/>
+    <target name="gml_to_image.generate" depends="mapserver_gml_to_png:create_tempdir" if="shp2img__x3A__validate__x3A__validated__flag" description="To convert gml2image">
+        <input addproperty="srcfile"  message="$srcfile"/>
+        <input addproperty="dstfile"  message="$dstfile"/>
+        <input addproperty="fileindex"  message="$fileindex"/>
+        <input addproperty="ditadir"  message="$ditadir"/>
+        
+        <!--<property name="dstfile" value="${dstfile}"/>
+        <property name="fileindex" value="${fileprefix}"/> <!-\- to uniq name -\->
+        <property name="ditadir" value="${ditadir}"/>-->
         <property name="images.xml" value="${mapserver_gml_to_png_basedir}/map/${fileindex}_images.xml"/> 
         <!-- contains info about images 
          <image x="1" y="1">
@@ -67,16 +76,30 @@
             <file>/Users/a.binder/Documents/xmlschema_procesy5/src-xmlschema/public_html/WPS_Functions/mapserver_gml_to_png/map/image-1-1.png</file>
         </image> -->
         <echo>
-            gml_to_image - i get properties: $srcfile ${srcfile} $dstfile ${dstfile} $fileindex ${fileindex}
+          #70  gml_to_image - i get properties: $srcfile = ${srcfile} ;  $dstfile= ${dstfile} ;  $fileindex= ${fileindex} ;
+          evaluated $images.xml = ${images.xml}
+          ${mapserver_gml_to_png:WMSurlAndLayer.Map} = $mapserver_gml_to_png:WMSurlAndLayer.Map
+          ${mapserver_gml_to_png:WMSurlAndLayer.Dzialki} = $mapserver_gml_to_png:WMSurlAndLayer.Dzialki
+          ${mapserver_gml_to_png:WMSurlAndLayer.MDCP} = $mapserver_gml_to_png:WMSurlAndLayer.MDCP
         </echo>
         <exec executable="${genpng2.sh}" dir="${mapserver_gml_to_png_basedir}/map">
             <arg line="-s 1000"/>
             <arg line="-g ${srcfile}"/>
             <arg line="-u ${fileindex}"/>
             <arg line="-w ${mapserver_gml_to_png:WMSurlAndLayer.Map}  ${mapserver_gml_to_png:WMSurlAndLayer.Dzialki}  ${mapserver_gml_to_png:WMSurlAndLayer.MDCP}"/> 
-            <env key="PATH" path="$PATH:${PATH_ADD}"/>
+            <env key="PATH" path="$PATH:${PATH_ADD}:/usr/local/bin"/>
         </exec>
         
+        <condition property="images.xml__generated__x3A__flag" value="generated ok #81">
+            <available file="${images.xml}"/>
+        </condition>
+        
+        <echo> #85 test if $images.xml__generated__x3A__flag == ${images.xml__generated__x3A__flag} </echo>
+        
+      
+    </target>
+    
+    <target name="gml_to_image.move_to_dest" if="images.xml__generated__x3A__flag">
         <move file="${images.xml}" tofile="${dstfile}"/>
         <mkdir dir="${ditadir}/${fileindex}"/>
         <move todir="${ditadir}/${fileindex}" >
@@ -84,8 +107,23 @@
                 <include name="${fileindex}_image-*"/>
             </fileset>
         </move>
+        <echo>#103 OK GENERATED</echo>
+    </target>
+    
+    <target name="gml_to_image.generate__x3A__error" unless="images.xml__generated__x3A__flag">
+        <echo>#102 ERROR NOT GENERATED  ${images.xml}  ${images.xml__generated__x3A__flag}</echo>
     </target>
     
     
+    <target name="shp2img__x3A__validate">
+        <condition property="shp2img__x3A__validate__x3A__validated__flag">
+            <available file="${shp2img}"/>
+        </condition>
+        <echo>$shp2img__x3A__validate = ${shp2img__x3A__validate}</echo>
+    </target>
+    
+    <target name="shp2img__x3A__validate__x3A__error" unless="shp2img__x3A__validate__x3A__validated__flag">
+        <echo level="error">#119 ERROR NOT FOUND $shp2img ${shp2img}</echo>
+    </target>
     
 </project>

+ 4 - 3
SE/schema/WPS_Functions/mapserver_gml_to_png/map/genpng2.sh

@@ -120,8 +120,9 @@ fi
 IMAGE_FILE="${PWD}/${UUID}_image" # nazwa plikow obrazow wraz ze sciezka - sam prefix (zostana dodane oznaczenia wspolrzednych kafelkow oraz dodane rozszerzenie)
 XML_FILE="${PWD}/${UUID}_images.xml" # nazwa wynikowego pliku XML wraz ze sciezka
 FONT_DIR="${PWD}/fonts"
-
+TMPTIME=1000
 TMP=`mktemp -d`
+#TMP=`mktemp -d /tmp/test_debugXXXX`
 SHAPEPATH="${TMP}/2177"
 
 #size=`echo "${SIZE}/${DPI}*2.54*${SCALE}/100" | bc -l`
@@ -213,14 +214,14 @@ for FILE in ${SHAPEPATH}/*.shp; do
 done
 
 cat ${MAP_SCHEMA_TAIL} >> ${MAP}
+cat ${MAP} > /tmp/test.map
 
 echo '<?xml version="1.0" encoding="UTF-8"?>' > ${XML_FILE}
 echo "<images uuid=\"${UUID}\">" >> ${XML_FILE}
 for y in `seq 1 ${ly}`; do
 	for x in `seq 1 ${lx}`; do
 		jobs=`jobs -p | wc -l`
-		while [ ${jobs} -ge ${PROCESSES} ]; do
-			sleep 1
+		while [ ${jobs} -ge ${PROCESSES} ]; do			sleep 1
 			jobs=`jobs -p | wc -l`
 		done
 		printf "Generating ${x}x${y} "

+ 4 - 3
SE/schema/WPS_Functions/mapserver_gml_to_png/map/map_schema/page.map.inc

@@ -1,8 +1,9 @@
   LAYER
     NAME "page"
     STATUS ON
-    TYPE ANNOTATION
-    TRANSFORM ul
+    #TYPE ANNOTATION
+    TYPE truetype
+     TRANSFORM ul
     FEATURE
       POINTS
         10 10
@@ -12,7 +13,7 @@
     CLASS
       LABEL
         FONT "arial"
-        TYPE TRUETYPE
+       TYPE TRUETYPE
         SIZE 24
         COLOR "#000000"
         FORCE TRUE

+ 2 - 1
SE/schema/WPS_Functions/mapserver_gml_to_png/map/map_schema/tail.map.inc

@@ -1,7 +1,8 @@
   LAYER
     NAME "copyright"
     STATUS ON
-    TYPE ANNOTATION
+    #TYPE ANNOTATION
+    TYPE truetype
     TRANSFORM lr
     FEATURE
       POINTS

+ 1 - 1
SE/schema/WPS_Functions/mapserver_gml_to_png/map/przywidz-test.map

@@ -98,7 +98,7 @@ MAP
   LAYER
     NAME "copyright"
     STATUS ON
-    TYPE ANNOTATION
+    TYPE LABEL
     TRANSFORM lr
     FEATURE
       POINTS

+ 3 - 1
SE/schema/WPS_Functions/mapserver_gml_to_png/map/wfs2048.map

@@ -70,7 +70,9 @@ MAP
   LAYER
     NAME "copyright"
     STATUS ON
-    TYPE ANNOTATION
+    #TYPE ANNOTATION
+    TYPE truetype
+    TYPE LABEL
     TRANSFORM lr
     FEATURE
       POINTS

+ 13 - 0
SE/schema/ant-url_action/default_db.in7_dziennik_koresp/pismo/GRAFIK_PRACY_view.ditamap

@@ -3,6 +3,7 @@
   typeName="p5_default_db:GRAFIK_PRACY_view" typeNameRealResource="p5_default_db:GRAFIK_PRACY_view"
   xmlns:ogc="http://www.opengis.net/ogc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
   xmlns:wfs="http://www.opengis.net/wfs"
+  xmlns:system_cache__dita__x3A__svg="http://biuro.biall-net.pl/WPS_Functions/system_cache__dita__x3A__p5gnuplot/system_cache__dita__x3A__svg.xsd"
   xmlns:get_wfs_recurse_xsl.RelatedFeature="http://biuro.biall-net.pl/xmlschema_procesy5/WPS_Functions/get_wfs_recurse_xsl/get_wfs_recurse_xsl.RelatedFeature.xsd"
   xmlns:get_wfs_recurse_xsl.RelatedFeatureRoot="http://biuro.biall-net.pl/xmlschema_procesy5/WPS_Functions/get_wfs_recurse_xsl/get_wfs_recurse_xsl.RelatedFeatureRoot.xsd"
   doctype-public="-//OASIS//DTD DITA Map//EN" doctype-system="map.dtd">
@@ -49,6 +50,18 @@
           <foreign>
             <!--<ph xpath="A_STATUS_INFO"  CONTENT.TEXT="1"/>-->
             <data xpath="A_STATUS_INFO" datatype="CONTENT.TEXT"/>
+            <svg-container
+              system_cache__dita__x3A__svg:data.y1.name="system_cache__dita__x3A__svg:GRAFIK_PRACY_view.raport.data.y1.name"
+              system_cache__dita__x3A__svg:data.y1.value="system_cache__dita__x3A__svg:GRAFIK_PRACY_view.raport.data.y1.value"
+              system_cache__dita__x3A__svg:data.y1.label="system_cache__dita__x3A__svg:GRAFIK_PRACY_view.data.y1.label"
+              system_cache__dita__x3A__svg:data.y2.name="system_cache__dita__x3A__svg:GRAFIK_PRACY_view.data.y2.name"
+              system_cache__dita__x3A__svg:data.y2.value="system_cache__dita__x3A__svg:GRAFIK_PRACY_view.data.y2.value"
+              system_cache__dita__x3A__svg:data.x.label="system_cache__dita__x3A__svg:GRAFIK_PRACY_view.raport.data.x.label.DATE"
+              system_cache__dita__x3A__svg:data.x.name="system_cache__dita__x3A__svg:GRAFIK_PRACY_view.raport.data.x.name"
+              system_cache__dita__x3A__svg:data.x.name.value="GRAFIK_PRACY_view.raport"
+              system_cache__dita__x3A__svg:data.x.value="system_cache__dita__x3A__svg:GRAFIK_PRACY_view.data.x.value"
+              >
+            </svg-container>
           </foreign>
           <table frame="all" id="table_rgg_vfh_bjb">
             <title>Raport dniowy-godzinowy</title>

+ 170 - 6
SE/schema/ant-url_action/default_db.in7_dziennik_koresp/pismo/IN7_MK_BAZA_DYSTRYBUCJI.dita

@@ -2,6 +2,9 @@
 <RelatedFeature xpath="ID"  typeName="p5_default_db:IN7_MK_BAZA_DYSTRYBUCJI" typeNameRealResource="p5_default_db:IN7_MK_BAZA_DYSTRYBUCJI"
   xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" 
   xmlns:ogc="http://www.opengis.net/ogc"
+  xmlns:wfs="http://www.opengis.net/wfs"
+  xmlns:get_wfs_recurse_xsl.RelatedFeature="http://biuro.biall-net.pl/xmlschema_procesy5/WPS_Functions/get_wfs_recurse_xsl/get_wfs_recurse_xsl.RelatedFeature.xsd"
+  xmlns:get_wfs_recurse_xsl.RelatedFeatureRoot="http://biuro.biall-net.pl/xmlschema_procesy5/WPS_Functions/get_wfs_recurse_xsl/get_wfs_recurse_xsl.RelatedFeatureRoot.xsd"
   xmlns:system_cache__appinfo="http://biuro.biall-net.pl/xmlschema_procesy5/default_db_xml_cache/appinfo.xsd"
   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 -->
@@ -92,8 +95,113 @@
             <p>Treść: </p>
             <bodydiv xpath="K_ZAWARTOSC_HTML" format="enter_to_ph"/>
           </RelatedFeature>
-        
+      <RelatedFeature wfs:MAXFEATURES="1" xpath="ID_PROJECT" xpath_value="../ID" typeName="p5_default_db:BUILDINGS" typeNameRealResource="p5_default_db:BUILDINGS">
+        <foreign>
+          <strow conref="#IN7_DZIENNIK_KORESP/DOTYCZY_BUDYNKOW_EMPTY1" conaction="pushreplace" system_cache__appinfo:id__x3A__append__unique="../.">
+            <stentry>Dotyczy budynków (1)</stentry>
+            
+            <stentry>
+              <RelatedFeature  xpath="ID_PROJECT" xpath_value="ID_PROJECT" typeName="p5_default_db:BUILDINGS" typeNameRealResource="p5_default_db:BUILDINGS">
+                
+                <p> <ph xpath="S_ADDRESS_POST_CODE"/> <ph xpath="S_ADDRESS_CITY"/> <ph xpath="S_ADDRESS_STREET_FULL"/> <ph xpath="S_ADDRESS_HOUSE"/>
+                  
+                  <!--<RelatedFeature  xpath="T_TELBOX_BUILDING_IN" xpath_value="../S_ADDRESS_STREET" typeName="p5_default_db:USERS2_MARKETING" typeNameRealResource="p5_default_db:USERS2_MARKETING">
+                                <ph  xpath="S_ADDRESS_STREET"/> 
+                              </RelatedFeature>-->
+                  
+                </p> 
+              </RelatedFeature>
+            </stentry>
+          </strow>
+        </foreign>
+      </RelatedFeature>
+        <simpletable>
+            
+            <strow id="DOTYCZY_BUDYNKOW_EMPTY1" system_cache__appinfo:id__x3A__append__unique=".">
+              <stentry>Dotyczy budynków (1)</stentry>
+              
+              <stentry>
+                <sub>(Nie powiązano)</sub>
+              </stentry>
+            </strow>
+        </simpletable>
       
+      <!---->
+      <simpletable>
+        <RelatedFeature wfs:MAXFEATURES="1" xpath="ID_PROJECT" xpath_value="../ID" typeName="p5_default_db:Rozdzielcza_Transmisje" typeNameRealResource="p5_default_db:Rozdzielcza_Transmisje">
+          
+          <strow conref="#IN7_DZIENNIK_KORESP/Rozdzielcza_Transmisje_EMPTY" conaction="pushreplace" system_cache__appinfo:id__x3A__append__unique="../.">
+            <stentry>Dotyczy transmisji (2)</stentry>
+            
+            <stentry>
+              <RelatedFeature  xpath="ID_PROJECT" xpath_value="ID_PROJECT" typeName="p5_default_db:Rozdzielcza_Transmisje" typeNameRealResource="p5_default_db:Rozdzielcza_Transmisje">
+                
+                <p> <ph xpath="M_DIST_TYPE"/> <ph xpath="A_STATUS"/> <ph xpath="A_STATUS_INFO"/> <ph xpath="OPIS_WARUNKOW"/> <ph xpath="TYP_TRANSMISJI"/>
+                  <ph xpath="TYP_TRANSMISJI"/>
+                  <ph xpath="TYP_TRANSMIJI_1J_DBM"/>
+                  <ph xpath="ID"/>
+                  <ph xpath="L_APPOITMENT_DATE"/>
+                  <ph xpath="L_APPOITMENT_USER"/>
+                  <ph xpath="L_APPOITMENT_INFO"/>
+                  
+                  <ph xpath="ID_BILLING_USERS"/>
+                  
+                </p>
+                
+                <RelatedFeature xpath="ID" xpath_value="../ID_BILLING_USERS" typeName="p5_default_db:COMPANIES" typeNameRealResource="p5_default_db:COMPANIES">
+                  
+                    <p >
+                      <ph> Dostawca: </ph>
+                      <ph xpath="P_NAME"/> <ph> </ph>
+                      <ph xpath="P_NAME_SECOND"/> <ph> </ph>
+                      
+                      <div>
+                        
+                        <p><ph xpath="P_ADDRESS_POST_CODE"/><ph> </ph><ph xpath="P_ADDRESS_CITY"/><ph> ul.</ph><ph xpath="P_ADDRESS_STREET"/><ph> </ph><ph xpath="P_ADDRESS_HOUSE"/><ph xpath="P_ADDRESS_HOME" xpath.match.regex="[0-9a-zA-Z]">/</ph><ph xpath="P_ADDRESS_HOME"/></p>
+                        <p><ph xpath.match.regex="[0-9]" xpath="P_NIP">nip: </ph> <ph xpath="P_NIP"/><ph> </ph> <ph xpath.match.regex="[0-9]" xpath="P_KRS_NUMER">krs:</ph> <ph xpath="P_KRS_NUMER"/><ph xpath="P_PESEL"  xpath.match.regex="[0-9]" > pesel:</ph><ph xpath="P_PESEL"/><ph> </ph></p>
+                        <p id="P_ADRESS_KORESP_1282" 
+                          
+                          xpath.not.match.regex.text=" "
+                          xpath.match.regex="[a-zA-Z]" 
+                          xpath="P_ADRESS_KORESP_1282">Adres koresp. <ph xpath="P_ADRESS_KORESP_1282" /><!-- ^$ --><!-- ul. Al. Niepodległości 797/1, 81-810 Sopot -->
+                        </p>
+                        <!--<p xpath="P_PESEL" xpath.match.regex="(|\s+)" xpath.match.regex.conref="#IN7_DZIENNIK_KORESP/P_ADRESS_KORESP_1282" xpath.match.regex.conaction="pushreplace" xpath.match.regex.text="brak adresu"/>-->
+                        <p xpath.match.regex="[a-z]" xpath="user_mail_contact"><ph>email:</ph><ph xpath="user_mail_contact"/></p>
+                        <p xpath.match.regex="[0-9]" xpath="P_PHONE"><ph> tel:</ph><ph xpath="P_PHONE"/> </p>
+                        <p xpath.match.regex="[0-9]" xpath="nr_rach" xpath.match.regex.text=""><ph>nr r-ku:</ph><ph xpath="nr_rach"/></p>
+                      </div>
+                      
+                    </p>
+                    
+                  
+                </RelatedFeature>
+                
+                <p>
+                  
+                  <ph xpath="ID_KORESP_PROJEKT_WYK"/>
+                  
+                  <ph xpath="ID_KORESP_OFFER"/>
+                  <ph xpath="ID_KORESP_ZLECENIE"/>
+                  <ph xpath="ID_KORESP_PROTOK_ODB"/>
+                  <ph xpath="Dlugosc"/>
+                  
+                  <!--<RelatedFeature  xpath="T_TELBOX_BUILDING_IN" xpath_value="../S_ADDRESS_STREET" typeName="p5_default_db:USERS2_MARKETING" typeNameRealResource="p5_default_db:USERS2_MARKETING">
+                                <ph  xpath="S_ADDRESS_STREET"/> 
+                              </RelatedFeature>-->
+                  
+                </p> 
+              </RelatedFeature>
+            </stentry>
+          </strow>
+        </RelatedFeature>
+        <strow id="Rozdzielcza_Transmisje_EMPTY" system_cache__appinfo:id__x3A__append__unique=".">
+          <stentry>Dotyczy transmisji (1)</stentry>
+          
+          <stentry>
+            <sub>(Nie powiązano)</sub>
+          </stentry>
+        </strow>
+      </simpletable>
       
       
       <p><b>podsprawy</b></p>
@@ -105,7 +213,7 @@
             <colspec colname="c3" colnum="3"/>
             <colspec colname="c4" colnum="4"/>
             <colspec colname="c5" colnum="5"/>
-            <thead>
+            <!--<thead>
               <row>
                 <entry>poz</entry>
                 <entry>ID</entry>
@@ -113,7 +221,7 @@
                 <entry>s/n</entry>
                 <entry>koszt</entry>
               </row>
-            </thead>
+            </thead>-->
             <tbody>
               <row>
                 <entry/>
@@ -124,15 +232,66 @@
               </row>
               
               <RelatedFeature xpath="P_ID" xpath_value="../ID" typeName="p5_default_db:IN7_MK_BAZA_DYSTRYBUCJI" typeNameRealResource="p5_default_db:IN7_MK_BAZA_DYSTRYBUCJI">  <!-- test sciagniecia powiazanych pism do sprawy -->
-                <row>
-                  <entry>---podsprawy</entry>
+                <!--<row>
+                  <entry>-\-\-podsprawy</entry>
                   <entry xpath="ID" />
                   <entry xpath="M_DIST_DESC"/>
                   <entry xpath="M_DISTRIBUTOR"/>
                   <entry xpath="L_APPOITMENT_INFO"/>
+                </row>-->
+                
+                <row>
+                  <entry namest="c1" nameend="c5">
+                      <simpletable relcolwidth="1.0* 5*">
+                        <strow>
+                          <stentry>Sprawa numer</stentry>
+                          <stentry><ph xpath="P_ID"/><ph xpath.match.regex="[1-9]" xpath="P_ID">-</ph><ph xpath="ID"/></stentry>
+                        </strow>
+                        <strow xpath.match.regex="[a-zA-Z1-9]" xpath="M_DIST_DEALNUM">
+                          <stentry>Obcy nr sprawy</stentry>
+                          <stentry><ph xpath.match.regex="[a-zA-Z1-9]" xpath="M_DIST_DEALNUM"/></stentry>
+                        </strow>
+                        <strow>
+                          <stentry>Opis</stentry>
+                          <stentry><ph xpath="M_DIST_DESC"/></stentry>
+                        </strow>
+                        <RelatedFeature wfs:MAXFEATURES="1" xpath="ID_PROJECT" xpath_value="../ID" typeName="p5_default_db:BUILDINGS" typeNameRealResource="p5_default_db:BUILDINGS">
+                          <strow conref="#IN7_DZIENNIK_KORESP/DOTYCZY_BUDYNKOW_EMPTY" conaction="pushreplace" system_cache__appinfo:id__x3A__append__unique="../.">
+                            <stentry>Dotyczy budynków (2)</stentry>
+                            
+                            <stentry>
+                              <RelatedFeature  xpath="ID_PROJECT" xpath_value="ID_PROJECT" typeName="p5_default_db:BUILDINGS" typeNameRealResource="p5_default_db:BUILDINGS">
+                                
+                                <p> <ph xpath="S_ADDRESS_POST_CODE"/> <ph xpath="S_ADDRESS_CITY"/> <ph xpath="S_ADDRESS_STREET_FULL"/> <ph xpath="S_ADDRESS_HOUSE"/>
+                                  
+                                  <!--<RelatedFeature  xpath="T_TELBOX_BUILDING_IN" xpath_value="../S_ADDRESS_STREET" typeName="p5_default_db:USERS2_MARKETING" typeNameRealResource="p5_default_db:USERS2_MARKETING">
+                          <ph  xpath="S_ADDRESS_STREET"/> 
+                        </RelatedFeature>-->
+                                  
+                                </p> 
+                              </RelatedFeature>
+                            </stentry>
+                          </strow>
+                        </RelatedFeature>
+                        
+                        
+                        <strow id="DOTYCZY_BUDYNKOW_EMPTY" system_cache__appinfo:id__x3A__append__unique=".">
+                          <stentry>Dotyczy budynków (2)</stentry>
+                          
+                          <stentry>
+                            <sub>(Nie powiązano)</sub>
+                          </stentry>
+                        </strow>
+                        
+                        
+                      </simpletable>
+                  </entry>
                 </row>
                 
                 
+                
+                
+                
                 <RelatedFeature xpath="ID_PROJECT" xpath_value="../ID" typeName="p5_default_db:IN7_DZIENNIK_KORESP" typeNameRealResource="p5_default_db:IN7_DZIENNIK_KORESP"><!-- test sciagniecia powiazanych pism do sprawy -->
                   <row>
                     <entry namest="c1" nameend="c5">
@@ -149,7 +308,7 @@
                               <p xpath="name2"/>
                             </RelatedFeature></stentry>
                           <stentry>
-                            <p>Odbiorca: x</p><ph/>
+                            <p>Odbiorca: </p><ph/>
                             <p id="K_OD_KOGO" xpath="K_OD_KOGO" system_cache__appinfo:id__x3A__append__unique="."/><ph/>
                             <p id="OD_KOGO_ADRES" xpath="OD_KOGO_ADRES" system_cache__appinfo:id__x3A__append__unique="."/><ph/>
                             <RelatedFeature xpath="ID" xpath_value="../ID_BILLING_USERS" typeName="p5_default_db:COMPANIES" typeNameRealResource="p5_default_db:COMPANIES">
@@ -394,6 +553,11 @@
         </table>
       </p> 
       
+      <RelatedFeature xpath="ID_PROJECT" get_wfs_recurse_xsl.RelatedFeature:gml.featureMember.copy="true" xpath_value="../ID" typeName="p5_default_db:Rozdzielcza_rurociag_wsg84" typeNameRealResource="p5_default_db:Rozdzielcza_rurociag_wsg84">
+      </RelatedFeature>
+      <!---->
+      
+      
       <p><sup>wygenerowano przez procesy5.pl</sup></p>
       
     </body>

+ 4 - 2
SE/schema/default_db_xml_cache.public/default_db/Benford.xsl

@@ -429,10 +429,12 @@
    
     
     <xsl:template match="*" mode="Benford:ditamap_root.embedded_map.body.topic.cleanup" >
-        <xsl:element name="{name()}">
+        <!--<xsl:element name="{name()}">-->
+        <xsl:copy>
             <xsl:copy-of select="@*"/>
             <xsl:apply-templates mode="Benford:ditamap_root.embedded_map.body.topic.cleanup"/>
-        </xsl:element>
+        </xsl:copy>
+        <!--</xsl:element>-->
     </xsl:template>
     
     <xsl:template match="@*" mode="Benford:ditamap_root.embedded_map.body.topic.cleanup">

+ 12 - 1
SE/schema/default_db_xml_cache.public/default_db/IN7_MK_BAZA_DYSTRYBUCJI/IN7_MK_BAZA_DYSTRYBUCJI_tree_to_dita.xsl

@@ -35,6 +35,7 @@
                 <xsl:apply-templates mode="preprocess_gml_geometry_image" select="."/>
             </xsl:for-each-group>-->
             <!-- podsumowania typow laczone -->
+        <xsl:comment>#38 curr name=<xsl:value-of select="name()"/>;</xsl:comment>
         <xsl:for-each-group select="//*[ contains( name(),'Rozdzielcza_')]" group-by="concat(ID_ZASOB,the_geom/node()/name())">
             <xsl:variable name="fileindex" select="concat('Rozdzielcza_ID_ZASOB_',ID_ZASOB,'_',the_geom/node()/name())"/>
                 <xsl:apply-templates mode="system_cache__appinfo:images__write" select=".">
@@ -44,6 +45,8 @@
                     <wfs:FeatureCollection xmlns:wfs="http://www.opengis.net/wfs" 
                         xmlns="http://www.opengis.net/wfs" xmlns:gml="http://www.opengis.net/gml" 
                         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" 
+                        get_wfs_recurse_xsl.RelatedFeatureRoot:debug="#48 node/name== {the_geom/node()/name()} , if the_geom/n {the_geom/name()}; tg/*/n={the_geom/*/name()}
+                        mode preprocess_root_IN7_MK_BAZA_DYSTRYBUCJI curr gr key {current-grouping-key()}  count_curr_gr={count(current-group())}"
                         xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:default_objects="https://biuro.biall-net.pl/wfs/ault_objects">
                         <xsl:attribute name="local-name" select="local-name()"/>
                             <xsl:apply-templates mode="preprocess_gml_geometry_image_unique_group" select="current-group()/*"/>
@@ -63,6 +66,7 @@
                 <wfs:FeatureCollection xmlns:wfs="http://www.opengis.net/wfs" 
                     xmlns="http://www.opengis.net/wfs" xmlns:gml="http://www.opengis.net/gml" 
                     xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" 
+                    get_wfs_recurse_xsl.RelatedFeatureRoot:debug="#67 curr-grouping-key {current-grouping-key()}"
                     xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:default_objects="https://biuro.biall-net.pl/wfs/ault_objects">
                     <xsl:attribute name="local-name" select="local-name()"/>
                     <xsl:apply-templates mode="preprocess_gml_geometry_image_unique_group" select="current-group()/*"/>
@@ -74,12 +78,19 @@
     </xsl:template>
     
     <xsl:template match="*[contains(@system_cache__appinfo:type,'gml:')][ descendant::node()/name()='coordinates']" mode="preprocess_gml_geometry_image_unique_group">
-            <gml:featureMember>
+        <gml:featureMember get_wfs_recurse_xsl.RelatedFeatureRoot:debug="#80 mode preprocess_gml_geometry_image_unique_group">
                 <xsl:copy-of select="." copy-namespaces="no"/>
             </gml:featureMember>
     </xsl:template>
     
     
+    <xsl:template match="*[LineString][ descendant::node()/name()='coordinates']" mode="preprocess_gml_geometry_image_unique_group">
+        <gml:featureMember get_wfs_recurse_xsl.RelatedFeatureRoot:debug="#89 mode preprocess_gml_geometry_image_unique_group">
+            <xsl:copy-of select="." copy-namespaces="no"/>
+        </gml:featureMember>
+    </xsl:template>
+    
+    
     
     <xsl:template match="*|text()|comment()" mode="preprocess_gml_geometry_image_unique_group">
         <xsl:message>#59 match <xsl:value-of select="name()"/></xsl:message>

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

@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
     xmlns:xs="http://www.w3.org/2001/XMLSchema"
+    xmlns:svgu="http://www.ora.com/XSLTCookbook/ns/svg-utils"
     xmlns:system_cache__appinfo="http://biuro.biall-net.pl/xmlschema_procesy5/default_db_xml_cache/appinfo.xsd"
     xmlns:system_cache__dita="http://biuro.biall-net.pl/xmlschema_procesy5/default_db_xml_cache/dita.xsd"
     xmlns:Benford="https://pl.wikipedia.org/wiki/Rozklad_Benforda"
@@ -146,6 +147,8 @@
     <xsl:import href="tree_to_dita.element.xsl"/>
     <xsl:import href="tree_to_dita.localname.translate.xsl"/>
     
+    <xsl:import href="system_cache__dita__x3A__svg/system_cache__dita__x3A__svg.ditamap_root.embedded_map.xsl"/>
+    
     <!-- testing wfs recurse as compatibile digging method for parsing data 2019-09 -->
     <xsl:import href="../../WPS_Functions/get_wfs_recurse_xsl/get_wfs_recurse_xsl.xsl"/>
     <xsl:import href="../default_db/system_cache__dita__x3A__p5gnuplot/system_cache__dita__x3A__p5gnuplot.interface.xsl"/>
@@ -245,7 +248,9 @@
     <xsl:template mode="postprocess_root_IN7_MK_BAZA_DYSTRYBUCJI" match="*"/>
     
     <xsl:template match="RelatedFeatureRoot|get_wfs_recurse_xsl.RelatedFeatureRoot:RelatedFeatureRoot">
-        <xsl:comment>#29 match RelatedFeatureRoot</xsl:comment>
+        <xsl:comment>#29 match RelatedFeatureRoot - mode default - now going mode ditamap_root; 
+                next match name=<xsl:value-of select="*/name()"/>;
+        </xsl:comment>
         <xsl:apply-templates mode="ditamap_root"/>
     </xsl:template>
     
@@ -286,6 +291,15 @@
         </xsl:element>
     </xsl:template>
     
+    <!--<xsl:template match="body[foreign[svg-container]]|foreign[svg-container]|svg-container" mode="ditamap_root.embedded_map">
+        <xsl:element name="{name()}">
+            <xsl:copy-of select="@*"/>
+            <!-\-<xsl:apply-templates mode="system_cache__dita__x3A__svg:ditamap_root.embedded_map" />-\->
+            <xsl:apply-imports/>
+        </xsl:element>
+    </xsl:template>-->
+    
+    
     <xsl:template mode="ditamap_root.embedded_map" match="@*"><xsl:copy-of select="."/></xsl:template>
     
     
@@ -418,6 +432,10 @@
         <!--<xsl:copy-of select="$table_cut"/>-->
     </xsl:template>
     
+    <xsl:template match="svg-container" mode="ditamap_root.embedded_map.body">
+        <xsl:apply-imports/>
+    </xsl:template>
+    
     
     <xsl:template match="*" mode="preprocess_root.embedded_map.simpletable">
         <xsl:element name="{name()}">

+ 31 - 0
se.oxygen.xpr

@@ -2000,6 +2000,36 @@
                     <entry>
                         <String>scenario.associations</String>
                         <scenarioAssociation-array>
+                            <scenarioAssociation>
+                                <field name="url">
+                                    <String>../../../../opt/local/pl.procesy5/p5build_SE/temp/WPS_Functions/recurse_ant/2019-10-18-03_29_0395b503/2019-10-18-03_29_0395b503.out_task.dita.final_with_RelatedFeatureLoop.xml</String>
+                                </field>
+                                <field name="scenarioIds">
+                                    <list>
+                                        <String>DITA Map PDF - based on XSL-FO - Copy</String>
+                                    </list>
+                                </field>
+                                <field name="scenarioTypes">
+                                    <list>
+                                        <String>DITAMAP</String>
+                                    </list>
+                                </field>
+                            </scenarioAssociation>
+                            <scenarioAssociation>
+                                <field name="url">
+                                    <String>SE/schema/WPS_Functions/default_db/recurse_ant/out/2019-10-18-03_29_0395b503.out_task.dita.final_with_RelatedFeatureLoop.xml</String>
+                                </field>
+                                <field name="scenarioIds">
+                                    <list>
+                                        <String>DITA Map PDF - based on XSL-FO - Copy</String>
+                                    </list>
+                                </field>
+                                <field name="scenarioTypes">
+                                    <list>
+                                        <String>DITAMAP</String>
+                                    </list>
+                                </field>
+                            </scenarioAssociation>
                             <scenarioAssociation>
                                 <field name="url">
                                     <String>SE/schema/WPS_Functions/default_db/recurse_ant/out/2019-10-18-00_46_194f3b2a.out_task.dita.final_with_RelatedFeatureLoop.xml</String>
@@ -3360,6 +3390,7 @@
             <file name="SE/schema/WPS_Functions/dita-ot/dita-ot-2.3.3/plugins/org.dita.pdf2/xsl/fo/flagging-preprocess.xsl"/>
             <file name="SE/schema/WPS_Functions/dita-ot/dita-ot-2.3.3/plugins/org.dita.pdf2/xsl/fo/flagging-preprocess_template.xsl"/>
             <file name="SE/schema/WPS_Functions/dita-ot/dita-ot-2.3.3/plugins/com.sophos.tocjs/xsl/frameset.xsl"/>
+            <file name="SE/schema/default_db_xml_cache.public/default_db/get_wfs_recurse_xsl.RelatedFeature.preprocess.xsl"/>
             <file name="SE/schema/default_db_xml_cache.public/get_wfs_recurse_xsl.xsl"/>
             <file name="SE/schema/WPS_Functions/get_wfs_recurse_xsl/get_wfs_recurse_xsl.xsl"/>
             <file name="SE/schema/default_db_xml_cache.public/default_db/graph_gnuplot/graph_gnuplot.simpletable__x3A__from_rows.xsl"/>