add search option

ramblerswebs · Jun 5, 2020 · 89374db · 89374db
1 parent 90cad19
commit 89374db
Show file tree

Hide file tree

Showing 4 changed files with 55 additions and 15 deletions.
diff --git a/classes/functions.php b/classes/functions.php
@@ -98,8 +98,9 @@ public static function errorEmail($feed, $error) {
         $mailer->addAddress(NOTIFY, 'Web Master');
         $mailer->isHTML(true);
         $mailer->Subject = "Ramblers Feed Error";
-        $mailer->Body = "<p>Feed error found while running: " . TASK . "</p><p>"
-                . $error . "</p>";
+        $mailer->Body = "<p>Feed error found while running: " . TASK . "</p>".
+                "<p>Feed: ".$feed. "</p>"
+                . "<p>Error: ". $error . "</p>";
         $mailer->send();
         echo "Error message sent" . BR;
         echo "Task: " . TASK . BR;

diff --git a/classes/groups/file.php b/classes/groups/file.php
@@ -28,8 +28,6 @@ public function process($latitude, $longitude, $distance, $maxpoints) {
             $dist = GeometryGreatcircle::distance($latitude, $longitude, $lat, $lon, GeometryGreatcircle::KM);
             $group->distance = $dist;
         }
-
-
         usort($this->groups, "GroupsFile::cmpDistance");
         foreach ($this->groups as $key => $group) {
             if ($group->distance > $distance) {
@@ -45,8 +43,30 @@ public function process($latitude, $longitude, $distance, $maxpoints) {
         }
         return $this->groups;
     }
-     private static function cmpDistance($a, $b) {
-        return $a->distance> $b->distance;
+
+    public function search($search, $number) {
+        $find = strtolower($search);
+        foreach ($this->groups as $key => $group) {
+            $found = false;
+            if (strpos(strtolower($group->name), $find) !== false) {
+                $found = true;
+            }
+            if (!$found) {
+                unset($this->groups[$key]);
+            }
+        }
+        $no = 0;
+        foreach ($this->groups as $key => $group) {
+            $no += 1;
+            if ($no > $number) {
+                unset($this->groups[$key]);
+            }
+        }
+        return $this->groups;
+    }
+
+    private static function cmpDistance($a, $b) {
+        return $a->distance > $b->distance;
     }
 
     public function allGroups() {

diff --git a/classes/options.php b/classes/options.php
@@ -6,13 +6,13 @@
  * @author Chris Vaughan
  */
 class Options {
-  
+
     private $gets = array();
     private $posts = array();
     private static $thisclass;
 
     function __construct() {
-        self::$thisclass=$this;
+        self::$thisclass = $this;
 
         foreach ($_GET as $key => $value) {
             $this->gets[$key] = htmlspecialchars($value);
@@ -21,27 +21,28 @@ function __construct() {
             $this->posts[$key] = htmlspecialchars($value);
         }
     }
-    public function getOptions(){
+
+    public function getOptions() {
         return self::$thisclass;
     }
 
     public function gets($name) {
-        if (isset($this->gets[$name])){
-             return $this->gets[$name];
+        if (isset($this->gets[$name])) {
+            return $this->gets[$name];
         } else {
             return null;
         }
-
     }
 
     public function posts($name) {
-        if (isset($this->posts[$name])){
-             return $this->posts[$name];
+        if (isset($this->posts[$name])) {
+            return $this->posts[$name];
         } else {
             return null;
         }
     }
-    public function noGets(){
+
+    public function noGets() {
         return count($this->gets);
     }
 

diff --git a/index.php b/index.php
@@ -1,5 +1,7 @@
 <?php
 
+// https://groups.theramblers.org.uk/?latitude=51.4589653&longitude=-2.52582669&maxpoints=100&dist=30
+
 error_reporting(E_ALL);
 ini_set('display_errors', 1);
 ini_set('assert.warning', 1);
@@ -26,12 +28,28 @@
 $opts = new Options();
 $groups = new GroupsFile();
 If ($opts->noGets() === 0) {
+    // return all groups
     $allGroups = $groups->allGroups();
     header("Access-Control-Allow-Origin: *");
     header("Content-type: application/json");
     echo json_encode($allGroups);
 }
+$search = $opts->gets("search");
+if ($search != null) {
+    // do a name search
+    $number = $opts->gets("number");
+    if ($number==null){
+        $number=20;
+    }
+    $groups = $groups->search($search, $number);
+    header("Access-Control-Allow-Origin: *");
+    header("Content-type: application/json");
+    echo json_encode($groups);
+
+    return;
+}
 
+// do a location search
 $latitude = $opts->gets("latitude");
 $longitude = $opts->gets("longitude");
 $distance = $opts->gets("dist");