diff MetaDataFolder.py @ 8:4cd862bf37a3

more renovation
author casties
date Thu, 28 Jul 2011 14:54:54 +0200
parents 00147a1ab4ac
children eeaad777d3d7
line wrap: on
line diff
--- a/MetaDataFolder.py	Thu Jul 28 10:36:39 2011 +0200
+++ b/MetaDataFolder.py	Thu Jul 28 14:54:54 2011 +0200
@@ -90,18 +90,26 @@
             url=path
         else:
             # path only
+            path = path.replace('/mpiwg/online/', '')
             if path.endswith("index.meta"):
-                url =self.metaDataServerUrl%path
+                url = self.metaDataServerUrl%path
             else:
-                url=os.path.join(self.metaDataServerUrl%path,'index.meta')
+                url = os.path.join(self.metaDataServerUrl%path,'index.meta')
             
         #logging.debug("get Metadata: %s"%url)
         md = getHttpData(url)
         return md
 
-    def getBibdataFromDom(self, dom):
+    def getTexttoolData(self, path=None, dom=None):
+        """returns contents of texttool tag as dict"""
+        return self.resource.meta.texttool.getData(path=path, dom=dom)
+
+
+
+
+    def getBibdata(self, path=None, dom=None):
         """returns contents of bib tag as dict"""
-        return self.resource.meta.bib.getDataFromDom(dom)
+        return self.resource.meta.bib.getData(path=path, dom=dom)
 
     def getBibMapping(self, bibtype):
         """returns MetaDataMapping for resource/meta/bib of bibtype"""
@@ -118,7 +126,6 @@
     def getDCMappedData(self, bibdata):
         """returns dict with DC keys and data from bibdata"""
         return self.resource.meta.bib.getDCMappedData(bibdata)
-    
                 
     def getBibFormattedMetaData(self, path=None, dom=None, bibdata=None):
             """get the metadafrom server"""
@@ -135,10 +142,12 @@
             logging.debug("getBibFormattedLabel(%s)"%path)
             return self.resource.meta.bib.getFormatted('label_template', path=path, dom=dom, data=bibdata)
                         
+    # compatibility
     getFormattedMetaData = getBibFormattedMetaData
     getFormattedMetaDataShort = getBibFormattedMetaData
     getFormattedMetaDataExtended = getBibFormattedMetaDataExtended
     getFormattedLabel = getBibFormattedLabel
+
                 
     def getDCFormatted(self,path):
         """get the metadata as dc set"""