Changed Parser Scripts to use new sumas.json

app/Models/parserSkripte/Allesklar.php

@@ -9,9 +9,9 @@ use Symfony\Component\DomCrawler\Crawler;
 class Allesklar extends Searchengine
 {
     protected $tds = "";
-    public function __construct(\SimpleXMLElement $engine, \App\MetaGer $metager)
+    public function __construct($name, \StdClass $engine, \App\MetaGer $metager)
     {
-        parent::__construct($engine, $metager);
+        parent::__construct($name, $engine, $metager);
     }
 
     public function loadResults($result)
@@ -43,7 +43,7 @@ class Allesklar extends Searchengine
                         $link,
                         $link,
                         $descr,
-                        $this->displayName,$this->homepage,
+                        $this->engine->{"display-name"},$this->engine->homepage,
                         $this->counter
                     );
                 } catch (\Exception $e) {

app/Models/parserSkripte/BASE.php

@@ -9,9 +9,9 @@ class BASE extends Searchengine
 {
     public $results = [];
 
-    public function __construct(\SimpleXMLElement $engine, \App\MetaGer $metager)
+    public function __construct($name, \StdClass $engine, \App\MetaGer $metager)
     {
-        parent::__construct($engine, $metager);
+        parent::__construct($name, $engine, $metager);
     }
 
     public function loadResults($result)
@@ -49,7 +49,7 @@ class BASE extends Searchengine
                         $link,
                         $anzeigeLink,
                         $descr,
-                        $this->displayName,$this->homepage,
+                        $this->engine->{"display-name"},$this->engine->homepage,
                         $this->counter
                     );
                 }

app/Models/parserSkripte/Beammachine.php

@@ -8,9 +8,9 @@ class Beammachine extends Searchengine
 {
     public $results = [];
 
-    public function __construct(\SimpleXMLElement $engine, \App\MetaGer $metager)
+    public function __construct($name, \StdClass $engine, \App\MetaGer $metager)
     {
-        parent::__construct($engine, $metager);
+        parent::__construct($name, $engine, $metager);
     }
 
     public function loadResults($result)
@@ -34,7 +34,7 @@ class Beammachine extends Searchengine
                 $link,
                 $anzeigeLink,
                 $descr,
-                $this->displayName,$this->homepage,
+                $this->engine->{"display-name"},$this->engine->homepage,
                 $this->counter
             );
         }

app/Models/parserSkripte/Blogsearch.php

@@ -9,9 +9,9 @@ class Blogsearch extends Searchengine
 {
     public $results = [];
 
-    public function __construct(\SimpleXMLElement $engine, \App\MetaGer $metager)
+    public function __construct($name, \StdClass $engine, \App\MetaGer $metager)
     {
-        parent::__construct($engine, $metager);
+        parent::__construct($name, $engine, $metager);
     }
 
     public function loadResults($result)
@@ -36,7 +36,7 @@ class Blogsearch extends Searchengine
                     $link,
                     $anzeigeLink,
                     $descr,
-                    $this->displayName,$this->homepage,
+                    $this->engine->{"display-name"},$this->engine->homepage,
                     $this->counter
                 );
             }

app/Models/parserSkripte/Dailymotion.php

@@ -9,9 +9,9 @@ class Dailymotion extends Searchengine
 {
     public $results = [];
 
-    public function __construct(\SimpleXMLElement $engine, \App\MetaGer $metager)
+    public function __construct($name, \StdClass $engine, \App\MetaGer $metager)
     {
-        parent::__construct($engine, $metager);
+        parent::__construct($name, $engine, $metager);
     }
 
     public function loadResults($result)
@@ -37,7 +37,7 @@ class Dailymotion extends Searchengine
                     $link,
                     $anzeigeLink,
                     $descr,
-                    $this->displayName,$this->homepage,
+                    $this->engine->{"display-name"},$this->engine->homepage,
                     $this->counter,
                     ['partnershop' => false]
                 );

app/Models/parserSkripte/Dart.php

@@ -9,9 +9,9 @@ class Dart extends Searchengine
 {
     public $results = [];
 
-    public function __construct(\SimpleXMLElement $engine, \App\MetaGer $metager)
+    public function __construct($name, \StdClass $engine, \App\MetaGer $metager)
     {
-        parent::__construct($engine, $metager);
+        parent::__construct($name, $engine, $metager);
     }
 
     public function loadResults($result)
@@ -57,7 +57,7 @@ class Dart extends Searchengine
                     $link,
                     $anzeigeLink,
                     $descr,
-                    $this->displayName,$this->homepage,
+                    $this->engine->{"display-name"},$this->engine->homepage,
                     $this->counter
                 );
             }

