mirror of
https://github.com/lacerta-doc/Lacerta.git
synced 2024-11-23 00:13:16 +00:00
fix
This commit is contained in:
parent
fc6cbb9d37
commit
7f71e818a8
|
@ -20,6 +20,7 @@ import one.nem.lacerta.source.database.LacertaDatabase;
|
||||||
import one.nem.lacerta.source.database.common.DateTypeConverter;
|
import one.nem.lacerta.source.database.common.DateTypeConverter;
|
||||||
import one.nem.lacerta.source.database.entity.DocumentEntity;
|
import one.nem.lacerta.source.database.entity.DocumentEntity;
|
||||||
import one.nem.lacerta.source.database.entity.FolderEntity;
|
import one.nem.lacerta.source.database.entity.FolderEntity;
|
||||||
|
import one.nem.lacerta.utils.FeatureSwitch;
|
||||||
import one.nem.lacerta.utils.LacertaLogger;
|
import one.nem.lacerta.utils.LacertaLogger;
|
||||||
|
|
||||||
public class LacertaLibraryImpl implements LacertaLibrary {
|
public class LacertaLibraryImpl implements LacertaLibrary {
|
||||||
|
@ -71,18 +72,13 @@ public class LacertaLibraryImpl implements LacertaLibrary {
|
||||||
|
|
||||||
FolderEntity folderEntity = database.folderDao().findById(pageId);
|
FolderEntity folderEntity = database.folderDao().findById(pageId);
|
||||||
if (folderEntity == null) {
|
if (folderEntity == null) {
|
||||||
|
logger.warn("LacertaLibraryImpl", pageId + " is not found.");
|
||||||
return null;
|
return null;
|
||||||
}
|
}
|
||||||
|
|
||||||
PublicPath publicPath = new PublicPath().parse(folderEntity.publicPath);
|
List<FolderEntity> folderEntities = database.folderDao().findByParentId(pageId);
|
||||||
|
|
||||||
String resolvedPublicPath = publicPath.resolve(folderEntity.name).getStringPath();
|
|
||||||
|
|
||||||
logger.debug("LacertaLibraryImpl", "Resolved publicPath: " + resolvedPublicPath);
|
|
||||||
|
|
||||||
List<FolderEntity> folderEntities = getFolderEntitiesByPublicPath(resolvedPublicPath).join();
|
|
||||||
logger.debug("LacertaLibraryImpl", "folderEntities.size(): " + folderEntities.size());
|
logger.debug("LacertaLibraryImpl", "folderEntities.size(): " + folderEntities.size());
|
||||||
List<DocumentEntity> documentEntities = getDocumentEntitiesByPublicPath(resolvedPublicPath).join();
|
List<DocumentEntity> documentEntities = database.documentDao().findByParentId(pageId);
|
||||||
logger.debug("LacertaLibraryImpl", "documentEntities.size(): " + documentEntities.size());
|
logger.debug("LacertaLibraryImpl", "documentEntities.size(): " + documentEntities.size());
|
||||||
|
|
||||||
ArrayList<ListItem> listItems = new ArrayList<>();
|
ArrayList<ListItem> listItems = new ArrayList<>();
|
||||||
|
@ -108,6 +104,7 @@ public class LacertaLibraryImpl implements LacertaLibrary {
|
||||||
|
|
||||||
libraryItemPage.setPageTitle(folderEntity.name);
|
libraryItemPage.setPageTitle(folderEntity.name);
|
||||||
libraryItemPage.setPageId(folderEntity.id);
|
libraryItemPage.setPageId(folderEntity.id);
|
||||||
|
libraryItemPage.setParentId(folderEntity.parentId);
|
||||||
libraryItemPage.setListItems(listItems);
|
libraryItemPage.setListItems(listItems);
|
||||||
|
|
||||||
logger.debug("LacertaLibraryImpl", "libraryItemPage.getListItems().size(): " + libraryItemPage.getListItems().size());
|
logger.debug("LacertaLibraryImpl", "libraryItemPage.getListItems().size(): " + libraryItemPage.getListItems().size());
|
||||||
|
|
Loading…
Reference in New Issue
Block a user