[BACK]Return to OSAS_add.py CVS log [TXT] [DIR] Up to [Repository] / OSAS / OSA_system

Diff for /OSAS/OSA_system/OSAS_add.py between versions 1.47 and 1.49

version 1.47, 2006/06/14 16:13:53 version 1.49, 2007/01/26 11:35:04
Line 706  def combineTextImage2(self,path): Line 706  def combineTextImage2(self,path):
                 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']
   
                 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()                  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)                  zLOG.LOG('OSAS (combine)',zLOG.INFO,ret)
   
   
   
         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")
                 tmp=patchedInfoXML(self.REQUEST['path'])          #        tmp=patchedInfoXML(self.REQUEST['path'])
                 f.write(tmp.encode('utf-8'))          #        f.write(tmp.encode('utf-8'))
                 f.close()          #        f.close()
                 splitted=path.split("/")          #        splitted=path.split("/")
                 fn=splitted[len(splitted)-1]          #        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"          #        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)          #        os.popen("scp /tmp/tmp_info.xml %s"%remotePath)
   
 def patchedInfoXML(path):  def patchedInfoXML(path):
         dom=xml.dom.minidom.parse(path+"/index.meta")          dom=xml.dom.minidom.parse(path+"/index.meta")
Removed from v.1.47  
changed lines
  Added in v.1.49

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