--- OSAS/OSA_system/OSAS_addfiles.py	2003/10/09 08:27:16	1.8
+++ OSAS/OSA_system/OSAS_addfiles.py	2004/01/21 07:43:01	1.14
@@ -4,6 +4,7 @@ import xml.dom.minidom
 from Products.ECHO_content import ECHO_collection
 import urllib
 import OSAS_add
+import OSAS_show
 import string
 from OFS.Folder import Folder
 from AccessControl import ClassSecurityInfo
@@ -183,20 +184,20 @@ class OSAS_add_contextData(Folder):
             if depth < enddepth:
                 tmp=tmp+spaces(depth)
                 
-                tmp= tmp+retLink(child[1])+"<br>"+self.printChilds(child[1],depth,items,enddepth)+"<br>"
+                tmp= tmp+retLink(child[1])+"<br>"+self.printChilds(child[1],depth,items,enddepth)
             else:
                 tmp=tmp+spaces(2*depth)
-                tmp = tmp+retLink(child[1])+"<br>"
+                tmp = tmp+retLink(child[1])
 
         return tmp
                     
-    def generateTree(self,depth=3):
+    def generateTree(self,depth=10):
         """Erzeugt HTML-Tree der Collection"""
     
         exec("items=self.getPhysicalRoot()."+self.collection+".getCollectionTree()")
         #print items[0][0]
 
-        childs=self.printChilds(items[0][0],0,items,3)
+        childs=self.printChilds(items[0][0],0,items,depth)
         
         return childs
 
@@ -208,30 +209,40 @@ class OSAS_add_contextData(Folder):
         """Hinzufügen zu einer Sammlung"""
         try:
             urllib.urlopen(self.REQUEST['SERVER_URL']+path+"/index.meta")
-            pt=PageTemplateFile('Products/OSA_system/contextDataMain.zpt').__of__(self)
-            return pt()
+            
         except:
-            return "index.meta file has to exist!"
+            return self.REQUEST['SERVER_URL']+path+"/index.meta file has to exist!"
 
+        links=[(path,'standard storage')]
+        
+        links+=OSAS_show.readContexts(path) # auslesen von contexten für den link
+        #print "LINK",links
+        self.REQUEST.SESSION['links']=links
+        pt=PageTemplateFile('Products/OSA_system/contextDataMain.zpt').__of__(self)
+        return pt()
     
     
-    def addContextData2(self,path,collection,context,science,practice,source_type,period,label,description,content_type,responsible,credits):
+    def addContextData2(self,path,collection,context,science,practice,source_type,period,link,label,description,content_type,responsible,weight,credits=None):
         """Hinzufuegen der Resource"""
         splitted=path.split("/")
-        
+        #print "BLU"
         id=splitted[len(splitted)-1]
         title=splitted[len(splitted)-1]
         metalink=self.REQUEST['SERVER_URL']+path+"/index.meta"
-        link="TOBEDONE"
+        
+        #link=TOBEDONE"
         """Hinzufügen der Ressource"""
 
         
         exec("collection_object=self"+collection)
         
-        ECHO_collection.manage_AddECHO_resource(collection_object,context,science,practice,source_type,period,id,title,label,description,content_type,responsible,link,metalink,credits,RESPONSE=None)
-
-        getattr(collection_object,id).ECHO_getResourceMD()
-
+        ECHO_collection.manage_AddECHO_resource(collection_object,context,science,practice,source_type,period,id,title,label,description,content_type,responsible,link,metalink,credits,weight,RESPONSE=None)
+        #print "HI5"
+        try:
+            getattr(collection_object,id).ECHO_getResourceMD()
+        except:
+            """nothing"""
+        #return "BLUByy"
         return self.REQUEST.RESPONSE.redirect(self.REQUEST['URL2']+'?path='+path)
         
     manage_options = Folder.manage_options+(