Changeset 32 for trunk

Timestamp:

Dec 30, 2018, 8:14:55 PM (6 years ago)

Author:

chronos

Message:

• Added: Meet item TimeImport time to see when was item imported to the database. Use TimeImport in RSS export for items with only date specified.

Location:

trunk

Files:

• Import/Amblar.php (modified) (1 diff)
• Import/AstraPraha.php (modified) (1 diff)
• Import/Eso.php (modified) (1 diff)
• Import/Seznamka.php (modified) (1 diff)
• Import/TanecniSkola.php (modified) (1 diff)
• Meet.php (modified) (1 diff)
• SQL/Update.php (modified) (1 diff)
• index.php (modified) (3 diffs)

trunk/Import/Amblar.php

@@ -62 +62 @@
         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()));
+      } else $MeetItem->Time = HumanDateToTime($MeetItem->Time);
       $MeetItem->Email = '';
       $MeetItem->Message = '';

trunk/Import/AstraPraha.php

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

trunk/Import/Eso.php

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

trunk/Import/Seznamka.php

@@ -40 +40 @@
       $MeetItem->Age = trim(str_replace('let', '', $MeetItem->Age));
       $MeetItem->Location = trim(GetTextBetween($Item, ' rel="nofollow">', '</a></span>'));
-      $MeetItem->Time = HumanDateTimeToTime(trim(GetTextBetween($Item, '> </a>', '</span>')).' '.HumanTime(time()));
+      $MeetItem->Time = HumanDateToTime(trim(GetTextBetween($Item, '> </a>', '</span>')));
       $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->Time = HumanDateTimeToTime(trim(GetTextBetween($Item, '<h3>', '</h3>')).' '.HumanTime(time()));
+        $MeetItem->Time = HumanDateToTime(trim(GetTextBetween($Item, '<h3>', '</h3>')));
         if ($MeetItem->Time != null)
         {

trunk/Meet.php

@@ -369 +369 @@
         'Source' => $this->Source,
         'Link' => $this->Link,
+        'TimeImport' => 'NOW()',
       ));
       $Result = 1;

trunk/SQL/Update.php

@@ -9 +9 @@
 
 ALTER TABLE `MeetItem` CHANGE `Date` `Time` DATETIME NOT NULL;
+
+ALTER TABLE `MeetItem` ADD `TimeImport` DATETIME NULL AFTER `Link`;

trunk/index.php

@@ -272 +272 @@
       array('Name' => 'Age', 'Title' => 'Věk'),
       array('Name' => 'Weight', 'Title' => 'Váha'),
-      array('Name' => 'Location', 'Title' => 'Úmístění'),
+      array('Name' => 'Location', 'Title' => 'Umístění'),
       array('Name' => 'Gender', 'Title' => 'Pohlaví'),
       array('Name' => 'Message', 'Title' => 'Zpráva'),
@@ -360 +360 @@
 
     $DbResult = $this->Database->select('MeetItem', '*, (SELECT MeetSource.Name FROM MeetSource WHERE MeetSource.Id = MeetItem.Source) AS SourceName, '.
-      '(SELECT MeetSource.URL FROM MeetSource WHERE MeetSource.Id = MeetItem.Source) AS SourceURL, UNIX_TIMESTAMP(`Time`) AS `UnixTime`', '1 ORDER BY `Time` DESC LIMIT 30');
+      '(SELECT MeetSource.URL FROM MeetSource WHERE MeetSource.Id = MeetItem.Source) AS SourceURL', '1 ORDER BY `Time` DESC LIMIT 30');
     while($MeetItem = $DbResult->fetch_assoc())
     {
@@ -373 +373 @@
       if ($MeetItem['Height'] != '') $Description .= '<br/>Výška: '.$MeetItem['Height'].' cm';
       if ($MeetItem['Weight'] != '') $Description .= '<br/>Váha: '.$MeetItem['Weight'].' kg';      
-      $Description .= '<br/>Zdroj importu: <a href="'.$MeetItem['SourceURL'].'">'.$MeetItem['SourceName'].'</a>';
+      $Description .= '<br/>Zdroj importu: <a href="'.$MeetItem['SourceURL'].'">'.$MeetItem['SourceName'].'</a>';     
+      $Time = MysqlDateTimeToTime($MeetItem['Time']);
+      $TimeImport = MysqlDateTimeToTime($MeetItem['TimeImport']);      
+      // Append time part of TimeImport time to item time so new items will appear in correct time order even if item doesn't have time part specified
+      if (TimeToMysqlTime($Time) == '00:00:00')
+      {
+        $Time = MysqlDateTimeToTime(TimeToMysqlDate($Time).' '.TimeToMysqlTime($TimeImport));
+      }
       $RSS->Items[] = array(
         'Title' => $Title,
         'Description' => $Description,
-        'Time' => $MeetItem['UnixTime'],
+        'Time' => $Time,
         'Link' => $this->AbsoluteLink('/seznamka/inzerat/'.$MeetItem['Id'].'/'),
       );