Adopt OAI-PMH plugin to new list object

dlf/plugins/oai/class.tx_dlf_oai.php

@@ -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']));
 

dlf/plugins/validator/class.tx_dlf_validator.php

@@ -55,24 +55,37 @@ class tx_dlf_validator extends tx_dlf_plugin {
 		// Disable caching for this plugin.
 		$this->setCache(FALSE);
 
-		// Load current document.
-		$this->loadDocument();
+		// Load template file.
+		if (!empty($this->conf['templateFile'])) {
 
-		if ($this->doc === NULL) {
+			$this->template = $this->cObj->getSubpart($this->cObj->fileResource($this->conf['templateFile']), '###TEMPLATE###');
+
+		} else {
 
-			// Quit without doing anything if required variables are not set.
-			return $content;
+			$this->template = $this->cObj->getSubpart($this->cObj->fileResource('EXT:dlf/plugins/validator/template.tmpl'), '###TEMPLATE###');
 
 		}
 
-		// Load template file.
-		if (!empty($this->conf['templateFile'])) {
+		// Load current document.
+		$this->loadDocument();
 
-			$this->template = $this->cObj->getSubpart($this->cObj->fileResource($this->conf['templateFile']), '###TEMPLATE###');
+		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 {
 
-			$this->template = $this->cObj->getSubpart($this->cObj->fileResource('EXT:dlf/plugins/validator/template.tmpl'), '###TEMPLATE###');
+			// 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
 
 		}