Selaa lähdekoodia

Merge branch 'master' of ssh://biuro.biall-net.pl:2222/plabudda/se

a.binder 8 vuotta sitten
vanhempi
commit
9b574e9127

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

@@ -1123,10 +1123,12 @@
     </condition>
     
     <target name="confirmAntfile" if="confirmAntfile.isset">
+        <record action="start" name="confirmAntfile.isset.log"/>
         <echo message="OUTPUT__START"/>
         <echo>#1112 wyzwalam ${confirmAntfile} target ${confirmAntfileTarget}: </echo>
             <ant antfile="${confirmAntfile}" target="${confirmAntfileTarget}"></ant>
         <echo message="OUTPUT__END"/>
+        <record action="stop" name="confirmAntfile.isset.log"/>
     </target>
     
     <target name="buildpdf_recursed_xsl_mail" unless="confirmAntfile.isset" depends="install_folders,uuid_check,typeName_check,xpath_check,xpath_value_check,set_dita,confirmAntfile"  description="URL_TASK buildpdf_recursed_xsl_mail szybki druk z wysylka mailem">

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

@@ -1,2 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<empty></empty>

+ 3 - 2
SE/schema/WPS_Functions/send_email/send_email.xsl

@@ -66,10 +66,10 @@
                 <xsl:copy-of select="$title"/>
                 <xsl:for-each select="send_email:send_email.send_email_from_xml_parsed.xml.child">
                     <!--<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;&gt;Wyslij mail do <xsl:value-of select="."/>&lt;/a&gt; &lt;/br&gt;</echo>
+                    <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>
-                <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;&gt;Wyslij mail do Wszystkich &lt;/a&gt; &lt;/br&gt;</echo>
+                <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>
             <target name="send_email.send_email_from_xml_parsed.build.xml.confirm.all">
                 <exec executable="mutt">
@@ -98,6 +98,7 @@
                             <xsl:attribute name="inputstring">${send_email.send_email_from_xml_parsed.build.xml.title}</xsl:attribute>
                             <arg line='-a "{$out.pdf}"'/>
                             <arg line='-s "Wiadomosc"'/>
+                            <arg line='-e "set copy = no"'/>
                             <arg line='--  {text()}'/>
                         </exec>
                     </target>

+ 0 - 60
SE/schema/ant-url_action/default_db.in7_dziennik_koresp/etykieta/build.recurse_ant.PRODUCT.xml

