version 1.35, 2008/11/04 20:23:49
|
version 1.37, 2008/11/04 22:03:56
|
Line 21 import logging
|
Line 21 import logging
|
import math |
import math |
|
|
import urlparse |
import urlparse |
|
from types import * |
def logger(txt,method,txt2): |
def logger(txt,method,txt2): |
"""logging""" |
"""logging""" |
logging.info(txt+ txt2) |
logging.info(txt+ txt2) |
Line 139 class documentViewer(Folder):
|
Line 139 class documentViewer(Folder):
|
return pt(docinfo=docinfo,pageinfo=pageinfo,viewMode=viewMode) |
return pt(docinfo=docinfo,pageinfo=pageinfo,viewMode=viewMode) |
|
|
security.declareProtected('View','index_html') |
security.declareProtected('View','index_html') |
def index_html(self,mode,url,viewMode="auto",start=None,pn=1): |
def index_html(self,mode,url,viewMode="auto",start=None,pn=1,mk=None): |
''' |
''' |
view it |
view it |
@param mode: defines how to access the document behind url |
@param mode: defines how to access the document behind url |
Line 167 class documentViewer(Folder):
|
Line 167 class documentViewer(Folder):
|
else: |
else: |
viewMode="images" |
viewMode="images" |
|
|
return pt(docinfo=docinfo,pageinfo=pageinfo,viewMode=viewMode) |
return pt(docinfo=docinfo,pageinfo=pageinfo,viewMode=viewMode,mk=self.generateMarks(mk)) |
|
|
|
def generateMarks(self,mk): |
|
ret="" |
|
if mk is None: |
|
return "" |
|
|
|
if type(mk) is not ListType: |
|
mk=[mk] |
|
for m in mk: |
|
ret+="mk=%s"%m |
|
return ret |
|
|
def getLink(self,param=None,val=None): |
def getLink(self,param=None,val=None): |
"""link to documentviewer with parameter param set to val""" |
"""link to documentviewer with parameter param set to val""" |
Line 288 class documentViewer(Folder):
|
Line 298 class documentViewer(Folder):
|
metaUrl=server+url.replace("/mpiwg/online","") |
metaUrl=server+url.replace("/mpiwg/online","") |
if not metaUrl.endswith("index.meta"): |
if not metaUrl.endswith("index.meta"): |
metaUrl += "/index.meta" |
metaUrl += "/index.meta" |
print metaUrl |
logging.debug("METAURL: %s"%metaUrl) |
for cnt in range(num_retries): |
for cnt in range(num_retries): |
try: |
try: |
# patch dirk encoding fehler treten dann nicht mehr auf |
# patch dirk encoding fehler treten dann nicht mehr auf |
Line 547 class documentViewer(Folder):
|
Line 557 class documentViewer(Folder):
|
elif mode=="imagepath": |
elif mode=="imagepath": |
docinfo = self.getDocinfoFromImagePath(url, docinfo=docinfo) |
docinfo = self.getDocinfoFromImagePath(url, docinfo=docinfo) |
elif mode=="filepath": |
elif mode=="filepath": |
docinfo = self.getDocinfoFromImagePath(url, docinfo=docinfo,cut=2) |
docinfo = self.getDocinfoFromImagePath(url, docinfo=docinfo,cut=1) |
else: |
else: |
logger("documentViewer (getdocinfo)", logging.ERROR,"unknown mode!") |
logger("documentViewer (getdocinfo)", logging.ERROR,"unknown mode!") |
raise ValueError("Unknown mode %s"%(mode)) |
raise ValueError("Unknown mode %s"%(mode)) |
Line 578 class documentViewer(Folder):
|
Line 588 class documentViewer(Folder):
|
pageinfo['numgroups'] = int(np / grpsize) |
pageinfo['numgroups'] = int(np / grpsize) |
if np % grpsize > 0: |
if np % grpsize > 0: |
pageinfo['numgroups'] += 1 |
pageinfo['numgroups'] += 1 |
|
logging.debug("getPageInfo: %s"%repr(pageinfo)) |
return pageinfo |
return pageinfo |
|
|
def text(self,mode,url,pn): |
def text(self,mode,url,pn): |