Changeset 473:74e9e74277e9 in documentViewer

Timestamp:

Aug 5, 2011, 9:24:42 AM (13 years ago)

Author:

casties

Branch:

elementtree

Message:

smaller improvements

Files:

• MpdlXmlTextServer.py (modified) (7 diffs)
• documentViewer.py (modified) (1 diff)

MpdlXmlTextServer.py

@@ -229 +229 @@
         # assume first second level div is pageMeta
         alldivs = dom.find("div")
+        
+        if alldivs is None or alldivs.get('class', '') != 'pageMeta':
+            logging.error("processPageInfo: pageMeta div not found!")
+            return
+        
         for div in alldivs:
             dc = div.get('class')
@@ -265 +270 @@
                         if np % pageinfo['groupsize'] > 0:
                             pageinfo['numgroups'] += 1
-                            
+        
+        #logging.debug("processPageInfo: pageinfo=%s"%repr(pageinfo))
         return
          
@@ -292 +298 @@
         selfurl = docinfo['viewerUrl']   
         
-        if mode == "dict":
-            # text_dict is called textPollux in the backend
+        if mode == "dict" or mode == "text_dict":
+            # dict is called textPollux in the backend
             textmode = "textPollux"
         elif not mode:
@@ -324 +330 @@
         # plain text mode
         if mode == "text":
-            if pagediv:
+            if pagediv is not None:
                 links = pagediv.findall(".//a")
                 for l in links:
@@ -336 +342 @@
         # text-with-links mode
         elif mode == "text_dict":
-            if pagediv:
+            if pagediv is not None:
                 # check all a-tags
                 links = pagediv.findall(".//a")
@@ -366 +372 @@
         # xml mode
         elif mode == "xml":
-            if pagediv:
+            if pagediv is not None:
                 return serialize(pagediv)
             
         # pureXml mode
         elif mode == "pureXml":
-            if pagediv:
+            if pagediv is not None:
                 return serialize(pagediv)
                   
@@ -377 +383 @@
         elif mode == "gis":
             name = docinfo['name']
-            if pagediv:
+            if pagediv is not None:
                 # check all a-tags
                 links = pagediv.findall(".//a")

documentViewer.py

@@ -462 +462 @@
         docinfo['documentUrl'] = docUrl
         # process index.meta contents
-        if metaDom is not None:
+        if metaDom is not None and metaDom.tag == 'resource':
             # document directory name and path
             resource = self.metadataService.getResourceData(dom=metaDom)