@@ -1,60 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project xmlns:recurse_ant="http://biuro.biall-net.pl/xmlschema_procesy5/WPS_Functions/default_db/recurse_ant.xsd"
-         xmlns:p5xsl="http://biuro.biall-net.pl/xmlschema_procesy5/WPS_Functions/xsl_interface/xsl_interface.xsd"
-         basedir="../../../"
-         default="PRODUCT"
-         name="recurse_ant.PRODUCT">
-   
-   
-   <include as="WPS_Functions" file="${basedir}/build_SE_basedir/build.p5build_SE.INSTALL_ROOT.xml"/>
-   <include as="WPS_Functions" file="${basedir}/WPS_Functions/build.WPS_Functions.PRODUCT.xml"/>
-   <include as="WPS_Functions" file="${basedir}/build_SE_basedir/build.p5build_SE.PRODUCT.xml"/>
-   <include file="${WPS_Functions.basedir}/get_wfs/build.get_wfs.PRODUCT.xml"/>
-   <include file="${WPS_Functions.basedir}/default_db/check_java_process_count/build.check_java_process_count.PRODUCT.xml"/>
-   <include file="${WPS_Functions.basedir}/default_db/CRM_PROCES_tree/build.CRM_PROCES_tree.PRODUCT.xml" optional="true"/>
-   <include file="${WPS_Functions.basedir}/send_email/build.send_email.PRODUCT.xml" optional="true"/>
-   
-   <property name="recurse_ant.PRODUCT.name"
-      value="${WPS_Functions.PRODUCT.name}.default_db.recurse_ant"/>
-   <property name="recurse_ant.PRODUCT.vendor-domain"
-      value="${WPS_Functions.PRODUCT.name}.recurse_ant"/>
-   <property name="recurse_ant.basedir"
-      value="${WPS_Functions.basedir}/default_db/recurse_ant"/>
-   <property name="recurse_ant.repository"
-      value="${WPS_Functions.repository}/recurse_ant"/>
-   <property name="recurse_ant.install"
-      value="${recurse_ant.basedir}/install"/>
-   <property location="${WPS_Functions.temp}/recurse_ant"
-      name="recurse_ant.temp"/>
-   
-   <property location="${recurse_ant.basedir}/build_recurse_ant.xml"
-      name="recurse_ant.build.xml"/>
-   
-   <property name="default_db:recurse_ant_basedir" location="${recurse_ant.basedir}"/>
-   
-   <property name="recurse_ant.basedir.out" value="${recurse_ant.basedir}/out"/>
-   <property name="default_db:recurse_ant_basedir.out" value="${recurse_ant.basedir.out}"/>
-   
-   <!--<property name="default_db:recurse_ant_basedir.temp" location="${default_db:recurse_ant_basedir}/temp/${uuid}"/>
-   <property name="recurse_ant.default_db.recurse_ant_basedir.temp" location="${recurse_ant.basedir}/temp/${uuid}"/>
-   -->
-   
-   
-   
-   <property name="p5_tr_map_dir" location="${basedir}/default_db.instance.xml/p5_tr_map" />
-   <property name="simpleSchema_dir" location="${basedir}//default_db.instance.xml/simpleSchema" />
-   <property name="detect_resource_type_dir" location="${basedir}/default_db.instance.xml/detect_resource_type" />
-   <property name="build_complexType_dir" location="${basedir}/default_db.instance.xml/build_complexType" />
-   <property name="default_db.instance.xml" location="${basedir}/default_db.instance.xml" />
-   <property name="default_db_xml_cache.public" location="${basedir}/default_db_xml_cache.public"/>
-   
-   
-   <property name="get_wfs_basedir" location="${get_wfs.basedir}"/>
-   <property name="get_wfs" location="${get_wfs.build}"/>
-   
-   
-   <target name="PRODUCT"/>
-      
-   
-   
-</project>

+ 0 - 1
SE/schema/ant-url_action/default_db.in7_dziennik_koresp/etykieta/build.xml

@@ -1 +0,0 @@
-build_recurse_ant.xml

+ 98 - 0
SE/schema/ant-url_action/default_db.in7_dziennik_koresp/etykieta/build.xml

