Skip to content

erp5
erp5
Commit b25c7e42 authored by Jérome Perrin's avatar Jérome Perrin
Browse files
Options

Make business template portable, from Klaus Wölfel 



git-svn-id: https://svn.erp5.org/repos/public/erp5/trunk@15717 20353a03-c40f-0410-a6d1-a30d3c3de9de
parent d02a534b
Show whitespace changes
Inline Side-by-side
Showing with 152 additions and 127 deletions
product/ERP5/Document/BusinessTemplate.py
View file @ b25c7e42
...@@ -74,9 +74,9 @@ from gzip import GzipFile ...@@ -74,9 +74,9 @@ from gzip import GzipFile
from xml.dom.minidom import parse from xml.dom.minidom import parse
from Products.CMFCore.Expression import Expression from Products.CMFCore.Expression import Expression
import tarfile import tarfile
from urllib import pathname2url, url2pathname from urllib import quote, unquote
from difflib import unified_diff from difflib import unified_diff
import posixpath
# those attributes from CatalogMethodTemplateItem are kept for # those attributes from CatalogMethodTemplateItem are kept for
# backward compatibility # backward compatibility
...@@ -226,20 +226,26 @@ class BusinessTemplateFolder(BusinessTemplateArchive): ...@@ -226,20 +226,26 @@ class BusinessTemplateFolder(BusinessTemplateArchive):
def addFolder(self, name=''): def addFolder(self, name=''):
if name !='': if name !='':
name = os.path.normpath(name)
path = os.path.join(self.path, name) path = os.path.join(self.path, name)
if not os.path.exists(path): if not os.path.exists(path):
os.makedirs(path) os.makedirs(path)
return path return path
def addObject(self, obj, name, path=None, ext='.xml'): def addObject(self, obj, name, path=None, ext='.xml'):
name = pathname2url(name) name = name.replace('\\', '/')
name = quote(name)
name = os.path.normpath(name)
if path is None: if path is None:
object_path = os.path.join(self.path, name) object_path = os.path.join(self.path, name)
else: else:
if '%' not in path: if '%' not in path:
path = pathname2url(path) tail, path = os.path.splitdrive(path)
path = path.replace('\\', '/')
path = tail + quote(path)
path = os.path.normpath(path)
object_path = os.path.join(path, name) object_path = os.path.join(path, name)
f = open(object_path+ext, 'wt') f = open(object_path+ext, 'wb')
f.write(str(obj)) f.write(str(obj))
f.close() f.close()
...@@ -258,12 +264,12 @@ class BusinessTemplateFolder(BusinessTemplateArchive): ...@@ -258,12 +264,12 @@ class BusinessTemplateFolder(BusinessTemplateArchive):
for file_path in self.file_list: for file_path in self.file_list:
if class_name in file_path.split(os.sep): if class_name in file_path.split(os.sep):
if os.path.isfile(file_path): if os.path.isfile(file_path):
file = open(file_path, 'r') file = open(file_path, 'rb')
# get object id # get object id
folders = file_path.split(os.sep) folders = file_path.split(os.sep)
file_name = string.join(folders[self.root_path_len:], os.sep) file_name = string.join(folders[self.root_path_len:], '/')
if '%' in file_name: if '%' in file_name:
file_name = url2pathname(file_name) file_name = unquote(file_name)
klass._importFile(file_name, file) klass._importFile(file_name, file)
# close file # close file
file.close() file.close()
...@@ -287,18 +293,24 @@ class BusinessTemplateTarball(BusinessTemplateArchive): ...@@ -287,18 +293,24 @@ class BusinessTemplateTarball(BusinessTemplateArchive):
self.tar = tarfile.open('', 'w:gz', self.fobj) self.tar = tarfile.open('', 'w:gz', self.fobj)
def addFolder(self, name=''): def addFolder(self, name=''):
name = os.path.normpath(name)
if not os.path.exists(name): if not os.path.exists(name):
os.makedirs(name) os.makedirs(name)
def addObject(self, obj, name, path=None, ext='.xml'): def addObject(self, obj, name, path=None, ext='.xml'):
name = pathname2url(name) name = name.replace('\\', '/')
name = quote(name)
name = os.path.normpath(name)
if path is None: if path is None:
object_path = os.path.join(self.path, name) object_path = os.path.join(self.path, name)
else: else:
if '%' not in path: if '%' not in path:
path = pathname2url(path) tail, path = os.path.splitdrive(path)
path = path.replace('\\', '/')
path = tail + quote(path)
path = os.path.normpath(path)
object_path = os.path.join(path, name) object_path = os.path.join(path, name)
f = open(object_path+ext, 'wt') f = open(object_path+ext, 'wb')
f.write(str(obj)) f.write(str(obj))
f.close() f.close()
...@@ -330,10 +342,10 @@ class BusinessTemplateTarball(BusinessTemplateArchive): ...@@ -330,10 +342,10 @@ class BusinessTemplateTarball(BusinessTemplateArchive):
file = tar.extractfile(info) file = tar.extractfile(info)
tar_file_name = info.name.startswith('./') and info.name[2:] or \ tar_file_name = info.name.startswith('./') and info.name[2:] or \
info.name info.name
folders = string.split(tar_file_name, os.sep) folders = string.split(tar_file_name, '/')
file_name = (os.sep).join(folders[2:]) file_name = ('/').join(folders[2:])
if '%' in file_name: if '%' in file_name:
file_name = url2pathname(file_name) file_name = unquote(file_name)
klass._importFile(file_name, file) klass._importFile(file_name, file)
file.close() file.close()
tar.close() tar.close()
...@@ -471,11 +483,11 @@ class ObjectTemplateItem(BaseTemplateItem): ...@@ -471,11 +483,11 @@ class ObjectTemplateItem(BaseTemplateItem):
for key in self._objects.keys(): for key in self._objects.keys():
obj = self._objects[key] obj = self._objects[key]
# create folder and subfolders # create folder and subfolders
folders, id = os.path.split(key) folders, id = posixpath.split(key)
encode_folders = [] encode_folders = []
for folder in folders.split('/'): for folder in folders.split('/'):
if '%' not in folder: if '%' not in folder:
encode_folders.append(pathname2url(folder)) encode_folders.append(quote(folder))
else: else:
encode_folders.append(folder) encode_folders.append(folder)
path = os.path.join(root_path, (os.sep).join(encode_folders)) path = os.path.join(root_path, (os.sep).join(encode_folders))
...@@ -1403,11 +1415,11 @@ class PortalTypeWorkflowChainTemplateItem(BaseTemplateItem): ...@@ -1403,11 +1415,11 @@ class PortalTypeWorkflowChainTemplateItem(BaseTemplateItem):
# XXX Not always a list # XXX Not always a list
if isinstance(workflow_list, str): if isinstance(workflow_list, str):
workflow_list = [workflow_list] workflow_list = [workflow_list]
xml_data += os.linesep+' <chain>' xml_data += '\n <chain>'
xml_data += os.linesep+' <type>%s</type>' %(key,) xml_data += '\n <type>%s</type>' %(key,)
xml_data += os.linesep+' <workflow>%s</workflow>' %(', '.join(workflow_list)) xml_data += '\n <workflow>%s</workflow>' %(', '.join(workflow_list))
xml_data += os.linesep+' </chain>' xml_data += '\n </chain>'
xml_data += os.linesep+'</workflow_chain>' xml_data += '\n</workflow_chain>'
return xml_data return xml_data
def export(self, context, bta, **kw): def export(self, context, bta, **kw):
...@@ -1547,11 +1559,11 @@ class PortalTypeAllowedContentTypeTemplateItem(BaseTemplateItem): ...@@ -1547,11 +1559,11 @@ class PortalTypeAllowedContentTypeTemplateItem(BaseTemplateItem):
keys.sort() keys.sort()
for key in keys: for key in keys:
allowed_list = dictio[key] allowed_list = dictio[key]
xml_data += os.linesep+' <portal_type id="%s">' %(key,) xml_data += '\n <portal_type id="%s">' %(key,)
for allowed_item in allowed_list: for allowed_item in allowed_list:
xml_data += os.linesep+' <item>%s</item>' %(allowed_item,) xml_data += '\n <item>%s</item>' %(allowed_item,)
xml_data += os.linesep+' </portal_type>' xml_data += '\n </portal_type>'
xml_data += os.linesep+'</%s>' %(self.xml_tag,) xml_data += '\n</%s>' %(self.xml_tag,)
return xml_data return xml_data
def export(self, context, bta, **kw): def export(self, context, bta, **kw):
...@@ -1592,7 +1604,7 @@ class PortalTypeAllowedContentTypeTemplateItem(BaseTemplateItem): ...@@ -1592,7 +1604,7 @@ class PortalTypeAllowedContentTypeTemplateItem(BaseTemplateItem):
return modified_object_list return modified_object_list
def _importFile(self, file_name, file): def _importFile(self, file_name, file):
path, name = os.path.split(file_name) path, name = posixpath.split(file_name)
id = string.split(name, '.')[0] id = string.split(name, '.')[0]
xml = parse(file) xml = parse(file)
portal_type_list = xml.getElementsByTagName('portal_type') portal_type_list = xml.getElementsByTagName('portal_type')
...@@ -1753,7 +1765,7 @@ class CatalogMethodTemplateItem(ObjectTemplateItem): ...@@ -1753,7 +1765,7 @@ class CatalogMethodTemplateItem(ObjectTemplateItem):
for key in self._objects.keys(): for key in self._objects.keys():
obj = self._objects[key] obj = self._objects[key]
# create folder and subfolders # create folder and subfolders
folders, id = os.path.split(key) folders, id = posixpath.split(key)
path = os.path.join(root_path, folders) path = os.path.join(root_path, folders)
bta.addFolder(name=path) bta.addFolder(name=path)
# export object in xml # export object in xml
...@@ -1764,32 +1776,32 @@ class CatalogMethodTemplateItem(ObjectTemplateItem): ...@@ -1764,32 +1776,32 @@ class CatalogMethodTemplateItem(ObjectTemplateItem):
method_id = obj.id method_id = obj.id
object_path = os.path.join(path, method_id+'.catalog_keys.xml') object_path = os.path.join(path, method_id+'.catalog_keys.xml')
f = open(object_path, 'wt') f = open(object_path, 'wb')
xml_data = '<catalog_method>' xml_data = '<catalog_method>'
for method_property, value in self._method_properties[method_id].items(): for method_property, value in self._method_properties[method_id].items():
xml_data += os.linesep+' <item key="%s" type="int">' %(method_property,) xml_data += '\n <item key="%s" type="int">' %(method_property,)
xml_data += os.linesep+' <value>%s</value>' %(value,) xml_data += '\n <value>%s</value>' %(value,)
xml_data += os.linesep+' </item>' xml_data += '\n </item>'
if catalog.filter_dict.has_key(method_id): if catalog.filter_dict.has_key(method_id):
if catalog.filter_dict[method_id]['filtered']: if catalog.filter_dict[method_id]['filtered']:
xml_data += os.linesep+' <item key="_is_filtered_archive" type="int">' xml_data += '\n <item key="_is_filtered_archive" type="int">'
xml_data += os.linesep+' <value>1</value>' xml_data += '\n <value>1</value>'
xml_data += os.linesep+' </item>' xml_data += '\n </item>'
for method in catalog_method_filter_list: for method in catalog_method_filter_list:
value = getattr(self, method, '')[method_id] value = getattr(self, method, '')[method_id]
if method != '_filter_expression_instance_archive': if method != '_filter_expression_instance_archive':
if type(value) in (type(''), type(u'')): if type(value) in (type(''), type(u'')):
xml_data += os.linesep+' <item key="%s" type="str">' %(method,) xml_data += '\n <item key="%s" type="str">' %(method,)
xml_data += os.linesep+' <value>%s</value>' %(str(value)) xml_data += '\n <value>%s</value>' %(str(value))
xml_data += os.linesep+' </item>' xml_data += '\n </item>'
elif type(value) in (type(()), type([])): elif type(value) in (type(()), type([])):
xml_data += os.linesep+' <item key="%s" type="tuple">'%(method) xml_data += '\n <item key="%s" type="tuple">'%(method)
for item in value: for item in value:
xml_data += os.linesep+' <value>%s</value>' %(str(item)) xml_data += '\n <value>%s</value>' %(str(item))
xml_data += os.linesep+' </item>' xml_data += '\n </item>'
xml_data += os.linesep+'</catalog_method>' xml_data += '\n</catalog_method>'
f.write(xml_data) f.write(xml_data)
f.close() f.close()
...@@ -1799,8 +1811,8 @@ class CatalogMethodTemplateItem(ObjectTemplateItem): ...@@ -1799,8 +1811,8 @@ class CatalogMethodTemplateItem(ObjectTemplateItem):
xml_data = '<key_list>' xml_data = '<key_list>'
obj.sort() obj.sort()
for key in obj: for key in obj:
xml_data += os.linesep+' <key>%s</key>' %(key) xml_data += '\n <key>%s</key>' %(key)
xml_data += os.linesep+'</key_list>' xml_data += '\n</key_list>'
return xml_data return xml_data
def install(self, context, trashbin, **kw): def install(self, context, trashbin, **kw):
...@@ -1956,7 +1968,7 @@ class CatalogMethodTemplateItem(ObjectTemplateItem): ...@@ -1956,7 +1968,7 @@ class CatalogMethodTemplateItem(ObjectTemplateItem):
self._objects[file_name[:-4]] = obj self._objects[file_name[:-4]] = obj
else: else:
# recreate data mapping specific to catalog method # recreate data mapping specific to catalog method
path, name = os.path.split(file_name) path, name = posixpath.split(file_name)
id = string.split(name, '.')[0] id = string.split(name, '.')[0]
xml = parse(file) xml = parse(file)
method_list = xml.getElementsByTagName('item') method_list = xml.getElementsByTagName('item')
...@@ -2026,8 +2038,8 @@ class ActionTemplateItem(ObjectTemplateItem): ...@@ -2026,8 +2038,8 @@ class ActionTemplateItem(ObjectTemplateItem):
obj = p.unrestrictedTraverse(relative_url) obj = p.unrestrictedTraverse(relative_url)
for ai in obj.listActions(): for ai in obj.listActions():
if getattr(ai, 'id') == value: if getattr(ai, 'id') == value:
url = os.path.split(relative_url) url = posixpath.split(relative_url)
key = os.path.join(url[-2], url[-1], value) key = posixpath.join(url[-2], url[-1], value)
action = ai._getCopy(context) action = ai._getCopy(context)
action = self.removeProperties(action) action = self.removeProperties(action)
self._objects[key] = action self._objects[key] = action
...@@ -2047,7 +2059,7 @@ class ActionTemplateItem(ObjectTemplateItem): ...@@ -2047,7 +2059,7 @@ class ActionTemplateItem(ObjectTemplateItem):
action = update_dict[id] action = update_dict[id]
if action == 'nothing': if action == 'nothing':
continue continue
path = id.split(os.sep) path = id.split('/')
obj = p.unrestrictedTraverse(path[:-1]) obj = p.unrestrictedTraverse(path[:-1])
action_list = obj.listActions() action_list = obj.listActions()
for index in range(len(action_list)): for index in range(len(action_list)):
...@@ -2184,21 +2196,21 @@ class PortalTypeRolesTemplateItem(BaseTemplateItem): ...@@ -2184,21 +2196,21 @@ class PortalTypeRolesTemplateItem(BaseTemplateItem):
type_role_list = self._objects[path] type_role_list = self._objects[path]
xml_data = '<type_roles>' xml_data = '<type_roles>'
for role in type_role_list: for role in type_role_list:
xml_data += os.linesep+" <role id='%s'>" % role['id'] xml_data += "\n <role id='%s'>" % role['id']
# uniq # uniq
for property in ('title', 'description', 'condition', 'priority', for property in ('title', 'description', 'condition', 'priority',
'base_category_script'): 'base_category_script'):
prop_value = role.get(property) prop_value = role.get(property)
if prop_value: if prop_value:
xml_data += os.linesep+" <property id='%s'>%s</property>" % \ xml_data += "\n <property id='%s'>%s</property>" % \
(property, prop_value) (property, prop_value)
# multi # multi
for property in ('category', 'base_category'): for property in ('category', 'base_category'):
for prop_value in role.get(property, []): for prop_value in role.get(property, []):
xml_data += os.linesep+" <multi_property "\ xml_data += "\n <multi_property "\
"id='%s'>%s</multi_property>" % (property, prop_value) "id='%s'>%s</multi_property>" % (property, prop_value)
xml_data += os.linesep+" </role>" xml_data += "\n </role>"
xml_data += os.linesep+'</type_roles>' xml_data += '\n</type_roles>'
return xml_data return xml_data
def export(self, context, bta, **kw): def export(self, context, bta, **kw):
...@@ -2318,7 +2330,7 @@ class SitePropertyTemplateItem(BaseTemplateItem): ...@@ -2318,7 +2330,7 @@ class SitePropertyTemplateItem(BaseTemplateItem):
action = update_dict[path] action = update_dict[path]
if action == 'nothing': if action == 'nothing':
continue continue
dir, id = os.path.split(path) dir, id = posixpath.split(path)
if p.hasProperty(id): if p.hasProperty(id):
continue continue
prop_type, property = self._objects[path] prop_type, property = self._objects[path]
...@@ -2350,18 +2362,18 @@ class SitePropertyTemplateItem(BaseTemplateItem): ...@@ -2350,18 +2362,18 @@ class SitePropertyTemplateItem(BaseTemplateItem):
def generateXml(self, path=None): def generateXml(self, path=None):
xml_data = '' xml_data = ''
prop_type, obj = self._objects[path] prop_type, obj = self._objects[path]
xml_data += os.linesep+' <property>' xml_data += '\n <property>'
xml_data += os.linesep+' <id>%s</id>' %(path,) xml_data += '\n <id>%s</id>' %(path,)
xml_data += os.linesep+' <type>%s</type>' %(prop_type,) xml_data += '\n <type>%s</type>' %(prop_type,)
if prop_type in ('lines', 'tokens'): if prop_type in ('lines', 'tokens'):
xml_data += os.linesep+' <value>' xml_data += '\n <value>'
for item in obj: for item in obj:
if item != '': if item != '':
xml_data += os.linesep+' <item>%s</item>' %(item,) xml_data += '\n <item>%s</item>' %(item,)
xml_data += os.linesep+' </value>' xml_data += '\n </value>'
else: else:
xml_data += os.linesep+' <value>%r</value>' %((os.linesep).join(obj),) xml_data += '\n <value>%r</value>' %(('\n').join(obj),)
xml_data += os.linesep+' </property>' xml_data += '\n </property>'
return xml_data return xml_data
def export(self, context, bta, **kw): def export(self, context, bta, **kw):
...@@ -2374,7 +2386,7 @@ class SitePropertyTemplateItem(BaseTemplateItem): ...@@ -2374,7 +2386,7 @@ class SitePropertyTemplateItem(BaseTemplateItem):
keys.sort() keys.sort()
for path in keys: for path in keys:
xml_data += self.generateXml(path) xml_data += self.generateXml(path)
xml_data += os.linesep+'</site_property>' xml_data += '\n</site_property>'
bta.addObject(obj=xml_data, name='properties', path=root_path) bta.addObject(obj=xml_data, name='properties', path=root_path)
class ModuleTemplateItem(BaseTemplateItem): class ModuleTemplateItem(BaseTemplateItem):
...@@ -2403,7 +2415,7 @@ class ModuleTemplateItem(BaseTemplateItem): ...@@ -2403,7 +2415,7 @@ class ModuleTemplateItem(BaseTemplateItem):
for key in keys: for key in keys:
if key =='permission_list': if key =='permission_list':
# separe permission dict into xml # separe permission dict into xml
xml_data += os.linesep+' <%s>' %(key,) xml_data += '\n <%s>' %(key,)
permission_list = dict[key] permission_list = dict[key]
for perm in permission_list: for perm in permission_list:
# the type of the permission defined if we use acquired or not # the type of the permission defined if we use acquired or not
...@@ -2411,17 +2423,17 @@ class ModuleTemplateItem(BaseTemplateItem): ...@@ -2411,17 +2423,17 @@ class ModuleTemplateItem(BaseTemplateItem):
ptype = "list" ptype = "list"
else: else:
ptype = "tuple" ptype = "tuple"
xml_data += os.linesep+" <permission type='%s'>" %(ptype,) xml_data += "\n <permission type='%s'>" %(ptype,)
xml_data += os.linesep+' <name>%s</name>' %(perm[0]) xml_data += '\n <name>%s</name>' %(perm[0])
role_list = list(perm[1]) role_list = list(perm[1])
role_list.sort() role_list.sort()
for role in role_list: for role in role_list:
xml_data += os.linesep+' <role>%s</role>' %(role) xml_data += '\n <role>%s</role>' %(role)
xml_data += os.linesep+' </permission>' xml_data += '\n </permission>'
xml_data += os.linesep+' </%s>' %(key,) xml_data += '\n </%s>' %(key,)
else: else:
xml_data += os.linesep+' <%s>%s</%s>' %(key, dict[key], key) xml_data += '\n <%s>%s</%s>' %(key, dict[key], key)
xml_data += os.linesep+'</module>' xml_data += '\n</module>'
return xml_data return xml_data
def export(self, context, bta, **kw): def export(self, context, bta, **kw):
...@@ -2452,7 +2464,7 @@ class ModuleTemplateItem(BaseTemplateItem): ...@@ -2452,7 +2464,7 @@ class ModuleTemplateItem(BaseTemplateItem):
if action == 'nothing': if action == 'nothing':
continue continue
mapping = items[id] mapping = items[id]
path, id = os.path.split(id) path, id = posixpath.split(id)
if id in portal.objectIds(): if id in portal.objectIds():
module = portal._getOb(id) module = portal._getOb(id)
module.portal_type = str(mapping['portal_type']) module.portal_type = str(mapping['portal_type'])
...@@ -2537,7 +2549,7 @@ class DocumentTemplateItem(BaseTemplateItem): ...@@ -2537,7 +2549,7 @@ class DocumentTemplateItem(BaseTemplateItem):
def build(self, context, **kw): def build(self, context, **kw):
BaseTemplateItem.build(self, context, **kw) BaseTemplateItem.build(self, context, **kw)
for id in self._archive.keys(): for id in self._archive.keys():
self._objects[self.__class__.__name__+os.sep+id] = globals()[self.local_file_reader_name](id) self._objects[self.__class__.__name__+'/'+id] = globals()[self.local_file_reader_name](id)
def preinstall(self, context, installed_bt, **kw): def preinstall(self, context, installed_bt, **kw):
modified_object_list = {} modified_object_list = {}
...@@ -2570,7 +2582,7 @@ class DocumentTemplateItem(BaseTemplateItem): ...@@ -2570,7 +2582,7 @@ class DocumentTemplateItem(BaseTemplateItem):
if action == 'nothing': if action == 'nothing':
continue continue
text = self._objects[id] text = self._objects[id]
path, name = os.path.split(id) path, name = posixpath.split(id)
# This raises an exception if the file already exists. # This raises an exception if the file already exists.
try: try:
globals()[self.local_file_writer_name](name, text, create=0) globals()[self.local_file_writer_name](name, text, create=0)
...@@ -2651,7 +2663,7 @@ class RoleTemplateItem(BaseTemplateItem): ...@@ -2651,7 +2663,7 @@ class RoleTemplateItem(BaseTemplateItem):
for key in self._archive.keys(): for key in self._archive.keys():
role_list.append(key) role_list.append(key)
if len(role_list) > 0: if len(role_list) > 0:
self._objects[self.__class__.__name__+os.sep+'role_list'] = role_list self._objects[self.__class__.__name__+'/'+'role_list'] = role_list
def preinstall(self, context, installed_bt, **kw): def preinstall(self, context, installed_bt, **kw):
modified_object_list = {} modified_object_list = {}
...@@ -2739,8 +2751,8 @@ class RoleTemplateItem(BaseTemplateItem): ...@@ -2739,8 +2751,8 @@ class RoleTemplateItem(BaseTemplateItem):
xml_data = '<role_list>' xml_data = '<role_list>'
obj.sort() obj.sort()
for role in obj: for role in obj:
xml_data += os.linesep+' <role>%s</role>' %(role) xml_data += '\n <role>%s</role>' %(role)
xml_data += os.linesep+'</role_list>' xml_data += '\n</role_list>'
return xml_data return xml_data
def export(self, context, bta, **kw): def export(self, context, bta, **kw):
...@@ -2767,7 +2779,7 @@ class CatalogResultKeyTemplateItem(BaseTemplateItem): ...@@ -2767,7 +2779,7 @@ class CatalogResultKeyTemplateItem(BaseTemplateItem):
else: else:
raise NotFound, 'Result key "%r" not found in catalog' %(key,) raise NotFound, 'Result key "%r" not found in catalog' %(key,)
if len(key_list) > 0: if len(key_list) > 0:
self._objects[self.__class__.__name__+os.sep+'result_key_list'] = key_list self._objects[self.__class__.__name__+'/'+'result_key_list'] = key_list
def _importFile(self, file_name, file): def _importFile(self, file_name, file):
list = [] list = []
...@@ -2830,8 +2842,8 @@ class CatalogResultKeyTemplateItem(BaseTemplateItem): ...@@ -2830,8 +2842,8 @@ class CatalogResultKeyTemplateItem(BaseTemplateItem):
xml_data = '<key_list>' xml_data = '<key_list>'
obj.sort() obj.sort()
for key in obj: for key in obj:
xml_data += os.linesep+' <key>%s</key>' %(key) xml_data += '\n <key>%s</key>' %(key)
xml_data += os.linesep+'</key_list>' xml_data += '\n</key_list>'
return xml_data return xml_data
def export(self, context, bta, **kw): def export(self, context, bta, **kw):
...@@ -2858,7 +2870,7 @@ class CatalogRelatedKeyTemplateItem(BaseTemplateItem): ...@@ -2858,7 +2870,7 @@ class CatalogRelatedKeyTemplateItem(BaseTemplateItem):
else: else:
raise NotFound, 'Related key "%r" not found in catalog' %(key,) raise NotFound, 'Related key "%r" not found in catalog' %(key,)
if len(key_list) > 0: if len(key_list) > 0:
self._objects[self.__class__.__name__+os.sep+'related_key_list'] = key_list self._objects[self.__class__.__name__+'/'+'related_key_list'] = key_list
def _importFile(self, file_name, file): def _importFile(self, file_name, file):
list = [] list = []
...@@ -2924,8 +2936,8 @@ class CatalogRelatedKeyTemplateItem(BaseTemplateItem): ...@@ -2924,8 +2936,8 @@ class CatalogRelatedKeyTemplateItem(BaseTemplateItem):
xml_data = '<key_list>' xml_data = '<key_list>'
obj.sort() obj.sort()
for key in obj: for key in obj:
xml_data += os.linesep+' <key>%s</key>' %(key) xml_data += '\n <key>%s</key>' %(key)
xml_data += os.linesep+'</key_list>' xml_data += '\n</key_list>'
return xml_data return xml_data
def export(self, context, bta, **kw): def export(self, context, bta, **kw):
...@@ -2952,7 +2964,7 @@ class CatalogResultTableTemplateItem(BaseTemplateItem): ...@@ -2952,7 +2964,7 @@ class CatalogResultTableTemplateItem(BaseTemplateItem):
else: else:
raise NotFound, 'Result table "%r" not found in catalog' %(key,) raise NotFound, 'Result table "%r" not found in catalog' %(key,)
if len(key_list) > 0: if len(key_list) > 0:
self._objects[self.__class__.__name__+os.sep+'result_table_list'] = key_list self._objects[self.__class__.__name__+'/'+'result_table_list'] = key_list
def _importFile(self, file_name, file): def _importFile(self, file_name, file):
list = [] list = []
...@@ -3015,8 +3027,8 @@ class CatalogResultTableTemplateItem(BaseTemplateItem): ...@@ -3015,8 +3027,8 @@ class CatalogResultTableTemplateItem(BaseTemplateItem):
xml_data = '<key_list>' xml_data = '<key_list>'
obj.sort() obj.sort()
for key in obj: for key in obj:
xml_data += os.linesep+' <key>%s</key>' %(key) xml_data += '\n <key>%s</key>' %(key)
xml_data += os.linesep+'</key_list>' xml_data += '\n</key_list>'
return xml_data return xml_data
def export(self, context, bta, **kw): def export(self, context, bta, **kw):
...@@ -3044,7 +3056,7 @@ class CatalogKeywordKeyTemplateItem(BaseTemplateItem): ...@@ -3044,7 +3056,7 @@ class CatalogKeywordKeyTemplateItem(BaseTemplateItem):
else: else:
raise NotFound, 'Keyword key "%r" not found in catalog' %(key,) raise NotFound, 'Keyword key "%r" not found in catalog' %(key,)
if len(key_list) > 0: if len(key_list) > 0:
self._objects[self.__class__.__name__+os.sep+'keyword_key_list'] = key_list self._objects[self.__class__.__name__+'/'+'keyword_key_list'] = key_list
def _importFile(self, file_name, file): def _importFile(self, file_name, file):
list = [] list = []
...@@ -3107,8 +3119,8 @@ class CatalogKeywordKeyTemplateItem(BaseTemplateItem): ...@@ -3107,8 +3119,8 @@ class CatalogKeywordKeyTemplateItem(BaseTemplateItem):
xml_data = '<key_list>' xml_data = '<key_list>'
obj.sort() obj.sort()
for key in obj: for key in obj:
xml_data += os.linesep+' <key>%s</key>' %(key) xml_data += '\n <key>%s</key>' %(key)
xml_data += os.linesep+'</key_list>' xml_data += '\n</key_list>'
return xml_data return xml_data
def export(self, context, bta, **kw): def export(self, context, bta, **kw):
...@@ -3136,7 +3148,7 @@ class CatalogFullTextKeyTemplateItem(BaseTemplateItem): ...@@ -3136,7 +3148,7 @@ class CatalogFullTextKeyTemplateItem(BaseTemplateItem):
else: else:
raise NotFound, 'Fulltext key "%r" not found in catalog' %(key,) raise NotFound, 'Fulltext key "%r" not found in catalog' %(key,)
if len(key_list) > 0: if len(key_list) > 0:
self._objects[self.__class__.__name__+os.sep+'full_text_key_list'] = key_list self._objects[self.__class__.__name__+'/'+'full_text_key_list'] = key_list
def _importFile(self, file_name, file): def _importFile(self, file_name, file):
list = [] list = []
...@@ -3199,8 +3211,8 @@ class CatalogFullTextKeyTemplateItem(BaseTemplateItem): ...@@ -3199,8 +3211,8 @@ class CatalogFullTextKeyTemplateItem(BaseTemplateItem):
xml_data = '<key_list>' xml_data = '<key_list>'
obj.sort() obj.sort()
for key in obj: for key in obj:
xml_data += os.linesep+' <key>%s</key>' %(key) xml_data += '\n <key>%s</key>' %(key)
xml_data += os.linesep+'</key_list>' xml_data += '\n</key_list>'
return xml_data return xml_data
def export(self, context, bta, **kw): def export(self, context, bta, **kw):
...@@ -3229,7 +3241,7 @@ class CatalogRequestKeyTemplateItem(BaseTemplateItem): ...@@ -3229,7 +3241,7 @@ class CatalogRequestKeyTemplateItem(BaseTemplateItem):
else: else:
raise NotFound, 'Request key "%r" not found in catalog' %(key,) raise NotFound, 'Request key "%r" not found in catalog' %(key,)
if len(key_list) > 0: if len(key_list) > 0:
self._objects[self.__class__.__name__+os.sep+'request_key_list'] = key_list self._objects[self.__class__.__name__+'/'+'request_key_list'] = key_list
def _importFile(self, file_name, file): def _importFile(self, file_name, file):
list = [] list = []
...@@ -3292,8 +3304,8 @@ class CatalogRequestKeyTemplateItem(BaseTemplateItem): ...@@ -3292,8 +3304,8 @@ class CatalogRequestKeyTemplateItem(BaseTemplateItem):
xml_data = '<key_list>' xml_data = '<key_list>'
obj.sort() obj.sort()
for key in obj: for key in obj:
xml_data += os.linesep+' <key>%s</key>' %(key) xml_data += '\n <key>%s</key>' %(key)
xml_data += os.linesep+'</key_list>' xml_data += '\n</key_list>'
return xml_data return xml_data
def export(self, context, bta, **kw): def export(self, context, bta, **kw):
...@@ -3321,7 +3333,7 @@ class CatalogMultivalueKeyTemplateItem(BaseTemplateItem): ...@@ -3321,7 +3333,7 @@ class CatalogMultivalueKeyTemplateItem(BaseTemplateItem):
else: else:
raise NotFound, 'Multivalue key "%r" not found in catalog' %(key,) raise NotFound, 'Multivalue key "%r" not found in catalog' %(key,)
if len(key_list) > 0: if len(key_list) > 0:
self._objects[self.__class__.__name__+os.sep+'multivalue_key_list'] = key_list self._objects[self.__class__.__name__+'/'+'multivalue_key_list'] = key_list
def _importFile(self, file_name, file): def _importFile(self, file_name, file):
list = [] list = []
...@@ -3383,8 +3395,8 @@ class CatalogMultivalueKeyTemplateItem(BaseTemplateItem): ...@@ -3383,8 +3395,8 @@ class CatalogMultivalueKeyTemplateItem(BaseTemplateItem):
xml_data = '<key_list>' xml_data = '<key_list>'
obj.sort() obj.sort()
for key in obj: for key in obj:
xml_data += os.linesep+' <key>%s</key>' %(key) xml_data += '\n <key>%s</key>' %(key)
xml_data += os.linesep+'</key_list>' xml_data += '\n</key_list>'
return xml_data return xml_data
def export(self, context, bta, **kw): def export(self, context, bta, **kw):
...@@ -3412,7 +3424,7 @@ class CatalogTopicKeyTemplateItem(BaseTemplateItem): ...@@ -3412,7 +3424,7 @@ class CatalogTopicKeyTemplateItem(BaseTemplateItem):
else: else:
raise NotFound, 'Topic key "%r" not found in catalog' %(key,) raise NotFound, 'Topic key "%r" not found in catalog' %(key,)
if len(key_list) > 0: if len(key_list) > 0:
self._objects[self.__class__.__name__+os.sep+'topic_key_list'] = key_list self._objects[self.__class__.__name__+'/'+'topic_key_list'] = key_list
def _importFile(self, file_name, file): def _importFile(self, file_name, file):
list = [] list = []
...@@ -3475,8 +3487,8 @@ class CatalogTopicKeyTemplateItem(BaseTemplateItem): ...@@ -3475,8 +3487,8 @@ class CatalogTopicKeyTemplateItem(BaseTemplateItem):
xml_data = '<key_list>' xml_data = '<key_list>'
obj.sort() obj.sort()
for key in obj: for key in obj:
xml_data += os.linesep+' <key>%s</key>' %(key) xml_data += '\n <key>%s</key>' %(key)
xml_data += os.linesep+'</key_list>' xml_data += '\n</key_list>'
return xml_data return xml_data
def export(self, context, bta, **kw): def export(self, context, bta, **kw):
...@@ -3498,7 +3510,7 @@ class MessageTranslationTemplateItem(BaseTemplateItem): ...@@ -3498,7 +3510,7 @@ class MessageTranslationTemplateItem(BaseTemplateItem):
else: # XXX backward compatibilty else: # XXX backward compatibilty
lang = lang_key lang = lang_key
catalog = 'erp5_ui' catalog = 'erp5_ui'
path = os.path.join(lang, catalog) path = posixpath.join(lang, catalog)
mc = localizer._getOb(catalog) mc = localizer._getOb(catalog)
self._objects[path] = mc.manage_export(lang) self._objects[path] = mc.manage_export(lang)
...@@ -3562,12 +3574,12 @@ class MessageTranslationTemplateItem(BaseTemplateItem): ...@@ -3562,12 +3574,12 @@ class MessageTranslationTemplateItem(BaseTemplateItem):
obj = self._objects[key] obj = self._objects[key]
path = os.path.join(root_path, key) path = os.path.join(root_path, key)
bta.addFolder(name=path) bta.addFolder(name=path)
f = open(path+os.sep+'translation.po', 'wt') f = open(path+os.sep+'translation.po', 'wb')
f.write(str(obj)) f.write(str(obj))
f.close() f.close()
def _importFile(self, file_name, file): def _importFile(self, file_name, file):
if os.path.split(file_name)[1] == 'translation.po': if posixpath.split(file_name)[1] == 'translation.po':
text = file.read() text = file.read()
self._objects[file_name[:-3]] = text self._objects[file_name[:-3]] = text
...@@ -3596,24 +3608,24 @@ class LocalRolesTemplateItem(BaseTemplateItem): ...@@ -3596,24 +3608,24 @@ class LocalRolesTemplateItem(BaseTemplateItem):
group_local_roles_keys.sort() group_local_roles_keys.sort()
# local roles # local roles
xml_data = '<local_roles_item>' xml_data = '<local_roles_item>'
xml_data += os.linesep+' <local_roles>' xml_data += '\n <local_roles>'
for key in local_roles_keys: for key in local_roles_keys:
xml_data += os.linesep+" <role id='%s'>" %(key,) xml_data += "\n <role id='%s'>" %(key,)
tuple = local_roles_dict[key] tuple = local_roles_dict[key]
for item in tuple: for item in tuple:
xml_data += os.linesep+" <item>%s</item>" %(item,) xml_data += "\n <item>%s</item>" %(item,)
xml_data += os.linesep+" </role>" xml_data += '\n </role>'
xml_data += os.linesep+' </local_roles>' xml_data += '\n </local_roles>'
# group local roles # group local roles
xml_data += os.linesep+' <group_local_roles>' xml_data += '\n <group_local_roles>'
for key in group_local_roles_keys: for key in group_local_roles_keys:
xml_data += os.linesep+" <role id='%s'>" %(key,) xml_data += "\n <role id='%s'>" %(key,)
tuple = group_local_roles_dict[key] tuple = group_local_roles_dict[key]
for item in tuple: for item in tuple:
xml_data += os.linesep+" <item>%s</item>" %(item,) xml_data += '\n <item>%s</item>' %(item,)
xml_data += os.linesep+" </role>" xml_data += '\n </role>'
xml_data += os.linesep+' </group_local_roles>' xml_data += '\n </group_local_roles>'
xml_data += os.linesep+'</local_roles_item>' xml_data += '\n</local_roles_item>'
return xml_data return xml_data
def export(self, context, bta, **kw): def export(self, context, bta, **kw):
...@@ -3624,11 +3636,11 @@ class LocalRolesTemplateItem(BaseTemplateItem): ...@@ -3624,11 +3636,11 @@ class LocalRolesTemplateItem(BaseTemplateItem):
for key in self._objects.keys(): for key in self._objects.keys():
xml_data = self.generateXml(key) xml_data = self.generateXml(key)
folders, id = os.path.split(key) folders, id = posixpath.split(key)
encode_folders = [] encode_folders = []
for folder in folders.split('/')[1:]: for folder in folders.split('/')[1:]:
if '%' not in folder: if '%' not in folder:
encode_folders.append(pathname2url(folder)) encode_folders.append(quote(folder))
else: else:
encode_folders.append(folder) encode_folders.append(folder)
path = os.path.join(root_path, (os.sep).join(encode_folders)) path = os.path.join(root_path, (os.sep).join(encode_folders))
...@@ -4480,7 +4492,7 @@ Business Template is a set of definitions, such as skins, portal types and categ ...@@ -4480,7 +4492,7 @@ Business Template is a set of definitions, such as skins, portal types and categ
if prop_type in ('text', 'string', 'int', 'boolean'): if prop_type in ('text', 'string', 'int', 'boolean'):
bta.addObject(obj=value, name=id, path=path+os.sep+'bt', ext='') bta.addObject(obj=value, name=id, path=path+os.sep+'bt', ext='')
elif prop_type in ('lines', 'tokens'): elif prop_type in ('lines', 'tokens'):
bta.addObject(obj=str(os.linesep).join(value), name=id, bta.addObject(obj=str('\n').join(value), name=id,
path=path+os.sep+'bt', ext='') path=path+os.sep+'bt', ext='')
# Export each part # Export each part
......
product/ERP5/Tool/TemplateTool.py
View file @ b25c7e42
...@@ -50,6 +50,7 @@ import re ...@@ -50,6 +50,7 @@ import re
from xml.dom.minidom import parse from xml.dom.minidom import parse
import struct import struct
import cPickle import cPickle
import posixpath
try: try:
from base64 import b64encode, b64decode from base64 import b64encode, b64decode
except ImportError: except ImportError:
...@@ -57,6 +58,10 @@ except ImportError: ...@@ -57,6 +58,10 @@ except ImportError:
from Products.ERP5Type.Message import Message from Products.ERP5Type.Message import Message
N_ = lambda msgid, **kw: Message('ui', msgid, **kw) N_ = lambda msgid, **kw: Message('ui', msgid, **kw)
WIN = False
if os.name == 'nt':
WIN = True
class BusinessTemplateUnknownError(Exception): class BusinessTemplateUnknownError(Exception):
""" Exception raised when the business template """ Exception raised when the business template
is impossible to find in the repositories is impossible to find in the repositories
...@@ -250,7 +255,7 @@ class TemplateTool (BaseTool): ...@@ -250,7 +255,7 @@ class TemplateTool (BaseTool):
""" """
Import template from a temp file (as uploaded by the user) Import template from a temp file (as uploaded by the user)
""" """
file = open(path, 'r') file = open(path, 'rb')
try: try:
# read magic key to determine wich kind of bt we use # read magic key to determine wich kind of bt we use
file.seek(0) file.seek(0)
...@@ -274,7 +279,7 @@ class TemplateTool (BaseTool): ...@@ -274,7 +279,7 @@ class TemplateTool (BaseTool):
for prop in bt.propertyMap(): for prop in bt.propertyMap():
prop_type = prop['type'] prop_type = prop['type']
pid = prop['id'] pid = prop['id']
prop_path = os.path.join(tar.members[0].name, 'bt', pid) prop_path = posixpath.join(tar.members[0].name, 'bt', pid)
try: try:
info = tar.getmember(prop_path) info = tar.getmember(prop_path)
except KeyError: except KeyError:
...@@ -284,11 +289,11 @@ class TemplateTool (BaseTool): ...@@ -284,11 +289,11 @@ class TemplateTool (BaseTool):
or prop_type == 'int': or prop_type == 'int':
prop_dict[pid] = value prop_dict[pid] = value
elif prop_type == 'lines' or prop_type == 'tokens': elif prop_type == 'lines' or prop_type == 'tokens':
prop_dict[pid[:-5]] = value.split(str(os.linesep)) prop_dict[pid[:-5]] = value.splitlines()
prop_dict.pop('id', '') prop_dict.pop('id', '')
bt.edit(**prop_dict) bt.edit(**prop_dict)
# import all other files from bt # import all other files from bt
fobj = open(path, 'r') fobj = open(path, 'rb')
try: try:
bt.importFile(file=fobj) bt.importFile(file=fobj)
finally: finally:
...@@ -326,8 +331,16 @@ class TemplateTool (BaseTool): ...@@ -326,8 +331,16 @@ class TemplateTool (BaseTool):
id = self.generateNewId() id = self.generateNewId()
urltype, name = splittype(url) urltype, name = splittype(url)
if os.path.isdir(name): # new version of business template in plain # Windows compatibility
# format (folder) if WIN:
if os.path.isdir(os.path.normpath(url)):
name = os.path.normpath(url)
elif os.path.isfile(os.path.normpath(url)):
url = 'file:///%s' %os.path.normpath(url)
# new version of business template in plain format (folder)
if os.path.isdir(os.path.normpath(name)):
name = os.path.normpath(name)
file_list = [] file_list = []
def callback(arg, directory, files): def callback(arg, directory, files):
if 'CVS' not in directory and '.svn' not in directory: # XXX: if 'CVS' not in directory and '.svn' not in directory: # XXX:
...@@ -350,11 +363,11 @@ class TemplateTool (BaseTool): ...@@ -350,11 +363,11 @@ class TemplateTool (BaseTool):
prop_path = os.path.join('.', bt_path, pid) prop_path = os.path.join('.', bt_path, pid)
if not os.path.exists(prop_path): if not os.path.exists(prop_path):
continue continue
value = open(prop_path, 'r').read() value = open(prop_path, 'rb').read()
if prop_type in ('text', 'string', 'int', 'boolean'): if prop_type in ('text', 'string', 'int', 'boolean'):
prop_dict[pid] = value prop_dict[pid] = value
elif prop_type in ('lines', 'tokens'): elif prop_type in ('lines', 'tokens'):
prop_dict[pid[:-5]] = value.split(str(os.linesep)) prop_dict[pid[:-5]] = value.splitlines()
prop_dict.pop('id', '') prop_dict.pop('id', '')
bt.edit(**prop_dict) bt.edit(**prop_dict)
# import all others objects # import all others objects
...@@ -397,7 +410,7 @@ class TemplateTool (BaseTool): ...@@ -397,7 +410,7 @@ class TemplateTool (BaseTool):
tempid, temppath = mkstemp() tempid, temppath = mkstemp()
try: try:
os.close(tempid) # Close the opened fd as soon as possible os.close(tempid) # Close the opened fd as soon as possible
tempfile = open(temppath, 'w') tempfile = open(temppath, 'wb')
try: try:
tempfile.write(import_file.read()) tempfile.write(import_file.read())
finally: finally:
......
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
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7