Changeset 26 for trunk

Timestamp:

Sep 11, 2019, 9:20:29 AM (5 years ago)

Author:

chronos

Message:

• Modified: Limit number of loaded teams as server returns error for some teams with higher number.

File:

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

trunk/index.php

@@ -99 +99 @@
       if ($Query != null) $URL .= '&query='.$Query;
       if ($StartNumber != null) $URL .= '&startNumber='.$StartNumber;
+      //echo($URL.'<br/>');
       $Content = file_get_contents($URL);
       $JSON = json_decode($Content, true);
-      //print_r($JSON);
       return $JSON;
   }
 
-  function QueryRunnersAll($Category = 'all')
+  function QueryRunnersAll($Category = 'all', $Count = 0)
   {
     $ItemsPerPage = 30;
     $MaxCount = 450 * 30;
+    if ($Count > 0) $MaxCount = $Count;
     $Result = array();
     $I = 0;
     while (true)
     {
-      $Page = $I * $MaxCount / $ItemsPerPage;
+      $Page = $I * floor($MaxCount / $ItemsPerPage);
       $JSON = $this->QueryRunners($Category, $Page, null, null, null, $MaxCount);
       foreach ($JSON['items'] as $Item)
@@ -119 +120 @@
         $Result[] = $Item;
       }
-      if ($JSON['last'] == 'true') break;
+      if (($JSON['last'] == 'true') or (count($JSON) == 0)) break;
       if ($I > 10) break; // Safe limit if last would not work
       $I++;
@@ -278 +279 @@
   {
     $Time = time();
-    $Items = $this->QueryRunnersAll('teams');
+    $Items = $this->QueryRunnersAll('teams', 520);
     $Items = array_merge($Items, $this->QueryRunnersAll('families'));
     $Items = array_merge($Items, $this->QueryRunnersAll(''));
@@ -287 +288 @@
       $ItemsWithoutProgress[] = $Item;
     }
-    //print_r($Items);
     $Hash = md5(serialize($ItemsWithoutProgress));
 
@@ -295 +295 @@
       $Import = $DbResult->fetch_assoc();
     } else $Import = array('Hash' => '');
-    if ($Import['Hash'] != $Hash)
+    //if ($Import['Hash'] != $Hash)
     {
       $this->Sync($Items, $Time);