Diff for /OSAS/OSA_system/OSAS_add.py between versions 1.50 and 1.51

version 1.50, 2007/01/31 14:28:04 version 1.51, 2008/04/15 14:25:32
Line 707  def combineTextImage2(self,path): Line 707  def combineTextImage2(self,path):
                   
                   
   
         urllib.urlopen("http://nausikaa2.rz-berlin.mpg.de:86/cgi-bin/toc/admin/reg.cgi?path=%s"%path).readlines()  #        urllib.urlopen("http://nausikaa2.rz-berlin.mpg.de:86/cgi-bin/toc/admin/reg.cgi?path=%s"%path).readlines()
   #
         if self.REQUEST.has_key('image'): # falls bilder  #        if self.REQUEST.has_key('image'): # falls bilder
                 path=re.sub('//','/',self.REQUEST['path']) # falls '//' im Pfad  #                path=re.sub('//','/',self.REQUEST['path']) # falls '//' im Pfad
                 dlpath = re.sub('/mpiwg/online/','',path)+"/"+self.REQUEST['image']  #                dlpath = re.sub('/mpiwg/online/','',path)+"/"+self.REQUEST['image']
   #
                 logger('OSas',logging.INFO,"ssh archive@nausikaa2.rz-berlin.mpg.de /usr/local/mpiwg/scripts/scaleomat -src=/mpiwg/online -dest=/mpiwg/temp/online/scaled/thumb -dir=%s -scaleto=90 -sync >> /tmp/sc.out &"%dlpath )  #                logger('OSas',logging.INFO,"ssh archive@nausikaa2.rz-berlin.mpg.de /usr/local/mpiwg/scripts/scaleomat -src=/mpiwg/online -dest=/mpiwg/temp/online/scaled/thumb -dir=%s -scaleto=90 -sync >> /tmp/sc.out &"%dlpath )
                 ret=os.popen("ssh archive@nausikaa2.rz-berlin.mpg.de /usr/local/mpiwg/scripts/scaleomat -src=/mpiwg/online -dest=/mpiwg/temp/online/scaled/thumb -dir=%s -scaleto=90 -sync >> /tmp/sc.out &"%dlpath ).read()  #                ret=os.popen("ssh archive@nausikaa2.rz-berlin.mpg.de /usr/local/mpiwg/scripts/scaleomat -src=/mpiwg/online -dest=/mpiwg/temp/online/scaled/thumb -dir=%s -scaleto=90 -sync >> /tmp/sc.out &"%dlpath ).read()
                 logger('OSAS (combine)',logging.INFO,ret)  #                logger('OSAS (combine)',logging.INFO,ret)
   
   
   

Removed from v.1.50  
changed lines
  Added in v.1.51


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