Prechádzať zdrojové kódy

upd schema + debug ldap

a.binder 8 rokov pred
rodič
commit
3765827e9e

+ 13 - 1
SE/schema/ant-object/default_db.BI_audit_CEIDG/BI_audit_CEIDG/BI_audit_CEIDG.xsd

@@ -8,7 +8,9 @@
    targetNamespace="https://biuro.biall-net.pl/wfs/default_db/table/BI_audit_CEIDG.xsd"
    xmlns:default_db__x3A__BI_audit_CEIDG_pelnomocnicy="https://biuro.biall-net.pl/wfs/default_db/table/BI_audit_CEIDG_pelnomocnicy.xsd"
    xmlns:default_db__x3A__BI_audit_CEIDG_powiazania="https://biuro.biall-net.pl/wfs/default_db/table/BI_audit_CEIDG_powiazania.xsd"
-   vc:minVersion="1.1">
+   vc:minVersion="1.1"
+   xmlns:default_db__x3A__BI_audit_ENERGA_PRACOWNICY="https://biuro.biall-net.pl/wfs/default_db/table/BI_audit_ENERGA_PRACOWNICY.xsd"
+   xmlns:default_db__x3A__BI_audit_ENERGA_RUM_KONTRAHENCI="https://biuro.biall-net.pl/wfs/default_db/table/BI_audit_ENERGA_RUM_KONTRAHENCI.xsd">
    <xs:import namespace="https://biuro.biall-net.pl/wfs/default_db/table/BI_audit_taxpayer.xsd"
       schemaLocation="../../default_db.BI_audit_taxpayer/BI_audit_taxpayer/BI_audit_taxpayer.xsd"/>
    <xs:import
@@ -17,6 +19,12 @@
    <xs:import
       namespace="https://biuro.biall-net.pl/wfs/default_db/table/BI_audit_CEIDG_powiazania.xsd"
       schemaLocation="../../default_db.BI_audit_CEIDG_powiazania/BI_audit_CEIDG_powiazania/BI_audit_CEIDG_powiazania.xsd"/>
+   <xs:import
+      schemaLocation="../../default_db.BI_audit_ENERGA_PRACOWNICY/BI_audit_ENERGA_PRACOWNICY/BI_audit_ENERGA_PRACOWNICY.xsd"
+      namespace="https://biuro.biall-net.pl/wfs/default_db/table/BI_audit_ENERGA_PRACOWNICY.xsd"/>
+   <xs:import
+      schemaLocation="../../default_db.BI_audit_ENERGA_RUM_KONTRAHENCI/BI_audit_ENERGA_RUM_KONTRAHENCI/BI_audit_ENERGA_RUM_KONTRAHENCI.xsd"
+      namespace="https://biuro.biall-net.pl/wfs/default_db/table/BI_audit_ENERGA_RUM_KONTRAHENCI.xsd"/>
    <xs:complexType name="BI_audit_CEIDG" id="audit_CEIDG___d4e4639-1_BI_audit_C">
       <xs:annotation>
          <xs:documentation>Tabela z Podmiotami z CEIDG</xs:documentation>
@@ -65,6 +73,10 @@
                   (referencja).</xs:documentation>
             </xs:annotation>
          </xs:element>
+         <xs:element maxOccurs="unbounded" minOccurs="0"
+            ref="default_db__x3A__BI_audit_ENERGA_PRACOWNICY:BI_audit_ENERGA_PRACOWNICY"/>
+         <xs:element maxOccurs="unbounded" minOccurs="0"
+            ref="default_db__x3A__BI_audit_ENERGA_RUM_KONTRAHENCI:BI_audit_ENERGA_RUM_KONTRAHENCI"/>
       </xs:sequence>
       <xs:attribute name="label" type="xs:string"/>
       <xs:assert test="@label = concat(nazwisko, substring(firma, 1, 20))"/>

+ 9 - 2
SE/schema/ant-object/default_db.BI_audit_KRS/BI_audit_KRS/BI_audit_KRS.xsd

@@ -10,7 +10,8 @@
    xmlns:vc="http://www.w3.org/2007/XMLSchema-versioning"
    xmlns:system_cache__appinfo="http://biuro.biall-net.pl/xmlschema_procesy5/default_db_xml_cache/appinfo.xsd"
    targetNamespace="https://biuro.biall-net.pl/wfs/default_db/table/BI_audit_KRS.xsd"
-   vc:minVersion="1.1">
+   vc:minVersion="1.1"
+   xmlns:default_db__x3A__BI_audit_ENERGA_RUM_KONTRAHENCI="https://biuro.biall-net.pl/wfs/default_db/table/BI_audit_ENERGA_RUM_KONTRAHENCI.xsd">
    <xs:import namespace="https://biuro.biall-net.pl/wfs/default_db/table/BI_audit_KRS_person.xsd"
       schemaLocation="../../default_db.BI_audit_KRS_person/BI_audit_KRS_person/BI_audit_KRS_person.xsd"/>
    <xs:import namespace="https://biuro.biall-net.pl/wfs/default_db/table/BI_audit_KRS_company.xsd"
@@ -21,6 +22,9 @@
       schemaLocation="../../default_db.BI_audit_KRS_address/BI_audit_KRS_address/BI_audit_KRS_address.xsd"/>
    <xs:import namespace="https://biuro.biall-net.pl/wfs/default_db/table/BI_audit_taxpayer.xsd"
       schemaLocation="../../default_db.BI_audit_taxpayer/BI_audit_taxpayer/BI_audit_taxpayer.xsd"/>
