diff -r 08c99d286e7c -r b37fde30dd4a server/src/app/Libraries/CocoonUtils.php --- a/server/src/app/Libraries/CocoonUtils.php Thu Feb 11 15:42:27 2016 +0100 +++ b/server/src/app/Libraries/CocoonUtils.php Fri Feb 12 15:30:32 2016 +0100 @@ -38,7 +38,7 @@ * @return string */ public static function getIdFromUri($uri) { - return substr($uri, strlen(config('corpusparole.cocoon_doc_id_base_uri'))); + return config('corpusparole.corpus_id_scheme').substr($uri, strlen(config('corpusparole.cocoon_doc_id_base_uri'))); } /** @@ -47,7 +47,7 @@ * @return string */ public static function getIdFromCorpusUri($uri) { - return substr($uri, strlen(config('corpusparole.corpus_doc_id_base_uri'))); + return config('corpusparole.corpus_id_scheme').substr($uri, strlen(config('corpusparole.corpus_doc_id_base_uri'))); } /** @@ -56,10 +56,16 @@ * @return string */ public static function getCorpusUriFromId($id) { + if(strpos($id, config('corpusparole.corpus_id_scheme')) === 0) { + $id = substr($id, strlen(config('corpusparole.corpus_id_scheme'))); + } return rtrim(config('corpusparole.corpus_doc_id_base_uri'),'/')."/$id"; } public static function getCocoonPubUrl($id) { + if(strpos($id, config('corpusparole.corpus_id_scheme')) === 0) { + $id = substr($id, strlen(config('corpusparole.corpus_id_scheme'))); + } return rtrim(config('corpusparole.cocoon_doc_pub_base_uri'), '/')."/$id"; }