--- OSAS/OSA_system/OSAS_add.py 2004/04/15 21:30:42 1.26 +++ OSAS/OSA_system/OSAS_add.py 2004/04/18 19:42:12 1.29 @@ -67,9 +67,10 @@ def add2(self): self.bibdata={} for referenceType in self.referencetypes: #print referenceType - self.bibdata[referenceType[1].title]=referenceType[1].fields - self.bibdata['data']=referenceType[1] - self.fields=self.bibdata[self.reftype] + if referenceType[1].title == self.reftype: + self.bibdata[referenceType[1].title]=referenceType[1].fields + self.bibdata['data']=referenceType[1] + self.fields=self.bibdata[self.reftype] self.isolist=getISO() tmp=getISO().keys() @@ -291,7 +292,7 @@ def addPresentation2(self): def addText(self,path,folder=None): """add fulltext to the path""" self.REQUEST.SESSION['existing_names']=['pageimg'] # to be done generate list of existing text files - self.REQUEST.SESSION['path']=path + self.REQUEST.SESSION['pathnew']=path newtemplate=PageTemplateFile('Products/OSA_system/zpt/addText').__of__(self) return newtemplate() @@ -300,7 +301,7 @@ def addText2(self): folder_name=self.REQUEST['folder_name'] #print self.REQUEST['folder_name'] content_description=self.REQUEST['content_description'] - path=self.REQUEST.SESSION['path'] + path=self.REQUEST.SESSION['pathnew'] file_name=self.REQUEST['fileupload'].filename filedata=self.REQUEST.form['fileupload'].read() os.mkdir(path+"/"+folder_name) @@ -621,7 +622,7 @@ 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 - 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 archive@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'])) else: # falls keine Bilder (bug in reg.cgi info file ersetzen) f=file("/tmp/tmp_info.xml","w")