Mercurial > hg > documentViewer
changeset 362:1ed87e862806
*** empty log message ***
author | abukhman |
---|---|
date | Mon, 18 Oct 2010 14:11:34 +0200 |
parents | c1381556f389 |
children | c89ae357ae48 |
files | documentViewer.py |
diffstat | 1 files changed, 4 insertions(+), 5 deletions(-) [+] |
line wrap: on
line diff
--- a/documentViewer.py Mon Oct 18 14:08:39 2010 +0200 +++ b/documentViewer.py Mon Oct 18 14:11:34 2010 +0200 @@ -12,7 +12,6 @@ import os.path import sys import urllib - import urllib2 import logging import math @@ -663,7 +662,7 @@ presentationUrls = dom.xpath("//texttool/presentation") docinfo = self.getBibinfoFromIndexMeta(url, docinfo=docinfo, dom=dom) # get info von bib tag docinfo = self.getNameFromIndexMeta(url, docinfo=docinfo, dom=dom) - docinfo =self.getOrigPages(docinfo=docinfo) + #docinfo =self.getOrigPages(docinfo=docinfo) if presentationUrls and (len(presentationUrls) > 0): # ueberschreibe diese durch presentation informationen # presentation url ergiebt sich ersetzen von index.meta in der url der fuer die Metadaten @@ -744,7 +743,7 @@ raise ValueError("Unknown mode %s! Has to be one of 'texttool','imagepath','filepath'."%(mode)) logging.debug("documentViewer (getdocinfo) docinfo: %s"%docinfo) - + #logging.debug("documentViewer (getdocinfo) docinfo: %s"%) self.REQUEST.SESSION['docinfo'] = docinfo return docinfo @@ -753,7 +752,7 @@ pageinfo = {} current = getInt(current) - #pageinfo ['originalPage'] = self.getOrigPages(docinfo=docinfo,pageinfo=pageinfo) + #pageinfo ['originalPage'] = originalPage pageinfo['current'] = current rows = int(rows or self.thumbrows) pageinfo['rows'] = rows @@ -786,7 +785,7 @@ toc = int (pageinfo['tocPN']) pageinfo['textPages'] =int (toc) - #logging.debug("originalPage: %s"%originalPage) + if 'tocSize_%s'%tocMode in docinfo: tocSize = int(docinfo['tocSize_%s'%tocMode])