Permalink
Browse files

ISLANDORA-695 Fix replace datastream errors.

...  Looks like I had created had an error in my fix, so this
should fix the error from the previous fix...  Should be good now.
  • Loading branch information...
1 parent 221a3ef commit 87972d4a1a15a8790049b72895ab5874e5a30d2d @adam-vessey adam-vessey committed Jul 5, 2012
Showing with 16 additions and 7 deletions.
  1. +16 −7 api/fedora_item.inc
View
@@ -1013,25 +1013,34 @@ RDF;
if ($parsed_url && array_key_exists('scheme', $parsed_url) && in_array($parsed_url['scheme'], $supported_schemes)) {
$components = explode('/', $parsed_url['path']);
$components = array_map('rawurlencode', $components);
- $result = drupal_http_request(
- url(
- t('!scheme://!user:!pass@!host:!port/!path', array(
+ $fixed_url = url(
+ t(
+ '!scheme://!user:!pass@!host:!port/!path',
+ array(
'!scheme' => $parsed_url['scheme'],
'!user' => rawurlencode($parsed_url['user']),
'!pass' => rawurlencode($parsed_url['pass']),
'!host' => $parsed_url['host'],
+ '!port' => $parsed_url['port'],
'!path' => implode('/', $components),
- )),
- array(
- 'query' => $parsed_url['query'],
- 'fragment' => $parsed_url['fragment'],
)
+ ),
+ array(
+ 'query' => $parsed_url['query'],
+ 'fragment' => $parsed_url['fragment'],
)
);
+ $result = drupal_http_request($fixed_url);
if ((int)($result->code / 100) === 2) {
$content = $result->data;
}
+ else {
+ watchdog('fedora_repository', 'Failed making HTTP request to @URL. Info: @info', array(
+ '@URL' => $fixed_url,
+ '@info' => print_r($result, TRUE),
+ ), 'warning');
+ }
}
return $content;

0 comments on commit 87972d4

Please sign in to comment.