Diff for /ImageArchive/ImageArchive.py between versions 1.29 and 1.30

version 1.29, 2004/10/13 13:39:59 version 1.30, 2004/10/13 14:07:19
Line 11  import urllib Line 11  import urllib
 import xml.dom.minidom  import xml.dom.minidom
 import operator  import operator
   
   def splitPath(str):
       str2=str.replace("\\","/")
       return os.path.split(str2)[1]
   
 def getText(nodelist):  def getText(nodelist):
           
     rc = ""      rc = ""
Line 69  class ImageDigilib(Folder,Persistent,Imp Line 73  class ImageDigilib(Folder,Persistent,Imp
     def uploadImage(self,fileupload,path_name):      def uploadImage(self,fileupload,path_name):
         """upload an Image from an Requast"""          """upload an Image from an Requast"""
         #path_name=self.ImageStoragePath          #path_name=self.ImageStoragePath
         fn=os.path.split(fileupload.filename)[1]          fn=splitPath(fileupload.filename)
         filename=path_name+"/"+fn          filename=path_name+"/"+fn
         filedata=fileupload.read()          filedata=fileupload.read()
         f=open(filename,"w")          f=open(filename,"w")
Line 131  def manage_AddImageDigilibForm(self): Line 135  def manage_AddImageDigilibForm(self):
 def manage_AddImageDigilib(self,id,fileupload,meta=None,RESPONSE=None):  def manage_AddImageDigilib(self,id,fileupload,meta=None,RESPONSE=None):
     """Add ImageCollection"""      """Add ImageCollection"""
     #fileupload=self.REQUEST['fileupload']      #fileupload=self.REQUEST['fileupload']
     fn=os.path.split(fileupload.filename)[1]      fn=splitPath(fileupload.filename)
     newObj=ImageDigilib(id,fn,meta)      newObj=ImageDigilib(id,fn,meta)
           
     self._setObject(id,newObj)      self._setObject(id,newObj)
Line 336  class ImageCollection(Folder, Persistent Line 340  class ImageCollection(Folder, Persistent
                 meta=None                  meta=None
         else:          else:
             meta=None              meta=None
           fn=splitPath(fileupload.filename)
                                   
         manage_AddImageDigilib(self,fileupload.filename,fileupload,meta=meta)          manage_AddImageDigilib(self,fn,fileupload,meta=meta)
         return RESPONSE.redirect(self.REQUEST['URL1']+'/'+fileupload.filename)          return RESPONSE.redirect(self.REQUEST['URL1']+'/'+fn)
         #return  self.REQUEST['URL1']+'/'+fileupload.filename          #return  self.REQUEST['URL1']+'/'+fileupload.filename
   
     def ImportFiles2(self,RESPONSE=None):      def ImportFiles2(self,RESPONSE=None):

Removed from v.1.29  
changed lines
  Added in v.1.30


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