[Fmsystem-commits] [15437] integration

[sigurdne]

Revision: 15437
          http://svn.sv.gnu.org/viewvc/?view=rev&root=fmsystem&revision=15437
Author:   sigurdne
Date:     2016-08-09 13:09:53 +0000 (Tue, 09 Aug 2016)
Log Message:
-----------
integration

Modified Paths:
--------------
    trunk/property/inc/cron/default/synkroniser_avdelinger_med_fellesdata.php

Modified: 
trunk/property/inc/cron/default/synkroniser_avdelinger_med_fellesdata.php
===================================================================
--- trunk/property/inc/cron/default/synkroniser_avdelinger_med_fellesdata.php   
2016-08-09 12:32:36 UTC (rev 15436)
+++ trunk/property/inc/cron/default/synkroniser_avdelinger_med_fellesdata.php   
2016-08-09 13:09:53 UTC (rev 15437)
@@ -300,23 +300,25 @@
                                {
                                        unset($value_set['id']);
 
+                                       $value_set['active'] = 1;
+                                       $value_set = 
$db->validate_update($value_set);
+                                       $sql = "UPDATE {$table} SET 
{$value_set} WHERE id =" . (int)$unit['id'];
                                        if ($this->debug)
                                        {
                                                $this->messages[] = "ID finnes 
fra før: {$unit['id']}, oppdaterer: {$unit['name']}";
+                                               $this->messages[] = $sql;
                                        }
-                                       $value_set['active'] = 1;
-                                       $value_set = 
$db->validate_update($value_set);
-                                       $sql = "UPDATE {$table} SET 
{$value_set} WHERE id =" . (int)$unit['id'];
                                }
                                else
                                {
+                                       $cols = implode(',', 
array_keys($value_set));
+                                       $values = 
$db->validate_insert(array_values($value_set));
+                                       $sql = "INSERT INTO {$table} ({$cols}) 
VALUES ({$values})";
                                        if ($this->debug)
                                        {
                                                $this->messages[] = "ID fantes 
ikke fra før: {$unit['id']}, legger til: {$unit['name']}";
+                                               $this->messages[] = $sql;
                                        }
-                                       $cols = implode(',', 
array_keys($value_set));
-                                       $values = 
$db->validate_insert(array_values($value_set));
-                                       $sql = "INSERT INTO {$table} ({$cols}) 
VALUES ({$values})";
                                }
 
                                $db->query($sql, __LINE__, __FILE__);