From ab95722f1e89f56f0fb4dc0d0c7f1bb2f7b2a077 Mon Sep 17 00:00:00 2001 From: Mike Colagrosso Date: Sat, 13 Jul 2024 17:08:18 -0600 Subject: [PATCH] Replace Collections with CollectionMemberships missed in #374 --- scripts/generate-bulk-downloads | 3 ++- scripts/generate-feeds | 3 ++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/scripts/generate-bulk-downloads b/scripts/generate-bulk-downloads index 077c8936..c9d53d1e 100755 --- a/scripts/generate-bulk-downloads +++ b/scripts/generate-bulk-downloads @@ -147,7 +147,8 @@ foreach(Library::GetEbooksFromFilesystem($webRoot) as $ebook){ } // Add to the 'books by collection' list - foreach($ebook->Collections as $collection){ + foreach($ebook->CollectionMemberships as $cm){ + $collection = $cm->Collection; if(!isset($ebooksByGroup['collections'][$collection->Name])){ $obj = new stdClass(); $obj->Label = $collection->Name; diff --git a/scripts/generate-feeds b/scripts/generate-feeds index 482d8aee..0c678c29 100755 --- a/scripts/generate-feeds +++ b/scripts/generate-feeds @@ -99,7 +99,8 @@ foreach(Library::GetEbooksFromFilesystem($webRoot) as $ebook){ $subjects[$urlName] = ['id' => $urlName, 'name' => $tag->Name, 'sortedname' => $tag->Name]; } - foreach($ebook->Collections as $collection){ + foreach($ebook->CollectionMemberships as $cm){ + $collection = $cm->Collection; $urlName = Formatter::MakeUrlSafe($collection->Name); $ebooksByCollection[$urlName][] = $ebook; $collections[$urlName] = ['id' => $urlName, 'name' => $collection->Name, 'sortedname' => $collection->GetSortedName()];