Merge pull request internetarchive#11152 from cdrini/11123/fix/subject-people-pages

Fix people/place/time subject pages erroring

Author: mekarpeles

openlibrary/core/models.py

@@ -1167,6 +1167,10 @@ def remove_user(self, userkey):
 
 class Subject(web.storage):
     key: str
+    name: str
+    subject_type: str
+    solr_query: str
+    """Query with normalized subject key to get matching books; eg 'person_key:ned_wilcox'"""
 
     def get_lists(self, limit=1000, offset=0, sort=True):
         q = {

openlibrary/plugins/worksearch/subjects.py

@@ -315,6 +315,10 @@ def get_subject(
             key=key,
             name=name,
             subject_type=subject_type,
+            solr_query=query_dict_to_str(
+                {meta.facet_key: self.normalize_key(path)},
+                phrase=True,
+            ),
             work_count=result.num_found,
             works=add_availability([self.work_wrapper(d) for d in result.docs]),
         )

openlibrary/templates/publishers/view.html

@@ -21,7 +21,7 @@ <h1>
 </div>
 
 <div class="contentBody">
-    $:macros.QueryCarousel(query='publisher_facet:"%s"' % page.name.replace('"', '\\"'), sort='trending,trending_score_hourly_sum', user_lang_only=False, has_fulltext_only=False)
+    $:macros.QueryCarousel(query=page.solr_query, sort='trending,trending_score_hourly_sum', user_lang_only=False, has_fulltext_only=False)
 
 	<div class="head">
 	    <h2>

openlibrary/templates/subjects.html

@@ -28,7 +28,7 @@ <h1 class="inline">
     </h1>
     <span class="heading">
         <span class="count" id="coversCount">
-            <strong><span><a href="/search?$page.subject_type=$page.name.replace('&','%26')" title="$_('See all works')">$ungettext("%(count)d work", "%(count)d works", page.work_count, count=page.work_count)</a></span></strong>
+            <strong><span><a href="/search?$urlencode(dict(q=page.solr_query))" title="$_('See all works')">$ungettext("%(count)d work", "%(count)d works", page.work_count, count=page.work_count)</a></span></strong>
         </span>
     </span>
     $if has_tag:
@@ -56,7 +56,7 @@ <h3>$_("Disambiguations")</h3>
     $if has_tag:
       $:format(sanitize(page.tag.body))
 
-    $:macros.QueryCarousel(query="subject_key:%s" % page.key.split('/')[-1], sort='trending,trending_score_hourly_sum', user_lang_only=True, fallback=True)
+    $:macros.QueryCarousel(query=page.solr_query, sort='trending,trending_score_hourly_sum', user_lang_only=True, fallback=True)
     $:macros.PublishingHistory(page.publishing_history)
 
     <div class="clearfix"></div>