Changeset 19

Timestamp:

Sep 6, 2019, 9:44:30 AM (5 years ago)

Author:

chronos

Message:

• Fixed: Teams were not imported correctly. Some of them had empty names.

Location:

trunk

Files:

• Database.php (modified) (5 diffs)
• index.php (modified) (13 diffs)

trunk/Database.php

@@ -57 +57 @@
     $this->LogFile = dirname(__FILE__).'/../../Query.log';
   }
- 
+
 
   function Connect($Host, $User, $Password, $Database)
@@ -109 +109 @@
       $this->insert_id = $this->PDO->lastInsertId();
     } else
-    {     
+    {
       $this->Error = $this->PDO->errorInfo();
       $this->Error = $this->Error[2];
@@ -134 +134 @@
     $this->insert_id = $this->PDO->lastInsertId();
   }
-  
+
   function GetInsert($Table, $Data)
   {
@@ -158 +158 @@
     $this->query($this->GetUpdate($Table, $Condition, $Data));
   }
-  
+
   function GetUpdate($Table, $Condition, $Data)
   {
@@ -219 +219 @@
   {
   }
-  
+
   public function Transaction($Queries)
   {
-      $this->PDO->beginTransaction();
-      foreach ($Queries as $Query)
-      {
-        $Statement = $this->PDO->prepare($Query);
-        $Statement->execute();
-      }          
-      $this->PDO->commit();
+    $this->PDO->beginTransaction();
+    foreach ($Queries as $Query)
+    {
+      $Statement = $this->PDO->prepare($Query);
+      $Statement->execute();
+    }
+    if (!$this->PDO->commit())
+    {
+      $this->Error = $this->PDO->errorInfo();
+      $this->Error = $this->Error[2];
+      if(($this->Error != '') and ($this->ShowSQLError == true))
+        echo('<div><strong>SQL Error: </strong>'.$this->Error.'<br />'.$Query.'</div>');
+      throw new Exception('SQL Error: '.$this->Error.', Query: '.$Query);
+    }
   }
 }

trunk/index.php

@@ -28 +28 @@
   var $Database;
   var $Config;
-  var $Year;
+  var $LeaderboardURL;
 
   function __construct()
   {
+    $this->LeaderboardURL = 'https://registrace.teribear.cz/Leaderboard';
   }
 
@@ -93 +94 @@
   function QueryRunners($Category, $Page = 0, $TeamId = null, $Query = null, $StartNumber = null, $Count = null)
   {
-      $URL = 'https://registrace.teribear.cz/Leaderboard/Home/GetRunners?category='.$Category;
+      $URL = $this->LeaderboardURL.'/Home/GetRunners?category='.$Category;
       if ($Page != 0) $URL .= '&page='.$Page;
       if ($TeamId != null) $URL .= '&teamId='.$TeamId;
@@ -179 +180 @@
           } else
           {
-          if (!array_key_exists($Item['TeamId'], $Teams))
-          {
-            $TeamId = $NextTeamId;
-            $Queries[] = $this->Database->GetInsert('Team', array(
-              'Id' => $TeamId,
-              'Name' => '',
-              'WebId' => $Item['TeamId'],
-              'Year' => $Year,
-            ));
-            $Teams[$Item['TeamId']] = array('Id' => $TeamId, 'Distance' => -1);
-            $NextTeamId++;
-          } else
-            $TeamId = $Teams[$Item['TeamId']]['Id'];
+            if (!array_key_exists($Item['TeamId'], $Teams))
+            {
+              $TeamId = $NextTeamId;
+              $Queries[] = $this->Database->GetInsert('Team', array(
+                'Id' => $TeamId,
+                'Name' => '',
+                'WebId' => $Item['TeamId'],
+                'Year' => $Year,
+                'IsFamily' => 0,
+              ));
+              $Teams[$Item['TeamId']] = array('Id' => $TeamId, 'Distance' => -1);
+              $NextTeamId++;
+            } else
+              $TeamId = $Teams[$Item['TeamId']]['Id'];
           }
 
@@ -223 +225 @@
       if (($Item['Type'] == 'team') or ($Item['Type'] == 'rodina'))
       {
+        if ($Item['Type'] == 'rodina') $IsFamily = 1;
+          else $IsFamily = 0;
         if (!array_key_exists($Item['GroupId'], $Teams))
         {
-          if ($Item['Type'] == 'rodina') $IsFamily = 1;
-            else $IsFamily = 0;
           $Queries[] = $this->Database->GetInsert('Team', array(
             'Id' => $NextTeamId,
@@ -240 +242 @@
           $TeamId = $Teams[$Item['GroupId']]['Id'];
 
+
         // Update missing team names
-        if ($Teams['Name'] == "")
+        if ($Teams[$Item['GroupId']]['Name'] == "")
         {
-          $Queries[] = $this->Database->GetUpdate('Team', 'Id='.$Team['Id'], array('Name' => $Item['Name']));
-          $Teams['Name'] = $Item['Name'];
-          echo($Team['Name'].' ');
+          $Queries[] = $this->Database->GetUpdate('Team', 'Id='.$TeamId, array(
+            'Name' => $Item['Name'],
+            'IsFamily' => $IsFamily
+          ));
+          $Teams[$Item['GroupId']]['Name'] = $Item['Name'];
+          $Teams[$Item['GroupId']]['IsFamily'] = $IsFamily;
         }
 
@@ -262 +268 @@
     }
     //print_r($Queries);
+    //foreach ($Queries as $Query) $this->Database->query($Query);
     $this->Database->Transaction($Queries);
   }
@@ -269 +276 @@
     $Time = time();
     $Items = $this->QueryRunnersAll();
-    //print_r($Items);
     $ItemsWithoutProgress = array();
     foreach ($Items as $Item)
@@ -292 +298 @@
         'ItemCount' => count($Items)
       ));
-      file_put_contents('/home/teribear/www/import/'.$Hash.'.txt', print_r($Items, true));
+      //file_put_contents('import/'.$Hash.'.txt', print_r($Items, true));
     }
   }
