From b5ae6f0d5156d51dc73f23bbd540c215d899fdca Mon Sep 17 00:00:00 2001
From: eric <eric@hellman.net>
Date: Wed, 14 Jan 2015 18:04:17 -0500
Subject: [PATCH] based on comments from Hadrien

---
 api/opds.py            | 17 +++++++++++++----
 api/templates/opds.xml |  6 ++++++
 2 files changed, 19 insertions(+), 4 deletions(-)

diff --git a/api/opds.py b/api/opds.py
index 7eec65be..1a4169c0 100644
--- a/api/opds.py
+++ b/api/opds.py
@@ -3,7 +3,7 @@ from itertools import islice
 from lxml import etree
 import datetime
 import urlparse
-import urllib
+from django.utils.http import urlquote
 
 import pytz
 
@@ -19,7 +19,7 @@ FORMAT_TO_MIMETYPE = {'pdf':"application/pdf",
                       'text':"text/html"}
 
 UNGLUEIT_URL= 'https://unglue.it'
-NAVIGATION = "application/atom+xml;profile=opds-catalog;kind=navigation"
+ACQUISITION = "application/atom+xml;profile=opds-catalog;kind=acquisition"
 FACET_RELATION = "http://opds-spec.org/facet"
 
 old_facets= ["creative_commons","active_campaigns"] 
@@ -45,6 +45,11 @@ def text_node(tag, text):
     node.text = text
     return node
 
+def html_node(tag, html):
+    node = text_node(tag, html)
+    node.attrib.update({"{http://www.w3.org/2005/Atom}type":'html'})
+    return node
+    
 def add_query_component(url, qc):
     """
     add component qc to the querystring of url
@@ -119,6 +124,9 @@ def work_node(work):
     #<dcterms:language>en</dcterms:language>
     node.append(text_node("{http://purl.org/dc/terms/}language", work.language))
     
+    # description
+    node.append(html_node("{http://www.w3.org/2005/Atom}content", work.description))
+    
     # identifiers
     if work.identifiers.filter(type='isbn'):
         for isbn in work.identifiers.filter(type='isbn')[0:9]:  #10 should be more than enough
@@ -131,6 +139,7 @@ def work_node(work):
             category_node = etree.Element("category")
             category_node.attrib["term"] = subject.name 
             node.append(category_node)
+            append_navlink(node, 'related', 'kw.'+ subject.name , 0, 'popular', title=subject.name)
             
     return node
 
@@ -260,8 +269,8 @@ def opds_feed_for_works(the_facet, page=None, order_by='newest'):
 def append_navlink(feed, rel, path, page, order_by, group=None, active=None , title=""):
     link = etree.Element("link")
     link.attrib.update({"rel":rel,
-             "href": UNGLUEIT_URL + "/api/opds/" + urllib.quote(path) + '/?order_by=' + order_by + ('&page=' + unicode(page) if page!=None else ''),
-             "type": NAVIGATION,
+             "href": UNGLUEIT_URL + "/api/opds/" + urlquote(path) + '/?order_by=' + order_by + ('&page=' + unicode(page) if page!=None else ''),
+             "type": ACQUISITION,
              "title": title,
             })
     if rel == FACET_RELATION:
diff --git a/api/templates/opds.xml b/api/templates/opds.xml
index 0cf621a5..3a55b357 100644
--- a/api/templates/opds.xml
+++ b/api/templates/opds.xml
@@ -10,6 +10,12 @@
     <uri>https://unglue.it/</uri>
   </author>
   <link rel="start" href="https://unglue.it{% url opds %}" type="application/atom+xml;profile=opds-catalog;kind=navigation" />
+    <link href="{{ feed.feed_path }}/?order_by=popular" 
+        rel="http://opds-spec.org/featured"
+        type="application/atom+xml;profile=opds-catalog;kind=acquisition" />
+    <link href="{{ feed.feed_path }}/?order_by=popular" 
+        rel="http://opds-spec.org/featured"
+        type="application/atom+xml;profile=opds-catalog;kind=acquisition" />
   <entry>
     <title>{{ feed.title }} - Popular</title>
     <id>https://unglue.it{% url opds_acqusition feed.feed_path %}?order_by=popular</id>