Changeset 31 for trunk/Import

Timestamp:

Dec 30, 2018, 7:37:55 PM (6 years ago)

Author:

chronos

Message:

• Modified: Store date of meet items including time. For items without specified time, just use current time (time of import).

Location:

trunk/Import

Files:

• Amblar.php (modified) (1 diff)
• AstraPraha.php (modified) (1 diff)
• Csts.php (modified) (1 diff)
• Eso.php (modified) (1 diff)
• Facebook.php (modified) (1 diff)
• MajkluvSvet.php (modified) (1 diff)
• SalsaDance.php (modified) (1 diff)
• Seznamka.php (modified) (1 diff)
• TanecniSkola.php (modified) (1 diff)
• Vavruska.php (modified) (1 diff)

trunk/Import/Amblar.php

@@ -55 +55 @@
       $Type = trim(GetTextBetween($Item, ' ', ' '));
       if ($Type == 'odpovězeno') continue;
-      $MeetItem->Date = trim(GetTextBetween($Item, '<span class="dwqa-date">', '</span>'));
-      if (mb_substr($MeetItem->Date, 0, 4) == 'před') 
+      $MeetItem->Time = trim(GetTextBetween($Item, '<span class="dwqa-date">', '</span>'));
+      if (mb_substr($MeetItem->Time, 0, 4) == 'před') 
       {            
-        $Parts = explode(' ', $MeetItem->Date);
-        if ($Parts[2] == 'hours') $MeetItem->Date = strtotime("-".$Parts[1]." hours");
-        else if ($Parts[2] == 'dní') $MeetItem->Date = strtotime("-".$Parts[1]." days");
-        else if ($Parts[2] == 'dny') $MeetItem->Date = strtotime("-".$Parts[1]." days");
-      } else $MeetItem->Date = HumanDateToTime($MeetItem->Date);
+        $Parts = explode(' ', $MeetItem->Time);
+        if ($Parts[2] == 'hours') $MeetItem->Time = strtotime("-".$Parts[1]." hours");
+        else if ($Parts[2] == 'dní') $MeetItem->Time = strtotime("-".$Parts[1]." days");
+        else if ($Parts[2] == 'dny') $MeetItem->Time = strtotime("-".$Parts[1]." days");
+      } else $MeetItem->Time = HumanDateTimeToTime($MeetItem->Time.' '.HumanTime(time()));
       $MeetItem->Email = '';
       $MeetItem->Message = '';

trunk/Import/AstraPraha.php

@@ -23 +23 @@
       $Item = GetTextBetween($Content, $ItemStart, $ItemEnd);
       $MeetItem = new MeetItem();
-      $MeetItem->Date = trim(GetTextBetween($Item, 'Vloženo:', '</p>'));
-      $MeetItem->Date = HumanDateToTime($MeetItem->Date);
+      $MeetItem->Time = trim(GetTextBetween($Item, 'Vloženo:', '</p>'));
+      $MeetItem->Time = HumanDateTimeToTime($MeetItem->Time.' '.HumanTime(time()));
 
       $MeetItem->Gender = trim(GetTextBetween($Item, '<h3 class=\'dating-heading\'>', '</h3>'));

trunk/Import/Csts.php

@@ -29 +29 @@
         else $MeetItem->Gender = Gender::Undefined;
       $MeetItem->Name = trim(html_entity_decode(GetTextBetween($Item, 'Vložil/a', ',')));
-      $MeetItem->Date = trim(GetTextBetween($Item, ' ', '</th>'));
-      $MeetItem->Date = HumanDateTimeToTime($MeetItem->Date);
+      $MeetItem->Time = trim(GetTextBetween($Item, ' ', '</th>'));
+      $MeetItem->Time = HumanDateTimeToTime($MeetItem->Time);
       $MeetItem->Height = trim(GetTextBetween($Item, "výška:", 'cm'));
       $MeetItem->Message = trim(html_entity_decode(strip_tags(GetTextBetween($Item, '<td colspan="3">', '</td>'))));

trunk/Import/Eso.php

@@ -35 +35 @@
         $Small = substr($Small, strpos($Small, '/') + 1); 
       }      
-      $MeetItem->Date = trim($Small);
-      $MeetItem->Date = HumanDateTimeToTime($MeetItem->Date);
+      $MeetItem->Time = trim($Small);
+      $MeetItem->Time = HumanDateTimeToTime($MeetItem->Time.' '.HumanTime(time()));
       $MeetItem->Message = trim(GetTextBetween($Item, '<p class="lead">', '</p>'));
       $MeetItem->Age = GetAgeFromText($MeetItem->Message);      

trunk/Import/Facebook.php

@@ -32 +32 @@
         else $MeetItem->Gender = Gender::Undefined;
       $MeetItem->Name = trim(html_entity_decode(GetTextBetween($Item, '<span class="_39_n">', '</span>')));
