# HG changeset patch # User casties # Date 1335461835 -7200 # Node ID 5c7433c2515c2ab47b98acd1af3557298e7ffc82 # Parent f0e28d31ebc6748b283bd2a7f3021ded9c417ee2 fix problems with texttool/text diff -r f0e28d31ebc6 -r 5c7433c2515c MpdlXmlTextServer.py --- a/MpdlXmlTextServer.py Thu Apr 26 14:45:05 2012 +0200 +++ b/MpdlXmlTextServer.py Thu Apr 26 19:37:15 2012 +0200 @@ -214,7 +214,10 @@ logging.debug("getTextPage: using cached text") return pageinfo['textPage'] - docpath = docinfo['textURLPath'] + docpath = docinfo.get('textURLPath', None) + if not docpath: + return None + # just checking if pageinfo['current'] != pn: logging.warning("getTextPage: current!=pn!") diff -r f0e28d31ebc6 -r 5c7433c2515c documentViewer.py --- a/documentViewer.py Thu Apr 26 14:45:05 2012 +0200 +++ b/documentViewer.py Thu Apr 26 19:37:15 2012 +0200 @@ -277,7 +277,8 @@ # auto viewMode: text if there is a text else images if viewMode=="auto": - if docinfo.get('textURL', None) or docinfo.get('textURLPath', None): + if docinfo.get('textURLPath', None): + # docinfo.get('textURL', None) not implemented yet viewMode = "text" if viewLayer is None: viewLayer = "dict" diff -r f0e28d31ebc6 -r 5c7433c2515c zpt/viewer_text.zpt --- a/zpt/viewer_text.zpt Thu Apr 26 14:45:05 2012 +0200 +++ b/zpt/viewer_text.zpt Thu Apr 26 19:37:15 2012 +0200 @@ -34,7 +34,7 @@