diff --git a/code/common/model/src/main/java/nu/marginalia/model/idx/DocumentFlags.java b/code/common/model/src/main/java/nu/marginalia/model/idx/DocumentFlags.java index 0c051341..eb2a61b2 100644 --- a/code/common/model/src/main/java/nu/marginalia/model/idx/DocumentFlags.java +++ b/code/common/model/src/main/java/nu/marginalia/model/idx/DocumentFlags.java @@ -8,7 +8,7 @@ public enum DocumentFlags { GeneratorDocs, GeneratorForum, GeneratorWiki, - Unused6, + Sideloaded, Unused7, Unused8, ; diff --git a/code/processes/converting-process/src/main/java/nu/marginalia/converting/sideload/SideloaderProcessing.java b/code/processes/converting-process/src/main/java/nu/marginalia/converting/sideload/SideloaderProcessing.java index 16a1ae7c..1a034ac2 100644 --- a/code/processes/converting-process/src/main/java/nu/marginalia/converting/sideload/SideloaderProcessing.java +++ b/code/processes/converting-process/src/main/java/nu/marginalia/converting/sideload/SideloaderProcessing.java @@ -63,6 +63,11 @@ public class SideloaderProcessing { for (String keyword : extraKeywords) ret.words.add(keyword, WordFlags.Subjects.asBit()); + if (type == GeneratorType.WIKI) + ret.words.add("generator:wiki", WordFlags.Subjects.asBit()); + else if (type == GeneratorType.DOCS) + ret.words.add("generator:docs", WordFlags.Subjects.asBit()); + ret.details = details.details(); // Add a few things that we know about the document @@ -80,8 +85,8 @@ public class SideloaderProcessing { PubDate.toYearByte(ret.details.pubYear), (int) -ret.details.quality, switch (type) { - case WIKI -> EnumSet.of(DocumentFlags.GeneratorWiki); - case DOCS -> EnumSet.of(DocumentFlags.GeneratorDocs); + case WIKI -> EnumSet.of(DocumentFlags.GeneratorWiki, DocumentFlags.Sideloaded); + case DOCS -> EnumSet.of(DocumentFlags.GeneratorDocs, DocumentFlags.Sideloaded); default -> EnumSet.noneOf(DocumentFlags.class); }); diff --git a/code/processes/converting-process/src/main/java/nu/marginalia/converting/sideload/encyclopedia/EncyclopediaMarginaliaNuSideloader.java b/code/processes/converting-process/src/main/java/nu/marginalia/converting/sideload/encyclopedia/EncyclopediaMarginaliaNuSideloader.java index 204aa6a8..8ca80c45 100644 --- a/code/processes/converting-process/src/main/java/nu/marginalia/converting/sideload/encyclopedia/EncyclopediaMarginaliaNuSideloader.java +++ b/code/processes/converting-process/src/main/java/nu/marginalia/converting/sideload/encyclopedia/EncyclopediaMarginaliaNuSideloader.java @@ -110,13 +110,18 @@ public class EncyclopediaMarginaliaNuSideloader implements SideloadSource, AutoC String fullUrl = baseUrl.toString() + url; StringBuilder fullHtml = new StringBuilder(); - fullHtml.append("").append(title).append(""); + fullHtml + .append("") + .append(title) + .append("") + .append("
"); + for (String part : parts) { fullHtml.append("

"); fullHtml.append(part); fullHtml.append("

"); } - fullHtml.append(""); + fullHtml.append("
"); var doc = sideloaderProcessing .processDocument(fullUrl,