Diff for /OSAS/OSA_system/OSAS_add.py between versions 1.24 and 1.25

version 1.24, 2004/04/15 09:45:29 version 1.25, 2004/04/15 12:56:41
Line 618  def combineTextImage2(self,path): Line 618  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      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']))          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']))
Line 653  def patchedInfoXML(path): Line 653  def patchedInfoXML(path):
         """not"""          """not"""
                   
     ret+="<lang>%s</lang>\n"%archive.getText(dom.getElementsByTagName('lang')[0].childNodes)      ret+="<lang>%s</lang>\n"%archive.getText(dom.getElementsByTagName('lang')[0].childNodes)
       try:
     ret+="<author>%s</author>\n"%archive.getText(dom.getElementsByTagName('author')[0].childNodes)      ret+="<author>%s</author>\n"%archive.getText(dom.getElementsByTagName('author')[0].childNodes)
       except:
           """not"""
       try:
     ret+="<title>%s</title>\n"%archive.getText(dom.getElementsByTagName('title')[0].childNodes)      ret+="<title>%s</title>\n"%archive.getText(dom.getElementsByTagName('title')[0].childNodes)
       except:
           """not"""
           
     ret+="</info>"      ret+="</info>"
   
     return ret      return ret

Removed from v.1.24  
changed lines
  Added in v.1.25


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