--- ECHO_content/ECHO_collection.py	2006/10/18 14:50:24	1.276
+++ ECHO_content/ECHO_collection.py	2007/01/23 18:53:01	1.282
@@ -68,16 +68,27 @@ import urllib
 import xml.dom.minidom
 import ECHO_helpers
 from ECHO_helpers import *
+
 try:
  from ECHO_language import *
 except:
     print "no echo_language"
+    class ECHO_language:
+    	""" leere Klasse"""
+	pass
+
 from ECHO_movie import *
 import vlp_xmlhelpers #TODO: vlp elemente aus echo herausnehmen
 import xmlrpclib
     
 
 
+
+def normalizeCt(str):
+	"""normalizes content_type"""
+	#str= str.replace(" ","_")
+	return str.replace("-"," ").lower()
+
 def setECHO_collectionInformation(self,title,label,description,contentType,responsible,credits,weight,coordstrs=""):
 
         """Allegemeine Informationen zu einer ECHO Collection"""
@@ -348,7 +359,10 @@ class ECHO_fullText(ZopePageTemplate,ECH
         def getPage(self,nr='1'):
                 """get page n"""
                 #return self().encode('latin-1','ignore')
-                dom=xml.dom.minidom.parseString(self())
+		try:
+                   dom=xml.dom.minidom.parseString(self())
+                except:
+                   dom=xml.dom.minidom.parseString(self().encode('latin-1'))
                 pages=dom.getElementsByTagName('page')
                 
                 return pages[int(nr)-1].toxml()
@@ -1095,7 +1109,7 @@ class ECHO_resource(CatalogAware,Folder,
 
     def getContentType(self):
             try:
-                    return self.contentType
+                    return normalizeCt(self.contentType)
             except:
                     return ""
 
@@ -1153,8 +1167,42 @@ class ECHO_resource(CatalogAware,Folder,
 
 
     
+    def changeViewer(self,newViewer):
+        """set newViewer to the url of the new viewer
+        only if metalink is set, otherwise it gives false
+        """
+        
+        vl,msg=self.checkValidityOfMetaLink()
+        
+        if vl:
+            self.newViewer=newViewer
+            return vl,msg
+        else:
+            return vl,msg
+    
+    def checkValidityOfMetaLink(self):
+        """checks if the metalink is valid xml"""
+        
+        ml=self.metalink
+        
+        try:
+            txt=urllib.urlopen(ml)
 
-    def changeECHO_resource_main(self,metalink,link,title,label,description,contentType,renderingType,weight,resourceID,RESPONSE=None):
+        except:
+            return False,"Cannot open: %s)"%ml
+        
+        txt.close()        
+        try:
+            dom = NonvalidatingReader.parseUri(ml)
+        except:
+            return False, "Connot parse: %s)"%ml
+        
+        if len(dom.xpath("//texttool"))==0:
+            return False, "No texttools: %s)"%ml
+            
+        return True,""
+        
+    def changeECHO_resource_main(self,metalink,link,title,label,description,contentType,renderingType,weight,resourceID,newViewer='',RESPONSE=None):
         """Aenderung der Properties"""
         self.resourceID=resourceID
         self.title=title
@@ -1168,6 +1216,9 @@ class ECHO_resource(CatalogAware,Folder,
         self.link=link
         self.metalink=metalink
         
+        self.newViewer=newViewer
+        
+        
         if RESPONSE is not None:
             RESPONSE.redirect('manage_main')
 
@@ -1210,7 +1261,7 @@ class ECHO_resource(CatalogAware,Folder,
 
     def changeECHO_resource_metadata_local(self,RESPONSE=None):
             """change metadata"""
-            tags=self.findTagsFromMapping(self.contentType)
+            tags=self.findTagsFromMapping(normalizeCt(self.contentType))
             for field in tags[1]:
                     self.metaDataHash[self.getFieldTag(tags,field)]=self.REQUEST.form[self.getFieldTag(tags,field)][0:]
                         
@@ -1221,7 +1272,7 @@ class ECHO_resource(CatalogAware,Folder,
 
     def changeECHO_resource_metadata(self,RESPONSE=None):
             """change metadata"""
-            tags=self.findTagsFromMapping(self.contentType)
+            tags=self.findTagsFromMapping(normalizeCt(self.contentType))
             self.OSAS_meta={}
             for field in tags[1]:
                     try:
@@ -1249,9 +1300,9 @@ class ECHO_resource(CatalogAware,Folder,
             """returns value for simple search"""
             
             try:
-                return " ".join([self.getMDValue('title',generic="yes"),
-                             self.getMDValue('author',generic="yes"),
-                             self.getMDValue('year',generic="yes"),self.getTitle()])
+                return " ".join([self.getMDValue('title',generic="yes",empty=" "),
+                             self.getMDValue('author',generic="yes",empty=" "),
+                             self.getMDValue('year',generic="yes",empty=" "),self.getTitle()])
             except:
                 
                 #zLOG.LOG(" ECHO_collection(getMDSimpleSearchField)",zLOG.INFO," ".join([self.getMDValue('title',generic="yes"),
@@ -1267,6 +1318,7 @@ class ECHO_resource(CatalogAware,Folder,
             if generic:
                 if self.contentType:
                     ct=self.contentType.replace(" ","_").lower()
+                    ct=self.contentType.replace("-","_").lower()
                 else:
                     zLOG.LOG("ECHO_collection (getMDValue)", zLOG.INFO, "no_content type for %s"%self.getId())
                     ct=""
@@ -1274,33 +1326,39 @@ class ECHO_resource(CatalogAware,Folder,
                 #caching
                 if not hasattr(self,'_v_mapHash'): #noch keine cachevariable
                     self._v_mapHash={}
-                    
+		
+                
+
                 tmp=self._v_mapHash.get(ct,None) 
                 if tmp: #teste ob type schon existiert
                     fieldName=tmp.get(fieldNameTest,None)
                 else:
                     self._v_mapHash[ct]={}
                     
+
                 #noch nicht gecached    
                 if not fieldName and hasattr(self.standardMD,ct):    
                     fieldName=getattr(self.standardMD,ct).generateMappingHash()[fieldNameTest][0]
                     self._v_mapHash[ct][fieldNameTest]=fieldName
             if not fieldName:
                 fieldName=fieldNameTest  
-            if not empty:
+            if empty is None:
                            #FIXME: warum gibt es manchmal kein metadatahas
                 try:
                     
-                    ret =self.metaDataHash.get(fieldName,'!!NOT USED HERE in Type: %s'%self.contentType)
+                    ret =self.metaDataHash.get(fieldName,'!!NOT USED HERE in Type: %s'%normalizeCt(self.contentType))
                 except:
                     zLOG.LOG("ECHO (line 1069)",zLOG.ERROR,"no md hash for %s"%self.getId()) 
                     return ""
                   
             else:
-
+                try:
                    
                    ret= self.metaDataHash.get(fieldNameTest,empty)
-           
+                except:
+                    zLOG.LOG("ECHO (line 1069)",zLOG.ERROR,"no md hash for %s"%self.getId()) 
+                    return ""
+                
             if type(ret) is StringType:
                return ret.decode('utf-8')
             else:
@@ -1457,11 +1515,12 @@ class ECHO_resource(CatalogAware,Folder,
         fields=[]
         fieldlist=self.standardMD.fieldList
 
-        tags=self.findTagsFromMapping(self.contentType)
+        tags=self.findTagsFromMapping(normalizeCt(self.contentType))
         self.referencetypes=tags[2]
         for referenceTypeF in self.referencetypes:
-
-                if referenceTypeF[1].title.lower() == referenceType.lower():
+	        
+                
+                if normalizeCt(referenceTypeF[1].title) == normalizeCt(referenceType.lower()):
 
                         try:
                                 bibdata[referenceTypeF[1].title]=referenceTypeF[1].fields
@@ -1499,7 +1558,7 @@ class ECHO_resource(CatalogAware,Folder,
         for referenceTypeF in temp:
                 #print referenceType
         
-                if referenceTypeF[1].title.lower() == referenceType.lower(): 
+                if normalizeCt(referenceTypeF[1].title) == normalizeCt(referenceType.lower()):
                         try:
                                 bibdata[referenceTypeF[1].title]=referenceTypeF[1].fields
                                 referenceType=referenceTypeF[1].title
@@ -1526,10 +1585,10 @@ class ECHO_resource(CatalogAware,Folder,
                     
                     return "ERROR:",error,self.absolute_url()
             
-            self.contentType=metadict['bib_type'][0:]
-            fields=self.findTagsFromMapping(self.contentType)
+            self.contentType=normalizeCt(metadict['bib_type'])[0:]
+            fields=self.findTagsFromMapping(normalizeCt(self.contentType))
             
-            #fields=self.findLabelsFromMapping(self.contentType)
+            #fields=self.findLabelsFromMapping(normalizeCt(self.contentType))
             for field in fields[1]:
                     
                     if self.isDefinedInThisSet(fields,field):
@@ -1541,7 +1600,7 @@ class ECHO_resource(CatalogAware,Folder,
             if RESPONSE:
                     return RESPONSE.redirect('manage_main')
             
-            return "OK:",self.absolute_url(),self.contentType
+            return "OK:",self.absolute_url(),normalizeCt(self.contentType)
         
     def ECHO_getResourceMD(self,template="yes",back=None,overwrite="no"):
         """Einlesen der Metadaten und Anlegen dieser Metadaten als Informationen zur Resource"""
@@ -1554,11 +1613,11 @@ class ECHO_resource(CatalogAware,Folder,
                 return "ERROR:",error
         
         if (not self.contentType) or (overwrite=="yes"):
-                self.contentType=metadict['bib_type'].lower()
+                self.contentType=normalizeCt(normalizeCt(metadict['bib_type']).lower())
                 
-        if not (metadict['bib_type'].lower()==self.contentType.lower()):
-                self.REQUEST.SESSION['contentStorage']=metadict['bib_type']
-                self.REQUEST.SESSION['contentZope']=self.contentType
+        if not (normalizeCt(metadict['bib_type']).lower()==normalizeCt(self.contentType).lower()):
+                self.REQUEST.SESSION['contentStorage']=normalizeCt(metadict['bib_type'])
+                self.REQUEST.SESSION['contentZope']=normalizeCt(self.contentType)
 
                 return zptFile(self, 'zpt/ECHO_getResourceMDErrorContentType.zpt')()
 
@@ -1605,6 +1664,11 @@ class ECHO_resource(CatalogAware,Folder,
                 self.REQUEST.RESPONSE.write(fh)
                 self.REQUEST.RESPONSE.close()
                 return 
+            
+        if getattr(self,'newViewer',''): #benutze den neuen viewer
+            url=self.newViewer+'url='+self.metalink+"&mode=texttool"
+            return self.REQUEST.RESPONSE.redirect(url)
+            
         return self.REQUEST.RESPONSE.redirect(self.link)
 
     def startpage_html(self):
@@ -1639,7 +1703,7 @@ class ECHO_resource(CatalogAware,Folder,
 
     def generate_label(self):
         """Erzeugt_standard_Label aus Template"""
-        pt=getattr(self,"label_template_"+self.contentType.lower())
+        pt=getattr(self,"label_template_"+normalizeCt(self.contentType).lower())
 
         self.label=pt()[0:]
         return pt()
@@ -1648,7 +1712,7 @@ class ECHO_resource(CatalogAware,Folder,
 
     def generate_title(self,RESPONSE=None):
         """Erzeugt_standard_Label aus Template"""
-        pt=getattr(self,"label_template_"+self.contentType.lower())
+        pt=getattr(self,"label_template_"+normalizeCt(self.contentType).lower())
 
         self.title=pt()[0:]
         
@@ -2287,6 +2351,28 @@ class ECHO_collection(CatalogAware, Fold
         else:
             return None
 
+    def changeViewer(self,newViewer,REQUEST=None,RESPONSE=None):
+        """changes all ressources to the newViewer"""
+        
+        resources=self.ZopeFind(self,obj_metatypes=['ECHO_resource'],search_sub=1)
+        if RESPONSE is not None:
+                    RESPONSE.write("<html><body>")
+
+        for resource in resources:
+            
+            done,msg=resource[1].changeViewer(newViewer)
+            if done:
+                if RESPONSE is not None:
+                    RESPONSE.write("<p>OK: %s"%resource[0])
+            else:
+                if RESPONSE is not None:
+                    RESPONSE.write("<p><a href='%s'>ERROR: %s (%s)</a>"%(resource[1].absolute_url()+'/ECHO_resource_config_main',resource[0],msg))
+                
+
+                
+        if RESPONSE is not None:
+                    RESPONSE.write("<p>Done</p></body></html>")
+
     def changeViewerTemplateSets(self,project,xslt,thumbtemplate,topbar,digiLibTemplate,digiliburlprefix,RESPONSE=None):
             """change the templates"""
 
@@ -2414,12 +2500,13 @@ class ECHO_collection(CatalogAware, Fold
             for resource in dom.getElementsByTagName('resource'):
                     link=getText(resource.getElementsByTagName('link')[0].childNodes)
                     label=getText(resource.getElementsByTagName('label')[0].childNodes)
+                    pageimglink=getText(resource.getElementsByTagName('pageimglink')[0].childNodes)
                     #splitted=link.split("?")[0].split("/")
                     #id=splitted[len(splitted)-1].encode('ascii')
                     id=re.sub(" ","_",label).encode('ascii')
                     
                     ret+="<p>"+label+"</p>"
-                    manage_addECHO_resource(self,id,label.encode('ascii'),label.encode('ascii'),"","","",link.encode('ascii'),"","")
+                    manage_addECHO_resource(self,id,label.encode('ascii'),label.encode('ascii'),"","",pageimglink.encode('ascii'),link.encode('ascii'),"","")
             return ret
         
     security.declarePublic('getImageTag')
@@ -2548,7 +2635,7 @@ class ECHO_collection(CatalogAware, Fold
         return ECHO_rerenderLinksMD(self,obj,types)
 
         
-    def __init__(self,id,title,label,description="",contentType="",responsible="",credits="",weight="",sortfield="",coords=[],secondaryLinkTitle="",secondaryLink="",imageTag="",bgcolour=""):
+    def __init__(self,id,title,label,description="",contentType="",responsible="",credits="",weight="",sortfield="",coords=[],secondaryLinkTitle="",secondaryLink="",imageTag="",bgcolour="",isVisible=True):
 
         self.id = id
         """Festlegen der ID"""
@@ -2566,6 +2653,7 @@ class ECHO_collection(CatalogAware, Fold
         self.secondaryLinkTitle=secondaryLinkTitle
         self.secondaryLink=secondaryLink
         self.bgcolour=bgcolour
+        self.isVisible=isVisible
         
 
     manage_options = Folder.manage_options+ Cacheable.manage_options+(
@@ -2610,7 +2698,7 @@ class ECHO_collection(CatalogAware, Fold
 
                 
     security.declarePublic('changeECHO_collection')         
-    def changeECHO_collection(self,title,label,description,contentType,responsible,weight,secondaryLink,secondaryLinkTitle,credits=None,sortfield="weight",coords=None,RESPONSE=None,imageTag="",bgcolour="",location=None,isAlwaysClickable=None,prefix="",suffix=""):
+    def changeECHO_collection(self,title,label,description,contentType,responsible,weight,secondaryLink,secondaryLinkTitle,credits=None,sortfield="weight",coords=None,RESPONSE=None,imageTag="",bgcolour="",location=None,isAlwaysClickable=None,prefix="",suffix="",isVisible=True):
         """Aenderung der Properties"""
 
         self.secondaryLink=secondaryLink
@@ -2621,6 +2709,7 @@ class ECHO_collection(CatalogAware, Fold
         self.isAlwaysClickable=isAlwaysClickable
         self.prefix=prefix[0:]
         self.suffix=suffix[0:]
+        self.setIsVisible(isVisible)
         
         setECHO_collectionInformation(self,title,label,description,contentType,responsible,credits,weight)
                 
@@ -2758,11 +2847,11 @@ def manage_addECHO_collectionForm(self):
         return pt()
 
 
-def manage_addECHO_collection(self,id,title,label,description="",contentType="",responsible="",weight=0,sortfield="weight",coords="",secondaryLinkTitle="",secondaryLink="",credits=None,RESPONSE=None,imageTag="",bgcolour=""):
+def manage_addECHO_collection(self,id,title,label,description="",contentType="",responsible="",weight=0,sortfield="weight",coords="",secondaryLinkTitle="",secondaryLink="",credits=None,RESPONSE=None,imageTag="",bgcolour="",isVisible=True):
     """add a echo collection"""
     
 
-    newObj=ECHO_collection(id,title,label,description,contentType,responsible,credits,weight,sortfield,coords,secondaryLinkTitle=secondaryLinkTitle,secondaryLink=secondaryLink,imageTag=imageTag,bgcolour="")
+    newObj=ECHO_collection(id,title,label,description,contentType,responsible,credits,weight,sortfield,coords,secondaryLinkTitle=secondaryLinkTitle,secondaryLink=secondaryLink,imageTag=imageTag,bgcolour="",isVisible=isVisible)
 
     self._setObject(id,newObj)
 
@@ -3628,6 +3717,7 @@ class ECHO_root(Folder,Persistent,Implic
             return ""
         
     link2html=vlp_xmlhelpers.link2html
+    related2html=vlp_xmlhelpers.related2html
 
     xml2html=vlp_xmlhelpers.xml2html
  
@@ -3984,7 +4074,7 @@ class ECHO_linkList(ZopePageTemplate,ECH
     def getcontentType(self):
         """get contentType"""
         if hasattr(self,'contentType'):
-            return self.contentType
+            return normalizeCt(self.contentType)
         else:
             return 0