Code
/
islandora
7
0
Fork 0
Code Issues Pull Requests 1 Projects Releases Wiki Activity
Browse Source

Coding standards corrections 

Minor coding standards fixes to pass Travis tests
pull/574/head
DiegoPino 10 years ago
parent
a8e67e2dcf
commit
f34e1eae72
1 changed files with 29 additions and 37 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 66
      includes/breadcrumb.inc

66
includes/breadcrumb.inc
Unescape View File

@ -77,58 +77,50 @@ function islandora_get_breadcrumbs_recursive($pid, FedoraRepository $repository,
); );
} }
else { else {
$query = <<<EOQ
$query= <<<EOQ PREFIX islandora-rels-ext: <http://islandora.ca/ontology/relsext#>
PREFIX islandora-rels-ext: <http://islandora.ca/ontology/relsext#> PREFIX fedora-rels-ext: <info:fedora/fedora-system:def/relations-external#>
PREFIX fedora-rels-ext: <info:fedora/fedora-system:def/relations-external#> SELECT DISTINCT ?object ?label
SELECT DISTINCT ?object ?label FROM <#ri>
FROM <#ri> WHERE {
WHERE {
<info:fedora/!pid> ?collection_predicate ?object; <info:fedora/!pid> ?collection_predicate ?object;
<fedora-model:label> ?label . <fedora-model:label> ?label .
?object <fedora-model:state> <fedora-model:Active> ?object <fedora-model:state> <fedora-model:Active>
. .
!optionals !optionals
!filters !filters
} }
EOQ; EOQ;
$query_optionals = (array) module_invoke('islandora_xacml_api', 'islandora_basic_collection_get_query_optionals', 'view');
$query_filters = (array) module_invoke('islandora_xacml_api', 'islandora_basic_collection_get_query_filters');
$filter_map = function ($filter) {
return "FILTER($filter)";
};
$query_filters[] = "sameTerm(?collection_predicate, <fedora-rels-ext:isMemberOfCollection>) || sameTerm(?collection_predicate, <fedora-rels-ext:isMemberOf>)";
$query = format_string($query, array(
'!optionals' => !empty($query_optionals) ? ('OPTIONAL {{' . implode('} UNION {', $query_optionals) . '}}') : '',
'!filters' => implode(' ', array_map($filter_map, $query_filters)),
));
$query_optionals = (array) module_invoke('islandora_xacml_api', 'islandora_basic_collection_get_query_optionals', 'view');
$query_filters = (array) module_invoke('islandora_xacml_api', 'islandora_basic_collection_get_query_filters');
$filter_map = function ($filter) {
return "FILTER($filter)";
};
$query_filters[] = "sameTerm(?collection_predicate, <fedora-rels-ext:isMemberOfCollection>) || sameTerm(?collection_predicate, <fedora-rels-ext:isMemberOf>)";
$query = format_string($query, array(
'!optionals' => !empty($query_optionals) ? ('OPTIONAL {{' . implode('} UNION {', $query_optionals) . '}}') : '',
'!filters' => implode(' ', array_map($filter_map, $query_filters)),
));
$query = format_string($query, array( $query = format_string($query, array(
'!pid' => $pid, '!pid' => $pid,
)); ));
$results = $repository->ri->sparqlQuery($query,'unlimited'); $results = $repository->ri->sparqlQuery($query, 'unlimited');
if (count($results) > 0 && $context['level'] > 0) { if (count($results) > 0 && $context['level'] > 0) {
$parent = $results[0]['object']['value']; $parent = $results[0]['object']['value'];
$this_label = $results[0]['label']['value']; $this_label = $results[0]['label']['value'];
if (empty($this_label)) { if (empty($this_label)) {
$this_label = t('-'); $this_label = t('-');
} }
$context['level']--; $context['level']--;
return array_merge( return array_merge(islandora_get_breadcrumbs_recursive($parent, $repository, $context), array(
islandora_get_breadcrumbs_recursive($parent, $repository, $context), l($this_label, "islandora/object/$pid"),
array( ));
l($this_label, "islandora/object/$pid"),
)
);
} }
else { else {
// Add an non-link, as we don't know how to get back to the root, and // Add an non-link, as we don't know how to get back to the root, and

Write Preview
Loading…
Cancel
Save