--- documentViewer/MpdlXmlTextServer.py 2011/02/24 13:55:28 1.228 +++ documentViewer/MpdlXmlTextServer.py 2011/03/10 14:22:05 1.232 @@ -21,6 +21,8 @@ class MpdlXmlTextServer(SimpleItem): manage_changeMpdlXmlTextServerForm = PageTemplateFile("zpt/manage_changeMpdlXmlTextServer", globals()) def __init__(self,id,title="",serverUrl="http://mpdl-proto.mpiwg-berlin.mpg.de/mpdl/interface/", serverName=None, timeout=40): + #def __init__(self,id,title="",serverUrl="http://mpdl-test.mpiwg-berlin.mpg.de:30030/mpdl/interface/", serverName=None, timeout=40): + """constructor""" self.id=id self.title=title @@ -85,7 +87,7 @@ class MpdlXmlTextServer(SimpleItem): selfurl = self.absolute_url() pagexml=href.replace('mode=text','mode=texttool&viewMode=%s&queryType=%s&query=%s&queryResultPageSize=%s&queryResultPN=%s&tocMode=%s&searchPN=%s&tocPN=%s&optionToggle=%s&characterNormalization=%s'%(viewMode,queryType,urllib.quote(query),pagesize,pn,tocMode,pn,tocPN,optionToggle,characterNormalization)) hrefNode.nodeValue = pagexml.replace('page-fragment.xql','%s'%selfurl) - logging.debug("PUREXML :%s"%(serializeNode(pagenode))) + #logging.debug("PUREXML :%s"%(serializeNode(pagenode))) return serializeNode(pagenode) if (queryType=="fulltextMorph"): pagedivs = pagedom.xpath("//div[@class='queryResult']") @@ -129,7 +131,6 @@ class MpdlXmlTextServer(SimpleItem): l.setAttributeNS(None, 'onClick', 'popupWin.focus();') return serializeNode(pagenode) return "no text here" - def getGisPlaces(self, docinfo=None, pageinfo=None): """ Show all Gis Places of whole Page""" @@ -151,7 +152,7 @@ class MpdlXmlTextServer(SimpleItem): href= hrefNode.nodeValue hrefList.append(href) myList = ",".join(hrefList) - logging.debug("getGisPlaces :%s"%(myList)) + #logging.debug("getGisPlaces :%s"%(myList)) return myList def getAllGisPlaces (self, docinfo=None, pageinfo=None): @@ -172,7 +173,7 @@ class MpdlXmlTextServer(SimpleItem): href= hrefNode.nodeValue hrefList.append(href) myList = ",".join(hrefList) - logging.debug("getALLGisPlaces :%s"%(myList)) + #logging.debug("getALLGisPlaces :%s"%(myList)) return myList @@ -184,6 +185,7 @@ class MpdlXmlTextServer(SimpleItem): name = docinfo.get('name',None) pn =pageinfo['current'] sn = pageinfo['sn'] + optionToggle =pageinfo ['optionToggle'] highlightQuery = pageinfo['highlightQuery'] #mode = pageinfo ['viewMode'] tocMode = pageinfo['tocMode'] @@ -195,28 +197,26 @@ class MpdlXmlTextServer(SimpleItem): else: textmode = mode - textParam = "document=%s&mode=%s&pn=%s&characterNormalization=%s"%(docpath,textmode,pn,characterNormalization) + textParam = "document=%s&mode=%s&pn=%s&characterNormalization=%s&optionToggle=%s"%(docpath,textmode,pn,characterNormalization,optionToggle) if highlightQuery is not None: textParam +="&highlightQuery=%s&sn=%s"%(urllib.quote(highlightQuery),sn) pagexml = self.getServerData("page-fragment.xql",textParam) dom = Parse(pagexml) - #original Pages pagedivs = dom.xpath("//div[@class='pageNumberOrig']") - if pagedivs == dom.xpath("//div[@class='pageNumberOrig']"): + """if pagedivs == dom.xpath("//div[@class='pageNumberOrig']"): if len(pagedivs)>0: docinfo['pageNumberOrig']= getTextFromNode(pagedivs[0]) - #logging.debug("ORIGINAL PAGES: %s"%(docinfo['pageNumberOrig'])) + logging.debug("ORIGINAL PAGE: %s"%(docinfo['pageNumberOrig'])) #original Pages Norm pagedivs = dom.xpath("//div[@class='pageNumberOrigNorm']") if pagedivs == dom.xpath("//div[@class='pageNumberOrigNorm']"): if len(pagedivs)>0: docinfo['pageNumberOrigNorm']= getTextFromNode(pagedivs[0]) - #logging.debug("ORIGINAL PAGES: %s"%(docinfo['pageNumberOrigNorm'])) - - + logging.debug("ORIGINAL PAGE NORM: %s"%(docinfo['pageNumberOrigNorm'])) + """ #figureEntries pagedivs = dom.xpath("//div[@class='countFigureEntries']") if pagedivs == dom.xpath("//div[@class='countFigureEntries']"): @@ -226,14 +226,12 @@ class MpdlXmlTextServer(SimpleItem): if s=='0': try: docinfo['countFigureEntries'] = int(s) - #logging.debug("FIGURE ENTRIES: %s"%(s)) except: docinfo['countFigureEntries'] = 0 else: s1 = int(s)/30+1 try: docinfo['countFigureEntries'] = int(s1) - #logging.debug("FIGURE ENTRIES: %s"%(s1)) except: docinfo['countFigureEntries'] = 0 @@ -245,7 +243,6 @@ class MpdlXmlTextServer(SimpleItem): s = getTextFromNode(pagedivs[0]) try: docinfo['countPlaces'] = int(s) - #logging.debug("PLACES HERE: %s"%(s)) except: docinfo['countPlaces'] = 0 @@ -258,14 +255,12 @@ class MpdlXmlTextServer(SimpleItem): if s=='0': try: docinfo['countTocEntries'] = int(s) - #logging.debug("TEXT ENTRIES: %s"%(s)) except: docinfo['countTocEntries'] = 0 else: s1 = int(s)/30+1 try: docinfo['countTocEntries'] = int(s1) - #logging.debug("TEXT ENTRIES: %s"%(s1)) except: docinfo['countTocEntries'] = 0 @@ -301,7 +296,6 @@ class MpdlXmlTextServer(SimpleItem): # plain text mode if mode == "text": # first div contains text - #mode = viewMode pagedivs = dom.xpath("/div") if len(pagedivs) > 0: pagenode = pagedivs[0] @@ -374,6 +368,31 @@ class MpdlXmlTextServer(SimpleItem): return serializeNode(pagenode) return "no text here" + def getOrigPages(self, docinfo=None, pageinfo=None): + docpath = docinfo['textURLPath'] + pn =pageinfo['current'] + selfurl = self.absolute_url() + pagexml = self.getServerData("page-fragment.xql","document=%s&pn=%s"%(docpath, pn)) + dom = Parse(pagexml) + pagedivs = dom.xpath("//div[@class='pageNumberOrig']") + if pagedivs == dom.xpath("//div[@class='pageNumberOrig']"): + if len(pagedivs)>0: + docinfo['pageNumberOrig']= getTextFromNode(pagedivs[0]) + return docinfo['pageNumberOrig'] + + def getOrigPagesNorm(self, docinfo=None, pageinfo=None): + docpath = docinfo['textURLPath'] + pn =pageinfo['current'] + selfurl = self.absolute_url() + pagexml = self.getServerData("page-fragment.xql","document=%s&pn=%s"%(docpath, pn)) + dom = Parse(pagexml) + pagedivs = dom.xpath("//div[@class='pageNumberOrigNorm']") + if pagedivs == dom.xpath("//div[@class='pageNumberOrigNorm']"): + if len(pagedivs)>0: + docinfo['pageNumberOrigNorm']= getTextFromNode(pagedivs[0]) + return docinfo['pageNumberOrigNorm'] + + def getTranslate(self, query=None, language=None): """translate into another languages""" data = self.getServerData("lt/lex.xql","document=&language="+str(language)+"&query="+urllib.quote(query)) @@ -406,14 +425,11 @@ class MpdlXmlTextServer(SimpleItem): pagedom = Parse(pagexml) numdivs = pagedom.xpath("//div[@class='queryResultHits']") tocSearch = int(getTextFromNode(numdivs[0])) - #logging.debug("documentViewer (gettoc) tocSearch: %s"%(tocSearch)) tc=int((tocSearch/10)+1) - #logging.debug("documentViewer (gettoc) tc: %s"%(tc)) return tc def getToc(self, mode="text", docinfo=None): """loads table of contents and stores in docinfo""" - #logging.debug("documentViewer (gettoc) mode: %s"%(mode)) if mode == "none": return docinfo if 'tocSize_%s'%mode in docinfo: @@ -465,11 +481,10 @@ class MpdlXmlTextServer(SimpleItem): data = self.getServerData("doc-query.xql","document=%s&queryType=%s&queryResultPageSize=%s&queryResultPN=%s&characterNormalization=regPlusNorm&optionToggle=1"%(docpath,queryType, pagesize, pn)) page = data.replace('page-fragment.xql?document=%s'%str(path),'%s?url=%s&viewMode=%s&tocMode=%s&tocPN=%s&optionToggle=1'%(selfurl,url, viewMode, tocMode, tocPN)) text = page.replace('mode=image','mode=texttool') - #logging.debug("documentViewer (characterNormalization) characterNormalization: %s"%(characterNormalization)) - #logging.debug("TEXT %s"%(text)) return text def manage_changeMpdlXmlTextServer(self,title="",serverUrl="http://mpdl-proto.mpiwg-berlin.mpg.de/mpdl/interface/",timeout=40,RESPONSE=None): + #def manage_changeMpdlXmlTextServer(self,title="",serverUrl="http://mpdl-test.mpiwg-berlin.mpg.de:30030/mpdl/interface/",timeout=40,RESPONSE=None): """change settings""" self.title=title self.timeout = timeout @@ -484,6 +499,7 @@ def manage_addMpdlXmlTextServerForm(self return pt() def manage_addMpdlXmlTextServer(self,id,title="",serverUrl="http://mpdl-proto.mpiwg-berlin.mpg.de/mpdl/interface/",timeout=40,RESPONSE=None): +#def manage_addMpdlXmlTextServer(self,id,title="",serverUrl="http://mpdl-test.mpiwg-berlin.mpg.de:30030/mpdl/interface/",timeout=40,RESPONSE=None): """add zogiimage""" newObj = MpdlXmlTextServer(id,title,serverUrl,timeout) self.Destination()._setObject(id, newObj)