--- OSAS/OSA_system/OSAS_add.py 2004/04/15 09:45:29 1.24 +++ OSAS/OSA_system/OSAS_add.py 2004/04/15 21:30:42 1.26 @@ -618,7 +618,7 @@ def combineTextImage2(self,path): - print 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 os.popen("ssh 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'])) @@ -629,7 +629,7 @@ def combineTextImage2(self,path): f.close() splitted=path.split("/") fn=splitted[len(splitted)-1] - remotePath="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) def patchedInfoXML(path): @@ -653,8 +653,15 @@ def patchedInfoXML(path): """not""" ret+="%s\n"%archive.getText(dom.getElementsByTagName('lang')[0].childNodes) - ret+="%s\n"%archive.getText(dom.getElementsByTagName('author')[0].childNodes) - ret+="%s\n"%archive.getText(dom.getElementsByTagName('title')[0].childNodes) + try: + ret+="%s\n"%archive.getText(dom.getElementsByTagName('author')[0].childNodes) + except: + """not""" + try: + ret+="%s\n"%archive.getText(dom.getElementsByTagName('title')[0].childNodes) + except: + """not""" + ret+="" return ret