version 1.70, 2010/06/17 16:48:14
|
version 1.97, 2010/08/24 13:27:07
|
Line 7 from AccessControl import getSecurityMan
|
Line 7 from AccessControl import getSecurityMan
|
from Globals import package_home |
from Globals import package_home |
|
|
from Ft.Xml import EMPTY_NAMESPACE, Parse |
from Ft.Xml import EMPTY_NAMESPACE, Parse |
from Ft.Xml.Domlette import PrettyPrint, Print |
import Ft.Xml.Domlette |
import os.path |
import os.path |
import sys |
import sys |
import urllib |
import urllib |
Line 43 def getTextFromNode(nodename):
|
Line 43 def getTextFromNode(nodename):
|
def serializeNode(node, encoding='utf-8'): |
def serializeNode(node, encoding='utf-8'): |
"""returns a string containing node as XML""" |
"""returns a string containing node as XML""" |
buf = cStringIO.StringIO() |
buf = cStringIO.StringIO() |
Print(node, stream=buf, encoding=encoding) |
Ft.Xml.Domlette.Print(node, stream=buf, encoding=encoding) |
s = buf.getvalue() |
s = buf.getvalue() |
buf.close() |
buf.close() |
return s |
return s |
Line 119 class documentViewer(Folder):
|
Line 119 class documentViewer(Folder):
|
page_main_images = PageTemplateFile('zpt/page_main_images', globals()) |
page_main_images = PageTemplateFile('zpt/page_main_images', globals()) |
page_main_text = PageTemplateFile('zpt/page_main_text', globals()) |
page_main_text = PageTemplateFile('zpt/page_main_text', globals()) |
page_main_text_dict = PageTemplateFile('zpt/page_main_text_dict', globals()) |
page_main_text_dict = PageTemplateFile('zpt/page_main_text_dict', globals()) |
|
page_main_gis =PageTemplateFile ('zpt/page_main_gis', globals()) |
page_main_xml = PageTemplateFile('zpt/page_main_xml', globals()) |
page_main_xml = PageTemplateFile('zpt/page_main_xml', globals()) |
head_main = PageTemplateFile('zpt/head_main', globals()) |
head_main = PageTemplateFile('zpt/head_main', globals()) |
docuviewer_css = PageTemplateFile('css/docuviewer.css', globals()) |
docuviewer_css = PageTemplateFile('css/docuviewer.css', globals()) |
Line 145 class documentViewer(Folder):
|
Line 146 class documentViewer(Folder):
|
self._setObject('template',templateFolder) # old style |
self._setObject('template',templateFolder) # old style |
try: |
try: |
import MpdlXmlTextServer |
import MpdlXmlTextServer |
textServer = MpdlXmlTextServer(id='fulltextclient') |
textServer = MpdlXmlTextServer.MpdlXmlTextServer(id='fulltextclient',serverName=textServerName) |
#templateFolder['fulltextclient'] = xmlRpcClient |
#templateFolder['fulltextclient'] = xmlRpcClient |
templateFolder._setObject('fulltextclient',textServer) |
templateFolder._setObject('fulltextclient',textServer) |
except Exception, e: |
except Exception, e: |
Line 172 class documentViewer(Folder):
|
Line 173 class documentViewer(Folder):
|
"""get search""" |
"""get search""" |
return self.template.fulltextclient.getSearch(**args) |
return self.template.fulltextclient.getSearch(**args) |
|
|
def getNumPages(self, **args): |
def getNumPages(self, docinfo): |
"""get numpages""" |
"""get numpages""" |
return self.template.fulltextclient.getNumPages(**args) |
return self.template.fulltextclient.getNumPages(docinfo) |
|
|
def getTranslate(self, **args): |
def getTranslate(self, **args): |
"""get translate""" |
"""get translate""" |
Line 225 class documentViewer(Folder):
|
Line 226 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,url,mode="texttool",viewMode="auto",tocMode="thumbs",start=None,pn=1,mk=None, query=None, querySearch=None): |
def index_html(self,url,mode="texttool",viewMode="auto",tocMode="thumbs",start=None,pn=1,mk=None, query=None, querySearch=None, characterNormalization=""): |
''' |
''' |
view it |
view it |
@param mode: defines how to access the document behind url |
@param mode: defines how to access the document behind url |
@param url: url which contains display information |
@param url: url which contains display information |
@param viewMode: if images display images, if text display text, default is auto (text,images or auto) |
@param viewMode: if images display images, if text display text, default is auto (text,images or auto) |
@param tocMode: type of 'table of contents' for navigation (thumbs, text, figures, none) |
@param tocMode: type of 'table of contents' for navigation (thumbs, text, figures, none) |
|
@param characterNormalization type of text display (reg, norm, none) |
@param querySearch: type of different search modes (fulltext, fulltextMorph, xpath, xquery, ftIndex, ftIndexMorph, fulltextMorphLemma) |
@param querySearch: type of different search modes (fulltext, fulltextMorph, xpath, xquery, ftIndex, ftIndexMorph, fulltextMorphLemma) |
''' |
''' |
|
|
Line 243 class documentViewer(Folder):
|
Line 245 class documentViewer(Folder):
|
return "ERROR: template folder missing!" |
return "ERROR: template folder missing!" |
|
|
if not getattr(self, 'digilibBaseUrl', None): |
if not getattr(self, 'digilibBaseUrl', None): |
self.digilibBaseUrl = self.findDigilibUrl() or "http://nausikaa.mpiwg-berlin.mpg.de/digitallibrary" |
self.digilibBaseUrl = self.findDigilibUrl() or "http://digilib.mpiwg-berlin.mpg.de/digitallibrary" |
|
|
docinfo = self.getDocinfo(mode=mode,url=url) |
docinfo = self.getDocinfo(mode=mode,url=url) |
|
|
|
|
if tocMode != "thumbs": |
if tocMode != "thumbs": |
# get table of contents |
# get table of contents |
docinfo = self.getToc(mode=tocMode, docinfo=docinfo) |
docinfo = self.getToc(mode=tocMode, docinfo=docinfo) |
|
|
if viewMode=="auto": # automodus gewaehlt |
if viewMode=="auto": # automodus gewaehlt |
if docinfo.has_key("textURL") or docinfo.has_key('textURLPath'): #texturl gesetzt und textViewer konfiguriert |
if docinfo.has_key('textURL') or docinfo.has_key('textURLPath'): #texturl gesetzt und textViewer konfiguriert |
viewMode="text_dict" |
viewMode="text_dict" |
else: |
else: |
viewMode="images" |
viewMode="images" |
Line 267 class documentViewer(Folder):
|
Line 268 class documentViewer(Folder):
|
ret="" |
ret="" |
if mk is None: |
if mk is None: |
return "" |
return "" |
if type(mk) is not ListType: |
if not isinstance(mk, list): |
mk=[mk] |
mk=[mk] |
for m in mk: |
for m in mk: |
ret+="mk=%s"%m |
ret+="mk=%s"%m |
Line 306 class documentViewer(Folder):
|
Line 307 class documentViewer(Folder):
|
params["url"] = getParentDir(params["url"]) |
params["url"] = getParentDir(params["url"]) |
|
|
# quote values and assemble into query string |
# quote values and assemble into query string |
ps = "&".join(["%s=%s"%(k,urllib.quote(v)) for (k, v) in params.items()]) |
#ps = "&".join(["%s=%s"%(k,urllib.quote(v)) for (k, v) in params.items()]) |
|
ps = urllib.urlencode(params) |
url=self.REQUEST['URL1']+"?"+ps |
url=self.REQUEST['URL1']+"?"+ps |
return url |
return url |
|
|
Line 347 class documentViewer(Folder):
|
Line 349 class documentViewer(Folder):
|
elif access is None or access in self.authgroups: |
elif access is None or access in self.authgroups: |
# only local access -- only logged in users |
# only local access -- only logged in users |
user = getSecurityManager().getUser() |
user = getSecurityManager().getUser() |
|
logging.debug("documentViewer (accessOK) user=%s ip=%s"%(user,self.REQUEST.getClientAddr())) |
if user is not None: |
if user is not None: |
#print "user: ", user |
#print "user: ", user |
return (user.getUserName() != "Anonymous User") |
return (user.getUserName() != "Anonymous User") |
else: |
else: |
return False |
return False |
|
|
logging.debug("documentViewer (accessOK) unknown access type %s"%access) |
logging.error("documentViewer (accessOK) unknown access type %s"%access) |
return False |
return False |
|
|
|
|
Line 588 class documentViewer(Folder):
|
Line 591 class documentViewer(Folder):
|
docinfo['textURLPath'] = textUrl |
docinfo['textURLPath'] = textUrl |
if not docinfo['imagePath']: |
if not docinfo['imagePath']: |
# text-only, no page images |
# text-only, no page images |
docinfo = self.getNumPages(docinfo) #im moment einfach auf eins setzen, navigation ueber die thumbs geht natuerlich nicht |
docinfo = self.getNumPages(docinfo) |
|
|
presentationUrls = dom.xpath("//texttool/presentation") |
presentationUrls = dom.xpath("//texttool/presentation") |
docinfo = self.getBibinfoFromIndexMeta(url, docinfo=docinfo, dom=dom) # get info von bib tag |
docinfo = self.getBibinfoFromIndexMeta(url, docinfo=docinfo, dom=dom) # get info von bib tag |
Line 675 class documentViewer(Folder):
|
Line 678 class documentViewer(Folder):
|
self.REQUEST.SESSION['docinfo'] = docinfo |
self.REQUEST.SESSION['docinfo'] = docinfo |
return docinfo |
return docinfo |
|
|
def getPageinfo(self, current, start=None, rows=None, cols=None, docinfo=None, viewMode=None, tocMode=None): |
def getPageinfo(self, current, start=None, rows=None, cols=None, docinfo=None, viewMode=None, tocMode=None,characterNormalization=""): |
"""returns pageinfo with the given parameters""" |
"""returns pageinfo with the given parameters""" |
pageinfo = {} |
pageinfo = {} |
current = getInt(current) |
current = getInt(current) |
Line 698 class documentViewer(Folder):
|
Line 701 class documentViewer(Folder):
|
pageinfo['numgroups'] += 1 |
pageinfo['numgroups'] += 1 |
pageinfo['viewMode'] = viewMode |
pageinfo['viewMode'] = viewMode |
pageinfo['tocMode'] = tocMode |
pageinfo['tocMode'] = tocMode |
|
pageinfo['characterNormalization'] =characterNormalization |
|
#pageinfo['characterNormalization'] = self.REQUEST.get('characterNormalization',' ') |
pageinfo['query'] = self.REQUEST.get('query',' ') |
pageinfo['query'] = self.REQUEST.get('query',' ') |
pageinfo['queryType'] = self.REQUEST.get('queryType',' ') |
pageinfo['queryType'] = self.REQUEST.get('queryType',' ') |
pageinfo['querySearch'] =self.REQUEST.get('querySearch', 'fulltext') |
pageinfo['querySearch'] =self.REQUEST.get('querySearch', 'fulltext') |