app/Models/parserSkripte/Dmoznebel.php

@@ -8,9 +8,9 @@ class Dmoznebel extends Searchengine
 {
     public $results = [];
 
-    public function __construct(\SimpleXMLElement $engine, \App\MetaGer $metager)
+    public function __construct($name, \StdClass $engine, \App\MetaGer $metager)
     {
-        parent::__construct($engine, $metager);
+        parent::__construct($name, $engine, $metager);
     }
 
     public function loadResults($result)
@@ -36,7 +36,7 @@ class Dmoznebel extends Searchengine
                 $link,
                 $anzeigeLink,
                 $descr,
-                $this->displayName,$this->homepage,
+                $this->engine->{"display-name"},$this->engine->homepage,
                 $this->counter
             );
         }

app/Models/parserSkripte/Dmoznebel_int.php

@@ -8,9 +8,9 @@ class Dmoznebel_int extends Searchengine
 {
     public $results = [];
 
-    public function __construct(\SimpleXMLElement $engine, \App\MetaGer $metager)
+    public function __construct($name, \StdClass $engine, \App\MetaGer $metager)
     {
-        parent::__construct($engine, $metager);
+        parent::__construct($name, $engine, $metager);
     }
 
     public function loadResults($result)
@@ -28,7 +28,7 @@ class Dmoznebel_int extends Searchengine
             $link,
             $anzeigeLink,
             $descr,
-            $this->displayName,$this->homepage,
+            $this->engine->{"display-name"},$this->engine->homepage,
             $this->counter
         );
     }

app/Models/parserSkripte/Ecoshopper.php

