Skip to content
This repository has been archived by the owner on Jan 30, 2020. It is now read-only.

Commit

Permalink
Forward zendframework/zendframework#2983
Browse files Browse the repository at this point in the history
  • Loading branch information
@Maks3w
Maks3w committed Nov 16, 2012
137 parents a4c7b54 + ba78039 + 2cc9607 + bbd31f7 + aff5dfd + 3daad46 + a2bd1ba + b82fa59 + 4190868 + 3a6b7ad + 8e745f6 + bab7086 + c5a5d19 + b468bc1 + d79794c + 508b344 + d16deed + f38e96a + c4a3687 + 54465f7 + 4ad15e4 + 9aa47da + 619d24d + ddfa8f2 + 8e7172b + e5fc69f + 284a721 + 6d3db4c + b99e8c3 + a52dcef + 1d21066 + cccc24c + 81bd699 + dfb38ed + b796f3d + d49dbc2 + 547433c + 0c9ce04 + a76e26a + 2914396 + 7ca3746 + f1b292d + 406112f + 5a9edd3 + f65c9f6 + c54156c + 5e55e82 + 352e42b + fa459f5 + 3eff137 + 3648ab6 + 4096125 + 0037391 + 9bdfcd9 + 6cd1498 + ecac99d + 199ed75 + b8507f7 + ef400bd + decb6ae + 860b39d + 243eca6 + d56af72 + 1aaf7f9 + 26b27a9 + 40cd50e + 986898b + d2780b7 + 49abb1d + cb5a738 + 21d3bef + 4748875 + 3331086 + bfed36c + b56e9b8 + 765b017 + b2cddce + 1c63803 + dd490e0 + c0425c2 + 128ed7f + 4d88940 + 94b3f1e + 9a0d8cf + 12135ad + 1169a58 + 6cdb5dc + 15950e5 + 7e68fb2 + 4bda4a9 + 537893f + 4cf10f8 + dd5b294 + 3ac5190 + 63d8503 + de5ff9e + f8868a0 + e3f8a27 + 634cf99 + c2cd236 + 189672f + d50054c + 8fb183a + 9f28eab + 2e7e2e2 + 7c64770 + 81a21d6 + cddc550 + eadb29a + 339c074 + 543ff20 + 732e048 + 8ec7eaf + ef5460e + d08629f + a04474f + 3fef53d + 1f4b9ed + d263f1c + c790aed + 412585a + b5e6b02 + 9ac81f3 + 25fde7d + 5215c37 + a31404d + 1328e20 + 33a507b + 012928d + c8a932b + 898d44f + c554ea2 + ffcf7bc + 2adc6bf + 4179b4d + c3f8fc7 + 8cf9c07 commit 007ee1a
Show file tree
Hide file tree
Showing 2 changed files with 36 additions and 36 deletions.
32 changes: 16 additions & 16 deletions src/Reader/Extension/DublinCore/Entry.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -50,16 +50,16 @@ public function getAuthors()
}

$authors = array();
$list = $this->xpath->evaluate($this->getXpathPrefix() . '//dc11:creator');
$list = $this->getXpath()->evaluate($this->getXpathPrefix() . '//dc11:creator');

if (!$list->length) {
$list = $this->xpath->evaluate($this->getXpathPrefix() . '//dc10:creator');
$list = $this->getXpath()->evaluate($this->getXpathPrefix() . '//dc10:creator');
}
if (!$list->length) {
$list = $this->xpath->evaluate($this->getXpathPrefix() . '//dc11:publisher');
$list = $this->getXpath()->evaluate($this->getXpathPrefix() . '//dc11:publisher');

if (!$list->length) {
$list = $this->xpath->evaluate($this->getXpathPrefix() . '//dc10:publisher');
$list = $this->getXpath()->evaluate($this->getXpathPrefix() . '//dc10:publisher');
}
}

Expand Down Expand Up @@ -92,10 +92,10 @@ public function getCategories()
return $this->data['categories'];
}

$list = $this->xpath->evaluate($this->getXpathPrefix() . '//dc11:subject');
$list = $this->getXpath()->evaluate($this->getXpathPrefix() . '//dc11:subject');

