--- documentViewer/documentViewer.py 2007/06/08 18:10:22 1.27 +++ documentViewer/documentViewer.py 2007/06/15 14:16:27 1.29 @@ -18,6 +18,7 @@ import sys import cgi import urllib import logging +import math import urlparse @@ -31,7 +32,7 @@ def getInt(number, default=0): try: return int(number) except: - return default + return int(default) def getTextFromNode(nodename): """get the cdata content of a node""" @@ -438,9 +439,18 @@ class documentViewer(Folder): """gets the bibliographical information from the preseantion entry in texttools """ 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]) + try: + docinfo['author']=getTextFromNode(dom.xpath("//author")[0]) + except: + pass + try: + docinfo['title']=getTextFromNode(dom.xpath("//title")[0]) + except: + pass + try: + docinfo['year']=getTextFromNode(dom.xpath("//date")[0]) + except: + pass return docinfo def getDocinfoFromImagePath(self,path,docinfo=None): @@ -495,7 +505,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: