version 1.46, 2005/11/04 16:37:35
|
version 1.50, 2007/01/31 14:28:04
|
Line 14 from Products.PageTemplates.PageTemplate
|
Line 14 from Products.PageTemplates.PageTemplate
|
from Products.PageTemplates.PageTemplate import PageTemplate |
from Products.PageTemplates.PageTemplate import PageTemplate |
import string |
import string |
import urllib |
import urllib |
import zLOG |
import logging |
|
|
|
#ersetzt logging |
|
def logger(txt,method,txt2): |
|
"""logging""" |
|
logging.info(txt+ txt2) |
|
|
|
|
import xml.dom.minidom |
import xml.dom.minidom |
from time import localtime,strftime |
from time import localtime,strftime |
from Globals import package_home |
from Globals import package_home |
Line 706 def combineTextImage2(self,path):
|
Line 713 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 ) |
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() |
zLOG.LOG('OSAS (combine)',zLOG.INFO,ret) |
logger('OSAS (combine)',logging.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") |