Pre-fill fields when switching to advanced search (#13601)

Co-Authored-By: Utkarsh Arya <190812618+Utkarsh3725@users.noreply.github.com>
Co-authored-by: Claude Sonnet 5 <noreply@anthropic.com>
Co-authored-by: Drini Cami <cdrini@gmail.com>

Author: 4 people

openlibrary/i18n/messages.pot

@@ -5654,6 +5654,10 @@ msgstr ""
 msgid "%(count)d records modified."
 msgstr ""
 
+#: search/advancedsearch.html
+msgid "All fields"
+msgstr ""
+
 #: search/advancedsearch.html
 msgid "ISBN"
 msgstr ""

openlibrary/macros/SearchNavigation.html

@@ -25,6 +25,6 @@
   </li>
   <li class="$('selected' if ctx.path=='/advancedsearch' else '')">
     <a data-ol-link-track="SearchNav|SearchAdvanced"
-       href="/advancedsearch">$_("Advanced Search")</a>
+       href="$changequery(_path='/advancedsearch', page=None)">$_("Advanced Search")</a>
   </li>
 </ul>

openlibrary/plugins/worksearch/code.py

@@ -967,7 +967,26 @@ class advancedsearch(delegate.page):
     path = "/advancedsearch"
 
     def GET(self):
-        return render_template("search/advancedsearch.html")
+        # facets are only a fallback
+        i = web.input(
+            q="",
+            title="",
+            author="",
+            isbn="",
+            subject="",
+            place="",
+            person="",
+            publisher="",
+            subject_facet="",
+            publisher_facet="",
+            person_facet="",
+            place_facet="",
+        )
+        i.subject = i.subject or i.subject_facet
+        i.publisher = i.publisher or i.publisher_facet
+        i.person = i.person or i.person_facet
+        i.place = i.place or i.place_facet
+        return render_template("search/advancedsearch.html", i)
 
 
 @dataclass

openlibrary/templates/search/advancedsearch.html

@@ -1,3 +1,4 @@
+$def with (i)
 <div id="contentHead">
   <h1>$_('Advanced Search')</h1>
 </div>
@@ -7,34 +8,37 @@ <h1>$_('Advanced Search')</h1>
   <form method="get" action="/search" class="siteSearch olform siteSearch--advanced">
     <fieldset class="home">
       <legend>$_('Advanced Search')</legend>
-      <input type="hidden" name="q" id="qtop">
+      <div class="formElement">
+        <label for="qtop">$_('All fields')</label><br>
+        <input type="text" class="siteSearch--advanced-input" name="q" id="qtop" placeholder="" size="35" value="$i.q">
+      </div>
       <div class="formElement">
         <label for="qtop-title">$_('Title')</label><br>
-        <input type="text" class="siteSearch--advanced-input" name="title" id="qtop-title" placeholder="" size="35">
+        <input type="text" class="siteSearch--advanced-input" name="title" id="qtop-title" placeholder="" size="35" value="$i.title">
       </div>
       <div class="formElement">
         <label for="qtop-author">$_('Author')</label><br>
-        <input type="text" class="siteSearch--advanced-input" name="author" id="qtop-author" placeholder="" size="35">
+        <input type="text" class="siteSearch--advanced-input" name="author" id="qtop-author" placeholder="" size="35" value="$i.author">
       </div>
       <div class="formElement">
         <label for="qtop-isbn">$_('ISBN')</label><br>
-        <input type="text" class="siteSearch--advanced-input" name="isbn" id="qtop-isbn" placeholder="" size="35">
+        <input type="text" class="siteSearch--advanced-input" name="isbn" id="qtop-isbn" placeholder="" size="35" value="$i.isbn">
       </div>
       <div class="formElement">
         <label for="qtop-subject">$_('Subject')</label><br>
-        <input type="text" class="siteSearch--advanced-input" name="subject" id="qtop-subject" placeholder="" size="35">
+        <input type="text" class="siteSearch--advanced-input" name="subject" id="qtop-subject" placeholder="" size="35" value="$i.subject">
       </div>
       <div class="formElement">
         <label for="qtop-place">$_('Place')</label><br>
-        <input type="text" class="siteSearch--advanced-input" name="place" id="qtop-place" placeholder="" size="35">
+        <input type="text" class="siteSearch--advanced-input" name="place" id="qtop-place" placeholder="" size="35" value="$i.place">
       </div>
       <div class="formElement">
         <label for="qtop-person">$_('Person')</label><br>
-        <input type="text" class="siteSearch--advanced-input" name="person" id="qtop-person" placeholder="" size="35">
+        <input type="text" class="siteSearch--advanced-input" name="person" id="qtop-person" placeholder="" size="35" value="$i.person">
       </div>
       <div class="formElement">
         <label for="qtop-publisher">$_('Publisher')</label><br>
-        <input type="text" class="siteSearch--advanced-input" name="publisher" id="qtop-publisher" placeholder="" size="35">
+        <input type="text" class="siteSearch--advanced-input" name="publisher" id="qtop-publisher" placeholder="" size="35" value="$i.publisher">
       </div>
     </fieldset>
     <button type="submit" class="cta-btn cta-btn--search">$_('Search')</button>