Changeset 42 for trunk

Timestamp:

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

Author:

chronos

Message:

• Modified: Update Vavruska import after remote website change.

Location:

trunk/Modules/Meet

Files:

• Import/Vavruska.php (modified) (4 diffs)
• Meet.php (modified) (6 diffs)

trunk/Modules/Meet/Import/Vavruska.php

@@ -8 +8 @@
     $Content = file_get_contents($this->URL);
 
-    $BlockStart = '<table class="seznamka">';
-    $BlockEnd = '<hr class="welt_bottom" />';
+    $BlockStart = '<h2 class="wow fadeIn">Aktuální inzeráty</h2>';
+    $BlockEnd = '<div class="clearfix"></div>';
     $Content = GetTextBetween($Content, $BlockStart, $BlockEnd);
     if ($Content == '')
@@ -17 +17 @@
     }
 
-    $ItemStart = '<tr class="spc">';
-    $ItemEnd = '</table>
-                </td></tr>';
+    $ItemStart = '<div class="col-sm-12">';
+    $ItemEnd = "</div>\n".
+    '        </div>';
     while (strpos($Content, $ItemStart) !== false)
     {
@@ -25 +25 @@
       $MeetItem = new MeetItem();
 
-      $MeetItem->Time = MysqlDateTimeToTime(trim(GetTextBetween($Item, 'přidáno:', '</i>')));
-      $MeetItem->Gender = trim(GetTextBetween($Item, '<img src=/design/', 'alt="avatar"'));
-      if ($MeetItem->Gender == 'avatar_m_03.png') $MeetItem->Gender = Gender::Male;
-        else $MeetItem->Gender = Gender::Female;
-      $MeetItem->Name = trim(GetTextBetween($Item, 'Jméno:</td><td>', '</td>'));
-      $MeetItem->Email = DecodeHtmlEnt(trim(GetTextBetween($Item, 'Kontakt:</td><td>', '</td>')));
-      $MeetItem->Message = trim(GetTextBetween($Item, 'Text:</td><td>', '</td>'));
+      $MeetItem->Gender = GetTextBetween($Item, '<h5 class="', '"');
+      if ($MeetItem->Gender == 'muz') $MeetItem->Gender = Gender::Male;
+      else if ($MeetItem->Gender == 'zena') $MeetItem->Gender = Gender::Female;
+      else $MeetItem->Gender = Gender::Undefined;
+      $MeetItem->Name = GetTextBetween($Item, '>', '<');
+      $MeetItem->Email = GetTextBetween($Item, '<p>', '</p>');
+      $MeetItem->Time = HumanDateToTime(trim(GetTextBetween($Item, '<p class="pridano">Přidáno:', '</p>')));
+      $MeetItem->Message = trim(GetTextBetween($Item, '<p class="text">', '</p>'));
       $MeetItem->Phone = '';
       $MeetItem->Height = GetHeightFromText($MeetItem->Message);
@@ -39 +40 @@
       $MeetItem->Database = $this->Database;
       $MeetItem->Source = $this->Id;
+      if ($MeetItem->Name == 'Nový Design Inzerátů') continue;
       $this->AddedCount += $MeetItem->AddIfNotExist();
     }

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(