if (!$list->length) {
$list = $this->xpath->evaluate($this->getXpathPrefix() . '//dc10:subject');
$list = $this->getXpath()->evaluate($this->getXpathPrefix() . '//dc10:subject');
}

if ($list->length) {
Expand Down Expand Up @@ -138,10 +138,10 @@ public function getDescription()
}

$description = null;
$description = $this->xpath->evaluate('string(' . $this->getXpathPrefix() . '/dc11:description)');
$description = $this->getXpath()->evaluate('string(' . $this->getXpathPrefix() . '/dc11:description)');

if (!$description) {
$description = $this->xpath->evaluate('string(' . $this->getXpathPrefix() . '/dc10:description)');
$description = $this->getXpath()->evaluate('string(' . $this->getXpathPrefix() . '/dc10:description)');
}

if (!$description) {
Expand All @@ -165,10 +165,10 @@ public function getId()
}

$id = null;
$id = $this->xpath->evaluate('string(' . $this->getXpathPrefix() . '/dc11:identifier)');
$id = $this->getXpath()->evaluate('string(' . $this->getXpathPrefix() . '/dc11:identifier)');

if (!$id) {
$id = $this->xpath->evaluate('string(' . $this->getXpathPrefix() . '/dc10:identifier)');
$id = $this->getXpath()->evaluate('string(' . $this->getXpathPrefix() . '/dc10:identifier)');
}

$this->data['id'] = $id;
Expand All @@ -188,10 +188,10 @@ public function getTitle()
}

$title = null;
$title = $this->xpath->evaluate('string(' . $this->getXpathPrefix() . '/dc11:title)');
$title = $this->getXpath()->evaluate('string(' . $this->getXpathPrefix() . '/dc11:title)');

if (!$title) {
$title = $this->xpath->evaluate('string(' . $this->getXpathPrefix() . '/dc10:title)');
$title = $this->getXpath()->evaluate('string(' . $this->getXpathPrefix() . '/dc10:title)');
}

if (!$title) {
Expand All @@ -215,10 +215,10 @@ public function getDate()
}

$d = null;
$date = $this->xpath->evaluate('string(' . $this->getXpathPrefix() . '/dc11:date)');
$date = $this->getXpath()->evaluate('string(' . $this->getXpathPrefix() . '/dc11:date)');

if (!$date) {
$date = $this->xpath->evaluate('string(' . $this->getXpathPrefix() . '/dc10:date)');
$date = $this->getXpath()->evaluate('string(' . $this->getXpathPrefix() . '/dc10:date)');
}

if ($date) {
Expand All @@ -237,7 +237,7 @@ public function getDate()
*/
protected function registerNamespaces()
{
$this->xpath->registerNamespace('dc10', 'http://purl.org/dc/elements/1.0/');
$this->xpath->registerNamespace('dc11', 'http://purl.org/dc/elements/1.1/');
$this->getXpath()->registerNamespace('dc10', 'http://purl.org/dc/elements/1.0/');
$this->getXpath()->registerNamespace('dc11', 'http://purl.org/dc/elements/1.1/');
}
}
40 changes: 20 additions & 20 deletions src/Reader/Extension/DublinCore/Feed.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -50,16 +50,16 @@ public function getAuthors()
}

$authors = array();
$list = $this->xpath->query('//dc11:creator');
$list = $this->getXpath()->query('//dc11:creator');

if (!$list->length) {
$list = $this->xpath->query('//dc10:creator');
$list = $this->getXpath()->query('//dc10:creator');
}
if (!$list->length) {
$list = $this->xpath->query('//dc11:publisher');
$list = $this->getXpath()->query('//dc11:publisher');

if (!$list->length) {
$list = $this->xpath->query('//dc10:publisher');
$list = $this->getXpath()->query('//dc10:publisher');
}
}

Expand Down Expand Up @@ -93,10 +93,10 @@ public function getCopyright()
}

$copyright = null;
$copyright = $this->xpath->evaluate('string(' . $this->getXpathPrefix() . '/dc11:rights)');
$copyright = $this->getXpath()->evaluate('string(' . $this->getXpathPrefix() . '/dc11:rights)');

