Changeset 723

Timestamp:

Jan 7, 2014, 4:40:51 PM (11 years ago)

Author:

maron

Message:

• Fixed: Update LastImport only if is imported version higher then all ready imported

Location:

trunk

Files:

• Modules/Import/Import.php (modified) (3 diffs)
• includes/Version.php (modified) (1 diff)

trunk/Modules/Import/Import.php

@@ -230 +230 @@
           }
           $Output .= '<br />Celkem: '.$Count.'  Nových: '.$this->NewItemCount.'<br />';
-          $this->System->Database->query('UPDATE `Group` SET `LastVersion` = "'.$this->Version['BuildNumber'].'", `LastImport` = NOW() WHERE `Id`='.$this->Group['Id']);
+          $this->UpdateLastVersion();
         }
         // else $Output .= ShowMessage('Již importován pro verzi '.$this->Version['Version'], MESSAGE_CRITICAL);
@@ -387 +387 @@
       }   
       $Output .= '<br />Celkem: '.$Count.'  Nových: '.$this->NewItemCount.'<br />';
-      $System->Database->query('UPDATE `Group` SET `LastVersion` = "'.$this->Version['BuildNumber'].'", `LastImport` = NOW() WHERE `Id`='.$this->Group['Id']);
+      $this->UpdateLastVersion();
     }
     $Output .= '<strong>Dokončeno.</strong>';
@@ -520 +520 @@
     }
     $Output = '<br />Celkem: '.$Count.'  Nových: '.$this->NewItemCount.'<br />';
-    $this->System->Database->query('UPDATE `Group` SET `LastVersion` = "'.$this->Version['BuildNumber'].'", `LastImport` = NOW() WHERE `Id`='.$this->Group['Id']);
+    $this->UpdateLastVersion();
     return($Output);
   }
+  function UpdateLastVersion() {
+    $DbResult = $this->System->Database->query('SELECT * FROM `Group` WHERE `Id`='.$this->Group['Id']);
+    $Version = $DbResult->fetch_assoc();  
+    if ($Version['LastVersion'] < $this->Version['BuildNumber'])
+      $this->System->Database->query('UPDATE `Group` SET `LastVersion` = "'.$this->Version['BuildNumber'].'", `LastImport` = NOW() WHERE `Id`='.$this->Group['Id']);
+  }
 }

trunk/includes/Version.php

@@ -6 +6 @@
 // and system will need database update. 
 
-$Revision = 722; // Subversion revision
+$Revision = 723; // Subversion revision
 $DatabaseRevision = 716; // Database structure revision 
 $ReleaseTime = '2014-01-07';