--- ECHO_content/ECHO_collection.py	2004/05/12 15:41:55	1.83
+++ ECHO_content/ECHO_collection.py	2004/06/23 13:00:58	1.127
@@ -19,14 +19,18 @@ from Globals import DTMLFile
 from OFS.Folder import Folder
 from OFS.SimpleItem import SimpleItem
 from AccessControl import ClassSecurityInfo
+from AccessControl.User import UserFolder
 from Globals import InitializeClass
 from Globals import DTMLFile
+import Globals
 from Products.PageTemplates.PageTemplateFile import PageTemplateFile
 from Products.PageTemplates.PageTemplate import PageTemplate
 from Products.PageTemplates.ZopePageTemplate import ZopePageTemplate
 from Globals import Persistent, package_home
 from Acquisition import Implicit
 from ECHO_helpers import displayTypes
+
+
 try:
 	from psycopg import libpq
 except:
@@ -42,30 +46,73 @@ import xml.dom.minidom
 from ECHO_graphicalOverview import javaHandler,javaScriptMain
 import ECHO_helpers
 
+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"""
 
+	    
+
+    
 	    def NoneToEmpty(obj):
 		    if obj:
 			    return obj
 		    else:
 			    return ""
+
+	    
 	    
 	    diffs={}
+	    
 	    tags=self.findTagsFromMapping(self.contentType)
+	    self.referencetypes=tags[2]
+	    self.fields=tags[3]
+	    
+    
 	    for field in tags[1]:
 		    try:
 			    if (NoneToEmpty(self.getFieldValue(self.getFieldTag(tags,field)))==metadict[self.getFieldTag(tags,field)]):
 				    diffs[self.getFieldTag(tags,field)]=1
 			    else:
-				    print "DIFF",field,self.getFieldValue(self.getFieldTag(tags,field)),metadict[self.getFieldTag(tags,field)]
+				    
 				    diffs[self.getFieldTag(tags,field)]=0
 		    except:
 			    diffs[self.getFieldTag(tags,field)]=0
-			    print "EX",field
+			    
 	    return diffs
     
 def content_html(self,type):
@@ -74,11 +121,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()
@@ -120,10 +167,42 @@ def sendFile(self, filename, type):
 	self.REQUEST.RESPONSE.write(file(fn).read())
     return
 
+class BrowserCheck:
+    """check the browsers request to find out the browser type"""
+    
+    def __init__(self, zope):
+	self.ua = zope.REQUEST.get_header("HTTP_USER_AGENT")
+	self.isN4 = (string.find(self.ua, 'Mozilla/4.') > -1) and (string.find(self.ua, 'MSIE') < 0)
+	self.isIE = string.find(self.ua, 'MSIE') > -1
+	self.nav = self.ua[string.find(self.ua, '('):]
+	ie = string.split(self.nav, "; ")[1]
+	if string.find(ie, "MSIE") > -1:
+	    self.versIE = string.split(ie, " ")[1]
+	self.isMac = string.find(self.ua, 'Macintosh') > -1
+	self.isWin = string.find(self.ua, 'Windows') > -1
+	self.isIEWin = self.isIE and self.isWin
+	self.isIEMac = self.isIE and self.isMac
+
+
+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()
 
-def writeMetadata(url,metadict):
-	"""Einlesen der Metadaten und und erstellen des geänderten XML file"""
+		node=dom.createElement(tag)
+		nodetext=dom.createTextNode(value)
+		node.appendChild(nodetext)
+		metanode.appendChild(node)
 
+			
 	try:
 		geturl=""
 		for line in urllib.urlopen(url).readlines():
@@ -146,7 +225,7 @@ def writeMetadata(url,metadict):
 	metanode=metanodes[0]
 
 	for metaData in metadict.keys():
-		print metaData,metanode
+		
 		try:
 			nodeOld=metanode.getElementsByTagName(metaData)
 		except:
@@ -165,13 +244,38 @@ def writeMetadata(url,metadict):
 				metanode.removeChild(nodeOld[0]).unlink()
 
 		metanodeneu=dom.createElement(metaData)
-		metanodetext=dom.createTextNode(unicode(metadict[metaData],"utf8"))
+		try:
+			metanodetext=dom.createTextNode(unicode(metadict[metaData],"utf-8"))
+		except:
+			metanodetext=dom.createTextNode(metadict[metaData].encode('utf-8'))
 		metanodeneu.appendChild(metanodetext)
 		metanode.appendChild(metanodeneu)
 
+
 	
-	return dom.topxml().encode('utf-8')
+	
+	
+	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')
+
+	
+	
 def readMetadata(url):
     """Methode zum Auslesen der Metadateninformation zu einer Resource
     Vorerst noch Typ bib"""
@@ -196,7 +300,7 @@ def readMetadata(url):
     if len(metanode)==0:
         metanode=dom.getElementsByTagName('archimedes')
         metadict['bib_type']='Archimedes'
-        #print "HELLO"
+        
         
     if not len(metanode)==0:    
         metacontent=metanode[0].childNodes
@@ -208,7 +312,8 @@ def readMetadata(url):
         
         for node in metacontent:
             try:
-                metadict[re.sub('-','_',node.tagName.lower())]=getText(node.childNodes)
+		    #print urllib.unquote(getText(node.childNodes)),getText(node.childNodes)
+		    metadict[re.sub('-','_',node.tagName.lower())]=urllib.unquote(getText(node.childNodes))
             except:
                 """nothing"""
 
@@ -233,66 +338,75 @@ def setECHO_collectionInformation(self,t
         coords=[]
         #coordinates of for rectangles
 
-        #print "cs", coordstrs
+        
         if coordstrs:
             for coordstr in coordstrs:
-                #print "cs", coordstr
+        
                 try:
                     temco=coordstr.split(",")
                 except:
                     temco=[]
-                #temco.append(angle)
+        
                 coords.append(temco)
 
 
         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:]
+
+	def getCopyrights(self):
+		"""return coyprights"""
+		return self.copyrights
+	        
+	manage_options = Folder.manage_options+(
+		{'label':'Main Config','action':'ECHO_copyright_configForm'},
+		)
 
-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 ECHO_copyright_configForm(self):
+		"""change form"""
+		pt=PageTemplateFile('Products/ECHO_content/zpt/ChangeECHO_copyright').__of__(self)
+		pt.content_type="text/html"
+		return pt()
 
-        self.id="scientific_Information"
-        self.source_type=source_type
-        self.period=period
-        
+	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"""
 
