Commit 0a559b7f authored by Dmitry Shelepnev's avatar Dmitry Shelepnev
Browse files

Fix opds search from sub-uri

parent 32c76881

opds_catalog/feeds.py

+1 −1
Original line number Diff line number Diff line
@@ -145,7 +145,7 @@ class MainFeed(AuthFeed): 


    def feed_extra_kwargs(self, obj):

        return {

                "searchTerm_url":"/opds/search/{searchTerms}/",

                "searchTerm_url":"%s%s"%(reverse("opds_catalog:opensearch"),'{searchTerms}/'),

                #"searchTerm_url":reverse("opds_catalog:searchtypes",kwargs={"searchterms":"{searchTerms}"}),

                "start_url":reverse("opds_catalog:main"),

                "description_mime_type":"text",

opds_catalog/templates/opensearch.html

+1 −1
Original line number Diff line number Diff line
@@ -3,7 +3,7 @@ 
<OpenSearchDescription xmlns="http://a9.com/-/spec/opensearch/1.1/">

    <ShortName>SimpleOPDS</ShortName>

    <LongName>SimpleOPDS</LongName>

    <Url type="application/atom+xml" template="/opds/search/{searchTerms}/" />

    <Url type="application/atom+xml" template="{% url opds_catalog:opensearch %}{searchTerms}/" />

    <Image width="16" height="16">http://www.sopds.ru/favicon.ico</Image>

    <Tags />

    <Contact />

opds_catalog/urls.py

+1 −0
Original line number Diff line number Diff line
@@ -26,6 +26,7 @@ urlpatterns = [ 
    url(r'^genres/(?P<section>\d+)/$',feeds.GenresFeed(), name='genres'), 

    

    url(r'^search/$',feeds.OpenSearch, name='opensearch'),

    #url(r'search/{searchTerms}/$',feeds.OpenSearch, name='search_template'),

   

    url(r'^search/books/(?P<searchtype>[bmasgued])/(?P<searchterms>.+)/(?P<page>\d+)/',feeds.SearchBooksFeed(), name='searchbooks'),

    url(r'^search/books/(?P<searchtype>[bmasgued])/(?P<searchterms>.+)/',feeds.SearchBooksFeed(), name='searchbooks'),