--- OSAS/OSA_system/OSAS_add.py	2004/03/03 13:02:54	1.12
+++ OSAS/OSA_system/OSAS_add.py	2004/03/21 15:49:45	1.16
@@ -2,6 +2,7 @@
 
 
 """Methoden zum hinzufügen von Dokumenten ins Archiv"""
+from OSAS_helpers import readArchimedesXML 
 import archive
 import os
 from Products.PageTemplates.PageTemplateFile import PageTemplateFile
@@ -442,49 +443,9 @@ def readArchimedesXML(folder):
 	else:
 		return ""
 	
-def combineTextImage(self,path):
-	"""gibt input formular zur erstellung des texttools meta tag aus"""
-	files = os.listdir(path)
-	
-	texts=[]
-	imagefolders=[]
-	presentationfolders=[]
-
-	splitted=path.split("/")
-	externxml=readArchimedesXML(splitted[len(splitted)-1])
-	
-	for filename in files:
-		#print "FN",filename
-		if archive.isdigilib2(path+"/"+filename):
-			imagefolders.append(filename)
-			
-		if archive.isFullText(path,filename):
-			#print "HI"
-			texts.append(filename)
-		if archive.isPresentation(path,filename):
-			presentationfolders.append(filename)
-	
-	dom=xml.dom.minidom.parse(path+"/index.meta")
-	try:
-		filelanguage=archive.getText(dom.getElementsByTagName('lang')[0].childNodes)
-	except:
-		filelanguage=""
-	self.REQUEST.SESSION['isolist']=getISO()
-	tmp=getISO().keys()
-	tmp.sort()
-	self.REQUEST.SESSION['isolistsort']=tmp
-	self.REQUEST.SESSION['path']=path
-	self.REQUEST.SESSION['texts']=texts
-	self.REQUEST.SESSION['imagefolders']=imagefolders
-	self.REQUEST.SESSION['presentationfolders']=presentationfolders
-	self.REQUEST.SESSION['filelanguage']=filelanguage
-	self.REQUEST.SESSION['externxml']=externxml
 
-	newtemplate=PageTemplateFile('Products/OSA_system/ImageandText').__of__(self)
-	return newtemplate()
 	
 
-
 def combineTextImage2(self,path):
 	"""erstellt bzw. ändert texttool meta tag"""
 	dom=xml.dom.minidom.parse(path+"/index.meta")
@@ -546,7 +507,7 @@ def combineTextImage2(self,path):
 			xsltnode.appendChild(xsltnodetext)
 			subnode.appendChild(xsltnode)
 
-	"""
+	
 	if self.REQUEST.has_key('thumbtemplate'):
 		if not self.REQUEST['thumbtemplate']=="":
 			xsltnode=dom.createElement('thumbtemplate')
@@ -556,12 +517,31 @@ def combineTextImage2(self,path):
 
 	if self.REQUEST.has_key('topbar'):
 		if not self.REQUEST['topbar']=="":
-			xsltnode=dom.createElement('topbar')
+			xsltnode=dom.createElement('toptemplate')
 			xsltnodetext=dom.createTextNode(self.REQUEST['topbar'])
 			xsltnode.appendChild(xsltnodetext)
 			subnode.appendChild(xsltnode)
 
-	"""
+	if self.REQUEST.has_key('startpage'):
+		if not self.REQUEST['startpage']=="":
+			xsltnode=dom.createElement('startpage')
+			xsltnodetext=dom.createTextNode(self.REQUEST['startpage'])
+			xsltnode.appendChild(xsltnodetext)
+			subnode.appendChild(xsltnode)
+
+	if self.REQUEST.has_key('project'):
+		if not self.REQUEST['project']=="":
+			xsltnode=dom.createElement('project')
+			xsltnodetext=dom.createTextNode(self.REQUEST['project'])
+			xsltnode.appendChild(xsltnodetext)
+			subnode.appendChild(xsltnode)
+
+	if self.REQUEST.has_key('digiLibTemplate'):
+		if not self.REQUEST['digiLibTemplate']=="":
+			xsltnode=dom.createElement('digilibtemplate')
+			xsltnodetext=dom.createTextNode(self.REQUEST['digiLibTemplate'])
+			xsltnode.appendChild(xsltnodetext)
+			subnode.appendChild(xsltnode)
 			
 	node.appendChild(subnode)