From 82aabb4eb5d1f8c4ca0d48767f2b313f48bffb3d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Pavel=20Zl=C3=A1mal?= Date: Mon, 25 Jan 2021 14:11:00 +0100 Subject: [PATCH] Mark addresses as HLAVNI in vsup_ifis service - Since we push only single address per-person, it is always marked as HLAVNI='+'. - To make sure values are updated to new state, also update SQL checks for this flag and updates it. --- send/vsup_ifis | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/send/vsup_ifis b/send/vsup_ifis index de87d94f..0b6c9535 100755 --- a/send/vsup_ifis +++ b/send/vsup_ifis @@ -268,9 +268,9 @@ foreach my $uco (@ucos) { # prepared statements my $addressExists = $dbh->prepare(qq{select 1 from $tableNameAdr where OSB_ID=?}); -my $insertAdr = $dbh->prepare(qq{INSERT INTO $tableNameAdr (OSB_ID, ULICE, MST_NAZEV, PSC, ZME_ID, VAD_TYP_OSB) VALUES (?,?,?,?,?,?)}); -my $addressAreEquals = $dbh->prepare(qq{SELECT 1 FROM $tableNameAdr WHERE ULICE=? and MST_NAZEV=? and PSC=? and ZME_ID=? and VAD_TYP_OSB=? and OSB_ID=?}); -my $updateAdr = $dbh->prepare(qq{UPDATE $tableNameAdr SET ULICE=?, MST_NAZEV=?, PSC=?, ZME_ID=?, VAD_TYP_OSB=? WHERE OSB_ID=?}); +my $insertAdr = $dbh->prepare(qq{INSERT INTO $tableNameAdr (OSB_ID, ULICE, MST_NAZEV, PSC, ZME_ID, VAD_TYP_OSB, HLAVNI) VALUES (?,?,?,?,?,?,?)}); +my $addressAreEquals = $dbh->prepare(qq{SELECT 1 FROM $tableNameAdr WHERE ULICE=? and MST_NAZEV=? and PSC=? and ZME_ID=? and VAD_TYP_OSB=? and HLAVNI=? and OSB_ID=?}); +my $updateAdr = $dbh->prepare(qq{UPDATE $tableNameAdr SET ULICE=?, MST_NAZEV=?, PSC=?, ZME_ID=?, VAD_TYP_OSB=?, HLAVNI=? WHERE OSB_ID=?}); my $deleteAdr = $dbh->prepare(qq{DELETE FROM $tableNameAdr where OSB_ID=?}); foreach my $uco (sort keys %$dataByKey) { @@ -287,10 +287,10 @@ foreach my $uco (sort keys %$dataByKey) { if ($addressExists->fetch) { - $addressAreEquals->execute($ULICE, $MST_NAZEV, $PSC, $COUNTRY_CODE, $ADR_TYPE, $uco); + $addressAreEquals->execute($ULICE, $MST_NAZEV, $PSC, $COUNTRY_CODE, $ADR_TYPE, '+', $uco); if(!$addressAreEquals->fetch) { - $updateAdr->execute($ULICE, $MST_NAZEV, $PSC, $COUNTRY_CODE, $ADR_TYPE, $uco); + $updateAdr->execute($ULICE, $MST_NAZEV, $PSC, $COUNTRY_CODE, $ADR_TYPE, '+', $uco); if($DEBUG == 1) { print "UPDATING EXISTING ADR RECORD: $uco\n"; } $foundAndUpdatedAdr++; handleAkt($uco, 'ADR'); @@ -303,7 +303,7 @@ foreach my $uco (sort keys %$dataByKey) { if($DEBUG == 1) { print "INSERT NEW ADR: $uco\n"; } $insertedAdr++; # we will do insert - $insertAdr->execute($uco, $ULICE, $MST_NAZEV, $PSC, $COUNTRY_CODE, $ADR_TYPE); + $insertAdr->execute($uco, $ULICE, $MST_NAZEV, $PSC, $COUNTRY_CODE, $ADR_TYPE, '+'); handleAkt($uco, 'ADR'); }