Merge branch '462-nachrichten-nach-zeit-sortierbar-machen' into 'development'

Ergebnis-Format geändert

See merge request !801

app/Models/Result.php

@@ -28,7 +28,8 @@ class Result
     public $rank; # Das Ranking für das Ergebnis
 
     # Erstellt ein neues Ergebnis
-    public function __construct($provider, $titel, $link, $anzeigeLink, $descr, $gefVon, $sourceRank, $partnershop = false, $image = "", $price = 0, $additionalInformation = [])
+    #public function __construct($provider, $titel, $link, $anzeigeLink, $descr, $gefVon, $sourceRank, $partnershop = false, $image = "", $price = 0, $additionalInformation = [])
+    public function __construct($provider, $titel, $link, $anzeigeLink, $descr, $gefVon, $sourceRank, $additionalInformation = [])
     {
         $provider          = simplexml_load_string($provider);
         $this->titel       = strip_tags(trim($titel));
@@ -60,9 +61,9 @@ class Result
         $this->strippedDomain        = $this->getStrippedDomain($this->strippedHost);
         $this->strippedLink          = $this->getStrippedLink($this->anzeigeLink);
         $this->rank                  = 0;
-        $this->partnershop           = $partnershop;
-        $this->image                 = $image;
-        $this->price                 = $price;
+        $this->partnershop           = $additionalInformation["partnershop"] ?? false;
+        $this->image                 = $additionalInformation["image"] ?? "";
+        $this->price                 = $additionalInformation["price"] ?? 0;
         $this->additionalInformation = $additionalInformation;
     }
 

app/Models/parserSkripte/Bing_bilder.php

@@ -33,8 +33,7 @@ class Bing_bilder extends Searchengine
                 $descr,
                 $this->gefVon,
                 $this->counter,
-                false,
-                $image
+                ['image' => $image]
             );
         });
 

app/Models/parserSkripte/Dailymotion.php

@@ -38,8 +38,7 @@ class Dailymotion extends Searchengine
                     $descr,
                     $this->gefVon,
                     $this->counter,
-                    false,
-                    $image
+                    ['partnershop' => false]
                 );
             }
         } catch (\Exception $e) {

app/Models/parserSkripte/Ebay.php

@@ -3,6 +3,7 @@
 namespace app\Models\parserSkripte;
 
 use App\Models\Searchengine;
+use Log;
 
 class Ebay extends Searchengine
 {
@@ -52,9 +53,9 @@ class Ebay extends Searchengine
                     $descr,
                     $this->gefVon,
                     $this->counter,
-                    false,
-                    $image,
-                    $price
+                    ['partnershop' => false,
+                        'price'        => $price,
+                        'image'        => $image]
                 );
                 $count++;
             }

app/Models/parserSkripte/Ecoshopper.php

@@ -51,8 +51,8 @@ class Ecoshopper extends Searchengine
                     $descr,
                     $this->gefVon,
                     $this->counter,
-                    false,
-                    $image
+                    ['partnershop' => false,
+                        'image'        => $image]
                 );
             }
         } catch (\Exception $e) {

app/Models/parserSkripte/Europeana.php

@@ -44,8 +44,7 @@ class Europeana extends Searchengine
                         $descr,
                         $this->gefVon,
                         $this->counter,
-                        false,
-                        $image
+                        ['image' => $image]
                     );
                 }
             }

app/Models/parserSkripte/Fairmondo.php

@@ -44,9 +44,9 @@ class Fairmondo extends Searchengine
                 $descr,
                 $this->gefVon,
                 $this->counter,
-                false,
-                $image,
-                $price
+                [
+                    'price' => $price,
+                    'image' => $image]
             );
         }
     }

app/Models/parserSkripte/Fernsehsuche.php

@@ -39,8 +39,7 @@ class Fernsehsuche extends Searchengine
                         $descr,
                         $this->gefVon,
                         $this->counter,
-                        false,
-                        $image
+                        ['image' => $image]
                     );
                 } catch (\ErrorException $e) {
 

app/Models/parserSkripte/Flickr.php

@@ -39,8 +39,7 @@ class Flickr extends Searchengine
                     $descr,
                     $this->gefVon,
                     $this->counter,
-                    false,
-                    $image
+                    ['image' => $image]
                 );
             }
         } catch (\Exception $e) {

app/Models/parserSkripte/Mg_produkt2.php

@@ -44,8 +44,7 @@ class Mg_produkt2 extends Searchengine
                     $descr,
                     $this->gefVon,
                     $this->counter,
-                    false,
-                    $image
+                    ['image' => $image]
                 );
             }
         } catch (\Exception $e) {

app/Models/parserSkripte/Openclipart.php

@@ -39,8 +39,7 @@ class Openclipart extends Searchengine
                     $descr,
                     $this->gefVon,
                     $this->counter,
-                    false,
-                    $image
+                    ['image' => $image]
                 );
             }
         } catch (\Exception $e) {

app/Models/parserSkripte/Pixabay.php

@@ -39,8 +39,7 @@ class Pixabay extends Searchengine
                     $descr,
                     $this->gefVon,
                     $this->counter,
-                    false,
-                    $image
+                    ['image' => $image]
                 );
             }
         } catch (\Exception $e) {

app/Models/parserSkripte/Radiobrowser.php

@@ -51,8 +51,7 @@ class Radiobrowser extends Searchengine
                     $anzeigeLink,
                     $descr,
                     $this->gefVon,
-                    $this->counter,
-                    false
+                    $this->counter
                 );
             }
         } catch (\Exception $e) {

app/Models/parserSkripte/Rlvproduct.php

@@ -31,10 +31,10 @@ class RlvProduct extends Searchengine
                 "",
                 $result["shopTitle"],
                 $counter,
-                $partnershop = false,
-                $image,
-                $result["price"],
-                ['shipping' => $result["distribution"]]
+                ['partnershop' => false,
+                    'price'        => $result["price"],
+                    'image'        => $image,
+                    'shipping'     => $result["distribution"]]
             );
         }
     }