@@ -0,0 +1,98 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project basedir="../../../." name="recurse_ant_etykieta" default="buildpdf_recursed_xsl_mail"  xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
+    xmlns:xs="http://www.w3.org/2001/XMLSchema" > <!--  -->
+    <description>
+        Etykieta
+    </description>
+    
+    <!--<echo>#88 $uuid = ${uuid}</echo>-->
+    <!-- template do kopiowania test-druk @2017-03-02 bindera 
+    Copyright BIALL-NET sp. z o.o. wszelkie prawa zastrzezone
+    
+    -->
+    
+    
+    <!-- Przykładowe wyzwolenie z bash :
+    cat input.xml | /Library/Server/Web/Data/Sites/Default/SE/stuff/dita-ot-2.3.3/bin/ant -buildfile ild__IN7_DZIENNIK_KORESP.xml
+    na output mamy pdf'a
+    -->
+
+
+    <!-- https://biuro.biall-net.pl/SE/version-git/index.php?_route=UrlAction_Ant&_task=ant&path=default_db.in7_dziennik_koresp/test-druk&namespace=p5_default_db:IN7_DZIENNIK_KORESP&featureID=59682 -->
+    <!-- default procesy5 sample template is  file:/SE/schema/ant-url_action/default_db.in7_dziennik_koresp/test-get-wfs-xml/build.xml-->
+    <!-- sample URL which call this exact variables in this ANT build -->
+    <!-- przykladowy URL ktory przekazuje parametry do tego ANT -->
+    <!--https://biuro.biall-net.pl/SE/version-git/index.php?_route=UrlAction_Ant&_task=ant&
+        path=${default_db.in7_dziennik_koresp/test-get-wfs-xml} -  this is the place to keep ant build (directory name with build.xml)  
+        &namespace=p5_default_db:Rozdzielcza_test_bzyk_PE&featureID=123 - this is setting the 
+        <property name="url" value="${url}"/> - to point what is record/table to download
+        <property name="uuid" value="${uuid}"/> it is automatically also set to enable uinque transaction and to allow to save data with user
+        <property name="passwordBase64Basic" value="${passwordBase64Basic}"/> - this is also set - to enable communicate with API -
+        <property name="DwebRootUrl" value="${$webRootUrl}"/> - this is the place where script is localized to easyli to target user GUI by href to generated output      
+    />
+    -->
+    
+    <!---DpasswordBase64Basic="xxxx=="
+        -DtypeName="p5_default_db:IN7_DZIENNIK_KORESP" 
+        -Dxpath=ID -Dxpath_value=1000 
+        -Duuid=1 -DwebRootUrl=somePathDir-->
+    
+    <!--<include file="build.recurse_ant.PRODUCT.xml"/>-->
+    
+    
+    <include as="WPS_Functions" file="${basedir}/build_SE_basedir/build.p5build_SE.INSTALL_ROOT.xml"/>
+    <include as="WPS_Functions" file="${basedir}/WPS_Functions/build.WPS_Functions.PRODUCT.xml"/>
+    <include as="WPS_Functions" file="${basedir}/build_SE_basedir/build.p5build_SE.PRODUCT.xml"/>
+    <include file="${WPS_Functions.basedir}/get_wfs/build.get_wfs.PRODUCT.xml"/>
+    <include file="${WPS_Functions.basedir}/default_db/check_java_process_count/build.check_java_process_count.PRODUCT.xml"/>
+    <include file="${WPS_Functions.basedir}/default_db/CRM_PROCES_tree/build.CRM_PROCES_tree.PRODUCT.xml" optional="true"/>
+    <include file="${WPS_Functions.basedir}/send_email/build.send_email.PRODUCT.xml" optional="true"/>
+    
+    <property name="recurse_ant.PRODUCT.name"
+        value="${WPS_Functions.PRODUCT.name}.default_db.recurse_ant"/>
+    <property name="recurse_ant.PRODUCT.vendor-domain"
+        value="${WPS_Functions.PRODUCT.name}.recurse_ant"/>
+    <property name="recurse_ant.basedir"
+        value="${WPS_Functions.basedir}/default_db/recurse_ant"/>
+    <property name="recurse_ant.repository"
+        value="${WPS_Functions.repository}/recurse_ant"/>
+    <property name="recurse_ant.install"
+        value="${recurse_ant.basedir}/install"/>
+    <property location="${WPS_Functions.temp}/recurse_ant"
+        name="recurse_ant.temp"/>
+    
+    
+    <property location="${recurse_ant.basedir}/build_recurse_ant.xml"
+        name="recurse_ant.build.xml"/>
+    
+    <property name="default_db:recurse_ant_basedir" location="${recurse_ant.basedir}"/>
+    
+    <property name="recurse_ant.basedir.out" value="${recurse_ant.basedir}/out"/>
+    <property name="default_db:recurse_ant_basedir.out" value="${recurse_ant.basedir.out}"/>
+    
+    <!--<property name="default_db:recurse_ant_basedir.temp" location="${default_db:recurse_ant_basedir}/temp/${uuid}"/>
+   <property name="recurse_ant.default_db.recurse_ant_basedir.temp" location="${recurse_ant.basedir}/temp/${uuid}"/>
+   -->
+    
+    
+    
+    <property name="p5_tr_map_dir" location="${basedir}/default_db.instance.xml/p5_tr_map" />
+    <property name="simpleSchema_dir" location="${basedir}//default_db.instance.xml/simpleSchema" />
+    <property name="detect_resource_type_dir" location="${basedir}/default_db.instance.xml/detect_resource_type" />
+    <property name="build_complexType_dir" location="${basedir}/default_db.instance.xml/build_complexType" />
+    <property name="default_db.instance.xml" location="${basedir}/default_db.instance.xml" />
+    <property name="default_db_xml_cache.public" location="${basedir}/default_db_xml_cache.public"/>
+    
+    
+    <property name="get_wfs_basedir" location="${get_wfs.basedir}"/>
+    <property name="get_wfs" location="${get_wfs.build}"/>
+    
+    
+    <include file="${recurse_ant.build.xml}" as="recurse_ant" />
+    <include file="${send_email.build.xml}" as="send_email"/>
+    
+    <target name="buildpdf_recursed_xsl_mail">
+        <antcall target="recurse_ant.buildpdf_recursed_xsl_mail"/>
+    </target>
+    
+</project>

