Changeset 46 for trunk

Timestamp:

Sep 12, 2022, 7:34:40 PM (2 years ago)

Author:

chronos

Message:

• Fixed: Correctly import data from leaderboard.

File:

• trunk/index.php (modified) (9 diffs)

trunk/index.php

@@ -17 +17 @@
   function Run()
   {
-
   }
 }
@@ -36 +35 @@
   function __construct()
   {
-    $this->LeaderboardURL = 'https://registrace.teribear.cz/Leaderboard';
+    //$this->LeaderboardURL = 'https://registrace.teribear.cz/Leaderboard';
+    $this->LeaderboardURL = 'https://leaderboard.teribear.cz/';
     $this->BaseURL = '';
     $this->LinkLocaleExceptions = array();
@@ -173 +173 @@
         foreach ($JSON['items'] as $Item)
         {
+          // Use RegistrationNumber as ChipNumber.
+          $Item['ChipNumber'] = $Item['RegistrationNumber'] * 1;
+          unset($Item['RegistrationNumber']);
+          if ($Item['Name'] != null)
+          {
+            // Normalize names
+            $Item['Name'] = trim($Item['Name']);
+            while (strpos($Item['Name'], '  ') !== false) 
+            {
+              $Item['Name'] = str_replace('  ', ' ', $Item['Name']);
+            }
+          }
           $Result[] = $Item;
         }
@@ -186 +198 @@
   {
     $Output = '';
-  /*
+    
     $this->Database->query('DELETE FROM RunnerStat');
     $this->Database->query('DELETE FROM Runner');
@@ -192 +204 @@
     $this->Database->query('DELETE FROM Team');
     $this->Database->query('DELETE FROM Import');
-    */
-
+    
     // Find duplicates
     /*
@@ -337 +348 @@
           $Runners[$Item['ChipNumber']] = array('Id' => $RunnerId, 'Distance' => -1, 'Team' => $TeamId);
           $NextRunnerId++;
-        } else {
+        } else 
+        {
           $RunnerId = $Runners[$Item['ChipNumber']]['Id'];
 
@@ -347 +359 @@
           } else
           {
-            $NewRunnerTeamId = $Teams[$Item['TeamId']]['Id'];
+            if (!array_key_exists($Item['TeamId'], $Teams))
+            {
+              $NewRunnerTeamId = $NextTeamId;
+              $Queries[] = $this->Database->GetInsert('Team', array(
+                'Id' => $NewRunnerTeamId,
+                'Name' => '',
+                'WebId' => $Item['TeamId'],
+                'Year' => $Year,
+                'IsFamily' => 0,
+              ));
+              $Teams[$Item['TeamId']] = array('Id' => $NewRunnerTeamId, 'Distance' => -1);
+              $NextTeamId++;              
+            } else
+            {
+              $NewRunnerTeamId = $Teams[$Item['TeamId']]['Id'];            
+            }
           }
           if ($OldRunnerTeamId != $NewRunnerTeamId)
@@ -369 +396 @@
       if (($Item['Type'] == 'team') or ($Item['Type'] == 'rodina'))
       {
+        if ($Item['Name'] == null) $Item['Name'] = '';
         if ($Item['Type'] == 'rodina') $IsFamily = 1;
           else $IsFamily = 0;
@@ -446 +474 @@
         'Hash' => $Hash,
         'ItemCount' => count($Items)
-      ));
-      //file_put_contents('import/'.$Hash.'.txt', print_r($Items, true));
+      ));      
     }
     $Output .= T('Data synchronization from leaderboard finished.<br/>');