--- ImageArchive/ImageArchive.py 2006/05/16 15:56:18 1.82 +++ ImageArchive/ImageArchive.py 2006/05/17 19:43:45 1.85 @@ -390,11 +390,11 @@ class ImageDigilib(Folder,Persistent,Imp """hack""" #scale thumb - self.scaleThumbs() + #self.scaleThumbs() #scale standard - self.scaleWorkingVersions() + #self.scaleWorkingVersions() @@ -480,11 +480,11 @@ class ImageDigilib(Folder,Persistent,Imp #scale thumb - self.scaleThumbs() + #self.scaleThumbs() #scale standard - self.scaleWorkingVersions() + #self.scaleWorkingVersions() if RESPONSE: @@ -532,11 +532,11 @@ class ImageDigilib(Folder,Persistent,Imp pass #scale thumb - self.scaleThumbs() + #self.scaleThumbs() #scale standard - self.scaleWorkingVersions() + #self.scaleWorkingVersions() if _rename: self.renameImage(file.filename) @@ -1075,11 +1075,11 @@ class ImageCollection(OrderedFolder, Per #scale thumb - self.scaleThumbs() + #self.scaleThumbs() #scale standard - self.scaleWorkingVersions() + #self.scaleWorkingVersions() RESPONSE.redirect('manage_main') @@ -1163,7 +1163,7 @@ class ImageCollection(OrderedFolder, Per #scale thumb - self.scaleThumbs() + #self.scaleThumbs() #scale standard @@ -1780,8 +1780,8 @@ class ImageCollectionMD(ImageCollection, args['_table']=self.imageCollectionConfig.getTable() args[self.imageCollectionConfig.getKey()]=file - if not self.ZSQLInlineSearch(args): - self.ZSQLAdd(args) + if not self.ZSQLInlineSearch(args=args): + self.ZSQLAdd(args=args) #print ret #pt=PageTemplateFile('Products/ImageArchive/out.zpt')).__of__(self) #print self.ImageStoragePath @@ -1789,11 +1789,11 @@ class ImageCollectionMD(ImageCollection, #scale thumb - self.scaleThumbs() + #self.scaleThumbs() #scale standard - self.scaleWorkingVersions() + #self.scaleWorkingVersions() if RESPONSE: RESPONSE.redirect('manage_main') @@ -1919,13 +1919,13 @@ class ImageCollectionMD(ImageCollection, self.REQUEST.SESSION['filename']=filen[0:] - if not self.REQUEST.SESSION['filename']=="": - url=getattr(self.getImageByName(self.REQUEST.SESSION['filename']),'absolute_url')() - if mode=="view": - self.REQUEST.RESPONSE.redirect(url) - elif mode=="download": - self.REQUEST.RESPONSE.redirect(url+"/download") - +# if not self.REQUEST.SESSION['filename']=="": +# url=getattr(self.getImageByName(self.REQUEST.SESSION['filename']),'absolute_url')() +# if mode=="view": +# self.REQUEST.RESPONSE.redirect(url) +# elif mode=="download": +# self.REQUEST.RESPONSE.redirect(url+"/download") +# if self.REQUEST.has_key('showall'): self.REQUEST.SESSION['showall']=self.REQUEST.get('showall') @@ -1939,8 +1939,7 @@ class ImageCollectionMD(ImageCollection, if overview and (generic =='No'):# - print "selected" - print repr(overview[0][1]) + return overview[0][1]() else: pt=PageTemplateFile(os.path.join(package_home(globals()),'zpt','overview_selectedMD.zpt')).__of__(self)