version 1.238.2.10, 2011/08/05 17:04:20
|
version 1.238.2.11, 2011/08/09 18:27:41
|
Line 29 def getTextFromNode(node):
|
Line 29 def getTextFromNode(node):
|
"""get the cdata content of a node""" |
"""get the cdata content of a node""" |
if node is None: |
if node is None: |
return "" |
return "" |
# ET: |
|
# text = node.text or "" |
|
# for e in node: |
|
# text += gettext(e) |
|
# if e.tail: |
|
# text += e.tail |
|
|
|
# 4Suite: |
# 4Suite: |
nodelist=node.childNodes |
nodelist=node.childNodes |
Line 187 class MpdlXmlTextServer(SimpleItem):
|
Line 181 class MpdlXmlTextServer(SimpleItem):
|
if not docpath: |
if not docpath: |
return None |
return None |
|
|
url = docinfo['url'] |
|
selfurl = self.absolute_url() |
|
pn = pageinfo['current'] |
pn = pageinfo['current'] |
hrefList=[] |
hrefList=[] |
myList= "" |
myList= "" |
Line 206 class MpdlXmlTextServer(SimpleItem):
|
Line 198 class MpdlXmlTextServer(SimpleItem):
|
def getAllGisPlaces (self, docinfo=None, pageinfo=None): |
def getAllGisPlaces (self, docinfo=None, pageinfo=None): |
"""Show all Gis Places of whole Book """ |
"""Show all Gis Places of whole Book """ |
xpath ='//echo:place' |
xpath ='//echo:place' |
docpath =docinfo['textURLPath'] |
|
url = docinfo['url'] |
|
selfurl =self.absolute_url() |
|
pn =pageinfo['current'] |
|
hrefList=[] |
hrefList=[] |
myList="" |
myList="" |
text=self.getServerData("xpath.xql", "document=%s&xpath=%s"%(docinfo['textURLPath'],xpath)) |
text=self.getServerData("xpath.xql", "document=%s&xpath=%s"%(docinfo['textURLPath'],xpath)) |
Line 504 class MpdlXmlTextServer(SimpleItem):
|
Line 492 class MpdlXmlTextServer(SimpleItem):
|
|
|
return docinfo |
return docinfo |
|
|
def getTocPage(self, mode="text", pn=1, pageinfo=None, docinfo=None): |
def getTocPage(self, mode="text", pn=0, pageinfo=None, docinfo=None): |
"""returns single page from the table of contents""" |
"""returns single page from the table of contents""" |
logging.debug("getTocPage mode=%s, pn=%s"%(mode,pn)) |
logging.debug("getTocPage mode=%s, pn=%s"%(mode,pn)) |
if mode == "text": |
if mode == "text": |
Line 521 class MpdlXmlTextServer(SimpleItem):
|
Line 509 class MpdlXmlTextServer(SimpleItem):
|
logging.error("getTocPage: unable to find tocXML") |
logging.error("getTocPage: unable to find tocXML") |
return "No ToC" |
return "No ToC" |
|
|
pagesize = int(pageinfo['tocPageSize']) |
pagesize = pageinfo['tocPageSize'] |
url = docinfo['url'] |
tocPN = pageinfo['tocPN'] |
urlmode = docinfo['mode'] |
if not pn: |
selfurl = docinfo['viewerUrl'] |
|
viewMode= pageinfo['viewMode'] |
|
tocMode = pageinfo['tocMode'] |
|
tocPN = int(pageinfo['tocPN']) |
|
pn = tocPN |
pn = tocPN |
|
|
fulltoc = ET.fromstring(tocxml) |
fulltoc = ET.fromstring(tocxml) |
Line 548 class MpdlXmlTextServer(SimpleItem):
|
Line 532 class MpdlXmlTextServer(SimpleItem):
|
# take pn from href |
# take pn from href |
m = re.match(r'page-fragment\.xql.*pn=(\d+)', href) |
m = re.match(r'page-fragment\.xql.*pn=(\d+)', href) |
if m is not None: |
if m is not None: |
# and create new url |
# and create new url (assuming parent is documentViewer) |
l.set('href', '%s?mode=%s&url=%s&viewMode=%s&pn=%s&tocMode=%s&tocPN=%s'%(selfurl, urlmode, url, viewMode, m.group(1), tocMode, tocPN)) |
url = self.getLink('pn', m.group(1)) |
|
l.set('href', url) |
else: |
else: |
logging.warning("getTocPage: Problem with link=%s"%href) |
logging.warning("getTocPage: Problem with link=%s"%href) |
|
|