@@ -9,9 +9,9 @@ class Ecoshopper extends Searchengine
 {
     public $results = [];
 
-    public function __construct(\SimpleXMLElement $engine, \App\MetaGer $metager)
+    public function __construct($name, \StdClass $engine, \App\MetaGer $metager)
     {
-        parent::__construct($engine, $metager);
+        parent::__construct($name, $engine, $metager);
     }
 
     public function loadResults($result)
@@ -49,7 +49,7 @@ class Ecoshopper extends Searchengine
                     $link,
                     $anzeigeLink,
                     $descr,
-                    $this->displayName,$this->homepage,
+                    $this->engine->{"display-name"},$this->engine->homepage,
                     $this->counter,
                     ['partnershop' => false,
                         'image'        => $image]

app/Models/parserSkripte/Europeana.php

@@ -9,9 +9,9 @@ class Europeana extends Searchengine
 {
     public $results = [];
 
-    public function __construct(\SimpleXMLElement $engine, \App\MetaGer $metager)
+    public function __construct($name, \StdClass $engine, \App\MetaGer $metager)
     {
-        parent::__construct($engine, $metager);
+        parent::__construct($name, $engine, $metager);
     }
 
     public function loadResults($result)
@@ -42,7 +42,7 @@ class Europeana extends Searchengine
                         $link,
                         $anzeigeLink,
                         $descr,
-                        $this->displayName,$this->homepage,
+                        $this->engine->{"display-name"},$this->engine->homepage,
                         $this->counter,
                         ['image' => $image]
                     );

app/Models/parserSkripte/Exalead.php

@@ -9,9 +9,9 @@ class Exalead extends Searchengine
 {
     public $results = [];
 
-    public function __construct(\SimpleXMLElement $engine, \App\MetaGer $metager)
+    public function __construct($name, \StdClass $engine, \App\MetaGer $metager)
     {
-        parent::__construct($engine, $metager);
+        parent::__construct($name, $engine, $metager);
     }
 
     public function loadResults($result)
@@ -61,7 +61,7 @@ class Exalead extends Searchengine
                         $link,
                         $anzeigeLink,
                         $descr,
-                        $this->displayName,$this->homepage,
+                        $this->engine->{"display-name"},$this->engine->homepage,
                         $this->counter
                     );
                 } catch (\ErrorException $e) {

app/Models/parserSkripte/Fairmondo.php

@@ -8,9 +8,9 @@ class Fairmondo extends Searchengine
 {
     public $results = [];
 
-    public function __construct(\SimpleXMLElement $engine, \App\MetaGer $metager)
+    public function __construct($name, \StdClass $engine, \App\MetaGer $metager)
     {
-        parent::__construct($engine, $metager);
+        parent::__construct($name, $engine, $metager);
     }
 
     public function loadResults($result)
@@ -42,7 +42,7 @@ class Fairmondo extends Searchengine
                 $link,
                 $anzeigeLink,
                 $descr,
-                $this->displayName,$this->homepage,
+                $this->engine->{"display-name"},$this->engine->homepage,
                 $this->counter,
                 [
                     'price' => $price,

app/Models/parserSkripte/Fernsehsuche.php

@@ -9,9 +9,9 @@ class Fernsehsuche extends Searchengine
 {
     public $results = [];
 
-    public function __construct(\SimpleXMLElement $engine, \App\MetaGer $metager)
+    public function __construct($name, \StdClass $engine, \App\MetaGer $metager)
     {
-        parent::__construct($engine, $metager);
+        parent::__construct($name, $engine, $metager);
     }
 
     public function loadResults($result)
@@ -38,7 +38,7 @@ class Fernsehsuche extends Searchengine
                         $link,
                         $anzeigeLink,
                         $descr,
-                        $this->displayName,$this->homepage,
+                        $this->engine->{"display-name"},$this->engine->homepage,
                         $this->counter,
                         ['image' => $image]
                     );

app/Models/parserSkripte/Fess.php

@@ -9,9 +9,9 @@ class Fess extends Searchengine
 {
     public $results = [];
 
-    public function __construct(\SimpleXMLElement $engine, \App\MetaGer $metager)
+    public function __construct($name, \StdClass $engine, \App\MetaGer $metager)
     {
-        parent::__construct($engine, $metager);
+        parent::__construct($name, $engine, $metager);
     }
 
     public function loadResults($result)
@@ -37,7 +37,7 @@ class Fess extends Searchengine
                         $link,
                         $anzeigeLink,
                         $descr,
-                        $this->displayName,$this->homepage,
+                        $this->engine->{"display-name"},$this->engine->homepage,
                         $this->counter
                     );
                 } catch (\ErrorException $e) {

app/Models/parserSkripte/Flickr.php

@@ -9,9 +9,9 @@ class Flickr extends Searchengine
 {
     public $results = [];
 
-    public function __construct(\SimpleXMLElement $engine, \App\MetaGer $metager)
+    public function __construct($name, \StdClass $engine, \App\MetaGer $metager)
     {
-        parent::__construct($engine, $metager);
+        parent::__construct($name, $engine, $metager);
     }
 
     public function loadResults($result)
@@ -37,7 +37,7 @@ class Flickr extends Searchengine
                     $link,
                     $anzeigeLink,
                     $descr,
-                    $this->displayName,$this->homepage,
+                    $this->engine->{"display-name"},$this->engine->homepage,
                     $this->counter,
                     ['image' => $image]
                 );

app/Models/parserSkripte/Goyax.php

@@ -9,9 +9,9 @@ class Goyax extends Searchengine
 {
     public $results = [];
 
-    public function __construct(\SimpleXMLElement $engine, \App\MetaGer $metager)
+    public function __construct($name, \StdClass $engine, \App\MetaGer $metager)
     {
-        parent::__construct($engine, $metager);
+        parent::__construct($name, $engine, $metager);
     }
 
     public function loadResults($result)
@@ -31,7 +31,7 @@ class Goyax extends Searchengine
                 $link,
                 $anzeigeLink,
                 $descr,
-                $this->displayName,$this->homepage,
+                $this->engine->{"display-name"},$this->engine->homepage,
                 $this->counter
             );
         });

app/Models/parserSkripte/Loklak.php

@@ -8,9 +8,9 @@ class Loklak extends Searchengine
 {
     public $results = [];
 
-    public function __construct(\SimpleXMLElement $engine, \App\MetaGer $metager)
+    public function __construct($name, \StdClass $engine, \App\MetaGer $metager)
     {
-        parent::__construct($engine, $metager);
+        parent::__construct($name, $engine, $metager);
     }
 
     public function loadResults($result)
@@ -35,7 +35,7 @@ class Loklak extends Searchengine
                 $link,
                 $anzeigeLink,
                 $descr,
-                $this->displayName,$this->homepage,
+                $this->engine->{"display-name"},$this->engine->homepage,
                 $this->counter
             );
         }

app/Models/parserSkripte/Mg_hochsch_de.php

