--- OSAS/OSA_system/OSAS_add.py	2005/01/20 13:38:02	1.40
+++ OSAS/OSA_system/OSAS_add.py	2005/01/21 17:56:16	1.43
@@ -14,6 +14,7 @@ from Products.PageTemplates.PageTemplate
 from Products.PageTemplates.PageTemplate import PageTemplate
 import string
 import urllib
+import zLOG
 import xml.dom.minidom
 from time import localtime,strftime
 from Globals import package_home
@@ -199,13 +200,19 @@ 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(renderxml)
+
 	f.close()
 	os.chmod(metapath,0664)
 	os.popen('chmod -R 0775 %s'%self.add_metadata['archive-path']+"/"+self.add_metadata['folder_name']) 
@@ -695,8 +702,12 @@ def combineTextImage2(self,path):
 	if self.REQUEST.has_key('image'): # falls bilder
 		path=re.sub('//','/',self.REQUEST['path']) # falls '//' im Pfad
 		dlpath = re.sub('/mpiwg/online/','',path)+"/"+self.REQUEST['image']
-		os.popen("ssh archive@nausikaa2.rz-berlin.mpg.de /usr/local/mpiwg/scripts/scaleomat -src=/mpiwg/online -dest=/mpiwg/temp/online/scaled/thumb -dir=%s -scaleto=90 -sync >> /tmp/sc.out &"%dlpath )
-	        #os.popen("ssh archive@nausikaa2.rz-berlin.mpg.de /usr/local/mpiwg/scripts/scaleomat.pl %s /mpiwg/temp/online/scaled/thumb 90 >> /tmp/sc.out &"% re.sub('/mpiwg/online/','',self.REQUEST['path']+"/"+self.REQUEST['image']))
+
+		zLOG.LOG('OSas',zLOG.INFO,"ssh archive@nausikaa2.rz-berlin.mpg.de /usr/local/mpiwg/scripts/scaleomat -src=/mpiwg/online -dest=/mpiwg/temp/online/scaled/thumb -dir=%s -scaleto=90 -sync >> /tmp/sc.out &"%dlpath )
+		ret=os.popen("ssh archive@nausikaa2.rz-berlin.mpg.de /usr/local/mpiwg/scripts/scaleomat -src=/mpiwg/online -dest=/mpiwg/temp/online/scaled/thumb -dir=%s -scaleto=90 -sync >> /tmp/sc.out &"%dlpath ).read()
+		zLOG.LOG('OSAS (combine)',zLOG.INFO,ret)
+
+
 
 	else: # falls keine Bilder (bug in reg.cgi info file ersetzen)
 		f=file("/tmp/tmp_info.xml","w")