Changeset 24 for trunk

Timestamp:

Dec 26, 2018, 10:45:44 PM (5 years ago)

Author:

chronos

Message:

• Fixed: Wrong age calculation from message text.

Location:

trunk

Files:

• Import/Csts.php (modified) (1 diff)
• Meet.php (modified) (4 diffs)

trunk/Import/Csts.php

@@ -33 +33 @@
       $MeetItem->Height = trim(GetTextBetween($Item, "výška:", 'cm'));
       $MeetItem->Message = trim(html_entity_decode(strip_tags(GetTextBetween($Item, '<td colspan="3">', '</td>'))));
+      // Replace unicode non-breakable space by normal space
+      $MeetItem->Message = str_replace("\xc2\xa0", "\x20", $MeetItem->Message);      
       $MeetItem->Age = GetAgeFromText($MeetItem->Message);      
       $MeetItem->Height = GetHeightFromText($MeetItem->Message);

trunk/Meet.php

@@ -104 +104 @@
 }
 
+function is_white_space($Char)
+{
+  return ($Char == ' ') or ($Char == "\t");
+}
+
 function GetNumberBeforeText($Text, $Needle)
 {
@@ -120 +125 @@
       $Text = substr($Text, $Pos + 1);
       $Start = $Pos - 1;
-      while (($Start >= 0) and (is_numeric($Result[$Start]) or ($Result[$Start] == ' ')))
+      while (($Start >= 0) and (is_numeric($Result[$Start]) or is_white_space($Result[$Start])))
         $Start--;
       $Start++;
@@ -146 +151 @@
       $Text = substr($Text, $Pos + 1);
       $End = 0;
-      while (($End < strlen($Result)) and (is_numeric($Result[$End]) or ($Result[$End] == ' ')))
+      while (($End < strlen($Result)) and (is_numeric($Result[$End]) or is_white_space($Result[$End])))
         $End++;
       $End--;
@@ -167 +172 @@
   if ($Result == '') $Result = GetNumberAfterText($Text, 'čerstvých');
   if ($Result == '') $Result = GetAgeHeightWeightFromText($Text)[0];
-  if ($Result == '') $Result = date('Y', time()) - GetNumberAfterText($Text, 'ročník');
+  if ($Result == '') {
+    $Year = GetNumberAfterText($Text, 'ročník');
+    if ($Year != '') $Result = date('Y', time()) - $Year;
+  }
   return $Result;
 }