--- ImageArchive/ImageArchive.py 2006/05/17 19:10:49 1.84 +++ 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) @@ -789,7 +789,7 @@ class ImageCollection(OrderedFolder, Per """scale thumbs""" #scale thumbs - ret=os.popen("/docuserver/lib/scaleomat/scaleomat.pl -src=/mpiwg/online/ -dir=%s -dest=/docuserver/scaled/thumb -scaleto=100 &"% self.ImageViewerPath) + ret=os.popen("ssh nausikaa2.rz-berlin.mpg.de /usr/local/mpiwg/scripts/scaleomat.pl -src=/mpiwg/online/ -dir=%s -dest=/mpiwg/temp/online/scaled/thumb -scaleto=100 &"% self.ImageViewerPath) if RESPONSE: RESPONSE.write(ret.read()) RESPONSE.write("\n") @@ -801,7 +801,7 @@ class ImageCollection(OrderedFolder, Per #scale standard - ret=os.popen("/docuserver/lib/scaleomat/scaleomat.pl -src=/mpiwg/online/ -dir=%s -dest=/mpiwg/temp/online/scaled/small -scaleto=2000 &"% self.ImageViewerPath) + ret=os.popen("ssh nausikaa2.rz-berlin.mpg.de /usr/local/mpiwg/scripts/scaleomat.pl -src=/mpiwg/online/ -dir=%s -dest=/mpiwg/temp/online/scaled/small -scaleto=2000 &"% self.ImageViewerPath) if RESPONSE: RESPONSE.write(ret.read()) RESPONSE.write("\n") @@ -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)