diff --git a/app/Models/parserSkripte/Europeana.php b/app/Models/parserSkripte/Europeana.php index 2f3b80ee3687ebda670dc3a8ce12163760ef05f2..0225cc873e731b13fbfc6f5a0570e8b168eb5bdb 100644 --- a/app/Models/parserSkripte/Europeana.php +++ b/app/Models/parserSkripte/Europeana.php @@ -3,6 +3,7 @@ namespace app\Models\parserSkripte; use App\Models\Searchengine; +use Log; class Europeana extends Searchengine { diff --git a/app/Models/parserSkripte/Flickr.php b/app/Models/parserSkripte/Flickr.php index 49be5da206166b0deb5e95751adbae7ce9b4578d..744837e6c7acc8b739384a485b1b06b663d609e1 100644 --- a/app/Models/parserSkripte/Flickr.php +++ b/app/Models/parserSkripte/Flickr.php @@ -3,6 +3,7 @@ namespace app\Models\parserSkripte; use App\Models\Searchengine; +use Log; class Flickr extends Searchengine { diff --git a/app/Models/parserSkripte/Openclipart.php b/app/Models/parserSkripte/Openclipart.php index 29ac91bc344b563123a0480f5489f7f13d3323c7..9836ed24d70ba80f3adcf8ce6389186483cecb2b 100644 --- a/app/Models/parserSkripte/Openclipart.php +++ b/app/Models/parserSkripte/Openclipart.php @@ -3,6 +3,7 @@ namespace app\Models\parserSkripte; use App\Models\Searchengine; +use Log; class Openclipart extends Searchengine { @@ -18,52 +19,54 @@ class Openclipart extends Searchengine $result = preg_replace("/\r\n/si", "", $result); try { $content = json_decode($result); + if (!$content) { + return; + } + + $results = $content->payload; + foreach ($results as $result) { + $title = $result->title; + $link = $result->detail_link; + $anzeigeLink = $link; + $descr = $result->description; + $image = $result->svg->png_thumb; + $this->counter++; + $this->results[] = new \App\Models\Result( + $this->engine, + $title, + $link, + $anzeigeLink, + $descr, + $this->gefVon, + $this->counter, + false, + $image + ); + } } catch (\Exception $e) { Log::error("Results from $this->name are not a valid json string"); return; } - if (!$content) { - return; - } - $results = $content->payload; - foreach ($results as $result) { - $title = $result->title; - $link = $result->detail_link; - $anzeigeLink = $link; - $descr = $result->description; - $image = $result->svg->png_thumb; - $this->counter++; - $this->results[] = new \App\Models\Result( - $this->engine, - $title, - $link, - $anzeigeLink, - $descr, - $this->gefVon, - $this->counter, - false, - $image - ); - } } public function getNext(\App\MetaGer $metager, $result) { try { $content = json_decode($result); + if (!$content) { + return; + } + + if ($content->info->current_page > $content->info->pages) { + return; + } + $next = new Openclipart(simplexml_load_string($this->engine), $metager); + $next->getString .= "&page=" . ($metager->getPage() + 1); + $next->hash = md5($next->host . $next->getString . $next->port . $next->name); + $this->next = $next; } catch (\Exception $e) { Log::error("Results from $this->name are not a valid json string"); return; } - if (!$content) { - return; - } - if ($content->info->current_page > $content->info->pages) { - return; - } - $next = new Openclipart(simplexml_load_string($this->engine), $metager); - $next->getString .= "&page=" . ($metager->getPage() + 1); - $next->hash = md5($next->host . $next->getString . $next->port . $next->name); - $this->next = $next; } } diff --git a/app/Models/parserSkripte/Overture.php b/app/Models/parserSkripte/Overture.php index c3739b75220ebcb71376e4110802081c5c998dbf..108e556906e99c812fd0ede372b8dbcf269c4101 100644 --- a/app/Models/parserSkripte/Overture.php +++ b/app/Models/parserSkripte/Overture.php @@ -3,6 +3,7 @@ namespace app\Models\parserSkripte; use App\Models\Searchengine; +use Log; class Overture extends Searchengine { diff --git a/app/Models/parserSkripte/Pixabay.php b/app/Models/parserSkripte/Pixabay.php index d50dc11aa4f76c54c20ea41ef00bf4b820d5de50..7ed67f4b580ae03c6138773ae85ecffea5a033f9 100644 --- a/app/Models/parserSkripte/Pixabay.php +++ b/app/Models/parserSkripte/Pixabay.php @@ -3,6 +3,7 @@ namespace app\Models\parserSkripte; use App\Models\Searchengine; +use Log; class Pixabay extends Searchengine { diff --git a/app/Models/parserSkripte/Radiobrowser.php b/app/Models/parserSkripte/Radiobrowser.php index 015c6d22bca9cc2f837515b0e679ea5e0e76750b..6e78eb1f98ebb4282b07029dd716bbcabba05040 100644 --- a/app/Models/parserSkripte/Radiobrowser.php +++ b/app/Models/parserSkripte/Radiobrowser.php @@ -3,6 +3,7 @@ namespace app\Models\parserSkripte; use App\Models\Searchengine; +use Log; class Radiobrowser extends Searchengine { diff --git a/app/Models/parserSkripte/Yandex.php b/app/Models/parserSkripte/Yandex.php index b8dd77138c1ad48c5747f4f2677a6c0e338f788d..6248297b2825fc341c80f6e674a1fb360d5edae2 100644 --- a/app/Models/parserSkripte/Yandex.php +++ b/app/Models/parserSkripte/Yandex.php @@ -3,6 +3,7 @@ namespace app\Models\parserSkripte; use App\Models\Searchengine; +use Log; class Yandex extends Searchengine {