@@ -301 +307 @@
     $Output .= '<div class="page-title">Families</div>';
 
-    $Year = 1;
+    $Year = 0;
     if ((count($this->PathItems) > 0) and ($this->PathItems[count($this->PathItems) - 1] != ''))
       $Year = $this->PathItems[count($this->PathItems) - 1] * 1;
@@ -419 +425 @@
     $Output .= '<div class="page-title">Teams</div>';
 
-    $Year = 1;
+    $Year = 0;
     if ((count($this->PathItems) > 0) and ($this->PathItems[count($this->PathItems) - 1] != ''))
       $Year = $this->PathItems[count($this->PathItems) - 1] * 1;
@@ -537 +543 @@
     $Output = '<div class="page-title">Runners</div>';
 
-    $Year = 1;
+    $Year = 0;
     if ((count($this->PathItems) > 0) and ($this->PathItems[count($this->PathItems) - 1] != ''))
       $Year = $this->PathItems[count($this->PathItems) - 1] * 1;
@@ -711 +717 @@
   {
     $Output = '';
-    $Output .= '<p>This website collects data from offical <a href="http://leaderboard.teribear.cz/">leaderboard</a> site and tracks and presents progress of runners.</p>';
-    $Output .= '<div class="page-title">Summary '.$Year.'</div>';
+    $Output .= '<p>This website collects data from offical <a href="'.$this->LeaderboardURL.'">leaderboard</a> site and tracks and presents progress of runners.</p>';
+    $Output .= '<div class="page-title">Summary</div>';
 
     $Year = 0;
@@ -772 +778 @@
     $this->Database->Prefix = $this->Config['Database']['Prefix'];
     $this->Database->charset($this->Config['Database']['Charset']);
+    //$this->Database->ShowSQLError = true;
     $this->PathItems = $this->ProcessURL();