diff --git a/data-sources/datasource.remote.php b/data-sources/datasource.remote.php index 031d893..8a811af 100644 --- a/data-sources/datasource.remote.php +++ b/data-sources/datasource.remote.php @@ -6,7 +6,7 @@ class RemoteDatasource extends DataSource implements iDatasource { - private static $transformer = null; + private static $transformer = array(); private static $url_result = null; private static $cacheable = null; @@ -1089,14 +1089,14 @@ public static function getTransformer($format) { $transformer = EXTENSIONS . '/remote_datasource/lib/class.' . strtolower($format) . '.php'; - if (!isset(self::$transformer)) { + if (!isset(self::$transformer[$format])) { if (file_exists($transformer)) { $classname = require_once $transformer; - self::$transformer = new $classname; + self::$transformer[$format] = new $classname; } } - return self::$transformer; + return self::$transformer[$format]; } } diff --git a/extension.meta.xml b/extension.meta.xml index 51a9559..fcb62ae 100644 --- a/extension.meta.xml +++ b/extension.meta.xml @@ -1,62 +1,65 @@ - Remote Datasource - A datasource that consumes XML, JSON, CSV or TEXT content. - https://github.com/symphonycms/remote_datasource - https://github.com/symphonycms/remote_datasource/issues - https://www.getsymphony.com/discuss/thread/110527/ - - - Symphony Team - - - - - - Bug fixes - - Added compatibility with Symphony 2.7.x and 3.x.x - - - - Fix for php 5.3 compat - - - - Make CSV style configurable. - - Fix `{$workspace}` path - - - - Fix a bug with late static binding on PHP 5.3. - - - - Fix the first cache of a result always resulting in an error - - Abstract the transformers for better extensibility - - - - Expose the CURL error via `httpError()` - - Fix error with CSV importing - - - - Add support for text format (a copy of the html response body) - - Add some documentation - - - - Clean-up - - - - Add support for Symphony 2.4 - - Support CSV data format - - Allow `$gateway` to be manipulated and `$data` to previewed - - When the Datasource fails, data is added to the `?debug` page to assist in debugging - - Allow no cache to be set - - Sanitize XPath to allow for more complex queries - - - - Officially release the extension - - Add `url` to the resulting XML result so you can see what URL was actually fetched - - Fix bug where a result would always be `stale` - - Allow timeout to be user configurable in the Data Source Editor - - Various PHP E_NOTICE fixes - - - - Initial release - - + Remote Datasource + A datasource that consumes XML, JSON, CSV or TEXT content. + https://github.com/symphonycms/remote_datasource + https://github.com/symphonycms/remote_datasource/issues + https://www.getsymphony.com/discuss/thread/110527/ + + + Symphony Team + + + + + - [#37](https://github.com/symphonycms/remote_datasource/issues/37) Fix error when multiple datasources are added to the same page with different formats. + + + - Bug fixes + - Added compatibility with Symphony 2.7.x and 3.x.x + + + - Fix for php 5.3 compat + + + - Make CSV style configurable. + - Fix `{$workspace}` path + + + - Fix a bug with late static binding on PHP 5.3. + + + - Fix the first cache of a result always resulting in an error + - Abstract the transformers for better extensibility + + + - Expose the CURL error via `httpError()` + - Fix error with CSV importing + + + - Add support for text format (a copy of the html response body) + - Add some documentation + + + - Clean-up + + + - Add support for Symphony 2.4 + - Support CSV data format + - Allow `$gateway` to be manipulated and `$data` to previewed + - When the Datasource fails, data is added to the `?debug` page to assist in debugging + - Allow no cache to be set + - Sanitize XPath to allow for more complex queries + + + - Officially release the extension + - Add `url` to the resulting XML result so you can see what URL was actually fetched + - Fix bug where a result would always be `stale` + - Allow timeout to be user configurable in the Data Source Editor + - Various PHP E_NOTICE fixes + + + - Initial release + +