OSAS/OSA_system/OSAS_add.py - diff

Return to OSAS_add.py CVS log

Up to [Repository] / OSAS / OSA_system

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

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

version 1.24, 2004/04/15 09:45:29	version 1.27, 2004/04/16 07:52:00
Line 291 def addPresentation2(self):	Line 291 def addPresentation2(self):
def addText(self,path,folder=None):	def addText(self,path,folder=None):
"""add fulltext to the path"""	"""add fulltext to the path"""
self.REQUEST.SESSION['existing_names']=['pageimg'] # to be done generate list of existing text files	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)	newtemplate=PageTemplateFile('Products/OSA_system/zpt/addText').__of__(self)
return newtemplate()	return newtemplate()

Line 300 def addText2(self):	Line 300 def addText2(self):
folder_name=self.REQUEST['folder_name']	folder_name=self.REQUEST['folder_name']
#print self.REQUEST['folder_name']	#print self.REQUEST['folder_name']
content_description=self.REQUEST['content_description']	content_description=self.REQUEST['content_description']
path=self.REQUEST.SESSION['path']	path=self.REQUEST.SESSION['pathnew']
file_name=self.REQUEST['fileupload'].filename	file_name=self.REQUEST['fileupload'].filename
filedata=self.REQUEST.form['fileupload'].read()	filedata=self.REQUEST.form['fileupload'].read()
os.mkdir(path+"/"+folder_name)	os.mkdir(path+"/"+folder_name)
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 629 def combineTextImage2(self,path):	Line 629 def combineTextImage2(self,path):
f.close()	f.close()
splitted=path.split("/")	splitted=path.split("/")
fn=splitted[len(splitted)-1]	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)	os.popen("scp /tmp/tmp_info.xml %s"%remotePath)

def patchedInfoXML(path):	def patchedInfoXML(path):
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.27