Added "merge_url" to document meta-data.

[redakcja.git] / apps / api / handlers / library_handlers.py

diff --git a/apps/api/handlers/library_handlers.py b/apps/api/handlers/library_handlers.py
index 0ad23d9..d2c6ec3 100644 (file)
--- a/apps/api/handlers/library_handlers.py
+++ b/apps/api/handlers/library_handlers.py
@@ -6,21 +6,24 @@ __doc__ = "Module documentation."
 
 from piston.handler import BaseHandler, AnonymousBaseHandler
 
 
 from piston.handler import BaseHandler, AnonymousBaseHandler
 

-
-import librarian
-import librarian.html
-import api.forms as forms
+import re

 from datetime import date
 
 from django.core.urlresolvers import reverse
 from datetime import date
 
 from django.core.urlresolvers import reverse

+from django.utils import simplejson as json

 
 

-from wlrepo import RevisionNotFound, LibraryException, DocumentAlreadyExists
+import librarian
+import librarian.html

 from librarian import dcparser
 
 from librarian import dcparser
 

+from wlrepo import RevisionNotFound, LibraryException, DocumentAlreadyExists
+from explorer.models import PullRequest
+
+# internal imports
+import api.forms as forms

 import api.response as response
 from api.utils import validate_form, hglibrary
 import api.response as response
 from api.utils import validate_form, hglibrary

-
-from explorer.models import PullRequest
+from api.models import PartCache

 
 #
 # Document List Handlers
 
 #
 # Document List Handlers


@@ -46,11 +49,35 @@ class LibraryHandler(BaseHandler):
     def read(self, request, lib):
         """Return the list of documents."""
 
     def read(self, request, lib):
         """Return the list of documents."""
 

-        document_list = [{
-            'url': reverse('document_view', args=[docid]),
-            'name': docid } for docid in lib.documents() ]
-
-        return {'documents' : document_list }        
+        documents = {}
+        
+        for docid in lib.documents():
+            docid = docid.decode('utf-8')
+            documents[docid] = {
+                'url': reverse('document_view', args=[docid]),
+                'name': docid,
+                'parts': []
+            }
+
+        parts = PartCache.objects.defer('part_id')\
+            .values_list('part_id', 'document_id').distinct()
+       
+        document_tree = dict(documents)
+
+        for part, docid in parts:
+            # this way, we won't display broken links
+            if not documents.has_key(part):
+                print "NOT FOUND:", part
+                continue
+
+            parent = documents[docid]
+            child = documents[part]
+
+            # not top-level anymore
+            document_tree.pop(part)
+            parent['parts'].append(child)
+            
+        return {'documents': sorted(document_tree.values()) }

 
     @validate_form(forms.DocumentUploadForm, 'POST')
     @hglibrary
 
     @validate_form(forms.DocumentUploadForm, 'POST')
     @hglibrary


@@ -147,6 +174,7 @@ class DocumentHandler(BaseHandler):
             'html_url': reverse('dochtml_view', args=[udoc.id,udoc.revision]),
             'text_url': reverse('doctext_view', args=[udoc.id,udoc.revision]),
             'dc_url': reverse('docdc_view', args=[udoc.id,udoc.revision]),
             'html_url': reverse('dochtml_view', args=[udoc.id,udoc.revision]),
             'text_url': reverse('doctext_view', args=[udoc.id,udoc.revision]),
             'dc_url': reverse('docdc_view', args=[udoc.id,udoc.revision]),

+            #'gallery_url': reverse('docdc_view', args=[udoc.id,udoc.revision]),

             'user_revision': udoc.revision,
             'public_revision': doc.revision,            
         }       
             'user_revision': udoc.revision,
             'public_revision': doc.revision,            
         }       


@@ -160,7 +188,6 @@ class DocumentHandler(BaseHandler):
 #
 #
 #
 #
 #
 #

-

 class DocumentHTMLHandler(BaseHandler):
     allowed_methods = ('GET', 'PUT')
 
 class DocumentHTMLHandler(BaseHandler):
     allowed_methods = ('GET', 'PUT')
 


@@ -180,6 +207,11 @@ class DocumentHTMLHandler(BaseHandler):
 #
 # Document Text View
 #
 #
 # Document Text View
 #

+
+XINCLUDE_REGEXP = r"""<(?:\w+:)?include\s+[^>]*?href=("|')wlrepo://(?P<link>[^\1]+?)\1\s*[^>]*?>"""
+#
+#
+#

 class DocumentTextHandler(BaseHandler):
     allowed_methods = ('GET', 'PUT')
 
 class DocumentTextHandler(BaseHandler):
     allowed_methods = ('GET', 'PUT')
 


