--- ECHO_content/ECHO_collection.py	2004/05/28 15:01:43	1.95
+++ ECHO_content/ECHO_collection.py	2004/07/18 14:14:42	1.142
@@ -29,7 +29,7 @@ from Products.PageTemplates.ZopePageTemp
 from Globals import Persistent, package_home
 from Acquisition import Implicit
 from ECHO_helpers import displayTypes
-
+import urllib
 
 try:
 	from psycopg import libpq
@@ -46,9 +46,68 @@ import xml.dom.minidom
 from ECHO_graphicalOverview import javaHandler,javaScriptMain
 import ECHO_helpers
 
+def getRDFDescription(self,linkURL,urn=None):
+	    """rdf"""
+	    ret=""
+	    about="""<RDF:Description about="%s">"""
+	    name="""<ECHONAVIGATION:name>%s</ECHONAVIGATION:name>"""
+	    #link="""<ECHONAVIGATION:link>%s</ECHONAVIGATION:link>"""
+	    link="""<ECHONAVIGATION:link RDF:about="%s"/>"""
+	    type="""<ECHONAVIGATION:type>%s</ECHONAVIGATION:type>"""
+
+	    if not urn:
+		    urn="urn:"+re.sub('/',':',self.absolute_url())
+
+	    about2=about%urn
+	    if hasattr(self,'label') and not (self.label==""):
+		    name2=name%urllib.quote(self.label)
+	    elif not self.title=="":
+		    name2=name%urllib.quote(self.title)
+	    else:
+		    name2=name%self.getId()
+		    
+	    link2=link%urllib.quote(linkURL)
+	    type2=type%self.meta_type
+	    
+	    ret=about2+"\n"+name2+"\n"+link2+"\n"+type2+"\n</RDF:Description>"
+	    return ret
+    
+def getCopyrightsFromForm(self,argv): 
+	medias={}
+	partners={}
+	copyrights={}
+	
+	copyrightsFinal=[]
+	for arg in argv.keys():
+		
+		if arg[0:5]=='media':
+			nm=int(arg[5:])
+			medias[nm]=argv[arg]
+		elif arg[0:5]=='partn':
+			nm=int(arg[5:])
+			partners[nm]=argv[arg]
+		elif arg[0:5]=='copyr':
+			nm=int(arg[5:])
+			copyrights[nm]=argv[arg]
+
+
+
+	copyrightsList=[(medias[nm],partners[nm],copyrights[nm]) for nm in medias.keys()]
+	for copyright in copyrightsList:
+		
+		if copyright[2]=='institution0000':
+			copyrightsFinal.append((copyright[0],copyright[1],self.getPartnerCopyright(copyright[1],'')))
+		else:
+			if not copyright[0]=='':
+				copyrightsFinal.append(copyright)
+		
+			
+	return copyrightsFinal
+
 #List of different types for the graphical linking viewer
 viewClassificationListMaster=['view point','area']
 
+
 def checkDiffs(self,metadict):
 	    """check differences"""
 
@@ -88,11 +147,11 @@ def content_html(self,type):
         #
         #if templates:
         #    return templates[0][1]()
-
-        try:
+	
+        if hasattr(self,type+"_template"):
             obj=getattr(self,type+"_template")
             return obj()
-        except:
+        else:
             pt=PageTemplateFile('Products/ECHO_content/zpt/ECHO_%s_template_standard.zpt'%type).__of__(self)
             pt.content_type="text/html"
             return pt()
@@ -151,9 +210,27 @@ class BrowserCheck:
 	self.isIEMac = self.isIE and self.isMac
 
 
-def writeMetadata(url,metadict):
+
+		
+def writeMetadata(url,metadict,project=None,startpage=None,xslt=None,thumbtemplate=None,topbar=None,digiLibTemplate=None):
 	"""Einlesen der Metadaten und und erstellen des geaenderten XML file"""
+	def updateTextToolNode(tag,value):
+		#print dom,tag,value
+		metanode=dom.getElementsByTagName('texttool')[0]
+		try:
+			nodeOld=metanode.getElementsByTagName(tag)
+		except:
+			nodeOld=None
+			
+		if nodeOld:
+			metanode.removeChild(nodeOld[0]).unlink()
 
+		node=dom.createElement(tag)
+		nodetext=dom.createTextNode(value)
+		node.appendChild(nodetext)
+		metanode.appendChild(node)
+
+			
 	try:
 		geturl=""
 		for line in urllib.urlopen(url).readlines():
@@ -202,6 +279,26 @@ def writeMetadata(url,metadict):
 		metanodeneu.appendChild(metanodetext)
 		metanode.appendChild(metanodeneu)
 
+
+	
+	
+	
+	if project:
+		updateTextToolNode('project',project)
+
+	if startpage:
+		updateTextToolNode('startpage',startpage)
+
+	if topbar:
+		updateTextToolNode('toptemplate',topbar)
+
+	if thumbtemplate:
+		updateTextToolNode('thumbtemplate',thumbtemplate)
+
+	if xslt:
+		updateTextToolNode('xslt',xslt)
+
+	
 	
 	return dom.toxml().encode('utf-8')
 
