f mail subjct

SE/schema/WPS_Functions/send_email/send_email.xsl

@@ -26,6 +26,21 @@
         <xsl:apply-templates mode="#current"/>
     </xsl:template>
     
+    
+    <xsl:template mode="send_email:send_email_from_xml_parsed.child" match="*[@FROM and text()] ">
+        <send_email:send_email.send_email_from_xml_parsed.xml.child.FROM>
+            <xsl:value-of select="text()"/>
+        </send_email:send_email.send_email_from_xml_parsed.xml.child.FROM>
+        <xsl:apply-templates mode="#current"/>
+    </xsl:template>
+    
+    <xsl:template mode="send_email:send_email_from_xml_parsed.child" match="*[@CONTENT.TEXT and text()]">
+        <send_email:send_email.send_email_from_xml_parsed.xml.child.CONTENT.TEXT>
+            <xsl:value-of select="text()"/>
+        </send_email:send_email.send_email_from_xml_parsed.xml.child.CONTENT.TEXT>
+        <xsl:apply-templates mode="#current"/>
+    </xsl:template>
+    
     <xsl:template mode="send_email:send_email_from_xml_parsed.child" match="title">
         <send_email:send_email.send_email_from_xml_parsed.xml.child.title>
             <xsl:for-each select="*">
@@ -40,6 +55,7 @@
     
     <xsl:template mode="send_email:send_email_from_xml_parsed.child" match="text()">
         <xsl:variable name="REPLYTO" select="parent::node()/@REPLYTO"/>
+        
         <xsl:for-each select="tokenize(.,' ')">
             <xsl:choose>
                 <xsl:when test="contains(.,'@')">
@@ -53,6 +69,7 @@
                 </xsl:otherwise>
             </xsl:choose>
         </xsl:for-each>
+        
     </xsl:template>
     
     
@@ -84,18 +101,25 @@
                 <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()"/>
+            <!--<xsl:variable name="FROM" select="send_email:send_email.send_email_from_xml_parsed.xml.child[@FROM][1]/text()"/>
+            <xsl:variable name="CONTENT.TEXT" select="send_email:send_email.send_email_from_xml_parsed.xml.child[@CONTENT.TEXT][1]/text()"/>-->
             <target name="send_email.send_email_from_xml_parsed.build.xml.confirm.all">
                 <exec executable="mutt">
-                    <xsl:attribute name="inputstring">${send_email.send_email_from_xml_parsed.build.xml.title}</xsl:attribute>
+                    <xsl:attribute name="inputstring">${send_email.send_email_from_xml_parsed.build.xml.title}<xsl:text> </xsl:text><xsl:value-of select="string-join(send_email:send_email.send_email_from_xml_parsed.xml.child.CONTENT.TEXT/text(),' ')"/></xsl:attribute>
                     <xsl:if test="send_email:send_email.send_email_from_xml_parsed.xml.child[@REPLYTO]">
                         <env key="REPLYTO" value="{send_email:send_email.send_email_from_xml_parsed.xml.child[@REPLYTO][1]/text()}"/>
                     </xsl:if>
+                    <env key="LANG" value="en_US.UTF-8"/>
+                    <env key="LC_CTYPE" value="en_US.UTF-8"/>
                     <arg line='-a "{$out.pdf}"'/>
                     <!--<arg line='-s "Wiadomosc"'/>-->
                     <arg>
-                        <xsl:attribute name="line">-s &quot;${send_email.send_email_from_xml_parsed.build.xml.title}&quot;</xsl:attribute>
+                        <xsl:attribute name="line">-s &quot;${send_email.send_email_from_xml_parsed.build.xml.title}<xsl:text> </xsl:text><xsl:value-of select="string-join(send_email:send_email.send_email_from_xml_parsed.xml.child.CONTENT.TEXT/text(),' ')"/>&quot;</xsl:attribute>
                     </arg>
                     <arg line='-e "set copy = no"'/>
