OSAS/OSA_system/OSAS_add.py - diff

Return to OSAS_add.py CVS log

Up to [Repository] / OSAS / OSA_system

version 1.39, 2004/11/24 17:22:47	version 1.40, 2005/01/20 13:38:02
Line 695 def combineTextImage2(self,path):	Line 695 def combineTextImage2(self,path):
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']
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 -replace >> /tmp/sc.out &"%dlpath )	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 )
#os.popen("ssh archive@nausikaa2.rz-berlin.mpg.de /usr/local/mpiwg/scripts/scaleomat.pl %s /mpiwg/temp/online/scaled/thumb 90 >> /tmp/sc.out &"% re.sub('/mpiwg/online/','',self.REQUEST['path']+"/"+self.REQUEST['image']))	#os.popen("ssh archive@nausikaa2.rz-berlin.mpg.de /usr/local/mpiwg/scripts/scaleomat.pl %s /mpiwg/temp/online/scaled/thumb 90 >> /tmp/sc.out &"% re.sub('/mpiwg/online/','',self.REQUEST['path']+"/"+self.REQUEST['image']))

else: # falls keine Bilder (bug in reg.cgi info file ersetzen)	else: # falls keine Bilder (bug in reg.cgi info file ersetzen)