--- OSAS/OSA_system/OSAS_addfiles.py	2004/08/19 19:01:17	1.36
+++ OSAS/OSA_system/OSAS_addfiles.py	2005/01/21 17:31:48	1.38
@@ -76,6 +76,7 @@ class OSAS_add_Document(Folder):
 
     def add4(self):
         """Applet"""
+	
         return OSAS_add.add4(self)
 
     def add5(self):
@@ -247,10 +248,9 @@ class OSAS_add_contextData(Folder):
             
     meta_type='OSAS_add_contextData'    
 
-    def XmlToTree(self,URL):
+    def XmlToTree(self,URL,pwstr=None):
         """Collection XML to Tree"""
         
-        
         class requestHandler(ContentHandler):
             def __init__(self):
                 self.depth=0
@@ -273,15 +273,21 @@ class OSAS_add_contextData(Folder):
                 if name=="element":
                     self.depth-=1
 
-
+        if pwstr=="":
+            pwstr=None
+            
         try:
-            URL+="/getCollectionTreeXML"
+            if pwstr:
+                URL+="/getCollectionTreeXML?pwstr=%s"%pwstr    
+            else:
+                URL+="/getCollectionTreeXML"
             parser=make_parser()
             curHandler=requestHandler()
             parser.setContentHandler(curHandler)
 
             parser.parse(urllib.urlopen(URL))
             return curHandler.retStr
+
         except:
 	    return URL
             return urllib.urlopen(URL).read()
@@ -302,18 +308,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)]
@@ -336,7 +340,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("/")
@@ -346,22 +350,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+(
@@ -375,8 +382,9 @@ class OSAS_add_contextData(Folder):
         return pt()
     
     
-    def change_OSAS_add_contextData(self,collection,RESPONSE=None):
+    def change_OSAS_add_contextData(self,collection,pwstr=None,RESPONSE=None):
         """Change"""
+        self.pwstr=pwstr
         self.collection=collection
         if RESPONSE is not None:
             RESPONSE.redirect('manage_main')