From 301a0342aa5a7570711ec56b05edd93c7220fb36 Mon Sep 17 00:00:00 2001
From: pbarroca <pbarroca@git-test.afi-sa.fr>
Date: Tue, 24 Apr 2012 09:06:50 +0000
Subject: [PATCH] =?UTF-8?q?OAI:=20compl=C3=A9ment=20r=C3=A9ponse=20GetReco?=
=?UTF-8?q?rd=20+=20capacit=C3=A9=20ajout=20CDATA=20dans=20xml=20builder?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
library/Class/Notice.php | 22 ++++++-
library/Class/Notice/DublinCoreVisitor.php | 22 ++++++-
library/Class/Xml/Builder.php | 5 ++
tests/TestXPathFactory.php | 7 +++
.../Class/Notice/DublinCoreVisitorTest.php | 61 ++++++++++++++++---
5 files changed, 107 insertions(+), 10 deletions(-)
diff --git a/library/Class/Notice.php b/library/Class/Notice.php
index 9d59662cee5..5154e3c8b7b 100644
--- a/library/Class/Notice.php
+++ b/library/Class/Notice.php
@@ -60,7 +60,8 @@ class Class_Notice extends Storm_Model_Abstract
$_auteur_principal,
$_avis,
$_moderated_avis,
- $_resume;
+ $_resume,
+ $_matieres;
protected $_default_attribute_values = array('type_doc' => 0);
@@ -787,6 +788,11 @@ class Class_Notice extends Storm_Model_Abstract
// ----------------------------------------------------------------
public function getMatieres()
{
+ if (isset($this->_matieres))
+ return $this->_matieres;
+
+ $matiere = array();
+
// Recup des zones matières dans les variables
$zones = fetchOne("select valeur from variables where clef='unimarc_zone_matiere'");
$zones = explode(";", trim($zones));
@@ -812,6 +818,16 @@ class Class_Notice extends Storm_Model_Abstract
return($matiere);
}
+
+ /**
+ * @param $matieres Array
+ */
+ public function setMatieres($matieres) {
+ $this->_matieres = $matieres;
+ return $this;
+ }
+
+
// ----------------------------------------------------------------
// CENTRE D'INTERET PERGAME
// ----------------------------------------------------------------
@@ -989,6 +1005,10 @@ class Class_Notice extends Storm_Model_Abstract
public function acceptVisitor($visitor) {
$visitor->visitClefAlpha($this->getClefAlpha());
$visitor->visitTitre($this->getTitrePrincipal());
+ $visitor->visitAuteur($this->getAuteurPrincipal());
+ foreach ($this->getMatieres() as $matiere)
+ $visitor->visitMatiere($matiere);
+ $visitor->visitResume($this->getResume());
$visitor->visitDateMaj($this->getDateMaj());
}
}
diff --git a/library/Class/Notice/DublinCoreVisitor.php b/library/Class/Notice/DublinCoreVisitor.php
index f0c8cadeb87..31021b49ebc 100644
--- a/library/Class/Notice/DublinCoreVisitor.php
+++ b/library/Class/Notice/DublinCoreVisitor.php
@@ -49,7 +49,17 @@ class Class_Notice_DublinCoreVisitor {
public function visitTitre($titre) {
- $this->_xml .= $this->_builder->title($titre);
+ $this->_xml .= $this->_builder->title($this->cdata($titre));
+ }
+
+
+ public function visitAuteur($auteur) {
+ $this->_xml .= $this->_builder->creator($this->cdata($auteur));
+ }
+
+
+ public function visitResume($resume) {
+ $this->_xml .= $this->_builder->description($this->cdata($resume));
}
@@ -59,6 +69,11 @@ class Class_Notice_DublinCoreVisitor {
}
+ public function visitMatiere($matiere) {
+ $this->_xml .= $this->_builder->subject($this->cdata($matiere));
+ }
+
+
public function getIdentifier() {
return $this->_identifier;
}
@@ -67,6 +82,11 @@ class Class_Notice_DublinCoreVisitor {
public function getDate() {
return $this->_date;
}
+
+
+ public function cdata($value) {
+ return $this->_builder->cdata($value);
+ }
}
?>
\ No newline at end of file
diff --git a/library/Class/Xml/Builder.php b/library/Class/Xml/Builder.php
index b8919dd3bb9..6853e004051 100644
--- a/library/Class/Xml/Builder.php
+++ b/library/Class/Xml/Builder.php
@@ -46,6 +46,11 @@ class Class_Xml_Builder {
$attribs .= ' ' . $k . '="' . $v . '"';
return $attribs;
}
+
+
+ public function cdata($value) {
+ return sprintf('<![CDATA[%s]]>', $value);
+ }
}
?>
\ No newline at end of file
diff --git a/tests/TestXPathFactory.php b/tests/TestXPathFactory.php
index eed8061d6cc..d1e01a24a4c 100644
--- a/tests/TestXPathFactory.php
+++ b/tests/TestXPathFactory.php
@@ -26,5 +26,12 @@ class TestXPathFactory {
return $xpath;
}
+
+ public static function newOaiDc() {
+ $xpath = self::newOai();
+ $xpath->registerNameSpace('oai_dc', 'http://www.openarchives.org/OAI/2.0/oai_dc/')
+ ->registerNameSpace('dc', 'http://purl.org/dc/elements/1.1/');
+ return $xpath;
+ }
}
?>
\ No newline at end of file
diff --git a/tests/library/Class/Notice/DublinCoreVisitorTest.php b/tests/library/Class/Notice/DublinCoreVisitorTest.php
index 1aeccc259e9..c5d1a0ea134 100644
--- a/tests/library/Class/Notice/DublinCoreVisitorTest.php
+++ b/tests/library/Class/Notice/DublinCoreVisitorTest.php
@@ -25,20 +25,27 @@ abstract class DublinCoreVisitorTestCase extends Storm_Test_ModelTestCase {
public function setUp() {
parent::setUp();
- $this->_xpath = new Storm_Test_XPath();
+ $this->_xpath = TestXPathFactory::newOaiDc();
$this->_dublin_core_visitor = new Class_Notice_DublinCoreVisitor();
}
}
class DublinCoreVisitorPotterTest extends DublinCoreVisitorTestCase {
+ protected $_summary;
+
public function setUp() {
parent::setUp();
+ $this->_summary = 'Apres la mort < tragique de Lily et James Potter, Harry est recueilli par sa tante Petunia, la soeur de Lily et son oncle Vernon. Son oncle et sa tante, possedant une haine feroce envers les parents d\'Harry, le maltraitent et laissent leur fils Dudley l\'humilier. Harry ne sait rien sur ses parents. On lui a toujours dit qu\'ils etaient morts dans un accident de voiture.';
+
$potter = Class_Notice::getLoader()
->newInstanceWithId(4)
->setClefAlpha('harrypotter-sorciers')
->setTitrePrincipal('Harry Potter a l\'ecole des sorciers')
- ->setDateMaj('2012-04-23');
+ ->setAuteurPrincipal('Joanne Kathleen Rowling')
+ ->setDateMaj('2012-04-23')
+ ->setResume($this->_summary)
+ ->setMatieres(array('Potions', 'Etude des runes'));
$this->_dublin_core_visitor->visit($potter);
}
@@ -46,7 +53,7 @@ class DublinCoreVisitorPotterTest extends DublinCoreVisitorTestCase {
/** @test */
public function identifierShouldBeHarryPotterSorciers() {
$this->_xpath->assertXPathContentContains($this->_dublin_core_visitor->xml(),
- '//dc//identifier',
+ '//oai_dc:dc/dc:identifier',
sprintf('http://localhost%s/recherche/notice/harrypotter-sorciers',
BASE_URL));
}
@@ -55,18 +62,56 @@ class DublinCoreVisitorPotterTest extends DublinCoreVisitorTestCase {
/** @test */
public function titleShouldBeHarryPotterEcoleSorciers() {
$this->_xpath->assertXPathContentContains($this->_dublin_core_visitor->xml(),
- '//dc//title',
+ '//oai_dc:dc/dc:title',
'Harry Potter a l\'ecole des sorciers');
}
+ /** @test */
+ public function creatorShouldBeJKRowling() {
+ $this->_xpath->assertXPathContentContains($this->_dublin_core_visitor->xml(),
+ '//oai_dc:dc/dc:creator',
+ 'Joanne Kathleen Rowling');
+ }
+
+
+ /** @test */
+ public function dateShouldBeAprilTwentythird2012() {
+ $this->_xpath->assertXpathContentContains($this->_dublin_core_visitor->xml(),
+ '//oai_dc:dc/dc:date',
+ '2012-04-23');
+ }
+
+
+ /** @test */
+ public function descriptionShouldBeApresLaMortTragiqueEtc() {
+ $this->_xpath->assertXPathContentContains($this->_dublin_core_visitor->xml(),
+ '//oai_dc:dc/dc:description',
+ $this->_summary);
+ }
+
+
+ /** @test */
+ public function subjectEtudeDesRuneShouldBePresent() {
+ $this->_xpath->assertXPathContentContains($this->_dublin_core_visitor->xml(),
+ '//oai_dc:dc/dc:subject',
+ 'Etude des runes');
+ }
+
+
+ /** @test */
+ public function subjectPotionsShouldBePresent() {
+ $this->_xpath->assertXPathContentContains($this->_dublin_core_visitor->xml(),
+ '//oai_dc:dc/dc:subject',
+ 'Potions');
+ }
+
+
/** @test */
public function namespaceShouldBeOAIDC() {
$this->_xpath->assertXpath($this->_dublin_core_visitor->xml(),
- '//dc');
+ '//oai_dc:dc');
}
-
-
}
@@ -87,7 +132,7 @@ class DublinCoreVisitorSouvignyTest extends DublinCoreVisitorTestCase {
/** @test */
public function identifierShouldBeSouvignyBible11eme() {
$this->_xpath->assertXPathContentContains($this->_dublin_core_visitor->xml(),
- '//dc//identifier',
+ '//oai_dc:dc/dc:identifier',
sprintf('http://moulins.fr%s/recherche/notice/souvigny-bible-11eme',
BASE_URL));
}
--
GitLab