@@ -8,9 +8,9 @@ class Mg_hochsch_de extends Searchengine
 {
     public $results = [];
 
-    public function __construct(\SimpleXMLElement $engine, \App\MetaGer $metager)
+    public function __construct($name, \StdClass $engine, \App\MetaGer $metager)
     {
-        parent::__construct($engine, $metager);
+        parent::__construct($name, $engine, $metager);
     }
 
     public function loadResults($result)
@@ -34,7 +34,7 @@ class Mg_hochsch_de extends Searchengine
                 $link,
                 $anzeigeLink,
                 $descr,
-                $this->displayName,$this->homepage,
+                $this->engine->{"display-name"},$this->engine->homepage,
                 $this->counter
             );
         }

app/Models/parserSkripte/Mg_produkt2.php

@@ -9,9 +9,9 @@ class Mg_produkt2 extends Searchengine
 {
     public $results = [];
 
-    public function __construct(\SimpleXMLElement $engine, \App\MetaGer $metager)
+    public function __construct($name, \StdClass $engine, \App\MetaGer $metager)
     {
-        parent::__construct($engine, $metager);
+        parent::__construct($name, $engine, $metager);
     }
 
     public function loadResults($result)
@@ -42,7 +42,7 @@ class Mg_produkt2 extends Searchengine
                     $link,
                     $anzeigeLink,
                     $descr,
-                    $this->displayName,$this->homepage,
+                    $this->engine->{"display-name"},$this->engine->homepage,
                     $this->counter,
                     ['image' => $image]
                 );

app/Models/parserSkripte/Onenewspage.php

@@ -10,9 +10,9 @@ class Onenewspage extends Searchengine
     public $resultCount = 0;
 
     private $offset = 0;
-    public function __construct(\SimpleXMLElement $engine, \App\MetaGer $metager)
+    public function __construct($name, \StdClass $engine, \App\MetaGer $metager)
     {
-        parent::__construct($engine, $metager);
+        parent::__construct($name, $engine, $metager);
     }
 
     public function loadResults($result)
@@ -37,7 +37,7 @@ class Onenewspage extends Searchengine
                 $link,
                 $anzeigeLink,
                 $descr,
-                $this->displayName,$this->homepage,
+                $this->engine->{"display-name"},$this->engine->homepage,
                 $this->counter,
                 $additionalInformation
             );

app/Models/parserSkripte/Onenewspagegermany.php

@@ -11,9 +11,9 @@ class Onenewspagegermany extends Searchengine
     public $resultCount = 0;
 
     private $offset = 0;
-    public function __construct(\SimpleXMLElement $engine, \App\MetaGer $metager)
+    public function __construct($name, \StdClass $engine, \App\MetaGer $metager)
     {
-        parent::__construct($engine, $metager);
+        parent::__construct($name, $engine, $metager);
     }
 
     public function loadResults($result)
@@ -40,7 +40,7 @@ class Onenewspagegermany extends Searchengine
                     $link,
                     $anzeigeLink,
                     $descr,
-                    $this->displayName,$this->homepage,
+                    $this->engine->{"display-name"},$this->engine->homepage,
                     $this->counter,
                     $additionalInformation
                 );

app/Models/parserSkripte/Onenewspagevideo.php

@@ -10,9 +10,9 @@ class Onenewspagevideo extends Searchengine
     public $resultCount = 0;
 
     private $offset = 0;
-    public function __construct(\SimpleXMLElement $engine, \App\MetaGer $metager)
+    public function __construct($name, \StdClass $engine, \App\MetaGer $metager)
     {
-        parent::__construct($engine, $metager);
+        parent::__construct($name, $engine, $metager);
     }
 
     public function loadResults($result)
@@ -36,7 +36,7 @@ class Onenewspagevideo extends Searchengine
                 $link,
                 $anzeigeLink,
                 $descr,
-                $this->displayName,$this->homepage,
+                $this->engine->{"display-name"},$this->engine->homepage,
                 $this->counter,
                 $additionalInformation
             );

app/Models/parserSkripte/Openclipart.php

@@ -9,9 +9,9 @@ class Openclipart extends Searchengine
 {
     public $results = [];
 
-    public function __construct(\SimpleXMLElement $engine, \App\MetaGer $metager)
+    public function __construct($name, \StdClass $engine, \App\MetaGer $metager)
     {
-        parent::__construct($engine, $metager);
+        parent::__construct($name, $engine, $metager);
     }
 
     public function loadResults($result)
@@ -37,7 +37,7 @@ class Openclipart extends Searchengine
                     $link,
                     $anzeigeLink,
                     $descr,
-                    $this->displayName,$this->homepage,
+                    $this->engine->{"display-name"},$this->engine->homepage,
                     $this->counter,
                     ['image' => $image]
                 );

