|
@@ -143,10 +143,10 @@ discard block |
|
|
block discarded – undo |
143
|
143
|
{ |
144
|
144
|
$object = empty($object) ? $this->catalogData : $object; |
145
|
145
|
foreach ($object as $folder) { |
146
|
|
- $this->folders[$folder->id] = (object) ['parentFolderId' => $parentFolderId, 'languageId' => @$folder->landguageid, 'name' => $folder->name, 'displayOrder' => $folder->display_order, 'englishName' => $folder->eng_name]; |
147
|
|
- $this->parseBooks((object) $folder->books, $folder->id); |
|
146
|
+ $this->folders[$folder->id] = (object)['parentFolderId' => $parentFolderId, 'languageId' => @$folder->landguageid, 'name' => $folder->name, 'displayOrder' => $folder->display_order, 'englishName' => $folder->eng_name]; |
|
147
|
+ $this->parseBooks((object)$folder->books, $folder->id); |
148
|
148
|
if (!empty($folder->folders)) { |
149
|
|
- $this->parseData((object) $folder->folders, $folder->id); |
|
149
|
+ $this->parseData((object)$folder->folders, $folder->id); |
150
|
150
|
} |
151
|
151
|
} |
152
|
152
|
} |
|
@@ -161,7 +161,7 @@ discard block |
|
|
block discarded – undo |
161
|
161
|
{ |
162
|
162
|
if (!empty($books)) { |
163
|
163
|
foreach ($books as $book) { |
164
|
|
- $this->books[$book->id] = (object) ['folderId' => $folderId, 'name' => $book->name, 'fullName' => $book->full_name, 'description' => $book->description, 'gospelLibraryUri' => $book->gl_uri, 'url' => $book->url, 'displayOrder' => $book->display_order, 'version' => $book->version, 'fileVersion' => $book->file_version, 'file' => $book->file, 'dateAdded' => $book->dateadded, 'dateModified' => $book->datemodified, 'cbId' => $book->cb_id, 'mediaAvailable' => $book->media_available, 'obsolete' => $book->obsolete, 'size' => $book->size, 'sizeIndex' => $book->size_index]; |
|
164
|
+ $this->books[$book->id] = (object)['folderId' => $folderId, 'name' => $book->name, 'fullName' => $book->full_name, 'description' => $book->description, 'gospelLibraryUri' => $book->gl_uri, 'url' => $book->url, 'displayOrder' => $book->display_order, 'version' => $book->version, 'fileVersion' => $book->file_version, 'file' => $book->file, 'dateAdded' => $book->dateadded, 'dateModified' => $book->datemodified, 'cbId' => $book->cb_id, 'mediaAvailable' => $book->media_available, 'obsolete' => $book->obsolete, 'size' => $book->size, 'sizeIndex' => $book->size_index]; |
165
|
165
|
$this->parseFiles(@$book->files, $book->id); |
166
|
166
|
} |
167
|
167
|
} |
|
@@ -178,7 +178,7 @@ discard block |
|
|
block discarded – undo |
178
|
178
|
if (!empty($files)) { |
179
|
179
|
// Currently, Gospel Library only includes PDF files |
180
|
180
|
foreach ($files->PDF as $file) { |
181
|
|
- $this->files[$file->id] = (object) ['bookId' => $bookId, 'order' => $file->order, 'dateAdded' => $file->dateadded, 'dateModified' => $file->datemodified, 'version' => $file->version, 'name' => $file->name, 'title' => $file->title, 'url' => $file->url, 'size' => $file->size]; |
|
181
|
+ $this->files[$file->id] = (object)['bookId' => $bookId, 'order' => $file->order, 'dateAdded' => $file->dateadded, 'dateModified' => $file->datemodified, 'version' => $file->version, 'name' => $file->name, 'title' => $file->title, 'url' => $file->url, 'size' => $file->size]; |
182
|
182
|
} |
183
|
183
|
} |
184
|
184
|
} |