Diff for /ImageArchive/ImageArchive.py between versions 1.65 and 1.67

version 1.65, 2005/10/11 20:08:10 version 1.67, 2005/10/17 19:20:49
Line 1 Line 1
   
 #genericServerPath="http://content.mpiwg-berlin.mpg.de/zogilib_images"  genericServerPath="http://content.mpiwg-berlin.mpg.de/zogilib_images"
 genericServerPath="http://127.0.0.1:8080/zogilib_images"  #genericServerPath="http://127.0.0.1:8080/zogilib_images"
   
   
 from OFS.Folder import Folder  from OFS.Folder import Folder
Line 922  class ImageCollection(Folder, Persistent Line 922  class ImageCollection(Folder, Persistent
         pt=PageTemplateFile(os.path.join(package_home(globals()),'zpt','addImage.zpt')).__of__(self)          pt=PageTemplateFile(os.path.join(package_home(globals()),'zpt','addImage.zpt')).__of__(self)
         return pt()          return pt()
           
     def addImage2(self,fileupload,meta,use_default=None,RESPONSE=None):      def addImage2(self,fileupload,fileName=None,meta=None,use_default=None,RESPONSE=None):
         """Add"""          """Add"""
   
         #print "FU",fileupload          #print "FU",fileupload
Line 934  class ImageCollection(Folder, Persistent Line 934  class ImageCollection(Folder, Persistent
                 meta=None                  meta=None
         else:          else:
             meta=None              meta=None
           
           if fileName:
               fn=fileName
           else:
         fn=splitPath(fileupload.filename)          fn=splitPath(fileupload.filename)
                   
         manage_AddImageDigilib(self,fn,fileupload,meta=meta)          manage_AddImageDigilib(self,fn,fileupload,meta=meta)
           
           if RESPONSE:
         return RESPONSE.redirect(self.REQUEST['URL1']+'/'+fn)          return RESPONSE.redirect(self.REQUEST['URL1']+'/'+fn)
         #return  self.REQUEST['URL1']+'/'+fileupload.filename          #return  self.REQUEST['URL1']+'/'+fileupload.filename
   

Removed from v.1.65  
changed lines
  Added in v.1.67


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