--- a/server/src/app/Http/Controllers/Api/DocumentController.php Thu Jun 02 18:16:17 2016 +0200
+++ b/server/src/app/Http/Controllers/Api/DocumentController.php Thu Jun 02 18:24:19 2016 +0200
@@ -65,9 +65,10 @@
* @param string $id
* @return Response
*/
- public function show($id)
+ public function show(Request $request, $id)
{
- $doc = $this->documentRepository->get($id);
+ $short = filter_var($request->input('short', false), FILTER_VALIDATE_BOOLEAN);
+ $doc = $this->documentRepository->get($id, $short);
if(is_null($doc)) {
abort(404);
}
@@ -86,13 +87,12 @@
if(is_null($doc) || is_null($doc->getTranscript()) ) {
abort(404);
}
- $transcriptDef = $doc->getTranscript();
-
- $transcriptUrl = $transcriptDef['url'];
- if(empty($transcriptUrl) || empty($transcriptDef['conforms-to'])) {
+ $transcript = $doc->getTranscript();
+ $transcriptUrl = $transcript->getUrl();
+ if(empty($transcriptUrl) || empty($transcript->getConformsTo())) {
abort(404);
}
- $converter = $this->transcriptManager->getConverterUrl($transcriptDef['conforms-to'], $doc, $transcriptUrl);
+ $converter = $this->transcriptManager->getConverterUrl($transcript->getConformsTo(), $doc, $transcriptUrl);
return response()->json($converter->convertToJson());
}