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