Skip to content

Fix resolution bugs #26

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
golsch wants to merge 5 commits into
base: 2023.06.x
Choose a base branch
from
Open

Fix resolution bugs #26

Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
1ad121b
fix: keep case of file names in alias paths
golsch Oct 5, 2026
76a21c3
fix: do not use alias as regular expression when cutting it off the path
golsch Oct 5, 2026
0307d4c
fix: match aliases of related items only on complete path segments
golsch Oct 5, 2026
de41d07
fix: escape special characters and whitespace in alias queries
golsch Oct 5, 2026
52fd916
fix: handle empty MCR.Alias.Filepattern property
golsch Oct 5, 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
18 changes: 9 additions & 9 deletions src/main/java/org/mycore/alias/servlets/MCRAliasContentServlet.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,7 @@
import org.apache.solr.client.solrj.SolrQuery;
import org.apache.solr.client.solrj.SolrServerException;
import org.apache.solr.client.solrj.response.QueryResponse;
import org.apache.solr.client.solrj.util.ClientUtils;
import org.apache.solr.common.SolrDocument;
import org.apache.solr.common.SolrDocumentList;
import org.mycore.access.MCRAccessManager;
Expand All @@ -33,7 +34,6 @@
import org.mycore.datamodel.niofs.MCRPath;
import org.mycore.frontend.servlets.MCRContentServlet;
import org.mycore.solr.MCRSolrClientFactory;
import org.mycore.solr.MCRSolrUtils;
import org.xml.sax.SAXException;
import jakarta.servlet.ServletException;
import jakarta.servlet.http.HttpServletRequest;
Expand Down Expand Up @@ -75,7 +75,7 @@ public class MCRAliasContentServlet extends MCRContentServlet {
@Override
public void init() throws ServletException {
super.init();
this.aliasFilePattern = MCRConfiguration2.getString("MCR.Alias.Filepattern").get();
this.aliasFilePattern = MCRConfiguration2.getString("MCR.Alias.Filepattern").orElse("");
}

@Override
Expand Down Expand Up @@ -114,8 +114,7 @@ public MCRContent getContent(HttpServletRequest request, HttpServletResponse res

LOGGER.info("Alias was found with Object id: " + rootAlias.get(0).getFieldValue(OBJECT_ID));

String aliasPathContextOrig = parsePath(path).replaceFirst(decreasedPath, "");
String aliasPathContext = aliasPathContextOrig.toLowerCase(Locale.ROOT);
String aliasPathContext = parsePath(path).substring(decreasedPath.length());

contentFromAliasPath = getContentFromAliasPath(aliasPathContext, path,
(String) rootAlias.get(0).getFieldValue(OBJECT_ID), request, response);
Expand Down Expand Up @@ -153,7 +152,8 @@ private static void logPossibleAliasDocument(SolrDocument doc) {
}

private static boolean isDocumentAliasMatching(String cleanAliasPathContext, SolrDocument doc) {
return cleanAliasPathContext.startsWith(getAliasFromDocument(doc).toLowerCase(Locale.ROOT));
String alias = getAliasFromDocument(doc).toLowerCase(Locale.ROOT);
return cleanAliasPathContext.equals(alias) || cleanAliasPathContext.startsWith(alias + "/");
}

private static boolean documentHasAlias(SolrDocument doc) {
Expand Down Expand Up @@ -260,10 +260,10 @@ private MCRContent getContentFromAliasPath(String aliasPathContext, String fullP
LOGGER.debug("Process Alias Path Context: Try to shrink Alias Path Context " + aliasPathContext);
List<String> pathParts = Stream.of(aliasPathContext.split("/"))
.filter(Predicate.not(String::isEmpty))
.map(p -> p.toLowerCase(Locale.ROOT))
.collect(Collectors.toList());

String cleanAliasPathContext = String.join("/", pathParts);
String cleanAliasPathContextOrig = String.join("/", pathParts);
String cleanAliasPathContext = cleanAliasPathContextOrig.toLowerCase(Locale.ROOT);

// the longer the alias of the document is, the more likely it is the correct one
Comparator<SolrDocument> compareBestMatchingAlias = Comparator
Expand All @@ -281,7 +281,7 @@ private MCRContent getContentFromAliasPath(String aliasPathContext, String fullP
relatedObjectId = (String) relatedDocument.getFieldValue(OBJECT_ID);
String alias = getAliasFromDocument(relatedDocument).toLowerCase(Locale.ROOT);

nextAliasPathContextAfter = cleanAliasPathContext.substring(alias.length());
nextAliasPathContextAfter = cleanAliasPathContextOrig.substring(alias.length());
LOGGER.info("---- Process Alias Path Context: " + alias + " found in "
+ aliasPathContext + ". Shrink aliasPathContext into " + nextAliasPathContextAfter);
}
Expand Down Expand Up @@ -359,7 +359,7 @@ protected SolrDocumentList getMCRObjectsFromSolr(String aliasPart) {
try {

String searchStr = ALIAS + ":%filter%".replace("%filter%",
aliasPart != null && !aliasPart.isEmpty() ? MCRSolrUtils.escapeSearchValue(aliasPart) : "*");
aliasPart != null && !aliasPart.isEmpty() ? ClientUtils.escapeQueryChars(aliasPart) : "*");

results = resolveSolrDocuments(searchStr);

Expand Down
Loading