Changeset 579:fc861a6cef17 in documentViewer

Timestamp:

Oct 26, 2012, 10:53:43 AM (12 years ago)

Author:

casties

Branch:

default

Message:

update in w-tag format.

Files:

• MpiwgXmlTextServer.py (modified) (5 diffs)
• zpt/viewer_index.zpt (modified) (1 diff)

MpiwgXmlTextServer.py

@@ -213 +213 @@
         
         # TODO: this should not be necessary when the backend is fixed                
-        textParams['normalization'] = normMode
+        #textParams['normalization'] = normMode
         
         if not mode:
@@ -274 +274 @@
             if pagediv is not None:
                 # add textmode and normMode classes
-                pagediv.set('class', 'text %s %s'%(textmode, normMode))
+                #pagediv.set('class', 'text %s %s'%(textmode, normMode))
                 self._processWTags(textmode, normMode, pagediv)
                 #self._processPbTag(pagediv, pageinfo)
@@ -343 +343 @@
                 return serialize(pagediv)
                     
-        logging.error("getTextPage: error in text mode %s or text!"%(textmode))
+        logging.error("getTextPage: error in text mode %s or in text!"%(textmode))
         return None
 
@@ -358 +358 @@
                 wtag.remove(wtag.find("span[@class='nodictionary norm']"))
                 # delete non-matching children of a-tag and suppress remaining tag name
-                atag = wtag.find("a[@class='dictionary']")
+                atag = wtag.find("*[@class='dictionary']")
                 if normMode == 'orig':
                     atag.remove(atag.find("span[@class='reg']"))
@@ -374 +374 @@
             else:
                 # delete a-tag
-                wtag.remove(wtag.find("a[@class='dictionary']"))
+                wtag.remove(wtag.find("*[@class='dictionary']"))
                 # delete non-matching children and suppress remaining tag name
                 if normMode == 'orig':

zpt/viewer_index.zpt

@@ -103 +103 @@
         </tal:block>
 
-        <tal:block tal:define="ctxs docinfo/presentationContext | nothing">
+        <tal:block tal:define="ctxs docinfo/presentationContext | nothing" tal:condition="ctxs">
           <h2>Presentation context</h2>
           <ul>