From 81e200a1b78b7855a608245febeffc07754f5e49 Mon Sep 17 00:00:00 2001
From: Dominik Hebeler <dominik@suma-ev.de>
Date: Tue, 12 Feb 2019 13:00:32 +0100
Subject: [PATCH] Fixed a bug in parser scripts
---
app/Models/parserSkripte/Europeana.php | 2 +-
app/Models/parserSkripte/Flickr.php | 2 +-
app/Models/parserSkripte/Onenewspage.php | 2 +-
app/Models/parserSkripte/Onenewspagegermany.php | 2 +-
app/Models/parserSkripte/Onenewspagevideo.php | 2 +-
app/Models/parserSkripte/Openclipart.php | 2 +-
app/Models/parserSkripte/Pixabay.php | 2 +-
app/Models/parserSkripte/Shopzilla.php | 2 +-
app/Models/parserSkripte/Yandex.php | 2 +-
9 files changed, 9 insertions(+), 9 deletions(-)
diff --git a/app/Models/parserSkripte/Europeana.php b/app/Models/parserSkripte/Europeana.php
index 43eb4a55b..ce96e7152 100644
--- a/app/Models/parserSkripte/Europeana.php
+++ b/app/Models/parserSkripte/Europeana.php
@@ -69,7 +69,7 @@ class Europeana extends Searchengine
}
$next = new Europeana($this->engine, $metager);
$next->getString .= "&start=" . $start;
- $next->hash = md5($next->host . $next->getString . $next->port . $next->name);
+ $next->hash = md5($next->engine->host . $next->getString . $next->engine->port . $next->name);
$this->next = $next;
} catch (\Exception $e) {
Log::error("A problem occurred parsing results from $this->name:");
diff --git a/app/Models/parserSkripte/Flickr.php b/app/Models/parserSkripte/Flickr.php
index 5d26d7992..1292867d0 100644
--- a/app/Models/parserSkripte/Flickr.php
+++ b/app/Models/parserSkripte/Flickr.php
@@ -65,7 +65,7 @@ class Flickr extends Searchengine
}
$next = new Flickr($this->name, $this->engine, $metager);
$next->getString .= "&page=" . $page;
- $next->hash = md5($next->host . $next->getString . $next->port . $next->name);
+ $next->hash = md5($next->engine->host . $next->getString . $next->engine->port . $next->name);
$this->next = $next;
} catch (\Exception $e) {
Log::error("A problem occurred parsing results from $this->name:");
diff --git a/app/Models/parserSkripte/Onenewspage.php b/app/Models/parserSkripte/Onenewspage.php
index 7d668568c..0b9ba4bb7 100644
--- a/app/Models/parserSkripte/Onenewspage.php
+++ b/app/Models/parserSkripte/Onenewspage.php
@@ -58,7 +58,7 @@ class Onenewspage extends Searchengine
$next->resultCount = $this->resultCount;
$next->offset = $this->offset + $this->resultCount;
$next->getString .= "&o=" . $next->offset;
- $next->hash = md5($next->host . $next->getString . $next->port . $next->name);
+ $next->hash = md5($next->engine->host . $next->getString . $next->engine->port . $next->name);
$this->next = $next;
}
}
diff --git a/app/Models/parserSkripte/Onenewspagegermany.php b/app/Models/parserSkripte/Onenewspagegermany.php
index b91f6f146..288f644e0 100644
--- a/app/Models/parserSkripte/Onenewspagegermany.php
+++ b/app/Models/parserSkripte/Onenewspagegermany.php
@@ -63,7 +63,7 @@ class Onenewspagegermany extends Searchengine
$next->resultCount = $this->resultCount;
$next->offset = $this->offset + $this->resultCount;
$next->getString .= "&o=" . $next->offset;
- $next->hash = md5($next->host . $next->getString . $next->port . $next->name);
+ $next->hash = md5($next->engine->host . $next->getString . $next->engine->port . $next->name);
$this->next = $next;
}
}
diff --git a/app/Models/parserSkripte/Onenewspagevideo.php b/app/Models/parserSkripte/Onenewspagevideo.php
index b94559558..a83ae8ddf 100644
--- a/app/Models/parserSkripte/Onenewspagevideo.php
+++ b/app/Models/parserSkripte/Onenewspagevideo.php
@@ -56,7 +56,7 @@ class Onenewspagevideo extends Searchengine
$next->resultCount = $this->resultCount;
$next->offset = $this->offset + $this->resultCount;
$next->getString .= "&o=" . $next->offset;
- $next->hash = md5($next->host . $next->getString . $next->port . $next->name);
+ $next->hash = md5($next->engine->host . $next->getString . $next->engine->port . $next->name);
$this->next = $next;
}
}
diff --git a/app/Models/parserSkripte/Openclipart.php b/app/Models/parserSkripte/Openclipart.php
index a718de29a..4f184a497 100644
--- a/app/Models/parserSkripte/Openclipart.php
+++ b/app/Models/parserSkripte/Openclipart.php
@@ -62,7 +62,7 @@ class Openclipart extends Searchengine
}
$next = new Openclipart($this->name, $this->engine, $metager);
$next->getString .= "&page=" . ($metager->getPage() + 1);
- $next->hash = md5($next->host . $next->getString . $next->port . $next->name);
+ $next->hash = md5($next->engine->host . $next->getString . $next->engine->port . $next->name);
$this->next = $next;
} catch (\Exception $e) {
Log::error("A problem occurred parsing results from $this->name:");
diff --git a/app/Models/parserSkripte/Pixabay.php b/app/Models/parserSkripte/Pixabay.php
index 987c17025..b4d57eb8b 100644
--- a/app/Models/parserSkripte/Pixabay.php
+++ b/app/Models/parserSkripte/Pixabay.php
@@ -72,7 +72,7 @@ class Pixabay extends Searchengine
}
$next = new Pixabay($this->name, $this->engine, $metager);
$next->getString .= "&page=" . $page;
- $next->hash = md5($next->host . $next->getString . $next->port . $next->name);
+ $next->hash = md5($next->engine->host . $next->getString . $next->engine->port . $next->name);
$this->next = $next;
} catch (\Exception $e) {
Log::error("A problem occurred parsing results from $this->name:");
diff --git a/app/Models/parserSkripte/Shopzilla.php b/app/Models/parserSkripte/Shopzilla.php
index 696315e0a..40e187b0b 100644
--- a/app/Models/parserSkripte/Shopzilla.php
+++ b/app/Models/parserSkripte/Shopzilla.php
@@ -101,7 +101,7 @@ class Shopzilla extends Searchengine
$next->getString .= "&start=" . ($current + 10);
}
- $next->hash = md5($next->host . $next->getString . $next->port . $next->name);
+ $next->hash = md5($next->engine->host . $next->getString . $next->engine->port . $next->name);
$this->next = $next;
}
}
diff --git a/app/Models/parserSkripte/Yandex.php b/app/Models/parserSkripte/Yandex.php
index 3e7c11f08..242171244 100644
--- a/app/Models/parserSkripte/Yandex.php
+++ b/app/Models/parserSkripte/Yandex.php
@@ -77,7 +77,7 @@ class Yandex extends Searchengine
}
$next = new Yandex($this->name, $this->engine, $metager);
$next->getString .= "&page=" . ($metager->getPage() + 1);
- $next->hash = md5($next->host . $next->getString . $next->port . $next->name);
+ $next->hash = md5($next->engine->host . $next->getString . $next->engine->port . $next->name);
} catch (\Exception $e) {
Log::error("A problem occurred parsing results from $this->name:\n" . $e->getMessage() . "\n" . $result);
return;
--
GitLab