--- OSAS/OSA_system/OSAS_addfiles.py	2004/10/04 12:57:03	1.37
+++ OSAS/OSA_system/OSAS_addfiles.py	2005/01/21 18:10:45	1.39
@@ -248,7 +248,7 @@ 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):
@@ -273,9 +273,14 @@ 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)
@@ -350,8 +355,11 @@ class OSAS_add_contextData(Folder):
         params=urllib.urlencode({'id':id,'title':title,'link':link,'label':label,'description':description,'contentType':content_type,'responsible':responsible,'weight':weight,'credits':credits,'metalink':metalink})
 
 
-
-        retStr=urllib.urlopen(collection+"/addResource",params).read()
+        try:
+            retStr=urllib.urlopen(collection+"/addResource",params).read()
+        except:
+            return "An Error occured adding the resource\n", collection,params
+        
 	#print "added"
 	if not retStr:
             return "An Error occured adding the resource\n", collection,params
@@ -377,8 +385,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')