From 4d6da44b4eb484d79fc263e5d36c02ea50265767 Mon Sep 17 00:00:00 2001
From: Andy Rickert <andrew_rickert@brown.edu>
Date: Wed, 12 Aug 2020 03:55:26 -0400
Subject: filtering in solr and pagination

---
 src/fields/Doc.ts | 1 +
 1 file changed, 1 insertion(+)

(limited to 'src/fields')

diff --git a/src/fields/Doc.ts b/src/fields/Doc.ts
index b535fea5a..927ff4422 100644
--- a/src/fields/Doc.ts
+++ b/src/fields/Doc.ts
@@ -1044,6 +1044,7 @@ export namespace Doc {
                 if (docFilters[i] === key && (docFilters[i + 1] === value || modifiers === "match")) {
                     if (docFilters[i + 2] === modifiers && modifiers && docFilters[i + 1] === value) return;
                     docFilters.splice(i, 3);
+                    container._docFilters = new List<string>(docFilters);
                     break;
                 }
             }
-- 
cgit v1.2.3-70-g09d2


From 4927e0d6318afc63f3476839999761decc5842ac Mon Sep 17 00:00:00 2001
From: bobzel <zzzman@gmail.com>
Date: Wed, 12 Aug 2020 08:04:56 -0400
Subject: switching syntax from && to AND for solr filters and added quotes
 around solr term values

---
 src/client/views/search/SearchBox.tsx | 8 ++++----
 src/fields/SchemaHeaderField.ts       | 2 +-
 2 files changed, 5 insertions(+), 5 deletions(-)

(limited to 'src/fields')

diff --git a/src/client/views/search/SearchBox.tsx b/src/client/views/search/SearchBox.tsx
index 39dd8d4bf..36b490839 100644
--- a/src/client/views/search/SearchBox.tsx
+++ b/src/client/views/search/SearchBox.tsx
@@ -279,10 +279,10 @@ export class SearchBox extends ViewBoxBaseComponent<FieldViewProps, SearchBoxDoc
                 const newWords: string[] = [];
                 const oldWords = values[0].split(" ");
                 oldWords.forEach((word, i) => {
-                    i === 0 ? newWords.push(key + mod + word) : newWords.push("&& " + key + mod + word)
+                    i === 0 ? newWords.push(key + mod + "\"" + word + "\"") : newWords.push("AND " + key + mod + "\"" + word + "\"")
                 });
                 let v = "(" + newWords.join(" ") + ")";
-                query = query + " && " + v;
+                query = query + " AND " + v;
             }
             else {
                 for (let i = 0; i < values.length; i++) {
@@ -290,11 +290,11 @@ export class SearchBox extends ViewBoxBaseComponent<FieldViewProps, SearchBoxDoc
                     const newWords: string[] = [];
                     const oldWords = values[i].split(" ");
                     oldWords.forEach((word, i) => {
-                        i === 0 ? newWords.push(key + mod + word) : newWords.push("&& " + key + mod + word)
+                        i === 0 ? newWords.push(key + mod + "\"" + word + "\"") : newWords.push("AND " + key + mod + "\"" + word + "\"")
                     });
                     let v = "(" + newWords.join(" ") + ")";
                     if (i === 0) {
-                        query = query + " && (" + v;
+                        query = query + " AND (" + v;
                         if (values.length === 1) {
                             query = query + ")";
                         }
diff --git a/src/fields/SchemaHeaderField.ts b/src/fields/SchemaHeaderField.ts
index 07c90f5a2..22ae454f8 100644
--- a/src/fields/SchemaHeaderField.ts
+++ b/src/fields/SchemaHeaderField.ts
@@ -114,7 +114,7 @@ export class SchemaHeaderField extends ObjectField {
     }
 
     [ToScriptString]() {
-        return `invalid`;
+        return `header(${this.heading},${this.type}})`;
     }
     [ToString]() {
         return `SchemaHeaderField`;
-- 
cgit v1.2.3-70-g09d2