--- ECHO_content/ECHO_resource.py	2011/10/13 07:48:27	1.6.2.1
+++ ECHO_content/ECHO_resource.py	2012/08/23 10:25:32	1.6.2.4
@@ -62,7 +62,7 @@ from ECHO_helpers import *
 
 
 from ECHO_movie import *
-import vlp_xmlhelpers #TODO: vlp elemente aus echo herausnehmen
+#import vlp_xmlhelpers #TODO: vlp elemente aus echo herausnehmen
 import xmlrpclib
 
 import logging
@@ -88,8 +88,11 @@ class ECHO_resource(CatalogAware,Folder,
 		 TODO: sollte konfigurierbar sein. 
 		 zur Zeit wird enfach nur self.metadata falls vorhanden zurueckggegeben.
 		 """
+	
+		 mf= getattr(self,"metadataFolder",None)
+		 #logging.debug("MetadataManager:"+repr(mf))
+		 return mf
 		 
-		 return getattr(self,"metadata",None)
 
     def index_meta(self,RESPONSE=None):
         """ gibt das im metalink gespeicher xml-file zurueck"""
@@ -486,10 +489,6 @@ class ECHO_resource(CatalogAware,Folder,
 
             
 
-    def changeViewerTemplateSetForm(self):
-            """change the viewer template set"""
-            pt=zptFile(self, 'zpt/changeResourceViewerTemplateSet')
-            return pt()
 
 
     def setLink(self, link=None):
@@ -921,15 +920,17 @@ class ECHO_resource(CatalogAware,Folder,
     def getMDValueSimpleSearchField(self):
             """returns value for simple search aus DC daten"""
             
-            
-            bibdata=self.getMetaDataManager().getBibData(path=self.getMetaDataLink())
-            dcMapped = self.getMetaDataManager().getDCMappedData(bibdata)
-            logging.debug("getMDValueSimpleSearchField:"+ repr(dcMapped))
-            return " ".join([dcMapped.get('title',''),
-                             dcMapped.get('creator',''),
-                             dcMapped.get('year',''),self.getTitle()])
-           
-
+            try:
+			    bibdata=self.getMetaDataManager().getBibData(path=self.getMetaDataLink())
+			    dcMapped = self.getMetaDataManager().getDCMappedData(bibdata)
+			    logging.debug("getMDValueSimpleSearchField:"+ repr(dcMapped))
+			    return " ".join([dcMapped.get('title',''),
+			                 dcMapped.get('creator',''),
+			                 dcMapped.get('year',''),self.getTitle()])
+		    
+            except:
+				logging.error("getMDValueSimpleSearchField doesn't work:"+self.getId())
+				
 
     def newMetaXML(self,project=None,startpage=None,xslt=None,thumbtemplate=None,topbar=None,digiLibTemplate=None,digiliburlprefix=None):
             """new index.meta"""
@@ -1001,7 +1002,6 @@ class ECHO_resource(CatalogAware,Folder,
         {'label':'Main Config','action':'ECHO_resource_config_main'},
         {'label':'Edit Metadata','action':'ECHO_getResourceMD'},
         {'label':'Graphic Coords','action':'ECHO_graphicEntry'},
-        {'label':'Change TemplateSets and Image Viewer','action':'changeViewerTemplateSetForm'},
         {'label':'set/change startpage','action':'setStartPageForm'},
         {'label':'Change AccessRights','action':'changeAccessRightForm'}, 
         ) + Folder.manage_options
@@ -1049,6 +1049,15 @@ class ECHO_resource(CatalogAware,Folder,
             self.contentType=normalizeCt(self.metaDataHash.get('@type',''))
             
             return
+           
+    def getDRI(self,type="escidoc"):
+    	"""get DRI"""
+    	try:
+    		dri = self.getMetaDataManager().getDRI(path=self.metalink,type=type)
+    	except:
+    		return None
+    	
+    	return dri
         
     def ECHO_getResourceMD(self,template="yes",back=None,overwrite="no"):
         """Einlesen der Metadaten und Anlegen dieser Metadaten als Informationen zur Resource"""