From 68fd0efbde740c351879ef2a1afb34fc2a0630f3 Mon Sep 17 00:00:00 2001
From: Viktor Lofgren <vlofgren@marginalia.nu>
Date: Mon, 8 Jan 2024 20:57:40 +0100
Subject: [PATCH] (search) Clean up search results template

Rendering is very slow. Let's see if this has a measurable effect on latency.
---
 .../marginalia/search/model/UrlDetails.java   | 20 ++++++++-----------
 .../templates/search/parts/search-result.hdb  |  9 ++++-----
 2 files changed, 12 insertions(+), 17 deletions(-)

diff --git a/code/services-application/search-service/src/main/java/nu/marginalia/search/model/UrlDetails.java b/code/services-application/search-service/src/main/java/nu/marginalia/search/model/UrlDetails.java
index 29c0c864..ae4f551e 100644
--- a/code/services-application/search-service/src/main/java/nu/marginalia/search/model/UrlDetails.java
+++ b/code/services-application/search-service/src/main/java/nu/marginalia/search/model/UrlDetails.java
@@ -104,18 +104,14 @@ public class UrlDetails {
     public int getProblemCount() {
         int numProblems = 0;
 
-        for (var problem :EnumSet.of(
-                HtmlFeature.JS,
-                HtmlFeature.TRACKING,
-                HtmlFeature.TRACKING_ADTECH,
-                HtmlFeature.AFFILIATE_LINK,
-                HtmlFeature.COOKIES,
-                HtmlFeature.ADVERTISEMENT)) {
-            if (HtmlFeature.hasFeature(features, problem)) {
-                numProblems++;
-            }
-        }
-        return numProblems;
+        int mask = HtmlFeature.JS.getFeatureBit()
+                | HtmlFeature.COOKIES.getFeatureBit()
+                | HtmlFeature.TRACKING.getFeatureBit()
+                | HtmlFeature.AFFILIATE_LINK.getFeatureBit()
+                | HtmlFeature.TRACKING_ADTECH.getFeatureBit()
+                | HtmlFeature.ADVERTISEMENT.getFeatureBit();
+
+        return Integer.bitCount(features & mask);
     }
 
     public String getProblems() {
diff --git a/code/services-application/search-service/src/main/resources/templates/search/parts/search-result.hdb b/code/services-application/search-service/src/main/resources/templates/search/parts/search-result.hdb
index bd89cc59..2c9c8f8a 100644
--- a/code/services-application/search-service/src/main/resources/templates/search/parts/search-result.hdb
+++ b/code/services-application/search-service/src/main/resources/templates/search/parts/search-result.hdb
@@ -1,5 +1,5 @@
-<section {{#unless hideRanking}} data-rs-rank="{{logRank}}" data-ms-rank="{{matchRank}}"{{/unless}}
-        class="card search-result {{#if specialDomain}}special-domain{{/if}}" >
+<section data-rs-rank="{{logRank}}" data-ms-rank="{{matchRank}}"
+        class="card search-result" >
 <div class="url"><a rel="nofollow external" href="{{url}}">{{url}}</a></div>
 <h2> <a tabindex="-1" class="title" rel="nofollow external" href="{{url}}">{{title}}</a> </h2>
 <p class="description">{{description}}</p>
@@ -7,10 +7,9 @@
 <div class="utils">
     {{#unless focusDomain}}
     <a href="/site/{{url.domain}}" title="Domain Information">Info</a>
-    {{#if hasMoreResults}}<a href="/site-search/{{url.domain}}/{{query}}?profile={{profile}}" title="More results from this domain">{{resultsFromSameDomain}}+</a>{{/if}}
-    {{/unless}}
+    {{#if hasMoreResults}}<a href="/site-search/{{url.domain}}/{{query}}?profile={{profile}}" title="More results from this domain">{{resultsFromSameDomain}}+</a>{{/if}}{{/unless}}
     <div class="meta">
-        {{#if problems}} <span class="problems" title="{{problems}}"> ⚠ {{problemCount}} </span> {{/if}}
+        {{#if problemCount}} <span class="problems" title="{{problems}}"> ⚠ {{problemCount}} </span> {{/if}}
         <span aria-hidden="true" class="meta positions"
               title="Positions where keywords were found within the document">{{positions}}</span>
     </div>