--- OSAS/OSA_system/OSAS_add.py	2004/10/04 15:52:32	1.37
+++ OSAS/OSA_system/OSAS_add.py	2005/02/10 16:17:18	1.44
@@ -14,9 +14,11 @@ 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
+from types import *
 
 import re
 def showHelp(helptext):
@@ -52,7 +54,7 @@ def getISO():
 
 		ret={}
 		for lineraw in f:
-			line=lineraw.encode('ascii','replace')
+			line=lineraw.encode('ascii','replace').strip()
 			value=string.split(line,'\t')[0].encode('ascii','replace')
 			key=string.split(line,'\t')[1].encode('ascii','replace')
 			ret[key]=value
@@ -116,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'):
@@ -173,7 +176,11 @@ def add4(self):
 	
 def add5(self):
 	"""ADD INDEX.META"""
-	os.chmod(self.REQUEST.SESSION['path'],0775)
+	try:
+		os.chmod(self.REQUEST.SESSION['path'],0775)
+	except:
+		pass
+
 	newtemplate=PageTemplateFile('Products/OSA_system/zpt/OSAS_add_metadata').__of__(self)
 	return newtemplate()
 
@@ -195,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)
+	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']) 
@@ -691,8 +705,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 -replace >> /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")