--- documentViewer/documentViewer.py	2007/05/03 17:28:23	1.24
+++ documentViewer/documentViewer.py	2007/06/08 18:10:22	1.27
@@ -80,6 +80,7 @@ class documentViewer(Folder):
     image_main = PageTemplateFile('zpt/image_main', globals())
     head_main = PageTemplateFile('zpt/head_main', globals())
     docuviewer_css = PageTemplateFile('css/docuviewer.css', globals())
+    info_xml = PageTemplateFile('zpt/info_xml', globals())
 
     security.declareProtected('View management screens','changeDocumentViewerForm')    
     changeDocumentViewerForm = PageTemplateFile('zpt/changeDocumentViewer', globals())
@@ -108,9 +109,9 @@ class documentViewer(Folder):
     def index_html(self,mode,url,viewMode="auto",start=None,pn=1):
         '''
         view it
-        @param mode: defines which type of document is behind url (text,images or auto)
+        @param mode: defines how to access the document behind url 
         @param url: url which contains display information
-        @param viewMode: if images display images, if text display text, default is images
+        @param viewMode: if images display images, if text display text, default is images (text,images or auto)
         
         '''
         
@@ -133,7 +134,6 @@ class documentViewer(Folder):
             else:
                 viewMode="images"
                
-
         return pt(docinfo=docinfo,pageinfo=pageinfo,viewMode=viewMode)
   
   
@@ -152,6 +152,17 @@ class documentViewer(Folder):
         url=self.REQUEST['URL1']+"?"+ps
         return url
 
+
+    def getInfo_xml(self,url,mode):
+        """returns info about the document as XML"""
+
+        if not self.digilibBaseUrl:
+            self.digilibBaseUrl = self.findDigilibUrl() or "http://nausikaa.mpiwg-berlin.mpg.de/digitallibrary"
+        
+        docinfo = self.getDocinfo(mode=mode,url=url)
+        pt = getattr(self.template, 'info_xml')
+        return pt(docinfo=docinfo)
+
     
     def getStyle(self, idx, selected, style=""):
         """returns a string with the given style and append 'sel' if path == selected."""
@@ -160,7 +171,7 @@ class documentViewer(Folder):
             return style + 'sel'
         else:
             return style
-        
+
         
     def isAccessible(self, docinfo):
         """returns if access to the resource is granted"""
@@ -298,7 +309,7 @@ class documentViewer(Folder):
         
     def getBibinfoFromIndexMeta(self,path,docinfo=None,dom=None):
         """gets bibliographical info from the index.meta file at path or given by dom"""
-        logger("documentViewer (getbibinfofromindexmeta)", logging.INFO,"path: %s"%(path))
+        logging.debug("documentViewer (getbibinfofromindexmeta) path: %s"%(path))
         
         if docinfo is None:
             docinfo = {}
@@ -306,26 +317,36 @@ class documentViewer(Folder):
         if dom is None:
             dom = self.getIndexMeta(getParentDir(path))
             
+        # put in all raw bib fields as dict "bib"
+        bib = dom.xpath("//bib/*")
+        if bib and len(bib)>0:
+            bibinfo = {}
+            for e in bib:
+                bibinfo[e.localName] = getTextFromNode(e)
+            docinfo['bib'] = bibinfo
+        
+        # extract some fields (author, title, year) according to their mapping
         metaData=self.metadata.main.meta.bib
         bibtype=dom.xpath("//bib/@type")
         if bibtype and (len(bibtype)>0):
             bibtype=bibtype[0].value
         else:
             bibtype="generic"
+            
         bibtype=bibtype.replace("-"," ") # wrong typesiin index meta "-" instead of " " (not wrong! ROC)
+        docinfo['bib_type'] = bibtype
         bibmap=metaData.generateMappingForType(bibtype)
-        #print "bibmap: ", bibmap, " for: ", bibtype
         # if there is no mapping bibmap is empty (mapping sometimes has empty fields)
         if len(bibmap) > 0 and len(bibmap['author'][0]) > 0:
             docinfo['author']=getTextFromNode(dom.xpath("//bib/%s"%bibmap['author'][0])[0])
             docinfo['title']=getTextFromNode(dom.xpath("//bib/%s"%bibmap['title'][0])[0])
             docinfo['year']=getTextFromNode(dom.xpath("//bib/%s"%bibmap['year'][0])[0])
-            
-            logging.info("bla")
+            logging.debug("documentViewer (getbibinfofromindexmeta) using mapping for %s"%bibtype)
             try:
                 docinfo['lang']=getTextFromNode(dom.xpath("//bib/lang")[0])
             except:
                 docinfo['lang']=''
+
         return docinfo
 
         
@@ -409,7 +430,7 @@ class documentViewer(Folder):
            presentationUrl=url.replace('index.meta',getTextFromNode(presentationUrls[0]))
            docinfo = self.getBibinfoFromTextToolPresentation(presentationUrl,docinfo=docinfo,dom=dom)
 
-       docinfo = self.getAuthinfoFromIndexMeta(path,docinfo=docinfo)
+       docinfo = self.getAuthinfoFromIndexMeta(url,docinfo=docinfo,dom=dom)   # get access info
        return docinfo