--- OSAS/OSA_system/OSAS_addfiles.py	2003/10/08 17:37:48	1.7
+++ OSAS/OSA_system/OSAS_addfiles.py	2003/10/09 09:57:50	1.9
@@ -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
@@ -30,7 +31,7 @@ class OSAS_add_Document(Folder):
     security.declarePublic('add_Document_config')
     def add_Document_config(self):
         """Main configuration"""
-        pt=PageTemplateFile('products/OSA_system/ChangeOSAS_addDocument.zpt').__of__(self)
+        pt=PageTemplateFile('Products/OSA_system/ChangeOSAS_addDocument.zpt').__of__(self)
         return pt()
     
     security.declarePublic('change_OSAS_add_Document')
@@ -79,7 +80,7 @@ class OSAS_add_Document(Folder):
     
 def manage_AddOSAS_add_DocumentForm(self):
     """interface for adding the OSAS_add_Metadata"""
-    pt=PageTemplateFile('products/OSA_system/AddOSAS_document.zpt').__of__(self)
+    pt=PageTemplateFile('Products/OSA_system/AddOSAS_document.zpt').__of__(self)
     return pt()
 
 def manage_AddOSAS_add_Document(self,id,RESPONSE=None):
@@ -112,7 +113,7 @@ class OSAS_add_Text(Folder):
     security.declarePublic('add_Text_config')
     def add_Text_config(self):
         """Main configuration"""
-        pt=PageTemplateFile('products/OSA_system/ChangeOSAS_addText.zpt').__of__(self)
+        pt=PageTemplateFile('Products/OSA_system/ChangeOSAS_addText.zpt').__of__(self)
         return pt()
     
     security.declarePublic('change_OSAS_add_Text')
@@ -131,7 +132,7 @@ class OSAS_add_Text(Folder):
         return OSAS_add.addText2(self)
 def manage_AddOSAS_add_TextForm(self):
     """interface for adding the OSAS_add_Metadata"""
-    pt=PageTemplateFile('products/OSA_system/AddOSAS_text.zpt').__of__(self)
+    pt=PageTemplateFile('Products/OSA_system/AddOSAS_text.zpt').__of__(self)
     return pt()
 
 def manage_AddOSAS_add_Text(self,id,RESPONSE=None):
@@ -208,21 +209,25 @@ 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!"
 
+        links=[path,'standard storage']
+        links=OSAS_show.readContexts(path) # auslesen von contexten für den link
+        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,credits):
         """Hinzufuegen der Resource"""
         splitted=path.split("/")
         
         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"""
 
         
@@ -241,7 +246,7 @@ class OSAS_add_contextData(Folder):
      
     def add_contextData_config(self):
         """Main configuration"""
-        pt=PageTemplateFile('products/OSA_system/ChangeOSAS_add_contextData.zpt').__of__(self)
+        pt=PageTemplateFile('Products/OSA_system/ChangeOSAS_add_contextData.zpt').__of__(self)
         return pt()
     
     
@@ -253,7 +258,7 @@ class OSAS_add_contextData(Folder):
             
 def manage_AddOSAS_add_contextDataForm(self):
     """interface for adding the OSAS_add_Metadata"""
-    pt=PageTemplateFile('products/OSA_system/AddOSAS_contextData.zpt').__of__(self)
+    pt=PageTemplateFile('Products/OSA_system/AddOSAS_contextData.zpt').__of__(self)
     return pt()
 
 def manage_AddOSAS_add_contextData(self,id,collection,RESPONSE=None):
@@ -285,7 +290,7 @@ class OSAS_add_Presentation(Folder):
     security.declarePublic('add_Presentation_config')
     def add_Presentation_config(self):
         """Main configuration"""
-        pt=PageTemplateFile('products/OSA_system/ChangeOSAS_addPresentation.zpt').__of__(self)
+        pt=PageTemplateFile('Products/OSA_system/ChangeOSAS_addPresentation.zpt').__of__(self)
         return pt()
     
     security.declarePublic('change_OSAS_add_Presentation')
@@ -305,7 +310,7 @@ class OSAS_add_Presentation(Folder):
     
 def manage_AddOSAS_add_PresentationForm(self):
     """interface for adding the OSAS_add_Metadata"""
-    pt=PageTemplateFile('products/OSA_system/AddOSAS_presentation.zpt').__of__(self)
+    pt=PageTemplateFile('Products/OSA_system/AddOSAS_presentation.zpt').__of__(self)
     return pt()
 
 def manage_AddOSAS_add_Presentation(self,id,RESPONSE=None):
@@ -337,7 +342,7 @@ class OSAS_combineTextImage(Folder):
     security.declarePublic('combineTextImage_config')
     def combineTextImage_config(self):
         """Main configuration"""
-        pt=PageTemplateFile('products/OSA_system/ChangeOSAS_combineTextImage.zpt').__of__(self)
+        pt=PageTemplateFile('Products/OSA_system/ChangeOSAS_combineTextImage.zpt').__of__(self)
         return pt()
     
     security.declarePublic('change_OSAS_combineTextImage')
@@ -362,7 +367,7 @@ class OSAS_combineTextImage(Folder):
 
         writeToContext(path,linkViewerEnvironment,"ECHO standard environment")
         
-        pt=PageTemplateFile('products/OSA_system/AddOSAS_combineTextImageFinal.zpt').__of__(self)
+        pt=PageTemplateFile('Products/OSA_system/AddOSAS_combineTextImageFinal.zpt').__of__(self)
 
         return pt()
 
@@ -393,7 +398,7 @@ def writeToContext(path,link,description
 
 def manage_AddOSAS_combineTextImageForm(self):
     """interface for adding the OSAS_add_Metadata"""
-    pt=PageTemplateFile('products/OSA_system/AddOSAS_combineTextImage.zpt').__of__(self)
+    pt=PageTemplateFile('Products/OSA_system/AddOSAS_combineTextImage.zpt').__of__(self)
     return pt()
 
 def manage_AddOSAS_combineTextImage(self,id,RESPONSE=None):