Skip to content
Snippets Groups Projects
Commit 4a0951f5 authored by Chris Hallberg's avatar Chris Hallberg
Browse files

Missed a pull. Now it's the latest VuDL.

parent 19caec06
No related merge requests found
Hide whitespace changes
Inline Side-by-side
module/VuDL/src/VuDL/Connection/Fedora.php
+ 15
− 47
View file @ 4a0951f5
......@@ -96,6 +96,20 @@ class Fedora extends AbstractBase
return $details;
}
/**
* Get the last modified date from Solr
*
* @param string $id ID to look up
*
* @return array
* @throws \Exception
*/
public function getModDate($id)
{
$xml = $this->connector->getObjectAsXML($id);
return (string)$xml[0]->objLastModDate;
}
/**
* Returns file contents of the structmap, our most common call
*
......@@ -105,53 +119,7 @@ class Fedora extends AbstractBase
*/
public function getOrderedMembers($id)
{
// Remove global filters from the connector
$map = $this->solr->getMap();
$params = $map->getParameters('select', 'appends');
$map->setParameters('select', 'appends', array());
// Try to find members in order
$seqField = 'sequence_'.str_replace(':', '_', $id).'_str';
$response = $this->solr->search(
new ParamBag(
array(
'q' => $seqField.':[* TO *]',
'wt' => 'json',
'rows' => 99999,
'fl' => 'id,'.$seqField,
'group' => 'false'
)
)
);
$data = json_decode($response);
// If we didn't find anything, do a standard members search
if ($data->response->numFound == 0) {
$response = $this->solr->search(
new ParamBag(
array(
'q' => 'relsext.isMemberOf:"'.$id.'"',
'wt' => 'json',
'rows' => 99999,
'fl' => 'id',
'group' => 'false'
)
)
);
$data = json_decode($response);
$structmap = array_map(
function ($n) {
return $n->id;
},
$data->response->docs
);
} else {
$structmap = array();
foreach ($data->response->docs as $member) {
$structmap[intval($member->$seqField)-1] = $member->id;
}
}
// Reapply the global filters
$map->setParameters('select', 'appends', $params->getArrayCopy());
return $structmap;
return $this->getMemberList($id);
}
/**
......
module/VuDL/src/VuDL/Connection/Solr.php
+ 42
− 24
View file @ 4a0951f5
......@@ -70,20 +70,53 @@ class Solr extends AbstractBase
*/
public function getDetails($id, $format)
{
// Remove global filters from the connector
$map = $this->solr->getMap();
$params = $map->getParameters('select', 'appends');
$map->setParameters('select', 'appends', array());
$details = null;
if($response = $this->solr->search(
new ParamBag(
array(
'q' => 'id:"'.$id.'"',
'wt' => 'json',
'group' => 'false'
'wt' => 'json'
)
)
)) {
$record = json_decode($response);
if ($format) {
return $this->formatDetails((Array) $record->response->docs[0]);
$details = $this->formatDetails((Array) $record->response->docs[0]);
}
return (Array) $record->response->docs[0];
$details = (Array) $record->response->docs[0];
}
// Reapply the global filters
$map->setParameters('select', 'appends', $params->getArrayCopy());
return null;
}
/**
* Get the last modified date from Solr
*
* @param string $id ID to look up
*
* @return array
* @throws \Exception
*/
public function getModDate($id)
{
$modfield = 'fgs.lastModifiedDate';
if($response = $this->solr->search(
new ParamBag(
array(
'q' => 'id:"'.$id.'"',
'wt' => 'json',
'group' => 'false',
'fl' => $modfield
)
)
)) {
$record = json_decode($response);
return $record->response->docs[0]->$modfield;
}
return null;
}
......@@ -106,7 +139,8 @@ class Solr extends AbstractBase
$response = $this->solr->search(
new ParamBag(
array(
'q' => $seqField.':[* TO *]',
'q' => 'relsext.isMemberOf:"'.$id.'"',
'sort' => $seqField.' asc',
'wt' => 'json',
'rows' => 99999,
'fl' => 'id,'.$seqField,
......@@ -117,34 +151,18 @@ class Solr extends AbstractBase
$data = json_decode($response);
// If we didn't find anything, do a standard members search
if ($data->response->numFound == 0) {
$response = $this->solr->search(
new ParamBag(
array(
'q' => 'relsext.isMemberOf:"'.$id.'"',
'wt' => 'json',
'rows' => 99999,
'fl' => 'id',
'group' => 'false'
)
)
);
$data = json_decode($response);
return null;
} else {
$structmap = array_map(
function ($n) {
return $n->id;
},
$data->response->docs
);
//var_dump('relsext.isMemberOf:"'.$id.'"');
} else {
//var_dump($seqField);
$structmap = array();
foreach ($data->response->docs as $member) {
$structmap[intval($member->$seqField)-1] = $member->id;
}
}
// Reapply the global filters
$map->setParameters('select', 'appends', $params->getArrayCopy());
//var_dump($structmap);
return $structmap;
}
......
module/VuDL/src/VuDL/OutlineGenerator.php
+ 1
− 2
View file @ 4a0951f5
......@@ -164,8 +164,7 @@ class OutlineGenerator
$this->outline = array('counts'=>array(), 'names'=>array(), 'lists'=>array());
// Check modification date
$xml = $this->connector->getObjectAsXML($root);
$rootModDate = (string)$xml[0]->objLastModDate;
$rootModDate = $this->connector->getModDate($root);
// Get lists
$lists = array_reverse($this->connector->getOrderedMembers($root));
// Get list items
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment