--- OSAS/OSA_system/OSAS_add.py 2007/01/31 14:28:04 1.50 +++ OSAS/OSA_system/OSAS_add.py 2008/09/05 11:42:55 1.52 @@ -584,7 +584,10 @@ def combineTextImage2(self,path): subnode=dom.createElement('texttool') #neu erzeugen - presentfile=os.listdir(path+"/"+self.REQUEST['presentation'])[0] + presentfiles=os.listdir(path+"/"+self.REQUEST['presentation']) + for presentfileTmp in presentfiles: + if (presentfileTmp[0]!="."): #schliesse unsichbare DAteien aus. + presentfile=presentfileTmp displaynode=dom.createElement('display') @@ -707,15 +710,15 @@ def combineTextImage2(self,path): - 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 - path=re.sub('//','/',self.REQUEST['path']) # falls '//' im Pfad - dlpath = re.sub('/mpiwg/online/','',path)+"/"+self.REQUEST['image'] - - 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() - logger('OSAS (combine)',logging.INFO,ret) +# 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 +# path=re.sub('//','/',self.REQUEST['path']) # falls '//' im Pfad +# dlpath = re.sub('/mpiwg/online/','',path)+"/"+self.REQUEST['image'] +# +# 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() +# logger('OSAS (combine)',logging.INFO,ret)