+                    <xsl:if test="send_email:send_email.send_email_from_xml_parsed.xml.child.FROM">
+                        <arg line="-e &quot;my_hdr From: {send_email:send_email.send_email_from_xml_parsed.xml.child.FROM[1]/text()} &lt;{$REPLYTO}&gt;&quot;"/>
+                    </xsl:if>
                     <arg line='-F /dev/null'/>
                     <arg>
                         <xsl:attribute name="line"><xsl:text>-- </xsl:text>
@@ -116,18 +140,24 @@
                             <message>Test wiadomosci</message>
                         </mail>-->
                         <exec executable="mutt">
-                            <xsl:attribute name="inputstring">${send_email.send_email_from_xml_parsed.build.xml.title}</xsl:attribute>
+                            <xsl:attribute name="inputstring">${send_email.send_email_from_xml_parsed.build.xml.title}<xsl:text> </xsl:text><xsl:value-of select="string-join(parent::*//send_email:send_email.send_email_from_xml_parsed.xml.child.CONTENT.TEXT/text(),' ')"/>
+                            </xsl:attribute>
                             <xsl:if test="string-length($REPLYTO) &gt;0">
                                 <env key="REPLYTO" value="{$REPLYTO}"/>
                             </xsl:if>
+                            <env key="LANG" value="en_US.UTF-8"/>
+                            <env key="LC_CTYPE" value="en_US.UTF-8"/>
                             <arg line='-a "{$out.pdf}"'/>
                             <!--<arg line='-s "Wiadomosc"'/>-->
                             <arg>
-                                <xsl:attribute name="line">-s &quot;${send_email.send_email_from_xml_parsed.build.xml.title}&quot;</xsl:attribute>
+                                <xsl:attribute name="line">-s &quot;${send_email.send_email_from_xml_parsed.build.xml.title}<xsl:text> </xsl:text><xsl:value-of select="string-join(parent::*//send_email:send_email.send_email_from_xml_parsed.xml.child.CONTENT.TEXT/text(),' ')"/>&quot;</xsl:attribute>
                             </arg>
                             <arg line='-F /dev/null'/>
                             <!--<arg line='&lt; /dev/null'/>-->
                             <arg line='-e "set copy = no"'/>
+                            <xsl:if test="parent::*//send_email:send_email.send_email_from_xml_parsed.xml.child.FROM">
+                                <arg line="-e &quot;my_hdr From: {parent::*//send_email:send_email.send_email_from_xml_parsed.xml.child.FROM[1]/text()} &lt;{$REPLYTO}&gt;&quot;"/>
+                            </xsl:if>
                             <arg line='--  {text()}'/>
                         </exec>
                     </target>

SE/schema/ant-url_action/default_db.in7_dziennik_koresp/pismo/ADMIN_USERS.dita

@@ -9,6 +9,17 @@
     <title><ph>Załącznik do umowy - dane dostępowe oraz wyposazenia dla </ph><ph xpath="ID"/><ph>-</ph><ph xpath="ADM_NAME"/>
     </title>
     <body>    
+      <foreign>
+        <RelatedFeature xpath="ADM_ACCOUNT" xpath_value="../L_APPOITMENT_USER" typeName="p5_default_db:ADMIN_USERS" typeNameRealResource="p5_default_db:ADMIN_USERS">
+          <ph xpath="EMAIL_LOCAL_ACCOUNT_ADDRESS" xpath_token_filter=" " xpath_token="1" REPLYTO="1"/>
+          <ph xpath="ADM_NAME"  FROM="1"/>
+        </RelatedFeature>
+        <RelatedFeature xpath="ADM_ACCOUNT" xpath_value="../A_RECORD_UPDATE_AUTHOR" typeName="p5_default_db:ADMIN_USERS" typeNameRealResource="p5_default_db:ADMIN_USERS">
+          <ph xpath="EMAIL_LOCAL_ACCOUNT_ADDRESS" xpath_token_filter=" " xpath_token="1" REPLYTO="1"/>
+          <ph xpath="ADM_NAME"  FROM="1"/>
+        </RelatedFeature>
+        <ph xpath="A_STATUS_INFO"  CONTENT.TEXT="1"/>
+      </foreign>
       <p><b>Dane logowania:</b> 
       <ol>
         <li>Nazwa konta do logowania: <codeph><ph xpath="ADM_ACCOUNT"></ph></codeph>

