--- OSAS/OSA_system/OSAS_addfiles.py 2003/12/05 14:57:03 1.13 +++ OSAS/OSA_system/OSAS_addfiles.py 2004/02/29 23:02:22 1.16 @@ -211,18 +211,19 @@ 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 #print "LINK",links + #return 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,link,label,description,content_type,responsible,credits,weight): + 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" @@ -236,7 +237,7 @@ class OSAS_add_contextData(Folder): 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,weight,RESPONSE=None) + 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() @@ -343,7 +344,7 @@ class OSAS_combineTextImage(Folder): {'label':'Main Config','action':'combineTextImage_config'}, ) - + security.declarePublic('combineTextImage_config') def combineTextImage_config(self):