--- OSAS/OSA_system/OSAS_addfiles.py 2004/04/15 12:56:41 1.28 +++ OSAS/OSA_system/OSAS_addfiles.py 2004/04/16 07:52:00 1.30 @@ -92,9 +92,9 @@ class OSAS_add_Document(Folder): metadata['archive-creation-date']=OSAS_add.date(self) metadata['creator']=self.REQUEST['creator'] metadata['description']=self.REQUEST['content_description'] - metadata['archive-path']=os.path.split(self.REQUEST.SESSION['path'])[0] + metadata['archive-path']=os.path.split(self.REQUEST.SESSION['pathnew'])[0] #metadata['folder_name']=self.REQUEST.SESSION['folder_name'] - metadata['folder_name']=os.path.split(self.REQUEST.SESSION['path'])[1] + metadata['folder_name']=os.path.split(self.REQUEST.SESSION['pathnew'])[1] metadata['content-type']="fulltext document" self.reftype=self.REQUEST.SESSION['reftype'] self.REQUEST.SESSION['add_metadata']=metadata @@ -107,7 +107,7 @@ class OSAS_add_Document(Folder): newtemplate=PageTemplateFile('Products/OSA_system/zpt/index_meta').__of__(self) newtemplate.content_type="text/plain" renderxml = newtemplate() - metapath=self.REQUEST.SESSION['path']+"/index.meta" + metapath=self.REQUEST.SESSION['pathnew']+"/index.meta" f=open(metapath,'w') @@ -305,22 +305,13 @@ class OSAS_add_contextData(Folder): params=urllib.urlencode({'id':id,'title':title,'link':link,'label':label,'description':description,'contentType':content_type,'responsible':responsible,'weight':weight,'credits':credits,'metalink':metalink}) retStr=urllib.urlopen(collection+"/addResource",params).read() - return retStr + if not retStr: return "An Error occured adding the resource\n" + urllib.urlopen(collection+"/"+id+"/ECHO_getResourceMD").read() - #exec("collection_object=self"+collection) - - - #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+(