+ 0 - 48
SE/schema/ant-url_action/default_db.in7_dziennik_koresp/etykieta/build_recurse_ant.xml

@@ -1,48 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project basedir="../../../." name="recurse_ant_etykieta" default="buildpdf_recursed_xsl_mail"  xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
-    xmlns:xs="http://www.w3.org/2001/XMLSchema" > <!--  -->
-    <description>
-        Etykieta
-    </description>
-    
-    <!--<echo>#88 $uuid = ${uuid}</echo>-->
-    <!-- template do kopiowania test-druk @2017-03-02 bindera 
-    Copyright BIALL-NET sp. z o.o. wszelkie prawa zastrzezone
-    
-    -->
-    
-    
-    <!-- Przykładowe wyzwolenie z bash :
-    cat input.xml | /Library/Server/Web/Data/Sites/Default/SE/stuff/dita-ot-2.3.3/bin/ant -buildfile ild__IN7_DZIENNIK_KORESP.xml
-    na output mamy pdf'a
-    -->
-
-
-    <!-- https://biuro.biall-net.pl/SE/version-git/index.php?_route=UrlAction_Ant&_task=ant&path=default_db.in7_dziennik_koresp/test-druk&namespace=p5_default_db:IN7_DZIENNIK_KORESP&featureID=59682 -->
-    <!-- default procesy5 sample template is  file:/SE/schema/ant-url_action/default_db.in7_dziennik_koresp/test-get-wfs-xml/build.xml-->
-    <!-- sample URL which call this exact variables in this ANT build -->
-    <!-- przykladowy URL ktory przekazuje parametry do tego ANT -->
-    <!--https://biuro.biall-net.pl/SE/version-git/index.php?_route=UrlAction_Ant&_task=ant&
-        path=${default_db.in7_dziennik_koresp/test-get-wfs-xml} -  this is the place to keep ant build (directory name with build.xml)  
-        &namespace=p5_default_db:Rozdzielcza_test_bzyk_PE&featureID=123 - this is setting the 
-        <property name="url" value="${url}"/> - to point what is record/table to download
-        <property name="uuid" value="${uuid}"/> it is automatically also set to enable uinque transaction and to allow to save data with user
-        <property name="passwordBase64Basic" value="${passwordBase64Basic}"/> - this is also set - to enable communicate with API -
-        <property name="DwebRootUrl" value="${$webRootUrl}"/> - this is the place where script is localized to easyli to target user GUI by href to generated output      
-    />
-    -->
-    
-    <!---DpasswordBase64Basic="xxxx=="
-        -DtypeName="p5_default_db:IN7_DZIENNIK_KORESP" 
-        -Dxpath=ID -Dxpath_value=1000 
-        -Duuid=1 -DwebRootUrl=somePathDir-->
-    
-    <include file="build.recurse_ant.PRODUCT.xml"/>
-    <include file="${recurse_ant.build.xml}" as="recurse_ant" />
-    <include file="${send_email.build.xml}" as="send_email"/>
-    
-    <target name="buildpdf_recursed_xsl_mail">
-        <antcall target="recurse_ant.buildpdf_recursed_xsl_mail"/>
-    </target>
-    
-</project>