--- OSAS/OSA_system/OSAS_add.py 2005/01/20 13:40:08 1.41 +++ OSAS/OSA_system/OSAS_add.py 2005/02/10 16:17:18 1.44 @@ -18,6 +18,7 @@ import zLOG import xml.dom.minidom from time import localtime,strftime from Globals import package_home +from types import * import re def showHelp(helptext): @@ -117,6 +118,7 @@ def add3(self): metadata=parse_query_string(self.REQUEST['QUERY_STRING']) self.REQUEST.SESSION['metadata']=metadata vorschlag=[] + if metadata.has_key('author'): vorschlag.append(metadata['author'][:5]) if metadata.has_key('title'): @@ -200,13 +202,20 @@ def add6(self): newtemplate=PageTemplateFile('Products/OSA_system/zpt/index_meta').__of__(self) newtemplate.content_type="text/plain" renderxml = newtemplate(encode='utf-8') + + if self.REQUEST.SESSION.has_key('no_upload'): metapath=self.REQUEST.SESSION['path']+"/index.meta" else: metapath=self.add_metadata['archive-path']+"/"+self.add_metadata['folder_name']+"/index.meta" f=open(metapath,'w') - f.write(renderxml.encode('utf-8')) + try: + f.write(renderxml.encode('utf-8')) + except: + f.write(unicode(renderxml,'latin-1').encode('utf-8')) + #f.write(renderxml) + f.close() os.chmod(metapath,0664) os.popen('chmod -R 0775 %s'%self.add_metadata['archive-path']+"/"+self.add_metadata['folder_name'])