app/Models/parserSkripte/Opencrawlastronomie.php

@@ -9,9 +9,9 @@ class Opencrawlastronomie extends Searchengine
 {
     public $results = [];
 
-    public function __construct(\SimpleXMLElement $engine, \App\MetaGer $metager)
+    public function __construct($name, \StdClass $engine, \App\MetaGer $metager)
     {
-        parent::__construct($engine, $metager);
+        parent::__construct($name, $engine, $metager);
     }
 
     public function loadResults($result)
@@ -41,7 +41,7 @@ class Opencrawlastronomie extends Searchengine
                     $link,
                     $anzeigeLink,
                     $descr,
-                    $this->displayName,$this->homepage,
+                    $this->engine->{"display-name"},$this->engine->homepage,
                     $this->counter
                 );
                 $count++;

app/Models/parserSkripte/Opencrawlpolitik.php

@@ -9,9 +9,9 @@ class Opencrawlpolitik extends Searchengine
 {
     public $results = [];
 
-    public function __construct(\SimpleXMLElement $engine, \App\MetaGer $metager)
+    public function __construct($name, \StdClass $engine, \App\MetaGer $metager)
     {
-        parent::__construct($engine, $metager);
+        parent::__construct($name, $engine, $metager);
     }
 
     public function loadResults($result)
@@ -49,7 +49,7 @@ class Opencrawlpolitik extends Searchengine
                     $link,
                     $anzeigeLink,
                     $descr,
-                    $this->displayName,$this->homepage,
+                    $this->engine->{"display-name"},$this->engine->homepage,
                     $this->counter,
                     $additionalInformation
                 );

app/Models/parserSkripte/Opencrawlregengergie.php

@@ -9,9 +9,9 @@ class Opencrawlregengergie extends Searchengine
 {
     public $results = [];
 
-    public function __construct(\SimpleXMLElement $engine, \App\MetaGer $metager)
+    public function __construct($name, \StdClass $engine, \App\MetaGer $metager)
     {
-        parent::__construct($engine, $metager);
+        parent::__construct($name, $engine, $metager);
     }
 
     public function loadResults($result)
@@ -41,7 +41,7 @@ class Opencrawlregengergie extends Searchengine
                     $link,
                     $anzeigeLink,
                     $descr,
-                    $this->displayName,$this->homepage,
+                    $this->engine->{"display-name"},$this->engine->homepage,
                     $this->counter
                 );
                 $count++;

app/Models/parserSkripte/OvertureAds.php

@@ -8,9 +8,9 @@ use Log;
 class OvertureAds extends Searchengine
 {
 
-    public function __construct(\SimpleXMLElement $engine, \App\MetaGer $metager)
+    public function __construct($name, \StdClass $engine, \App\MetaGer $metager)
     {
-        parent::__construct($engine, $metager);
+        parent::__construct($name, $engine, $metager);
     }
 
     public function loadResults($result)
@@ -35,7 +35,7 @@ class OvertureAds extends Searchengine
                     $link,
                     $anzeigeLink,
                     $descr,
-                    $this->displayName,$this->homepage,
+                    $this->engine->{"display-name"},$this->engine->homepage,
                     $this->counter
                 );
             }

app/Models/parserSkripte/Pixabay.php

@@ -9,9 +9,9 @@ class Pixabay extends Searchengine
 {
     public $results = [];
 
-    public function __construct(\SimpleXMLElement $engine, \App\MetaGer $metager)
+    public function __construct($name, \StdClass $engine, \App\MetaGer $metager)
     {
-        parent::__construct($engine, $metager);
+        parent::__construct($name, $engine, $metager);
     }
 
     public function loadResults($result)
@@ -37,7 +37,7 @@ class Pixabay extends Searchengine
                     $link,
                     $anzeigeLink,
                     $descr,
-                    $this->displayName,$this->homepage,
+                    $this->engine->{"display-name"},$this->engine->homepage,
                     $this->counter,
                     ['image' => $image]
                 );

app/Models/parserSkripte/Qip.php

@@ -9,9 +9,9 @@ class Qip extends Searchengine
 {
     public $results = [];
 
-    public function __construct(\SimpleXMLElement $engine, \App\MetaGer $metager)
+    public function __construct($name, \StdClass $engine, \App\MetaGer $metager)
     {
-        parent::__construct($engine, $metager);
+        parent::__construct($name, $engine, $metager);
     }
 
     public function loadResults($result)
@@ -36,7 +36,7 @@ class Qip extends Searchengine
                     $link,
                     $anzeigeLink,