Skip to content

Patch content indexing issue #869 #422

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
mariusmarin-dev wants to merge 3 commits into
base: main
Choose a base branch
from
Open

Patch content indexing issue #869 #422

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
5dbc50d
Patch content indexing issue #869
mariusmarin-dev Jun 9, 2026
a5b32be
Patch content indexing issue #869
mariusmarin-dev Jun 9, 2026
2107146
Patch content indexing issue #869
mariusmarin-dev Jun 11, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 7 additions & 7 deletions src/main/java/uk/ac/cam/cl/dtg/isaac/api/GameboardsFacade.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -437,13 +437,6 @@ public final Response renameAndSaveGameboard(@Context final HttpServletRequest r
@Produces(MediaType.APPLICATION_JSON)
@GZIP
@Operation(summary = "List all gameboards linked to the current user.")
private String sanitiseForLog(final String input) {
if (input == null) {
return "null";
}
return input.replace('\r', '_').replace('\n', '_');
}

public final Response getGameboardsByCurrentUser(@Context final HttpServletRequest request,
@QueryParam("start_index") final String startIndex,
@QueryParam("limit") final String limit,
Expand Down Expand Up @@ -565,6 +558,13 @@ public final Response getGameboardsByCurrentUser(@Context final HttpServletReque
return Response.ok(gameboards).cacheControl(getCacheControl(NEVER_CACHE_WITHOUT_ETAG_CHECK, false)).build();
}

private String sanitiseForLog(final String input) {
if (input == null) {
return "null";
}
return input.replace('\r', '_').replace('\n', '_');
}

/**
* REST end point to allow gameboards to be persisted into permanent storage and for it to be added to the users' my
* boards collection.
Expand Down
6 changes: 3 additions & 3 deletions src/main/java/uk/ac/cam/cl/dtg/segue/etl/ContentIndexer.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -380,10 +380,10 @@ private void validateAndCacheContent(final Content flattenedContent, final Conte
}

log.info(CONTENT_LOG_PREFIX + "Resource with duplicate ID ({}) detected in cache. Skipping {}",
parentContent.getId(), treeWalkPath);
flattenedContent.getId(), treeWalkPath);
this.registerContentProblem(flattenedContent, String.format(
"Index failure - Duplicate ID (%s) found in files (%s) and (%s): only one will be available.",
parentContent.getId(),
flattenedContent.getId(),
treeWalkPath,
context.contentCache.get(flattenedContent.getId()).getCanonicalSourceFile()),
context.indexProblemCache);
Expand Down Expand Up @@ -448,8 +448,8 @@ private Content augmentChildContent(final Content content, final String canonica
}

augmentMediaFieldsViaReflection(content, canonicalSourceFile);
augmentMediaContent(content, canonicalSourceFile, parentId);
updateContentIdentifier(content, newParentId, parentPublished);
augmentMediaContent(content, canonicalSourceFile, parentId);

return content;
}
Expand Down
Loading