From: Vincent Vanwaelscappel Date: Tue, 29 Jul 2025 15:14:42 +0000 (+0200) Subject: #7634 @1 X-Git-Url: http://git.cubedesigners.com/?a=commitdiff_plain;h=1c1c97b52f2f77d01dd3499e3f45889844a66159;p=fluidbook-toolbox.git #7634 @1 --- diff --git a/app/Fluidbook/Farm.php b/app/Fluidbook/Farm.php index b0a0986c3..954cd1f47 100644 --- a/app/Fluidbook/Farm.php +++ b/app/Fluidbook/Farm.php @@ -287,7 +287,7 @@ class Farm return self::_getFile( ['operation' => 'extractmarkdown', 'pdf' => $pdf, - 'out' => $out], 0, false); + 'out' => $out], 0, $out . '/docling/p1.md'); }); } @@ -323,16 +323,20 @@ class Farm return false; } - if ($checkOutput) { - $output = trim($output); + if (is_bool($checkOutput)) { + if ($checkOutput) { + $output = trim($output); - if (file_exists($output)) { - $res = $output; + if (file_exists($output)) { + $res = $output; + } else { + $res = false; + } } else { - $res = false; + $res = true; } } else { - $res = true; + $res = file_exists($checkOutput); } $time = round(microtime(true) - $start, 4); diff --git a/app/Models/FluidbookPublication.php b/app/Models/FluidbookPublication.php index 37c603a91..49da6c1bb 100644 --- a/app/Models/FluidbookPublication.php +++ b/app/Models/FluidbookPublication.php @@ -464,7 +464,9 @@ class FluidbookPublication extends ToolboxStatusModel public function getAccessibleFile($page, $format = 'md') { $compo = $this->getComposition()[$page]; - return self::_getDocument($compo[0])->getMarkdown($compo[1]); + if ($format === 'md') { + return self::_getDocument($compo[0])->getMarkdown($compo[1]); + } } public function getAccessibleContents($revision = 'latest') @@ -481,7 +483,7 @@ class FluidbookPublication extends ToolboxStatusModel return $json; } } else { - return json_decode(gzdecode(file_get_contents($file)),true); + return json_decode(gzdecode(file_get_contents($file)), true); } }