--- OSAS/OSA_system/OSAS_show.py 2004/07/23 17:37:55 1.25 +++ OSAS/OSA_system/OSAS_show.py 2004/08/19 19:01:17 1.27 @@ -107,7 +107,7 @@ class OSAS_StoreOnline(SimpleItem): """rescale thumbs of images in path""" dlpath = re.sub('/mpiwg/online/','',self.REQUEST['path']) - 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 -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.pl %s /mpiwg/temp/online/scaled/thumb 90 --replace >> /tmp/sc.out &"% re.sub('/mpiwg/online/','',self.REQUEST['path'])) self.REQUEST.SESSION['path']=self.REQUEST['path'] @@ -200,7 +200,7 @@ class OSAS_StoreOnline(SimpleItem): """Editiere das Index Metafile""" try: dom=xml.dom.minidom.parse(path+"/index.meta") - indexmeta=dom.toxml() + indexmeta=dom.toxml(encoding='UTF-8') except: indexmeta="" @@ -963,7 +963,9 @@ def getBib(nodelist): if node.nodeType == node.ELEMENT_NODE: """nothing""" + rc = rc+""+str(node.nodeName)+": "+getText(node.childNodes)+"" + #print rc return rc+"" @@ -1022,7 +1024,7 @@ def getMetafile(path): # html=html.encode('utf-8','replace')+getBib(bib.childNodes).encode('utf-8','replace') - return html + return html.encode('utf-8') def hasMetafile(path): """get index.meta"""