# HG changeset patch
# User casties
# Date 1330452608 -3600
# Node ID 67095296c95a4a586d23fa9e442eab39245ca0c0
# Parent  73fb73577961f3d1b3c8c609676371ea58cd7f7d# Parent  92a6443a6f16ff25674d43814ec0d6c0a43a5e1a
Merge from elementtree branch
92a6443a6f16ff25674d43814ec0d6c0a43a5e1a

diff -r 92a6443a6f16 -r 67095296c95a .hgtags
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/.hgtags	Tue Feb 28 19:10:08 2012 +0100
@@ -0,0 +1,5 @@
+4db49915d825571c1e81da3ba2273229f3736b02 Root_modularisierung
+93b9a5dddb8b2976c128481c696eac44acc64fa7 Root_elementtree
+cb0978becec474f6e9d62dfce6aa1fb7ef31c99c Root_metalify-1
+df6952ac93e9a517dc6936a9ff0f6447dfd43a63 Root_integrate_imageArchive
+ead830ce45d61a215ee451f9d6ab804bec525012 Root_roc_1
diff -r 92a6443a6f16 -r 67095296c95a MpdlXmlTextServer.py
diff -r 92a6443a6f16 -r 67095296c95a documentViewer.py
diff -r 92a6443a6f16 -r 67095296c95a zpt/page_main_gis.zpt
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/zpt/page_main_gis.zpt	Tue Feb 28 19:10:08 2012 +0100
@@ -0,0 +1,3 @@
+<tal:block tal:define="pageinfo python:options.get('pageinfo',None); docinfo python:options.get('docinfo',None) ;highlightQuery python:pageinfo.get('highlightQuery','');sn python:pageinfo.get('sn',''); characterNormalization python:pageinfo.get('characterNormalization',''); optionToggle python:pageinfo.get('optionToggle','');">
+  <div tal:content="structure python:pageinfo['textPage']"></div>
+</tal:block>
\ No newline at end of file
diff -r 92a6443a6f16 -r 67095296c95a zpt/page_main_pureXml.zpt
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/zpt/page_main_pureXml.zpt	Tue Feb 28 19:10:08 2012 +0100
@@ -0,0 +1,3 @@
+<tal:block tal:define="pageinfo python:options.get('pageinfo',None); docinfo python:options.get('docinfo',None) ;highlightQuery python:pageinfo.get('highlightQuery','');s python:pageinfo.get('s','');optionToggle python:pageinfo.get('optionToggle','');  ">
+  <div tal:content="structure python:pageinfo['textPage']"></div>
+</tal:block>
\ No newline at end of file
diff -r 92a6443a6f16 -r 67095296c95a zpt/page_main_text.zpt
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/zpt/page_main_text.zpt	Tue Feb 28 19:10:08 2012 +0100
@@ -0,0 +1,10 @@
+<tal:block tal:define="pageinfo python:options.get('pageinfo',None); 
+                       docinfo python:options.get('docinfo',None);
+                       highlightQuery python:pageinfo.get('highlightQuery','');
+                       s python:pageinfo.get('s','');
+                       pn python:pageinfo.get('pn',1);
+                       characterNormalization python:pageinfo.get('characterNormalization','');
+                       optionToggle python:pageinfo.get('optionToggle','');">
+  <div tal:content="structure python:pageinfo['textPage']"></div>
+  
+</tal:block>
\ No newline at end of file
diff -r 92a6443a6f16 -r 67095296c95a zpt/page_main_text_dict.zpt
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/zpt/page_main_text_dict.zpt	Tue Feb 28 19:10:08 2012 +0100
@@ -0,0 +1,3 @@
+<tal:block tal:define="pageinfo python:options.get('pageinfo',None); docinfo python:options.get('docinfo',None) ;highlightQuery python:pageinfo.get('highlightQuery','');sn python:pageinfo.get('sn','');characterNormalization python:pageinfo.get('characterNormalization','');optionToggle python:pageinfo.get('optionToggle','');">
+  <div tal:content="structure python:pageinfo['textPage']"></div>
+</tal:block>
\ No newline at end of file
diff -r 92a6443a6f16 -r 67095296c95a zpt/page_main_xml.zpt
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/zpt/page_main_xml.zpt	Tue Feb 28 19:10:08 2012 +0100
@@ -0,0 +1,3 @@
+<tal:block tal:define="pageinfo python:options.get('pageinfo',None); docinfo python:options.get('docinfo',None) ;highlightQuery python:pageinfo.get('highlightQuery','');s python:pageinfo.get('s','');optionToggle python:pageinfo.get('optionToggle',''); mode python:pageinfo.get('mode', 'xml') ">
+  <div tal:content="structure python:pageinfo['textPage']"></div>
+</tal:block>
\ No newline at end of file