a.binder 9 лет назад
Родитель
Сommit
b872c1e880

+ 7 - 9
SE/schema/ant-url_action/default_db.crm_proces/CRM_PROCES_tree/build.xml

@@ -49,6 +49,8 @@
     <property name="xpath" value="${xpath}"/> <!-- to be set initially like as key to search ID  -->
     <property name="xpath_value" value="${xpath_value}"/> <!-- to be set initially like 1000 (to search ID=1000, if ID we get by featureID  -->
     
+    <property name="loop_path" value=""/>  <!-- w przypadku podania, system powinien w tym katalogu zapisywac wynik xml dzialania, azeby odbudowac rekursywne drzewo - zapisujemy po system_cache__appinfo:id np bedzie ${temp}/${uuid}_CRM_PROCES___d14e4479-1_PROCES_BEN/  -->
+    
     <!-- variables to first transform of doc for then get related features -->
     <!--<property name="default_db_xml_cache.public" value="../../../default_db_xml_cache.public"/>--> <!-- katalog z xsl z projektu src-xmlschema.git -->
     
@@ -257,6 +259,10 @@
                     
                     <target name="xml_recursed_from_tr_map" depends="install_folders,uuid_check,typeName_check,xpath_check,xpath_value_check,passwordBase64Basic_check,check_tr_map" description="Buduje wyjsciowego XMLa na podstawie mapy transportowej dla zastosowan w API DEVEL">
                         <echo message="OUTPUT__START"/>
+                        
+                        <!-- TODO proba wlaczenia rekursywnosci zapisanie wezla do sciezki w folderze-->
+                        <copy file="${out_task.dita.final}" tofile="${temp}/${loop_path}/${uuid_tested}.loop_path.xml" />
+                        
                         <move file="${out_task.dita.final}" tofile="${out_task.dita.final}.xml"/>
                         
                         <echo>
@@ -351,7 +357,7 @@
    
    
     <target name="clean_temp_dir" description="URL_TASK Target clean_temp_dir">
-        <delete>
+        <delete includeemptydirs="yes">
             <fileset dir="${temp}"/>
         </delete>        
         <echo message="OUTPUT__START"/>   
@@ -362,7 +368,6 @@
     <!-- wygenerowanie ant builda do sciagniecia niezbednego elementu na podstawie template main.dita i tam zagniezdzonego RelatedFeature-->
     <target name="build_recurse_ant.xml" depends="php_session_id_check,main_build_recurse_ant.dita_with_id,main_build_recurse_ant.tr_map_with_id">
         <!-- build do wytworzenia pierwszego przetworzenia zagniezdzen -->
-        
         <property name="loop_xpath"  value="root"/>
         <property name="build_recurse_ant.xml" value="${temp}/${uuid_tested}.build_${loop_xpath}.xml"/>
         <echo>#113 ant build_recurse_ant.xml=${build_recurse_ant.xml}; </echo>
@@ -402,9 +407,6 @@
         <!-- pozbierac wszystkie do kupy xmle  -->
     </target>
     
-    
-    
-    
     <target name="build_recurse_ant_merge_dita_from_temp.xsl" depends="build_recurse_ant.xml" description="z plikow temp/$uuid.* buduje $out_task.dita.final ">
         <xslt basedir="./" style="${build_recurse_ant_merge_dita_from_temp.xsl}" in="${main_build_recurse_ant.dita_with_id}"  destdir="./" out="${out_task.dita.final}" >
             <factory name="net.sf.saxon.TransformerFactoryImpl">    
@@ -421,8 +423,6 @@
     </target>
 
 
-
-
     <target name="buildpdf_recursed" depends="uuid_check,typeName_check,xpath_check,xpath_value_check,passwordBase64Basic_check,php_session_id_check,check_dita" if="${test_if_dita}">
         <property name="dita.dir" location="/Library/Server/Web/Data/Sites/Default/SE/stuff/dita-ot-2.3.3/bin/dita"/>
         <exec executable="${dita.dir}" dir=".">
@@ -464,7 +464,5 @@
     </target>
 
 
-
-    
     
 </project>

+ 153 - 91
SE/schema/table/CRM_PROCES.xsd

@@ -4,8 +4,8 @@
            xmlns:vc="http://www.w3.org/2007/XMLSchema-versioning"
            xmlns:gml="http://www.opengis.net/gml/3.2"
            xmlns:default_db__x3A__CRM_WSKAZNIK="https://biuro.biall-net.pl/wfs/default_db/table/CRM_WSKAZNIK.xsd"
-           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:system_cache__appinfo="http://biuro.biall-net.pl/xmlschema_procesy5/default_db_xml_cache/appinfo.xsd"
            elementFormDefault="qualified"
            targetNamespace="https://biuro.biall-net.pl/wfs/default_db/table/CRM_PROCES.xsd"
            vc:minVersion="1.0"
@@ -14,6 +14,42 @@
               schemaLocation="../Types/gml.xsd"/>
    <xs:import namespace="https://biuro.biall-net.pl/wfs/default_db/table/CRM_WSKAZNIK.xsd"
               schemaLocation="CRM_WSKAZNIK.xsd"/>
+   <xs:simpleType name="TYPE_Simple" id="_CRM_PROCES___d20e4484-1_TYPE_Simpl">
+      <xs:restriction base="xs:string">
+         <xs:enumeration value="PROCES_INIT"/>
+         <xs:enumeration value="PROCES_GROUP_1"/>
+         <xs:enumeration value="PROCES_GROUP_2"/>
+         <xs:enumeration value="PROCES_BENEFIT_INFO"/>
+         <xs:enumeration value="PROCES"/>
+         <xs:enumeration value="TEXT_BREAK"/>
+      </xs:restriction>
+   </xs:simpleType>
+   <xs:simpleType name="PROCES_INIT_Simple" id="_CRM_PROCES___d20e4492-1_PROCES_INI">
+      <xs:restriction base="default_db__x3A__CRM_PROCES:TYPE_Simple">
+         <xs:enumeration value="PROCES_INIT"/>
+      </xs:restriction>
+   </xs:simpleType>
+   <xs:simpleType name="PROCES_Simple" id="_CRM_PROCES___d20e4495-1_PROCES_Sim">
+      <xs:restriction base="default_db__x3A__CRM_PROCES:TYPE_Simple">
+         <xs:enumeration value="PROCES"/>
+      </xs:restriction>
+   </xs:simpleType>
+   <xs:simpleType name="PROCES_GROUP_1_Simple" id="_CRM_PROCES___d20e4498-1_PROCES_GRO">
+      <xs:restriction base="default_db__x3A__CRM_PROCES:TYPE_Simple">
+         <xs:enumeration value="PROCES_GROUP_1"/>
+      </xs:restriction>
+   </xs:simpleType>
+   <xs:simpleType name="PROCES_GROUP_2_Simple" id="_CRM_PROCES___d20e4501-1_PROCES_GRO">
+      <xs:restriction base="default_db__x3A__CRM_PROCES:TYPE_Simple">
+         <xs:enumeration value="PROCES_GROUP_2"/>
+      </xs:restriction>
+   </xs:simpleType>
+   <xs:simpleType name="PROCES_BENEFIT_INFO_Simple"
+                  id="_CRM_PROCES___d20e4504-1_PROCES_BEN">
+      <xs:restriction base="default_db__x3A__CRM_PROCES:TYPE_Simple">
+         <xs:enumeration value="PROCES_BENEFIT_INFO"/>
+      </xs:restriction>
+   </xs:simpleType>
    <xs:complexType name="CRM_PROCES" id="_CRM_PROCES___d14e4403-1_CRM_PROCES">
       <xs:sequence id="_CRM_PROCES___d14e4404-1">
          <xs:element name="ID" type="xs:int" id="_CRM_PROCES___d14e4405-1_ID"/>
@@ -33,6 +69,9 @@
          </xs:element>
          <xs:element name="path" type="xs:string" id="_CRM_PROCES___d14e4406-1_path"/>
          <xs:element name="DESC" type="xs:string" id="_CRM_PROCES___d20e4587-1_DESC"/>
+         <xs:element name="TYPE"
+                     type="default_db__x3A__CRM_PROCES:TYPE_Simple"
+                     id="_CRM_PROCES___d20e4519-1_TYPE"/>
          <xs:element maxOccurs="unbounded"
                      minOccurs="0"
                      ref="default_db__x3A__CRM_PROCES:PROCES_INIT"
@@ -55,7 +94,7 @@
                <xs:appinfo>
                   <system_cache__appinfo:flat_relation_cache>
                      <system_cache__appinfo:source system_cache__appinfo:name="ID"
-                        system_cache__appinfo:xpath="default_db__x3A__CRM_PROCES:CRM_PROCES/PARENT_ID"/>
+                                                   system_cache__appinfo:xpath="default_db__x3A__CRM_PROCES:CRM_PROCES/PARENT_ID"/>
                   </system_cache__appinfo:flat_relation_cache>
                </xs:appinfo>
                <xs:documentation>Tutaj nie dajemy appinfo relation cache - tylko w PARENT_ID do przetworzenia w celu odbudowania</xs:documentation>
@@ -64,15 +103,17 @@
          <xs:element maxOccurs="unbounded"
                      minOccurs="0"
                      ref="default_db__x3A__CRM_PROCES:PROCES_GROUP_1"
-                     id="_CRM_PROCES___d14e4409-1"><xs:annotation>
-                        <xs:appinfo>
-                           <system_cache__appinfo:flat_relation_cache>
-                              <system_cache__appinfo:source system_cache__appinfo:name="ID"
-                                 system_cache__appinfo:xpath="default_db__x3A__CRM_PROCES:CRM_PROCES/PARENT_ID"/>
-                           </system_cache__appinfo:flat_relation_cache>
-                        </xs:appinfo>
-                        <xs:documentation>Tutaj nie dajemy appinfo relation cache - tylko w PARENT_ID do przetworzenia w celu odbudowania</xs:documentation>
-                     </xs:annotation></xs:element>
+                     id="_CRM_PROCES___d14e4409-1">
+            <xs:annotation>
+               <xs:appinfo>
+                  <system_cache__appinfo:flat_relation_cache>
+                     <system_cache__appinfo:source system_cache__appinfo:name="ID"
+                                                   system_cache__appinfo:xpath="default_db__x3A__CRM_PROCES:CRM_PROCES/PARENT_ID"/>
+                  </system_cache__appinfo:flat_relation_cache>
+               </xs:appinfo>
+               <xs:documentation>Tutaj nie dajemy appinfo relation cache - tylko w PARENT_ID do przetworzenia w celu odbudowania</xs:documentation>
+            </xs:annotation>
+         </xs:element>
          <xs:element maxOccurs="unbounded"
                      minOccurs="0"
                      ref="default_db__x3A__CRM_PROCES:PROCES_GROUP_2"
@@ -81,7 +122,7 @@
                <xs:appinfo>
                   <system_cache__appinfo:flat_relation_cache>
                      <system_cache__appinfo:source system_cache__appinfo:name="ID"
-                        system_cache__appinfo:xpath="default_db__x3A__CRM_PROCES:PROCES_GROUP_2/PARENT_ID"/>
+                                                   system_cache__appinfo:xpath="default_db__x3A__CRM_PROCES:PROCES_GROUP_2/PARENT_ID"/>
                   </system_cache__appinfo:flat_relation_cache>
                </xs:appinfo>
                <xs:documentation>Tutaj nie dajemy appinfo relation cache - tylko w PARENT_ID do przetworzenia w celu odbudowania</xs:documentation>
@@ -95,7 +136,7 @@
                <xs:appinfo>
                   <system_cache__appinfo:flat_relation_cache>
                      <system_cache__appinfo:source system_cache__appinfo:name="ID"
-                        system_cache__appinfo:xpath="default_db__x3A__CRM_PROCES:PROCES_BENEFIT_INFO/PARENT_ID"/>
+                                                   system_cache__appinfo:xpath="default_db__x3A__CRM_PROCES:PROCES_BENEFIT_INFO/PARENT_ID"/>
                   </system_cache__appinfo:flat_relation_cache>
                </xs:appinfo>
                <xs:documentation>Tutaj nie dajemy appinfo relation cache - tylko w PARENT_ID do przetworzenia w celu odbudowania</xs:documentation>
@@ -109,7 +150,7 @@
                <xs:appinfo>
                   <system_cache__appinfo:flat_relation_cache>
                      <system_cache__appinfo:source system_cache__appinfo:name="ID"
-                        system_cache__appinfo:xpath="default_db__x3A__CRM_WSKAZNIK:CRM_WSKAZNIK/ID_PROCES"/>
+                                                   system_cache__appinfo:xpath="default_db__x3A__CRM_WSKAZNIK:CRM_WSKAZNIK/ID_PROCES"/>
                   </system_cache__appinfo:flat_relation_cache>
                </xs:appinfo>
             </xs:annotation>
@@ -131,7 +172,7 @@
                      <xs:appinfo>
                         <system_cache__appinfo:flat_relation_cache>
                            <system_cache__appinfo:source system_cache__appinfo:name="ID"
-                              system_cache__appinfo:xpath="default_db__x3A__CRM_PROCES:CRM_PROCES/PARENT_ID"/>
+                                                         system_cache__appinfo:xpath="default_db__x3A__CRM_PROCES:CRM_PROCES/PARENT_ID"/>
                         </system_cache__appinfo:flat_relation_cache>
                      </xs:appinfo>
                      <xs:documentation>xpath="default_db__x3A__CRM_PROCES:CRM_PROCES/ID
@@ -140,6 +181,9 @@
                </xs:element>
                <xs:element name="path" type="xs:string" id="_CRM_PROCES___d14e4419-1_path"/>
                <xs:element name="DESC" type="xs:string" id="_CRM_PROCES___d20e4601-1_DESC"/>
+               <xs:element name="TYPE"
+                           type="default_db__x3A__CRM_PROCES:PROCES_INIT_Simple"
+                           id="_CRM_PROCES___d20e4575-1_TYPE"/>
                <xs:element maxOccurs="0"
                            minOccurs="0"
                            ref="default_db__x3A__CRM_PROCES:PROCES_INIT"
@@ -148,7 +192,7 @@
                      <xs:appinfo>
                         <system_cache__appinfo:flat_relation_cache>
                            <system_cache__appinfo:source system_cache__appinfo:name="ID"
-                              system_cache__appinfo:xpath="default_db__x3A__CRM_PROCES:PROCES_INIT/PARENT_ID"/>
+                                                         system_cache__appinfo:xpath="default_db__x3A__CRM_PROCES:PROCES_INIT/PARENT_ID"/>
                         </system_cache__appinfo:flat_relation_cache>
                      </xs:appinfo>
                      <xs:documentation>xpath="default_db__x3A__CRM_PROCES:CRM_PROCES/ID
@@ -163,7 +207,7 @@
                      <xs:appinfo>
                         <system_cache__appinfo:flat_relation_cache>
                            <system_cache__appinfo:source system_cache__appinfo:name="ID"
-                              system_cache__appinfo:xpath="default_db__x3A__CRM_PROCES:CRM_PROCES/PARENT_ID"/>
+                                                         system_cache__appinfo:xpath="default_db__x3A__CRM_PROCES:CRM_PROCES/PARENT_ID"/>
                         </system_cache__appinfo:flat_relation_cache>
                      </xs:appinfo>
                      <xs:documentation>xpath="default_db__x3A__CRM_PROCES:CRM_PROCES/ID
@@ -174,16 +218,17 @@
                            minOccurs="0"
                            ref="default_db__x3A__CRM_PROCES:PROCES_GROUP_1"
                            id="_CRM_PROCES___d14e4422-1">
-                           <xs:annotation>
-                              <xs:appinfo>
-                                 <system_cache__appinfo:flat_relation_cache>
-                                    <system_cache__appinfo:source system_cache__appinfo:name="ID"
-                                       system_cache__appinfo:xpath="default_db__x3A__CRM_PROCES:PROCES_GROUP_1/PARENT_ID"/>
-                                 </system_cache__appinfo:flat_relation_cache>
-                              </xs:appinfo>
-                              <xs:documentation>xpath="default_db__x3A__CRM_PROCES:PROCES_GROUP_1/ID
+                  <xs:annotation>
+                     <xs:appinfo>
+                        <system_cache__appinfo:flat_relation_cache>
+                           <system_cache__appinfo:source system_cache__appinfo:name="ID"
+                                                         system_cache__appinfo:xpath="default_db__x3A__CRM_PROCES:PROCES_GROUP_1/PARENT_ID"/>
+                        </system_cache__appinfo:flat_relation_cache>
+                     </xs:appinfo>
+                     <xs:documentation>xpath="default_db__x3A__CRM_PROCES:PROCES_GROUP_1/ID
                               </xs:documentation>
-                           </xs:annotation></xs:element>
+                  </xs:annotation>
+               </xs:element>
                <xs:element maxOccurs="0"
                            minOccurs="0"
                            ref="default_db__x3A__CRM_PROCES:PROCES_GROUP_2"
@@ -192,7 +237,7 @@
                      <xs:appinfo>
                         <system_cache__appinfo:flat_relation_cache>
                            <system_cache__appinfo:source system_cache__appinfo:name="ID"
-                              system_cache__appinfo:xpath="default_db__x3A__CRM_PROCES:PROCES_GROUP_2/PARENT_ID"/>
+                                                         system_cache__appinfo:xpath="default_db__x3A__CRM_PROCES:PROCES_GROUP_2/PARENT_ID"/>
                         </system_cache__appinfo:flat_relation_cache>
                      </xs:appinfo>
                      <xs:documentation>xpath="default_db__x3A__CRM_PROCES:PROCES_GROUP_1/ID
@@ -203,29 +248,29 @@
                            minOccurs="0"
                            ref="default_db__x3A__CRM_PROCES:PROCES_BENEFIT_INFO"
                            id="_CRM_PROCES___d14e4424-1">
-                        <xs:annotation>
-                           <xs:appinfo>
-                              <system_cache__appinfo:flat_relation_cache>
-                                 <system_cache__appinfo:source system_cache__appinfo:name="ID"
-                                    system_cache__appinfo:xpath="default_db__x3A__CRM_PROCES:PROCES_BENEFIT_INFO/PARENT_ID"/>
-                              </system_cache__appinfo:flat_relation_cache>
-                           </xs:appinfo>
-                           <xs:documentation>xpath="default_db__x3A__CRM_PROCES:CRM_PROCES/ID
+                  <xs:annotation>
+                     <xs:appinfo>
+                        <system_cache__appinfo:flat_relation_cache>
+                           <system_cache__appinfo:source system_cache__appinfo:name="ID"
+                                                         system_cache__appinfo:xpath="default_db__x3A__CRM_PROCES:PROCES_BENEFIT_INFO/PARENT_ID"/>
+                        </system_cache__appinfo:flat_relation_cache>
+                     </xs:appinfo>
+                     <xs:documentation>xpath="default_db__x3A__CRM_PROCES:CRM_PROCES/ID
                            </xs:documentation>
-                        </xs:annotation>
+                  </xs:annotation>
                </xs:element>
                <xs:element maxOccurs="unbounded"
                            minOccurs="0"
                            ref="default_db__x3A__CRM_WSKAZNIK:CRM_WSKAZNIK"
                            id="_CRM_PROCES___d14e4425-1">
-                           <xs:annotation>
-                              <xs:appinfo>
-                                 <system_cache__appinfo:flat_relation_cache>
-                                    <system_cache__appinfo:source system_cache__appinfo:name="ID"
-                                       system_cache__appinfo:xpath="default_db__x3A__CRM_WSKAZNIK:CRM_WSKAZNIK/ID_PROCES"/>
-                                 </system_cache__appinfo:flat_relation_cache>
-                              </xs:appinfo>
-                           </xs:annotation>
+                  <xs:annotation>
+                     <xs:appinfo>
+                        <system_cache__appinfo:flat_relation_cache>
+                           <system_cache__appinfo:source system_cache__appinfo:name="ID"
+                                                         system_cache__appinfo:xpath="default_db__x3A__CRM_WSKAZNIK:CRM_WSKAZNIK/ID_PROCES"/>
+                        </system_cache__appinfo:flat_relation_cache>
+                     </xs:appinfo>
+                  </xs:annotation>
                </xs:element>
             </xs:sequence>
          </xs:restriction>
@@ -255,6 +300,9 @@
                </xs:element>
                <xs:element name="path" type="xs:string" id="_CRM_PROCES___d14e4432-1_path"/>
                <xs:element name="DESC" type="xs:string" id="_CRM_PROCES___d20e4615-1_DESC"/>
+               <xs:element name="TYPE"
+                           type="default_db__x3A__CRM_PROCES:PROCES_GROUP_1_Simple"
+                           id="_CRM_PROCES___d20e4632-1_TYPE"/>
                <xs:element maxOccurs="unbounded"
                            minOccurs="0"
                            ref="default_db__x3A__CRM_PROCES:PROCES_INIT"
@@ -263,7 +311,7 @@
                      <xs:appinfo>
                         <system_cache__appinfo:flat_relation_cache>
                            <system_cache__appinfo:source system_cache__appinfo:name="ID"
-                              system_cache__appinfo:xpath="default_db__x3A__CRM_PROCES:PROCES_INIT/PARENT_ID"/>
+                                                         system_cache__appinfo:xpath="default_db__x3A__CRM_PROCES:PROCES_INIT/PARENT_ID"/>
                         </system_cache__appinfo:flat_relation_cache>
                      </xs:appinfo>
                      <xs:documentation>xpath="default_db__x3A__CRM_PROCES:CRM_PROCES/PARENT_ID
@@ -278,7 +326,7 @@
                      <xs:appinfo>
                         <system_cache__appinfo:flat_relation_cache>
                            <system_cache__appinfo:source system_cache__appinfo:name="ID"
-                              system_cache__appinfo:xpath="default_db__x3A__CRM_PROCES:CRM_PROCES/PARENT_ID"/>
+                                                         system_cache__appinfo:xpath="default_db__x3A__CRM_PROCES:CRM_PROCES/PARENT_ID"/>
                         </system_cache__appinfo:flat_relation_cache>
                      </xs:appinfo>
                      <xs:documentation>xpath="default_db__x3A__CRM_PROCES:CRM_PROCES/PARENT_ID
@@ -293,7 +341,7 @@
                      <xs:appinfo>
                         <system_cache__appinfo:flat_relation_cache>
                            <system_cache__appinfo:source system_cache__appinfo:name="ID"
-                              system_cache__appinfo:xpath="default_db__x3A__CRM_PROCES:PROCES_GROUP_1/PARENT_ID"/>
+                                                         system_cache__appinfo:xpath="default_db__x3A__CRM_PROCES:PROCES_GROUP_1/PARENT_ID"/>
                         </system_cache__appinfo:flat_relation_cache>
                      </xs:appinfo>
                      <xs:documentation>xpath="default_db__x3A__CRM_PROCES:CRM_PROCES/PARENT_ID
@@ -308,7 +356,7 @@
                      <xs:appinfo>
                         <system_cache__appinfo:flat_relation_cache>
                            <system_cache__appinfo:source system_cache__appinfo:name="ID"
-                              system_cache__appinfo:xpath="default_db__x3A__CRM_PROCES:PROCES_GROUP_2/PARENT_ID"/>
+                                                         system_cache__appinfo:xpath="default_db__x3A__CRM_PROCES:PROCES_GROUP_2/PARENT_ID"/>
                         </system_cache__appinfo:flat_relation_cache>
                      </xs:appinfo>
                      <xs:documentation>xpath="default_db__x3A__CRM_PROCES:CRM_PROCES/PARENT_ID
@@ -323,7 +371,7 @@
                      <xs:appinfo>
                         <system_cache__appinfo:flat_relation_cache>
                            <system_cache__appinfo:source system_cache__appinfo:name="ID"
-                              system_cache__appinfo:xpath="default_db__x3A__CRM_PROCES:PROCES_BENEFIT_INFO/PARENT_ID"/>
+                                                         system_cache__appinfo:xpath="default_db__x3A__CRM_PROCES:PROCES_BENEFIT_INFO/PARENT_ID"/>
                         </system_cache__appinfo:flat_relation_cache>
                      </xs:appinfo>
                      <xs:documentation>xpath="default_db__x3A__CRM_PROCES:CRM_PROCES/PARENT_ID
@@ -338,7 +386,7 @@
                      <xs:appinfo>
                         <system_cache__appinfo:flat_relation_cache>
                            <system_cache__appinfo:source system_cache__appinfo:name="ID"
-                              system_cache__appinfo:xpath="default_db__x3A__CRM_WSKAZNIK:CRM_WSKAZNIK/ID_PROCES"/>
+                                                         system_cache__appinfo:xpath="default_db__x3A__CRM_WSKAZNIK:CRM_WSKAZNIK/ID_PROCES"/>
                         </system_cache__appinfo:flat_relation_cache>
                      </xs:appinfo>
                   </xs:annotation>
@@ -371,20 +419,24 @@
                </xs:element>
                <xs:element name="path" type="xs:string" id="_CRM_PROCES___d14e4445-1_path"/>
                <xs:element name="DESC" type="xs:string" id="_CRM_PROCES___d20e4629-1_DESC"/>
+               <xs:element name="TYPE"
+                           type="default_db__x3A__CRM_PROCES:PROCES_GROUP_2_Simple"
+                           id="_CRM_PROCES___d20e4688-1_TYPE"/>
                <xs:element maxOccurs="unbounded"
                            minOccurs="0"
                            ref="default_db__x3A__CRM_PROCES:PROCES_INIT"
                            id="_CRM_PROCES___d14e4446-1">
                   <xs:annotation>
-                              <xs:appinfo>
-                                 <system_cache__appinfo:flat_relation_cache>
-                                    <system_cache__appinfo:source system_cache__appinfo:name="ID"
-                                       system_cache__appinfo:xpath="default_db__x3A__CRM_PROCES:PROCES_INIT/PARENT_ID"/>
-                                 </system_cache__appinfo:flat_relation_cache>
-                              </xs:appinfo>
-                        <xs:documentation>xpath="default_db__x3A__CRM_PROCES:PROCES_INIT/PARENT_ID
+                     <xs:appinfo>
+                        <system_cache__appinfo:flat_relation_cache>
+                           <system_cache__appinfo:source system_cache__appinfo:name="ID"
+                                                         system_cache__appinfo:xpath="default_db__x3A__CRM_PROCES:PROCES_INIT/PARENT_ID"/>
+                        </system_cache__appinfo:flat_relation_cache>
+                     </xs:appinfo>
+                     <xs:documentation>xpath="default_db__x3A__CRM_PROCES:PROCES_INIT/PARENT_ID
                               </xs:documentation>
-                           </xs:annotation></xs:element>
+                  </xs:annotation>
+               </xs:element>
                <xs:element maxOccurs="0"
                            minOccurs="0"
                            ref="default_db__x3A__CRM_PROCES:CRM_PROCES"
@@ -393,7 +445,7 @@
                      <xs:appinfo>
                         <system_cache__appinfo:flat_relation_cache>
                            <system_cache__appinfo:source system_cache__appinfo:name="ID"
-                              system_cache__appinfo:xpath="default_db__x3A__CRM_PROCES:CRM_PROCES/PARENT_ID"/>
+                                                         system_cache__appinfo:xpath="default_db__x3A__CRM_PROCES:CRM_PROCES/PARENT_ID"/>
                         </system_cache__appinfo:flat_relation_cache>
                      </xs:appinfo>
                      <xs:documentation>xpath="default_db__x3A__CRM_PROCES:PROCES_INIT/PARENT_ID
@@ -408,7 +460,7 @@
                      <xs:appinfo>
                         <system_cache__appinfo:flat_relation_cache>
                            <system_cache__appinfo:source system_cache__appinfo:name="ID"
-                              system_cache__appinfo:xpath="default_db__x3A__CRM_PROCES:PROCES_GROUP_1/PARENT_ID"/>
+                                                         system_cache__appinfo:xpath="default_db__x3A__CRM_PROCES:PROCES_GROUP_1/PARENT_ID"/>
                         </system_cache__appinfo:flat_relation_cache>
                      </xs:appinfo>
                      <xs:documentation>xpath="default_db__x3A__CRM_PROCES:PROCES_INIT/PARENT_ID
@@ -423,7 +475,7 @@
                      <xs:appinfo>
                         <system_cache__appinfo:flat_relation_cache>
                            <system_cache__appinfo:source system_cache__appinfo:name="ID"
-                              system_cache__appinfo:xpath="default_db__x3A__CRM_PROCES:PROCES_GROUP_2/PARENT_ID"/>
+                                                         system_cache__appinfo:xpath="default_db__x3A__CRM_PROCES:PROCES_GROUP_2/PARENT_ID"/>
                         </system_cache__appinfo:flat_relation_cache>
                      </xs:appinfo>
                      <xs:documentation>xpath="default_db__x3A__CRM_PROCES:PROCES_INIT/PARENT_ID
@@ -438,7 +490,7 @@
                      <xs:appinfo>
                         <system_cache__appinfo:flat_relation_cache>
                            <system_cache__appinfo:source system_cache__appinfo:name="ID"
-                              system_cache__appinfo:xpath="default_db__x3A__CRM_PROCES:PROCES_BENEFIT_INFO/PARENT_ID"/>
+                                                         system_cache__appinfo:xpath="default_db__x3A__CRM_PROCES:PROCES_BENEFIT_INFO/PARENT_ID"/>
                         </system_cache__appinfo:flat_relation_cache>
                      </xs:appinfo>
                      <xs:documentation>xpath="default_db__x3A__CRM_PROCES:PROCES_INIT/PARENT_ID
@@ -453,7 +505,7 @@
                      <xs:appinfo>
                         <system_cache__appinfo:flat_relation_cache>
                            <system_cache__appinfo:source system_cache__appinfo:name="ID"
-                              system_cache__appinfo:xpath="default_db__x3A__CRM_WSKAZNIK:CRM_WSKAZNIK/ID_PROCES"/>
+                                                         system_cache__appinfo:xpath="default_db__x3A__CRM_WSKAZNIK:CRM_WSKAZNIK/ID_PROCES"/>
                         </system_cache__appinfo:flat_relation_cache>
                      </xs:appinfo>
                   </xs:annotation>
@@ -486,6 +538,9 @@
                </xs:element>
                <xs:element name="path" type="xs:string" id="_CRM_PROCES___d14e4458-1_path"/>
                <xs:element name="DESC" type="xs:string" id="_CRM_PROCES___d20e4643-1_DESC"/>
+               <xs:element name="TYPE"
+                           type="default_db__x3A__CRM_PROCES:TYPE_Simple"
+                           id="_CRM_PROCES___d20e4744-1_TYPE"/>
                <xs:element maxOccurs="0"
                            minOccurs="0"
                            ref="default_db__x3A__CRM_PROCES:PROCES_INIT"
@@ -494,7 +549,7 @@
                      <xs:appinfo>
                         <system_cache__appinfo:flat_relation_cache>
                            <system_cache__appinfo:source system_cache__appinfo:name="ID"
-                              system_cache__appinfo:xpath="default_db__x3A__CRM_PROCES:PROCES_INIT/PARENT_ID"/>
+                                                         system_cache__appinfo:xpath="default_db__x3A__CRM_PROCES:PROCES_INIT/PARENT_ID"/>
                         </system_cache__appinfo:flat_relation_cache>
                      </xs:appinfo>
                      <xs:documentation>xpath="default_db__x3A__CRM_PROCES:PROCES_INIT/PARENT_ID
@@ -509,7 +564,7 @@
                      <xs:appinfo>
                         <system_cache__appinfo:flat_relation_cache>
                            <system_cache__appinfo:source system_cache__appinfo:name="ID"
-                              system_cache__appinfo:xpath="default_db__x3A__CRM_PROCES:CRM_PROCES/PARENT_ID"/>
+                                                         system_cache__appinfo:xpath="default_db__x3A__CRM_PROCES:CRM_PROCES/PARENT_ID"/>
                         </system_cache__appinfo:flat_relation_cache>
                      </xs:appinfo>
                      <xs:documentation>xpath="default_db__x3A__CRM_PROCES:PROCES_INIT/PARENT_ID
@@ -524,7 +579,7 @@
                      <xs:appinfo>
                         <system_cache__appinfo:flat_relation_cache>
                            <system_cache__appinfo:source system_cache__appinfo:name="ID"
-                              system_cache__appinfo:xpath="default_db__x3A__CRM_PROCES:PROCES_GROUP_1/PARENT_ID"/>
+                                                         system_cache__appinfo:xpath="default_db__x3A__CRM_PROCES:PROCES_GROUP_1/PARENT_ID"/>
                         </system_cache__appinfo:flat_relation_cache>
                      </xs:appinfo>
                      <xs:documentation>xpath="default_db__x3A__CRM_PROCES:PROCES_INIT/PARENT_ID
@@ -539,7 +594,7 @@
                      <xs:appinfo>
                         <system_cache__appinfo:flat_relation_cache>
                            <system_cache__appinfo:source system_cache__appinfo:name="ID"
-                              system_cache__appinfo:xpath="default_db__x3A__CRM_PROCES:PROCES_GROUP_2/PARENT_ID"/>
+                                                         system_cache__appinfo:xpath="default_db__x3A__CRM_PROCES:PROCES_GROUP_2/PARENT_ID"/>
                         </system_cache__appinfo:flat_relation_cache>
                      </xs:appinfo>
                      <xs:documentation>xpath="default_db__x3A__CRM_PROCES:PROCES_INIT/PARENT_ID
@@ -554,7 +609,7 @@
                      <xs:appinfo>
                         <system_cache__appinfo:flat_relation_cache>
                            <system_cache__appinfo:source system_cache__appinfo:name="ID"
-                              system_cache__appinfo:xpath="default_db__x3A__CRM_PROCES:PROCES_BENEFIT_INFO/PARENT_ID"/>
+                                                         system_cache__appinfo:xpath="default_db__x3A__CRM_PROCES:PROCES_BENEFIT_INFO/PARENT_ID"/>
                         </system_cache__appinfo:flat_relation_cache>
                      </xs:appinfo>
                      <xs:documentation>xpath="default_db__x3A__CRM_PROCES:PROCES_BENEFIT_INFO/PARENT_ID
@@ -569,7 +624,7 @@
                      <xs:appinfo>
                         <system_cache__appinfo:flat_relation_cache>
                            <system_cache__appinfo:source system_cache__appinfo:name="ID"
-                              system_cache__appinfo:xpath="default_db__x3A__CRM_WSKAZNIK:CRM_WSKAZNIK/ID_PROCES"/>
+                                                         system_cache__appinfo:xpath="default_db__x3A__CRM_WSKAZNIK:CRM_WSKAZNIK/ID_PROCES"/>
                         </system_cache__appinfo:flat_relation_cache>
                      </xs:appinfo>
                   </xs:annotation>
@@ -602,35 +657,42 @@
                </xs:element>
                <xs:element name="path" type="xs:string" id="_CRM_PROCES___d14e4472-1_path"/>
                <xs:element name="DESC" type="xs:string" id="_CRM_PROCES___d20e4658-1_DESC"/>
+               <xs:element name="TYPE" id="_CRM_PROCES___d20e4800-1_TYPE">
+                  <xs:simpleType id="_CRM_PROCES___d20e4801-1">
+                     <xs:restriction base="default_db__x3A__CRM_PROCES:TYPE_Simple">
+                        <xs:enumeration value="PROCES_BENEFIT_INFO"/>
+                     </xs:restriction>
+                  </xs:simpleType>
+               </xs:element>
                <xs:element maxOccurs="0"
                            minOccurs="0"
                            ref="default_db__x3A__CRM_PROCES:PROCES_INIT"
                            id="_CRM_PROCES___d14e4473-1">
-                     <xs:annotation>
-                        <xs:appinfo>
-                           <system_cache__appinfo:flat_relation_cache>
-                              <system_cache__appinfo:source system_cache__appinfo:name="ID"
-                                 system_cache__appinfo:xpath="default_db__x3A__CRM_PROCES:PROCES_INIT/PARENT_ID"/>
-                           </system_cache__appinfo:flat_relation_cache>
-                        </xs:appinfo>
-                        <xs:documentation>xpath="default_db__x3A__CRM_PROCES:PROCES_INIT/PARENT_ID
+                  <xs:annotation>
+                     <xs:appinfo>
+                        <system_cache__appinfo:flat_relation_cache>
+                           <system_cache__appinfo:source system_cache__appinfo:name="ID"
+                                                         system_cache__appinfo:xpath="default_db__x3A__CRM_PROCES:PROCES_INIT/PARENT_ID"/>
+                        </system_cache__appinfo:flat_relation_cache>
+                     </xs:appinfo>
+                     <xs:documentation>xpath="default_db__x3A__CRM_PROCES:PROCES_INIT/PARENT_ID
                         </xs:documentation>
-                     </xs:annotation>
+                  </xs:annotation>
                </xs:element>
                <xs:element maxOccurs="0"
                            minOccurs="0"
                            ref="default_db__x3A__CRM_PROCES:CRM_PROCES"
                            id="_CRM_PROCES___d14e4474-1">
-                     <xs:annotation>
-                        <xs:appinfo>
-                           <system_cache__appinfo:flat_relation_cache>
-                              <system_cache__appinfo:source system_cache__appinfo:name="ID"
-                                 system_cache__appinfo:xpath="default_db__x3A__CRM_PROCES:CRM_PROCES/PARENT_ID"/>
-                           </system_cache__appinfo:flat_relation_cache>
-                        </xs:appinfo>
-                        <xs:documentation>xpath="default_db__x3A__CRM_PROCES:PROCES_INIT/PARENT_ID
+                  <xs:annotation>
+                     <xs:appinfo>
+                        <system_cache__appinfo:flat_relation_cache>
+                           <system_cache__appinfo:source system_cache__appinfo:name="ID"
+                                                         system_cache__appinfo:xpath="default_db__x3A__CRM_PROCES:CRM_PROCES/PARENT_ID"/>
+                        </system_cache__appinfo:flat_relation_cache>
+                     </xs:appinfo>
+                     <xs:documentation>xpath="default_db__x3A__CRM_PROCES:PROCES_INIT/PARENT_ID
                         </xs:documentation>
-                     </xs:annotation>
+                  </xs:annotation>
                </xs:element>
                <xs:element maxOccurs="0"
                            minOccurs="0"
@@ -640,7 +702,7 @@
                      <xs:appinfo>
                         <system_cache__appinfo:flat_relation_cache>
                            <system_cache__appinfo:source system_cache__appinfo:name="ID"
-                              system_cache__appinfo:xpath="default_db__x3A__CRM_PROCES:PROCES_GROUP_1/PARENT_ID"/>
+                                                         system_cache__appinfo:xpath="default_db__x3A__CRM_PROCES:PROCES_GROUP_1/PARENT_ID"/>
                         </system_cache__appinfo:flat_relation_cache>
                      </xs:appinfo>
                      <xs:documentation>xpath="default_db__x3A__CRM_PROCES:PROCES_INIT/PARENT_ID
@@ -655,7 +717,7 @@
                      <xs:appinfo>
                         <system_cache__appinfo:flat_relation_cache>
                            <system_cache__appinfo:source system_cache__appinfo:name="ID"
-                              system_cache__appinfo:xpath="default_db__x3A__CRM_PROCES:PROCES_GROUP_2/PARENT_ID"/>
+                                                         system_cache__appinfo:xpath="default_db__x3A__CRM_PROCES:PROCES_GROUP_2/PARENT_ID"/>
                         </system_cache__appinfo:flat_relation_cache>
                      </xs:appinfo>
                      <xs:documentation>xpath="default_db__x3A__CRM_PROCES:PROCES_INIT/PARENT_ID
@@ -670,7 +732,7 @@
                      <xs:appinfo>
                         <system_cache__appinfo:flat_relation_cache>
                            <system_cache__appinfo:source system_cache__appinfo:name="ID"
-                              system_cache__appinfo:xpath="default_db__x3A__CRM_PROCES:PROCES_BENEFIT_INFO/PARENT_ID"/>
+                                                         system_cache__appinfo:xpath="default_db__x3A__CRM_PROCES:PROCES_BENEFIT_INFO/PARENT_ID"/>
                         </system_cache__appinfo:flat_relation_cache>
                      </xs:appinfo>
                      <xs:documentation>xpath="default_db__x3A__CRM_PROCES:PROCES_BENEFIT_INFO/PARENT_ID
@@ -685,7 +747,7 @@
                      <xs:appinfo>
                         <system_cache__appinfo:flat_relation_cache>
                            <system_cache__appinfo:source system_cache__appinfo:name="ID"
-                              system_cache__appinfo:xpath="default_db__x3A__CRM_WSKAZNIK:CRM_WSKAZNIK/ID_PROCES"/>
+                                                         system_cache__appinfo:xpath="default_db__x3A__CRM_WSKAZNIK:CRM_WSKAZNIK/ID_PROCES"/>
                         </system_cache__appinfo:flat_relation_cache>
                      </xs:appinfo>
                   </xs:annotation>

+ 3 - 3
SE/superedit-INSTALL_SES_PROCESY_A.php

@@ -563,18 +563,18 @@ function INSTALL_GETCOMMANDS_XSL_ENGINES($ADMIN_USERNAME,$SERVER_ADDRESS_IP,$ADM
 // $cmd[]['rsh']='hdiutil mount /tmp/jdk-8u51-macosx-x64.dmg -mountpoint /Volumes/jdk-8u51-macosx-x64';
 // $cmd[]['rsh']='installer -package /Volumes/jdk-8u51-macosx-x64/JDK*.pkg -target "/" -verbose';
 //current 2017-03
- $cmd[]['scp_root']=array($INSTALL_ROOT,'/stuff/jre-8u121-macosx-x64.dmg','/tmp/jre-8u121-macosx-x64.dmg');
+ $cmd[]['scp_root']=array($INSTALL_ROOT.'/stuff/jre-8u121-macosx-x64.dmg','/tmp/jre-8u121-macosx-x64.dmg');
  $cmd[]['rsh']='hdiutil mount /tmp/jre-8u121-macosx-x64.dmg -mountpoint /Volumes/jre-8u121-macosx-x64';
  $cmd[]['rsh']='installer -package /Volumes/jre-8u121-macosx-x64/Java\ 8\ Update\ 121.app/Contents/Resources/JavaAppletPlugin.pkg -target "/" -verbose';
 //current dla dzialania dity
- $cmd[]['scp_root']=array($INSTALL_ROOT,'/stuff/jdk-8u121-macosx-x64.dmg','/tmp/jdk-8u121-macosx-x64.dmg');
+ $cmd[]['scp_root']=array($INSTALL_ROOT.'/stuff/jdk-8u121-macosx-x64.dmg','/tmp/jdk-8u121-macosx-x64.dmg');
  $cmd[]['rsh']='hdiutil mount /tmp/jdk-8u121-macosx-x64.dmg -mountpoint /Volumes/jdk-8u121-macosx-x64.dmg';
  $cmd[]['rsh']='installer -package /Volumes/jdk-8u121-macosx-x64.dmg/JDK\ 8\ Update\ 121.pkg -target "/" -verbose';
 
 
  $cmd[]['rsh']='port install saxon';
  //todo repo-13 do stuff
- $cmd[]['scp_root']=array($INSTALL_ROOT,'/stuff/expath-repo-0.13.1.zip','/tmp/expath-repo-0.13.1.zip');
+ $cmd[]['scp_root']=array($INSTALL_ROOT.'/stuff/expath-repo-0.13.1.zip','/tmp/expath-repo-0.13.1.zip');
  $cmd[]['rsh']='unzip /tmp/expath-repo-0.13.1.zip';
  $cmd[]['rsh']='export SAXON_HOME=/opt/local/share/java/';
  $cmd[]['rsh']='mkdir -p /opt/local/share/expath';