--- OSAS/OSA_system/OSAS_add.py	2004/04/08 16:50:01	1.20
+++ OSAS/OSA_system/OSAS_add.py	2004/04/14 21:26:23	1.21
@@ -9,6 +9,7 @@ except:
 	print "archive not imported"
 	
 import os
+
 from Products.PageTemplates.PageTemplateFile import PageTemplateFile
 from Products.PageTemplates.PageTemplate import PageTemplate
 import string
@@ -57,7 +58,7 @@ def getISO():
 			ret[key]=value
 	except:
 		ret={}
-        return ret
+	return ret
 
 
 def add2(self):
@@ -69,6 +70,7 @@ def add2(self):
 		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()
 	tmp.sort()
@@ -138,13 +140,16 @@ def add4(self):
 	
 	self.folder_name=self.REQUEST['folder_name']
 	# next has to be changed -> error if back button is used!!
-	self.REQUEST.SESSION['path']=self.REQUEST.SESSION['path']+"/"+self.REQUEST['folder_name']
-
-
 	self.REQUEST.SESSION['folder_name']=self.folder_name
-	self.image_folder_name="pageimg"
-	newtemplate=PageTemplateFile('Products/OSA_system/zpt/OSAS_upload').__of__(self)
-	return newtemplate()
+	if self.REQUEST['submit']=="upload images":
+		self.REQUEST.SESSION['path']=os.path.join(self.REQUEST.SESSION['path'],self.REQUEST['folder_name'])
+		self.image_folder_name="pageimg"
+		newtemplate=PageTemplateFile('Products/OSA_system/zpt/OSAS_upload').__of__(self)
+		return newtemplate()
+	else:
+		os.mkdir(os.path.join(self.REQUEST.SESSION['path'],self.REQUEST['folder_name']))
+		return addText(self,os.path.join(self.REQUEST.SESSION['path'],self.REQUEST['folder_name']))
+	
 	
 def add5(self):
 	"""ADD INDEX.META"""
@@ -184,16 +189,15 @@ def add6(self):
 		return self.REQUEST.response.redirect(self.REQUEST['URL2']+"?path="+self.REQUEST.SESSION['path'])
 	else:
                 #print self.add_metadata['archive-path']
-		self.viewpath=re.search(r"/mpiwg/online/(.*)",self.add_metadata['archive-path']).group(1) 
-		newtemplate2=PageTemplateFile('Products/OSA_system/zpt/OSAS_saved').__of__(self)
-	
-		
-		newtemplate2.content_type="text/html"
-		self.REQUEST.response.setHeader('Content-Type','text/html')
-	
-
-		return newtemplate2()
-
+		self.viewpath=re.search(r"/mpiwg/online/(.*)",self.add_metadata['archive-path']).group(1)
+		if not (self.REQUEST.SESSION['no_upload']=="text"):
+			newtemplate2=PageTemplateFile('Products/OSA_system/zpt/OSAS_saved').__of__(self)
+			newtemplate2.content_type="text/html"
+			self.REQUEST.response.setHeader('Content-Type','text/html')
+			return newtemplate2()
+		else:
+			"""text upload"""
+			return 1
 
 
 
@@ -213,16 +217,25 @@ def addPresentation(self,path):
 		try:
 			author=archive.getText(dom.getElementsByTagName('Author')[0].childNodes)
 		except:
-			author=archive.getText(dom.getElementsByTagName('Editor')[0].childNodes)
-			
-	title=archive.getText(dom.getElementsByTagName('title')[0].childNodes)
+			try:
+				author=archive.getText(dom.getElementsByTagName('Editor')[0].childNodes)
+			except:
+				author=""
+	try:
+		title=archive.getText(dom.getElementsByTagName('title')[0].childNodes)
+	except:
+		title=""
+		
 	try:
 		date=archive.getText(dom.getElementsByTagName('year')[0].childNodes)
 	except:
 		try:
 			date=archive.getText(dom.getElementsByTagName('Year')[0].childNodes)
 		except:
-			date=archive.getText(dom.getElementsByTagName('date')[0].childNodes)
+			try:
+				date=archive.getText(dom.getElementsByTagName('date')[0].childNodes)
+			except:
+				date=""
 	i=1
 	while os.path.exists("%02d-presentation"%i):
 		i+=1
@@ -274,7 +287,7 @@ def addPresentation2(self):
 	
 	return self.REQUEST.RESPONSE.redirect(self.REQUEST['URL2']+'?path='+path)
 
-def addText(self,path):
+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
@@ -569,7 +582,6 @@ def combineTextImage2(self,path):
 		node2=node.getElementsByTagName('bib')[0]
 		subs=node2.getElementsByTagName('lang')
 		for sub in subs:
-			print "X",sub
 			node2.removeChild(sub)
 	except:
 		"""nothing"""
@@ -577,7 +589,6 @@ def combineTextImage2(self,path):
 		main=dom.getElementsByTagName('bib')[0]
 		node=dom.createElement('lang')
 		textnode=dom.createTextNode(self.REQUEST['lang'])
-		print "LANG:",lang
 		node.appendChild(textnode)
 		main.appendChild(node)
 	except: