diff --git a/admin/sync/fas/sync_fas_vilesci_mitarbeiter.php b/admin/sync/fas/sync_fas_vilesci_mitarbeiter.php index f95afa762..6dff68824 100644 --- a/admin/sync/fas/sync_fas_vilesci_mitarbeiter.php +++ b/admin/sync/fas/sync_fas_vilesci_mitarbeiter.php @@ -15,10 +15,10 @@ require_once('../../../vilesci/config.inc.php'); $conn=pg_connect(CONN_STRING) or die("Connection zur Portal Datenbank fehlgeschlagen"); $conn_fas=pg_connect(CONN_STRING_FAS) or die("Connection zur FAS Datenbank fehlgeschlagen"); -$adress='ruhan@technikum-wien.at'; -$adress_plausi='ruhan@technikum-wien.at'; -//$adress='fas_sync@technikum-wien.at'; -//$adress_plausi='fas_sync@technikum-wien.at'; +//$adress='ruhan@technikum-wien.at'; +//$adress_plausi='ruhan@technikum-wien.at'; +$adress='fas_sync@technikum-wien.at'; +$adress_plausi='fas_sync@technikum-wien.at'; $error_log=''; $error_log_fas=''; @@ -102,7 +102,7 @@ p2.stundensatz AS stundensatz2, p2.ausbildung AS ausbildung2, p2.aktiv AS aktiv2 FROM (person JOIN mitarbeiter ON person_pk=mitarbeiter.person_fk ) AS p1 CROSS JOIN (person JOIN mitarbeiter ON person_pk=mitarbeiter.person_fk) AS p2 WHERE ((p1.svnr=p2.svnr AND p1.svnr IS NOT NULL AND p1.svnr<>'') - OR (p1.familienname=p2.familienname AND p1.familienname IS NOT NULL AND p1.familienname!='' + OR (p1.svnr<>p2.svnr AND p1.svnr IS NOT NULL AND p1.svnr<>'' AND p1.familienname=p2.familienname AND p1.familienname IS NOT NULL AND p1.familienname!='' AND p1.gebdat=p2.gebdat AND p1.gebdat IS NOT NULL AND p1.gebdat>'1935-01-01' AND p1.gebdat<'2000-01-01')) AND (p1.person_pk < p2.person_pk) AND (p1.svnr<>'0005010400' AND p2.svnr<>'0005010400') @@ -292,7 +292,7 @@ SELECT p1.person_pk FROM (person JOIN mitarbeiter ON person_pk=mitarbeiter.person_fk ) AS p1 CROSS JOIN (person JOIN mitarbeiter ON person_pk=mitarbeiter.person_fk) AS p2 WHERE ((p1.svnr=p2.svnr AND p1.svnr IS NOT NULL AND p1.svnr<>'') - OR (p1.familienname=p2.familienname AND p1.familienname IS NOT NULL AND p1.familienname!='' + OR (p1.svnr<>p2.svnr AND p1.svnr IS NOT NULL AND p1.svnr<>'' AND p1.familienname=p2.familienname AND p1.familienname IS NOT NULL AND p1.familienname!='' AND p1.gebdat=p2.gebdat AND p1.gebdat IS NOT NULL AND p1.gebdat>'1935-01-01' AND p1.gebdat<'2000-01-01')) AND (p1.person_pk <> p2.person_pk) AND (p1.svnr<>'0005010400' AND p2.svnr<>'0005010400') diff --git a/admin/sync/fas/sync_fas_vilesci_person.php b/admin/sync/fas/sync_fas_vilesci_person.php index 34c5f4ff5..7ec930d37 100644 --- a/admin/sync/fas/sync_fas_vilesci_person.php +++ b/admin/sync/fas/sync_fas_vilesci_person.php @@ -23,8 +23,8 @@ $conn_fas=pg_connect(CONN_STRING_FAS) or die("Connection zur FAS Datenbank fehlg //set_time_limit(60); -$adress='ruhan@technikum-wien.at'; -//$adress='fas_sync@technikum-wien.at'; +//$adress='ruhan@technikum-wien.at'; +$adress='fas_sync@technikum-wien.at'; $error_log=''; $error_log_fas=''; diff --git a/admin/sync/fas/sync_fas_vilesci_student.php b/admin/sync/fas/sync_fas_vilesci_student.php index 14c0929e4..b19c7417e 100644 --- a/admin/sync/fas/sync_fas_vilesci_student.php +++ b/admin/sync/fas/sync_fas_vilesci_student.php @@ -123,8 +123,9 @@ p2.beendigungsdatum AS beendigungsdatum2, p2.berufstaetigkeit AS berufstaetigkei p2.aufnahmeschluessel AS aufnahmeschluessel2, p2.aufnahmeschluessel_fk AS aufnahmeschluesselfk2, p2.angetreten AS angetreten2 FROM (person JOIN student ON person_pk=student.person_fk ) AS p1 CROSS JOIN (person JOIN student ON person_pk=student.person_fk) AS p2 WHERE -((p1.gebdat=p2.gebdat AND p1.familienname=p2.familienname AND p1.svnr='' AND p1.ersatzkennzeichen='') -OR ((p1.ersatzkennzeichen=p2.ersatzkennzeichen AND p1.ersatzkennzeichen<>'') OR (p1.svnr=p2.svnr AND p1.svnr<>''))) +((p1.svnr=p2.svnr AND p1.svnr IS NOT NULL AND p1.svnr<>'') + OR (p1.svnr<>p2.svnr AND p1.svnr IS NOT NULL AND p1.svnr<>'' AND p1.familienname=p2.familienname AND p1.familienname IS NOT NULL AND p1.familienname!='' + AND p1.gebdat=p2.gebdat AND p1.gebdat IS NOT NULL AND p1.gebdat>'1935-01-01' AND p1.gebdat<'2000-01-01')) AND (p1.person_pk < p2.person_pk) AND (p1.svnr<>'0005010400' AND p2.svnr<>'0005010400') AND (trim(p1.familienname)<>trim(p2.familienname) OR trim(p1.vorname)<>trim(p2.vorname) OR trim(p1.vornamen)<>trim(p2.vornamen) @@ -406,7 +407,9 @@ CROSS JOIN (person JOIN student ON person_pk=student.person_fk) AS p2 WHERE ((p1.gebdat=p2.gebdat AND p1.familienname=p2.familienname AND p1.vorname=p2.vorname) OR ((p1.ersatzkennzeichen=p2.ersatzkennzeichen AND p1.ersatzkennzeichen<>'') OR (p1.svnr=p2.svnr AND p1.svnr<>''))) AND (p1.person_pk <> p2.person_pk) -AND (p1.svnr<>'0005010400' AND p2.svnr<>'0005010400') +AND ((p1.svnr=p2.svnr AND p1.svnr IS NOT NULL AND p1.svnr<>'') + OR (p1.svnr<>p2.svnr AND p1.svnr IS NOT NULL AND p1.svnr<>'' AND p1.familienname=p2.familienname AND p1.familienname IS NOT NULL AND p1.familienname!='' + AND p1.gebdat=p2.gebdat AND p1.gebdat IS NOT NULL AND p1.gebdat>'1935-01-01' AND p1.gebdat<'2000-01-01')) AND (trim(p1.familienname)<>trim(p2.familienname) OR trim(p1.vorname)<>trim(p2.vorname) OR trim(p1.vornamen)<>trim(p2.vornamen) OR p1.geschlecht<>p2.geschlecht OR p1.gebdat<>p2.gebdat OR p1.staatsbuergerschaft<> p2.staatsbuergerschaft OR p1.familienstand<>p2.familienstand