Better search. #598. Thank you Zireael07 for the bug report.

breck7 · Oct 3, 2024 · c5f7a3e · c5f7a3e
1 parent d146435
commit c5f7a3e
Show file tree

Hide file tree

Showing 9 changed files with 32 additions and 37 deletions.
diff --git a/Computer.js b/Computer.js
@@ -768,7 +768,7 @@ table
  git clone ${mainRepo}`
       : ""
 
-    return `import ../header.scroll
+    return `../header.scroll
 baseUrl https://pldb.io/concepts/
 title ${title} - ${lodash.upperFirst(primaryTagName)}
 
@@ -779,7 +779,7 @@ printTitle ${title}
 
 viewSourceUrl ${this.sourceUrl}
 
-wideColumns 1
+container 800px
 
 <div class="trueBaseThemeQuickLinks">${this.quickLinks}</div>
 
@@ -799,7 +799,7 @@ ${this.descriptionSection}
 
 ${this.factsArray.map(fact => `- ${fact}\n inlineMarkupsOn none`).join("\n")}
 
-<br>
+br
 
 ${this.exampleSection}
 
@@ -1477,27 +1477,25 @@ class Feature {
     const description = this.measure.Description
     if (description) descriptionText = `* This question asks: ${description}`
 
-    return `import header.scroll
+    return `header.scroll
 
 title ${title} - language feature
+tags Feature
 printTitle ${title}
 
-html
- <a class="trueBaseThemePreviousItem" href="${previous.permalink}">&lt;</a>
- <a class="trueBaseThemeNextItem" href="${next.permalink}">&gt;</a>
+<a class="trueBaseThemePreviousItem" href="${previous.permalink}">&lt;</a>
+<a class="trueBaseThemeNextItem" href="${next.permalink}">&gt;</a>
 
 viewSourceUrl https://github.com/breck7/pldb/blob/main/Computer.js
 
-mediumColumns 1
+container 600px
 
 ${examplesText}
 
 ***
 
 ${[positiveText, negativeText, descriptionText, explorerLinks, referencesText].filter(i => i).join("\n\n***\n\n")}
 
-endColumns
-
 keyboardNav ${previous.permalink} ${next.permalink}
 
 ../footer.scroll

diff --git a/blog/print-debugging-in-over-300-languages.scroll b/blog/print-debugging-in-over-300-languages.scroll
@@ -3,7 +3,7 @@ authors Breck Yunits
 date 2022.07.15
 replace PD <b>print("debugging")</b>
 tags All
-title "print() debugging" in over 300 languages
+title print() debugging in over 300 languages
 
 postHeader.scroll
 printTitle

diff --git a/code/browser/client.js b/code/browser/client.js
@@ -27,7 +27,7 @@ const initAutocomplete = elementId => {
       const htmlEncodedQuery = query.replace(/</g, "&lt;")
 
       suggestions.push({
-        label: `Full text search for "${htmlEncodedQuery}"`,
+        label: `Search for "${htmlEncodedQuery}"`,
         id: "",
         url: normalizeUrl(`/lists/explorer.html#q=${htmlEncodedQuery}`)
       })
@@ -36,7 +36,7 @@ const initAutocomplete = elementId => {
     onSelect: item => {
       const { url, id } = item
       if (id) window.location = url
-      else window.location = normalizeUrl("/lists/explorer.html#q=" + encodeURIComponent(input.value))
+      else window.location = normalizeUrl("/search.html#q=" + encodeURIComponent(input.value))
     }
   })
 }
diff --git a/footer.scroll b/footer.scroll
@@ -17,6 +17,9 @@ stumpNoSnippet
   a About
    href BASE_URL/pages/about.html
   span ·
+  a Search
+   href BASE_URL/search.html
+  span ·
   a Keywords
    href BASE_URL/lists/keywords.html
   span ·

diff --git a/header.scroll b/header.scroll
@@ -23,7 +23,7 @@ stumpNoSnippet
   form
    style display:inline-block;
    method get
-   action BASE_URL/lists/explorer.html
+   action BASE_URL/search.html
    input
     type search
     id trueBaseThemeHeaderSearch

diff --git a/lists/keywords.scroll b/lists/keywords.scroll
diff --git a/package.json b/package.json
@@ -42,7 +42,7 @@
     "lodash": "^4.17.21",
     "monaco-editor": "^0.34.1",
     "numeral": "^2.0.6",
-    "scroll-cli": "^136.4.1",
+    "scroll-cli": "^136.11.1",
     "scrollsdk": "^87.0.0",
     "semver": "^7.6.2"
   },

diff --git a/search.scroll b/search.scroll
@@ -0,0 +1,15 @@
+title Search PLDB
+
+rootHeader.scroll
+
+printTitle
+
+// Todo: this is pretty amazing that we can just dump plain text versions of over 5,000 files in one HTML table and use DataTables to search...BUT...let's improve (make build speed faster, for example)
+
+container
+printSearchTable blog/All features/All concepts/
+tableSearch
+
+endColumns
+
+footer.scroll
diff --git a/searchForm.scroll b/searchForm.scroll
@@ -1,6 +1,6 @@
 html
  <div class="trueBaseSearchForm trueBaseSearchFormPadded">
-  <form style="display:inline;" method="get" action="BASE_URL/lists/explorer.html">
+  <form style="display:inline;" method="get" action="BASE_URL/search.html">
    <input name="q" placeholder="Search" autocomplete="off" type="search" id="searchFormInput">
    <input class="searchButton" type="submit" value="Search">
   </form>