Diff for /ImageArchive/ImageArchive.py between versions 1.94 and 1.95

version 1.94, 2006/05/25 15:49:42 version 1.95, 2006/05/26 17:46:07
Line 779  class ImageCollection(OrderedFolder, Per Line 779  class ImageCollection(OrderedFolder, Per
             
                 
         #ret=scaleStr          #ret=scaleStr
       #zLOG.LOG("ImageCollection:scale",zLOG.INFO,scaleStr)
         ret=os.popen2(scaleStr,1)[1].read()          ret=os.popen2(scaleStr,1)[1].read()
     
         if RESPONSE:          if RESPONSE:
Line 930  class ImageCollection(OrderedFolder, Per Line 931  class ImageCollection(OrderedFolder, Per
         dest=os.path.join(self.scaledBasis,'thumb')          dest=os.path.join(self.scaledBasis,'thumb')
         self.scale(dir=self.getImageStoragePath(),dest=dest,scaleTo=100,RESPONSE=RESPONSE)          self.scale(dir=self.getImageStoragePath(),dest=dest,scaleTo=100,RESPONSE=RESPONSE)
         #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)          #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:          #if RESPONSE:
                 RESPONSE.write(ret.read())          #        RESPONSE.write(ret.read())
                 RESPONSE.write("\n")          #        RESPONSE.write("\n")
                                   
         return "RESCALING STARTED"          return "RESCALING STARTED"
   

Removed from v.1.94  
changed lines
  Added in v.1.95


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