a.binder пре 6 година
родитељ
комит
94fcdb39e6

+ 2 - 1
SE/schema/WPS_Functions/default_db/recurse_ant/build_recurse_ant.xml

@@ -472,7 +472,7 @@
             <empty>empty</empty>
         </echoxml>
         
-        <xslt basedir="${default_db:recurse_ant_basedir}" style="${get_wfs_recurse_xsl.xsl}" in="${empty.xml}"  destdir="./" out="${out_task.dita.final}" > <!-- out_task.dita.final -->
+        <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">    
                 <!--<attribute name="http://saxon.sf.net/feature/xinclude-aware" value="true"/>-->
                 <attribute name="http://saxon.sf.net/feature/initialTemplate" value="main"/>
@@ -481,6 +481,7 @@
             <!--<classpath location="/opt/local/share/java/saxon.jar"/>-->
             
             <classpath location="/opt/local/share/java/saxon9he.jar"/>
+            <param name="out_task.dita.final" expression="${out_task.dita.final}"/>
             <param name="typeName" expression="${typeName}"/>
             <!--<param name="webRootUrl" expression="${webRootUrl}" />--> 
             <!--<param name="main_build_recurse_ant.dita" expression="${main_build_recurse_ant.dita}"/>-->

+ 4 - 4
SE/schema/WPS_Functions/send_email/send_email.xsl

@@ -76,11 +76,11 @@
             <xsl:copy-of select="$title"/>
             <target name="send_email.send_email_from_xml_parsed.build.xml.to.confirm">
                 <xsl:copy-of select="$title"/>
-                <xsl:for-each select="send_email:send_email.send_email_from_xml_parsed.xml.child">
+                <xsl:for-each-group select="send_email:send_email.send_email_from_xml_parsed.xml.child" group-by="text()">
                     <!--<echo message="O_UTPUT__START"/>-->
                     <echo>&lt;br&gt;&lt;a href=&quot;${antFunctionUrl}&amp;confirmAntfile=<xsl:value-of select="$confirmAntfile"/>&amp;confirmAntfileTarget=send_email.send_email_from_xml_parsed.build.xml.confirm.<xsl:value-of select="position()"/>&quot;  target=&quot;_blank&quot;&gt;Wyslij mail do <xsl:value-of select="."/>&lt;/a&gt; &lt;/br&gt;</echo>
                     <!--<echo message="O_UTPUT__END"/>-->
-                </xsl:for-each>
+                </xsl:for-each-group>
                 <echo>&lt;br&gt;&lt;a href=&quot;${antFunctionUrl}&amp;confirmAntfile=<xsl:value-of select="$confirmAntfile"/>&amp;confirmAntfileTarget=send_email.send_email_from_xml_parsed.build.xml.confirm.all&quot; target=&quot;_blank&quot;&gt;Wyslij mail do Wszystkich &lt;/a&gt; &lt;/br&gt;</echo>
             </target>
             <xsl:variable name="REPLYTO" select="send_email:send_email.send_email_from_xml_parsed.xml.child[@REPLYTO][1]/text()"/>
@@ -107,7 +107,7 @@
                 </exec>
             </target>
                 
-                <xsl:for-each select="send_email:send_email.send_email_from_xml_parsed.xml.child">
+                <xsl:for-each-group select="send_email:send_email.send_email_from_xml_parsed.xml.child" group-by="text()">
                     <target name="send_email.send_email_from_xml_parsed.build.xml.confirm.{position()}">
                     <echo>Sending message to <xsl:value-of select="."/></echo>
                         <!--<mail from="a.binder@biall-net.pl" failonerror="false"
@@ -131,7 +131,7 @@
                             <arg line='--  {text()}'/>
                         </exec>
                     </target>
-                </xsl:for-each>
+                </xsl:for-each-group>
             
         </project>
     </xsl:template>