From 7d77d1c96c5af80b24d0e3549a2e6dcc51e5dcd2 Mon Sep 17 00:00:00 2001 From: "vincent@cubedesigners.com" Date: Thu, 3 May 2012 18:50:23 +0000 Subject: [PATCH] --- inc/ws/Controlleur/class.ws.maintenance.php | 10 +++++++++- inc/ws/DAO/class.ws.dao.book.php | 11 +++++++++++ 2 files changed, 20 insertions(+), 1 deletion(-) diff --git a/inc/ws/Controlleur/class.ws.maintenance.php b/inc/ws/Controlleur/class.ws.maintenance.php index 01f5edbfa..c7c080130 100644 --- a/inc/ws/Controlleur/class.ws.maintenance.php +++ b/inc/ws/Controlleur/class.ws.maintenance.php @@ -248,7 +248,7 @@ class wsMaintenance { $tolinks = array_merge($tolinks, $fromlinks); $torulers = array_merge($torulers, $fromrulers); - $dao->setLinksAndRulers($to, $tolinks, $torulers, 'Copy links from #' . $from . ' to #' . $to,$core->user->utilisateur_id); + $dao->setLinksAndRulers($to, $tolinks, $torulers, 'Copy links from #' . $from . ' to #' . $to, $core->user->utilisateur_id); } public static function importBooks($oldBooks) { @@ -652,6 +652,14 @@ class wsMaintenance { wsLang::getV1Translations(); } + public static function appendDocument($args) { + global $core; + $book_id = $args[0]; + $document_id = $args[1]; + $dao=new wsDAOBook($core->con); + $dao->appendDocument($book_id, $document_id); + } + public static function reprocessVideos($args) { global $core; diff --git a/inc/ws/DAO/class.ws.dao.book.php b/inc/ws/DAO/class.ws.dao.book.php index ff305017e..505b1f236 100644 --- a/inc/ws/DAO/class.ws.dao.book.php +++ b/inc/ws/DAO/class.ws.dao.book.php @@ -889,6 +889,17 @@ class wsDAOBook extends commonDAO { copy($source, $localPath); } } + + $workingDir = WS_BOOKS . '/working/' . $book_id . '/'; + if (file_exists($workingDir . 'media')) { + $cp = new cubeCommandLine('cp'); + $cp->setPath(CONVERTER_PATH); + $cp->setArg('r'); + $cp->setArg(null, $workingDir . 'media'); + $cp->setArg(null, $finalDir . 'data'); + $cp->execute(); + } + return $res; } -- 2.39.5