Merge branch 'hotline/13167' into 'hotline_6.41'

Hotline/13167

library/Class/WebService/OPDS/CatalogReader.php

@@ -118,6 +118,10 @@ class Class_WebService_OPDS_CatalogReader {
 			return;
 		}
 
+		if (array_key_exists('REL', $attributes) && $attributes['REL'] == 'start') {
+			return;
+		}
+
 		if (false === strpos($attributes['TYPE'], 'application/atom+xml'))
 			return;
 
@@ -201,4 +205,4 @@ class Class_WebService_OPDS_CatalogReader {
 		return $normalized . dirname($urlInfos['path']) . $url;
 	}
 }
-?>
\ No newline at end of file
+?>

tests/library/Class/WebService/OPDS/CatalogReaderTest.php

+<?php
+
+/**
+ * Copyright (c) 2012-2014, Agence Française Informatique (AFI). All rights reserved.
+ *
+ * AFI-OPAC 2.0 is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU AFFERO GENERAL PUBLIC LICENSE as published by
+ * the Free Software Foundation.
+ *
+ * There are special exceptions to the terms and conditions of the AGPL as it
+ * is applied to this software (see README file).
+ *
+ * AFI-OPAC 2.0 is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU AFFERO GENERAL PUBLIC LICENSE for more details.
+ *
+ * You should have received a copy of the GNU AFFERO GENERAL PUBLIC LICENSE
+ * along with AFI-OPAC 2.0; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301  USA 
+ */
+
+class OPDS_CatalogReaderTest extends PHPUnit_Framework_TestCase {
+	protected $catalog_reader;
+
+	public function setUp() {
+		$xmlpath = realpath(dirname(__FILE__)) . '/fixtures/atramenta.xml';
+		$xml = file_get_contents($xmlpath);
+		$this->catalog_reader = Class_WebService_OPDS_CatalogReader::fromXML($xml);
+	}
+
+	/** @test */
+	public function catalogReaderEntriesShouldHaveCorrectLink() {
+		$entries = $this->catalog_reader->getEntries();
+		$this->assertEquals('http://www.atramenta.net/opds/lecture_libre.atom', $entries[0]->getLink());
+		$this->assertEquals('https://www.atramenta.net/opds/account.atom', $entries[1]->getLink());
+	}
+}

tests/library/Class/WebService/OPDS/fixtures/atramenta.xml

+<?xml version="1.0" encoding="UTF-8"?>
+ <feed xmlns:app="http://www.w3.org/2007/app" xmlns:dcterms="http://purl.org/dc/terms/" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:opds="http://opds-spec.org/2010/catalog" xml:lang="en" xmlns:opensearch="http://a9.com/-/spec/opensearch/1.1/" xmlns:thr="http://purl.org/syndication/thread/1.0" xmlns="http://www.w3.org/2005/Atom">
+  <id>http://www.atramenta.net/opds/catalog.atom</id>
+  <link type="application/atom+xml" href="http://www.atramenta.net/opds/catalog.atom" rel="self"/>
+  <title>Atramenta</title>
+  <updated>2014-04-23T11:29:28+02:00</updated>
+  <icon>http://www.atramenta.net/favicon.ico</icon>
+  <author>
+    <name>Atramenta</name>
+    <uri>http://www.atramenta.net</uri>
+    <email>noreply@atramenta.net</email>
+  </author>
+<link type="application/atom+xml; profile=opds-catalog; kind=navigation" href="http://www.atramenta.net/opds/catalog.atom" rel="self"/>
+
+<entry>
+  <title>Lecture libre</title>
+  <link type="application/atom+xml;profile=opds-catalog;kind=navigation" href="http://www.atramenta.net/opds/lecture_libre.atom" rel="subsection"/>
+  <link type="application/atom+xml;profile=opds-catalog;kind=navigation" href="http://www.atramenta.net/opds/catalog.atom" rel="start" title="Atramenta"/>
+  <updated>2014-04-23T11:29:28+02:00</updated>
+  <id>http://www.atramenta.net/opds/lecture_libre.atom</id>
+  <content type="text">Des milliers d'oeuvres du domaine public et d'auteurs contemporains à télécharger gratuitement</content>
+</entry>
+
+<entry>
+  <title>Mon compte</title>
+  <link type="application/atom+xml;profile=opds-catalog;kind=navigation" href="https://www.atramenta.net/opds/account.atom" rel="subsection"/>
+  <link type="application/atom+xml;profile=opds-catalog;kind=navigation" href="http://www.atramenta.net/opds/catalog.atom" rel="start" title="Atramenta"/>
+  <updated>2014-04-23T11:29:28+02:00</updated>
+  <id>https://www.atramenta.net/opds/account.atom</id>
+  <content type="text">Vos oeuvres favorites et vos propres oeuvres et ebooks</content>
+</entry>
+
+</feed>