--- OSAS/OSA_system/OSAS_addfiles.py 2003/10/11 10:54:13 1.10 +++ OSAS/OSA_system/OSAS_addfiles.py 2004/01/29 10:19:38 1.15 @@ -184,10 +184,10 @@ 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 @@ -211,34 +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 #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): + 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,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+( @@ -339,7 +344,7 @@ class OSAS_combineTextImage(Folder): {'label':'Main Config','action':'combineTextImage_config'}, ) - + security.declarePublic('combineTextImage_config') def combineTextImage_config(self):