+   <xs:import
+      schemaLocation="../../default_db.BI_audit_ENERGA_RUM_KONTRAHENCI/BI_audit_ENERGA_RUM_KONTRAHENCI/BI_audit_ENERGA_RUM_KONTRAHENCI.xsd"
+      namespace="https://biuro.biall-net.pl/wfs/default_db/table/BI_audit_ENERGA_RUM_KONTRAHENCI.xsd"/>
    <xs:complexType name="BI_audit_KRS" id="I_audit_KRS___d4e4493-1_BI_audit_K">
       <xs:annotation>
          <xs:documentation>Tabela z podmiotami z KRS</xs:documentation>
@@ -106,6 +110,8 @@
                   (referencja).</xs:documentation>
             </xs:annotation>
          </xs:element>
+         <xs:element maxOccurs="unbounded" minOccurs="0"
+            ref="default_db__x3A__BI_audit_ENERGA_RUM_KONTRAHENCI:BI_audit_ENERGA_RUM_KONTRAHENCI"/>
       </xs:sequence>
       <xs:attribute ref="default_db__x3A__BI_audit_KRS:label" id="I_audit_KRS___d6e76972-1">
          <xs:annotation>
@@ -113,7 +119,8 @@
          </xs:annotation>
       </xs:attribute>
       <xs:attribute name="label" type="xs:string" id="I_audit_KRS___d5e74727-1_label"/>
-      <xs:assert test="@default_db__x3A__BI_audit_KRS:label = concat(nazwa, ' ', krs, ' ', S_miejscowosc)"
+      <xs:assert
+         test="@default_db__x3A__BI_audit_KRS:label = concat(nazwa, ' ', krs, ' ', S_miejscowosc)"
          id="I_audit_KRS___d6e76977-1">
          <xs:annotation>
             <xs:documentation>Przeliczenie nazwy takiego labela, atrybutu nazwanego</xs:documentation>

+ 9 - 2
SE/schema/ant-object/default_db.BI_audit_KRS_person/BI_audit_KRS_person/BI_audit_KRS_person.xsd

@@ -7,9 +7,13 @@
    xmlns:system_cache__appinfo="http://biuro.biall-net.pl/xmlschema_procesy5/default_db_xml_cache/appinfo.xsd"
    targetNamespace="https://biuro.biall-net.pl/wfs/default_db/table/BI_audit_KRS_person.xsd"
    vc:minVersion="1.1"
-   xmlns:default_db__x3A__BI_audit_KRS="https://biuro.biall-net.pl/wfs/default_db/table/BI_audit_KRS.xsd">
+   xmlns:default_db__x3A__BI_audit_KRS="https://biuro.biall-net.pl/wfs/default_db/table/BI_audit_KRS.xsd"
+   xmlns:default_db__x3A__BI_audit_ENERGA_PRACOWNICY="https://biuro.biall-net.pl/wfs/default_db/table/BI_audit_ENERGA_PRACOWNICY.xsd">
    <xs:import namespace="https://biuro.biall-net.pl/wfs/default_db/table/BI_audit_KRS.xsd"
       schemaLocation="../../default_db.BI_audit_KRS/BI_audit_KRS/BI_audit_KRS.xsd"/>
+   <xs:import
+      schemaLocation="../../default_db.BI_audit_ENERGA_PRACOWNICY/BI_audit_ENERGA_PRACOWNICY/BI_audit_ENERGA_PRACOWNICY.xsd"
+      namespace="https://biuro.biall-net.pl/wfs/default_db/table/BI_audit_ENERGA_PRACOWNICY.xsd"/>
    <xs:complexType name="BI_audit_KRS_person" id="_KRS_person___d4e4621-1_BI_audit_K">
       <xs:annotation>
          <xs:documentation>Do dowiazania do BI_audit_KRS</xs:documentation>
@@ -20,7 +24,8 @@
          <xs:element name="imiona" type="xs:string" id="_KRS_person___d4e4653-1_imiona"/>
          <xs:element name="pesel" type="xs:NMTOKEN" id="_KRS_person___d4e4654-1_pesel"/>
          <xs:element name="cached" id="_KRS_person___d5e5635-1_cached" type="xs:int"> </xs:element>
-         <xs:element ref="default_db__x3A__BI_audit_KRS:BI_audit_KRS">
+         <xs:element ref="default_db__x3A__BI_audit_KRS:BI_audit_KRS" maxOccurs="unbounded"
+            minOccurs="1">
             <xs:annotation>
                <xs:appinfo>
                   <system_cache__appinfo:flat_relation_cache system_cache__appinfo:backref_evaluate="true">
@@ -29,6 +34,8 @@
                </xs:appinfo>
             </xs:annotation>
          </xs:element>
+         <xs:element maxOccurs="unbounded" minOccurs="0"
+            ref="default_db__x3A__BI_audit_ENERGA_PRACOWNICY:BI_audit_ENERGA_PRACOWNICY"/>
       </xs:sequence>
       <xs:attribute id="_KRS_person___d5e80455-1_label" name="label" type="xs:string"/>
       <xs:attribute ref="default_db__x3A__BI_audit_KRS:label"/>

+ 7 - 1
SE/se-lib/Core/Client/Ldap.php

@@ -134,7 +134,13 @@ class Core_Client_Ldap {
 	}
 
 	public function get_values($entry, $attr) {
-		return ldap_get_values($this->_conn, $entry, $attr);
+		try {
+			$return=ldap_get_values($this->_conn, $entry, $attr);
+		} catch (Exception $e) {
+			error_log('#140 ldap_get_values problems with ',$this->_conn,var_dump($entry), var_dump($attr));
+		  //else throw new Exception($e->getMessage());
+		}
+		return $return;
 	}
 
 	public function get_attributes($entry) {