--- OSAS/OSA_system/OSAS_add.py	2004/03/21 15:45:38	1.15
+++ OSAS/OSA_system/OSAS_add.py	2004/03/25 09:59:19	1.17
@@ -1,9 +1,13 @@
-g#BAUSTELLE
+#BAUSTELLE
 
 
 """Methoden zum hinzufügen von Dokumenten ins Archiv"""
 from OSAS_helpers import readArchimedesXML 
-import archive
+try:
+	import archive
+except:
+	print "archive not imported"
+	
 import os
 from Products.PageTemplates.PageTemplateFile import PageTemplateFile
 from Products.PageTemplates.PageTemplate import PageTemplate
@@ -101,7 +105,7 @@ def add3(self):
 	metadata=parse_query_string(self.REQUEST['QUERY_STRING'])
 	self.REQUEST.SESSION['metadata']=metadata
 	vorschlag_naming=metadata['author'][:5]+"_"+metadata['title'][:5]+"_"+metadata['year']
-	self.vorschlag_naming=vorschlag_naming.decode('ascii','ignore')
+	self.vorschlag_naming=unicode(vorschlag_naming,'ascii','ignore')
 	if self.REQUEST.SESSION.has_key('no_upload'):
 		self.REQUEST.SESSION['folder_name']=self.REQUEST.SESSION['path']
 		return add5(self)
@@ -535,13 +539,6 @@ def combineTextImage2(self,path):
 			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)