--- OSAS/OSA_system/OSAS_addfiles.py 2003/10/09 09:57:50 1.9
+++ OSAS/OSA_system/OSAS_addfiles.py 2004/03/03 13:02:54 1.17
@@ -31,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/zpt/ChangeOSAS_addDocument.zpt').__of__(self)
return pt()
security.declarePublic('change_OSAS_add_Document')
@@ -80,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/zpt/AddOSAS_document.zpt').__of__(self)
return pt()
def manage_AddOSAS_add_Document(self,id,RESPONSE=None):
@@ -113,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/zpt/ChangeOSAS_addText.zpt').__of__(self)
return pt()
security.declarePublic('change_OSAS_add_Text')
@@ -132,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/zpt/AddOSAS_text.zpt').__of__(self)
return pt()
def manage_AddOSAS_add_Text(self,id,RESPONSE=None):
@@ -184,20 +184,20 @@ class OSAS_add_contextData(Folder):
if depth < enddepth:
tmp=tmp+spaces(depth)
- tmp= tmp+retLink(child[1])+"
"+self.printChilds(child[1],depth,items,enddepth)+"
"
+ tmp= tmp+retLink(child[1])+"
"+self.printChilds(child[1],depth,items,enddepth)
else:
tmp=tmp+spaces(2*depth)
- tmp = tmp+retLink(child[1])+"
"
+ 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
@@ -211,32 +211,39 @@ class OSAS_add_contextData(Folder):
urllib.urlopen(self.REQUEST['SERVER_URL']+path+"/index.meta")
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
+ links=[(path,'standard storage')]
+
+ links+=OSAS_show.readContexts(path) # auslesen von contexten für den link
+ #print "LINK",links
+ #return links
self.REQUEST.SESSION['links']=links
- pt=PageTemplateFile('Products/OSA_system/contextDataMain.zpt').__of__(self)
+ pt=PageTemplateFile('Products/OSA_system/zpt/contextDataMain.zpt').__of__(self)
return pt()
- def addContextData2(self,path,collection,context,science,practice,source_type,period,link,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"
"""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,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+(
@@ -246,7 +253,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/zpt/ChangeOSAS_add_contextData.zpt').__of__(self)
return pt()
@@ -258,7 +265,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/zpt/AddOSAS_contextData.zpt').__of__(self)
return pt()
def manage_AddOSAS_add_contextData(self,id,collection,RESPONSE=None):
@@ -290,7 +297,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/zpt/ChangeOSAS_addPresentation.zpt').__of__(self)
return pt()
security.declarePublic('change_OSAS_add_Presentation')
@@ -310,7 +317,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/zpt/AddOSAS_presentation.zpt').__of__(self)
return pt()
def manage_AddOSAS_add_Presentation(self,id,RESPONSE=None):
@@ -337,12 +344,12 @@ class OSAS_combineTextImage(Folder):
{'label':'Main Config','action':'combineTextImage_config'},
)
-
+
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/zpt/ChangeOSAS_combineTextImage.zpt').__of__(self)
return pt()
security.declarePublic('change_OSAS_combineTextImage')
@@ -367,7 +374,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/zpt/AddOSAS_combineTextImageFinal.zpt').__of__(self)
return pt()
@@ -398,7 +405,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/zpt/AddOSAS_combineTextImage.zpt').__of__(self)
return pt()
def manage_AddOSAS_combineTextImage(self,id,RESPONSE=None):