Skip to content
This repository has been archived by the owner on Nov 20, 2024. It is now read-only.

[91] - switching the patterns in the MediaInternetGovCmsCkanHandler->… #93

Merged
merged 4 commits into from
Jun 8, 2017
Merged

[91] - switching the patterns in the MediaInternetGovCmsCkanHandler->… #93

Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
844064c
Merge pull request #71 from govCMS/develop
SRowlands Aug 3, 2016
6679a01
Merge branch 'develop' into 7.x-1.x
steveworley Feb 21, 2017
c4c825f
[91] - switching the patterns in the MediaInternetGovCmsCkanHandler->…
kurtfoster May 5, 2017
f3dce0f
[91] - Adding a basePath and associated function to ensure the post a…
kurtfoster May 8, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
17 changes: 15 additions & 2 deletions modules/govcms_ckan_media/includes/MediaInternetGovCmsCkanHandler.inc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@ class MediaInternetGovCmsCkanHandler extends MediaInternetBaseHandler {

protected $baseUrl;
protected $baseHost;
protected $basePath;
protected $baseUri = 'ckan://resource/';

/**
Expand All @@ -22,6 +23,7 @@ class MediaInternetGovCmsCkanHandler extends MediaInternetBaseHandler {
parent::__construct($embed_code);
$this->baseUrl = variable_get('govcms_ckan_endpoint_url', '');
$this->baseHost = $this->getBaseHost();
$this->basePath = $this->getBasePath();
}

/**
Expand All @@ -34,8 +36,8 @@ class MediaInternetGovCmsCkanHandler extends MediaInternetBaseHandler {
// @baseurl/dataset/PACKAGE_ID/resource/RESOURCE_ID/download/filename.csv
// @baseurl/dataset/PACKAGE_ID/resource/RESOURCE_ID
$patterns = array(
'@' . $this->baseHost . '/dataset/([^"\&\? ]+)/resource/([^"\&\? ]+)/download/(?:[^"\&\? ]+)@i',
'@' . $this->baseHost . '/dataset/([^"\&\? ]+)/resource/([^"\&\? ]+)@i',
'@' . $this->baseHost . $this->basePath . '/dataset/([^"\&\? ]+)/resource/([^"\&\? ]+)/download/(?:[^"\&\? ]+)@i',
'@' . $this->baseHost . $this->basePath . '/dataset/([^"\&\? ]+)/resource/([^"\&\? ]+)@i',
);

// First check if the url contains the embed code.
Expand Down Expand Up @@ -185,6 +187,17 @@ class MediaInternetGovCmsCkanHandler extends MediaInternetBaseHandler {
return (!empty($url_parts['host']) ? $url_parts['host'] . $port : NULL);
}

/**
* Get the base path.
*
* @return string
* If valid path found it is returned, otherwise an empty string.
*/
public function getBasePath() {
$url_parts = parse_url($this->baseUrl);
return (!empty($url_parts['path']) ? $url_parts['path'] : '');
}

/**
* Build a resource url.
*
Expand Down