Merge branch 'master' of bn.git:plabudda/se

SE/schema/ant-url_action/default_db.in7_dziennik_koresp/test-druk/build_recurse_ant.xml

@@ -40,6 +40,7 @@
     <property name="default_db:recurse_ant" value="${default_db:recurse_ant_basedir}/build_recurse_ant.xml"/>
     <property name="default_db:recurse_ant_basedir.recurse_cache" location="${default_db:recurse_ant_basedir}/recurse_cache"/>
      
+    <!--<property name="build_recurse_ant.childproperties" location="${WPS_Functions.childproperties}/build_recurse_ant.properties"/>--><!-- TODO UNKNOWN -->
     
     <property name="out" value="out"/> <!-- output ready files like pdf -->
     <property name="p5_tr_map_dir" location="${basedir}/../../../default_db.instance.xml/p5_tr_map" />
@@ -113,6 +114,13 @@
     
     <property name="dita.dir" location="/Library/Server/Web/Data/Sites/Default/SE/stuff/dita-ot-2.3.3/bin/dita"/>
     
+    
+    <target name="write_child_props_to_config_dir" depends="install_folders">
+        <!--<echoproperties destfile="${build_recurse_ant.childproperties}"/>-->
+        <echo> TODO #120 - module is to be updated to provide properties - he dont know where is WPS_Functions - to fix. Bypassed properties</echo>
+    </target>
+    
+    
     <target name="uuid_cond">
         <condition property="uuid_set" taskname="uuid_check">
             <or>
@@ -403,7 +411,7 @@
             &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 wyjsciowy plik XML - 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; 
+            &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"/>
     </target>
@@ -459,6 +467,7 @@
         <property name="build_recurse_ant_xsl_xpath_filter.xsl" value="${default_db_xml_cache.public}/build_recurse_ant_xsl_xpath_filter.xsl"/>
         <property name="recurse_ant_to_html.xsl" value="${default_db_xml_cache.public}/recurse_ant_to_html.xsl"/>
         <property name="build_recurse_ant_cache_control.xsl" value="${default_db_xml_cache.public}/build_recurse_ant_cache_control.xsl"/>
+        <property name="get_wfs_recurse_xsl.xsl" value="${default_db_xml_cache.public}/get_wfs_recurse_xsl.xsl"/>
         
     </target>
     
@@ -472,6 +481,7 @@
         <property name="build_recurse_ant_xsl_xpath_filter.xsl" value="${default_db_xml_cache.public}/build_recurse_ant_xsl_xpath_filter.xsl"/>
         <property name="recurse_ant_to_html.xsl" value="${default_db_xml_cache.public}/recurse_ant_to_html.xsl"/>
         <property name="build_recurse_ant_cache_control.xsl" value="${default_db_xml_cache.public}/build_recurse_ant_cache_control.xsl"/>
+        <property name="get_wfs_recurse_xsl.xsl" value="${default_db_xml_cache.public}/get_wfs_recurse_xsl.xsl"/>
     </target>
     
     
@@ -503,6 +513,10 @@
         </xslt>-->
     </target>
    
+    <target name="clean" description="Clean all output and temp files">
+        <antcall target="clean_temp_dir"/>
+        <delete dir="${out}" failonerror="false"/>
+    </target>
    
     <target name="clean_temp_dir" description="URL_TASK Wyczyść cache modułu ">
         <!--<delete includeemptydirs="yes" failonerror="false">
@@ -817,7 +831,54 @@
         </echo>
         <echo message="OUTPUT__END"/>
     </target>   
-     
+    
+    <target name="buildpdf_recursed_xsl" depends="install_folders,uuid_check,typeName_check,xpath_check,xpath_value_check,set_dita"  description="retrieve and build object from api using just XSL calls - needed username and password">
+        
+        
+        <echo>#836 will try to in $main_build_recurse_ant.dita_with_id ${main_build_recurse_ant.dita_with_id}</echo>
+        <xslt basedir="${default_db:recurse_ant_basedir}" style="${get_wfs_recurse_xsl.xsl}" in="${empty.xml}"  destdir="./" out="${main_build_recurse_ant.dita_with_id}" > <!-- out_task.dita.final -->
+            <factory name="net.sf.saxon.TransformerFactoryImpl">    
+                <!--<attribute name="http://saxon.sf.net/feature/xinclude-aware" value="true"/>-->
+                <attribute name="http://saxon.sf.net/feature/initialTemplate" value="main"/>
+            </factory>
+            
+            <classpath location="/opt/local/share/java/saxon.jar"/>
+            <!--<classpath location="/opt/local/share/java/saxon9he.jar"/>-->
+            <!--<param name="webRootUrl" expression="${webRootUrl}" />--> 
+            <!--<param name="main_build_recurse_ant.dita" expression="${main_build_recurse_ant.dita}"/>-->
+            <param name="uuid" expression="${uuid_tested}"/>
+            <param name="username.pass" expression="${Password}"/>
+            <!--<param name="basedir" expression="${basedir}"/>-->
+            <param name="temp" expression="${temp}"/>
+            <param name="simpleSchema_dir" expression="${simpleSchema_dir}"/>
+        </xslt>
+        
+        
+        <!--<ant antfile="${build_CRM_PROCES_tree}" target="default_db:PROCES_INIT:tree:dita" inheritall="false">
+            <property name="uuid" value="${uuid}"/>
+            <property name="default_db:recurse_ant_basedir.out" value="${default_db:recurse_ant_basedir}/out"/>
+        </ant>-->
+        
+        <!--<exec executable="${dita.dir}" dir=".">
+            <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="${out}"/>
+        </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 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"/>
+    </target>
     
     <target name="buildpdf_recursed_html5" depends="install_folders,uuid_check,typeName_check,xpath_check,xpath_value_check,passwordBase64Basic_check,php_session_id_check,check_dita" if="${test_if_dita}" description="URL_TASK Pobierz Wersję HTML">
         <property name="dita.dir" location="/Library/Server/Web/Data/Sites/Default/SE/stuff/dita-ot-2.3.3/bin/dita"/>

