From 5851e91424ac57d33d7ee7addbeb83249716178c Mon Sep 17 00:00:00 2001
From: Viktor Lofgren <vlofgren@marginalia.nu>
Date: Wed, 11 Jan 2023 19:33:32 +0100
Subject: [PATCH] Clean-up and fix for feature regression in site:-terms

---
 .../marginalia/wmsa/edge/search/query/QueryFactory.java  | 6 +++---
 .../edge/search/svc/EdgeSearchQueryIndexService.java     | 9 ---------
 2 files changed, 3 insertions(+), 12 deletions(-)

diff --git a/marginalia_nu/src/main/java/nu/marginalia/wmsa/edge/search/query/QueryFactory.java b/marginalia_nu/src/main/java/nu/marginalia/wmsa/edge/search/query/QueryFactory.java
index 7ed02926..6cf8a050 100644
--- a/marginalia_nu/src/main/java/nu/marginalia/wmsa/edge/search/query/QueryFactory.java
+++ b/marginalia_nu/src/main/java/nu/marginalia/wmsa/edge/search/query/QueryFactory.java
@@ -134,6 +134,9 @@ public class QueryFactory {
                         break;
                     case ADVICE_TERM:
                         searchTermsAdvice.add(t.str);
+                        if (t.str.toLowerCase().startsWith("site:")) {
+                            domain = t.str.substring("site:".length());
+                        }
                         break;
                     case PRIORTY_TERM:
                         searchTermsPriority.add(t.str);
@@ -141,9 +144,6 @@ public class QueryFactory {
                     case LITERAL_TERM: // fallthrough;
                     case QUOT_TERM:
                         searchTermsInclude.add(t.str);
-                        if (t.str.toLowerCase().startsWith("site:")) {
-                            domain = t.str.substring("site:".length());
-                        }
                         break;
                     case QUALITY_TERM:
                     case YEAR_TERM:
diff --git a/marginalia_nu/src/main/java/nu/marginalia/wmsa/edge/search/svc/EdgeSearchQueryIndexService.java b/marginalia_nu/src/main/java/nu/marginalia/wmsa/edge/search/svc/EdgeSearchQueryIndexService.java
index f5d6c0aa..0c4cffc2 100644
--- a/marginalia_nu/src/main/java/nu/marginalia/wmsa/edge/search/svc/EdgeSearchQueryIndexService.java
+++ b/marginalia_nu/src/main/java/nu/marginalia/wmsa/edge/search/svc/EdgeSearchQueryIndexService.java
@@ -67,13 +67,7 @@ public class EdgeSearchQueryIndexService {
 
         final List<EdgeUrlDetails> resultList = new ArrayList<>(results.size());
 
-        long badQCount = 0;
         for (var details : resultDecorator.getAllUrlDetails(results)) {
-            if (details.getUrlQuality() <= -100) {
-                badQCount++;
-                continue;
-            }
-
             details = details.withUrlQualityAdjustment(
                     adjustScoreBasedOnQuery(details, processedQuery.specs));
 
@@ -85,9 +79,6 @@ public class EdgeSearchQueryIndexService {
         UrlDeduplicator deduplicator = new UrlDeduplicator(processedQuery.specs.limitByDomain);
         List<EdgeUrlDetails> retList = new ArrayList<>(processedQuery.specs.limitTotal);
 
-        if (badQCount > 0) {
-            System.out.println(badQCount);
-        }
         for (var item : resultList) {
             if (retList.size() >= processedQuery.specs.limitTotal)
                 break;