--- OSAS/OSA_system/OSAS_addfiles.py	2004/04/15 21:30:42	1.29
+++ OSAS/OSA_system/OSAS_addfiles.py	2004/06/22 06:39:04	1.33
@@ -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
@@ -304,13 +306,17 @@ class OSAS_add_contextData(Folder):
 
         params=urllib.urlencode({'id':id,'title':title,'link':link,'label':label,'description':description,'contentType':content_type,'responsible':responsible,'weight':weight,'credits':credits,'metalink':metalink})
 
+        print params
+        
         retStr=urllib.urlopen(collection+"/addResource",params).read()
 
 	if not retStr:
             return "An Error occured adding the resource\n"
 	
 
-        urllib.urlopen(collection+"/"+id+"/ECHO_getResourceMD").read()
+        print urllib.urlopen(collection+"/"+id+"/copyIndex_meta2echo_resource").read()
+        print urllib.urlopen(collection+"/"+id+"/generate_label").read()
+        print urllib.urlopen(collection+"/"+id+"/generate_title").read()
 
         return self.REQUEST.RESPONSE.redirect(self.REQUEST['URL2']+'?path='+path)
         
@@ -472,20 +478,21 @@ class OSAS_combineTextImage(Folder):
 	newtemplate=PageTemplateFile('Products/OSA_system/zpt/ImageandText').__of__(self)
 	return newtemplate()
 	
-    def getProjects(self,obj_ids=None):
-        """Get the Project title for configuration"""
+    def getViewerTemplateSets(self,obj_ids=None):
+        """Get the ViewerTemplateSet title for configuration"""
         ret=[]
-        
+        viewerTemplateSets=self.ZopeFind(self.viewerTemplateSets,obj_metatypes=['OSAS_viewerTemplateSet'],obj_ids=obj_ids)#assumes viewerTemplateSets folder somewhere in the hierarchie.
+
         try:
-            projects=self.ZopeFind(self.projects,obj_metatypes=['OSAS_project'],obj_ids=obj_ids)#assumes projects folder somewhere in the hierarchie.
+            viewerTemplateSets=self.ZopeFind(self.viewerTemplateSets,obj_metatypes=['OSAS_viewerTemplateSet'],obj_ids=obj_ids)#assumes viewerTemplateSets folder somewhere in the hierarchie.
             
-            for project in projects:
-                ret.append((project[1].title,project[0],project[1]))
+            for viewerTemplateSet in viewerTemplateSets:
+                ret.append((viewerTemplateSet[1].title,viewerTemplateSet[0],viewerTemplateSet[1]))
             
             return ret
         
         except:
-            return [('no Projectfolders','')]
+            return [('no ViewerTemplateSetfolders','')]
 
     def getTextToolsField(self,path,name,default=''):
         """Lese Textoolsfelder aus index.meta im path aus"""
@@ -494,11 +501,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"""
@@ -521,10 +533,10 @@ class OSAS_combineTextImage(Folder):
 
         return pt()
 
-    def isSelectedProject(self,obj,id):
+    def isSelectedViewerTemplateSet(self,obj,id):
         """is ausgewählt"""
         
-        if self.REQUEST['project']==id:
+        if self.REQUEST['viewerTemplateSet']==id:
             return 1
         else:
             return None