@@ -283,52 +380,61 @@ def setECHO_collectionInformation(self,t
 
         self.coords=coords[0:]
             
+class ECHO_copyright(Folder):
+	"""Copyright informationen"""
+	meta_type="ECHO_copyright"
+	
+	
+	
+	def __init__(self,id,title,copyrights):
+		"""init"""
+		self.title=title
+		self.id=id
+		self.copyrights=copyrights[0:]
 
-class scientificClassification(SimpleItem,Persistent,Implicit):
-    """outdated will be deleeted in the next versions: subclass"""
-    security=ClassSecurityInfo()
-    
-    def __init__(self,context,science,practice):
-        self.context=context
-        self.science=science
-        self.practice=practice
-        self.id="scientific_Classification"
-        
-    security.declarePublic('get_context')
-    def get_context(self):
-        return self.context
-    
-    security.declarePublic('get_science')
-    def get_science(self):
-        return self.science
-        
-    security.declarePublic('get_practice')
-    def get_practice(self):
-        return self.practice
-    
-                
-class scientificInformation(Folder,Persistent,Implicit):
-    """outdated will be deleted in the next versions: subclass scientificInformation"""
-    security=ClassSecurityInfo()
-    
-    
-    
-    def __init__(self,source_type,period):
+	def getCopyrights(self):
+		"""return coyprights"""
+		return self.copyrights
+	        
+	manage_options = Folder.manage_options+(
+		{'label':'Main Config','action':'ECHO_copyright_configForm'},
+		)
 
-        self.id="scientific_Information"
-        self.source_type=source_type
-        self.period=period
-        
+	def ECHO_copyright_configForm(self):
+		"""change form"""
+		pt=PageTemplateFile('Products/ECHO_content/zpt/ChangeECHO_copyright').__of__(self)
+		pt.content_type="text/html"
+		return pt()
+
+	def ECHO_copyright_config(self,title,RESPONSE=None):
+		"""change"""
+		self.title=title
+		self.copyrights=[]
+		self.copyrights=getCopyrightsFromForm(self,self.REQUEST.form)[0:]
 
+		if RESPONSE is not None:
+			RESPONSE.redirect('manage_main')
 
-    security.declarePublic('get_source_type')
-    def get_source_type(self):
-        return self.source_type
-    
-    security.declarePublic('get_period')
-    def get_period(self):
-        return self.period
+		
+def manage_addECHO_copyrightForm(self):
+    """Form for adding"""
+    pt=PageTemplateFile('Products/ECHO_content/zpt/AddECHO_copyright.zpt').__of__(self)
+    return pt()
+
+def manage_addECHO_copyright(self, id,title,RESPONSE=None):
+	"""add the copyright"""
+
+	meta_type="ECHO_copyright"
+	
+	#first generate copyrights as list of tripels (mediaType,partner,copyrightType)
+	
+		
+
+	self._setObject(id, ECHO_copyright(id, title,getCopyrightsFromForm(self,self.REQUEST.form)))
 
+	if RESPONSE is not None:
+		RESPONSE.redirect('manage_main')
+	
 class ECHO_layoutTemplate(ZopePageTemplate):
     """Create a layout Template for different purposes"""
 
@@ -397,21 +503,273 @@ def manage_addECHO_layoutTemplate(self,
     REQUEST.RESPONSE.redirect(u+'/manage_main')
     return ''
 
+
+
 class ECHO_resource(Folder,Persistent):
     """ECHO Ressource"""
+    security=ClassSecurityInfo()
     meta_type='ECHO_resource'
 
     viewClassificationList=viewClassificationListMaster
 
     getSubCols = ECHO_helpers.getSubCols
+
+    security.declareProtected('View','index_html')
+    def getRDF(self):
+	    """rdf"""
+	    return getRDFDescription(self,self.link)
+	    
+	    
+    def getAccessRightSelectorHTML(self,outlook="select"):
+	    """htmlselector"""
+	    values=['free','mpiwg']
+	    
+	    if outlook=="select":
+		    ret="""<select name="%s">"""%self.getId()
+
+		    for value in values:
+			    if value==self.getAccessRightMD():
+				    ret+="<option selected>%s</option>"%value
+			    else:
+				    ret+="<option>%s</option>"%value
+		    return ret+"</select>"
+
+	    else:
+		    ret=""
+		    for value in values:
+			    print
+			    if value==self.getAccessRightMD():
+				    ret+="""<input type="radio" name="%s" value="%s" checked>%s"""%(self.getId(),value,value)
+			    else:
+				    ret+="""<input type="radio" name="%s" value="%s">%s"""%(self.getId(),value,value)
+		    return ret
+
+
+    
+    def getAccessRightMD(self):
+		"""set accessright"""
+		url=self.metalink
+
+		try:
+			geturl=""
+			for line in urllib.urlopen(url).readlines():
+				geturl=geturl+line
+
+
+		except:
+			return (None,"Cannot open: "+url)
+
+		try:
+			dom=xml.dom.minidom.parseString(geturl)
+			root=dom.getElementsByTagName('resource')[0]
+		except:
+			return (None,"Cannot parse: "+url+"<br>"+geturl)
+
+		internal=dom.getElementsByTagName('internal')
+		if internal:
+			institution=dom.getElementsByTagName('institution')
+			return getText(institution[0].childNodes)
+		
+		free=dom.getElementsByTagName('free')
+		if free:
+			return "free"
+
+		return "free" #default free
+
+    def changeAccessRightMD(self,accessright,RESPONSE=None):
+	    """change the rights"""
+	    
+	    params="accessright=%s"%accessright
+
+
+	    #print urllib.urlopen(self.absolute_url()+'/setAccessRightXML'+'?'+params).read()
+
+	    
+	    urllib.urlopen('http://xserve02.mpiwg-berlin.mpg.de:18880/echo_nav/storage/downloadExternalXML?index_meta_url=%s&xml_url=%s'%(self.metalink,self.absolute_url()+'/setAccessRightXML'+urllib.quote('?'+params))).read()
+
+	  
+	    if RESPONSE is not None:
+			RESPONSE.redirect('manage_main')
+
+		
+    def setAccessRightXML(self,accessright):
+		"""set accessright"""
+		url=self.metalink
+
+		try:
+			geturl=""
+			for line in urllib.urlopen(url).readlines():
+				geturl=geturl+line 
+
+
+		except:
+			return (None,"Cannot open: "+url)
+
+		try:
+			dom=xml.dom.minidom.parseString(geturl)
+			root=dom.getElementsByTagName('resource')[0]
+		except:
+			return (None,"Cannot parse: "+url+"<br>"+geturl)
+
+		metanodes=dom.getElementsByTagName('access-conditions')
+
+		if not metanodes:
+			nodenew=dom.createElement('access-conditions')
+			root.appendChild(nodenew)
+			metanode=nodenew
+		else:
+			metanode=metanodes[0]
+
+		accesses=metanode.getElementsByTagName('access')
+
+		if not accesses:
+			nodenew2=dom.createElement('access')
+			metanode.appendChild(nodenew2)
+			metanode2=nodenew2
+		else:
+			metanode2=accesses[0]
+
+		internal=metanode.getElementsByTagName('internal')
+
+		if internal:
+			metanode2.removeChild(internal[0]).unlink()
+
+		free=metanode.getElementsByTagName('free')
+		
+		if free:
+			metanode2.removeChild(internal[0]).unlink()
+
+
+		if accessright=='free':
+			nodenew3=dom.createElement('free')
+			metanode2.appendChild(nodenew3)
+		elif accessright=='mpiwg':
+			nodenew3=dom.createElement('internal')
+			nodenew4=dom.createElement('institution')
+			metanodetext=dom.createTextNode('mpiwg')
+			nodenew4.appendChild(metanodetext)
+			nodenew3.appendChild(nodenew4)
+			metanode2.appendChild(nodenew3)
+
+		return dom.toxml().encode('utf-8')
+
+    def setStartPageForm(self):
+	    """Form for changing the startpage"""
+
+	    
+	    pt=PageTemplateFile('Products/ECHO_content/zpt/ChangeECHO_resourceStartPage.zpt').__of__(self)
+            pt.content_type="text/html"
+            return pt()
+    
+    
+    def setStartPage(self,startpage=None,RESPONSE=None):
+	    """set start page, if no startpage defined use the generic one of the resource"""
+
+	    if (not (type(startpage)==StringType)) and ("__generic" in startpage): # checke ob generic in der liste
+		    startpage=self.absolute_url()+"/startpage_html"
+		    
+	    if (not startpage) or (startpage=="__generic"):
+		     startpage=self.absolute_url()+"/startpage_html"
+	    
+    
+	    params="startpage=%s"%startpage
+	    
+	    urllib.urlopen('http://xserve02.mpiwg-berlin.mpg.de:18880/echo_nav/storage/downloadExternalXML?index_meta_url=%s&xml_url=%s'%(self.metalink,self.absolute_url()+'/newMetaXML'+urllib.quote('?'+params))).read()
+	
+	    
+	    path=self.metalink
+	    
+	    path=re.sub(self.REQUEST['SERVER_URL'],'',path)
+	    path=re.sub('http://'+self.REQUEST['HTTP_HOST'],'',path)
+
+	    path=re.sub('http://foxridge.mpiwg-berlin.mpg.de:8080','',path) # falls foxridge als server
+	    path=re.sub('http://foxridge.mpiwg-berlin.mpg.de','',path) # falls foxridge als server
+	    path=re.sub('http://foxridge.rz-berlin.mpg.de:8080','',path) # falls foxridge als server
+	    path=re.sub('http://foxridge.rz-berlin.mpg.de','',path) # falls foxridge als server
+	    path=re.sub('/index.meta','',path) 
+
+
+	    urllib.urlopen("http://nausikaa2.rz-berlin.mpg.de:86/cgi-bin/toc/admin/reg.cgi?path=%s"%path).readlines()
+
+	    if RESPONSE is not None:
+			RESPONSE.redirect('manage_main')
+
+    def changeViewerTemplateSetForm(self):
+	    """change the viewer template set"""
+	    pt=PageTemplateFile('Products/ECHO_content/zpt/changeResourceViewerTemplateSet').__of__(self)
+            return pt()
+
+
+    def getTextToolsField(self,name,default=''):
+        """Lese Textoolsfelder aus index.meta im path aus"""
+        
+        try:
+            dom=xml.dom.minidom.parse(self.metalink)
+            node=dom.getElementsByTagName('texttool')[0] #getNode
+            subnode=node.getElementsByTagName(name)[0]
+
+            # 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 changeViewerTemplateSet(self,project,xslt,thumbtemplate,topbar,digiLibTemplate,RESPONSE=None):
+	    """changeit"""
+
+	    paramList=['project','startpage','xslt','thumbtemplate','topbar','digiLibTemplate']
+
+	    
+	    #writeMetadata(self.metalink,self.metaDataHash,project,None,xslt,thumbtemplate,topbar,digiLibTemplate)
+
+	    params="project=%s&xslt=%s&thumbtemplate=%s&topbar=%s&digiLibTemplate=%s"%(project,xslt,thumbtemplate,topbar,digiLibTemplate)
+
+	    
+	    urllib.urlopen('http://echo.mpiwg-berlin.mpg.de/echo_nav/storage/downloadExternalXML?index_meta_url=%s&xml_url=%s'%(self.metalink,self.absolute_url()+'/newMetaXML'+urllib.quote('?'+params))).read()
+
+	    # hack Pfad auf die Dokumente
+	    path=self.metalink
+	    
+	    
+
+	    path=re.sub('/index.meta','',path) 
+
+	    path=re.sub(self.REQUEST['SERVER_URL'],'',path)
+	    path=re.sub('http://'+self.REQUEST['HTTP_HOST'],'',path)
+
+  	    path=re.sub('http://foxridge.mpiwg-berlin.mpg.de:8080','',path) # falls foxridge als server
+  	    path=re.sub('http://foxridge.mpiwg-berlin.mpg.de:8080','',path) # falls foxridge als server
+	    path=re.sub('http://foxridge.mpiwg-berlin.mpg.de','',path) # falls foxridge als server
+
+	    path=re.sub('http://foxridge.rz-berlin.mpg.de:8080','',path) # falls foxridge als server
+	    path=re.sub('http://foxridge.rz-berlin.mpg.de','',path) # falls foxridge als server
+
+	    return urllib.urlopen("http://nausikaa2.rz-berlin.mpg.de:86/cgi-bin/toc/admin/reg.cgi?path=%s"%path).readlines()
+
+	    if RESPONSE is not None:
+			RESPONSE.redirect('manage_main')
+
+    
     def getTitle(self):
 	"""title"""
-	return self.title.encode('utf-8') 
-
+	try:
+		return self.title.encode('utf-8','ignore') 
+	except:
+		self.title=self.title.decode('iso-8859-1','ignore')[0:] #correnct conding error
+		return self.title.encode('utf-8','ignore') 
+	
     def getLabel(self):
 	"""title"""
-	return self.label.encode('utf-8') 
-
+	try:
+		return self.label.encode('utf-8','ignore') 
+	except:
+		self.label=self.label.decode('iso-8859-1','ignore')[0:] #correnct conding error
+		return self.label.encode('utf-8','ignore') 
+	
     def content_html(self):
         """template fuer content"""
         return content_html(self,'resource')
@@ -430,8 +788,9 @@ class ECHO_resource(Folder,Persistent):
 		    texttools=dom.getElementsByTagName('texttool')
 		    text=texttools[0].getElementsByTagName('text')
 		    texturl=getText(text[0].childNodes)
-		    self.REQUEST.RESPONSE.setHeader('Content-Type','text/xml')
+		    
 		    if not noredirect:
+                            self.REQUEST.RESPONSE.setHeader('Content-Type','text/xml')	
 			    self.REQUEST.RESPONSE.redirect(texturl)
 		    else:
 			    return texturl
@@ -443,17 +802,36 @@ class ECHO_resource(Folder,Persistent):
 		    else:
 			    return "<error>no fulltext available</error>"
 
-    def getCopyright(self):
-	    """gib link auf copyright notiz aus"""
-	    if hasattr(self,'copyrightType'):
-		    obj=getattr(self.copyrightTypes,'copyrightType')
+    def getCopyrightsHTML(self):
+	    """gib (link auf copyright link, mediatyp, institution, copyrightType, label von copyrightType) aus"""
+	    
+	    if hasattr(self,'copyrightModel'):
+		    obj=self.copyrightModel
+		    
 	    else:
-		    obj=getattr(self.copyrightTypes,'generic')
-
-	    label=obj.label
-	    link="copyrightTypes/"+obj.getId()+'/copyright.html'
+		    return "ERROR"
+	    ret=[]
 	    
-	    return """<a target="_blank" href="%s">%s</a>"""%(link,label)
+	    for copyright in obj.getCopyrights():
+		    
+		    link="copyrightTypes/"+copyright[2]+'/copyright.html'
+		    
+		    try:
+		        copyrightTypeObj=getattr(self.copyrightTypes,copyright[2])
+		        label=copyrightTypeObj.label
+		        url=copyrightTypeObj.url
+			    
+		        if url!='':
+			         ret.append((url,copyright[0],copyright[1],copyright[2],label))
+		        else:
+			        if hasattr(copyrightTypeObj, 'copyright.html'):
+			             ret.append(("""%s?partner=%s"""%(link,copyright[1]),copyright[0],copyright[1],copyright[2],label))
+			        else:
+			             ret.append(('empty',copyright[0],copyright[1],copyright[2],label))
+		    except:
+			    """nothing"""
+		    
+	    return ret
     
     def getCredits(self):
         """Ausgabe der credits"""
@@ -556,7 +934,8 @@ class ECHO_resource(Folder,Persistent):
 		self.contentType=self.bib_type
 		for data in self.metadata:
 			data_neu=re.sub('-','_',data)
-			self.metaDataHash[data_neu]=getattr(self,data)
+			self.meta
+                        DataHash[data_neu]=getattr(self,data)[0:]
 
 	
         pt=PageTemplateFile('Products/ECHO_content/zpt/ChangeECHO_resource_metadata.zpt').__of__(self)
@@ -614,7 +993,7 @@ class ECHO_resource(Folder,Persistent):
 	    """change metadata"""
 	    tags=self.findTagsFromMapping(self.contentType)
 	    for field in tags[1]:
-		    self.metaDataHash[self.getFieldTag(tags,field)]=self.REQUEST.form[self.getFieldTag(tags,field)]
+		    self.metaDataHash[self.getFieldTag(tags,field)]=self.REQUEST.form[self.getFieldTag(tags,field)][0:]
 			
 
 	    	    
@@ -632,8 +1011,9 @@ class ECHO_resource(Folder,Persistent):
 		    except:
 			    """nothing"""
 
-	    return urllib.urlopen('http://xserve02.mpiwg-berlin.mpg.de:18880/echo_nav/storage/downloadExternalXML?index_meta_url=%s&xml_url=%s'%(self.metalink,self.absolute_url()+'/newMetaXML')).read()
-	    
+	    urllib.urlopen('http://xserve02.mpiwg-berlin.mpg.de:18880/echo_nav/storage/downloadExternalXML?index_meta_url=%s&xml_url=%s'%(self.metalink,self.absolute_url()+'/newMetaXML')).read()
+
+
 	    if RESPONSE is not None:
 		    RESPONSE.redirect('manage_main')
 
@@ -641,13 +1021,19 @@ class ECHO_resource(Folder,Persistent):
     def getMDValue(self,fieldName):
 	    return self.metaDataHash.get(fieldName,'!!NOT USED HERE in Type: %s'%self.contentType)
 					 
-    def newMetaXML(self):
+    def newMetaXML(self,project=None,startpage=None,xslt=None,thumbtemplate=None,topbar=None,digiLibTemplate=None):
 	    """new index.meta"""
 	    self.REQUEST.RESPONSE.setHeader('Content-Type','text/xml')
-	    return writeMetadata(self.metalink,self.OSAS_meta)
 
+	    if not hasattr(self,'metaDataHash'):
+		
+		    self.copyIndex_meta2echo_resource()
+	    try:
+		    return writeMetadata(self.metalink,self.OSAS_meta,project,startpage,xslt,thumbtemplate,topbar,digiLibTemplate)
+	    except:
+		    return writeMetadata(self.metalink,self.metaDataHash,project,startpage,xslt,thumbtemplate,topbar,digiLibTemplate)
 
-    def getMetaDataXML(self):
+    def getMetaDataXML(self,project=None,startpage=None,xslt=None,thumbtemplate=None,topbar=None,digiLibTemplate=None):
 	    """prints out metadata as stored in the echo environment, format is the index.meta format"""
 	    self.REQUEST.RESPONSE.setHeader('Content-Type','text/xml')
 	    return writeMetadata(self.metalink,self.metaDataHash)
@@ -672,11 +1058,13 @@ class ECHO_resource(Folder,Persistent):
             
     manage_options = Folder.manage_options+(
         {'label':'Main Config','action':'ECHO_resource_config_main'},
-	{'label':'Change Partners & Copyright','action':'ECHO_resource_config_credits'},
 	{'label':'Change Metadata','action':'ECHO_resource_config_metadata'},
 	{'label':'Change Coords','action':'ECHO_resource_config_coords'},
 	{'label':'Add coords','action':'ECHO_graphicEntry'},
         {'label':'Sync Metadata','action':'ECHO_getResourceMD'},
+	{'label':'Change TemplateSets','action':'changeViewerTemplateSetForm'},
+	{'label':'set/change startpage','action':'setStartPageForm'},
+	{'label':'Copy MD for indexing and search','action':'copySearchFields'},
 	)
 
     def getOverview(self):
@@ -765,6 +1153,12 @@ class ECHO_resource(Folder,Persistent):
 	self.metaDataHash[field]=value[0:]
 	
 
+    def copySearchFields(self):
+	    """copys metadatafields to the object"""
+	    fields=['author','title','year']
+	    for field in fields:
+		    setattr(self,'MD_'+field,self.getFieldValue(field))
+    
 
     def findLabelsFromMapping(self,referenceType):
         """gib hash mit label -> generic zurueck"""
@@ -819,8 +1213,9 @@ class ECHO_resource(Folder,Persistent):
         bibdata={}
         retdata={}
         fieldlist=self.standardMD.fieldList
-        
+        fields=[]
 	for referenceTypeF in temp:
+		#print referenceType
 	
 		if referenceTypeF[1].title.lower() == referenceType.lower(): 
 			try:
@@ -836,15 +1231,20 @@ class ECHO_resource(Folder,Persistent):
         return retdata,fieldlist,temp,fields
 
     
-
+    security.declarePublic('copyIndex_meta2echo_resource') # has to be change, presentlyset because of OSAS koordination
     def copyIndex_meta2echo_resource(self,RESPONSE=None):
 	    """copy MD von Index_meta to the echo_resource"""
 	    
 	    (metadict, error)=readMetadata(self.metalink)
+
+
 	    
 	    self.metaDataHash={}
 	    if not error=="": #Fehler beim Auslesen des Metafiles
+		    
 		    return "ERROR:",error
+	    
+	    self.contentType=metadict['bib_type'][0:]
 	    fields=self.findTagsFromMapping(self.contentType)
 	    
 	    #fields=self.findLabelsFromMapping(self.contentType)
@@ -859,11 +1259,12 @@ class ECHO_resource(Folder,Persistent):
 	    if RESPONSE:
 		    return RESPONSE.redirect('manage_main')
 	    
-    def ECHO_getResourceMD(self,template="yes"):
+    def ECHO_getResourceMD(self,template="yes",back=None):
         """Einlesen der Metadaten und Anlegen dieser Metadaten als Informationen zur Resource"""
         (metadict, error)=readMetadata(self.metalink)
 
-	
+        if back:
+            self.REQUEST.SESSION['back']=back
 
         if not error=="": #Fehler beim Auslesen des Metafiles
 		return "ERROR:",error
@@ -928,21 +1329,27 @@ class ECHO_resource(Folder,Persistent):
 		    return sp[0][1]()
 
 
-		    
+    security.declarePublic('generate_label') # has to be change, presentlyset because of OSAS koordination
+
     def generate_label(self):
         """Erzeugt_standard_Label aus Template"""
-        pt=getattr(self,"label_template_"+self.bib_type)
+        pt=getattr(self,"label_template_"+self.contentType.lower())
 
+	self.label=pt()[0:]
         return pt()
 
+    security.declarePublic('generate_title') # has to be change, presentlyset because of OSAS koordination
+
     def generate_title(self,RESPONSE=None):
         """Erzeugt_standard_Label aus Template"""
-        pt=getattr(self,"label_template_"+self.contentType)
+        pt=getattr(self,"label_template_"+self.contentType.lower())
 
-	self.title=pt()
+	self.title=pt()[0:]
 	
         return pt()
 
+Globals.InitializeClass(ECHO_resource)
+
 def manage_addECHO_resourceForm(self):
         """Form for adding a ressource"""
         pt=PageTemplateFile('Products/ECHO_content/zpt/AddECHO_resourceForm.zpt').__of__(self)
@@ -968,11 +1375,19 @@ class ECHO_externalLink(Folder):
 
     def getTitle(self):
 	"""title"""
-	return self.title.encode('utf-8') 
-
+	try:
+		return self.title.encode('utf-8','ignore') 
+	except:
+		self.title=self.title.decode('iso-8859-1','ignore')[0:] #correnct conding error
+		return self.title.encode('utf-8','ignore') 
+	
     def getLabel(self):
 	"""title"""
-	return self.label.encode('utf-8') 
+	try:
+		return self.label.encode('utf-8','ignore') 
+	except:
+		self.label=self.label.decode('iso-8859-1','ignore')[0:] #correnct conding error
+		return self.label.encode('utf-8','ignore') 
 
     def content_html(self):
         """template fuer content"""
@@ -1028,12 +1443,6 @@ class ECHO_externalLink(Folder):
         {'label':'Main Config','action':'ECHO_externalLink_config'},
         )
 
-    def getCredits(self):
-        """Ausgabe der credits"""
-        if self.credits:
-            return self.credits
-        else:
-            return []
         
     def index_html(self):
         """standard page"""
@@ -1095,6 +1504,242 @@ class ECHO_collection(Folder, Persistent
     viewClassificationList=viewClassificationListMaster
     displayTypes=displayTypes
 
+    path="/mpiwg/online/permanent/shipbuilding"
+
+    def showRDF(self):
+	    """showrdf"""
+            self.REQUEST.RESPONSE.setHeader('Content-Type','text/xml')
+	    ret="""<?xml encoding="utf-8"?>\n<RDF:RDF xmlns:RDF="http://www.w3.org/1999/02/22-rdf-syntax-ns#"  xmlns:ECHONAVIGATION="http://www.echo.eu/rdf#">\n"""
+	    ret+=self.getRDF(urn="echo:collectionroot")+"\n"
+	    ret+="""</RDF:RDF>"""
+    	    return ret 
+
+    def getRDF(self,urn=None):
+	    """rdf of the collection"""
+	    contents=self.ZopeFind(self,obj_metatypes=['ECHO_group','ECHO_resource','ECHO_collection'])
+
+	    ret=getRDFDescription(self,self.absolute_url(),urn)
+
+	    if not urn:
+		    urn="urn:"+re.sub('/',':',self.absolute_url())
+	    else:
+		    urn="urn:"+urn
+		    
+	    li="""<RDF:li resource="%s" />\n"""
+
+	    
+	    for content in contents:
+		    ret+=content[1].getRDF()+"\n"
+		    
+	    ret+="""<RDF:Seq about="%s">\n"""%urn
+	    for content in contents:
+		    nurn="urn:"+re.sub('/',':',content[1].absolute_url())
+		    ret+=li%nurn
+	    return ret+"</RDF:Seq>"
+	    
+	    
+    def changeLabels(self):
+		"""change form"""
+		pt=PageTemplateFile('Products/ECHO_content/zpt/changeLabelsForm').__of__(self)
+		pt.content_type="text/html"
+		return pt()
+
+    def changeTitles(self):
+		"""change form"""
+		pt=PageTemplateFile('Products/ECHO_content/zpt/changeTitleForm').__of__(self)
+		pt.content_type="text/html"
+		return pt()
+
+    def changeAccessRightsCollection(self):
+	    """change"""
+	    ret=""
+	    argv=self.REQUEST.form
+	    
+	    resources=self.ZopeFind(self,obj_metatypes=['ECHO_resource'])
+	    for resource in resources:
+		   
+		    try:
+			    ret+=resource[1].getId()+"   "+argv[resource[1].getId()]+"</br>"
+			    resource[1].changeAccessRightMD(argv[resource[1].getId()])
+		    except:
+			    """not"""
+	    return ret
+
+    def changeLabelsInCollection(self):
+	    """change all lables of a collection"""
+	    ret=""
+	    argv=self.REQUEST.form
+	    
+	    resources=self.ZopeFind(self,obj_metatypes=['ECHO_resource'])
+	    for resource in resources:
+		   
+		    try:
+			    ret+=resource[1].getId()+"   "+argv[resource[1].getId()]+"</br>"
+                            resource[1].label=argv[resource[1].getId()][0:]
+		    except:
+			    """not"""
+	    return ret
+
+    def changeTitlesInCollection(self):
+	    """change all lables of a collection"""
+	    ret=""
+	    argv=self.REQUEST.form
+	    
+	    resources=self.ZopeFind(self,obj_metatypes=['ECHO_resource'])
+	    for resource in resources:
+		   
+		    try:
+			    ret+=resource[1].getId()+"   "+argv[resource[1].getId()]+"</br>"
+                            resource[1].title=argv[resource[1].getId()][0:]
+		    except:
+			    """not"""
+	    return ret
+        
+    def updateCollection(self,RESPONSE=None):
+        """liest verzeichnisse aus dem pfad und legt sie dann als objekte in den ordner"""
+        files=os.listdir(self.path)
+	ret=""
+        for fileName in files:
+            
+            if fileName:
+		
+		tempPath=re.sub("/mpiwg/online","",self.path)
+		link="http://echo.mpiwg-berlin.mpg.de/zogilib_book?fn="+tempPath+"/"+fileName+"/pageimg"
+		
+		metalink=self.path+"/"+fileName+"/index.meta"
+                try:
+
+			#link="http://nausikaa2.mpiwg-berlin.mpg.de/cgi-bin/toc/toc.x.cgi?dir="+fileName+"&step=thumb"
+			
+			newObj=ECHO_resource(fileName,link,metalink,fileName,fileName,fileName,'generated','book','','','','','','')
+			self._setObject(fileName,newObj)
+                
+			genObj=getattr(self,fileName)
+                        #genObj.createIndexFile()
+			ret+="OK:"+fileName+"<br/>"
+		except:
+			print "ERROR"
+			ret+="ERROR:"+fileName+"<br/>"
+
+	return ret
+
+        if RESPONSE is not None:
+            RESPONSE.redirect('manage_main')
+
+    def updateCollectionMD(self,RESPONSE=None):
+        """updateMD"""
+        files=os.listdir(self.path)
+        for fileName in files:
+            if fileName:
+                genObj=getattr(self,fileName)
+                genObj.copyIndex_meta2echo_resource()
+                genObj.generate_title()
+
+        if RESPONSE is not None:
+            RESPONSE.redirect('manage_main')
+
+
+
+    def changeViewerTemplateSetsForm(self):
+	    """change the viewer template set"""
+	    pt=PageTemplateFile('Products/ECHO_content/zpt/changeViewerTemplateSet').__of__(self)
+            return pt()
+
+    def getViewerTemplateSets(self,obj_ids=None):
+	    """Get the ViewerTemplateSet title for configuration"""
+	    ret=[]
+	    
+	    try:
+		    viewerTemplateSets=self.ZopeFind(self.viewerTemplateSets,obj_metatypes=['OSAS_viewerTemplateSet'],obj_ids=obj_ids)#assumes viewerTemplateSets folder somewhere in the hierarchie.
+            
+		    for viewerTemplateSet in viewerTemplateSets:
+			    ret.append((viewerTemplateSet[1].title,viewerTemplateSet[0],viewerTemplateSet[1]))
+			    
+		    return ret
+		    
+	    except:
+		    return [('no ViewerTemplateSetfolders','')]
+
+    def getTextToolsField(self,name,default=''):
+	    """Lese viewerTemplateSet der Collection not implemented yet!"""
+	    
+	    return default
+
+            
+    def isSelectedViewerTemplateSet(self,obj,id):
+        """is ausgewählt"""
+        
+        if self.REQUEST['viewerTemplateSet']==id:
+            return 1
+        else:
+            return None
+
+    def changeViewerTemplateSets(self,project,xslt,thumbtemplate,topbar,digiLibTemplate,RESPONSE=None):
+	    """change the templates"""
+
+	    resources=self.ZopeFind(self,obj_metatypes=['ECHO_resource'])
+
+	    for resource in resources:
+
+		    resource[1].changeViewerTemplateSet(project,xslt,thumbtemplate,topbar,digiLibTemplate)
+
+	    if RESPONSE is not None:
+		    RESPONSE.redirect('manage_main')
+
+
+    def copySearchFields(self,RESPONSE=None):
+	    """copys import metadatafields to the object"""
+	    resources=self.ZopeFind(self,obj_metatypes=['ECHO_resource'])
+
+	    for resource in resources:
+
+		    resource[1].copySearchFields()
+
+	    if RESPONSE is not None:
+		    RESPONSE.redirect('manage_main')
+
+    def reloadMetaDataFromStorage(self,RESPONSE=None):
+	    """copy metadata from the storage to ECHO"""
+	    ret=""
+	    resources=self.ZopeFind(self,obj_metatypes=['ECHO_resource'])
+
+	    for resource in resources:
+
+		    ret+=str(resource[1].copyIndex_meta2echo_resource())+"<br>"
+
+
+	    if RESPONSE is not None:
+		    #		    RESPONSE.redirect('manage_main')
+		    return ret
+	    
+    def getPartnerCopyright(self,name,sonst="generic"):
+		"""gibt generisches copyright eines partners aus, sonst behalte jetzige einsteillung"""
+		#print "hi",name,sonst
+		#print getattr(self.partners,name).copyrightType
+		try:
+			partner=getattr(self.partners,name)
+			return partner.copyrightType
+		except:
+			print "error"
+			return sonst
+
+    def partnerSelector_HTML(self,selected=None):
+         """give type selector"""
+	 if not selected:
+		 retStr="<option selected>\n"
+	 else:
+		 retStr="<option>\n"
+		 
+	 try: # erste version copyrightTypes exists
+		 for partner in self.credits:
+			 if selected and (partner==selected):
+				 retStr+="""<option selected value="%s">%s\n"""%(partner,partner)
+			 else:                
+				 retStr+="""<option value="%s">%s\n"""%(partner,partner)
+	 except:
+		 """nothing"""
+	 return retStr
+ 
     def getViewClassification(self):
         if hasattr(self,'viewClassification'):
             return self.viewClassification
@@ -1103,14 +1748,20 @@ class ECHO_collection(Folder, Persistent
 
     def getTitle(self):
 	"""title"""
-	return self.title.encode('utf-8') 
-
+	try:
+		return self.title.encode('utf-8','ignore') 
+	except:
+		self.title=self.title.decode('iso-8859-1','ignore')[0:] #correnct conding error
+		return self.title.encode('utf-8','ignore') 
+	
     def getLabel(self):
 	"""title"""
-	return self.label.encode('utf-8') 
-
-    
-	    
+	try:
+		return self.label.encode('utf-8','ignore') 
+	except:
+		self.label=self.label.decode('iso-8859-1','ignore')[0:] #correnct conding error
+		return self.label.encode('utf-8','ignore')
+	
     def createRessourcesFromXMLForm(self):
 	    """form"""
 	    pt=PageTemplateFile('Products/ECHO_content/zpt/createRessourcesFromXMLForm.zpt').__of__(self)
@@ -1130,6 +1781,7 @@ class ECHO_collection(Folder, Persistent
 		    ret+="<p>"+label+"</p>"
 		    manage_addECHO_resource(self,id,label.encode('ascii'),label.encode('ascii'),"","","",link.encode('ascii'),"","")
 	    return ret
+    
     def getImageTag(self):
         """GetTag"""
         try:
@@ -1140,7 +1792,7 @@ class ECHO_collection(Folder, Persistent
     def addResource(self,id,title,label,description,contentType,responsible,link,metalink,weight,credits=None,coords=None,RESPONSE=None):
         """SSS"""
         try:
-            manage_addECHO_resource(self,id,title,label,description,contentType,responsible,link,metalink,weight,credits=None,coords=None,RESPONSE=None)
+            manage_addECHO_resource(self,id,title,label,description,responsible,link,metalink,weight,credits=None,coords=None,RESPONSE=None)
             return "done"
         except:
             return None
@@ -1307,8 +1959,10 @@ class ECHO_collection(Folder, Persistent
     
     security.declarePublic('ECHO_rerenderLinksMD')
 
-    def ECHO_rerenderLinksMD(self,obj=None):
+    def ECHO_rerenderLinksMD(self,obj=None,types=['title','label']):
         """Rerender all Links"""
+	ret=""
+	
         if not obj:
             obj = self
             
@@ -1316,14 +1970,22 @@ class ECHO_collection(Folder, Persistent
 
         for entry in entries:
 		if entry[1].meta_type == 'ECHO_resource':
-			entry[1].ECHO_getResourceMD(template="no")
+			try:
+				entry[1].ECHO_getResourceMD(template="no")
+                                if "title" in types:
+                                    entry[1].generate_title()
+                                if "label" in types:
+                                    entry[1].generate_label()
+				ret+="OK:"+entry[0]+"-- "+entry[1].getTitle().decode('utf-8')+"-- "+entry[1].getTitle().decode('utf-8')+"<br>"
+			except:
+				ret+="Error:"+entry[0]+"<br>"
 
 		else:
 		   self.ECHO_rerenderLinksMD(entry[1])
 
                 
                 
-        return "Rerenderd all links to resources in: "+self.title
+        return ret+"Rerenderd all links to resources in: "+self.title
 
     security.declarePublic('ECHO_newViewerLink')
     
@@ -1361,10 +2023,15 @@ class ECHO_collection(Folder, Persistent
 
     manage_options = Folder.manage_options+(
         {'label':'Main Config','action':'ECHO_collection_config'},
-        {'label':'Rerender Links','action':'ECHO_rerenderLinksMD'},
+        {'label':'Change Labels','action':'changeLabels'},
+        {'label':'Change Titles','action':'changeTitles'},
+        {'label':'Rerender Labels and Titles','action':'ECHO_rerenderLinksMD'},
         {'label':'Graphics','action':'ECHO_graphicEntry'},
 	{'label':'create resources from XML','action':'createRessourcesFromXMLForm'},
-
+        {'label':'Change Viewer Templates','action':'changeViewerTemplateSetsForm'},
+	{'label':'Reload Metadata','action':'reloadMetaDataFromStorage'},
+	{'label':'ImportCollection','action':'updateCollection'},
+	{'label':'Copy MD for indexing and search','action':'copySearchFields'},
         )
 
     def getOverview(self):
@@ -1423,7 +2090,7 @@ class ECHO_collection(Folder, Persistent
 	    else:
 		    return "#dddddd"
 	    
-    def changeECHO_collection(self,title,label,description,contentType,responsible,weight,secondaryLink,secondaryLinkTitle,credits=None,sortfield="weight",coords=None,RESPONSE=None,imageTag="",bgcolour="",viewClassification=None):
+    def changeECHO_collection(self,title,label,description,contentType,responsible,weight,secondaryLink,secondaryLinkTitle,credits=None,sortfield="weight",coords=None,RESPONSE=None,imageTag="",bgcolour="",viewClassification=None,location=None):
         """Aenderung der Properties"""
 
         self.secondaryLink=secondaryLink
@@ -1431,6 +2098,7 @@ class ECHO_collection(Folder, Persistent
         self.imageTag=imageTag
 	self.bgcolour=bgcolour
         self.viewClassification=viewClassification
+        self.location=location
 	
         if coords:
             coordsnew=[ string.split(x,",") for x in coords]
@@ -1572,6 +2240,28 @@ class ECHO_group(ECHO_collection):
 		)
 	
 	security.declareProtected('View','index_html')
+
+	def getRDF(self):
+	    """rdf of the collection"""
+	    contents=self.ZopeFind(self,obj_metatypes=['ECHO_group','ECHO_resource','ECHO_collection'])
+
+	    ret=getRDFDescription(self,self.absolute_url())
+
+	    
+
+	    urn="urn:"+re.sub('/',':',self.absolute_url())
+	    li="""<RDF:li resource="%s" />\n"""
+	    
+	    
+	    for content in contents:
+		    ret+=content[1].getRDF()+"\n"
+		    
+	    ret+="""<RDF:Seq about="%s">\n"""%urn
+	    for content in contents:
+		    nurn="urn:"+re.sub('/',':',content[1].absolute_url())
+		    ret+=li%nurn
+	    return ret+"</RDF:Seq>"
+	    
 	def index_html(self):
 		"""standard page"""
 		displayedObjects=self.ZopeFind(self,obj_metatypes=displayTypes)
@@ -1787,7 +2477,53 @@ class ECHO_root(Folder,Persistent,Implic
     security=ClassSecurityInfo()
     
     meta_type="ECHO_root"
+    
+    def showRDF(self):
+	    """showrdf"""
+            self.REQUEST.RESPONSE.setHeader('Content-Type','text/xml')
+	    ret="""<RDF:RDF xmlns:RDF="http://www.w3.org/1999/02/22-rdf-syntax-ns#"  xmlns:ECHONAVIGATION="http://www.echo.eu/rdf#">\n"""
+	    ret+=self.getRDF()+"\n"
+	    ret+="""</RDF:RDF>"""
+    	    return ret
+
+    def getRDF(self):
+	    """rdf of the collection"""
+	    contents=self.ZopeFind(self,obj_metatypes=['ECHO_group','ECHO_resource','ECHO_collection'])
+
+	    about="""<RDF:Description about="%s">"""
+	    name="""<ECHONAVIGATION:name>%s</ECHONAVIGATION:name>"""
+	    
+	    urn="urn:"+re.sub('/',':',self.absolute_url())
+
+	    about2=about%urn
+	    name2=name%self.getId()
+	    
+
+	    ret=about2+"\n"+name2+"\n"+"</RDF:Description>"
 
+	    li="""<RDF:li resource="%s" />\n"""
+
+	    
+	    for content in contents:
+		    ret+=content[1].getRDF()+"\n"
+		    
+	    ret+="""<RDF:Seq about="%s">\n"""%urn
+	    for content in contents:
+		    nurn="urn:"+re.sub('/',':',content[1].absolute_url())
+		    ret+=li%nurn
+	    return ret+"</RDF:Seq>"
+	    
+
+    def showContent(self,path):
+	    """return content/html"""
+	    
+	    return urllib.urlopen(path+"/content_html").read()
+    
+    def getImageViewers(self):
+        """images"""
+        viewers=self.ZopeFind(self.standardImageViewer,obj_metatypes=['OSAS_ViewerObject'])
+        return viewers
+    
 
     def getBibTag(self,tag,content):
 	    """get field tag für index-meta-generation"""
@@ -1878,7 +2614,32 @@ class ECHO_root(Folder,Persistent,Implic
 	 return retStr
 
 
-    def copyrightTypeSelector_HTML(self,selected=None):
+    def copyrightTypeSelector_HTML(self,selected=None,first=None):
+         """give type selector"""
+
+	 if not first:
+		 if not selected:
+			 retStr="<option selected>\n"
+		 else:
+			 retStr="<option>\n"
+	 else:
+		 if not selected:
+			 retStr="""<option selected value="%s">%s\n"""%first
+		 else:
+			 retStr="""<option value="%s">%s\n"""%first
+
+	 
+	 try: # erste version copyrightTypes exists
+		 for copyrightType in self.ZopeFind(self.copyrightTypes,obj_metatypes=["ECHO_copyrightType"]):
+			 if selected and (copyrightType[0]==selected):
+				 retStr+="""<option selected value="%s">%s\n"""%(copyrightType[0],copyrightType[0])
+			 else:                
+				 retStr+="""<option value="%s">%s\n"""%(copyrightType[0],copyrightType[0])
+	 except:
+		 """nothing"""
+	 return retStr
+
+    def partnerSelector_HTML(self,selected=None):
          """give type selector"""
 	 if not selected:
 		 retStr="<option selected>\n"
@@ -1886,7 +2647,7 @@ class ECHO_root(Folder,Persistent,Implic
 		 retStr="<option>\n"
 		 
 	 try: # erste version copyrightTypes exists
-		 for copyrightType in self.ZopeFind(self.copyrightTypes,obj_metatypes=["ECHO_copyrightType"]):
+		 for copyrightType in self.ZopeFind(self.partners,obj_metatypes=["ECHO_partner"]):
 			 if selected and (copyrightType[0]==selected):
 				 retStr+="""<option selected value="%s">%s\n"""%(copyrightType[0],copyrightType[0])
 			 else:                
@@ -1894,6 +2655,25 @@ class ECHO_root(Folder,Persistent,Implic
 	 except:
 		 """nothing"""
 	 return retStr
+ 
+    mediaTypes=['all','text','images','sound','video'] # konfigurierbar in neuer version über echoroot??
+
+    def mediaTypeSelector_HTML(self,selected=None):
+         """give type selector"""
+	 if not selected:
+		 retStr="<option selected>\n"
+	 else:
+		 retStr="<option>\n"
+	 
+	 try: # erste version mediatypesTypes exists
+		 for mediaType in self.mediaTypes:
+			 if selected and (mediaType in selected):
+				 retStr+="""<option selected value="%s">%s\n"""%(mediaType,mediaType)
+			 else:                
+				 retStr+="""<option value="%s">%s\n"""%(mediaType,mediaType)
+	 except:
+		 """nothing"""
+	 return retStr
 
             
     def patchContentType(self,obj=None):
@@ -2007,7 +2787,7 @@ class ECHO_root(Folder,Persistent,Implic
         if str:
 
             str=re.sub("\&","&amp;",str)
-            dom=xml.dom.minidom.parseString("<?xml version='1.0' ?><txt>"+str+"</txt>")
+            dom=xml.dom.minidom.parseString("<?xml version='1.0' encoding='utf-8'?><txt>"+str+"</txt>")
             links=dom.getElementsByTagName("link")
             
 
@@ -2017,9 +2797,31 @@ class ECHO_root(Folder,Persistent,Implic
                 if self.checkRef(ref):
                     link.setAttribute("href",self.aq_parent.absolute_url()+"/vlp_coll?id="+ref)
 
-            return dom.toxml('utf-8')
+            newxml=dom.toxml('utf-8')
+	    match=re.sub(r'<\?xml version=\"1.0\" encoding=\"utf-8\"\?>\n<txt>','',newxml)
+	    match=re.sub(r'</txt>','',match)
+	    
+	    return match
+			   
         return ""
 
+    def xml2html(self,str):
+        """link2html fuer VLP muss hier noch raus"""
+        if str:
+
+            str=re.sub("\&","&amp;",str)
+            dom=xml.dom.minidom.parseString(str)
+            links=dom.getElementsByTagName("link")
+            
+
+            for link in links:
+                link.tagName="a"
+                ref=link.getAttribute("ref")
+                if self.checkRef(ref):
+                    link.setAttribute("href",self.aq_parent.absolute_url()+"/vlp_coll?id="+ref)
+
+            return dom.toxml('utf-8')
+        return ""
 
     def checkRef(self,ref):
         dbs={'vl_literature':'AND CD LIKE \'%lise%\'','vl_technology':'','vl_people':''}
@@ -2155,6 +2957,50 @@ class ECHO_root(Folder,Persistent,Implic
 	    
 	    self.REQUEST.RESPONSE.setHeader("Content-Type", "text/xml")
 	    self.REQUEST.RESPONSE.write(ret)
+
+
+    def getMetaDatasXML(self,viewerType=None,filter=None):
+	    """gebe all ressourcen aus"""
+	    ret="""<?xml version="1.0" ?>
+	             <index>"""
+	    for resource in self.ZopeFind(self,obj_metatypes=['ECHO_resource'],search_sub=1):
+
+		    echo_url=resource[1].absolute_url()
+		    
+		    if hasattr(resource[1],'link'):
+			    meta_url=echo_url+"/getMetaDataXML"
+		    else:
+			    meta_url="NO_URL"
+			    
+		    if filter and not re.search(filter,viewer_url):
+			    continue
+
+		    ret+="""\n<resource resourceLink="%s" metaLink="%s"/>"""%(urllib.quote(echo_url,safe='/:?'),urllib.quote(meta_url,safe='/:?'))
+			    
+	    ret +="""\n</index>"""
+	    
+	    
+	    self.REQUEST.RESPONSE.setHeader("Content-Type", "text/xml")
+	    self.REQUEST.RESPONSE.write(ret)
+
+	    
+    def findPartners(self):	
+        """find all partners in partners"""
+        par=self.ZopeFind(self.partners, obj_metatypes='ECHO_partner')
+        return par
+        
+    def getPartnerFromID(self):
+        """find partner form ID return object"""
+        pa=self.REQUEST['partner']
+        par=self.ZopeFind(self.partners, obj_ids=[pa])
+        return par
+        
+    def getPartnerFromIDParameter(self, id):
+        """ find partners from ID"""
+        par=self.ZopeFind(self.partners, obj_ids=[id])
+        return par
+
+
         
 def manage_addECHO_root(self,id,title,RESPONSE=None):
     """Add an ECHO_root"""
@@ -2173,11 +3019,12 @@ class ECHO_copyrightType(Folder):
 
 	meta_type="ECHO_copyrightType"
 	
-	def __init__(self,id,title,label):
+	def __init__(self,id,title,label,url):
 		"""init"""
 		self.id=id
 		self.title=title
 		self.label=label
+		self.url=url
 
 	manage_options = Folder.manage_options+(
         {'label':'Main Config','action':'ECHO_copyrightType_config_mainForm'},
@@ -2189,10 +3036,11 @@ class ECHO_copyrightType(Folder):
 		pt.content_type="text/html"
 		return pt()
 
-	def ECHO_copyrightType_config_main(self,title,label,RESPONSE=None):
+	def ECHO_copyrightType_config_main(self,title,label,url,RESPONSE=None):
 		"""change"""
 		self.title=title
 		self.label=label
+		self.url=url
 
 		if RESPONSE is not None:
 			RESPONSE.redirect('manage_main')
@@ -2203,10 +3051,10 @@ def manage_addECHO_copyrightTypeForm(sel
         return pt()
 
 
-def manage_addECHO_copyrightType(self,id,title,label,RESPONSE=None):
+def manage_addECHO_copyrightType(self,id,title,label,url,RESPONSE=None):
     """addaresource"""
 
-    newObj=ECHO_copyrightType(id,title,label)
+    newObj=ECHO_copyrightType(id,title,label,url)
 
     self._setObject(id,newObj)
 
@@ -2220,12 +3068,16 @@ class ECHO_partner(Image,Persistent):
 
     meta_type="ECHO_partner"
 
-    def __init__(self, id, title,url, file, content_type='', precondition=''):
+    def __init__(self, id, title,url, file, copyrightType, person, email, country, color, content_type='', precondition=''):
         self.__name__=id
         self.title=title
         self.url=url
+        self.person=person
+        self.email=email
+        self.country=country
+        self.color=color
         self.precondition=precondition
-
+        self.copyrightType=copyrightType
         data, size = self._read_data(file)
         content_type=self._get_content_type(file, data, id, content_type)
         self.update_data(data, content_type, size)
@@ -2234,9 +3086,15 @@ class ECHO_partner(Image,Persistent):
         {'label':'Partner Information','action':'ECHO_partner_config'},
         )
 
-    def changeECHO_partner(self,url,RESPONSE=None):
+    
+    def changeECHO_partner(self,url,copyrightType,person, email, country, color, RESPONSE=None):
         """Change main information"""
         self.url=url
+        self.person=person
+        self.email=email
+        self.country=country
+        self.color=color
+        self.copyrightType=copyrightType
         if RESPONSE is not None:
             RESPONSE.redirect('manage_main')
             
@@ -2255,7 +3113,7 @@ manage_addECHO_partnerForm=DTMLFile('dtm
 
 
 
-def manage_addECHO_partner(self, id, file,url, title='', precondition='', content_type='',
+def manage_addECHO_partner(self, id, url, person, email, country, color, file=None, copyrightType='', title='', precondition='', content_type='',
                     REQUEST=None):
     """
     Add a new ECHO_partner object.
@@ -2274,7 +3132,7 @@ def manage_addECHO_partner(self, id, fil
     self=self.this()
 
     # First, we create the image without data:
-    self._setObject(id, ECHO_partner(id,title,url,'',content_type, precondition))
+    self._setObject(id, ECHO_partner(id,title,url,'',copyrightType, person, email, country, color, content_type, precondition))
 
     # Now we "upload" the data.  By doing this in two steps, we
     # can use a database trick to make the upload more efficient.