--- documentViewer/MpdlXmlTextServer.py 2011/02/18 11:21:46 1.227 +++ documentViewer/MpdlXmlTextServer.py 2011/02/24 13:55:28 1.228 @@ -183,8 +183,6 @@ class MpdlXmlTextServer(SimpleItem): url = docinfo.get('url',None) name = docinfo.get('name',None) pn =pageinfo['current'] - #viewMode= pageinfo['viewMode'] - sn = pageinfo['sn'] highlightQuery = pageinfo['highlightQuery'] #mode = pageinfo ['viewMode'] @@ -209,14 +207,14 @@ class MpdlXmlTextServer(SimpleItem): 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 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'])) + #logging.debug("ORIGINAL PAGES: %s"%(docinfo['pageNumberOrigNorm'])) #figureEntries @@ -228,14 +226,14 @@ class MpdlXmlTextServer(SimpleItem): if s=='0': try: docinfo['countFigureEntries'] = int(s) - logging.debug("FIGURE ENTRIES: %s"%(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)) + #logging.debug("FIGURE ENTRIES: %s"%(s1)) except: docinfo['countFigureEntries'] = 0 @@ -247,7 +245,7 @@ class MpdlXmlTextServer(SimpleItem): s = getTextFromNode(pagedivs[0]) try: docinfo['countPlaces'] = int(s) - logging.debug("PLACES HERE: %s"%(s)) + #logging.debug("PLACES HERE: %s"%(s)) except: docinfo['countPlaces'] = 0 @@ -260,14 +258,14 @@ class MpdlXmlTextServer(SimpleItem): if s=='0': try: docinfo['countTocEntries'] = int(s) - logging.debug("TEXT ENTRIES: %s"%(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)) + #logging.debug("TEXT ENTRIES: %s"%(s1)) except: docinfo['countTocEntries'] = 0 @@ -280,7 +278,7 @@ class MpdlXmlTextServer(SimpleItem): try: docinfo['numPages'] = int(s) - logging.debug("PAGE NUMBER: %s"%(s)) + #logging.debug("PAGE NUMBER: %s"%(s)) np = docinfo['numPages'] pageinfo['end'] = min(pageinfo['end'], np) @@ -408,14 +406,14 @@ class MpdlXmlTextServer(SimpleItem): pagedom = Parse(pagexml) numdivs = pagedom.xpath("//div[@class='queryResultHits']") tocSearch = int(getTextFromNode(numdivs[0])) - logging.debug("documentViewer (gettoc) tocSearch: %s"%(tocSearch)) + #logging.debug("documentViewer (gettoc) tocSearch: %s"%(tocSearch)) tc=int((tocSearch/10)+1) - logging.debug("documentViewer (gettoc) tc: %s"%(tc)) + #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)) + #logging.debug("documentViewer (gettoc) mode: %s"%(mode)) if mode == "none": return docinfo if 'tocSize_%s'%mode in docinfo: @@ -468,7 +466,7 @@ class MpdlXmlTextServer(SimpleItem): 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)) + #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):