OPDS import: orginal uri stored in external_uri.

application/modules/admin/views/scripts/opds/browse.phtml

@@ -16,9 +16,9 @@
 		  <?php echo $this->escape($entry->getTitle());?>
 		  <?php if ($entry->getAuthor()) echo '(' . $this->escape($entry->getAuthor()) . ')';?>
 			<?php if ($entry->hasFiles()) { ?>
-			- <a href="<?php echo $this->url(array('action' => 'import'));?>?feed=<?php echo urlencode($this->catalog->getUrl());?>&entry=<?php echo urlencode($entry->getId());?>">Importer</a>
+			- <a href="<?php echo $this->url(array('action' => 'import'));?>?feed=<?php echo urlencode($this->catalog->getUrl());?>&entry=<?php echo urlencode($entry->getExternalUri());?>">Importer</a>
 
-			- <a data-popup="true" href="<?php echo $this->url(array('action' => 'previsu-epub'));?>?feed=<?php echo urlencode($this->catalog->getUrl());?>&entry=<?php echo urlencode($entry->getId());?>">Prévisualiser</a>
+			- <a data-popup="true" href="<?php echo $this->url(array('action' => 'previsu-epub'));?>?feed=<?php echo urlencode($this->catalog->getUrl());?>&entry=<?php echo urlencode($entry->getExternalUri());?>">Prévisualiser</a>
 			<?php } ?>
 		<?php } else { ?>
 				<a href="<?php echo $this->url();?>?entry=<?php echo urlencode($entry->getLink()); ?>">

library/Class/WebService/OPDS/CatalogReader.php

@@ -168,6 +168,7 @@ class Class_WebService_OPDS_CatalogReader {
 			return;
 
 		$this->_current_entry->setId($data);
+		$this->_current_entry->setExternalUri($data);
 	}
 
 

tests/application/modules/admin/controllers/OpdsControllerTest.php

@@ -480,7 +480,7 @@ class Admin_OpdsControllerBrowseEbooksGratuitsLastUpdatedTest extends Admin_Opds
 			->with('http://www.opacsgratuits.com/opds/feed.php?mode=maj')
 			->answers(OPDSFeedFixtures::ebooksGratuitsLastUpdatedXml());
 		
-		$this->dispatch('/admin/opds/browse/id/1?entry=' . urlencode('http://www.opacsgratuits.com/opds/feed.php?mode=maj'));
+		$this->dispatch('/admin/opds/browse/id/1?entry=' . urlencode('http://www.opacsgratuits.com/opds/feed.php?mode=maj'), true);
 	}
 
 
@@ -501,7 +501,8 @@ class Admin_OpdsControllerBrowseEbooksGratuitsLastUpdatedTest extends Admin_Opds
 		$this->assertXPathContentContains(sprintf('//a[contains(@href, "admin/opds/import/id/1?feed=%s&entry=%s")]',
 																							urlencode('http://www.opacsgratuits.com/opds/feed.php?mode=maj'),
 																							urlencode('http://www.ebooksgratuits.com/details.php?book=592')),
-																			'Importer');
+																			'Importer',
+																			$this->_response->getBody());
 	}