Diff for /OSAS/OSA_system/OSAS_addfiles.py between versions 1.28 and 1.31

version 1.28, 2004/04/15 12:56:41 version 1.31, 2004/04/17 15:22:42
Line 92  class OSAS_add_Document(Folder): Line 92  class OSAS_add_Document(Folder):
         metadata['archive-creation-date']=OSAS_add.date(self)          metadata['archive-creation-date']=OSAS_add.date(self)
         metadata['creator']=self.REQUEST['creator']          metadata['creator']=self.REQUEST['creator']
         metadata['description']=self.REQUEST['content_description']          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']=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"      metadata['content-type']="fulltext document"
     self.reftype=self.REQUEST.SESSION['reftype']      self.reftype=self.REQUEST.SESSION['reftype']
     self.REQUEST.SESSION['add_metadata']=metadata         self.REQUEST.SESSION['add_metadata']=metadata   
Line 107  class OSAS_add_Document(Folder): Line 107  class OSAS_add_Document(Folder):
     newtemplate=PageTemplateFile('Products/OSA_system/zpt/index_meta').__of__(self)      newtemplate=PageTemplateFile('Products/OSA_system/zpt/index_meta').__of__(self)
     newtemplate.content_type="text/plain"      newtemplate.content_type="text/plain"
     renderxml = newtemplate()      renderxml = newtemplate()
         metapath=self.REQUEST.SESSION['path']+"/index.meta"          metapath=self.REQUEST.SESSION['pathnew']+"/index.meta"
           
           
     f=open(metapath,'w')      f=open(metapath,'w')
Line 305  class OSAS_add_contextData(Folder): Line 305  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})          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()          retStr=urllib.urlopen(collection+"/addResource",params).read()
         return retStr  
     if not retStr:      if not retStr:
             return "An Error occured adding the resource\n"              return "An Error occured adding the resource\n"
   
         urllib.urlopen(collection+"/"+id+"/ECHO_getResourceMD").read()  
         #exec("collection_object=self"+collection)  
           
   
           urllib.urlopen(collection+"/"+id+"/ECHO_getResourceMD").read()
                   
         #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)          return self.REQUEST.RESPONSE.redirect(self.REQUEST['URL2']+'?path='+path)
                   
     manage_options = Folder.manage_options+(      manage_options = Folder.manage_options+(
Line 504  class OSAS_combineTextImage(Folder): Line 495  class OSAS_combineTextImage(Folder):
             node=dom.getElementsByTagName('texttool')[0] #getNode              node=dom.getElementsByTagName('texttool')[0] #getNode
             subnode=node.getElementsByTagName(name)[0]              subnode=node.getElementsByTagName(name)[0]
                           
               # bei text wird nur der Folder gebraucht
               if name=="text":
                   splitted=getText(subnode.childNodes).split("/")
                   return splitted[len(splitted)-2]
               else:
             return getText(subnode.childNodes)              return getText(subnode.childNodes)
         except:          except:
             return default              return default

Removed from v.1.28  
changed lines
  Added in v.1.31


FreeBSD-CVSweb <freebsd-cvsweb@FreeBSD.org>