-      $MeetItem->Date = trim(GetTextBetween($Item, ' ', '</th>'));
-      $MeetItem->Date = HumanDateTimeToTime($MeetItem->Date);
+      $MeetItem->Time = trim(GetTextBetween($Item, ' ', '</th>'));
+      $MeetItem->Time = HumanDateTimeToTime($MeetItem->Time);
       $MeetItem->Height = trim(GetTextBetween($Item, "výška:", 'cm'));
       $MeetItem->Message = trim(html_entity_decode(strip_tags(GetTextBetween($Item, 'data-ft="&#123;&quot;tn&quot;:&quot;K&quot;&#125;">', '</div>'))));

trunk/Import/MajkluvSvet.php

@@ -42 +42 @@
         $MeetItem->Email = trim(substr($MeetItem->Email, strpos($MeetItem->Email, '|') + 1));
       } else $MeetItem->Phone = '';
-      $MeetItem->Date = trim(GetTextBetween($Item, "<span id='datum1", '</span>'));
-      $MeetItem->Date = substr($MeetItem->Date, strpos($MeetItem->Date, '>') + 1);
-      $MeetItem->Date = HumanDateTimeToTime($MeetItem->Date);
+      $MeetItem->Time = trim(GetTextBetween($Item, "<span id='datum1", '</span>'));
+      $MeetItem->Time = substr($MeetItem->Time, strpos($MeetItem->Time, '>') + 1);
+      $MeetItem->Time = HumanDateTimeToTime($MeetItem->Time);
       $MeetItem->Link = 'http://www.majkluvsvet.cz'.trim(GetTextBetween($Item, "<span class='linkk pravo'><a href='", "'>odkaz"));
       $MeetItem->Database = $this->Database;

trunk/Import/SalsaDance.php

@@ -22 +22 @@
       $Item = GetTextBetween($Content, $ItemStart, $ItemEnd);
       $MeetItem = new MeetItem();
-      $MeetItem->Date = trim(GetTextBetween($Item, '<span class="created">', '</span>'));
-      $MeetItem->Date = str_replace('. ', '.', $MeetItem->Date);
-      if (strpos($MeetItem->Date, 'dnes v') !== false)
-        $MeetItem->Date = str_replace('dnes v', HumanDate(time()), $MeetItem->Date);
-      if (strpos($MeetItem->Date, 'včera v') !== false)
-        $MeetItem->Date = str_replace('včera v', HumanDate(strtotime('-1 day', time())), $MeetItem->Date);
-      $MeetItem->Date = HumanDateTimeToTime($MeetItem->Date);
+      $MeetItem->Time = trim(GetTextBetween($Item, '<span class="created">', '</span>'));
+      $MeetItem->Time = str_replace('. ', '.', $MeetItem->Time);
+      if (strpos($MeetItem->Time, 'dnes v') !== false)
+        $MeetItem->Time = str_replace('dnes v', HumanDate(time()), $MeetItem->Time);
+      if (strpos($MeetItem->Time, 'včera v') !== false)
+        $MeetItem->Time = str_replace('včera v', HumanDate(strtotime('-1 day', time())), $MeetItem->Time);
+      $MeetItem->Time = HumanDateTimeToTime($MeetItem->Time);
       $MeetItem->Name = trim(GetTextBetween($Item, '<div class="comment-name">', '</div>'));
       $MeetItem->Message = trim(GetTextBetween($Item, '<p>', '</p>'));

trunk/Import/Seznamka.php

@@ -40 +40 @@
       $MeetItem->Age = trim(str_replace('let', '', $MeetItem->Age));
       $MeetItem->Location = trim(GetTextBetween($Item, ' rel="nofollow">', '</a></span>'));
-      $MeetItem->Date = HumanDateToTime(trim(GetTextBetween($Item, '> </a>', '</span>')));
+      $MeetItem->Time = HumanDateTimeToTime(trim(GetTextBetween($Item, '> </a>', '</span>')).' '.HumanTime(time()));
       $MeetItem->Message = trim(strip_tags(GetTextBetween($Item, 'margin-top:10px;\'>', '</div>')));
       $MeetItem->Link = GetTextBetween($Item, "<a href='", "'");

trunk/Import/TanecniSkola.php

@@ -47 +47 @@
       {
         $MeetItem = new MeetItem();
-        $MeetItem->Date = HumanDateToTime(trim(GetTextBetween($Item, '<h3>', '</h3>')));
-        if ($MeetItem->Date != null)
+        $MeetItem->Time = HumanDateTimeToTime(trim(GetTextBetween($Item, '<h3>', '</h3>')).' '.HumanTime(time()));
+        if ($MeetItem->Time != null)
         {
-          $PreviousTime = $MeetItem->Date;
-        } else $MeetItem->Date = $PreviousTime;
+          $PreviousTime = $MeetItem->Time;
+        } else $MeetItem->Time = $PreviousTime;
 
         $Part = GetTextBetween($Item, '</strong>', '<strong>');

trunk/Import/Vavruska.php

@@ -25 +25 @@
       $MeetItem = new MeetItem();
 
-      $MeetItem->Date = MysqlDateTimeToTime(trim(GetTextBetween($Item, 'přidáno:', '</i>')));
+      $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;