--- OSAS/OSA_system/OSAS_addfiles.py	2004/07/01 07:46:42	1.35
+++ OSAS/OSA_system/OSAS_addfiles.py	2004/10/04 12:57:03	1.37
@@ -76,6 +76,7 @@ class OSAS_add_Document(Folder):
 
     def add4(self):
         """Applet"""
+	
         return OSAS_add.add4(self)
 
     def add5(self):
@@ -102,16 +103,19 @@ class OSAS_add_Document(Folder):
 	self.metadata=self.REQUEST.SESSION['metadata']
 	self.metadataprint=""
 	for tag in self.metadata.keys():
-		self.metadataprint=self.metadataprint+"<"+tag+">"+self.metadata[tag]+"</"+tag+">\n"
+            
+            #print str(self.metadata[tag]).decode('utf-8').encode('utf-8')
+            self.metadataprint=self.metadataprint+"<"+tag+">"+self.metadata[tag]+"</"+tag+">\n"
 
 	newtemplate=PageTemplateFile('Products/OSA_system/zpt/index_meta').__of__(self)
 	newtemplate.content_type="text/plain"
-	renderxml = newtemplate()
+	renderxml = newtemplate(encoding='utf-8')
+        #return renderxml
         metapath=self.REQUEST.SESSION['pathnew']+"/index.meta"
 	
-	
 	f=open(metapath,'w')
-	f.writelines(renderxml)
+
+	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']) 
@@ -138,12 +142,12 @@ class OSAS_add_Document(Folder):
 
 	newtemplate=PageTemplateFile('Products/OSA_system/zpt/index_meta').__of__(self)
 	newtemplate.content_type="text/plain"
-	renderxml = newtemplate()
+	renderxml = newtemplate(encoding='utf-8')
         metapath=self.REQUEST.SESSION['pathnew']+"/index.meta"
 	
 	
 	f=open(metapath,'w')
-	f.writelines(renderxml)
+	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']) 
@@ -247,7 +251,6 @@ class OSAS_add_contextData(Folder):
     def XmlToTree(self,URL):
         """Collection XML to Tree"""
         
-        
         class requestHandler(ContentHandler):
             def __init__(self):
                 self.depth=0
@@ -279,6 +282,7 @@ class OSAS_add_contextData(Folder):
 
             parser.parse(urllib.urlopen(URL))
             return curHandler.retStr
+
         except:
 	    return URL
             return urllib.urlopen(URL).read()
@@ -299,18 +303,16 @@ class OSAS_add_contextData(Folder):
                 
             def startElement(self,name,attrs):
                 if name=="partner":
-                    self.ret.append((attrs.get('id'),attrs.get('title')))
+                    self.ret.append((attrs.get('id'),attrs.get('title').encode('utf-8')))
 
 
         URL+="/getPartnersXML"
-            
-        try:
-            
-        	parser=make_parser()
-        	curHandler=requestHandler()
-	        parser.setContentHandler(curHandler)
-            
-        	parser.parse(urllib.urlopen(URL))
+        parser=make_parser()	
+	curHandler=requestHandler()
+        parser.setContentHandler(curHandler)
+	parser.parse(urllib.urlopen(URL))	        
+        try:	
+                  
 	        return curHandler.ret
         except:
         	return [("",URL)]
@@ -333,7 +335,7 @@ class OSAS_add_contextData(Folder):
         pt=PageTemplateFile('Products/OSA_system/zpt/contextDataMain.zpt').__of__(self)
         return pt()
     
-    
+   
     def addContextData2(self,path,collection,link,label,description,content_type,responsible,weight,credits=None):
         """Hinzufuegen der Resource"""
         splitted=path.split("/")
@@ -343,22 +345,25 @@ class OSAS_add_contextData(Folder):
         metalink=self.REQUEST['SERVER_URL']+path+"/index.meta"
         
         #link=TOBEDONE"
-        """Hinzufügen der Ressource"""
+        """Hinzufuegen der Ressource"""
 
         params=urllib.urlencode({'id':id,'title':title,'link':link,'label':label,'description':description,'contentType':content_type,'responsible':responsible,'weight':weight,'credits':credits,'metalink':metalink})
 
-        print params
-        
-        retStr=urllib.urlopen(collection+"/addResource",params).read()
 
+
+        retStr=urllib.urlopen(collection+"/addResource",params).read()
+	#print "added"
 	if not retStr:
-            return "An Error occured adding the resource\n"
+            return "An Error occured adding the resource\n", collection,params
 	
+        #print collection+"/"+id+"/copyIndex_meta2echo_resource"
 
-        print urllib.urlopen(collection+"/"+id+"/copyIndex_meta2echo_resource").read()
-        print urllib.urlopen(collection+"/"+id+"/generate_label").read()
-        print urllib.urlopen(collection+"/"+id+"/generate_title").read()
-
+        urllib.urlopen(collection+"/"+id+"/copyIndex_meta2echo_resource").read()
+	#print "copy2res"
+        urllib.urlopen(collection+"/"+id+"/generate_label").read()
+	#print "label"
+        urllib.urlopen(collection+"/"+id+"/generate_title").read()
+	#print "title"
         return self.REQUEST.RESPONSE.redirect(self.REQUEST['URL2']+'?path='+path)
         
     manage_options = Folder.manage_options+(
@@ -618,7 +623,7 @@ def writeToContext(path,link,description
     
     writefile=file(path+"/index.meta","w")
     #print path+"/index.meta"
-    writefile.write(dom.toxml().encode('utf-8'))
+    writefile.write(dom.toxml(encoding="UTF-8"))
     writefile.close()
 
 def manage_AddOSAS_combineTextImageForm(self):