--- ECHO_content/ECHO_collection.py	2005/01/21 16:28:58	1.204
+++ ECHO_content/ECHO_collection.py	2005/01/31 11:15:50	1.207
@@ -1304,7 +1304,7 @@ def manage_addECHO_resourceForm(self):
 
 
 
-def manage_addECHO_resource(self,id,title,label,description,responsible,link,metalink,weight,copyrightType=None,resourceID=None,contentType=None,renderingType=None,credits=None,coords=None,RESPONSE=None):
+def manage_addECHO_resource(self,id,title,label,description="",responsible="",link="",metalink="",weight="",copyrightType=None,resourceID=None,contentType=None,renderingType=None,credits=None,coords=None,RESPONSE=None):
     """addaresource"""
 
     newObj=ECHO_resource(id,link,metalink,resourceID,title,label,description,contentType,renderingType,copyrightType,responsible,credits,weight,coords)
@@ -1794,29 +1794,32 @@ class ECHO_collection(Folder, Persistent
         except:
             return ""
         
-    def getCollectionTreeXML(self):
+    def getCollectionTreeXML(self,pwstr=None):
         """Tree as XML"""
 
-	def addPassWd(str):
+	def addPassWd(str,pwstr=None):
 		"""adds a user/passwd to an url"""
-		txt2=re.sub(r"(http://)(.*?)","\g<1>www:3333@\g<2>",str)
+		if pwstr:
+			txt2=re.sub(r"(http://)(.*?)","\g<1>%s@\g<2>"%pwstr,str)
+		else:
+			txt2=re.sub(r"(http://)(.*?)","\g<1>www:3333@\g<2>",str)
 		return txt2
 
-        def getCollection(object,depth=0):
+        def getCollection(object,depth=0,pwstr=None):
             depth+=1
             collections=""
             for entry in object.__dict__.keys():
                 element=getattr(object,entry)
                 try:
                     if element.meta_type in ["ECHO_collection","ECHO_group"]:
-                        collections+="<element name=\""+urllib.quote(element.title)+"\" url=\""+addPassWd(element.absolute_url())+"\">"
+                        collections+="<element name=\""+urllib.quote(element.title)+"\" url=\""+addPassWd(element.absolute_url(),pwstr=pwstr)+"\">"
                         collections+=getCollection(element,depth)+"</element>\n"
                 except:
                     """nothing"""
             return collections
         
 	ret="""<?xml version="1.0" encoding="utf-8" ?>"""
-        return ret+"<collection>"+getCollection(self)+"</collection>"
+        return ret+"<collection>"+getCollection(self,pwstr=pwstr)+"</collection>"
     
     def createAllJSAreas(self):
         """create area calls for JavaScript"""
@@ -2056,7 +2059,7 @@ def manage_addECHO_collectionForm(self):
         return pt()
 
 
-def manage_addECHO_collection(self,id,title,label,description,contentType,responsible,weight,sortfield,coords="",secondaryLinkTitle="",secondaryLink="",credits=None,RESPONSE=None,imageTag="",bgcolour=""):
+def manage_addECHO_collection(self,id,title,label,description="",contentType="",responsible="",weight=0,sortfield="weight",coords="",secondaryLinkTitle="",secondaryLink="",credits=None,RESPONSE=None,imageTag="",bgcolour=""):
     """add a echo collection"""
     
 
@@ -2370,6 +2373,8 @@ class ECHO_root(Folder,Persistent,Implic
 
     def checkResource(self,id):
 	    """checks if a resource is in the tree, gives back none or list of resources"""
+	    splitted=id.split("/")
+	    id=splitted[len(splitted)-1]
 	    if hasattr(self,"_v_checkResource") and self._v_checkResource.has_key(id): #existiert ein cache und id ist bereits drin?
 			    return self._v_checkResource[id]