# HG changeset patch # User casties # Date 1348851059 -7200 # Node ID eabfbad6aeb424cbd8c8aaa14a06eae24d758a01 # Parent 6ab436383fcaa2c358dbc97fdb5246e6369823eb "extended" layer for index view and some bugfixes. diff -r 6ab436383fca -r eabfbad6aeb4 MpdlXmlTextServer.py --- a/MpdlXmlTextServer.py Fri Sep 28 11:25:25 2012 +0200 +++ b/MpdlXmlTextServer.py Fri Sep 28 18:50:59 2012 +0200 @@ -52,6 +52,17 @@ return getHttpData(url,data,timeout=self.timeout) + def getTextDownloadUrl(self, type='xml', docinfo=None): + """returns a URL to download the current text""" + docpath = docinfo.get('textURLPath', None) + if not docpath: + return None + + docpath = docpath.replace('.xml','.'+type) + url = '%sgetDoc?doc=%s'%(self.serverUrl.replace('interface/',''), docpath) + return url + + def getPlacesOnPage(self, docinfo=None, pn=None): """Returns list of GIS places of page pn""" docpath = docinfo.get('textURLPath',None) diff -r 6ab436383fca -r eabfbad6aeb4 documentViewer.py --- a/documentViewer.py Fri Sep 28 11:25:25 2012 +0200 +++ b/documentViewer.py Fri Sep 28 18:50:59 2012 +0200 @@ -136,6 +136,7 @@ layer_text_annotator = PageTemplateFile('zpt/layer_text_annotator', globals()) layer_text_gis = PageTemplateFile('zpt/layer_text_gis', globals()) layer_text_pundit = PageTemplateFile('zpt/layer_text_pundit', globals()) + layer_index_extended = PageTemplateFile('zpt/layer_index_extended', globals()) # toc templates toc_thumbs = PageTemplateFile('zpt/toc_thumbs', globals()) toc_text = PageTemplateFile('zpt/toc_text', globals()) @@ -218,6 +219,10 @@ """returns one page of the table of contents""" return self.template.fulltextclient.getTocPage(**args) + def getTextDownloadUrl(self, **args): + """get list of gis places on one page""" + return self.template.fulltextclient.getTextDownloadUrl(**args) + def getPlacesOnPage(self, **args): """get list of gis places on one page""" return self.template.fulltextclient.getPlacesOnPage(**args) diff -r 6ab436383fca -r eabfbad6aeb4 zpt/layer_index_extended.zpt --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/zpt/layer_index_extended.zpt Fri Sep 28 18:50:59 2012 +0200 @@ -0,0 +1,27 @@ + + +
+ +Document ID: | - |