Adopt OAI-PMH plugin to new list object

This commit is contained in:
Sebastian Meyer 2013-12-20 14:26:26 +01:00
parent 1766866f55
commit 1f9d5a066a
2 changed files with 28 additions and 15 deletions

View File

@ -590,9 +590,9 @@ class tx_dlf_oai extends tx_dlf_plugin {
for ($i = $resultSet->metadata['offset'], $j = intval($resultSet->metadata['offset'] + $this->conf['limit']); $i < $j; $i++) {
$todo[] = $resultSet->elements[$i]['uid'];
$todo[] = $resultSet[$i];
if (empty($resultSet->elements[$i + 1])) {
if (empty($resultSet[$i + 1])) {
$complete = TRUE;
@ -742,7 +742,7 @@ class tx_dlf_oai extends tx_dlf_plugin {
$resumptionToken->setAttribute('cursor', $resultSet->metadata['offset']);
$resumptionToken->setAttribute('completeListSize', $resultSet->count);
$resumptionToken->setAttribute('completeListSize', count($resultSet));
$resumptionToken->setAttribute('expirationDate', gmdate('Y-m-d\TH:i:s\Z', $GLOBALS['EXEC_TIME'] + $this->conf['expired']));
@ -1249,7 +1249,7 @@ class tx_dlf_oai extends tx_dlf_plugin {
$resumptionToken->setAttribute('cursor', '0');
$resumptionToken->setAttribute('completeListSize', $resultSet->count);
$resumptionToken->setAttribute('completeListSize', count($resultSet));
$resumptionToken->setAttribute('expirationDate', gmdate('Y-m-d\TH:i:s\Z', $GLOBALS['EXEC_TIME'] + $this->conf['expired']));
@ -1654,7 +1654,7 @@ class tx_dlf_oai extends tx_dlf_plugin {
$resumptionToken->setAttribute('cursor', '0');
$resumptionToken->setAttribute('completeListSize', $resultSet->count);
$resumptionToken->setAttribute('completeListSize', count($resultSet));
$resumptionToken->setAttribute('expirationDate', gmdate('Y-m-d\TH:i:s\Z', $GLOBALS['EXEC_TIME'] + $this->conf['expired']));

View File

@ -55,16 +55,6 @@ class tx_dlf_validator extends tx_dlf_plugin {
// Disable caching for this plugin.
$this->setCache(FALSE);
// Load current document.
$this->loadDocument();
if ($this->doc === NULL) {
// Quit without doing anything if required variables are not set.
return $content;
}
// Load template file.
if (!empty($this->conf['templateFile'])) {
@ -76,6 +66,29 @@ class tx_dlf_validator extends tx_dlf_plugin {
}
// Load current document.
$this->loadDocument();
if ($this->doc === NULL) {
// Document could not be loaded.
// Check:
// - if document location is valid URL
// - if document location is reachable
// - if document is well-formed XML
// - if document has METS node
} else {
// Document loaded.
// Check:
// - if document is valid METS document
// - if document contains supported metadata schema
// - if document's metadata are valid
// - if document provides configured mandatory fields
}
return $this->pi_wrapInBaseClass($content);
}