From a8468ac9b0e1a5f380b9c803f2b258537a1ba5ff Mon Sep 17 00:00:00 2001
From: klausi <klausi@262198.no-reply.drupal.org>
Date: Mon, 10 Feb 2014 18:08:59 -0800
Subject: [PATCH] Issue #2192819 by twistor, klausi: FeedsHTTPFetcherResult
should store the result between batches.
---
plugins/FeedsHTTPFetcher.inc | 28 +++++++++++++++++++++-------
1 file changed, 21 insertions(+), 7 deletions(-)
diff --git a/plugins/FeedsHTTPFetcher.inc b/plugins/FeedsHTTPFetcher.inc
index 3bd0c1e4..7b71281e 100644
--- a/plugins/FeedsHTTPFetcher.inc
+++ b/plugins/FeedsHTTPFetcher.inc
@@ -11,8 +11,19 @@ feeds_include_library('PuSHSubscriber.inc', 'PuSHSubscriber');
* Result of FeedsHTTPFetcher::fetch().
*/
class FeedsHTTPFetcherResult extends FeedsFetcherResult {
+
+ /**
+ * The URL of the feed being fetched.
+ *
+ * @var string
+ */
protected $url;
- protected $file_path;
+
+ /**
+ * The timeout in seconds to wait for a download.
+ *
+ * @var int
+ */
protected $timeout;
/**
@@ -20,19 +31,22 @@ class FeedsHTTPFetcherResult extends FeedsFetcherResult {
*/
public function __construct($url = NULL) {
$this->url = $url;
- parent::__construct('');
}
/**
* Overrides FeedsFetcherResult::getRaw();
*/
public function getRaw() {
- feeds_include_library('http_request.inc', 'http_request');
- $result = http_request_get($this->url, NULL, NULL, NULL, $this->timeout);
- if (!in_array($result->code, array(200, 201, 202, 203, 204, 205, 206))) {
- throw new Exception(t('Download of @url failed with code !code.', array('@url' => $this->url, '!code' => $result->code)));
+ if (!isset($this->raw)) {
+ feeds_include_library('http_request.inc', 'http_request');
+ $result = http_request_get($this->url, NULL, NULL, NULL, $this->timeout);
+ if (!in_array($result->code, array(200, 201, 202, 203, 204, 205, 206))) {
+ throw new Exception(t('Download of @url failed with code !code.', array('@url' => $this->url, '!code' => $result->code)));
+ }
+ $this->raw = $result->data;
}
- return $this->sanitizeRaw($result->data);
+
+ return $this->sanitizeRaw($this->raw);
}
public function getTimeout() {
--
GitLab