@@ -216,21 +248,57 @@ class DocumentTextHandler(BaseHandler):
                         "provided_revision": orig.revision,
                         "latest_revision": current.revision })
 
                         "provided_revision": orig.revision,
                         "latest_revision": current.revision })
 

-            ndoc = current.quickwrite('xml', data, msg)
+            # try to find any Xinclude tags
+            includes = [m.groupdict()['link'] for m in (re.finditer(\
+                XINCLUDE_REGEXP, data, flags=re.UNICODE) or []) ]
+
+            print "INCLUDES: ", includes
+
+            # TODO: provide useful routines to make this simpler
+            def xml_update_action(lib, resolve):
+                try:
+                    f = lib._fileopen(resolve('parts'), 'r')
+                    stored_includes = json.loads(f.read())
+                    f.close()
+                except:
+                    stored_includes = []
+                
+                if stored_includes != includes:
+                    f = lib._fileopen(resolve('parts'), 'w+')
+                    f.write(json.dumps(includes))
+                    f.close()
+
+                    lib._fileadd(resolve('parts'))
+
+                    # update the parts cache
+                    PartCache.update_cache(docid, current.owner,\
+                        stored_includes, includes)
+
+                # now that the parts are ok, write xml
+                f = lib._fileopen(resolve('xml'), 'w+')
+                f.write(data.encode('utf-8'))
+                f.close()
+
+            ndoc = None
+            ndoc = current.invoke_and_commit(\
+                xml_update_action, lambda d: (msg, current.owner) )

 
             try:
                 # return the new revision number
 
             try:
                 # return the new revision number

-                return {
+                return response.SuccessAllOk().django_response({

                     "document": ndoc.id,
                     "subview": "xml",
                     "previous_revision": current.revision,
                     "document": ndoc.id,
                     "subview": "xml",
                     "previous_revision": current.revision,

-                    "updated_revision": ndoc.revision
-                }
+                    "updated_revision": ndoc.revision,
+                    "url": reverse("doctext_view", args=[ndoc.id, ndoc.revision])
+                })

             except Exception, e:
             except Exception, e:

-                lib._rollback()
+                if ndoc: lib._rollback()

                 raise e        
         except RevisionNotFound, e:
                 raise e        
         except RevisionNotFound, e:

-            return response.EntityNotFound().django_response(e)
+            return response.EntityNotFound(mimetype="text/plain").\
+                django_response(e.message)
+

 
 #
 # Dublin Core handlers
 
 #
 # Dublin Core handlers


@@ -286,10 +354,11 @@ class DocumentDublinCoreHandler(BaseHandler):
                     "document": ndoc.id,
                     "subview": "dc",
                     "previous_revision": current.revision,
                     "document": ndoc.id,
                     "subview": "dc",
                     "previous_revision": current.revision,

-                    "updated_revision": ndoc.revision
+                    "updated_revision": ndoc.revision,
+                    "url": reverse("docdc_view", args=[ndoc.id, ndoc.revision])

                 }
             except Exception, e:
                 }
             except Exception, e:

-                lib._rollback()
+                if ndoc: lib._rollback()

                 raise e
         except RevisionNotFound:
             return response.EntityNotFound().django_response()
                 raise e
         except RevisionNotFound:
             return response.EntityNotFound().django_response()


@@ -351,12 +420,12 @@ class MergeHandler(BaseHandler):
                 ticket_status=prq.status, \
                 ticket_uri=reverse("pullrequest_view", args=[prq.id]) )
 
                 ticket_status=prq.status, \
                 ticket_uri=reverse("pullrequest_view", args=[prq.id]) )
 

-        if form.cleanded_data['type'] == 'update':
+        if form.cleaned_data['type'] == 'update':

             # update is always performed from the file branch
             # to the user branch
             success, changed = udoc.update(request.user.username)
 
             # update is always performed from the file branch
             # to the user branch
             success, changed = udoc.update(request.user.username)
 

-        if form.cleanded_data['type'] == 'share':
+        if form.cleaned_data['type'] == 'share':

             success, changed = udoc.share(form.cleaned_data['comment'])
 
         if not success:
             success, changed = udoc.share(form.cleaned_data['comment'])
 
         if not success:


@@ -372,4 +441,4 @@ class MergeHandler(BaseHandler):
             "parent_user_resivion": udoc.revision,
             "parent_revision": doc.revision,
             "revision": udoc.revision,
             "parent_user_resivion": udoc.revision,
             "parent_revision": doc.revision,
             "revision": udoc.revision,

-        })
\ No newline at end of file
+        })