if (!$copyright) {
$copyright = $this->xpath->evaluate('string(' . $this->getXpathPrefix() . '/dc10:rights)');
$copyright = $this->getXpath()->evaluate('string(' . $this->getXpathPrefix() . '/dc10:rights)');
}

if (!$copyright) {
Expand All @@ -120,10 +120,10 @@ public function getDescription()
}

$description = null;
$description = $this->xpath->evaluate('string(' . $this->getXpathPrefix() . '/dc11:description)');
$description = $this->getXpath()->evaluate('string(' . $this->getXpathPrefix() . '/dc11:description)');

if (!$description) {
$description = $this->xpath->evaluate('string(' . $this->getXpathPrefix() . '/dc10:description)');
$description = $this->getXpath()->evaluate('string(' . $this->getXpathPrefix() . '/dc10:description)');
}

if (!$description) {
Expand All @@ -147,10 +147,10 @@ public function getId()
}

$id = null;
$id = $this->xpath->evaluate('string(' . $this->getXpathPrefix() . '/dc11:identifier)');
$id = $this->getXpath()->evaluate('string(' . $this->getXpathPrefix() . '/dc11:identifier)');

if (!$id) {
$id = $this->xpath->evaluate('string(' . $this->getXpathPrefix() . '/dc10:identifier)');
$id = $this->getXpath()->evaluate('string(' . $this->getXpathPrefix() . '/dc10:identifier)');
}

$this->data['id'] = $id;
Expand All @@ -170,10 +170,10 @@ public function getLanguage()
}

$language = null;
$language = $this->xpath->evaluate('string(' . $this->getXpathPrefix() . '/dc11:language)');
$language = $this->getXpath()->evaluate('string(' . $this->getXpathPrefix() . '/dc11:language)');

if (!$language) {
$language = $this->xpath->evaluate('string(' . $this->getXpathPrefix() . '/dc10:language)');
$language = $this->getXpath()->evaluate('string(' . $this->getXpathPrefix() . '/dc10:language)');
}

if (!$language) {
Expand All @@ -197,10 +197,10 @@ public function getTitle()
}

$title = null;
$title = $this->xpath->evaluate('string(' . $this->getXpathPrefix() . '/dc11:title)');
$title = $this->getXpath()->evaluate('string(' . $this->getXpathPrefix() . '/dc11:title)');

if (!$title) {
$title = $this->xpath->evaluate('string(' . $this->getXpathPrefix() . '/dc10:title)');
$title = $this->getXpath()->evaluate('string(' . $this->getXpathPrefix() . '/dc10:title)');
}

if (!$title) {
Expand All @@ -224,10 +224,10 @@ public function getDate()
}

$d = null;
$date = $this->xpath->evaluate('string(' . $this->getXpathPrefix() . '/dc11:date)');
$date = $this->getXpath()->evaluate('string(' . $this->getXpathPrefix() . '/dc11:date)');

if (!$date) {
$date = $this->xpath->evaluate('string(' . $this->getXpathPrefix() . '/dc10:date)');
$date = $this->getXpath()->evaluate('string(' . $this->getXpathPrefix() . '/dc10:date)');
}

if ($date) {
Expand All @@ -250,10 +250,10 @@ public function getCategories()
return $this->data['categories'];
}

$list = $this->xpath->evaluate($this->getXpathPrefix() . '//dc11:subject');
$list = $this->getXpath()->evaluate($this->getXpathPrefix() . '//dc11:subject');

if (!$list->length) {
$list = $this->xpath->evaluate($this->getXpathPrefix() . '//dc10:subject');
$list = $this->getXpath()->evaluate($this->getXpathPrefix() . '//dc10:subject');
}

if ($list->length) {
Expand All @@ -280,7 +280,7 @@ public function getCategories()
*/
protected function registerNamespaces()
{
$this->xpath->registerNamespace('dc10', 'http://purl.org/dc/elements/1.0/');
$this->xpath->registerNamespace('dc11', 'http://purl.org/dc/elements/1.1/');
$this->getXpath()->registerNamespace('dc10', 'http://purl.org/dc/elements/1.0/');
$this->getXpath()->registerNamespace('dc11', 'http://purl.org/dc/elements/1.1/');
}
}

0 comments on commit 007ee1a

Please sign in to comment.