@@ -361,13 +475,110 @@ def manage_addECHO_layoutTemplate(self,
     REQUEST.RESPONSE.redirect(u+'/manage_main')
     return ''
 
-class ECHO_resource(Folder):
+class ECHO_resource(Folder,Persistent):
     """ECHO Ressource"""
+    security=ClassSecurityInfo()
     meta_type='ECHO_resource'
 
     viewClassificationList=viewClassificationListMaster
 
     getSubCols = ECHO_helpers.getSubCols
+
+    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('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('/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
+
+
+	    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') 
@@ -387,19 +598,56 @@ class ECHO_resource(Folder):
             return ""
 
     def getFullTextXML(self,noredirect=None):
-	    """getFullTextXML"""
+	    """getFullTextXML; gives the FullText as an XML Document, and <error></error> if somthing goes wrong."""
 	    try:
 		    fh=urllib.urlopen(self.metalink)
 		    dom=xml.dom.minidom.parse(fh)
 		    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.redirect(texturl)
 		    else:
 			    return texturl
 	    except:
-		    return None
+
+		    if not noredirect:
+			    self.REQUEST.RESPONSE.setHeader('Content-Type','text/xml')
+			    self.REQUEST.RESPONSE.write("<error>no fulltext available</error>")
+		    else:
+			    return "<error>no fulltext available</error>"
+
+    def getCopyrightsHTML(self):
+	    """gib (link auf copyright notiz, mediatyp, institution, copyrightType, label von copyrightType) aus"""
+	    
+	    if hasattr(self,'copyrightModel'):
+		    obj=self.copyrightModel
+		    
+	    else:
+		    return "ERROR"
+	    ret=[]
+	    
+	    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(("""<a target="_blank" href="%s">%s</a>"""%(url,label),copyright[0],copyright[1],copyright[2],label))
+		        else:
+			        if hasattr(copyrightTypeObj, 'copyright.html'):
+			             ret.append(("""<a target="_blank" href="%s?partner=%s">%s</a>"""%(link,copyright[1],label),copyright[0],copyright[1],copyright[2],label))
+			        else:
+			             ret.append((label,copyright[0],copyright[1],copyright[2],label))
+		    except:
+			    """nothing"""
+		    
+	    return ret
     
     def getCredits(self):
         """Ausgabe der credits"""
@@ -408,7 +656,7 @@ class ECHO_resource(Folder):
         else:
             return []
     
-    def __init__(self,id,link,metalink,title,label,description,contentType,responsible,credits,weight,coords):
+    def __init__(self,id,link,metalink,resourceID,title,label,description,contentType,renderingType,copyrightType,responsible,credits,weight,coords):
 
         self.id = id
         """Festlegen der ID"""
@@ -421,8 +669,11 @@ class ECHO_resource(Folder):
         self.credits=toList(credits)
         self.description=description
         self.contentType=contentType
+	self.copyrightType=copyrightType
+	self.renderingType=renderingType
         self.responsible=responsible
-        
+        self.resourceID=resourceID
+	
         if coords:
             coordsnew=[ string.split(x,",") for x in coords]
         else:
@@ -499,9 +750,8 @@ class ECHO_resource(Folder):
 		self.contentType=self.bib_type
 		for data in self.metadata:
 			data_neu=re.sub('-','_',data)
-			self.metaDataHash[data_neu]=getattr(self,data)
-			#print data_neu, getattr(self,data)
-		#print self.metaDataHash,self.metadata
+			self.metaDataHash[data_neu]=getattr(self,data)[0:]
+
 	
         pt=PageTemplateFile('Products/ECHO_content/zpt/ChangeECHO_resource_metadata.zpt').__of__(self)
         return pt()
@@ -554,6 +804,17 @@ class ECHO_resource(Folder):
             RESPONSE.redirect('manage_main')
 
 
+    def changeECHO_resource_metadata_local(self,RESPONSE=None):
+	    """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)][0:]
+			
+
+	    	    
+	    if RESPONSE is not None:
+		    RESPONSE.redirect('manage_main')
+
     def changeECHO_resource_metadata(self,RESPONSE=None):
 	    """change metadata"""
 	    tags=self.findTagsFromMapping(self.contentType)
@@ -565,18 +826,32 @@ class ECHO_resource(Folder):
 		    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')
 
 
-    def newMetaXML(self):
+    def getMDValue(self,fieldName):
+	    return self.metaDataHash.get(fieldName,'!!NOT USED HERE in Type: %s'%self.contentType)
+					 
+    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,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)
+
     def changeECHO_resource(self,metalink,link,title,label,description,contentType,responsible,weight,viewClassification="",coords=None,credits=None,RESPONSE=None):
         """Änderung der Properties"""
         
@@ -597,11 +872,12 @@ class ECHO_resource(Folder):
             
     manage_options = Folder.manage_options+(
         {'label':'Main Config','action':'ECHO_resource_config_main'},
-	{'label':'Change Credits & 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'},
 	)
 
     def getOverview(self):
@@ -667,7 +943,7 @@ class ECHO_resource(Folder):
         
     def getFieldValue(self,field):
         """get value"""
-	#print field
+	
         try:
 	
             ret=self.metaDataHash[field]
@@ -678,75 +954,143 @@ class ECHO_resource(Folder):
         except:
             return None
 
+    def getMetaDataHash(self):
+	    """md hash"""
+	    return self.metaDataHash
+    
+    def setFieldValue(self,field,value):
+        """get value"""
+	
+	if not hasattr(self,'metaDataHash'):
+		setattr(self,'metaDataHash',{})
+	self.metaDataHash[field]=value[0:]
+	
+
+
     def findLabelsFromMapping(self,referenceType):
         """gib hash mit label -> generic zurueck"""
-        self.referencetypes=self.ZopeFind(self.standardMD)
-	#print "RT",referenceType
+	#return {},[]
+
+        temp=self.ZopeFind(self.standardMD)
+
+	if referenceType=="":
+		referenceType="book"
+	
 	
         bibdata={}
         retdata={}
+	fields=[]
         fieldlist=self.standardMD.fieldList
         
 	for referenceTypeF in self.referencetypes:
-		#print referenceTypeF[1].title,referenceType	
-		if referenceTypeF[1].title == referenceType:
-			#print "OK"
-			bibdata[referenceTypeF[1].title]=referenceTypeF[1].fields
+
+		if referenceTypeF[1].title.lower() == referenceType.lower():
+
+			try:
+				bibdata[referenceTypeF[1].title]=referenceTypeF[1].fields
+				referenceType=referenceTypeF[1].title
+			except:
+				bibdata[referenceType]=referenceTypeF[1].fields
+		
+
 			bibdata['data']=referenceTypeF[1]
-			self.fields=bibdata[referenceType]
+			fields=bibdata[referenceType]
                         for field in fieldlist:
                             retdata[field]=referenceTypeF[1].getValue(field)[1]
-	#print retdata,fieldlist
-        return retdata,fieldlist
+
+        return retdata,fieldlist,temp,fields
 
     def findTagsFromMapping(self,referenceType):
         """gib hash mit label -> generic zurueck"""
-        self.referencetypes=self.ZopeFind(self.standardMD)
+	
+
+	if referenceType=="":
+		referenceType="book"
+	
+	temp =  self.ZopeFind(self.standardMD)[0:]
+
+	
+	#self.referencetypes=temp[0:]
+	
 	
 	
+
+	
+
         bibdata={}
         retdata={}
         fieldlist=self.standardMD.fieldList
         
-	for referenceTypeF in self.referencetypes:
+	for referenceTypeF in temp:
 	
-		if referenceTypeF[1].title == referenceType: 
-			bibdata[referenceTypeF[1].title]=referenceTypeF[1].fields
+		if referenceTypeF[1].title.lower() == referenceType.lower(): 
+			try:
+				bibdata[referenceTypeF[1].title]=referenceTypeF[1].fields
+				referenceType=referenceTypeF[1].title
+			except:
+				bibdata[referenceType]=referenceTypeF[1].fields
 			bibdata['data']=referenceTypeF[1]
-			self.fields=bibdata[referenceType]
+			fields=bibdata[referenceType]
                         for field in fieldlist:
                             retdata[field]=referenceTypeF[1].getValue(field)[0]
 	
-        return retdata,fieldlist
+        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.contentType=metadict['bib_type'][0:]
+	    
+	    self.metaDataHash={}
+	    if not error=="": #Fehler beim Auslesen des Metafiles
+		    return "ERROR:",error
+	    fields=self.findTagsFromMapping(self.contentType)
+	    
+	    #fields=self.findLabelsFromMapping(self.contentType)
+	    for field in fields[1]:
 		    
+		    if self.isDefinedInThisSet(fields,field):
+			    #print urllib.unquote(metadict.get(self.getFieldTag(fields,field),''))
+			    self.setFieldValue(self.getFieldTag(fields,field),metadict.get(self.getFieldTag(fields,field),''))
+
+	    
+	    
+	    if RESPONSE:
+		    return RESPONSE.redirect('manage_main')
+	    
     def ECHO_getResourceMD(self,template="yes"):
         """Einlesen der Metadaten und Anlegen dieser Metadaten als Informationen zur Resource"""
         (metadict, error)=readMetadata(self.metalink)
 
-
+	
 
         if not error=="": #Fehler beim Auslesen des Metafiles
 		return "ERROR:",error
 	
 
-	if not (metadict['bib_type']==self.contentType):
+	if not (metadict['bib_type'].lower()==self.contentType.lower()):
 		self.REQUEST.SESSION['contentStorage']=metadict['bib_type']
 		self.REQUEST.SESSION['contentZope']=self.contentType
 
 		return PageTemplateFile('Products/ECHO_content/zpt/ECHO_getResourceMDErrorContentType.zpt').__of__(self)()
-		
-        self.REQUEST.SESSION['metadict']=metadict
 
-	self.REQUEST.SESSION['diffs']=checkDiffs(self,metadict)
+	self.REQUEST.SESSION['metadict']=metadict
+
+	
+	
+	self.REQUEST.SESSION['diffs']=checkDiffs(self,self.REQUEST.SESSION['metadict'])
+	
 
 		
         if template=="yes":
-            pt=PageTemplateFile('Products/ECHO_content/zpt/ECHO_resourceMD.zpt').__of__(self)
-            return pt()
+		pt=PageTemplateFile('Products/ECHO_content/zpt/ECHO_resourceMD.zpt').__of__(self)
+		return pt()
 
+	
 
     
     
@@ -759,12 +1103,53 @@ class ECHO_resource(Folder):
         
         return self.REQUEST.RESPONSE.redirect(self.link)
 
+    def startpage_html(self):
+	    """prints out a startpage for a resource for use e.g. in the BVE"""
+
+	    # suche ob startpage.html in dem Ordner vorhanden ist, dann wir diese angezeigt
+
+	    sp=self.ZopeFind(self,obj_ids=['startpage.html'])
+
+	    if sp:
+		    return sp[1]()
+
+            #prüfen ob irgendwo ein template
+	    if hasattr(self,'startpage_index_template'): 
+		    return self.startpage_index_template()
+
+	    #generisches template ausgeben
+	    
+	    pt=PageTemplateFile('Products/ECHO_content/zpt/ECHO_startpage_index_template_standard.zpt').__of__(self)
+	    pt.content_type="text/html"
+	    return pt()
+
+    def toc_html(self):
+	    
+	    sp=self.ZopeFind(self,obj_ids=['toc.html'])
+		    
+	    if sp:
+		    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.lower())
 
+	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)
@@ -772,10 +1157,10 @@ def manage_addECHO_resourceForm(self):
 
 
 
-def manage_addECHO_resource(self,id,title,label,description,contentType,responsible,link,metalink,weight,credits=None,coords=None,RESPONSE=None):
+def manage_addECHO_resource(self,id,title,label,description,responsible,link,metalink,weight,copyrightType=None,resourceID=None,contentType=None,renderingType=None,credits=None,coords=None,RESPONSE=None):
     """addaresource"""
 
-    newObj=ECHO_resource(id,link,metalink,title,label,description,contentType,responsible,credits,weight,coords)
+    newObj=ECHO_resource(id,link,metalink,resourceID,title,label,description,contentType,renderingType,copyrightType,responsible,credits,weight,coords)
 
     self._setObject(id,newObj)
 
@@ -824,7 +1209,7 @@ class ECHO_externalLink(Folder):
         if not hasattr(self,'coords'):
             
             self.coords=['']
-            #print "G",self.coords
+
 
         pt=PageTemplateFile('Products/ECHO_content/zpt/ChangeECHO_externalLink.zpt').__of__(self)
         return pt()
@@ -850,12 +1235,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"""
@@ -911,11 +1290,88 @@ def manage_addECHO_link(self,id,title,la
 
 class ECHO_collection(Folder, Persistent, Implicit):
     """ECHO Collection"""
+
     security=ClassSecurityInfo()
     meta_type='ECHO_collection'
     viewClassificationList=viewClassificationListMaster
     displayTypes=displayTypes
 
+
+    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:
+		    print resource[0]
+		    resource[1].changeViewerTemplateSet(project,xslt,thumbtemplate,topbar,digiLibTemplate)
+
+	    if RESPONSE is not None:
+		    RESPONSE.redirect('manage_main')
+
+
+    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
@@ -961,7 +1417,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
@@ -1000,7 +1456,7 @@ class ECHO_collection(Folder, Persistent
         return ret+"<collection>"+getCollection(self)+"</collection>"
     
     def createJavaScript(self):
-        """CreateJava"""
+        """OLD CreateJava"""
         ret=javaScriptMain
 
         dynamical="\n"
@@ -1014,7 +1470,7 @@ class ECHO_collection(Folder, Persistent
         return ret
 
     def createJSAreas(self):
-        """new version of createJavaScript"""
+        """create area calls for JavaScript"""
         dynamical="\n"
         for ob in self.getGraphicCoords():
 	    if ob[5] == "area":
@@ -1024,20 +1480,37 @@ class ECHO_collection(Folder, Persistent
         return dynamical
 
     def createMapHead(self):
-        """generate divs"""
+        """create javascript include and script tags for head"""
         pt=PageTemplateFile(os.path.join(package_home(globals()), 'zpt/ECHO_content_map_frag_js')).__of__(self)
         return pt()
+
+    def createMapImg(self):
+	"""generate img-tag for map"""
+	bt = BrowserCheck(self)
+	tag = ""
+	src = self.REQUEST['URL1'] + "/overview"
+	if bt.isN4:
+	    tag += '<ilayer id="overview" visibility="show"><img src="%s"></ilayer>'%src
+	else:
+	    tag += '<img id="overview" src="%s" />'%src
+	return tag
         
     def createMapLink(self, ob, text=None):
 	"""generate map link"""
+	bt = BrowserCheck(self)
 	id = ob[1]
 	link = ob[1]
 	if text == None:
 	    text = ob[2]
-	tag = '<a id="a.%s" onmouseover="highlightPair(\'%s\', true)" onmouseout="highlightPair(\'%s\', false)" href="%s" target="_blank"'%(id,id,id,link)
-	if ob[3].contentType == 'text-popup':
-	    tag += ' title="%s"'%ob[3].description
-	tag += ">" + text + "</a>"
+	tag = ""
+	if bt.isN4:
+	    tag += '<ilayer id="a.%s"><a onmouseover="highlightPair(\'%s\', true)" onmouseout="highlightPair(\'%s\', false)" href="%s" target="_blank"'%(id,id,id,link)
+	    tag += ">" + text + "</a></ilayer>"
+	else:
+	    tag = '<a id="a.%s" onmouseover="highlightPair(\'%s\', true)" onmouseout="highlightPair(\'%s\', false)" href="%s" target="_blank"'%(id,id,id,link)
+	    if ob[3].contentType == 'text-popup':
+		tag += ' title="%s"'%ob[3].description
+	    tag += ">" + text + "</a>"
 	return tag
 
     def createMapAux(self, ob, arrowsrc="http://nausikaa2.rz-berlin.mpg.de/digitallibrary/servlet/Scaler/?dw=15&fn=icons/pfeil"):
@@ -1046,18 +1519,39 @@ class ECHO_collection(Folder, Persistent
 	link = ob[1]
 	vtype = ob[5]
 	ctype = ob[3].contentType
-	
-	tag = '<a id="b.%s" onmouseover="highlightPair(\'%s\', true)" onmouseout="highlightPair(\'%s\', false)" href="%s" target="_blank">'%(id,id,id,link)
-	if vtype == "view point":
-	    rot = ob[4][4]
-	    tag += '<img id="i.%s" src="%s&rot=%s" border="1" style="position:absolute; top:-100px; left:-100px; border-style:none" />'%(id,arrowsrc,rot)
+	bt = BrowserCheck(self)
+	tag = ""
+
+	if bt.isN4:
+	    tag += '<layer id="i.%s" onmouseover="highlightPair(\'%s\', true)" onmouseout="highlightPair(\'%s\', false)">'%(id,id,id)
+	    if vtype == "view point":
+	        rot = ob[4][4]
+		tag += '<a href="%s"><img border="0" src="%s&rot=%s" /></a>'%(link,arrowsrc,rot)
+	    else:
+		tag += '<a href="%s"><img border="0" width="1000" height="1000" src="trans_img"'%(link)
+		if ctype == "text-popup":
+		    desc = ob[3].description
+		    tag += ' alt="%s"'%desc
+		tag += ' /></a>'
+	    tag += '</layer>'
 	else:
-	    tag += '<span id="i.%s" style="position:absolute; top:-100px; left:-100px; border-style:none"'%(id)
-	    if ctype == "text-popup":
-		desc = ob[3].description
-		tag += ' title="%s"'%desc
-	    tag += ' />'
-	tag += '</a>'
+	    tag = '<a id="b.%s" onmouseover="highlightPair(\'%s\', true)" onmouseout="highlightPair(\'%s\', false)" href="%s" target="_blank">'%(id,id,id,link)
+	    if vtype == "view point":
+		rot = ob[4][4]
+		if bt.isIEWin and bt.versIE > 5:
+		    tag += '<span id="i.%s" style="position:absolute; top:-100px; left:-100px; border-style:none; border-width=1px; filter:progid:DXImageTransform.Microsoft.AlphaImageLoader(src=\'%s&rot=%s\');"><img style="visibility:hidden" src="%s&rot=%s" /></span>'%(id,arrowsrc,rot,arrowsrc,rot)
+		else:
+		    tag += '<img id="i.%s" src="%s&rot=%s" border="1" style="position:absolute; top:-100px; left:-100px; border-style:none;" />'%(id,arrowsrc,rot)
+	    else:
+		if bt.isIEWin:
+		    tag += '<div id="i.%s" style="position:absolute; top:-100px; left:-100px;background:url(area_img)"'%(id)
+		else:
+		    tag += '<div id="i.%s" style="position:absolute; top:-100px; left:-100px;"'%(id)
+		if ctype == "text-popup":
+		    desc = ob[3].description
+		    tag += ' title="%s"'%desc
+		tag += '> </div>'
+	    tag += '</a>'
 	return tag
 
     
@@ -1100,7 +1594,9 @@ class ECHO_collection(Folder, Persistent
         for entry in entries:
 		if entry[1].meta_type == 'ECHO_resource':
 			entry[1].ECHO_getResourceMD(template="no")
-			#print "rerender",entry[1].getId()
+			entry[1].generate_title()
+			entry[1].generate_label()
+
 		else:
 		   self.ECHO_rerenderLinksMD(entry[1])
 
@@ -1122,7 +1618,7 @@ class ECHO_collection(Folder, Persistent
             return []
         
     def __init__(self,id,title,label,description,contentType,responsible,credits,weight,sortfield,coords,secondaryLinkTitle,secondaryLink,imageTag="",bgcolour=""):
-        #print "CO",coords
+
 
         self.id = id
         """Festlegen der ID"""
@@ -1147,7 +1643,7 @@ class ECHO_collection(Folder, Persistent
         {'label':'Rerender Links','action':'ECHO_rerenderLinksMD'},
         {'label':'Graphics','action':'ECHO_graphicEntry'},
 	{'label':'create resources from XML','action':'createRessourcesFromXMLForm'},
-
+        {'label':'Change Viewer Templates','action':'changeViewerTemplateSetsForm'},
         )
 
     def getOverview(self):
@@ -1206,7 +1702,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
@@ -1214,6 +1710,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]
@@ -1233,8 +1730,6 @@ class ECHO_collection(Folder, Persistent
         if RESPONSE is not None:
             RESPONSE.redirect('manage_main')
             
-    security.declarePublic('index_html')
-
 
     def showOverview(self):
         """overview"""
@@ -1243,6 +1738,7 @@ class ECHO_collection(Folder, Persistent
         pt=PageTemplateFile('Products/ECHO_content/zpt/ECHO_content_overview.zpt').__of__(self)
         return pt()
 
+    security.declareProtected('View','index_html')
     
     def index_html(self):
         """standard page"""
@@ -1274,7 +1770,15 @@ class ECHO_collection(Folder, Persistent
 
     def area_img(self):
         """area image"""
-        return sendFile(self, 'images/red.gif', 'image/gif')
+	bt = BrowserCheck(self)
+	if bt.isIE or bt.isN4:
+	    return sendFile(self, 'images/red.gif', 'image/gif')
+	else:
+	    return sendFile(self, 'images/reda.png', 'image/png')
+
+    def trans_img(self):
+        """empty image"""
+        return sendFile(self, 'images/trans.gif', 'image/gif')
 
     def hl_lib_js(self):
         """javascript"""
@@ -1316,9 +1820,8 @@ class ECHO_collection(Folder, Persistent
 
 
     getSubCols = ECHO_helpers.getSubCols
-     
-                
-    
+
+Globals.InitializeClass(ECHO_collection)
     
 def manage_addECHO_collectionForm(self):
         """Add collection form"""
@@ -1339,6 +1842,7 @@ def manage_addECHO_collection(self,id,ti
 
 class ECHO_group(ECHO_collection):
 	"""ECHO Gruppe"""
+	security=ClassSecurityInfo()
 	meta_type="ECHO_group"
 
 	manage_options = Folder.manage_options+(
@@ -1346,7 +1850,8 @@ class ECHO_group(ECHO_collection):
 		{'label':'Rerender Links','action':'ECHO_rerenderLinksMD'},
 		{'label':'Graphics','action':'ECHO_graphicEntry'},
 		)
-
+	
+	security.declareProtected('View','index_html')
 	def index_html(self):
 		"""standard page"""
 		displayedObjects=self.ZopeFind(self,obj_metatypes=displayTypes)
@@ -1440,12 +1945,148 @@ def manage_addECHO_group(self,id,title,l
     if RESPONSE is not None:
         RESPONSE.redirect('manage_main')
 
+Globals.InitializeClass(ECHO_group)
+
 
+class ECHO_userFolder(UserFolder):
+	"""User folder for Intranet"""
+	_domain_auth_mode=1 # Identification via domain
+	meta_type="ECHO_userFolder"
 	
+	def authenticate(self, name, password, request):
+		emergency = self._emergency_user
+		if name is None:
+		    return None
+		if emergency and name==emergency.getUserName():
+		    user = emergency
+		else:
+		    user = self.getUser(name)
+		if user is not None and user.authenticate(password, request):
+		    return user
+		else:
+		    return None
+
+	def domainSpecMatch(self,spec, request):
+	    host=''
+	    addr=''
+
+	    # Fast exit for the match-all case
+	    if len(spec) == 1 and spec[0] == '*':
+		return 1
+
+	    if request.has_key('REMOTE_HOST'):
+		host=request['REMOTE_HOST']
+
+	    if request.has_key('REMOTE_ADDR'):
+		addr=request['REMOTE_ADDR']
+
+	    if request.has_key('HTTP_X_FORWARDED_FOR'):
+		addr=request['HTTP_X_FORWARDED_FOR']
+
+	    
+	    if not host and not addr:
+		return 0
+
+	    if not host:
+		try:    host=socket.gethostbyaddr(addr)[0]
+		except: pass
+	    if not addr:
+		try:    addr=socket.gethostbyname(host)
+		except: pass
+
+
+	    _host=host.split('.')
+	    _addr=addr.split('.')
+	    _hlen=len(_host)
+	    _alen=len(_addr)
+
+	    for ob in spec:
+		sz=len(ob)
+		_ob=ob.split('.')
+		_sz=len(_ob)
+
+		mo = addr_match(ob)
+		if mo is not None:
+		    if mo.end(0)==sz:
+			fail=0
+			for i in range(_sz):
+			    a=_addr[i]
+			    o=_ob[i]
+			    if (o != a) and (o != '*'):
+				fail=1
+				break
+			if fail:
+			    continue
+			return 1
+
+		mo = host_match(ob)
+		if mo is not None:
+		    if mo.end(0)==sz:
+			if _hlen < _sz:
+			    continue
+			elif _hlen > _sz:
+			    _item=_host[-_sz:]
+			else:
+			    _item=_host
+			fail=0
+			for i in range(_sz):
+			    h=_item[i]
+			    o=_ob[i]
+			    if (o != h) and (o != '*'):
+				fail=1
+				break
+			if fail:
+			    continue
+			return 1
+	    return 0
+
+Globals.default__class_init__(ECHO_userFolder)
+
+
+
+def manage_addECHO_userFolder(self,dtself=None,REQUEST=None,**ignored):
+    """add a user folder """
+    f=ECHO_userFolder()
+    self=self.this()
+    try:    self._setObject('acl_users', f)
+    except: return MessageDialog(
+                   title  ='Item Exists',
+                   message='This object already contains a User Folder',
+                   action ='%s/manage_main' % REQUEST['URL1'])
+    self.__allow_groups__=f
+    if REQUEST is not None:
+        REQUEST['RESPONSE'].redirect(self.absolute_url()+'/manage_main')
+
+def manage_addECHO_userFolderForm(self):
+	"""add a user folder form"""
+	return manage_addECHO_userFolder(self)
+
 class ECHO_root(Folder,Persistent,Implicit):
     """ECHO Root Folder"""
+
+    security=ClassSecurityInfo()
+    
     meta_type="ECHO_root"
 
+
+    def getBibTag(self,tag,content):
+	    """get field tag für index-meta-generation"""
+	    if not content or content=="":
+		    return ""
+	    ret="<%s>"%tag
+	    #ret+=urllib.quote(content)
+	    ret+=content
+
+	    ret+="</%s>"%tag
+	    return ret
+
+    def getValueFromClass(self,field,found):
+	    """retattribute falss existing"""
+	    try:
+		    
+		    return getattr(found,field).decode('ascii','ignore')
+	    except:
+		    return ""
     
     def getImageTag(self):
 	    """needed by main_template"""
@@ -1517,7 +2158,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"
@@ -1525,7 +2191,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:                
@@ -1533,6 +2199,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):
@@ -1561,7 +2246,7 @@ class ECHO_root(Folder,Persistent,Implic
 	def checkIfArrow(obj):
 		if hasattr(obj,'coords'):
 			for coordtemp in obj.coords:
-				#print obj.title,len(coordtemp)
+
 				if (len(coordtemp)>4) and not (coordtemp[4]==''):
 					return 4
 			return None
@@ -1633,7 +2318,7 @@ class ECHO_root(Folder,Persistent,Implic
             
             for word in words:
                 strUrl=url%word
-                #print "str",strUrl
+
                 retStr+="""<a href="%s">%s</a><br/>"""%(strUrl,word)
             str=retStr
         if str:
@@ -1644,27 +2329,48 @@ class ECHO_root(Folder,Persistent,Implic
     def link2html(self,str):
         """link2html fuer VLP muss hier noch raus"""
         if str:
-            #print 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")
             
-            #print "link",links
+
             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')
+            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':''}
         res=None
         for db in dbs.keys():
-            #print ref,"select reference from %s where reference =\'%s\' %s"%(db,ref,dbs[db])
 
             res=res or self.search(var=str("select reference from %s where reference =\'%s\' %s"%(db,ref,dbs[db])))
         return res
@@ -1673,7 +2379,7 @@ class ECHO_root(Folder,Persistent,Implic
 
     def PgQuoteString(self,string):
         """Quote string"""
-        #print "PG",string
+
         return libpq.PgQuoteString(string)
         
     def getPartners(self):
@@ -1791,10 +2497,53 @@ class ECHO_root(Folder,Persistent,Implic
 			    else:
 				    ret+="""\n<resource echoLink="%s" viewerLink="%s"/>"""%(urllib.quote(echo_url,safe='/:?'),urllib.quote(viewer_url,safe='/:?'))
 	    ret +="""\n</index>"""
-	    print ret
+	    
 	    
 	    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 resource[1].getFullTextXML(noredirect="yes"):
+			    if hasattr(resource[1],'link'):
+				    viewer_url=echo_url+"/getMetaDataXML"
+			    else:
+				    viewer_url="NO URL"
+			    if filter:
+				    if re.search(filter,viewer_url):
+					    ret+="""\n<resource echoLink="%s" viewerLink="%s"/>"""%(urllib.quote(echo_url,safe='/:?'),urllib.quote(viewer_url,safe='/:?'))
+			    else:
+				    ret+="""\n<resource echoLink="%s" viewerLink="%s"/>"""%(urllib.quote(echo_url,safe='/:?'),urllib.quote(viewer_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"""
@@ -1807,18 +2556,70 @@ def manage_addECHO_rootForm(self):
         """Nothing yet"""
         pt=PageTemplateFile('Products/ECHO_content/zpt/AddECHO_root.zpt').__of__(self)
         return pt()
+
+class ECHO_copyrightType(Folder):
+	"""copyright typ"""
+
+	meta_type="ECHO_copyrightType"
+	
+	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'},
+	)
+
+	def ECHO_copyrightType_config_mainForm(self):
+		"""change form"""
+		pt=PageTemplateFile('Products/ECHO_content/zpt/ChangeECHO_copyrightType').__of__(self)
+		pt.content_type="text/html"
+		return pt()
+
+	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')
+
+def manage_addECHO_copyrightTypeForm(self):
+        """Form for adding a ressource"""
+        pt=PageTemplateFile('Products/ECHO_content/zpt/AddECHO_copyrightTypeForm.zpt').__of__(self)
+        return pt()
+
+
+def manage_addECHO_copyrightType(self,id,title,label,url,RESPONSE=None):
+    """addaresource"""
+
+    newObj=ECHO_copyrightType(id,title,label,url)
+
+    self._setObject(id,newObj)
+
+    if RESPONSE is not None:
+        RESPONSE.redirect('manage_main')
+ 
+
  
 class ECHO_partner(Image,Persistent):
     """ECHO Partner"""
 
     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, content_type='', precondition=''):
         self.__name__=id
         self.title=title
         self.url=url
+        self.person=person
+        self.email=email
+        self.country=country
         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)
@@ -1827,9 +2628,14 @@ 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, RESPONSE=None):
         """Change main information"""
         self.url=url
+        self.person=person
+        self.email=email
+        self.country=country
+        self.copyrightType=copyrightType
         if RESPONSE is not None:
             RESPONSE.redirect('manage_main')
             
@@ -1848,7 +2654,7 @@ manage_addECHO_partnerForm=DTMLFile('dtm
 
 
 
-def manage_addECHO_partner(self, id, file,url, title='', precondition='', content_type='',
+def manage_addECHO_partner(self, id,file,url, person, email, country, copyrightType='', title='', precondition='', content_type='',
                     REQUEST=None):
     """
     Add a new ECHO_partner object.
@@ -1867,7 +2673,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, 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.