--- OSAS/OSA_system/OSAS_addfiles.py	2004/04/15 21:30:42	1.29
+++ OSAS/OSA_system/OSAS_addfiles.py	2004/05/06 16:58:57	1.32
@@ -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')
@@ -221,7 +221,7 @@ class OSAS_add_contextData(Folder):
                         begin="<b>"
                         end="</b>"
                         
-                    self.retStr+=spaces(self.depth)+"<input type='radio' name='collection' value='%s'>%s</input>"%(attrs.get('url'),begin+attrs.get('name')+end)+"<br>\n"
+                    self.retStr+=spaces(self.depth)+"<input type='radio' name='collection' value='%s'>%s</input>"%(attrs.get('url'),begin+urllib.unquote(attrs.get('name'))+end)+"<br>\n"
 
 
                     
@@ -239,8 +239,10 @@ class OSAS_add_contextData(Folder):
             parser.parse(urllib.urlopen(URL))
             return curHandler.retStr
         except:
+	    return URL
             return urllib.urlopen(URL).read()
-        
+	    
+      
     def __init__(self,id,collection):
         self.id=id
         self.collection=collection
@@ -263,18 +265,18 @@ class OSAS_add_contextData(Folder):
             
         try:
             
-            parser=make_parser()
-            curHandler=requestHandler()
-            parser.setContentHandler(curHandler)
+        	parser=make_parser()
+        	curHandler=requestHandler()
+	        parser.setContentHandler(curHandler)
             
-            parser.parse(urllib.urlopen(URL))
-            return curHandler.ret
+        	parser.parse(urllib.urlopen(URL))
+	        return curHandler.ret
         except:
-            return [("",urllib.urlopen(URL).read())]
-
+        	return [("",URL)]
+	    
     
     def addContextData(self,path):
-        """Hinzufügen zu einer Sammlung"""
+        """Hinzufuegen zu einer Sammlung"""
         try:
             urllib.urlopen(self.REQUEST['SERVER_URL']+path+"/index.meta")
             
@@ -283,7 +285,7 @@ class OSAS_add_contextData(Folder):
 
         links=[(path,'standard storage')]
         
-        links+=OSAS_show.readContexts(path) # auslesen von contexten für den link
+        links+=OSAS_show.readContexts(path) # auslesen von contexten fuer den link
         #print "LINK",links
         #return links
         self.REQUEST.SESSION['links']=links
@@ -494,11 +496,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"""