--- documentViewer/documentViewer.py	2007/05/04 13:17:02	1.26
+++ documentViewer/documentViewer.py	2007/06/14 16:07:21	1.28
@@ -18,6 +18,7 @@ import sys
 import cgi
 import urllib
 import logging
+import math
 
 import urlparse 
 
@@ -309,7 +310,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 = {}
@@ -317,26 +318,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
 
         
@@ -430,7 +441,7 @@ class documentViewer(Folder):
         dom=self.getPresentationInfoXML(url)
         docinfo['author']=getTextFromNode(dom.xpath("//author")[0])
         docinfo['title']=getTextFromNode(dom.xpath("//title")[0])
-        docinfo['year']=getTextFromNode(dom.xpath("//date")[0])
+        #docinfo['year']=getTextFromNode(dom.xpath("//date")[0])
         return docinfo
     
     def getDocinfoFromImagePath(self,path,docinfo=None):
@@ -485,7 +496,8 @@ class documentViewer(Folder):
         pageinfo['cols'] = cols
         grpsize = cols * rows
         pageinfo['groupsize'] = grpsize
-        start = getInt(start, default=(int(current / grpsize) * grpsize +1))
+        start = getInt(start, default=(math.ceil(float(current)/float(grpsize))*grpsize-(grpsize-1)))
+        # int(current / grpsize) * grpsize +1))
         pageinfo['start'] = start
         pageinfo['end'] = start + grpsize
         if docinfo is not None: