From f196054c7e2c21924c6600d0cebfc8a7e5183941 Mon Sep 17 00:00:00 2001
From: Caryl Wyatt <carylw@hathitrust.org>
Date: Fri, 8 Nov 2024 13:38:18 -0500
Subject: [PATCH 1/2] add original location filter to advanced search

---
 .../AdvancedSearchForm/index.svelte           | 48 ++++++++++++++++++-
 1 file changed, 46 insertions(+), 2 deletions(-)

diff --git a/src/js/components/AdvancedSearchForm/index.svelte b/src/js/components/AdvancedSearchForm/index.svelte
index a82e0ea..21c1706 100644
--- a/src/js/components/AdvancedSearchForm/index.svelte
+++ b/src/js/components/AdvancedSearchForm/index.svelte
@@ -10,6 +10,7 @@
   // <hathi-advanced-search-form data-prop-language-data="[&quot;Abkhaz&quot;,&quot;Achinese&quot;,&quot;Acoli&quot;,&quot;Adangme&quot;...
   export let formatData = [];
   export let languageData = [];
+  export let locationData = [];
   export let collid = null;
   export let collectionName = null;
 
@@ -50,6 +51,7 @@
   let pubYear = {};
   let lang = [];
   let format = [];
+  let originalLocation;
   let modal;
   // let types = new Array(4); types.fill('ocr');
   let types = ['ocr', 'all', 'title', 'author'];
@@ -166,15 +168,19 @@
           searchParams.append('bool[]', value);
         }
       });
-
       lang.forEach((value) => {
         searchParams.append('fqor-language[]', value);
       });
       format.forEach((value) => {
         searchParams.append('fqor-format[]', value);
       });
+      if (originalLocation) {
+        searchParams.append('filter[]', `htsource:${originalLocation}`)
+      }
 
-      url.search = searchParams.toString();
+      let preSearch = searchParams.toString()
+      // note: searchParams.toString() turns the : after htsource into a %3A and I don't want that
+      url.search = preSearch.replace(/htsource%3A/g, 'htsource:'); 
     } else {
       url = new URL(`${protocol}//${HT.service_domain}/cgi/ls`);
       let searchParams = new URLSearchParams();
@@ -251,6 +257,9 @@
       format.forEach((value) => {
         searchParams.append('facet_format', `format:${value}`);
       });
+      if (originalLocation) {
+        searchParams.append('facet', `htsource:"${originalLocation}"`)
+      }
 
       url.search = searchParams.toString();
     }
@@ -289,6 +298,14 @@
         });
         format = format;
       }
+      if (params.get('filter[]')?.includes('htsource')) {
+        params.getAll('filter[]').forEach((value) => {
+          if (value.includes('htsource')) {
+            originalLocation = value.replace('htsource:', '');
+          }
+        });
+        originalLocation = originalLocation;
+      }
 
       if (!params.get('ft') && window.location.href.includes('?')) {
         isFullView = false;
@@ -343,6 +360,14 @@
         });
         format = format;
       }
+      if (params.get('facet')?.includes('htsource')) {
+        params.getAll('facet').forEach((value) => {
+          if (value.includes('htsource')) {
+            originalLocation = value.replace('htsource:', '').replaceAll('"', '');
+          }
+        });
+        originalLocation = originalLocation;
+      }
 
       yop = params.get('yop') || 'after';
       switch (yop) {
@@ -686,6 +711,25 @@
               />
             </div>
           </fieldset>
+
+          <fieldset class="mb-4">
+            <legend class="fs-4 fw-bold">Original Location</legend>
+
+            <div class="advanced-search-list">
+              <FilterableSelection
+                --filterable-list-height="15rem"
+                items={locationData.map((item) => ({
+                  option: item,
+                  key: item,
+                  value: item,
+                }))}
+                label="Original location"
+                placeholder="Filter by original location"
+                multiple={false}
+                bind:value={originalLocation}
+              />
+            </div>
+          </fieldset>
         </div>
 
         <div class="d-flex gap-3 mb-3 justify-content-end">

From e4ed5fbeb42d7243e1478fa224de9250123fb2c7 Mon Sep 17 00:00:00 2001
From: Caryl Wyatt <carylw@hathitrust.org>
Date: Fri, 6 Dec 2024 16:05:18 -0500
Subject: [PATCH 2/2] fix ampersand in data

---
 src/js/components/FilterableSelection.svelte | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/js/components/FilterableSelection.svelte b/src/js/components/FilterableSelection.svelte
index 2c6a626..a491972 100644
--- a/src/js/components/FilterableSelection.svelte
+++ b/src/js/components/FilterableSelection.svelte
@@ -123,7 +123,7 @@
             on:focus={(event) => updateValue(event, true)}
           />
         {/if}
-        <label class="form-check-label p-2 px-3" for="item{index}-{guid}">{item.option}</label>
+        <label class="form-check-label p-2 px-3" for="item{index}-{guid}">{@html item.option}</label>
       </li>
     {/each}
   </ul>