--- OSAS/OSA_system/OSAS_addfiles.py	2004/04/15 21:30:42	1.29
+++ OSAS/OSA_system/OSAS_addfiles.py	2004/04/17 15:22:42	1.31
@@ -92,9 +92,9 @@ class OSAS_add_Document(Folder):
         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['path'])[0]
+	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['path'])[1]
+	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	
@@ -107,7 +107,7 @@ class OSAS_add_Document(Folder):
 	newtemplate=PageTemplateFile('Products/OSA_system/zpt/index_meta').__of__(self)
 	newtemplate.content_type="text/plain"
 	renderxml = newtemplate()
-        metapath=self.REQUEST.SESSION['path']+"/index.meta"
+        metapath=self.REQUEST.SESSION['pathnew']+"/index.meta"
 	
 	
 	f=open(metapath,'w')
@@ -494,11 +494,16 @@ class OSAS_combineTextImage(Folder):
             dom=xml.dom.minidom.parse(path+"/index.meta")
             node=dom.getElementsByTagName('texttool')[0] #getNode
             subnode=node.getElementsByTagName(name)[0]
-            
-            return getText(subnode.childNodes)
+
+            # bei text wird nur der Folder gebraucht
+            if name=="text":
+                splitted=getText(subnode.childNodes).split("/")
+                return splitted[len(splitted)-2]
+            else:
+                return getText(subnode.childNodes)
         except:
             return default
-            
+   
 
     def combineTextImage2(self,path):
         """Eingabe von Metadateninformationen"""