--- OSAS/OSA_system/OSAS_addfiles.py	2004/06/22 06:39:04	1.33
+++ OSAS/OSA_system/OSAS_addfiles.py	2004/08/19 19:01:17	1.36
@@ -102,21 +102,56 @@ class OSAS_add_Document(Folder):
 	self.metadata=self.REQUEST.SESSION['metadata']
 	self.metadataprint=""
 	for tag in self.metadata.keys():
+            
+            #print str(self.metadata[tag]).decode('utf-8').encode('utf-8')
+            self.metadataprint=self.metadataprint+"<"+tag+">"+self.metadata[tag]+"</"+tag+">\n"
+
+	newtemplate=PageTemplateFile('Products/OSA_system/zpt/index_meta').__of__(self)
+	newtemplate.content_type="text/plain"
+	renderxml = newtemplate(encoding='utf-8')
+        #return renderxml
+        metapath=self.REQUEST.SESSION['pathnew']+"/index.meta"
+	
+	f=open(metapath,'w')
+
+	f.write(renderxml)
+	f.close()
+	os.chmod(metapath,0664)
+	os.popen('chmod -R 0775 %s'%self.add_metadata['archive-path']+"/"+self.add_metadata['folder_name']) 
+	
+        return OSAS_add.addText2(self)
+
+    def addPdf2(self):
+        """add only a pdf"""
+        metadata=OSAS_add.parse_query_string(self.REQUEST['QUERY_STRING'])
+        metadata['archive-creation-date']=OSAS_add.date(self)
+        metadata['creator']=self.REQUEST['creator']
+        metadata['description']=self.REQUEST['content_description']
+	metadata['archive-path']=os.path.split(self.REQUEST.SESSION['pathnew'])[0]
+	#metadata['folder_name']=self.REQUEST.SESSION['folder_name']
+	metadata['folder_name']=os.path.split(self.REQUEST.SESSION['pathnew'])[1]
+	metadata['content-type']="fulltext document"
+	self.reftype=self.REQUEST.SESSION['reftype']
+	self.REQUEST.SESSION['add_metadata']=metadata	
+	self.add_metadata=metadata
+	self.metadata=self.REQUEST.SESSION['metadata']
+	self.metadataprint=""
+	for tag in self.metadata.keys():
 		self.metadataprint=self.metadataprint+"<"+tag+">"+self.metadata[tag]+"</"+tag+">\n"
 
 	newtemplate=PageTemplateFile('Products/OSA_system/zpt/index_meta').__of__(self)
 	newtemplate.content_type="text/plain"
-	renderxml = newtemplate()
+	renderxml = newtemplate(encoding='utf-8')
         metapath=self.REQUEST.SESSION['pathnew']+"/index.meta"
 	
 	
 	f=open(metapath,'w')
-	f.writelines(renderxml)
+	f.write(renderxml)
 	f.close()
 	os.chmod(metapath,0664)
 	os.popen('chmod -R 0775 %s'%self.add_metadata['archive-path']+"/"+self.add_metadata['folder_name']) 
 	
-        return OSAS_add.addText2(self)
+        return OSAS_add.addPdf2(self)
 
     def addImages(self,path):
         """Hinzufügen eines neuen Imagesfolders"""
@@ -172,6 +207,14 @@ class OSAS_add_Text(Folder):
         if RESPONSE is not None:
             RESPONSE.redirect('manage_main')
 
+    def addPdf(self,path):
+        """Add a pdf"""
+        return OSAS_add.addPdf(self,path)
+
+    def addPdf2(self):
+        """Read the file and store it"""
+        return OSAS_add.addPdf2(self)
+    
     def addText(self,path):
         """Add a fulltext"""
         return OSAS_add.addText(self,path)
@@ -179,6 +222,7 @@ class OSAS_add_Text(Folder):
     def addText2(self):
         """Read the file and store it"""
         return OSAS_add.addText2(self)
+    
 def manage_AddOSAS_add_TextForm(self):
     """interface for adding the OSAS_add_Metadata"""
     pt=PageTemplateFile('Products/OSA_system/zpt/AddOSAS_text.zpt').__of__(self)
@@ -514,6 +558,9 @@ class OSAS_combineTextImage(Folder):
 
     def combineTextImage2(self,path):
         """Eingabe von Metadateninformationen"""
+	
+	# correct path
+	path=re.sub("//","/",path)
         OSAS_add.combineTextImage2(self,path) # Add images
         splitted=path.split("/")
         linkPath=splitted[len(splitted)-1]
@@ -574,7 +621,7 @@ def writeToContext(path,link,description
     
     writefile=file(path+"/index.meta","w")
     #print path+"/index.meta"
-    writefile.write(dom.toxml().encode('utf-8'))
+    writefile.write(dom.toxml(encoding="UTF-8"))
     writefile.close()
 
 def manage_AddOSAS_combineTextImageForm(self):