Commit 308af61e authored by mitshel's avatar mitshel
Browse files

Delete from links in OpdsTemplate kind element

parent d386cc2f
Loading
Loading
Loading
Loading
+23 −23
Original line number Diff line number Diff line
@@ -28,7 +28,7 @@ class opdsTemplate():
                              '</entry>')

       self.agregate_authors=('<author><name>%(last_name)s %(first_name)s</name></author>')
       self.agregate_authors_link=('<link href="%(modulepath)s?id=22%(author_id)s" rel="related" type="application/atom+xml;profile=opds-catalog;kind=navigation" title="Все книги %(last_name)s %(first_name)s" />')
       self.agregate_authors_link=('<link href="%(modulepath)s?id=22%(author_id)s" rel="related" type="application/atom+xml;profile=opds-catalog" title="Все книги %(last_name)s %(first_name)s" />')
       self.agregate_genres='<category term="%(genre)s" label="%(genre)s" />'
       self.agregate_genres_link=''
       self.agregate_series=''
@@ -64,82 +64,82 @@ class opdsTemplate():
                               '<entry>'
                               '<title>По каталогам</title>'
                               '<content type="text">Каталогов: %(cat_num)s, книг: %(book_num)s.</content>'
                               '<link type="application/atom+xml;profile=opds-catalog;kind=navigation" href="%(modulepath)s?id=01"/>'
                               '<link type="application/atom+xml;profile=opds-catalog" href="%(modulepath)s?id=01"/>'
                               '<id>id:01</id></entry>'
                               '<entry>'
                               '<title>По авторам</title>'
                               '<content type="text">Авторов: %(author_num)s.</content>'
                               '<link type="application/atom+xml;profile=opds-catalog;kind=navigation" href="%(modulepath)s?id=%(alphabet_id)s02"/>'
                               '<link type="application/atom+xml;profile=opds-catalog" href="%(modulepath)s?id=%(alphabet_id)s02"/>'
                               '<id>id:02</id></entry>'
                               '<entry>'
                               '<title>По наименованию</title>'
                               '<content type="text">Книг: %(book_num)s.</content>'
                               '<link type="application/atom+xml;profile=opds-catalog;kind=navigation" href="%(modulepath)s?id=%(alphabet_id)s03"/>'
                               '<link type="application/atom+xml;profile=opds-catalog" href="%(modulepath)s?id=%(alphabet_id)s03"/>'
                               '<id>id:03</id></entry>'
                               '<entry>'
                               '<title>По Жанрам</title>'
                               '<content type="text">Жанров: %(genre_num)s.</content>'
                               '<link type="application/atom+xml;profile=opds-catalog;kind=navigation" href="%(modulepath)s?id=04"/>'
                               '<link type="application/atom+xml;profile=opds-catalog" href="%(modulepath)s?id=04"/>'
                               '<id>id:04</id></entry>'
                               '<entry>'
                               '<title>По Сериям</title>'
                               '<content type="text">Серий: %(series_num)s.</content>'
                               '<link type="application/atom+xml;profile=opds-catalog;kind=navigation" href="%(modulepath)s?id=%(alphabet_id)s06"/>'
                               '<link type="application/atom+xml;profile=opds-catalog" href="%(modulepath)s?id=%(alphabet_id)s06"/>'
                               '<id>id:06</id></entry>'
                               )
       self.document_mainmenu_new=('<entry>'
                               '<title>Новинки за %(new_period)s суток</title>'
                               '<link type="application/atom+xml;profile=opds-catalog;kind=navigation" href="%(modulepath)s?id=05"/>'
                               '<link type="application/atom+xml;profile=opds-catalog" href="%(modulepath)s?id=05"/>'
                               '<id>id:05</id></entry>'
                               )
       self.document_mainmenu_shelf=('<entry>'
                               '<title>Книжная полка для %(user)s</title>'
                               '<content type="text">Книг: %(shelf_book_num)s.</content>'
                               '<link type="application/atom+xml;profile=opds-catalog;kind=navigation" href="%(modulepath)s?id=08"/>'
                               '<link type="application/atom+xml;profile=opds-catalog" href="%(modulepath)s?id=08"/>'
                               '<id>id:08</id></entry>'
                               )
       self.document_newmenu=('<entry>'
                               '<title>Все новинки за %(new_period)s суток</title>'
                               '<content type="text">Новых книг: %(newbook_num)s.</content>'
                               '<link type="application/atom+xml;profile=opds-catalog;kind=navigation" href="%(modulepath)s?id=%(alphabet_id)s03&amp;news=1"/>'
                               '<link type="application/atom+xml;profile=opds-catalog" href="%(modulepath)s?id=%(alphabet_id)s03&amp;news=1"/>'
                               '<id>id:03:news</id></entry>'
                               '<entry>'
                               '<title>Новинки по авторам</title>'
                               '<link type="application/atom+xml;profile=opds-catalog;kind=navigation" href="%(modulepath)s?id=%(alphabet_id)s02&amp;news=1"/>'
                               '<link type="application/atom+xml;profile=opds-catalog" href="%(modulepath)s?id=%(alphabet_id)s02&amp;news=1"/>'
                               '<id>id:02:news</id></entry>'
                               '<entry>'
                               '<title>Новинки по Жанрам</title>'
                               '<link type="application/atom+xml;profile=opds-catalog;kind=navigation" href="%(modulepath)s?id=04&amp;news=1"/>'
                               '<link type="application/atom+xml;profile=opds-catalog" href="%(modulepath)s?id=04&amp;news=1"/>'
                               '<id>id:04:news</id></entry>'
                               '<entry>'
                               '<title>Новинки по Сериям</title>'
                               '<link type="application/atom+xml;profile=opds-catalog;kind=navigation" href="%(modulepath)s?id=%(alphabet_id)s06&amp;news=1"/>'
                               '<link type="application/atom+xml;profile=opds-catalog" href="%(modulepath)s?id=%(alphabet_id)s06&amp;news=1"/>'
                               '<id>id:06:news</id></entry>'
                               )
       self.document_authors_submenu=('<entry>'
                               '<title>Книги по сериям</title>'
                               '<link type="application/atom+xml;profile=opds-catalog;kind=navigation" href="%(modulepath)s?id=31%(author_id)s"/>'
                               '<link type="application/atom+xml;profile=opds-catalog" href="%(modulepath)s?id=31%(author_id)s"/>'
                               '<id>id:31:authors</id></entry>'
                               '<entry>'
                               '<title>Книги вне серий</title>'
                               '<link type="application/atom+xml;profile=opds-catalog;kind=navigation" href="%(modulepath)s?id=34%(author_id)s"/>'
                               '<link type="application/atom+xml;profile=opds-catalog" href="%(modulepath)s?id=34%(author_id)s"/>'
                               '<id>id:32:authors</id></entry>'
                               '<entry>'
                               '<title>Книги по алфавиту</title>'
                               '<link type="application/atom+xml;profile=opds-catalog;kind=navigation" href="%(modulepath)s?id=33%(author_id)s"/>'
                               '<link type="application/atom+xml;profile=opds-catalog" href="%(modulepath)s?id=33%(author_id)s"/>'
                               '<id>id:33:authors</id></entry>'
                               )

       self.document_alphabet_menu=('<entry><title>А..Я (РУС)</title><id>alpha:1</id><link type="application/atom+xml;profile=opds-catalog;kind=navigation" href="%(modulepath)s?id=%(iid)s&amp;alpha=1%(nl)s"/></entry>'
                                    '<entry><title>0..9 (Цифры)</title><id>alpha:2</id><link type="application/atom+xml;profile=opds-catalog;kind=navigation" href="%(modulepath)s?id=%(iid)s&amp;alpha=2%(nl)s"/></entry>'
                                    '<entry><title>A..Z (ENG)</title><id>alpha:3</id><link type="application/atom+xml;profile=opds-catalog;kind=navigation" href="%(modulepath)s?id=%(iid)s&amp;alpha=3%(nl)s"/></entry>'
                                    '<entry><title>Другие Символы</title><id>alpha:4</id><link type="application/atom+xml;profile=opds-catalog;kind=navigation" href="%(modulepath)s?id=%(iid)s&amp;alpha=4%(nl)s"/></entry>'
                                    '<entry><title>Показать все</title><id>alpha:5</id><link type="application/atom+xml;profile=opds-catalog;kind=navigation" href="%(modulepath)s?id=%(iid)s&amp;alpha=5%(nl)s"/></entry>'
       self.document_alphabet_menu=('<entry><title>А..Я (РУС)</title><id>alpha:1</id><link type="application/atom+xml;profile=opds-catalog" href="%(modulepath)s?id=%(iid)s&amp;alpha=1%(nl)s"/></entry>'
                                    '<entry><title>0..9 (Цифры)</title><id>alpha:2</id><link type="application/atom+xml;profile=opds-catalog" href="%(modulepath)s?id=%(iid)s&amp;alpha=2%(nl)s"/></entry>'
                                    '<entry><title>A..Z (ENG)</title><id>alpha:3</id><link type="application/atom+xml;profile=opds-catalog" href="%(modulepath)s?id=%(iid)s&amp;alpha=3%(nl)s"/></entry>'
                                    '<entry><title>Другие Символы</title><id>alpha:4</id><link type="application/atom+xml;profile=opds-catalog" href="%(modulepath)s?id=%(iid)s&amp;alpha=4%(nl)s"/></entry>'
                                    '<entry><title>Показать все</title><id>alpha:5</id><link type="application/atom+xml;profile=opds-catalog" href="%(modulepath)s?id=%(iid)s&amp;alpha=5%(nl)s"/></entry>'
                                    )
       self.document_page_control_start=''
       self.document_page_control_prev=('<link type="application/atom+xml;profile=opds-catalog;kind=navigation" rel="prev" title="Previous Page" href="%(modulepath)s?id=%(link_id)s&amp;page=%(page_prev)s" />'
       self.document_page_control_prev=('<link type="application/atom+xml;profile=opds-catalog" rel="prev" title="Previous Page" href="%(modulepath)s?id=%(link_id)s&amp;page=%(page_prev)s" />'
                               )
       self.document_page_control_next=('<link type="application/atom+xml;profile=opds-catalog;kind=navigation" rel="next" title="Next Page" href="%(modulepath)s?id=%(link_id)s&amp;page=%(page_next)s" />'
       self.document_page_control_next=('<link type="application/atom+xml;profile=opds-catalog" rel="next" title="Next Page" href="%(modulepath)s?id=%(link_id)s&amp;page=%(page_next)s" />'
                               )
       self.document_page_control_finish=''

@@ -148,7 +148,7 @@ class opdsTemplate():
                               '<updated>%(e_date)s</updated>'
                               '<id>id:%(e_id)s</id>')
       self.document_entry_nav_link=('<link type="application/atom+xml" rel="alternate" href="%(modulepath)s?id=%(link_id)s%(nl)s"/>'
                               '<link type="application/atom+xml;profile=opds-catalog" rel="subsection" href="%(modulepath)s?id=%(link_id)s%(nl)s"/>'
                               '<link type="application/atom+xml;profile=opds-catalog" href="%(modulepath)s?id=%(link_id)s%(nl)s"/>'
                               )
       self.document_entry_nav_info=('<content type="text">%(e_nav_info)s</content>')
       self.document_entry_nav_finish='</entry>>'