SE/schema/default_db_xml_cache.public/build_recurse_ant.xsl

@@ -214,7 +214,8 @@
                         | $temp is = <xsl:value-of select="$temp"/> ;
                         | $loop_xpath = <xsl:value-of select="$loop_xpath"/>
                         | $loop_path_recurs = <xsl:value-of select="$loop_path_recurs"/>
-                        | $feature_pos_parent= <xsl:value-of select="$feature_pos_parent"/>; $feature_pos=<xsl:value-of select="$feature_pos"/>;  position()= <xsl:value-of select="position()"/>; $parallel_pos= <xsl:value-of select="$parallel_pos"/> ;  ($)parallel_pos= ${parallel_pos} 
+                        | $feature_pos_parent= <xsl:value-of select="$feature_pos_parent"/>; $feature_pos=<xsl:value-of select="$feature_pos"/>;  position()= <xsl:value-of select="position()"/>; $parallel_pos= <xsl:value-of select="$parallel_pos"/> ;  ($)parallel_pos= ${parallel_pos}
+                        | $input_obj_fid/@fid = <xsl:value-of select="$input_obj_fid/@fid"/> ;
                         | ANT Uruchamiam $loop_xpath_real <xsl:value-of select="$loop_xpath_real"/>;
                         =-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-
                     </echo></xsl:if>
@@ -508,6 +509,7 @@
                         | $temp is = <xsl:value-of select="$temp"/> ;
                         | $loop_xpath = <xsl:value-of select="$loop_xpath"/> projekt <xsl:value-of select="$loop_xpath_real"/>;
                         | ANT Uruchamiam $feature_pos=<xsl:value-of select="$feature_pos"/>; $feature_pos_parent= <xsl:value-of select="$feature_pos_parent"/>;
+                        | $input_obj_fid/@fid = <xsl:value-of select="$input_obj_fid/@fid"/> ;
                         =-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-
                        </echo></xsl:if>
                     </xsl:element>
@@ -687,7 +689,6 @@
                     <property name="loop_path_recurs_xpath" value="{$loop_path_recurs_xpath}"/>
                     <property name="build_check_java_process_count.xml"  value="{$build_check_java_process_count.xml}"/>
                     <property name="parallel_java_process_max" value="{$parallel_java_process_max}"/>
-                    
                     <property name="feature_pos_parent" value="{$feature_pos_parent}"/> <!-- @2017-04 fixing leaf parallel conflict -->
                     <property name="parallel_pos" value="{$parallel_pos}"/>
                     <property name="process_locks" value="{$process_locks}"/>
@@ -699,7 +700,8 @@
                         xpath_value=<xsl:value-of select="$xpath_value"/>;
                         $passwordBase64Basic=<xsl:value-of select="$passwordBase64Basic"/>
                         $feature_pos_parent" <xsl:value-of select="$feature_pos_parent"/>
-                        
+                        $typeNameRoot <xsl:value-of select="$typeNameRoot"/>
+                        $input_obj_fid/@fid = <xsl:value-of select="$input_obj_fid/@fid"/> ;
                     </xsl:comment>
                     <!--<xsl:apply-templates mode="ant_target" select=".">
                         <xsl:with-param name="typeName_dita" select="$typeName_dita"/>
@@ -954,7 +956,6 @@
                     <!-- task do polaczenia zaglebien -->
                     <!-- jak nie ma zaglebien to generujemy pdf i dajemy uzytkownikowi linka  -->
                     <xsl:if test="$debug &gt; 2"><xsl:message>%%%%%%%%%%%%%%%%%%%%%% #871  END OF BUILDING BUILD_ROOT for RelatedFeatureLOOP </xsl:message></xsl:if>
-                    
                 </project>
             </xsl:when>
             <xsl:otherwise>

SE/schema/default_db_xml_cache.public/get_all_xsd.xsl

@@ -565,11 +565,11 @@
                           <xsl:attribute name="system_cache__appinfo:document-uri-full" select="'http://www.w3.org/1999/XSL/Transform'"/>
                           <xsl:copy-of select="$system_cache__appinfo:builtintypes.xsd"/>
                       </system_cache__appinfo:get_all_xsd>
-                      <!--<system_cache__appinfo:get_all_xsd>
+                      <system_cache__appinfo:get_all_xsd>
                           <xsl:attribute name="system_cache__appinfo:document-uri" select="'http://biuro.biall-net.pl/p5/schema/types'"/>
                           <xsl:attribute name="system_cache__appinfo:document-uri-full" select="'http://biuro.biall-net.pl/p5/schema/types'"/>
                           <xsl:copy-of select="$system_cache__appinfo:p5Type.xsd"/>
-                      </system_cache__appinfo:get_all_xsd>-->
+                      </system_cache__appinfo:get_all_xsd>
                   </system_cache__appinfo:get_all_xsd_list>
                 </xsl:variable>
                 <!--<xsl:result-document href="{concat('../default_db.instance.xml/transformed/',$element-filename,'.xml')}">