--- OSAS/OSA_system/OSAS_add.py 2006/06/14 16:13:53 1.47 +++ OSAS/OSA_system/OSAS_add.py 2007/01/26 11:35:04 1.49 @@ -706,21 +706,21 @@ def combineTextImage2(self,path): path=re.sub('//','/',self.REQUEST['path']) # falls '//' im Pfad dlpath = re.sub('/mpiwg/online/','',path)+"/"+self.REQUEST['image'] - zLOG.LOG('OSas',zLOG.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 ) + zLOG.LOG('OSas',zLOG.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=100 -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=100 -sync >> /tmp/sc.out &"%dlpath ).read() zLOG.LOG('OSAS (combine)',zLOG.INFO,ret) - else: # falls keine Bilder (bug in reg.cgi info file ersetzen) - f=file("/tmp/tmp_info.xml","w") - tmp=patchedInfoXML(self.REQUEST['path']) - f.write(tmp.encode('utf-8')) - f.close() - splitted=path.split("/") - fn=splitted[len(splitted)-1] - remotePath="archive@nausikaa2.rz-berlin.mpg.de:/usr/local/share/archimedes/web/docs/proj/echo/1/docs/"+fn+"/info.xml" - os.popen("scp /tmp/tmp_info.xml %s"%remotePath) + #else: # falls keine Bilder (bug in reg.cgi info file ersetzen) + # f=file("/tmp/tmp_info.xml","w") + # tmp=patchedInfoXML(self.REQUEST['path']) + # f.write(tmp.encode('utf-8')) + # f.close() + # splitted=path.split("/") + # fn=splitted[len(splitted)-1] + # remotePath="archive@nausikaa2.rz-berlin.mpg.de:/usr/local/share/archimedes/web/docs/proj/echo/1/docs/"+fn+"/info.xml" + # os.popen("scp /tmp/tmp_info.xml %s"%remotePath) def patchedInfoXML(path): dom=xml.dom.minidom.parse(path+"/index.meta")