OSAS/OSA_system/OSAS_add.py - diff

Return to OSAS_add.py CVS log

Up to [Repository] / OSAS / OSA_system

version 1.32, 2004/07/01 07:46:42	version 1.33, 2004/07/23 17:49:07
Line 679 def combineTextImage2(self,path):	Line 679 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
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']))	dlpath = re.sub('/mpiwg/online/','',self.REQUEST['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 &"% )
	#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)
f=file("/tmp/tmp_info.xml","w")	f=file("/tmp/tmp_info.xml","w")