Changeset 18 for trunk

Timestamp:

11/29/09 17:58:55 (9 months ago)

Author:

guillaume

Message:

. Update API callbacks parameters (filename => docid, fileid => docid)
. Correct minor bug: if pagenum < 0 or pagenum >= pages

Location:

trunk/backend/python-wsgi

Files:

• . (moved) (moved from trunk/backoffice-pywsgi)
• dare-dare.wsgi (modified) (6 diffs)

trunk/backend/python-wsgi/dare-dare.wsgi

@@ -42 +42 @@
                 """
                 self.callbacks = {
-                        'open'  : (self.open    , ('!filename',)),
-                        'read'  : (self.read    , ('!fileid', '!pagenum', '?resolution')),
-                        'close' : (self.close   , ('!fileid',)),
+                        'open'  : (self.open    , ('!docid',)),
+                        'read'  : (self.read    , ('!docid', '!pagenum', '?resolution')),
+                        'close' : (self.close   , ('!docid',)),
                 }
 
@@ -98 +98 @@
                 return data
 
-        def open(self, fileid):
+        def open(self, docid):
                 """Open a new pdf document.
 
@@ -110 +110 @@
                 """
                 if '/' in fileid:
-                        return('400 Bad Request', [], ['"', fileid, '" contains invalid caracters'])
+                        return('400 Bad Request', [], ['"', fileid, '" contains invalid characters'])
                         
                 lgname = '/'.join((self.tempdir, fileid, 'src.pdf'))
@@ -128 +128 @@
                         [json.encode({'fileid': fileid, 'numpages': numpages, 'width': x, 'height': y})])
 
-        def read(self, fileid, pagenum, resolution=None):
+        def read(self, docid, pagenum, resolution=None):
                 """Read a page of an opened pdf document.
                         The result is return as a pdf image
@@ -157 +157 @@
                 pages = doc.get_n_pages()
 
-                if pagenum < 0 or pagenum > pages:
+                if pagenum < 0 or pagenum >= pages:
                         return('404 Not Found', [], ['pagenum out of bounds'])
 
@@ -206 +206 @@
                 )
 
-        def close(self, fileid):
+        def close(self, docid):
                 """Closing a document. 
                         We should remove the document temp directory and all associated files