wip #6407 @0.25

diff --git a/framework/application/Fluidbook/ToolboxAPI.php b/framework/application/Fluidbook/ToolboxAPI.php
index 0f61acb9144f16706ac624158557a6dd507ad2b2..e6895829d9e51dd13ffdcd48c1da3f4880a2c6ee 100644 (file)
--- a/framework/application/Fluidbook/ToolboxAPI.php
+++ b/framework/application/Fluidbook/ToolboxAPI.php
@@ -109,7 +109,7 @@ class Fluidbook_ToolboxAPI extends Zend_Rest_Client
             file_put_contents($dir . '/_TIME', time());\r
         }\r
         CubeIT_Files::rmdir($tdir);\r
-        return false;\r
+        return true;\r
     }\r
 \r
     public static function getResponseBody(Zend_Http_Response $response)\r

diff --git a/framework/application/controllers/MaintenanceController.php b/framework/application/controllers/MaintenanceController.php
index fd0c31ad8b47cc80532a2ccde4a12132ca583b21..585dd1c9cc7201e49e0a643422f7e8dc0cda367b 100644 (file)
--- a/framework/application/controllers/MaintenanceController.php
+++ b/framework/application/controllers/MaintenanceController.php
@@ -57,13 +57,15 @@ class MaintenanceController extends CubeIT_Controller_MaintenanceController
         $fluidbooks = array_values(array_unique($fluidbooks));
         shuffle($fluidbooks);
 
+        print_r($fluidbooks);
+
         $n = 0;
         foreach ($fluidbooks as $fluidbook) {
             if ($n > 20 && !isset($_GET['all'])) {
                 break;
             }
             try {
-                $res = self::importReference($id, true);
+                $res = self::importReference($fluidbook, true);
                 if ($res) {
                     $n++;
                 }
@@ -87,6 +89,9 @@ class MaintenanceController extends CubeIT_Controller_MaintenanceController
     {
         $api = self::getToolboxAPI();
         $meta = $api->getPublicationMetadata($id);
+        if (null === $meta) {
+            throw new Exception('Invalid metadata for fb ' . $id);
+        }
         return self::_install($api, $id, $meta, $onlyIfNeeded);
     }
 
@@ -102,13 +107,16 @@ class MaintenanceController extends CubeIT_Controller_MaintenanceController
     {
         $ws = self::getWorkshopAPI();
         $meta = $ws->getMetadata($id);
-
+        if (null === $meta) {
+            throw new Exception('Invalid metadata for fb ' . $id);
+        }
         return self::_install($ws, $id, $meta, $onlyIfNeeded);
     }
 
     protected static function _install($api, $id, $meta, $onlyIfNeeded)
     {
         $dir = PUBLIC_PATH . '/references/' . $id . '-' . CubeIT_Text::str2URL(trim($meta->title));
+        echo "Install fb " . $id . ' on ' . $dir . json_encode($meta) . "<br>";
         if ($onlyIfNeeded) {
             return $api->installBookIfNeeded($id, $dir, isset($_GET['force']) ? time() : 'auto');
         }