Mercurial > hg > documentViewer

annotate MpdlXmlTextServer.py @ 469:15394486ab75 elementtree

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
working with new templates
author casties
date Wed, 03 Aug 2011 21:04:18 +0200
parents 224aad394350
children 415a7026eeda
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
rev   line source
129
9404b6c37920 more modular version with separate object MpdlXmlTextServer
casties
parents:
diff changeset
1
9404b6c37920 more modular version with separate object MpdlXmlTextServer
casties
parents:
diff changeset
2 from OFS.SimpleItem import SimpleItem
9404b6c37920 more modular version with separate object MpdlXmlTextServer
casties
parents:
diff changeset
3 from Products.PageTemplates.PageTemplateFile import PageTemplateFile
455
0a53fea83df7 more work renovating
casties
parents: 453
diff changeset
4
129
9404b6c37920 more modular version with separate object MpdlXmlTextServer
casties
parents:
diff changeset
5 from Ft.Xml import EMPTY_NAMESPACE, Parse
453
beb7ccb92564 first version using elementtree instead of 4suite xml
casties
parents: 407
diff changeset
6 from Ft.Xml.Domlette import NonvalidatingReader
beb7ccb92564 first version using elementtree instead of 4suite xml
casties
parents: 407
diff changeset
7 import Ft.Xml.Domlette
beb7ccb92564 first version using elementtree instead of 4suite xml
casties
parents: 407
diff changeset
8 import cStringIO
129
9404b6c37920 more modular version with separate object MpdlXmlTextServer
casties
parents:
diff changeset
9
453
beb7ccb92564 first version using elementtree instead of 4suite xml
casties
parents: 407
diff changeset
10 import xml.etree.ElementTree as ET
beb7ccb92564 first version using elementtree instead of 4suite xml
casties
parents: 407
diff changeset
11
455
0a53fea83df7 more work renovating
casties
parents: 453
diff changeset
12 import re
129
9404b6c37920 more modular version with separate object MpdlXmlTextServer
casties
parents:
diff changeset
13 import logging
134
6a33aa624ba4 fixed more oopsies
casties
parents: 133
diff changeset
14 import urllib
453
beb7ccb92564 first version using elementtree instead of 4suite xml
casties
parents: 407
diff changeset
15
458
48b135b089c8 more renovation
casties
parents: 456
diff changeset
16 from SrvTxtUtils import getInt, getText, getHttpData
453
beb7ccb92564 first version using elementtree instead of 4suite xml
casties
parents: 407
diff changeset
17
beb7ccb92564 first version using elementtree instead of 4suite xml
casties
parents: 407
diff changeset
18 def serialize(node):
beb7ccb92564 first version using elementtree instead of 4suite xml
casties
parents: 407
diff changeset
19 """returns a string containing an XML snippet of node"""
beb7ccb92564 first version using elementtree instead of 4suite xml
casties
parents: 407
diff changeset
20 s = ET.tostring(node, 'UTF-8')
beb7ccb92564 first version using elementtree instead of 4suite xml
casties
parents: 407
diff changeset
21 # snip off XML declaration
beb7ccb92564 first version using elementtree instead of 4suite xml
casties
parents: 407
diff changeset
22 if s.startswith('<?xml'):
beb7ccb92564 first version using elementtree instead of 4suite xml
casties
parents: 407
diff changeset
23 i = s.find('?>')
beb7ccb92564 first version using elementtree instead of 4suite xml
casties
parents: 407
diff changeset
24 return s[i+3:]
beb7ccb92564 first version using elementtree instead of 4suite xml
casties
parents: 407
diff changeset
25
beb7ccb92564 first version using elementtree instead of 4suite xml
casties
parents: 407
diff changeset
26 return s
beb7ccb92564 first version using elementtree instead of 4suite xml
casties
parents: 407
diff changeset
27
beb7ccb92564 first version using elementtree instead of 4suite xml
casties
parents: 407
diff changeset
28
beb7ccb92564 first version using elementtree instead of 4suite xml
casties
parents: 407
diff changeset
29 def getTextFromNode(node):
beb7ccb92564 first version using elementtree instead of 4suite xml
casties
parents: 407
diff changeset
30 """get the cdata content of a node"""
beb7ccb92564 first version using elementtree instead of 4suite xml
casties
parents: 407
diff changeset
31 if node is None:
beb7ccb92564 first version using elementtree instead of 4suite xml
casties
parents: 407
diff changeset
32 return ""
beb7ccb92564 first version using elementtree instead of 4suite xml
casties
parents: 407
diff changeset
33 # ET:
455
0a53fea83df7 more work renovating
casties
parents: 453
diff changeset
34 # text = node.text or ""
0a53fea83df7 more work renovating
casties
parents: 453
diff changeset
35 # for e in node:
0a53fea83df7 more work renovating
casties
parents: 453
diff changeset
36 # text += gettext(e)
0a53fea83df7 more work renovating
casties
parents: 453
diff changeset
37 # if e.tail:
0a53fea83df7 more work renovating
casties
parents: 453
diff changeset
38 # text += e.tail
453
beb7ccb92564 first version using elementtree instead of 4suite xml
casties
parents: 407
diff changeset
39
beb7ccb92564 first version using elementtree instead of 4suite xml
casties
parents: 407
diff changeset
40 # 4Suite:
beb7ccb92564 first version using elementtree instead of 4suite xml
casties
parents: 407
diff changeset
41 nodelist=node.childNodes
beb7ccb92564 first version using elementtree instead of 4suite xml
casties
parents: 407
diff changeset
42 text = ""
beb7ccb92564 first version using elementtree instead of 4suite xml
casties
parents: 407
diff changeset
43 for n in nodelist:
beb7ccb92564 first version using elementtree instead of 4suite xml
casties
parents: 407
diff changeset
44 if n.nodeType == node.TEXT_NODE:
beb7ccb92564 first version using elementtree instead of 4suite xml
casties
parents: 407
diff changeset
45 text = text + n.data
beb7ccb92564 first version using elementtree instead of 4suite xml
casties
parents: 407
diff changeset
46
beb7ccb92564 first version using elementtree instead of 4suite xml
casties
parents: 407
diff changeset
47 return text
beb7ccb92564 first version using elementtree instead of 4suite xml
casties
parents: 407
diff changeset
48
beb7ccb92564 first version using elementtree instead of 4suite xml
casties
parents: 407
diff changeset
49 def serializeNode(node, encoding="utf-8"):
beb7ccb92564 first version using elementtree instead of 4suite xml
casties
parents: 407
diff changeset
50 """returns a string containing node as XML"""
beb7ccb92564 first version using elementtree instead of 4suite xml
casties
parents: 407
diff changeset
51 #s = ET.tostring(node)
beb7ccb92564 first version using elementtree instead of 4suite xml
casties
parents: 407
diff changeset
52
beb7ccb92564 first version using elementtree instead of 4suite xml
casties
parents: 407
diff changeset
53 # 4Suite:
beb7ccb92564 first version using elementtree instead of 4suite xml
casties
parents: 407
diff changeset
54 stream = cStringIO.StringIO()
beb7ccb92564 first version using elementtree instead of 4suite xml
casties
parents: 407
diff changeset
55 Ft.Xml.Domlette.Print(node, stream=stream, encoding=encoding)
beb7ccb92564 first version using elementtree instead of 4suite xml
casties
parents: 407
diff changeset
56 s = stream.getvalue()
beb7ccb92564 first version using elementtree instead of 4suite xml
casties
parents: 407
diff changeset
57 stream.close()
beb7ccb92564 first version using elementtree instead of 4suite xml
casties
parents: 407
diff changeset
58
beb7ccb92564 first version using elementtree instead of 4suite xml
casties
parents: 407
diff changeset
59 return s
beb7ccb92564 first version using elementtree instead of 4suite xml
casties
parents: 407
diff changeset
60
129
9404b6c37920 more modular version with separate object MpdlXmlTextServer
casties
parents:
diff changeset
61
9404b6c37920 more modular version with separate object MpdlXmlTextServer
casties
parents:
diff changeset
62 class MpdlXmlTextServer(SimpleItem):
9404b6c37920 more modular version with separate object MpdlXmlTextServer
casties
parents:
diff changeset
63 """TextServer implementation for MPDL-XML eXist server"""
9404b6c37920 more modular version with separate object MpdlXmlTextServer
casties
parents:
diff changeset
64 meta_type="MPDL-XML TextServer"
9404b6c37920 more modular version with separate object MpdlXmlTextServer
casties
parents:
diff changeset
65
9404b6c37920 more modular version with separate object MpdlXmlTextServer
casties
parents:
diff changeset
66 manage_options=(
9404b6c37920 more modular version with separate object MpdlXmlTextServer
casties
parents:
diff changeset
67 {'label':'Config','action':'manage_changeMpdlXmlTextServerForm'},
9404b6c37920 more modular version with separate object MpdlXmlTextServer
casties
parents:
diff changeset
68 )+SimpleItem.manage_options
9404b6c37920 more modular version with separate object MpdlXmlTextServer
casties
parents:
diff changeset
69
9404b6c37920 more modular version with separate object MpdlXmlTextServer
casties
parents:
diff changeset
70 manage_changeMpdlXmlTextServerForm = PageTemplateFile("zpt/manage_changeMpdlXmlTextServer", globals())
9404b6c37920 more modular version with separate object MpdlXmlTextServer
casties
parents:
diff changeset
71
455
0a53fea83df7 more work renovating
casties
parents: 453
diff changeset
72 def __init__(self,id,title="",serverUrl="http://mpdl-text.mpiwg-berlin.mpg.de/mpdl/interface/", serverName=None, timeout=40):
129
9404b6c37920 more modular version with separate object MpdlXmlTextServer
casties
parents:
diff changeset
73 """constructor"""
9404b6c37920 more modular version with separate object MpdlXmlTextServer
casties
parents:
diff changeset
74 self.id=id
9404b6c37920 more modular version with separate object MpdlXmlTextServer
casties
parents:
diff changeset
75 self.title=title
9404b6c37920 more modular version with separate object MpdlXmlTextServer
casties
parents:
diff changeset
76 self.timeout = timeout
132
39167e96e582 fixed creation of text server on __init__
casties
parents: 129
diff changeset
77 if serverName is None:
39167e96e582 fixed creation of text server on __init__
casties
parents: 129
diff changeset
78 self.serverUrl = serverUrl
39167e96e582 fixed creation of text server on __init__
casties
parents: 129
diff changeset
79 else:
39167e96e582 fixed creation of text server on __init__
casties
parents: 129
diff changeset
80 self.serverUrl = "http://%s/mpdl/interface/"%serverName
129
9404b6c37920 more modular version with separate object MpdlXmlTextServer
casties
parents:
diff changeset
81
9404b6c37920 more modular version with separate object MpdlXmlTextServer
casties
parents:
diff changeset
82 def getHttpData(self, url, data=None):
9404b6c37920 more modular version with separate object MpdlXmlTextServer
casties
parents:
diff changeset
83 """returns result from url+data HTTP request"""
458
48b135b089c8 more renovation
casties
parents: 456
diff changeset
84 return getHttpData(url,data,timeout=self.timeout)
129
9404b6c37920 more modular version with separate object MpdlXmlTextServer
casties
parents:
diff changeset
85
9404b6c37920 more modular version with separate object MpdlXmlTextServer
casties
parents:
diff changeset
86 def getServerData(self, method, data=None):
9404b6c37920 more modular version with separate object MpdlXmlTextServer
casties
parents:
diff changeset
87 """returns result from text server for method+data"""
9404b6c37920 more modular version with separate object MpdlXmlTextServer
casties
parents:
diff changeset
88 url = self.serverUrl+method
458
48b135b089c8 more renovation
casties
parents: 456
diff changeset
89 return getHttpData(url,data,timeout=self.timeout)
129
9404b6c37920 more modular version with separate object MpdlXmlTextServer
casties
parents:
diff changeset
90
455
0a53fea83df7 more work renovating
casties
parents: 453
diff changeset
91 # WTF: what does this really do? can it be integrated in getPage?
453
beb7ccb92564 first version using elementtree instead of 4suite xml
casties
parents: 407
diff changeset
92 def getSearch(self, pageinfo=None, docinfo=None):
129
9404b6c37920 more modular version with separate object MpdlXmlTextServer
casties
parents:
diff changeset
93 """get search list"""
455
0a53fea83df7 more work renovating
casties
parents: 453
diff changeset
94 logging.debug("getSearch()")
129
9404b6c37920 more modular version with separate object MpdlXmlTextServer
casties
parents:
diff changeset
95 docpath = docinfo['textURLPath']
9404b6c37920 more modular version with separate object MpdlXmlTextServer
casties
parents:
diff changeset
96 url = docinfo['url']
9404b6c37920 more modular version with separate object MpdlXmlTextServer
casties
parents:
diff changeset
97 pagesize = pageinfo['queryPageSize']
453
beb7ccb92564 first version using elementtree instead of 4suite xml
casties
parents: 407
diff changeset
98 pn = pageinfo.get('searchPN',1)
129
9404b6c37920 more modular version with separate object MpdlXmlTextServer
casties
parents:
diff changeset
99 sn = pageinfo['sn']
9404b6c37920 more modular version with separate object MpdlXmlTextServer
casties
parents:
diff changeset
100 highlightQuery = pageinfo['highlightQuery']
181
bc44cf97dfdc *** empty log message ***
abukhman
parents: 180
diff changeset
101 query =pageinfo['query']
129
9404b6c37920 more modular version with separate object MpdlXmlTextServer
casties
parents:
diff changeset
102 queryType =pageinfo['queryType']
9404b6c37920 more modular version with separate object MpdlXmlTextServer
casties
parents:
diff changeset
103 viewMode= pageinfo['viewMode']
9404b6c37920 more modular version with separate object MpdlXmlTextServer
casties
parents:
diff changeset
104 tocMode = pageinfo['tocMode']
169
21ac9164eedf characterNormalization
abukhman
parents: 167
diff changeset
105 characterNormalization = pageinfo['characterNormalization']
453
beb7ccb92564 first version using elementtree instead of 4suite xml
casties
parents: 407
diff changeset
106 #optionToggle = pageinfo['optionToggle']
129
9404b6c37920 more modular version with separate object MpdlXmlTextServer
casties
parents:
diff changeset
107 tocPN = pageinfo['tocPN']
9404b6c37920 more modular version with separate object MpdlXmlTextServer
casties
parents:
diff changeset
108 selfurl = self.absolute_url()
453
beb7ccb92564 first version using elementtree instead of 4suite xml
casties
parents: 407
diff changeset
109 data = self.getServerData("doc-query.xql","document=%s&mode=%s&queryType=%s&query=%s&queryResultPageSize=%s&queryResultPN=%s&sn=%s&viewMode=%s&characterNormalization=%s&highlightQuery=%s"%(docpath, 'text', queryType, urllib.quote(query), pagesize, pn, sn, viewMode,characterNormalization, urllib.quote(highlightQuery)))
129
9404b6c37920 more modular version with separate object MpdlXmlTextServer
casties
parents:
diff changeset
110 pagexml = data.replace('?document=%s'%str(docpath),'?url=%s'%url)
9404b6c37920 more modular version with separate object MpdlXmlTextServer
casties
parents:
diff changeset
111 pagedom = Parse(pagexml)
453
beb7ccb92564 first version using elementtree instead of 4suite xml
casties
parents: 407
diff changeset
112
beb7ccb92564 first version using elementtree instead of 4suite xml
casties
parents: 407
diff changeset
113 """
beb7ccb92564 first version using elementtree instead of 4suite xml
casties
parents: 407
diff changeset
114 pagedivs = pagedom.xpath("//div[@class='queryResultHits']")
beb7ccb92564 first version using elementtree instead of 4suite xml
casties
parents: 407
diff changeset
115 if (pagedivs == pagedom.xpath("//div[@class='queryResultHits']")):
beb7ccb92564 first version using elementtree instead of 4suite xml
casties
parents: 407
diff changeset
116 if len(pagedivs)>0:
beb7ccb92564 first version using elementtree instead of 4suite xml
casties
parents: 407
diff changeset
117 docinfo['queryResultHits'] = int(getTextFromNode(pagedivs[0]))
beb7ccb92564 first version using elementtree instead of 4suite xml
casties
parents: 407
diff changeset
118 s = getTextFromNode(pagedivs[0])
beb7ccb92564 first version using elementtree instead of 4suite xml
casties
parents: 407
diff changeset
119 s1 = int(s)/10+1
beb7ccb92564 first version using elementtree instead of 4suite xml
casties
parents: 407
diff changeset
120 try:
beb7ccb92564 first version using elementtree instead of 4suite xml
casties
parents: 407
diff changeset
121 docinfo['queryResultHits'] = int(s1)
beb7ccb92564 first version using elementtree instead of 4suite xml
casties
parents: 407
diff changeset
122 logging.debug("SEARCH ENTRIES: %s"%(s1))
beb7ccb92564 first version using elementtree instead of 4suite xml
casties
parents: 407
diff changeset
123 except:
beb7ccb92564 first version using elementtree instead of 4suite xml
casties
parents: 407
diff changeset
124 docinfo['queryResultHits'] = 0
beb7ccb92564 first version using elementtree instead of 4suite xml
casties
parents: 407
diff changeset
125 """
129
9404b6c37920 more modular version with separate object MpdlXmlTextServer
casties
parents:
diff changeset
126 if (queryType=="fulltext")or(queryType=="xpath")or(queryType=="xquery")or(queryType=="fulltextMorphLemma"):
9404b6c37920 more modular version with separate object MpdlXmlTextServer
casties
parents:
diff changeset
127 pagedivs = pagedom.xpath("//div[@class='queryResultPage']")
9404b6c37920 more modular version with separate object MpdlXmlTextServer
casties
parents:
diff changeset
128 if len(pagedivs)>0:
9404b6c37920 more modular version with separate object MpdlXmlTextServer
casties
parents:
diff changeset
129 pagenode=pagedivs[0]
9404b6c37920 more modular version with separate object MpdlXmlTextServer
casties
parents:
diff changeset
130 links=pagenode.xpath("//a")
9404b6c37920 more modular version with separate object MpdlXmlTextServer
casties
parents:
diff changeset
131 for l in links:
9404b6c37920 more modular version with separate object MpdlXmlTextServer
casties
parents:
diff changeset
132 hrefNode = l.getAttributeNodeNS(None, u"href")
9404b6c37920 more modular version with separate object MpdlXmlTextServer
casties
parents:
diff changeset
133 if hrefNode:
9404b6c37920 more modular version with separate object MpdlXmlTextServer
casties
parents:
diff changeset
134 href = hrefNode.nodeValue
9404b6c37920 more modular version with separate object MpdlXmlTextServer
casties
parents:
diff changeset
135 if href.startswith('page-fragment.xql'):
9404b6c37920 more modular version with separate object MpdlXmlTextServer
casties
parents:
diff changeset
136 selfurl = self.absolute_url()
453
beb7ccb92564 first version using elementtree instead of 4suite xml
casties
parents: 407
diff changeset
137 pagexml=href.replace('mode=text','mode=texttool&viewMode=%s&queryType=%s&query=%s&queryResultPageSize=%s&queryResultPN=%s&tocMode=%s&searchPN=%s&tocPN=%s&characterNormalization=%s'%(viewMode,queryType,urllib.quote(query),pagesize,pn,tocMode,pn,tocPN, characterNormalization))
129
9404b6c37920 more modular version with separate object MpdlXmlTextServer
casties
parents:
diff changeset
138 hrefNode.nodeValue = pagexml.replace('page-fragment.xql','%s'%selfurl)
453
beb7ccb92564 first version using elementtree instead of 4suite xml
casties
parents: 407
diff changeset
139 #logging.debug("PUREXML :%s"%(serializeNode(pagenode)))
129
9404b6c37920 more modular version with separate object MpdlXmlTextServer
casties
parents:
diff changeset
140 return serializeNode(pagenode)
9404b6c37920 more modular version with separate object MpdlXmlTextServer
casties
parents:
diff changeset
141 if (queryType=="fulltextMorph"):
9404b6c37920 more modular version with separate object MpdlXmlTextServer
casties
parents:
diff changeset
142 pagedivs = pagedom.xpath("//div[@class='queryResult']")
9404b6c37920 more modular version with separate object MpdlXmlTextServer
casties
parents:
diff changeset
143 if len(pagedivs)>0:
9404b6c37920 more modular version with separate object MpdlXmlTextServer
casties
parents:
diff changeset
144 pagenode=pagedivs[0]
9404b6c37920 more modular version with separate object MpdlXmlTextServer
casties
parents:
diff changeset
145 links=pagenode.xpath("//a")
9404b6c37920 more modular version with separate object MpdlXmlTextServer
casties
parents:
diff changeset
146 for l in links:
9404b6c37920 more modular version with separate object MpdlXmlTextServer
casties
parents:
diff changeset
147 hrefNode = l.getAttributeNodeNS(None, u"href")
9404b6c37920 more modular version with separate object MpdlXmlTextServer
casties
parents:
diff changeset
148 if hrefNode:
9404b6c37920 more modular version with separate object MpdlXmlTextServer
casties
parents:
diff changeset
149 href = hrefNode.nodeValue
9404b6c37920 more modular version with separate object MpdlXmlTextServer
casties
parents:
diff changeset
150 if href.startswith('page-fragment.xql'):
9404b6c37920 more modular version with separate object MpdlXmlTextServer
casties
parents:
diff changeset
151 selfurl = self.absolute_url()
453
beb7ccb92564 first version using elementtree instead of 4suite xml
casties
parents: 407
diff changeset
152 pagexml=href.replace('mode=text','mode=texttool&viewMode=%s&queryType=%s&query=%s&queryResultPageSize=%s&queryResultPN=%s&tocMode=%s&searchPN=%s&tocPN=%s&characterNormalization=%s'%(viewMode,queryType,urllib.quote(query),pagesize,pn,tocMode,pn,tocPN,characterNormalization))
129
9404b6c37920 more modular version with separate object MpdlXmlTextServer
casties
parents:
diff changeset
153 hrefNode.nodeValue = pagexml.replace('page-fragment.xql','%s'%selfurl)
9404b6c37920 more modular version with separate object MpdlXmlTextServer
casties
parents:
diff changeset
154 if href.startswith('../lt/lemma.xql'):
453
beb7ccb92564 first version using elementtree instead of 4suite xml
casties
parents: 407
diff changeset
155 hrefNode.nodeValue = href.replace('../lt/lemma.xql','%s/template/head_main_query'%(selfurl))
129
9404b6c37920 more modular version with separate object MpdlXmlTextServer
casties
parents:
diff changeset
156 l.setAttributeNS(None, 'target', '_blank')
9404b6c37920 more modular version with separate object MpdlXmlTextServer
casties
parents:
diff changeset
157 l.setAttributeNS(None, 'onClick',"popupWin = window.open(this.href, 'contacts', 'location,width=500,height=600,top=180, left=400, scrollbars=1'); return false;")
453
beb7ccb92564 first version using elementtree instead of 4suite xml
casties
parents: 407
diff changeset
158 l.setAttributeNS(None, 'onDblclick', 'popupWin.focus();')
129
9404b6c37920 more modular version with separate object MpdlXmlTextServer
casties
parents:
diff changeset
159 pagedivs = pagedom.xpath("//div[@class='queryResultMorphExpansion']")
9404b6c37920 more modular version with separate object MpdlXmlTextServer
casties
parents:
diff changeset
160 return serializeNode(pagenode)
9404b6c37920 more modular version with separate object MpdlXmlTextServer
casties
parents:
diff changeset
161 if (queryType=="ftIndex")or(queryType=="ftIndexMorph"):
9404b6c37920 more modular version with separate object MpdlXmlTextServer
casties
parents:
diff changeset
162 pagedivs= pagedom.xpath("//div[@class='queryResultPage']")
9404b6c37920 more modular version with separate object MpdlXmlTextServer
casties
parents:
diff changeset
163 if len(pagedivs)>0:
9404b6c37920 more modular version with separate object MpdlXmlTextServer
casties
parents:
diff changeset
164 pagenode=pagedivs[0]
9404b6c37920 more modular version with separate object MpdlXmlTextServer
casties
parents:
diff changeset
165 links=pagenode.xpath("//a")
9404b6c37920 more modular version with separate object MpdlXmlTextServer
casties
parents:
diff changeset
166 for l in links:
9404b6c37920 more modular version with separate object MpdlXmlTextServer
casties
parents:
diff changeset
167 hrefNode = l.getAttributeNodeNS(None, u"href")
9404b6c37920 more modular version with separate object MpdlXmlTextServer
casties
parents:
diff changeset
168 if hrefNode:
9404b6c37920 more modular version with separate object MpdlXmlTextServer
casties
parents:
diff changeset
169 href = hrefNode.nodeValue
453
beb7ccb92564 first version using elementtree instead of 4suite xml
casties
parents: 407
diff changeset
170 hrefNode.nodeValue=href.replace('mode=text','mode=texttool&viewMode=%s&tocMode=%s&tocPN=%s&pn=%s&characterNormalization=%s'%(viewMode,tocMode,tocPN,pn,characterNormalization))
129
9404b6c37920 more modular version with separate object MpdlXmlTextServer
casties
parents:
diff changeset
171 if href.startswith('../lt/lex.xql'):
453
beb7ccb92564 first version using elementtree instead of 4suite xml
casties
parents: 407
diff changeset
172 hrefNode.nodeValue = href.replace('../lt/lex.xql','%s/template/head_main_lex'%selfurl)
129
9404b6c37920 more modular version with separate object MpdlXmlTextServer
casties
parents:
diff changeset
173 l.setAttributeNS(None, 'target', '_blank')
9404b6c37920 more modular version with separate object MpdlXmlTextServer
casties
parents:
diff changeset
174 l.setAttributeNS(None, 'onClick',"popupWin = window.open(this.href, 'contacts', 'location,width=500,height=600,top=180, left=400, scrollbars=1'); return false;")
453
beb7ccb92564 first version using elementtree instead of 4suite xml
casties
parents: 407
diff changeset
175 l.setAttributeNS(None, 'onDblclick', 'popupWin.focus();')
129
9404b6c37920 more modular version with separate object MpdlXmlTextServer
casties
parents:
diff changeset
176 if href.startswith('../lt/lemma.xql'):
453
beb7ccb92564 first version using elementtree instead of 4suite xml
casties
parents: 407
diff changeset
177 hrefNode.nodeValue = href.replace('../lt/lemma.xql','%s/template/head_main_lemma'%(selfurl))
129
9404b6c37920 more modular version with separate object MpdlXmlTextServer
casties
parents:
diff changeset
178 l.setAttributeNS(None, 'target', '_blank')
9404b6c37920 more modular version with separate object MpdlXmlTextServer
casties
parents:
diff changeset
179 l.setAttributeNS(None, 'onClick',"popupWin = window.open(this.href, 'contacts', 'location,width=500,height=600,top=180, left=400, scrollbars=1'); return false;")
453
beb7ccb92564 first version using elementtree instead of 4suite xml
casties
parents: 407
diff changeset
180 l.setAttributeNS(None, 'onDblclick', 'popupWin.focus();')
129
9404b6c37920 more modular version with separate object MpdlXmlTextServer
casties
parents:
diff changeset
181 return serializeNode(pagenode)
9404b6c37920 more modular version with separate object MpdlXmlTextServer
casties
parents:
diff changeset
182 return "no text here"
453
beb7ccb92564 first version using elementtree instead of 4suite xml
casties
parents: 407
diff changeset
183
253
d6ca167ccb1a *** empty log message ***
abukhman
parents: 252
diff changeset
184 def getGisPlaces(self, docinfo=None, pageinfo=None):
207
0f6a377679d5 *** empty log message ***
abukhman
parents: 206
diff changeset
185 """ Show all Gis Places of whole Page"""
264
ac93e115d902 *** empty log message ***
abukhman
parents: 263
diff changeset
186 xpath='//place'
453
beb7ccb92564 first version using elementtree instead of 4suite xml
casties
parents: 407
diff changeset
187 docpath = docinfo.get('textURLPath',None)
beb7ccb92564 first version using elementtree instead of 4suite xml
casties
parents: 407
diff changeset
188 if not docpath:
beb7ccb92564 first version using elementtree instead of 4suite xml
casties
parents: 407
diff changeset
189 return None
beb7ccb92564 first version using elementtree instead of 4suite xml
casties
parents: 407
diff changeset
190
253
d6ca167ccb1a *** empty log message ***
abukhman
parents: 252
diff changeset
191 url = docinfo['url']
d6ca167ccb1a *** empty log message ***
abukhman
parents: 252
diff changeset
192 selfurl = self.absolute_url()
257
d1eb63cf3410 *** empty log message ***
abukhman
parents: 256
diff changeset
193 pn = pageinfo['current']
291
3b54df7ca88e *** empty log message ***
abukhman
parents: 290
diff changeset
194 hrefList=[]
306
ec293c61f8a9 *** empty log message ***
abukhman
parents: 305
diff changeset
195 myList= ""
264
ac93e115d902 *** empty log message ***
abukhman
parents: 263
diff changeset
196 text=self.getServerData("xpath.xql", "document=%s&xpath=%s&pn=%s"%(docinfo['textURLPath'],xpath,pn))
455
0a53fea83df7 more work renovating
casties
parents: 453
diff changeset
197 dom = ET.fromstring(text)
0a53fea83df7 more work renovating
casties
parents: 453
diff changeset
198 result = dom.findall(".//result/resultPage/place")
236
ccdce5aca47b *** empty log message ***
abukhman
parents: 233
diff changeset
199 for l in result:
455
0a53fea83df7 more work renovating
casties
parents: 453
diff changeset
200 href = l.get("id")
292
d97ab809de6f *** empty log message ***
abukhman
parents: 291
diff changeset
201 hrefList.append(href)
455
0a53fea83df7 more work renovating
casties
parents: 453
diff changeset
202 # WTF: what does this do?
309
ea18683b2bff *** empty log message ***
abukhman
parents: 308
diff changeset
203 myList = ",".join(hrefList)
453
beb7ccb92564 first version using elementtree instead of 4suite xml
casties
parents: 407
diff changeset
204 #logging.debug("getGisPlaces :%s"%(myList))
307
ec5e920a61e6 *** empty log message ***
abukhman
parents: 306
diff changeset
205 return myList
ec5e920a61e6 *** empty log message ***
abukhman
parents: 306
diff changeset
206
ec5e920a61e6 *** empty log message ***
abukhman
parents: 306
diff changeset
207 def getAllGisPlaces (self, docinfo=None, pageinfo=None):
ec5e920a61e6 *** empty log message ***
abukhman
parents: 306
diff changeset
208 """Show all Gis Places of whole Book """
ec5e920a61e6 *** empty log message ***
abukhman
parents: 306
diff changeset
209 xpath ='//echo:place'
ec5e920a61e6 *** empty log message ***
abukhman
parents: 306
diff changeset
210 docpath =docinfo['textURLPath']
ec5e920a61e6 *** empty log message ***
abukhman
parents: 306
diff changeset
211 url = docinfo['url']
ec5e920a61e6 *** empty log message ***
abukhman
parents: 306
diff changeset
212 selfurl =self.absolute_url()
ec5e920a61e6 *** empty log message ***
abukhman
parents: 306
diff changeset
213 pn =pageinfo['current']
ec5e920a61e6 *** empty log message ***
abukhman
parents: 306
diff changeset
214 hrefList=[]
ec5e920a61e6 *** empty log message ***
abukhman
parents: 306
diff changeset
215 myList=""
ec5e920a61e6 *** empty log message ***
abukhman
parents: 306
diff changeset
216 text=self.getServerData("xpath.xql", "document=%s&xpath=%s"%(docinfo['textURLPath'],xpath))
455
0a53fea83df7 more work renovating
casties
parents: 453
diff changeset
217 dom = ET.fromstring(text)
0a53fea83df7 more work renovating
casties
parents: 453
diff changeset
218 result = dom.findall(".//result/resultPage/place")
395
e6f3fcb2058f *** empty log message ***
abukhman
parents: 393
diff changeset
219
307
ec5e920a61e6 *** empty log message ***
abukhman
parents: 306
diff changeset
220 for l in result:
455
0a53fea83df7 more work renovating
casties
parents: 453
diff changeset
221 href = l.get("id")
307
ec5e920a61e6 *** empty log message ***
abukhman
parents: 306
diff changeset
222 hrefList.append(href)
455
0a53fea83df7 more work renovating
casties
parents: 453
diff changeset
223 # WTF: what does this do?
300
e67f50a09259 *** empty log message ***
abukhman
parents: 299
diff changeset
224 myList = ",".join(hrefList)
453
beb7ccb92564 first version using elementtree instead of 4suite xml
casties
parents: 407
diff changeset
225 #logging.debug("getALLGisPlaces :%s"%(myList))
309
ea18683b2bff *** empty log message ***
abukhman
parents: 308
diff changeset
226 return myList
453
beb7ccb92564 first version using elementtree instead of 4suite xml
casties
parents: 407
diff changeset
227
455
0a53fea83df7 more work renovating
casties
parents: 453
diff changeset
228 def processPageInfo(self, dom, docinfo, pageinfo):
0a53fea83df7 more work renovating
casties
parents: 453
diff changeset
229 """processes page info divs from dom and stores in docinfo and pageinfo"""
469
15394486ab75 working with new templates
casties
parents: 465
diff changeset
230 # assume first second level div is pageMeta
15394486ab75 working with new templates
casties
parents: 465
diff changeset
231 alldivs = dom.find("div")
455
0a53fea83df7 more work renovating
casties
parents: 453
diff changeset
232 for div in alldivs:
0a53fea83df7 more work renovating
casties
parents: 453
diff changeset
233 dc = div.get('class')
0a53fea83df7 more work renovating
casties
parents: 453
diff changeset
234
0a53fea83df7 more work renovating
casties
parents: 453
diff changeset
235 # pageNumberOrig
469
15394486ab75 working with new templates
casties
parents: 465
diff changeset
236 if dc == 'pageNumberOrig':
455
0a53fea83df7 more work renovating
casties
parents: 453
diff changeset
237 pageinfo['pageNumberOrig'] = div.text
0a53fea83df7 more work renovating
casties
parents: 453
diff changeset
238
0a53fea83df7 more work renovating
casties
parents: 453
diff changeset
239 # pageNumberOrigNorm
0a53fea83df7 more work renovating
casties
parents: 453
diff changeset
240 elif dc == 'pageNumberOrigNorm':
0a53fea83df7 more work renovating
casties
parents: 453
diff changeset
241 pageinfo['pageNumberOrigNorm'] = div.text
0a53fea83df7 more work renovating
casties
parents: 453
diff changeset
242
0a53fea83df7 more work renovating
casties
parents: 453
diff changeset
243 # pageNumberOrigNorm
0a53fea83df7 more work renovating
casties
parents: 453
diff changeset
244 elif dc == 'countFigureEntries':
469
15394486ab75 working with new templates
casties
parents: 465
diff changeset
245 docinfo['numFigureEntries'] = getInt(div.text)
455
0a53fea83df7 more work renovating
casties
parents: 453
diff changeset
246
0a53fea83df7 more work renovating
casties
parents: 453
diff changeset
247 # pageNumberOrigNorm
0a53fea83df7 more work renovating
casties
parents: 453
diff changeset
248 elif dc == 'countTocEntries':
0a53fea83df7 more work renovating
casties
parents: 453
diff changeset
249 # WTF: s1 = int(s)/30+1
469
15394486ab75 working with new templates
casties
parents: 465
diff changeset
250 docinfo['numTocEntries'] = getInt(div.text)
15394486ab75 working with new templates
casties
parents: 465
diff changeset
251
15394486ab75 working with new templates
casties
parents: 465
diff changeset
252 # pageHeaderTitle
15394486ab75 working with new templates
casties
parents: 465
diff changeset
253 elif dc == 'pageHeaderTitle':
15394486ab75 working with new templates
casties
parents: 465
diff changeset
254 docinfo['pageHeaderTitle'] = div.text
455
0a53fea83df7 more work renovating
casties
parents: 453
diff changeset
255
0a53fea83df7 more work renovating
casties
parents: 453
diff changeset
256 # numTextPages
0a53fea83df7 more work renovating
casties
parents: 453
diff changeset
257 elif dc == 'countPages':
458
48b135b089c8 more renovation
casties
parents: 456
diff changeset
258 np = getInt(div.text)
455
0a53fea83df7 more work renovating
casties
parents: 453
diff changeset
259 if np > 0:
0a53fea83df7 more work renovating
casties
parents: 453
diff changeset
260 docinfo['numTextPages'] = np
0a53fea83df7 more work renovating
casties
parents: 453
diff changeset
261 if docinfo.get('numPages', 0) == 0:
465
224aad394350 really works with new getDocinfo
casties
parents: 458
diff changeset
262 # seems to be text-only - update page count
224aad394350 really works with new getDocinfo
casties
parents: 458
diff changeset
263 docinfo['numPages'] = np
455
0a53fea83df7 more work renovating
casties
parents: 453
diff changeset
264 pageinfo['end'] = min(pageinfo['end'], np)
0a53fea83df7 more work renovating
casties
parents: 453
diff changeset
265 pageinfo['numgroups'] = int(np / pageinfo['groupsize'])
0a53fea83df7 more work renovating
casties
parents: 453
diff changeset
266 if np % pageinfo['groupsize'] > 0:
0a53fea83df7 more work renovating
casties
parents: 453
diff changeset
267 pageinfo['numgroups'] += 1
0a53fea83df7 more work renovating
casties
parents: 453
diff changeset
268
0a53fea83df7 more work renovating
casties
parents: 453
diff changeset
269 return
0a53fea83df7 more work renovating
casties
parents: 453
diff changeset
270
388
0265ab93716a *** empty log message ***
abukhman
parents: 386
diff changeset
271
453
beb7ccb92564 first version using elementtree instead of 4suite xml
casties
parents: 407
diff changeset
272 def getTextPage(self, mode="text_dict", pn=1, docinfo=None, pageinfo=None):
129
9404b6c37920 more modular version with separate object MpdlXmlTextServer
casties
parents:
diff changeset
273 """returns single page from fulltext"""
455
0a53fea83df7 more work renovating
casties
parents: 453
diff changeset
274 logging.debug("getTextPage mode=%s, pn=%s"%(mode,pn))
0a53fea83df7 more work renovating
casties
parents: 453
diff changeset
275 # check for cached text -- but this shouldn't be called twice
0a53fea83df7 more work renovating
casties
parents: 453
diff changeset
276 if pageinfo.has_key('textPage'):
0a53fea83df7 more work renovating
casties
parents: 453
diff changeset
277 logging.debug("getTextPage: using cached text")
0a53fea83df7 more work renovating
casties
parents: 453
diff changeset
278 return pageinfo['textPage']
0a53fea83df7 more work renovating
casties
parents: 453
diff changeset
279
129
9404b6c37920 more modular version with separate object MpdlXmlTextServer
casties
parents:
diff changeset
280 docpath = docinfo['textURLPath']
455
0a53fea83df7 more work renovating
casties
parents: 453
diff changeset
281 # just checking
0a53fea83df7 more work renovating
casties
parents: 453
diff changeset
282 if pageinfo['current'] != pn:
0a53fea83df7 more work renovating
casties
parents: 453
diff changeset
283 logging.warning("getTextPage: current!=pn!")
0a53fea83df7 more work renovating
casties
parents: 453
diff changeset
284
0a53fea83df7 more work renovating
casties
parents: 453
diff changeset
285 # stuff for constructing full urls
0a53fea83df7 more work renovating
casties
parents: 453
diff changeset
286 url = docinfo['url']
0a53fea83df7 more work renovating
casties
parents: 453
diff changeset
287 urlmode = docinfo['mode']
0a53fea83df7 more work renovating
casties
parents: 453
diff changeset
288 sn = pageinfo.get('sn', None)
0a53fea83df7 more work renovating
casties
parents: 453
diff changeset
289 highlightQuery = pageinfo.get('highlightQuery', None)
0a53fea83df7 more work renovating
casties
parents: 453
diff changeset
290 tocMode = pageinfo.get('tocMode', None)
0a53fea83df7 more work renovating
casties
parents: 453
diff changeset
291 tocPN = pageinfo.get('tocPN',None)
0a53fea83df7 more work renovating
casties
parents: 453
diff changeset
292 characterNormalization = pageinfo.get('characterNormalization', None)
0a53fea83df7 more work renovating
casties
parents: 453
diff changeset
293 selfurl = docinfo['viewerUrl']
0a53fea83df7 more work renovating
casties
parents: 453
diff changeset
294
129
9404b6c37920 more modular version with separate object MpdlXmlTextServer
casties
parents:
diff changeset
295 if mode == "text_dict":
455
0a53fea83df7 more work renovating
casties
parents: 453
diff changeset
296 # text_dict is called textPollux in the backend
129
9404b6c37920 more modular version with separate object MpdlXmlTextServer
casties
parents:
diff changeset
297 textmode = "textPollux"
9404b6c37920 more modular version with separate object MpdlXmlTextServer
casties
parents:
diff changeset
298 else:
9404b6c37920 more modular version with separate object MpdlXmlTextServer
casties
parents:
diff changeset
299 textmode = mode
453
beb7ccb92564 first version using elementtree instead of 4suite xml
casties
parents: 407
diff changeset
300
373
0aa294b31236 *** empty log message ***
abukhman
parents: 372
diff changeset
301 textParam = "document=%s&mode=%s&pn=%s&characterNormalization=%s"%(docpath,textmode,pn,characterNormalization)
455
0a53fea83df7 more work renovating
casties
parents: 453
diff changeset
302 if highlightQuery:
376
4f381768909a *** empty log message ***
abukhman
parents: 375
diff changeset
303 textParam +="&highlightQuery=%s&sn=%s"%(urllib.quote(highlightQuery),sn)
453
beb7ccb92564 first version using elementtree instead of 4suite xml
casties
parents: 407
diff changeset
304
455
0a53fea83df7 more work renovating
casties
parents: 453
diff changeset
305 # fetch the page
185
6fb9a06b8bee *** empty log message ***
abukhman
parents: 184
diff changeset
306 pagexml = self.getServerData("page-fragment.xql",textParam)
453
beb7ccb92564 first version using elementtree instead of 4suite xml
casties
parents: 407
diff changeset
307 dom = ET.fromstring(pagexml)
455
0a53fea83df7 more work renovating
casties
parents: 453
diff changeset
308 # extract additional info
0a53fea83df7 more work renovating
casties
parents: 453
diff changeset
309 self.processPageInfo(dom, docinfo, pageinfo)
0a53fea83df7 more work renovating
casties
parents: 453
diff changeset
310 # page content is in <div class="pageContent">
0a53fea83df7 more work renovating
casties
parents: 453
diff changeset
311 pagediv = None
0a53fea83df7 more work renovating
casties
parents: 453
diff changeset
312 # ElementTree 1.2 in Python 2.6 can't do div[@class='pageContent']
469
15394486ab75 working with new templates
casties
parents: 465
diff changeset
313 # so we look at the second level divs
15394486ab75 working with new templates
casties
parents: 465
diff changeset
314 alldivs = dom.findall("div")
453
beb7ccb92564 first version using elementtree instead of 4suite xml
casties
parents: 407
diff changeset
315 for div in alldivs:
beb7ccb92564 first version using elementtree instead of 4suite xml
casties
parents: 407
diff changeset
316 dc = div.get('class')
455
0a53fea83df7 more work renovating
casties
parents: 453
diff changeset
317 # page content div
453
beb7ccb92564 first version using elementtree instead of 4suite xml
casties
parents: 407
diff changeset
318 if dc == 'pageContent':
beb7ccb92564 first version using elementtree instead of 4suite xml
casties
parents: 407
diff changeset
319 pagediv = div
beb7ccb92564 first version using elementtree instead of 4suite xml
casties
parents: 407
diff changeset
320 break
beb7ccb92564 first version using elementtree instead of 4suite xml
casties
parents: 407
diff changeset
321
129
9404b6c37920 more modular version with separate object MpdlXmlTextServer
casties
parents:
diff changeset
322 # plain text mode
9404b6c37920 more modular version with separate object MpdlXmlTextServer
casties
parents:
diff changeset
323 if mode == "text":
453
beb7ccb92564 first version using elementtree instead of 4suite xml
casties
parents: 407
diff changeset
324 if pagediv:
beb7ccb92564 first version using elementtree instead of 4suite xml
casties
parents: 407
diff changeset
325 links = pagediv.findall(".//a")
129
9404b6c37920 more modular version with separate object MpdlXmlTextServer
casties
parents:
diff changeset
326 for l in links:
453
beb7ccb92564 first version using elementtree instead of 4suite xml
casties
parents: 407
diff changeset
327 href = l.get('href')
beb7ccb92564 first version using elementtree instead of 4suite xml
casties
parents: 407
diff changeset
328 if href and href.startswith('#note-'):
455
0a53fea83df7 more work renovating
casties
parents: 453
diff changeset
329 href = href.replace('#note-',"?mode=%s&url=%s&viewMode=text&tocMode=%s&tocPN=%s&pn=%s#note-"%(urlmode,url,tocMode,tocPN,pn))
453
beb7ccb92564 first version using elementtree instead of 4suite xml
casties
parents: 407
diff changeset
330 l.set('href', href)
455
0a53fea83df7 more work renovating
casties
parents: 453
diff changeset
331
453
beb7ccb92564 first version using elementtree instead of 4suite xml
casties
parents: 407
diff changeset
332 return serialize(pagediv)
beb7ccb92564 first version using elementtree instead of 4suite xml
casties
parents: 407
diff changeset
333
129
9404b6c37920 more modular version with separate object MpdlXmlTextServer
casties
parents:
diff changeset
334 # text-with-links mode
455
0a53fea83df7 more work renovating
casties
parents: 453
diff changeset
335 elif mode == "text_dict":
453
beb7ccb92564 first version using elementtree instead of 4suite xml
casties
parents: 407
diff changeset
336 if pagediv:
129
9404b6c37920 more modular version with separate object MpdlXmlTextServer
casties
parents:
diff changeset
337 # check all a-tags
453
beb7ccb92564 first version using elementtree instead of 4suite xml
casties
parents: 407
diff changeset
338 links = pagediv.findall(".//a")
129
9404b6c37920 more modular version with separate object MpdlXmlTextServer
casties
parents:
diff changeset
339 for l in links:
453
beb7ccb92564 first version using elementtree instead of 4suite xml
casties
parents: 407
diff changeset
340 href = l.get('href')
beb7ccb92564 first version using elementtree instead of 4suite xml
casties
parents: 407
diff changeset
341
beb7ccb92564 first version using elementtree instead of 4suite xml
casties
parents: 407
diff changeset
342 if href:
129
9404b6c37920 more modular version with separate object MpdlXmlTextServer
casties
parents:
diff changeset
343 # is link with href
453
beb7ccb92564 first version using elementtree instead of 4suite xml
casties
parents: 407
diff changeset
344 if href.startswith('http://mpdl-proto.mpiwg-berlin.mpg.de/mpdl/interface/lt/wordInfo.xql'):
129
9404b6c37920 more modular version with separate object MpdlXmlTextServer
casties
parents:
diff changeset
345 # is pollux link
9404b6c37920 more modular version with separate object MpdlXmlTextServer
casties
parents:
diff changeset
346 selfurl = self.absolute_url()
9404b6c37920 more modular version with separate object MpdlXmlTextServer
casties
parents:
diff changeset
347 # change href
453
beb7ccb92564 first version using elementtree instead of 4suite xml
casties
parents: 407
diff changeset
348 l.set('href', href.replace('http://mpdl-proto.mpiwg-berlin.mpg.de/mpdl/interface/lt/wordInfo.xql','%s/head_main_voc'%selfurl))
129
9404b6c37920 more modular version with separate object MpdlXmlTextServer
casties
parents:
diff changeset
349 # add target
453
beb7ccb92564 first version using elementtree instead of 4suite xml
casties
parents: 407
diff changeset
350 l.set('target', '_blank')
beb7ccb92564 first version using elementtree instead of 4suite xml
casties
parents: 407
diff changeset
351
beb7ccb92564 first version using elementtree instead of 4suite xml
casties
parents: 407
diff changeset
352 if href.startswith('http://mpdl-proto.mpiwg-berlin.mpg.de/mpdl/lt/lemma.xql'):
129
9404b6c37920 more modular version with separate object MpdlXmlTextServer
casties
parents:
diff changeset
353 selfurl = self.absolute_url()
453
beb7ccb92564 first version using elementtree instead of 4suite xml
casties
parents: 407
diff changeset
354 l.set('href', href.replace('http://mpdl-proto.mpiwg-berlin.mpg.de/mpdl/lt/lemma.xql','%s/head_main_lemma'%selfurl))
beb7ccb92564 first version using elementtree instead of 4suite xml
casties
parents: 407
diff changeset
355 l.set('target', '_blank')
beb7ccb92564 first version using elementtree instead of 4suite xml
casties
parents: 407
diff changeset
356 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;")
beb7ccb92564 first version using elementtree instead of 4suite xml
casties
parents: 407
diff changeset
357 l.set('ondblclick', 'popupWin.focus();')
beb7ccb92564 first version using elementtree instead of 4suite xml
casties
parents: 407
diff changeset
358
129
9404b6c37920 more modular version with separate object MpdlXmlTextServer
casties
parents:
diff changeset
359 if href.startswith('#note-'):
455
0a53fea83df7 more work renovating
casties
parents: 453
diff changeset
360 l.set('href', href.replace('#note-',"?mode=%s&url=%s&viewMode=text_dict&tocMode=%s&tocPN=%s&pn=%s#note-"%(urlmode,url,tocMode,tocPN,pn)))
453
beb7ccb92564 first version using elementtree instead of 4suite xml
casties
parents: 407
diff changeset
361
beb7ccb92564 first version using elementtree instead of 4suite xml
casties
parents: 407
diff changeset
362 return serialize(pagediv)
beb7ccb92564 first version using elementtree instead of 4suite xml
casties
parents: 407
diff changeset
363
455
0a53fea83df7 more work renovating
casties
parents: 453
diff changeset
364 # xml mode
0a53fea83df7 more work renovating
casties
parents: 453
diff changeset
365 elif mode == "xml":
0a53fea83df7 more work renovating
casties
parents: 453
diff changeset
366 if pagediv:
0a53fea83df7 more work renovating
casties
parents: 453
diff changeset
367 return serialize(pagediv)
0a53fea83df7 more work renovating
casties
parents: 453
diff changeset
368
0a53fea83df7 more work renovating
casties
parents: 453
diff changeset
369 # pureXml mode
0a53fea83df7 more work renovating
casties
parents: 453
diff changeset
370 elif mode == "pureXml":
0a53fea83df7 more work renovating
casties
parents: 453
diff changeset
371 if pagediv:
0a53fea83df7 more work renovating
casties
parents: 453
diff changeset
372 return serialize(pagediv)
0a53fea83df7 more work renovating
casties
parents: 453
diff changeset
373
0a53fea83df7 more work renovating
casties
parents: 453
diff changeset
374 # gis mode
0a53fea83df7 more work renovating
casties
parents: 453
diff changeset
375 elif mode == "gis":
0a53fea83df7 more work renovating
casties
parents: 453
diff changeset
376 name = docinfo['name']
0a53fea83df7 more work renovating
casties
parents: 453
diff changeset
377 if pagediv:
0a53fea83df7 more work renovating
casties
parents: 453
diff changeset
378 # check all a-tags
0a53fea83df7 more work renovating
casties
parents: 453
diff changeset
379 links = pagediv.findall(".//a")
0a53fea83df7 more work renovating
casties
parents: 453
diff changeset
380 for l in links:
0a53fea83df7 more work renovating
casties
parents: 453
diff changeset
381 href = l.get('href')
0a53fea83df7 more work renovating
casties
parents: 453
diff changeset
382 if href:
0a53fea83df7 more work renovating
casties
parents: 453
diff changeset
383 if href.startswith('http://chinagis.mpiwg-berlin.mpg.de'):
0a53fea83df7 more work renovating
casties
parents: 453
diff changeset
384 l.set('href', href.replace('chinagis_REST/REST/db/chgis/mpdl','chinagis/REST/db/mpdl/%s'%name))
0a53fea83df7 more work renovating
casties
parents: 453
diff changeset
385 l.set('target', '_blank')
0a53fea83df7 more work renovating
casties
parents: 453
diff changeset
386
0a53fea83df7 more work renovating
casties
parents: 453
diff changeset
387 return serialize(pagediv)
0a53fea83df7 more work renovating
casties
parents: 453
diff changeset
388
129
9404b6c37920 more modular version with separate object MpdlXmlTextServer
casties
parents:
diff changeset
389 return "no text here"
453
beb7ccb92564 first version using elementtree instead of 4suite xml
casties
parents: 407
diff changeset
390
455
0a53fea83df7 more work renovating
casties
parents: 453
diff changeset
391 # WTF: is this needed?
453
beb7ccb92564 first version using elementtree instead of 4suite xml
casties
parents: 407
diff changeset
392 def getOrigPages(self, docinfo=None, pageinfo=None):
455
0a53fea83df7 more work renovating
casties
parents: 453
diff changeset
393 logging.debug("CALLED: getOrigPages!")
0a53fea83df7 more work renovating
casties
parents: 453
diff changeset
394 if not pageinfo.has_key('pageNumberOrig'):
0a53fea83df7 more work renovating
casties
parents: 453
diff changeset
395 logging.warning("getOrigPages: not in pageinfo!")
0a53fea83df7 more work renovating
casties
parents: 453
diff changeset
396 return None
0a53fea83df7 more work renovating
casties
parents: 453
diff changeset
397
0a53fea83df7 more work renovating
casties
parents: 453
diff changeset
398 return pageinfo['pageNumberOrig']
453
beb7ccb92564 first version using elementtree instead of 4suite xml
casties
parents: 407
diff changeset
399
455
0a53fea83df7 more work renovating
casties
parents: 453
diff changeset
400 # WTF: is this needed?
453
beb7ccb92564 first version using elementtree instead of 4suite xml
casties
parents: 407
diff changeset
401 def getOrigPagesNorm(self, docinfo=None, pageinfo=None):
455
0a53fea83df7 more work renovating
casties
parents: 453
diff changeset
402 logging.debug("CALLED: getOrigPagesNorm!")
0a53fea83df7 more work renovating
casties
parents: 453
diff changeset
403 if not pageinfo.has_key('pageNumberOrigNorm'):
0a53fea83df7 more work renovating
casties
parents: 453
diff changeset
404 logging.warning("getOrigPagesNorm: not in pageinfo!")
0a53fea83df7 more work renovating
casties
parents: 453
diff changeset
405 return None
0a53fea83df7 more work renovating
casties
parents: 453
diff changeset
406
0a53fea83df7 more work renovating
casties
parents: 453
diff changeset
407 return pageinfo['pageNumberOrigNorm']
453
beb7ccb92564 first version using elementtree instead of 4suite xml
casties
parents: 407
diff changeset
408
455
0a53fea83df7 more work renovating
casties
parents: 453
diff changeset
409 # TODO: should be getWordInfo
453
beb7ccb92564 first version using elementtree instead of 4suite xml
casties
parents: 407
diff changeset
410 def getTranslate(self, word=None, language=None):
129
9404b6c37920 more modular version with separate object MpdlXmlTextServer
casties
parents:
diff changeset
411 """translate into another languages"""
453
beb7ccb92564 first version using elementtree instead of 4suite xml
casties
parents: 407
diff changeset
412 data = self.getServerData("lt/wordInfo.xql","language="+str(language)+"&word="+urllib.quote(word)+"&output=html")
129
9404b6c37920 more modular version with separate object MpdlXmlTextServer
casties
parents:
diff changeset
413 return data
9404b6c37920 more modular version with separate object MpdlXmlTextServer
casties
parents:
diff changeset
414
455
0a53fea83df7 more work renovating
casties
parents: 453
diff changeset
415 # WTF: what does this do?
129
9404b6c37920 more modular version with separate object MpdlXmlTextServer
casties
parents:
diff changeset
416 def getLemma(self, lemma=None, language=None):
9404b6c37920 more modular version with separate object MpdlXmlTextServer
casties
parents:
diff changeset
417 """simular words lemma """
453
beb7ccb92564 first version using elementtree instead of 4suite xml
casties
parents: 407
diff changeset
418 data = self.getServerData("lt/lemma.xql","language="+str(language)+"&lemma="+urllib.quote(lemma)+"&output=html")
beb7ccb92564 first version using elementtree instead of 4suite xml
casties
parents: 407
diff changeset
419 return data
beb7ccb92564 first version using elementtree instead of 4suite xml
casties
parents: 407
diff changeset
420
455
0a53fea83df7 more work renovating
casties
parents: 453
diff changeset
421 # WTF: what does this do?
453
beb7ccb92564 first version using elementtree instead of 4suite xml
casties
parents: 407
diff changeset
422 def getLemmaQuery(self, query=None, language=None):
beb7ccb92564 first version using elementtree instead of 4suite xml
casties
parents: 407
diff changeset
423 """simular words lemma """
beb7ccb92564 first version using elementtree instead of 4suite xml
casties
parents: 407
diff changeset
424 data = self.getServerData("lt/lemma.xql","language="+str(language)+"&query="+urllib.quote(query)+"&output=html")
129
9404b6c37920 more modular version with separate object MpdlXmlTextServer
casties
parents:
diff changeset
425 return data
9404b6c37920 more modular version with separate object MpdlXmlTextServer
casties
parents:
diff changeset
426
455
0a53fea83df7 more work renovating
casties
parents: 453
diff changeset
427 # WTF: what does this do?
453
beb7ccb92564 first version using elementtree instead of 4suite xml
casties
parents: 407
diff changeset
428 def getLex(self, query=None, language=None):
beb7ccb92564 first version using elementtree instead of 4suite xml
casties
parents: 407
diff changeset
429 #simular words lemma
beb7ccb92564 first version using elementtree instead of 4suite xml
casties
parents: 407
diff changeset
430 data = self.getServerData("lt/lex.xql","document=&language="+str(language)+"&query="+urllib.quote(query))
129
9404b6c37920 more modular version with separate object MpdlXmlTextServer
casties
parents:
diff changeset
431 return data
455
0a53fea83df7 more work renovating
casties
parents: 453
diff changeset
432
0a53fea83df7 more work renovating
casties
parents: 453
diff changeset
433 # WTF: what does this do?
453
beb7ccb92564 first version using elementtree instead of 4suite xml
casties
parents: 407
diff changeset
434 def getQuery (self, docinfo=None, pageinfo=None, query=None, queryType=None, pn=1):
beb7ccb92564 first version using elementtree instead of 4suite xml
casties
parents: 407
diff changeset
435 #number of
129
9404b6c37920 more modular version with separate object MpdlXmlTextServer
casties
parents:
diff changeset
436 docpath = docinfo['textURLPath']
9404b6c37920 more modular version with separate object MpdlXmlTextServer
casties
parents:
diff changeset
437 pagesize = pageinfo['queryPageSize']
9404b6c37920 more modular version with separate object MpdlXmlTextServer
casties
parents:
diff changeset
438 pn = pageinfo['searchPN']
181
bc44cf97dfdc *** empty log message ***
abukhman
parents: 180
diff changeset
439 query =pageinfo['query']
129
9404b6c37920 more modular version with separate object MpdlXmlTextServer
casties
parents:
diff changeset
440 queryType =pageinfo['queryType']
9404b6c37920 more modular version with separate object MpdlXmlTextServer
casties
parents:
diff changeset
441 tocSearch = 0
9404b6c37920 more modular version with separate object MpdlXmlTextServer
casties
parents:
diff changeset
442 tocDiv = None
9404b6c37920 more modular version with separate object MpdlXmlTextServer
casties
parents:
diff changeset
443
179
ac715583385b urllib.quote
abukhman
parents: 178
diff changeset
444 pagexml = self.getServerData("doc-query.xql","document=%s&mode=%s&queryType=%s&query=%s&queryResultPageSize=%s&queryResultPN=%s"%(docpath, 'text', queryType, urllib.quote(query), pagesize, pn))
129
9404b6c37920 more modular version with separate object MpdlXmlTextServer
casties
parents:
diff changeset
445 pagedom = Parse(pagexml)
9404b6c37920 more modular version with separate object MpdlXmlTextServer
casties
parents:
diff changeset
446 numdivs = pagedom.xpath("//div[@class='queryResultHits']")
9404b6c37920 more modular version with separate object MpdlXmlTextServer
casties
parents:
diff changeset
447 tocSearch = int(getTextFromNode(numdivs[0]))
9404b6c37920 more modular version with separate object MpdlXmlTextServer
casties
parents:
diff changeset
448 tc=int((tocSearch/10)+1)
402
d3bd3c2674ee *** empty log message ***
abukhman
parents: 401
diff changeset
449 return tc
453
beb7ccb92564 first version using elementtree instead of 4suite xml
casties
parents: 407
diff changeset
450
129
9404b6c37920 more modular version with separate object MpdlXmlTextServer
casties
parents:
diff changeset
451 def getToc(self, mode="text", docinfo=None):
455
0a53fea83df7 more work renovating
casties
parents: 453
diff changeset
452 """loads table of contents and stores XML in docinfo"""
0a53fea83df7 more work renovating
casties
parents: 453
diff changeset
453 logging.debug("getToc mode=%s"%mode)
129
9404b6c37920 more modular version with separate object MpdlXmlTextServer
casties
parents:
diff changeset
454 if mode == "none":
455
0a53fea83df7 more work renovating
casties
parents: 453
diff changeset
455 return docinfo
0a53fea83df7 more work renovating
casties
parents: 453
diff changeset
456
129
9404b6c37920 more modular version with separate object MpdlXmlTextServer
casties
parents:
diff changeset
457 if 'tocSize_%s'%mode in docinfo:
9404b6c37920 more modular version with separate object MpdlXmlTextServer
casties
parents:
diff changeset
458 # cached toc
9404b6c37920 more modular version with separate object MpdlXmlTextServer
casties
parents:
diff changeset
459 return docinfo
9404b6c37920 more modular version with separate object MpdlXmlTextServer
casties
parents:
diff changeset
460
9404b6c37920 more modular version with separate object MpdlXmlTextServer
casties
parents:
diff changeset
461 docpath = docinfo['textURLPath']
9404b6c37920 more modular version with separate object MpdlXmlTextServer
casties
parents:
diff changeset
462 # we need to set a result set size
9404b6c37920 more modular version with separate object MpdlXmlTextServer
casties
parents:
diff changeset
463 pagesize = 1000
9404b6c37920 more modular version with separate object MpdlXmlTextServer
casties
parents:
diff changeset
464 pn = 1
9404b6c37920 more modular version with separate object MpdlXmlTextServer
casties
parents:
diff changeset
465 if mode == "text":
9404b6c37920 more modular version with separate object MpdlXmlTextServer
casties
parents:
diff changeset
466 queryType = "toc"
9404b6c37920 more modular version with separate object MpdlXmlTextServer
casties
parents:
diff changeset
467 else:
9404b6c37920 more modular version with separate object MpdlXmlTextServer
casties
parents:
diff changeset
468 queryType = mode
9404b6c37920 more modular version with separate object MpdlXmlTextServer
casties
parents:
diff changeset
469 # number of entries in toc
9404b6c37920 more modular version with separate object MpdlXmlTextServer
casties
parents:
diff changeset
470 tocSize = 0
9404b6c37920 more modular version with separate object MpdlXmlTextServer
casties
parents:
diff changeset
471 tocDiv = None
455
0a53fea83df7 more work renovating
casties
parents: 453
diff changeset
472 # fetch full toc
129
9404b6c37920 more modular version with separate object MpdlXmlTextServer
casties
parents:
diff changeset
473 pagexml = self.getServerData("doc-query.xql","document=%s&queryType=%s&queryResultPageSize=%s&queryResultPN=%s"%(docpath,queryType, pagesize, pn))
455
0a53fea83df7 more work renovating
casties
parents: 453
diff changeset
474 dom = ET.fromstring(pagexml)
0a53fea83df7 more work renovating
casties
parents: 453
diff changeset
475 # page content is in <div class="queryResultPage">
0a53fea83df7 more work renovating
casties
parents: 453
diff changeset
476 pagediv = None
0a53fea83df7 more work renovating
casties
parents: 453
diff changeset
477 # ElementTree 1.2 in Python 2.6 can't do div[@class='queryResultPage']
0a53fea83df7 more work renovating
casties
parents: 453
diff changeset
478 alldivs = dom.findall("div")
0a53fea83df7 more work renovating
casties
parents: 453
diff changeset
479 for div in alldivs:
0a53fea83df7 more work renovating
casties
parents: 453
diff changeset
480 dc = div.get('class')
0a53fea83df7 more work renovating
casties
parents: 453
diff changeset
481 # page content div
0a53fea83df7 more work renovating
casties
parents: 453
diff changeset
482 if dc == 'queryResultPage':
0a53fea83df7 more work renovating
casties
parents: 453
diff changeset
483 pagediv = div
0a53fea83df7 more work renovating
casties
parents: 453
diff changeset
484
0a53fea83df7 more work renovating
casties
parents: 453
diff changeset
485 elif dc == 'queryResultHits':
458
48b135b089c8 more renovation
casties
parents: 456
diff changeset
486 docinfo['tocSize_%s'%mode] = getInt(div.text)
455
0a53fea83df7 more work renovating
casties
parents: 453
diff changeset
487
0a53fea83df7 more work renovating
casties
parents: 453
diff changeset
488 if pagediv:
0a53fea83df7 more work renovating
casties
parents: 453
diff changeset
489 # store XML in docinfo
0a53fea83df7 more work renovating
casties
parents: 453
diff changeset
490 docinfo['tocXML_%s'%mode] = ET.tostring(pagediv, 'UTF-8')
0a53fea83df7 more work renovating
casties
parents: 453
diff changeset
491
129
9404b6c37920 more modular version with separate object MpdlXmlTextServer
casties
parents:
diff changeset
492 return docinfo
9404b6c37920 more modular version with separate object MpdlXmlTextServer
casties
parents:
diff changeset
493
9404b6c37920 more modular version with separate object MpdlXmlTextServer
casties
parents:
diff changeset
494 def getTocPage(self, mode="text", pn=1, pageinfo=None, docinfo=None):
9404b6c37920 more modular version with separate object MpdlXmlTextServer
casties
parents:
diff changeset
495 """returns single page from the table of contents"""
455
0a53fea83df7 more work renovating
casties
parents: 453
diff changeset
496 logging.debug("getTocPage mode=%s, pn=%s"%(mode,pn))
129
9404b6c37920 more modular version with separate object MpdlXmlTextServer
casties
parents:
diff changeset
497 if mode == "text":
9404b6c37920 more modular version with separate object MpdlXmlTextServer
casties
parents:
diff changeset
498 queryType = "toc"
9404b6c37920 more modular version with separate object MpdlXmlTextServer
casties
parents:
diff changeset
499 else:
9404b6c37920 more modular version with separate object MpdlXmlTextServer
casties
parents:
diff changeset
500 queryType = mode
455
0a53fea83df7 more work renovating
casties
parents: 453
diff changeset
501
0a53fea83df7 more work renovating
casties
parents: 453
diff changeset
502 # check for cached TOC
0a53fea83df7 more work renovating
casties
parents: 453
diff changeset
503 if not docinfo.has_key('tocXML_%s'%mode):
0a53fea83df7 more work renovating
casties
parents: 453
diff changeset
504 self.getToc(mode=mode, docinfo=docinfo)
0a53fea83df7 more work renovating
casties
parents: 453
diff changeset
505
0a53fea83df7 more work renovating
casties
parents: 453
diff changeset
506 tocxml = docinfo.get('tocXML_%s'%mode, None)
0a53fea83df7 more work renovating
casties
parents: 453
diff changeset
507 if not tocxml:
0a53fea83df7 more work renovating
casties
parents: 453
diff changeset
508 logging.error("getTocPage: unable to find tocXML")
0a53fea83df7 more work renovating
casties
parents: 453
diff changeset
509 return "No ToC"
0a53fea83df7 more work renovating
casties
parents: 453
diff changeset
510
0a53fea83df7 more work renovating
casties
parents: 453
diff changeset
511 pagesize = int(pageinfo['tocPageSize'])
129
9404b6c37920 more modular version with separate object MpdlXmlTextServer
casties
parents:
diff changeset
512 url = docinfo['url']
455
0a53fea83df7 more work renovating
casties
parents: 453
diff changeset
513 urlmode = docinfo['mode']
0a53fea83df7 more work renovating
casties
parents: 453
diff changeset
514 selfurl = docinfo['viewerUrl']
129
9404b6c37920 more modular version with separate object MpdlXmlTextServer
casties
parents:
diff changeset
515 viewMode= pageinfo['viewMode']
9404b6c37920 more modular version with separate object MpdlXmlTextServer
casties
parents:
diff changeset
516 tocMode = pageinfo['tocMode']
455
0a53fea83df7 more work renovating
casties
parents: 453
diff changeset
517 tocPN = int(pageinfo['tocPN'])
456
b27a7d2f06ff even toc pagination works
casties
parents: 455
diff changeset
518 pn = tocPN
455
0a53fea83df7 more work renovating
casties
parents: 453
diff changeset
519
0a53fea83df7 more work renovating
casties
parents: 453
diff changeset
520 fulltoc = ET.fromstring(tocxml)
129
9404b6c37920 more modular version with separate object MpdlXmlTextServer
casties
parents:
diff changeset
521
455
0a53fea83df7 more work renovating
casties
parents: 453
diff changeset
522 if fulltoc:
0a53fea83df7 more work renovating
casties
parents: 453
diff changeset
523 # paginate
456
b27a7d2f06ff even toc pagination works
casties
parents: 455
diff changeset
524 start = (pn - 1) * pagesize * 2
b27a7d2f06ff even toc pagination works
casties
parents: 455
diff changeset
525 len = pagesize * 2
b27a7d2f06ff even toc pagination works
casties
parents: 455
diff changeset
526 del fulltoc[:start]
b27a7d2f06ff even toc pagination works
casties
parents: 455
diff changeset
527 del fulltoc[len:]
455
0a53fea83df7 more work renovating
casties
parents: 453
diff changeset
528 tocdivs = fulltoc
0a53fea83df7 more work renovating
casties
parents: 453
diff changeset
529
0a53fea83df7 more work renovating
casties
parents: 453
diff changeset
530 # check all a-tags
0a53fea83df7 more work renovating
casties
parents: 453
diff changeset
531 links = tocdivs.findall(".//a")
0a53fea83df7 more work renovating
casties
parents: 453
diff changeset
532 for l in links:
0a53fea83df7 more work renovating
casties
parents: 453
diff changeset
533 href = l.get('href')
0a53fea83df7 more work renovating
casties
parents: 453
diff changeset
534 if href:
0a53fea83df7 more work renovating
casties
parents: 453
diff changeset
535 # take pn from href
0a53fea83df7 more work renovating
casties
parents: 453
diff changeset
536 m = re.match(r'page-fragment\.xql.*pn=(\d+)', href)
0a53fea83df7 more work renovating
casties
parents: 453
diff changeset
537 if m is not None:
0a53fea83df7 more work renovating
casties
parents: 453
diff changeset
538 # and create new url
0a53fea83df7 more work renovating
casties
parents: 453
diff changeset
539 l.set('href', '%s?mode=%s&url=%s&viewMode=%s&pn=%s&tocMode=%s&tocPN=%s'%(selfurl, urlmode, url, viewMode, m.group(1), tocMode, tocPN))
0a53fea83df7 more work renovating
casties
parents: 453
diff changeset
540 else:
0a53fea83df7 more work renovating
casties
parents: 453
diff changeset
541 logging.warning("getTocPage: Problem with link=%s"%href)
0a53fea83df7 more work renovating
casties
parents: 453
diff changeset
542
0a53fea83df7 more work renovating
casties
parents: 453
diff changeset
543 return serialize(tocdivs)
0a53fea83df7 more work renovating
casties
parents: 453
diff changeset
544
129
9404b6c37920 more modular version with separate object MpdlXmlTextServer
casties
parents:
diff changeset
545
453
beb7ccb92564 first version using elementtree instead of 4suite xml
casties
parents: 407
diff changeset
546 def manage_changeMpdlXmlTextServer(self,title="",serverUrl="http://mpdl-text.mpiwg-berlin.mpg.de/mpdl/interface/",timeout=40,RESPONSE=None):
129
9404b6c37920 more modular version with separate object MpdlXmlTextServer
casties
parents:
diff changeset
547 """change settings"""
9404b6c37920 more modular version with separate object MpdlXmlTextServer
casties
parents:
diff changeset
548 self.title=title
9404b6c37920 more modular version with separate object MpdlXmlTextServer
casties
parents:
diff changeset
549 self.timeout = timeout
9404b6c37920 more modular version with separate object MpdlXmlTextServer
casties
parents:
diff changeset
550 self.serverUrl = serverUrl
9404b6c37920 more modular version with separate object MpdlXmlTextServer
casties
parents:
diff changeset
551 if RESPONSE is not None:
9404b6c37920 more modular version with separate object MpdlXmlTextServer
casties
parents:
diff changeset
552 RESPONSE.redirect('manage_main')
9404b6c37920 more modular version with separate object MpdlXmlTextServer
casties
parents:
diff changeset
553
9404b6c37920 more modular version with separate object MpdlXmlTextServer
casties
parents:
diff changeset
554 # management methods
9404b6c37920 more modular version with separate object MpdlXmlTextServer
casties
parents:
diff changeset
555 def manage_addMpdlXmlTextServerForm(self):
9404b6c37920 more modular version with separate object MpdlXmlTextServer
casties
parents:
diff changeset
556 """Form for adding"""
9404b6c37920 more modular version with separate object MpdlXmlTextServer
casties
parents:
diff changeset
557 pt = PageTemplateFile("zpt/manage_addMpdlXmlTextServer", globals()).__of__(self)
9404b6c37920 more modular version with separate object MpdlXmlTextServer
casties
parents:
diff changeset
558 return pt()
9404b6c37920 more modular version with separate object MpdlXmlTextServer
casties
parents:
diff changeset
559
453
beb7ccb92564 first version using elementtree instead of 4suite xml
casties
parents: 407
diff changeset
560 def manage_addMpdlXmlTextServer(self,id,title="",serverUrl="http://mpdl-text.mpiwg-berlin.mpg.de/mpdl/interface/",timeout=40,RESPONSE=None):
beb7ccb92564 first version using elementtree instead of 4suite xml
casties
parents: 407
diff changeset
561 #def manage_addMpdlXmlTextServer(self,id,title="",serverUrl="http://mpdl-text.mpiwg-berlin.mpg.de:30030/mpdl/interface/",timeout=40,RESPONSE=None):
129
9404b6c37920 more modular version with separate object MpdlXmlTextServer
casties
parents:
diff changeset
562 """add zogiimage"""
9404b6c37920 more modular version with separate object MpdlXmlTextServer
casties
parents:
diff changeset
563 newObj = MpdlXmlTextServer(id,title,serverUrl,timeout)
9404b6c37920 more modular version with separate object MpdlXmlTextServer
casties
parents:
diff changeset
564 self.Destination()._setObject(id, newObj)
9404b6c37920 more modular version with separate object MpdlXmlTextServer
casties
parents:
diff changeset
565 if RESPONSE is not None:
455
0a53fea83df7 more work renovating
casties
parents: 453
diff changeset
566 RESPONSE.redirect('manage_main')
0a53fea83df7 more work renovating
casties
parents: 453
diff changeset
567
0a53fea83df7 more work renovating
casties
parents: 453
diff changeset
568