--- OSAS/OSA_system/OSAS_add.py	2003/10/01 08:20:47	1.1
+++ OSAS/OSA_system/OSAS_add.py	2003/10/05 18:16:19	1.2
@@ -1,11 +1,8 @@
-
-
-
 #BAUSTELLE
 
 
 """Methoden zum hinzufügen von Dokumenten ins Archiv"""
-#import archive
+import archive
 import os
 from Products.PageTemplates.PageTemplateFile import PageTemplateFile
 from Products.PageTemplates.PageTemplate import PageTemplate
@@ -200,64 +197,64 @@ def addPresentation(self,path):
 	<display>yes</display>
 </info>"""%(author,title,date)
 	
-	newtemplate=PageTemplateFile('/usr/local/mpiwg/Zope/Extensions/addPresentation').__of__(self)
+	newtemplate=PageTemplateFile('products/OSA_system/addPresentation').__of__(self)
 	return newtemplate()
 
 def addPresentation2(self):
 	"""add presentation """
-	self.folder_name=self.REQUEST['folder_name']
+	folder_name=self.REQUEST['folder_name']
 	#print self.REQUEST['folder_name']
-	self.content_description=self.REQUEST['content_description']
+	content_description=self.REQUEST['content_description']
 
-	self.path=self.REQUEST.SESSION['path']
+	path=self.REQUEST.SESSION['path']
 
 	if not self.REQUEST.has_key('fileupload'):
-		self.xmlinfo=self.REQUEST['xmltext']
+		xmlinfo=self.REQUEST['xmltext']
 		file_name="info.xml"
 
 	else:
 		file_name=self.REQUEST['fileupload'].filename
-		self.xmlinfo=self.REQUEST.form['fileupload'].read()
-		# hack dW
+		xmlinfo=self.REQUEST.form['fileupload'].read()
+		# hack Multipart auswertung funktioniert nicht ausser bei mozilla
 		file_name="info.xml"
-		self.xmlinfo=self.REQUEST['xmltext']
+		xmlinfo=self.REQUEST['xmltext']
 	try:
-		os.mkdir(self.path+"/"+self.folder_name)
+		os.mkdir(path+"/"+folder_name)
 	except:
 		"""nothing"""
 	print "NAME:",file_name
-	f=open(self.path+"/"+self.folder_name+"/"+file_name,"w")
-	f.write(self.xmlinfo)
+	f=open(path+"/"+folder_name+"/"+file_name,"w")
+	f.write(xmlinfo)
 	f.close()
-	os.chmod(self.path+"/"+self.folder_name,0755)
-	os.chmod(self.path+"/"+self.folder_name+"/"+file_name,0644)
-	addDirsToIndexMeta(self.path,self.folder_name,self.content_description,'presentation')
+	os.chmod(path+"/"+folder_name,0755)
+	os.chmod(path+"/"+folder_name+"/"+file_name,0644)
+	addDirsToIndexMeta(path,folder_name,content_description,'presentation')
 	
-	return self.REQUEST.RESPONSE.redirect('storefiles?path='+self.path)
+	return self.REQUEST.RESPONSE.redirect(self.REQUEST['URL2']+'?path='+path)
 
 def addText(self,path):
 	"""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
-	newtemplate=PageTemplateFile('/usr/local/mpiwg/Zope/Extensions/addText').__of__(self)
+	newtemplate=PageTemplateFile('products/OSA_system/addText').__of__(self)
 	return newtemplate()
 
 def addText2(self):
-	self.folder_name=self.REQUEST['folder_name']
+	folder_name=self.REQUEST['folder_name']
 	#print self.REQUEST['folder_name']
-	self.content_description=self.REQUEST['content_description']
-	self.path=self.REQUEST.SESSION['path']
-	self.file_name=self.REQUEST['fileupload'].filename
-	self.file=self.REQUEST.form['fileupload'].read()
-	os.mkdir(self.path+"/"+self.folder_name)
-	f=open(self.path+"/"+self.folder_name+"/"+self.file_name,"w")
-	f.write(self.file)
+	content_description=self.REQUEST['content_description']
+	path=self.REQUEST.SESSION['path']
+	file_name=self.REQUEST['fileupload'].filename
+	filedata=self.REQUEST.form['fileupload'].read()
+	os.mkdir(path+"/"+folder_name)
+	f=open(path+"/"+folder_name+"/"+file_name,"w")
+	f.write(filedata)
 	f.close()
-	os.chmod(self.path+"/"+self.folder_name,0755)
-	os.chmod(self.path+"/"+self.folder_name+"/"+self.file_name,0644)
-	addDirsToIndexMeta(self.path,self.folder_name,self.content_description,'fulltext')
+	os.chmod(path+"/"+folder_name,0755)
+	os.chmod(path+"/"+folder_name+"/"+file_name,0644)
+	addDirsToIndexMeta(path,folder_name,content_description,'fulltext')
 
-	return self.REQUEST.RESPONSE.redirect('storefiles?path='+self.path)
+	return self.REQUEST.RESPONSE.redirect(self.REQUEST['URL2']+'?path='+path)
 
 def addTextExternal(self,path,texturl,version):
 	"""hinzufügen eines externen textes"""
@@ -367,6 +364,7 @@ def addImages(self,path):
 	return newtemplate()
 
 def addImages2(self):
+	
 	self.image_folder_name=self.REQUEST['folder_name']
 	#print self.REQUEST['folder_name']
 	self.content_description=self.REQUEST['content_description']
@@ -378,6 +376,7 @@ def addImages2(self):
 	self.REQUEST.SESSION['path']=re.search(r"/mpiwg(.*)",self.REQUEST.SESSION['path']).group(1)
 	newtemplate=PageTemplateFile('products/OSA_system/OSAS_upload2').__of__(self)
 	return newtemplate()
+	
 
 
 def addDirsToIndexMeta(path,folder_name,content_description,content_type):
@@ -437,7 +436,7 @@ def combineTextImage(self,path):
 	self.REQUEST.SESSION['imagefolders']=imagefolders
 	self.REQUEST.SESSION['presentationfolders']=presentationfolders
 	self.REQUEST.SESSION['filelanguage']=filelanguage
-	newtemplate=PageTemplateFile('/usr/local/mpiwg/Zope/Extensions/ImageandText').__of__(self)
+	newtemplate=PageTemplateFile('products/OSA_system/ImageandText').__of__(self)
 	return newtemplate()
 	
 
@@ -499,8 +498,8 @@ 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()
 	#return urllib.quote("http://nausikaa2.rz-berlin.mpg.de:86/cgi-bin/toc/admin/reg.cgi?path=%s"%path)
 	os.popen("ssh nausikaa2.rz-berlin.mpg.de /usr/local/mpiwg/scripts/scaleomat.pl %s /mpiwg/temp/online/scaled/thumb 90 &"% re.sub('mpiwg/online/','',self.REQUEST['path']+"/"+self.REQUEST['image']))
-	return self.REQUEST.RESPONSE.redirect('storefiles?path='+self.REQUEST['path'])
+	return self.REQUEST.RESPONSE.redirect(self.REQUEST['URL2']+'?path='+self.REQUEST['path'])