Changeset 44 for trunk

Timestamp:

Nov 9, 2019, 11:14:27 PM (4 years ago)

Author:

chronos

Message:

• Added: Taneční škola Ella as meet source.

Location:

trunk

Files:

• Modules/Meet/Meet.php (modified) (5 diffs)
• SQL/Update.php (modified) (1 diff)

trunk/Modules/Meet/Meet.php

@@ -11 +11 @@
 include_once(dirname(__FILE__).'/Import/Facebook.php');
 include_once(dirname(__FILE__).'/Import/Eso.php');
+include_once(dirname(__FILE__).'/Import/Ella.php');
 
 abstract class Gender
@@ -287 +288 @@
 }
 
+function GetGenderFromName($Text)
+{
+  $Gender = Gender::Male;
+  $Ending = substr($Text, -2);
+  if (($Ending == 'na') or ($Ending == 'ta') or ($Ending == 'va') or
+    ($Ending == 'ka') or ($Ending == 'ga') or ($Ending == 'ie') or
+    ($Ending == 'la') or ($Ending == 'za') or ($Ending == 'še') or
+    ($Ending == 'ra') or ($Ending == 'da') or ($Ending == 'sa') or
+    ($Ending == 'ce') or ($Ending == 'id') or ($Ending == 'ša') or
+    ($Ending == 'ma') or ($Ending == 'ja') or ($Ending == 'ia') or
+    ($Ending == 'ha') or ($Ending == 'is'))
+    return $Gender = Gender::Female;
+  return $Gender;
+}
+
 class MeetSources
 {
@@ -310 +326 @@
       else if ($Method == 'facebook') $Source = new MeetSourceFacebook();
       else if ($Method == 'eso') $Source = new MeetSourceEso();
+      else if ($Method == 'ella') $Source = new MeetSourceElla();
       else {
         $Output .= 'Unsupported parse method: '.$Method.'<br/>';
@@ -360 +377 @@
   var $Title = '';
   var $Level = '';
-
-  function AddIfNotExist($TimeInterval = 0)
-  {
-    $DbResult = $this->Database->select('MeetItem', '*',
-      '(`Message` = "'.$this->Database->real_escape_string($this->Message).'") AND '.
+  var $RemoteId = '';
+
+  function AddIfNotExist($TimeInterval = 0, $CompareTime = true, $CompareRemoteId = false)
+  {
+    $Where = '(`Message` = "'.$this->Database->real_escape_string($this->Message).'") AND '.
       '(`Email` = "'.$this->Database->real_escape_string($this->Email).'") AND '.
-      '(`Time` >= "'.$this->Database->real_escape_string(TimeToMysqlDateTime($this->Time - $TimeInterval)).'") AND '.
-      '(`Time` <= "'.$this->Database->real_escape_string(TimeToMysqlDateTime($this->Time + $TimeInterval)).'") AND '.
-      '(`Source` = '.$this->Source.')');
+      '(`Source` = '.$this->Source.')';
+    if ($CompareTime)
+      $Where .= ' AND (`Time` >= "'.$this->Database->real_escape_string(TimeToMysqlDateTime($this->Time - $TimeInterval)).'") AND '.
+      '(`Time` <= "'.$this->Database->real_escape_string(TimeToMysqlDateTime($this->Time + $TimeInterval)).'")';
+    if ($CompareRemoteId)
+      $Where .= ' AND (`RemoteId` = "'.$this->Database->real_escape_string($this->RemoteId).'")';
+    $DbResult = $this->Database->select('MeetItem', '*', $Where);
     if ($DbResult->num_rows == 0)
     {
@@ -390 +411 @@
         'Source' => $this->Source,
         'Link' => $this->Link,
+        'RemoteId' => $this->RemoteId,
         'TimeImport' => 'NOW()',
       ));

trunk/SQL/Update.php

@@ -49 +49 @@
 ALTER TABLE `DanceFigure`
   ADD CONSTRAINT `DanceFigure_ibfk_1` FOREIGN KEY (`Dance`) REFERENCES `Dance` (`Id`);
+
+ALTER TABLE `MeetItem`
+  ADD COLUMN `RemoteId` VARCHAR(255) NULL DEFAULT NULL AFTER `TimeImport`;