From: vincent@cubedesigners.com <vincent@cubedesigners.com@f5622870-0f3c-0410-866d-9cb505b7a8ef>
Date: Wed, 18 Oct 2023 07:47:21 +0000 (+0000)
Subject: wip #6407 @0.25
X-Git-Url: http://git.cubedesigners.com/?a=commitdiff_plain;h=5aca4f52dc84327267e758592b8b55f579b2be5a;p=fluidbook-v3.git

wip #6407 @0.25
---

diff --git a/framework/application/Fluidbook/ToolboxAPI.php b/framework/application/Fluidbook/ToolboxAPI.php
index 0f61acb..e689582 100644
--- 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());
         }
         CubeIT_Files::rmdir($tdir);
-        return false;
+        return true;
     }
 
     public static function getResponseBody(Zend_Http_Response $response)
diff --git a/framework/application/controllers/MaintenanceController.php b/framework/application/controllers/MaintenanceController.php
index fd0c31a..585dd1c 100644
--- 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');
         }