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

Merge pull request #813 from bondjimbond/parent_fix 

Exclude configured root from orphans list
7.x
Bryan J. Brown 4 years ago committed by GitHub
parent
430b500c73 4258cfa415
commit
c34c7ac071
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 12 additions and 9 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. 5
      includes/orphaned_objects.inc

5
includes/orphaned_objects.inc
Unescape View File

@ -154,7 +154,8 @@ function islandora_manage_orphaned_objects_confirm_submit(array $form, array &$f
*/ */
function islandora_get_orphaned_objects() { function islandora_get_orphaned_objects() {
$query_method = variable_get('islandora_orphaned_objects_backend', 'SPARQL'); $query_method = variable_get('islandora_orphaned_objects_backend', 'SPARQL');
$root_pid = variable_get('islandora_repository_pid', 'islandora:root');
$root_pid_check = "info:fedora/" . $root_pid;
if ($query_method == 'Solr') { if ($query_method == 'Solr') {
// Solr query for all objects. // Solr query for all objects.
$collection_field = variable_get('islandora_solr_member_of_collection_field', 'RELS_EXT_isMemberOfCollection_uri_ms'); $collection_field = variable_get('islandora_solr_member_of_collection_field', 'RELS_EXT_isMemberOfCollection_uri_ms');
@ -197,6 +198,7 @@ function islandora_get_orphaned_objects() {
foreach ($results as $result) { foreach ($results as $result) {
if (array_key_exists($collection_field, $result['solr_doc'])) { if (array_key_exists($collection_field, $result['solr_doc'])) {
foreach ($result['solr_doc'][$collection_field] as $collection) { foreach ($result['solr_doc'][$collection_field] as $collection) {
if (($result['PID'] != $root_pid) && ($collection != $root_pid_check)) {
if (in_array($collection, $missing_parents)) { if (in_array($collection, $missing_parents)) {
$orphaned_objects[] = $result; $orphaned_objects[] = $result;
} }
@ -210,6 +212,7 @@ function islandora_get_orphaned_objects() {
} }
} }
} }
}
if (array_key_exists($member_field, $result['solr_doc'])) { if (array_key_exists($member_field, $result['solr_doc'])) {
foreach ($result['solr_doc'][$member_field] as $membership) { foreach ($result['solr_doc'][$member_field] as $membership) {
if (in_array($membership, $missing_parents)) { if (in_array($membership, $missing_parents)) {

Write Preview
Loading…
Cancel
Save