Personal/cops
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Simplify relative path handling.

Browse source 
--HG--
extra : rebase_source : d20290cad2dca3ea1f04a85f899c026c0991bbe5
This commit is contained in:
Sébastien Lucas 2013-08-30 10:35:15 +02:00
parent 881f76d87a
commit 30f801443e
2 changed files with 27 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

15
resources/php-epub-meta/epub.php
View file

@ -153,9 +153,9 @@ class EPub {
/**
* Get the component content
*/
public function component($comp, $elementPath) {
public function component($comp) {
$path = str_replace ("-SLASH-", "/", $comp);
$path = $this->getFullPath ($path, $elementPath);
$path = $this->getFullPath ($path);
if (!$this->zip->FileExists($path)) {
throw new Exception ("Unable to find " . $path);
}
@ -164,6 +164,15 @@ class EPub {
return $data;
}
public function getComponentName ($comp, $elementPath) {
$path = str_replace ("-SLASH-", "/", $comp);
$path = $this->getFullPath ($path, $elementPath);
if (!$this->zip->FileExists($path)) {
throw new Exception ("Unable to find " . $path);
}
return str_replace ("/", "-SLASH-", $path);
}
/**
* Get the component content type
*/
@ -533,7 +542,7 @@ class EPub {
if (!empty ($context)) {
$path = $this->combine (dirname ($path), $context);
}
error_log ("FullPath : $path ($file / $context)");
//error_log ("FullPath : $path ($file / $context)");
return $path;
}