SE/schema/ant-url_action/default_db.in7_dziennik_koresp/pismo/IN7_DZIENNIK_KORESP.dita

@@ -76,11 +76,13 @@
     <foreign>
       <RelatedFeature xpath="ADM_ACCOUNT" xpath_value="../L_APPOITMENT_USER" typeName="p5_default_db:ADMIN_USERS" typeNameRealResource="p5_default_db:ADMIN_USERS">
         <ph xpath="EMAIL_LOCAL_ACCOUNT_ADDRESS" xpath_token_filter=" " xpath_token="1" REPLYTO="1"/>
+        <ph xpath="ADM_NAME"  FROM="1"/>
       </RelatedFeature>
       <RelatedFeature xpath="ADM_ACCOUNT" xpath_value="../A_RECORD_UPDATE_AUTHOR" typeName="p5_default_db:ADMIN_USERS" typeNameRealResource="p5_default_db:ADMIN_USERS">
         <ph xpath="EMAIL_LOCAL_ACCOUNT_ADDRESS" xpath_token_filter=" " xpath_token="1" REPLYTO="1"/>
+        <ph xpath="ADM_NAME"  FROM="1"/>
       </RelatedFeature>
-      <ph xpath="A_STATUS_INFO"/>
+      <ph xpath="A_STATUS_INFO"  CONTENT.TEXT="1"/>
       <ph xpath="K_ZNAK_REFERENTA"/>
       
     </foreign>

SE/schema/ant-url_action/default_db.in7_dziennik_koresp/umowa/IN7_DZIENNIK_KORESP.dita

@@ -80,10 +80,13 @@
       <foreign>
         <RelatedFeature xpath="ADM_ACCOUNT" xpath_value="../L_APPOITMENT_USER" typeName="p5_default_db:ADMIN_USERS" typeNameRealResource="p5_default_db:ADMIN_USERS">
           <ph xpath="EMAIL_LOCAL_ACCOUNT_ADDRESS" xpath_token_filter=" " xpath_token="1" REPLYTO="1"/>
+          <ph xpath="ADM_NAME"  FROM="1"/>
         </RelatedFeature>
         <RelatedFeature xpath="ADM_ACCOUNT" xpath_value="../A_RECORD_UPDATE_AUTHOR" typeName="p5_default_db:ADMIN_USERS" typeNameRealResource="p5_default_db:ADMIN_USERS">
           <ph xpath="EMAIL_LOCAL_ACCOUNT_ADDRESS" xpath_token_filter=" " xpath_token="1" REPLYTO="1"/>
+          <ph xpath="ADM_NAME"  FROM="1"/>
         </RelatedFeature>
+        <ph xpath="A_STATUS_INFO"  CONTENT.TEXT="1"/>
       </foreign>
       
       <RelatedFeature xpath="ID" xpath_value="../ID_PROJECT" typeName="p5_default_db:IN7_MK_BAZA_DYSTRYBUCJI" typeNameRealResource="p5_default_db:IN7_MK_BAZA_DYSTRYBUCJI">

SE/schema/default_db_xml_cache/build_complexType.xsl

@@ -5,8 +5,11 @@
     xmlns:system_cache__appinfo="http://biuro.biall-net.pl/xmlschema_procesy5/default_db_xml_cache/appinfo.xsd"
     xmlns:hfp="http://www.w3.org/2001/XMLSchema-hasFacetAndProperty"
     xmlns:p5="https://biuro.biall-net.pl/wfs"
+    xmlns:ogc="http://www.opengis.net/ogc"
+    xmlns:fes="http://www.opengis.net/fes/2.0"
     xmlns:system_cache__resources_tree_generate_xsl_required_occurs_raport="http://biuro.biall-net.pl/xmlschema_procesy5/system_cache/resources_tree_generate_xsl_require_occurs_raport"
     xmlns:xp5r="http://biuro.biall-net.pl/xmlschema_procesy5/default_db_xml_cache.public/xinclude_p5_recurse/xinclude_p5_recurse.xsd"
