Changeset 42 for trunk/Modules/Meet/Meet.php

Timestamp:

Sep 17, 2019, 10:13:33 PM (5 years ago)

Author:

chronos

Message:

• Modified: Update Vavruska import after remote website change.

File:

• trunk/Modules/Meet/Meet.php (modified) (6 diffs)

trunk/Modules/Meet/Meet.php

@@ -169 +169 @@
   $Text = strtolower($Text);
   $Result = GetNumberAfterText($Text, 'je mi');
-  if ($Result == '') $Result = GetNumberAfterText($Text, 'jsem');
+  if ($Result == '') $Result = GetNumberBeforeText($Text, 'let');
   if ($Result == '') $Result = GetNumberBeforeText($Text, 'rokov');
   if ($Result == '') $Result = GetNumberBeforeText($Text, 'letou');
-  if ($Result == '') $Result = GetNumberBeforeText($Text, 'let');
   if ($Result == '') $Result = GetNumberAfterText($Text, 'čerstvých');
+  if ($Result == '') {
+    $Result = GetNumberAfterText($Text, 'jsem');
+    if ($Result > 100) $Result = ''; // Age over 100 is probably not age but height
+  }
   if ($Result == '') $Result = GetAgeHeightWeightFromText($Text)[0];
   if ($Result == '') {
@@ -179 +182 @@
     if ($Year != '') $Result = date('Y', time()) - $Year;
   }
+  if ($Result == '') {
+    $Year = GetNumberAfterText($Text, 'narozen roku');
+    if ($Year != '') $Result = date('Y', time()) - $Year;
+  }
   return $Result;
 }
@@ -184 +191 @@
 function GetHeightFromText($Text)
 {
-  $Text = strtolower($Text);  
+  $Text = strtolower($Text);
   $Result = GetNumberAfterText($Text, 'měřím');
   if ($Result == '') $Result = GetNumberAfterText($Text, 'merim');
-  if ($Result == '') $Result = GetNumberBeforeText($Text, 'cm');  
+  if ($Result == '') $Result = GetNumberAfterText($Text, 'výška');
+  if ($Result == '') $Result = GetNumberBeforeText($Text, 'cm');
   if ($Result == '') $Result = GetNumberBeforeText($Text, 'bez podpatků');
+  if ($Result == '') {
+    $Result = GetNumberAfterText($Text, 'jsem');
+    if ($Result < 150) $Result = ''; // Height below 150 is probably not height but age
+  }
   if ($Result == '') $Result = GetAgeHeightWeightFromText($Text)[1];
   return $Result;
@@ -198 +210 @@
   $Result = GetNumberBeforeText($Text, 'kg');
   if ($Result == '') $Result = GetNumberAfterText($Text, 'vážím');
+  if ($Result == '') $Result = GetNumberAfterText($Text, 'váha');
   if ($Result == '') $Result = GetAgeHeightWeightFromText($Text)[2];
   return $Result;
@@ -264 +277 @@
 {
   global $Locations;
-  
+
   $Text = strtolower($Text);
 
@@ -357 +370 @@
     if ($DbResult->num_rows == 0)
     {
-      if ($this->Age == '') $Age = null; 
+      if ($this->Age == '') $Age = null;
         else $Age = $this->Age;
-      if ($this->Height == '') $Height = null; 
+      if ($this->Height == '') $Height = null;
         else $Height = $this->Height;
-      if ($this->Weight == '') $Weight = null; 
+      if ($this->Weight == '') $Weight = null;
         else $Weight = $this->Weight;
       $this->Database->insert('MeetItem', array(