Changeset 554:c56bc63436de in documentViewer

Timestamp:

Sep 25, 2012, 11:05:48 AM (12 years ago)

Author:

casties

Branch:

default

Message:

fixed problem with empty div tags in fulltext.

Files:

• MpdlXmlTextServer.py (modified) (5 diffs)
• version.txt (modified) (1 diff)

MpdlXmlTextServer.py

@@ -283 +283 @@
         # ElementTree 1.2 in Python 2.6 can't do div[@class='pageContent']
         # so we look at the second level divs
-        alldivs = dom.findall("div")
+        alldivs = dom.findall('div')
         for div in alldivs:
             dc = div.get('class')
@@ -299 +299 @@
                     pagediv = self.addPunditAttributes(pagediv, pageinfo, docinfo)
                     
+                # fix empty div tags
+                divs = pagediv.findall('.//div')
+                for d in divs:
+                    if len(d) == 0 and not d.text:
+                        # make empty divs non-empty
+                        d.text = ' '
+                    
                 # check all a-tags
-                links = pagediv.findall(".//a")
+                links = pagediv.findall('.//a')
                 for l in links:
                     href = l.get('href')
@@ -316 +323 @@
                 if punditMode:
                     pagediv = self.addPunditAttributes(pagediv, pageinfo, docinfo)
+                    
+                # fix empty div tags
+                divs = pagediv.findall('.//div')
+                for d in divs:
+                    if len(d) == 0 and not d.text:
+                        # make empty divs non-empty
+                        d.text = ' '
                     
                 # check all a-tags
@@ -333 +347 @@
                             l.set('target', '_blank')
                                                           
-                        # TODO: is this needed?
-#                        if href.startswith('http://mpdl-proto.mpiwg-berlin.mpg.de/mpdl/lt/lemma.xql'):
-#                            selfurl = self.absolute_url()
-#                            l.set('href', href.replace('http://mpdl-proto.mpiwg-berlin.mpg.de/mpdl/lt/lemma.xql','%s/head_main_lemma'%selfurl))
-#                            l.set('target', '_blank')
-#                            l.set('onclick',"popupWin = window.open(this.href, 'InfoWindow', 'menubar=no, location,width=500,height=600,top=180, left=700, toolbar=no, scrollbars=1'); return false;")
-#                            l.set('ondblclick', 'popupWin.focus();')   
-                    
                         if href.startswith('#note-'):
                             # note link
@@ -360 +366 @@
         elif textmode == "gis":
             if pagediv is not None:
+                # fix empty div tags
+                divs = pagediv.findall('.//div')
+                for d in divs:
+                    if len(d) == 0 and not d.text:
+                        # make empty divs non-empty
+                        d.text = ' '
+                    
                 # check all a-tags
                 links = pagediv.findall(".//a")

version.txt

@@ -1 @@
-DocumentViewer 2.2.3
+DocumentViewer 2.2.4