--- documentViewer/MpdlXmlTextServer.py 2011/02/24 13:55:28 1.228 +++ documentViewer/MpdlXmlTextServer.py 2011/03/01 14:53:15 1.229 @@ -129,7 +129,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""" @@ -201,21 +200,17 @@ class MpdlXmlTextServer(SimpleItem): 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 len(pagedivs)>0: docinfo['pageNumberOrig']= getTextFromNode(pagedivs[0]) - #logging.debug("ORIGINAL PAGES: %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'])) - #figureEntries pagedivs = dom.xpath("//div[@class='countFigureEntries']") @@ -226,14 +221,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 +238,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 +250,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 +291,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] @@ -406,14 +395,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,8 +451,6 @@ 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):