Commit 751948b3 authored by Jérome Perrin's avatar Jérome Perrin

improve DAV export (sort cells for diff, fix the method signature)


git-svn-id: https://svn.erp5.org/repos/public/erp5/trunk@4670 20353a03-c40f-0410-a6d1-a30d3c3de9de
parent c0e30e10
...@@ -92,7 +92,7 @@ class PDFTk : ...@@ -92,7 +92,7 @@ class PDFTk :
out = self._getOutput( out = self._getOutput(
PDFTK_EXECUTABLE+ PDFTK_EXECUTABLE+
" %s fill_form %s output - "%( " %s fill_form %s output - flattern "%(
pdfFormFileName, fdfFormFileName)) pdfFormFileName, fdfFormFileName))
os.remove(fdfFormFileName) os.remove(fdfFormFileName)
os.remove(pdfFormFileName) os.remove(pdfFormFileName)
...@@ -162,7 +162,7 @@ class PDFTk : ...@@ -162,7 +162,7 @@ class PDFTk :
fdf = "%FDF-1.2\x0d%\xe2\xe3\xcf\xd3\x0d\x0a" fdf = "%FDF-1.2\x0d%\xe2\xe3\xcf\xd3\x0d\x0a"
fdf += "1 0 obj\x0d<< \x0d/FDF << /Fields [ " fdf += "1 0 obj\x0d<< \x0d/FDF << /Fields [ "
for key, value in values.items(): for key, value in values.items():
fdf += "<< /T (%s) /V (%s)>> \x0d" % ( fdf += "<< /T (%s) /V (%s) /ClrF 2 /ClrFf 1 >> \x0d" % (
self._escapeString(key), self._escapeString(key),
self._escapeString(value)) self._escapeString(value))
...@@ -301,7 +301,7 @@ class PDFForm(File): ...@@ -301,7 +301,7 @@ class PDFForm(File):
globals(), __name__='manage_cells') globals(), __name__='manage_cells')
security.declareProtected(Permissions.View, 'manage_FTPget') security.declareProtected(Permissions.View, 'manage_FTPget')
def manage_FTPget(self, REQUEST, RESPONSE) : def manage_FTPget(self, REQUEST=None, RESPONSE=None) :
""" get this pdf form via webDAV/FTP, it returns an XML """ get this pdf form via webDAV/FTP, it returns an XML
representation of all the fields, then the pdf itself.""" representation of all the fields, then the pdf itself."""
from xml.dom.minidom import getDOMImplementation from xml.dom.minidom import getDOMImplementation
...@@ -309,7 +309,9 @@ class PDFForm(File): ...@@ -309,7 +309,9 @@ class PDFForm(File):
newdoc = impl.createDocument(None, "pdfform", None) newdoc = impl.createDocument(None, "pdfform", None)
top_element = newdoc.documentElement top_element = newdoc.documentElement
cells = newdoc.createElement('cells') cells = newdoc.createElement('cells')
for cell in self.cells.keys() : pdfform_cell_list = self.cells.keys()
pdfform_cell_list.sort()
for cell in pdfform_cell_list :
cell_node = newdoc.createElement('cell') cell_node = newdoc.createElement('cell')
cell_node.setAttribute('name', cell) cell_node.setAttribute('name', cell)
tales = newdoc.createTextNode(self.cells[cell]) tales = newdoc.createTextNode(self.cells[cell])
...@@ -322,9 +324,11 @@ class PDFForm(File): ...@@ -322,9 +324,11 @@ class PDFForm(File):
pdf_data.appendChild(pdf_content) pdf_data.appendChild(pdf_content)
top_element.appendChild(pdf_data) top_element.appendChild(pdf_data)
content = newdoc.toprettyxml(' ') content = newdoc.toprettyxml(' ')
RESPONSE.setHeader('Content-Type', 'application/x-erp5-pdfform') if RESPONSE :
RESPONSE.setHeader('Content-Length', len(content)) RESPONSE.setHeader('Content-Type', 'application/x-erp5-pdfform')
RESPONSE.write(content) RESPONSE.setHeader('Content-Length', len(content))
RESPONSE.write(content)
return content
manage_DAVget = manage_FTPget manage_DAVget = manage_FTPget
security.declareProtected(Permissions.ManagePortal, 'PUT') security.declareProtected(Permissions.ManagePortal, 'PUT')
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment