Changeset 26 for trunk

Timestamp:

Dec 27, 2018, 3:47:30 PM (6 years ago)

Author:

chronos

Message:

• Modified: Improved information parsing from message text.

Location:

trunk

Files:

• Import/AstraPraha.php (modified) (1 diff)
• Import/Csts.php (modified) (1 diff)
• Meet.php (modified) (3 diffs)
• index.php (modified) (1 diff)

trunk/Import/AstraPraha.php

@@ -29 +29 @@
       if ($MeetItem->Gender == 'Hledám partnerku') $MeetItem->Gender = Gender::Male;
         else $MeetItem->Gender = Gender::Female;
-      $MeetItem->Message = trim(GetTextBetween($Item, '<p class=\'last-element\'>', '</p>'));
+      $MeetItem->Message = trim(strip_tags(GetTextBetween($Item, '<p class=\'last-element\'>', '</p>')));
       $MeetItem->Email = trim(GetTextBetween($Item, 'class="nowrap text-link">', '</a>'));
       $MeetItem->Name = '';

trunk/Import/Csts.php

@@ -34 +34 @@
       $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->Message = str_replace("\xc2\xa0", "\x20", $MeetItem->Message);
+      $MeetItem->Age = GetAgeFromText($MeetItem->Message);
       $MeetItem->Height = GetHeightFromText($MeetItem->Message);
       $MeetItem->Weight = GetWeightFromText($MeetItem->Message);

trunk/Meet.php

@@ -129 +129 @@
       $Start++;
       $Result = trim(substr($Result, $Start, $Pos - $Start));
-      break;
+      if (is_numeric($Result)) break;
     } else break;
   }
@@ -165 +165 @@
 {
   $Text = strtolower($Text);
-  $Result = GetNumberBeforeText($Text, 'let');
+  $Result = GetNumberAfterText($Text, 'je mi');
+  if ($Result == '') $Result = GetNumberAfterText($Text, 'jsem');
   if ($Result == '') $Result = GetNumberBeforeText($Text, 'rokov');
   if ($Result == '') $Result = GetNumberBeforeText($Text, 'letou');
-  if ($Result == '') $Result = GetNumberAfterText($Text, 'je mi');
-  if ($Result == '') $Result = GetNumberAfterText($Text, 'jsem');
+  if ($Result == '') $Result = GetNumberBeforeText($Text, 'let');
   if ($Result == '') $Result = GetNumberAfterText($Text, 'čerstvých');
   if ($Result == '') $Result = GetAgeHeightWeightFromText($Text)[0];
@@ -181 +181 @@
 function GetHeightFromText($Text)
 {
-  $Text = strtolower($Text);
-  $Result = GetNumberBeforeText($Text, 'cm');
-  if ($Result == '') $Result = GetNumberAfterText($Text, 'měřím');
+  $Text = strtolower($Text);  
+  $Result = GetNumberAfterText($Text, 'měřím');
   if ($Result == '') $Result = GetNumberAfterText($Text, 'merim');
+  if ($Result == '') $Result = GetNumberBeforeText($Text, 'cm');  
   if ($Result == '') $Result = GetNumberBeforeText($Text, 'bez podpatků');
   if ($Result == '') $Result = GetAgeHeightWeightFromText($Text)[1];

trunk/index.php

@@ -377 +377 @@
     $this->Database->Prefix = $this->Config['Database']['Prefix'];
     $this->Database->charset($this->Config['Database']['Charset']);
+    $this->Database->ShowSQLError = false;
+    $this->Database->ShowSQLQuery = false;
     $this->PathItems = $this->ProcessURL();