Bladeren bron

fixed PKD xsd

Piotr Labudda 8 jaren geleden
bovenliggende
commit
6519812bd7

+ 2 - 17
SE/schema/ant-object/default_db.BI_audit_KRS_PKD/BI_audit_KRS_PKD/BI_audit_KRS_PKD.xsd

@@ -17,10 +17,11 @@
               schemaLocation="../table/IN7_DZIENNIK_KORESP.xsd"/>
    <xs:import namespace="https://biuro.biall-net.pl/wfs/default_db/table/IN7_MK_BAZA_DYSTRYBUCJI.xsd"
               schemaLocation="../table/IN7_MK_BAZA_DYSTRYBUCJI.xsd"/>
+  -->
    <xs:import namespace="https://biuro.biall-net.pl/wfs/default_db/SystemObjects/AccessGroup.xsd"
               schemaLocation="../SystemObjects/AccessGroup.xsd"/>
    <xs:import namespace="https://biuro.biall-net.pl/wfs/default_db/SystemObjects/AccessOwner.xsd"
-              schemaLocation="../SystemObjects/AccessOwner.xsd"/>-->
+              schemaLocation="../SystemObjects/AccessOwner.xsd"/>
    <xs:simpleType name="A_STATUS_Type" id="dit_KRS_PKD___d5e17766-1_A_STATUS_T">
       <xs:restriction base="xs:string">
          <xs:enumeration value="NORMAL"/>
@@ -39,11 +40,7 @@
          <xs:element name="A_STATUS_INFO" type="xs:string" id="dit_KRS_PKD___d5e17778-1_A_STATUS_I"/>
          <xs:element name="L_APPOITMENT_USER" type="xs:string"
             id="dit_KRS_PKD___d5e17779-1_L_APPOITME"/>
-<<<<<<< HEAD
-         <!--<xs:element ref="SystemObjects__x3A__AccessOwner:AccessOwner"
-=======
          <xs:element ref="SystemObjects__x3A__AccessOwner:AccessOwner"
->>>>>>> f596a4855fad80c45981d33f2c83de21140fe38d
                      id="dit_KRS_PKD___d5e17780-1">
             <xs:annotation>
                <xs:appinfo>
@@ -55,21 +52,13 @@
             </xs:annotation>
          </xs:element>
          <xs:element name="A_CLASSIFIED" type="xs:string" id="dit_KRS_PKD___d5e17785-1_A_CLASSIFI"/>
-<<<<<<< HEAD
-         <!--<xs:element ref="SystemObjects__x3A__AccessGroup:AccessGroupRead"
-=======
          <xs:element ref="SystemObjects__x3A__AccessGroup:AccessGroupRead"
->>>>>>> f596a4855fad80c45981d33f2c83de21140fe38d
                      id="dit_KRS_PKD___d5e17786-1">
             <xs:annotation>
                <xs:appinfo>
                   <system_cache__appinfo:flat_relation_cache>
                      <system_cache__appinfo:source system_cache__appinfo:name="A_CLASSIFIED"
-<<<<<<< HEAD
-                                                   system_cache__appinfo:xpath="SystemObjects__x3A__AccessGroup:AccessGroupRead/name"/>
-=======
                                                    system_cache__appinfo:xpath="SystemObjects__x3A__AccessGroup:AccessGroupRead/uid"/>
->>>>>>> f596a4855fad80c45981d33f2c83de21140fe38d
                   </system_cache__appinfo:flat_relation_cache>
                </xs:appinfo>
             </xs:annotation>
@@ -83,11 +72,7 @@
                <xs:appinfo>
                   <system_cache__appinfo:flat_relation_cache>
                      <system_cache__appinfo:source system_cache__appinfo:name="A_ADM_COMPANY"
-<<<<<<< HEAD
-                                                   system_cache__appinfo:xpath="SystemObjects__x3A__AccessGroup:AccessGroupWrite/name"/>
-=======
                                                    system_cache__appinfo:xpath="SystemObjects__x3A__AccessGroup:AccessGroupWrite/uid"/>
->>>>>>> f596a4855fad80c45981d33f2c83de21140fe38d
                   </system_cache__appinfo:flat_relation_cache>
                </xs:appinfo>
             </xs:annotation>