--- ECHO_content/ECHO_collection.py	2007/03/09 17:57:13	1.286
+++ ECHO_content/ECHO_collection.py	2007/04/30 16:30:09	1.288
@@ -1177,8 +1177,26 @@ class ECHO_resource(CatalogAware,Folder,
         only if metalink is set, otherwise it gives false
         """
         
+        texterUrl="http://nausikaa2.mpiwg-berlin.mpg.de/digitallibrary/servlet/Texter?fn=/"
+        
         vl,msg=self.checkValidityOfMetaLink()
         
+        if not vl: #ungueltiger link, versuche neuen
+            newStr=re.match(".*/mpiwg/online/(.*)",self.metalink) # suche pfad hinter /mpiwg/online 
+            oldLink=self.metalink
+            
+            if newStr:
+                self.metalink=texterUrl+newStr.group(1)
+                vl,msg=self.checkValidityOfMetaLink()
+            else:
+                logging.error("change Viewer XX(mew Metadatafile) %s"%self.metalink)
+                vl=False
+                
+            if not vl: # geht immer noch nicht, dann setzte wieder zurueck
+                self.metaLink=oldLink
+            
+            logging.info("change Viewer (mew Metadatafile) %s"%self.metalink)
+           
         if vl:
             self.newViewer=newViewer
             return vl,msg
@@ -2612,9 +2630,9 @@ class ECHO_collection(CatalogAware, Fold
         ret="""<?xml version="1.0" encoding="utf-8" ?>"""
         return ret+"<collection>"+getCollection(self,pwstr=pwstr)+"</collection>"
     
-    def createAllJSAreas(self):
+    def createAllJSAreas(self,mapColTypes=None):
         """create area calls for JavaScript"""
-        areas = self.getAllMapAreas()
+        areas = self.getAllMapAreas(mapColTypes=mapColTypes)
         return self.createJSAreas(areas)
 
     
@@ -2839,9 +2857,11 @@ class ECHO_collection(CatalogAware, Fold
         """javascript"""
         return sendFile(self, 'js/hl_add.js', 'text/plain')
 
-    def getAllMapAreas(self,mapColTypes=['ECHO_collection','ECHO_resource','ECHO_link','ECHO_externalLink']):
+    def getAllMapAreas(self,mapColTypes=None):
         """Give list of coordinates"""
-        
+        if mapColTypes is None:
+            mapColTypes=['ECHO_collection','ECHO_resource','ECHO_link','ECHO_externalLink']
+            
         areas=[]
         for entry in self.getSubCols(subColTypes=mapColTypes):
             object=entry