Mirror/MarginaliaSearch
1
0
Fork 0
mirror of https://github.com/MarginaliaSearch/MarginaliaSearch.git synced 2025-02-24 13:19:02 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Clean-up and fix for feature regression in site:-terms

Browse Source
This commit is contained in:
Viktor Lofgren 2023-01-11 19:33:32 +01:00
parent fb2797a8ef
commit 5851e91424
2 changed files with 3 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
marginalia_nu/src/main/java/nu/marginalia/wmsa/edge/search/query/QueryFactory.java
View File

@ -134,6 +134,9 @@ public class QueryFactory {
break; break;
case ADVICE_TERM: case ADVICE_TERM:
searchTermsAdvice.add(t.str); searchTermsAdvice.add(t.str);
if (t.str.toLowerCase().startsWith("site:")) {
domain = t.str.substring("site:".length());
}
break; break;
case PRIORTY_TERM: case PRIORTY_TERM:
searchTermsPriority.add(t.str); searchTermsPriority.add(t.str);
@ -141,9 +144,6 @@ public class QueryFactory {
case LITERAL_TERM: // fallthrough; case LITERAL_TERM: // fallthrough;
case QUOT_TERM: case QUOT_TERM:
searchTermsInclude.add(t.str); searchTermsInclude.add(t.str);
if (t.str.toLowerCase().startsWith("site:")) {
domain = t.str.substring("site:".length());
}
break; break;
case QUALITY_TERM: case QUALITY_TERM:
case YEAR_TERM: case YEAR_TERM:

9
marginalia_nu/src/main/java/nu/marginalia/wmsa/edge/search/svc/EdgeSearchQueryIndexService.java
View File

@ -67,13 +67,7 @@ public class EdgeSearchQueryIndexService {
final List<EdgeUrlDetails> resultList = new ArrayList<>(results.size()); final List<EdgeUrlDetails> resultList = new ArrayList<>(results.size());
long badQCount = 0;
for (var details : resultDecorator.getAllUrlDetails(results)) { for (var details : resultDecorator.getAllUrlDetails(results)) {
if (details.getUrlQuality() <= -100) {
badQCount++;
continue;
}
details = details.withUrlQualityAdjustment( details = details.withUrlQualityAdjustment(
adjustScoreBasedOnQuery(details, processedQuery.specs)); adjustScoreBasedOnQuery(details, processedQuery.specs));
@ -85,9 +79,6 @@ public class EdgeSearchQueryIndexService {
UrlDeduplicator deduplicator = new UrlDeduplicator(processedQuery.specs.limitByDomain); UrlDeduplicator deduplicator = new UrlDeduplicator(processedQuery.specs.limitByDomain);
List<EdgeUrlDetails> retList = new ArrayList<>(processedQuery.specs.limitTotal); List<EdgeUrlDetails> retList = new ArrayList<>(processedQuery.specs.limitTotal);
if (badQCount > 0) {
System.out.println(badQCount);
}
for (var item : resultList) { for (var item : resultList) {
if (retList.size() >= processedQuery.specs.limitTotal) if (retList.size() >= processedQuery.specs.limitTotal)
break; break;