Changeset 11 for trunk/Import

Timestamp:

Aug 26, 2018, 8:53:55 PM (7 years ago)

Author:

chronos

Message:

• Fixed: Updated parsing of Astra website.
• Fixed: Correctly parse Amblar date.
• Added: Allow to update only one meet source by specified id.
• Added: Show RSS link with RSS icon under meet table.

Location:

trunk/Import

Files:

• Amblar.php (modified) (3 diffs)
• AstraPraha.php (modified) (3 diffs)
• SalsaDance.php (modified) (2 diffs)
• Seznamka.php (modified) (2 diffs)
• TanecniSkola.php (modified) (2 diffs)
• Vavruska.php (modified) (2 diffs)

trunk/Import/Amblar.php

@@ -28 +28 @@
   function Import()
   {
-    echo('Parsing '.$this->Name.'...</br>');
+    parent::Import();
     $Content = file_get_contents($this->URL);
 
@@ -53 +53 @@
         else $MeetItem->Gender = Gender::Male;
       $MeetItem->Name = trim(GetTextBetween($Item, '<span class="dwqa-author">', '</span>'));
-      $MeetItem->Date = HumanDateToTime(trim(GetTextBetween($Item, '<span class="dwqa-date">', '</span>')));
+      $MeetItem->Date = trim(GetTextBetween($Item, '<span class="dwqa-date">', '</span>'));
+      if ($MeetItem->Date == 'před 1 dní') $MeetItem->Date = strtotime("-1 days");
+        else $MeetItem->Date = HumanDateToTime($MeetItem->Date);
       $MeetItem->Email = '';
       $MeetItem->Message = '';
@@ -64 +66 @@
       $MeetItem->Source = $this->Id;
       $this->ImportItem($MeetItem);
-      $MeetItem->AddIfNotExist();
+      $this->AddedCount += $MeetItem->AddIfNotExist();
     }
   }

trunk/Import/AstraPraha.php

@@ -5 +5 @@
   function Import()
   {
-    echo('Parsing '.$this->Name.'...</br>');
+    parent::Import();
     $Content = file_get_contents($this->URL);
-    $Content = RemoveHtmlComments($Content);
 
-    $BlockStart = '----------------------------------------------';
-    $BlockEnd = '<script type="text/javascript"';
+    $BlockStart = '<h2>Tanečního partnera hledají:</h2>';
+    $BlockEnd = '<hr />';
     $Content = GetTextBetween($Content, $BlockStart, $BlockEnd);
     if ($Content == '')
@@ -18 +17 @@
     }
 
-    $ItemStart = '</div><h2></h2>';
-    $ItemEnd = '<div class="clearer"></div><div class="clearer">';
+    $ItemStart = '<p class=\'dating-date\'>';
+    $ItemEnd = '<hr class=\'dating-spacer\' />';
     while (strpos($Content, $ItemStart) !== false)
     {
       $Item = GetTextBetween($Content, $ItemStart, $ItemEnd);
       $MeetItem = new MeetItem();
-      $MeetItem->Gender = trim(GetTextBetween($Item, ');"><u>', '</u>'));
+      $MeetItem->Date = trim(GetTextBetween($Item, 'Vloženo:', '</p>'));
+      $MeetItem->Date = HumanDateToTime($MeetItem->Date);
+
+      $MeetItem->Gender = trim(GetTextBetween($Item, '<h3 class=\'dating-heading\'>', '</h3>'));
       if ($MeetItem->Gender == 'Hledám partnerku') $MeetItem->Gender = Gender::Male;
         else $MeetItem->Gender = Gender::Female;
-      $End = '<em>';
-      $MeetItem->Message = trim(substr($Item, 0, strpos($Item, $End)));
-      $Item = substr($Item, strpos($Item, $End) + strlen($End));
-      $MeetItem->Message = trim(strip_tags($MeetItem->Message));
-      $MeetItem->Date = trim(GetTextBetween($Item, 'datum vložení', '</em>'));
-      if (substr($MeetItem->Date, 0, 1) == ':')
-        $MeetItem->Date = trim(substr($MeetItem->Date, 1));
-      $MeetItem->Date = HumanDateToTime($MeetItem->Date);
-      $MeetItem->Email = GetEmailFromText($MeetItem->Message);
+      $MeetItem->Message = trim(GetTextBetween($Item, '<p class=\'last-element\'>', '</p>'));
+      $MeetItem->Email = trim(GetTextBetween($Item, 'class="nowrap text-link">', '</a>'));
       $MeetItem->Name = '';
       $MeetItem->Age = GetAgeFromText($MeetItem->Message);
@@ -44 +39 @@
       $MeetItem->Database = $this->Database;
       $MeetItem->Source = $this->Id;
-      $MeetItem->AddIfNotExist();
+      $this->AddedCount += $MeetItem->AddIfNotExist();
     }
   }

trunk/Import/SalsaDance.php

@@ -5 +5 @@
   function Import()
   {
-    echo('Parsing '.$this->Name.'...</br>');
+    parent::Import();
     $Content = file_get_contents($this->URL);
     $BlockStart = '<ul class="comments">';
@@ -40 +40 @@
       $MeetItem->Database = $this->Database;
       $MeetItem->Source = $this->Id;
-      //print_r($MeetItem);
-      $MeetItem->AddIfNotExist();
+      $this->AddedCount += $MeetItem->AddIfNotExist();
     }
   }

trunk/Import/Seznamka.php

@@ -5 +5 @@
   function Import()
   {
-    echo('Parsing '.$this->Name.'...</br>');
+    parent::Import();
     $Content = file_get_contents($this->URL);
     $BlockStart = 'Tanec ...</h1 class=\'nadpis\'>';
@@ -42 +42 @@
       $MeetItem->Database = $this->Database;
       $MeetItem->Source = $this->Id;
-      //unset($MeetItem->Database);
-      //print_r($MeetItem);
-      $MeetItem->AddIfNotExist();
+      $this->AddedCount += $MeetItem->AddIfNotExist();
     }
   }

trunk/Import/TanecniSkola.php

@@ -26 +26 @@
     );
 
-    echo('Parsing '.$this->Name.'...</br>');
+    parent::Import();
     $Content = file_get_contents($this->URL);
 
@@ -85 +85 @@
         $MeetItem->Database = $this->Database;
         $MeetItem->Source = $this->Id;
-        $MeetItem->AddIfNotExist();
+        $this->AddedCount += $MeetItem->AddIfNotExist();
       }
     }

trunk/Import/Vavruska.php

@@ -5 +5 @@
   function Import()
   {
-    echo('Parsing '.$this->Name.'...</br>');
+    parent::Import();
     $Content = file_get_contents($this->URL);
 
@@ -39 +39 @@
       $MeetItem->Database = $this->Database;
       $MeetItem->Source = $this->Id;
-      $MeetItem->AddIfNotExist();
+      $this->AddedCount += $MeetItem->AddIfNotExist();
     }
   }