+    xmlns:p5Type="http://biuro.biall-net.pl/p5/schema/types"
     exclude-result-prefixes="xs exslt system_cache__appinfo xsl hfp" version="2.0">
     <!-- @2016-01-04 TODO simpleContent na restrykcjach do zrobienia i przetestowania
     @2016-01-15 TODO nie prawidlowo generuje sie dla element simpleContent type string z atrybutem  name="NAZDOD" id="TERYT_terc_xml_import_after_main___d44e184" - brakuje informacji, ze pole jest stringiem itp... -->
@@ -18,7 +21,7 @@
     
     
     <xsl:output indent="yes"/>
-    <xsl:param name="system_cache__appinfo:path.2863.len.limit" select="800"/>
+    <xsl:param name="system_cache__appinfo:path.2863.len.limit" select="500"/>
     <xsl:param name="debug_level_param" /><!-- select="4" -->
     
     <xsl:param name="default_db.instance.xml" required="yes"/>
@@ -41,7 +44,7 @@
     <xsl:variable name="debug_level">
         <xsl:choose>
             <xsl:when test="$debug_level_param"><xsl:value-of select="$debug_level_param"/></xsl:when>
-            <xsl:otherwise><xsl:value-of select="4"/></xsl:otherwise>
+            <xsl:otherwise><xsl:value-of select="1"/></xsl:otherwise>
         </xsl:choose>
     </xsl:variable>
     
@@ -474,6 +477,16 @@
     <xsl:template match="*" mode="system_cache__appinfo:remove_duplicate_elements" xpath-default-namespace="http://www.w3.org/2001/XMLSchema">
         <!--<xsl:message>#451 rem dupl matched name()<xsl:value-of select="name()"/>;  @name<xsl:value-of select="@name"/>; @id=<xsl:value-of select="@id"/></xsl:message>-->
         <xsl:element name="{name()}">
+            <xsl:choose>
+                <xsl:when test="string-length(system_cache__appinfo:get_object_prefix.on_error_empty(name())) &gt;0 and string-length(system_cache__appinfo:targetNamespace_from_prefix($system_cache__appinfo:vrtfNamespaces, system_cache__appinfo:get_object_prefix(name()))) &gt;0">
+                    <xsl:if test="number($debug_level) &gt;2"><xsl:message>#481 try to set NS for el="<xsl:value-of select="name()"/>" =="<xsl:value-of select="system_cache__appinfo:targetNamespace_from_prefix($system_cache__appinfo:vrtfNamespaces, system_cache__appinfo:get_object_prefix(name()))"/>"; system_cache__appinfo:get_object_prefix="<xsl:value-of select="system_cache__appinfo:get_object_prefix(name())"/>"</xsl:message></xsl:if>
+                    <xsl:namespace name="{system_cache__appinfo:get_object_prefix(name())}" select="system_cache__appinfo:targetNamespace_from_prefix($system_cache__appinfo:vrtfNamespaces, system_cache__appinfo:get_object_prefix(name()))"/>
+                </xsl:when>
+                <xsl:when test="string-length(system_cache__appinfo:get_object_prefix.on_error_empty(name())) &gt;0 ">
+                    <xsl:if test="number($debug_level) &gt;2"><xsl:message>#481-B NOT try to set NS for el="<xsl:value-of select="name()"/>" =="<xsl:value-of select="system_cache__appinfo:targetNamespace_from_prefix($system_cache__appinfo:vrtfNamespaces, system_cache__appinfo:get_object_prefix(name()))"/>"; system_cache__appinfo:get_object_prefix="<xsl:value-of select="system_cache__appinfo:get_object_prefix(name())"/>"</xsl:message></xsl:if>
+                </xsl:when>
+            </xsl:choose>
+            
             <xsl:apply-templates mode="#current" select="@*"/>
             <xsl:apply-templates mode="#current"/>
         </xsl:element>