annotate MpiwgXmlTextServer.py @ 570:61d53ccbdd70

more resilience to server errors.
author casties
date Fri, 12 Oct 2012 16:01:41 +0200
parents 694935574177
children 51800c42bcda
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
rev   line source
564
31f562fa7214 first version of MpiwgXmlTextServer.
casties
parents:
diff changeset
1 from OFS.SimpleItem import SimpleItem
31f562fa7214 first version of MpiwgXmlTextServer.
casties
parents:
diff changeset
2 from Products.PageTemplates.PageTemplateFile import PageTemplateFile
31f562fa7214 first version of MpiwgXmlTextServer.
casties
parents:
diff changeset
3
31f562fa7214 first version of MpiwgXmlTextServer.
casties
parents:
diff changeset
4 import xml.etree.ElementTree as ET
31f562fa7214 first version of MpiwgXmlTextServer.
casties
parents:
diff changeset
5
31f562fa7214 first version of MpiwgXmlTextServer.
casties
parents:
diff changeset
6 import re
31f562fa7214 first version of MpiwgXmlTextServer.
casties
parents:
diff changeset
7 import logging
31f562fa7214 first version of MpiwgXmlTextServer.
casties
parents:
diff changeset
8 import urllib
31f562fa7214 first version of MpiwgXmlTextServer.
casties
parents:
diff changeset
9 import urlparse
31f562fa7214 first version of MpiwgXmlTextServer.
casties
parents:
diff changeset
10 import base64
31f562fa7214 first version of MpiwgXmlTextServer.
casties
parents:
diff changeset
11
31f562fa7214 first version of MpiwgXmlTextServer.
casties
parents:
diff changeset
12 from SrvTxtUtils import getInt, getText, getHttpData
31f562fa7214 first version of MpiwgXmlTextServer.
casties
parents:
diff changeset
13
31f562fa7214 first version of MpiwgXmlTextServer.
casties
parents:
diff changeset
14 def serialize(node):
31f562fa7214 first version of MpiwgXmlTextServer.
casties
parents:
diff changeset
15 """returns a string containing an XML snippet of node"""
31f562fa7214 first version of MpiwgXmlTextServer.
casties
parents:
diff changeset
16 s = ET.tostring(node, 'UTF-8')
31f562fa7214 first version of MpiwgXmlTextServer.
casties
parents:
diff changeset
17 # snip off XML declaration
31f562fa7214 first version of MpiwgXmlTextServer.
casties
parents:
diff changeset
18 if s.startswith('<?xml'):
31f562fa7214 first version of MpiwgXmlTextServer.
casties
parents:
diff changeset
19 i = s.find('?>')
31f562fa7214 first version of MpiwgXmlTextServer.
casties
parents:
diff changeset
20 return s[i+3:]
31f562fa7214 first version of MpiwgXmlTextServer.
casties
parents:
diff changeset
21
31f562fa7214 first version of MpiwgXmlTextServer.
casties
parents:
diff changeset
22 return s
31f562fa7214 first version of MpiwgXmlTextServer.
casties
parents:
diff changeset
23
31f562fa7214 first version of MpiwgXmlTextServer.
casties
parents:
diff changeset
24
31f562fa7214 first version of MpiwgXmlTextServer.
casties
parents:
diff changeset
25 class MpiwgXmlTextServer(SimpleItem):
31f562fa7214 first version of MpiwgXmlTextServer.
casties
parents:
diff changeset
26 """TextServer implementation for MPIWG-XML server"""
31f562fa7214 first version of MpiwgXmlTextServer.
casties
parents:
diff changeset
27 meta_type="MPIWG-XML TextServer"
31f562fa7214 first version of MpiwgXmlTextServer.
casties
parents:
diff changeset
28
31f562fa7214 first version of MpiwgXmlTextServer.
casties
parents:
diff changeset
29 manage_options=(
31f562fa7214 first version of MpiwgXmlTextServer.
casties
parents:
diff changeset
30 {'label':'Config','action':'manage_changeMpiwgXmlTextServerForm'},
31f562fa7214 first version of MpiwgXmlTextServer.
casties
parents:
diff changeset
31 )+SimpleItem.manage_options
31f562fa7214 first version of MpiwgXmlTextServer.
casties
parents:
diff changeset
32
31f562fa7214 first version of MpiwgXmlTextServer.
casties
parents:
diff changeset
33 manage_changeMpiwgXmlTextServerForm = PageTemplateFile("zpt/manage_changeMpiwgXmlTextServer", globals())
31f562fa7214 first version of MpiwgXmlTextServer.
casties
parents:
diff changeset
34
31f562fa7214 first version of MpiwgXmlTextServer.
casties
parents:
diff changeset
35 def __init__(self,id,title="",serverUrl="http://mpdl-text.mpiwg-berlin.mpg.de/mpiwg-mpdl-cms-web/", timeout=40, serverName=None, repositoryType='production'):
31f562fa7214 first version of MpiwgXmlTextServer.
casties
parents:
diff changeset
36 """constructor"""
31f562fa7214 first version of MpiwgXmlTextServer.
casties
parents:
diff changeset
37 self.id=id
31f562fa7214 first version of MpiwgXmlTextServer.
casties
parents:
diff changeset
38 self.title=title
31f562fa7214 first version of MpiwgXmlTextServer.
casties
parents:
diff changeset
39 self.timeout = timeout
31f562fa7214 first version of MpiwgXmlTextServer.
casties
parents:
diff changeset
40 self.repositoryType = repositoryType
31f562fa7214 first version of MpiwgXmlTextServer.
casties
parents:
diff changeset
41 if serverName is None:
31f562fa7214 first version of MpiwgXmlTextServer.
casties
parents:
diff changeset
42 self.serverUrl = serverUrl
31f562fa7214 first version of MpiwgXmlTextServer.
casties
parents:
diff changeset
43 else:
31f562fa7214 first version of MpiwgXmlTextServer.
casties
parents:
diff changeset
44 self.serverUrl = "http://%s/mpiwg-mpdl-cms-web/"%serverName
31f562fa7214 first version of MpiwgXmlTextServer.
casties
parents:
diff changeset
45
31f562fa7214 first version of MpiwgXmlTextServer.
casties
parents:
diff changeset
46 def getHttpData(self, url, data=None):
31f562fa7214 first version of MpiwgXmlTextServer.
casties
parents:
diff changeset
47 """returns result from url+data HTTP request"""
31f562fa7214 first version of MpiwgXmlTextServer.
casties
parents:
diff changeset
48 return getHttpData(url,data,timeout=self.timeout)
31f562fa7214 first version of MpiwgXmlTextServer.
casties
parents:
diff changeset
49
31f562fa7214 first version of MpiwgXmlTextServer.
casties
parents:
diff changeset
50 def getServerData(self, method, data=None):
31f562fa7214 first version of MpiwgXmlTextServer.
casties
parents:
diff changeset
51 """returns result from text server for method+data"""
31f562fa7214 first version of MpiwgXmlTextServer.
casties
parents:
diff changeset
52 url = self.serverUrl+method
31f562fa7214 first version of MpiwgXmlTextServer.
casties
parents:
diff changeset
53 return getHttpData(url,data,timeout=self.timeout)
31f562fa7214 first version of MpiwgXmlTextServer.
casties
parents:
diff changeset
54
31f562fa7214 first version of MpiwgXmlTextServer.
casties
parents:
diff changeset
55
31f562fa7214 first version of MpiwgXmlTextServer.
casties
parents:
diff changeset
56 def getRepositoryType(self):
31f562fa7214 first version of MpiwgXmlTextServer.
casties
parents:
diff changeset
57 """returns the repository type, e.g. 'production'"""
31f562fa7214 first version of MpiwgXmlTextServer.
casties
parents:
diff changeset
58 return self.repositoryType
31f562fa7214 first version of MpiwgXmlTextServer.
casties
parents:
diff changeset
59
31f562fa7214 first version of MpiwgXmlTextServer.
casties
parents:
diff changeset
60 def getTextDownloadUrl(self, type='xml', docinfo=None):
31f562fa7214 first version of MpiwgXmlTextServer.
casties
parents:
diff changeset
61 """returns a URL to download the current text"""
31f562fa7214 first version of MpiwgXmlTextServer.
casties
parents:
diff changeset
62 docpath = docinfo.get('textURLPath', None)
31f562fa7214 first version of MpiwgXmlTextServer.
casties
parents:
diff changeset
63 if not docpath:
31f562fa7214 first version of MpiwgXmlTextServer.
casties
parents:
diff changeset
64 return None
31f562fa7214 first version of MpiwgXmlTextServer.
casties
parents:
diff changeset
65
31f562fa7214 first version of MpiwgXmlTextServer.
casties
parents:
diff changeset
66 docpath = docpath.replace('.xml','.'+type)
31f562fa7214 first version of MpiwgXmlTextServer.
casties
parents:
diff changeset
67 url = '%sdoc/GetDocument?id=%s'%(self.serverUrl.replace('interface/',''), docpath)
31f562fa7214 first version of MpiwgXmlTextServer.
casties
parents:
diff changeset
68 return url
31f562fa7214 first version of MpiwgXmlTextServer.
casties
parents:
diff changeset
69
31f562fa7214 first version of MpiwgXmlTextServer.
casties
parents:
diff changeset
70
31f562fa7214 first version of MpiwgXmlTextServer.
casties
parents:
diff changeset
71 def getPlacesOnPage(self, docinfo=None, pn=None):
31f562fa7214 first version of MpiwgXmlTextServer.
casties
parents:
diff changeset
72 """Returns list of GIS places of page pn"""
31f562fa7214 first version of MpiwgXmlTextServer.
casties
parents:
diff changeset
73 #FIXME!
31f562fa7214 first version of MpiwgXmlTextServer.
casties
parents:
diff changeset
74 docpath = docinfo.get('textURLPath',None)
31f562fa7214 first version of MpiwgXmlTextServer.
casties
parents:
diff changeset
75 if not docpath:
31f562fa7214 first version of MpiwgXmlTextServer.
casties
parents:
diff changeset
76 return None
31f562fa7214 first version of MpiwgXmlTextServer.
casties
parents:
diff changeset
77
31f562fa7214 first version of MpiwgXmlTextServer.
casties
parents:
diff changeset
78 places=[]
31f562fa7214 first version of MpiwgXmlTextServer.
casties
parents:
diff changeset
79 text=self.getServerData("xpath.xql", "document=%s&xpath=//place&pn=%s"%(docpath,pn))
31f562fa7214 first version of MpiwgXmlTextServer.
casties
parents:
diff changeset
80 dom = ET.fromstring(text)
31f562fa7214 first version of MpiwgXmlTextServer.
casties
parents:
diff changeset
81 result = dom.findall(".//resultPage/place")
31f562fa7214 first version of MpiwgXmlTextServer.
casties
parents:
diff changeset
82 for l in result:
31f562fa7214 first version of MpiwgXmlTextServer.
casties
parents:
diff changeset
83 id = l.get("id")
31f562fa7214 first version of MpiwgXmlTextServer.
casties
parents:
diff changeset
84 name = l.text
31f562fa7214 first version of MpiwgXmlTextServer.
casties
parents:
diff changeset
85 place = {'id': id, 'name': name}
31f562fa7214 first version of MpiwgXmlTextServer.
casties
parents:
diff changeset
86 places.append(place)
31f562fa7214 first version of MpiwgXmlTextServer.
casties
parents:
diff changeset
87
31f562fa7214 first version of MpiwgXmlTextServer.
casties
parents:
diff changeset
88 return places
31f562fa7214 first version of MpiwgXmlTextServer.
casties
parents:
diff changeset
89
31f562fa7214 first version of MpiwgXmlTextServer.
casties
parents:
diff changeset
90
565
1b483194901c more new MpiwgXmlTextServer.
casties
parents: 564
diff changeset
91 def getTextInfo(self, mode=None, docinfo=None):
564
31f562fa7214 first version of MpiwgXmlTextServer.
casties
parents:
diff changeset
92 """reads document info, including page concordance, from text server"""
31f562fa7214 first version of MpiwgXmlTextServer.
casties
parents:
diff changeset
93 logging.debug("getTextInfo mode=%s"%mode)
565
1b483194901c more new MpiwgXmlTextServer.
casties
parents: 564
diff changeset
94
1b483194901c more new MpiwgXmlTextServer.
casties
parents: 564
diff changeset
95 field = ''
568
694935574177 more new MpiwgXmlTextServer.
casties
parents: 567
diff changeset
96 if mode in ['pages', 'toc', 'figures', 'handwritten']:
565
1b483194901c more new MpiwgXmlTextServer.
casties
parents: 564
diff changeset
97 # translate mode to field param
1b483194901c more new MpiwgXmlTextServer.
casties
parents: 564
diff changeset
98 field = '&field=%s'%mode
1b483194901c more new MpiwgXmlTextServer.
casties
parents: 564
diff changeset
99 else:
1b483194901c more new MpiwgXmlTextServer.
casties
parents: 564
diff changeset
100 mode = None
1b483194901c more new MpiwgXmlTextServer.
casties
parents: 564
diff changeset
101
564
31f562fa7214 first version of MpiwgXmlTextServer.
casties
parents:
diff changeset
102 # check cached info
31f562fa7214 first version of MpiwgXmlTextServer.
casties
parents:
diff changeset
103 if mode:
31f562fa7214 first version of MpiwgXmlTextServer.
casties
parents:
diff changeset
104 # cached toc-request?
31f562fa7214 first version of MpiwgXmlTextServer.
casties
parents:
diff changeset
105 if 'full_%s'%mode in docinfo:
31f562fa7214 first version of MpiwgXmlTextServer.
casties
parents:
diff changeset
106 return docinfo
31f562fa7214 first version of MpiwgXmlTextServer.
casties
parents:
diff changeset
107
31f562fa7214 first version of MpiwgXmlTextServer.
casties
parents:
diff changeset
108 else:
565
1b483194901c more new MpiwgXmlTextServer.
casties
parents: 564
diff changeset
109 # cached but no toc-request?
564
31f562fa7214 first version of MpiwgXmlTextServer.
casties
parents:
diff changeset
110 if 'numTextPages' in docinfo:
31f562fa7214 first version of MpiwgXmlTextServer.
casties
parents:
diff changeset
111 return docinfo
31f562fa7214 first version of MpiwgXmlTextServer.
casties
parents:
diff changeset
112
31f562fa7214 first version of MpiwgXmlTextServer.
casties
parents:
diff changeset
113 docpath = docinfo.get('textURLPath', None)
31f562fa7214 first version of MpiwgXmlTextServer.
casties
parents:
diff changeset
114 if docpath is None:
31f562fa7214 first version of MpiwgXmlTextServer.
casties
parents:
diff changeset
115 logging.error("getTextInfo: no textURLPath!")
31f562fa7214 first version of MpiwgXmlTextServer.
casties
parents:
diff changeset
116 return docinfo
31f562fa7214 first version of MpiwgXmlTextServer.
casties
parents:
diff changeset
117
31f562fa7214 first version of MpiwgXmlTextServer.
casties
parents:
diff changeset
118 # fetch docinfo
565
1b483194901c more new MpiwgXmlTextServer.
casties
parents: 564
diff changeset
119 pagexml = self.getServerData("query/GetDocInfo","docId=%s%s"%(docpath,field))
564
31f562fa7214 first version of MpiwgXmlTextServer.
casties
parents:
diff changeset
120 dom = ET.fromstring(pagexml)
565
1b483194901c more new MpiwgXmlTextServer.
casties
parents: 564
diff changeset
121 # all info in tag <doc>
1b483194901c more new MpiwgXmlTextServer.
casties
parents: 564
diff changeset
122 doc = dom
564
31f562fa7214 first version of MpiwgXmlTextServer.
casties
parents:
diff changeset
123 if doc is None:
31f562fa7214 first version of MpiwgXmlTextServer.
casties
parents:
diff changeset
124 logging.error("getTextInfo: unable to find document-tag!")
31f562fa7214 first version of MpiwgXmlTextServer.
casties
parents:
diff changeset
125 else:
565
1b483194901c more new MpiwgXmlTextServer.
casties
parents: 564
diff changeset
126 if mode is None:
1b483194901c more new MpiwgXmlTextServer.
casties
parents: 564
diff changeset
127 # get general info from system-tag
568
694935574177 more new MpiwgXmlTextServer.
casties
parents: 567
diff changeset
128 sys = doc.find('system')
694935574177 more new MpiwgXmlTextServer.
casties
parents: 567
diff changeset
129 if sys is not None:
694935574177 more new MpiwgXmlTextServer.
casties
parents: 567
diff changeset
130 docinfo['numTextPages'] = getInt(getText(sys.find('countPages')))
694935574177 more new MpiwgXmlTextServer.
casties
parents: 567
diff changeset
131 docinfo['numFigureEntries'] = getInt(getText(sys.find('countFigures')))
694935574177 more new MpiwgXmlTextServer.
casties
parents: 567
diff changeset
132 docinfo['numHandwritten'] = getInt(getText(sys.find('countHandwritten')))
694935574177 more new MpiwgXmlTextServer.
casties
parents: 567
diff changeset
133 docinfo['numTocEntries'] = getInt(getText(sys.find('countTocEntries')))
565
1b483194901c more new MpiwgXmlTextServer.
casties
parents: 564
diff changeset
134
1b483194901c more new MpiwgXmlTextServer.
casties
parents: 564
diff changeset
135 else:
1b483194901c more new MpiwgXmlTextServer.
casties
parents: 564
diff changeset
136 # result is in list-tag
1b483194901c more new MpiwgXmlTextServer.
casties
parents: 564
diff changeset
137 l = doc.find('list')
1b483194901c more new MpiwgXmlTextServer.
casties
parents: 564
diff changeset
138 if l is not None:
1b483194901c more new MpiwgXmlTextServer.
casties
parents: 564
diff changeset
139 lt = l.get('type')
1b483194901c more new MpiwgXmlTextServer.
casties
parents: 564
diff changeset
140 # pageNumbers
1b483194901c more new MpiwgXmlTextServer.
casties
parents: 564
diff changeset
141 if lt == 'pages':
1b483194901c more new MpiwgXmlTextServer.
casties
parents: 564
diff changeset
142 # contains tags with page numbers
1b483194901c more new MpiwgXmlTextServer.
casties
parents: 564
diff changeset
143 # <item n="14" o="2" o-norm="2" file="0014"/>
1b483194901c more new MpiwgXmlTextServer.
casties
parents: 564
diff changeset
144 # n=scan number, o=original page no, on=normalized original page no
1b483194901c more new MpiwgXmlTextServer.
casties
parents: 564
diff changeset
145 # pageNumbers is a dict indexed by scan number
1b483194901c more new MpiwgXmlTextServer.
casties
parents: 564
diff changeset
146 pages = {}
1b483194901c more new MpiwgXmlTextServer.
casties
parents: 564
diff changeset
147 for i in l:
1b483194901c more new MpiwgXmlTextServer.
casties
parents: 564
diff changeset
148 page = {}
1b483194901c more new MpiwgXmlTextServer.
casties
parents: 564
diff changeset
149 pn = getInt(i.get('n'))
1b483194901c more new MpiwgXmlTextServer.
casties
parents: 564
diff changeset
150 page['pn'] = pn
568
694935574177 more new MpiwgXmlTextServer.
casties
parents: 567
diff changeset
151 no = i.get('o')
565
1b483194901c more new MpiwgXmlTextServer.
casties
parents: 564
diff changeset
152 page['no'] = no
568
694935574177 more new MpiwgXmlTextServer.
casties
parents: 567
diff changeset
153 non = i.get('o-norm')
565
1b483194901c more new MpiwgXmlTextServer.
casties
parents: 564
diff changeset
154 page['non'] = non
1b483194901c more new MpiwgXmlTextServer.
casties
parents: 564
diff changeset
155
1b483194901c more new MpiwgXmlTextServer.
casties
parents: 564
diff changeset
156 if pn > 0:
1b483194901c more new MpiwgXmlTextServer.
casties
parents: 564
diff changeset
157 pages[pn] = page
1b483194901c more new MpiwgXmlTextServer.
casties
parents: 564
diff changeset
158
1b483194901c more new MpiwgXmlTextServer.
casties
parents: 564
diff changeset
159 docinfo['pageNumbers'] = pages
1b483194901c more new MpiwgXmlTextServer.
casties
parents: 564
diff changeset
160 logging.debug("got pageNumbers=%s"%repr(pages))
1b483194901c more new MpiwgXmlTextServer.
casties
parents: 564
diff changeset
161
1b483194901c more new MpiwgXmlTextServer.
casties
parents: 564
diff changeset
162 # toc
568
694935574177 more new MpiwgXmlTextServer.
casties
parents: 567
diff changeset
163 elif lt == 'toc' or lt == 'figures' or lt == 'handwritten':
565
1b483194901c more new MpiwgXmlTextServer.
casties
parents: 564
diff changeset
164 # contains tags with table of contents/figures
568
694935574177 more new MpiwgXmlTextServer.
casties
parents: 567
diff changeset
165 # <item n="2.1." lv="2">CAP.I. <ref o="119">132</ref></item>
565
1b483194901c more new MpiwgXmlTextServer.
casties
parents: 564
diff changeset
166 tocs = []
568
694935574177 more new MpiwgXmlTextServer.
casties
parents: 567
diff changeset
167 for te in l:
694935574177 more new MpiwgXmlTextServer.
casties
parents: 567
diff changeset
168 if te.tag == 'item':
694935574177 more new MpiwgXmlTextServer.
casties
parents: 567
diff changeset
169 toc = {}
694935574177 more new MpiwgXmlTextServer.
casties
parents: 567
diff changeset
170 toc['level-string'] = te.get('n')
694935574177 more new MpiwgXmlTextServer.
casties
parents: 567
diff changeset
171 toc['level'] = te.get('lv')
694935574177 more new MpiwgXmlTextServer.
casties
parents: 567
diff changeset
172 toc['content'] = te.text.strip()
694935574177 more new MpiwgXmlTextServer.
casties
parents: 567
diff changeset
173 ref = te.find('ref')
694935574177 more new MpiwgXmlTextServer.
casties
parents: 567
diff changeset
174 toc['pn'] = getInt(ref.text)
694935574177 more new MpiwgXmlTextServer.
casties
parents: 567
diff changeset
175 toc['no'] = ref.get('o')
694935574177 more new MpiwgXmlTextServer.
casties
parents: 567
diff changeset
176 toc['non'] = ref.get('o-norm')
694935574177 more new MpiwgXmlTextServer.
casties
parents: 567
diff changeset
177 tocs.append(toc)
564
31f562fa7214 first version of MpiwgXmlTextServer.
casties
parents:
diff changeset
178
565
1b483194901c more new MpiwgXmlTextServer.
casties
parents: 564
diff changeset
179 # save as full_toc/full_figures
1b483194901c more new MpiwgXmlTextServer.
casties
parents: 564
diff changeset
180 docinfo['full_%s'%mode] = tocs
564
31f562fa7214 first version of MpiwgXmlTextServer.
casties
parents:
diff changeset
181
31f562fa7214 first version of MpiwgXmlTextServer.
casties
parents:
diff changeset
182 return docinfo
31f562fa7214 first version of MpiwgXmlTextServer.
casties
parents:
diff changeset
183
31f562fa7214 first version of MpiwgXmlTextServer.
casties
parents:
diff changeset
184
31f562fa7214 first version of MpiwgXmlTextServer.
casties
parents:
diff changeset
185 def getTextPage(self, mode="text", pn=1, docinfo=None, pageinfo=None):
31f562fa7214 first version of MpiwgXmlTextServer.
casties
parents:
diff changeset
186 """returns single page from fulltext"""
31f562fa7214 first version of MpiwgXmlTextServer.
casties
parents:
diff changeset
187
31f562fa7214 first version of MpiwgXmlTextServer.
casties
parents:
diff changeset
188 logging.debug("getTextPage mode=%s, pn=%s"%(mode,pn))
31f562fa7214 first version of MpiwgXmlTextServer.
casties
parents:
diff changeset
189 # check for cached text -- but ideally this shouldn't be called twice
31f562fa7214 first version of MpiwgXmlTextServer.
casties
parents:
diff changeset
190 if pageinfo.has_key('textPage'):
31f562fa7214 first version of MpiwgXmlTextServer.
casties
parents:
diff changeset
191 logging.debug("getTextPage: using cached text")
31f562fa7214 first version of MpiwgXmlTextServer.
casties
parents:
diff changeset
192 return pageinfo['textPage']
31f562fa7214 first version of MpiwgXmlTextServer.
casties
parents:
diff changeset
193
31f562fa7214 first version of MpiwgXmlTextServer.
casties
parents:
diff changeset
194 docpath = docinfo.get('textURLPath', None)
31f562fa7214 first version of MpiwgXmlTextServer.
casties
parents:
diff changeset
195 if not docpath:
31f562fa7214 first version of MpiwgXmlTextServer.
casties
parents:
diff changeset
196 return None
31f562fa7214 first version of MpiwgXmlTextServer.
casties
parents:
diff changeset
197
31f562fa7214 first version of MpiwgXmlTextServer.
casties
parents:
diff changeset
198 # just checking
31f562fa7214 first version of MpiwgXmlTextServer.
casties
parents:
diff changeset
199 if pageinfo['current'] != pn:
31f562fa7214 first version of MpiwgXmlTextServer.
casties
parents:
diff changeset
200 logging.warning("getTextPage: current!=pn!")
31f562fa7214 first version of MpiwgXmlTextServer.
casties
parents:
diff changeset
201
31f562fa7214 first version of MpiwgXmlTextServer.
casties
parents:
diff changeset
202 # stuff for constructing full urls
31f562fa7214 first version of MpiwgXmlTextServer.
casties
parents:
diff changeset
203 selfurl = docinfo['viewerUrl']
31f562fa7214 first version of MpiwgXmlTextServer.
casties
parents:
diff changeset
204 textParams = {'docId': docpath,
31f562fa7214 first version of MpiwgXmlTextServer.
casties
parents:
diff changeset
205 'page': pn}
565
1b483194901c more new MpiwgXmlTextServer.
casties
parents: 564
diff changeset
206
564
31f562fa7214 first version of MpiwgXmlTextServer.
casties
parents:
diff changeset
207 if 'characterNormalization' in pageinfo:
565
1b483194901c more new MpiwgXmlTextServer.
casties
parents: 564
diff changeset
208 cn = pageinfo['characterNormalization']
1b483194901c more new MpiwgXmlTextServer.
casties
parents: 564
diff changeset
209 # TODO: change values in form
1b483194901c more new MpiwgXmlTextServer.
casties
parents: 564
diff changeset
210 if cn == 'regPlusNorm':
1b483194901c more new MpiwgXmlTextServer.
casties
parents: 564
diff changeset
211 cn = 'norm'
1b483194901c more new MpiwgXmlTextServer.
casties
parents: 564
diff changeset
212
1b483194901c more new MpiwgXmlTextServer.
casties
parents: 564
diff changeset
213 textParams['normalization'] = cn
564
31f562fa7214 first version of MpiwgXmlTextServer.
casties
parents:
diff changeset
214
31f562fa7214 first version of MpiwgXmlTextServer.
casties
parents:
diff changeset
215 if not mode:
31f562fa7214 first version of MpiwgXmlTextServer.
casties
parents:
diff changeset
216 # default is dict
31f562fa7214 first version of MpiwgXmlTextServer.
casties
parents:
diff changeset
217 mode = 'text'
31f562fa7214 first version of MpiwgXmlTextServer.
casties
parents:
diff changeset
218
31f562fa7214 first version of MpiwgXmlTextServer.
casties
parents:
diff changeset
219 modes = mode.split(',')
31f562fa7214 first version of MpiwgXmlTextServer.
casties
parents:
diff changeset
220 # check for multiple layers
31f562fa7214 first version of MpiwgXmlTextServer.
casties
parents:
diff changeset
221 if len(modes) > 1:
31f562fa7214 first version of MpiwgXmlTextServer.
casties
parents:
diff changeset
222 logging.debug("getTextPage: more than one mode=%s"%mode)
31f562fa7214 first version of MpiwgXmlTextServer.
casties
parents:
diff changeset
223
31f562fa7214 first version of MpiwgXmlTextServer.
casties
parents:
diff changeset
224 # search mode
31f562fa7214 first version of MpiwgXmlTextServer.
casties
parents:
diff changeset
225 if 'search' in modes:
31f562fa7214 first version of MpiwgXmlTextServer.
casties
parents:
diff changeset
226 # add highlighting
31f562fa7214 first version of MpiwgXmlTextServer.
casties
parents:
diff changeset
227 highlightQuery = pageinfo.get('highlightQuery', None)
31f562fa7214 first version of MpiwgXmlTextServer.
casties
parents:
diff changeset
228 if highlightQuery:
31f562fa7214 first version of MpiwgXmlTextServer.
casties
parents:
diff changeset
229 textParams['highlightQuery'] = highlightQuery
31f562fa7214 first version of MpiwgXmlTextServer.
casties
parents:
diff changeset
230 textParams['highlightElem'] = pageinfo.get('highlightElement', '')
31f562fa7214 first version of MpiwgXmlTextServer.
casties
parents:
diff changeset
231 textParams['highlightElemPos'] = pageinfo.get('highlightElementPos', '')
31f562fa7214 first version of MpiwgXmlTextServer.
casties
parents:
diff changeset
232
31f562fa7214 first version of MpiwgXmlTextServer.
casties
parents:
diff changeset
233 # ignore mode in the following
31f562fa7214 first version of MpiwgXmlTextServer.
casties
parents:
diff changeset
234 modes.remove('search')
31f562fa7214 first version of MpiwgXmlTextServer.
casties
parents:
diff changeset
235
31f562fa7214 first version of MpiwgXmlTextServer.
casties
parents:
diff changeset
236 # pundit mode
31f562fa7214 first version of MpiwgXmlTextServer.
casties
parents:
diff changeset
237 punditMode = False
31f562fa7214 first version of MpiwgXmlTextServer.
casties
parents:
diff changeset
238 if 'pundit' in modes:
31f562fa7214 first version of MpiwgXmlTextServer.
casties
parents:
diff changeset
239 punditMode = True
31f562fa7214 first version of MpiwgXmlTextServer.
casties
parents:
diff changeset
240 # ignore mode in the following
31f562fa7214 first version of MpiwgXmlTextServer.
casties
parents:
diff changeset
241 modes.remove('pundit')
31f562fa7214 first version of MpiwgXmlTextServer.
casties
parents:
diff changeset
242
31f562fa7214 first version of MpiwgXmlTextServer.
casties
parents:
diff changeset
243 # other modes don't combine
31f562fa7214 first version of MpiwgXmlTextServer.
casties
parents:
diff changeset
244 if 'dict' in modes:
31f562fa7214 first version of MpiwgXmlTextServer.
casties
parents:
diff changeset
245 textmode = 'dict'
31f562fa7214 first version of MpiwgXmlTextServer.
casties
parents:
diff changeset
246 textParams['mode'] = 'tokenized'
31f562fa7214 first version of MpiwgXmlTextServer.
casties
parents:
diff changeset
247 textParams['outputFormat'] = 'html'
31f562fa7214 first version of MpiwgXmlTextServer.
casties
parents:
diff changeset
248 elif 'xml' in modes:
31f562fa7214 first version of MpiwgXmlTextServer.
casties
parents:
diff changeset
249 textmode = 'xml'
31f562fa7214 first version of MpiwgXmlTextServer.
casties
parents:
diff changeset
250 textParams['mode'] = 'untokenized'
31f562fa7214 first version of MpiwgXmlTextServer.
casties
parents:
diff changeset
251 textParams['outputFormat'] = 'xmlDisplay'
31f562fa7214 first version of MpiwgXmlTextServer.
casties
parents:
diff changeset
252 textParams['normalization'] = 'orig'
31f562fa7214 first version of MpiwgXmlTextServer.
casties
parents:
diff changeset
253 elif 'gis' in modes:
31f562fa7214 first version of MpiwgXmlTextServer.
casties
parents:
diff changeset
254 #FIXME!
31f562fa7214 first version of MpiwgXmlTextServer.
casties
parents:
diff changeset
255 textmode = 'gis'
31f562fa7214 first version of MpiwgXmlTextServer.
casties
parents:
diff changeset
256 else:
31f562fa7214 first version of MpiwgXmlTextServer.
casties
parents:
diff changeset
257 # text is default mode
31f562fa7214 first version of MpiwgXmlTextServer.
casties
parents:
diff changeset
258 textmode = 'text'
31f562fa7214 first version of MpiwgXmlTextServer.
casties
parents:
diff changeset
259 textParams['mode'] = 'untokenized'
31f562fa7214 first version of MpiwgXmlTextServer.
casties
parents:
diff changeset
260 textParams['outputFormat'] = 'html'
31f562fa7214 first version of MpiwgXmlTextServer.
casties
parents:
diff changeset
261
565
1b483194901c more new MpiwgXmlTextServer.
casties
parents: 564
diff changeset
262 try:
570
61d53ccbdd70 more resilience to server errors.
casties
parents: 568
diff changeset
263 # fetch the page
61d53ccbdd70 more resilience to server errors.
casties
parents: 568
diff changeset
264 pagexml = self.getServerData("query/GetPage",urllib.urlencode(textParams))
565
1b483194901c more new MpiwgXmlTextServer.
casties
parents: 564
diff changeset
265 dom = ET.fromstring(pagexml)
1b483194901c more new MpiwgXmlTextServer.
casties
parents: 564
diff changeset
266 except Exception, e:
570
61d53ccbdd70 more resilience to server errors.
casties
parents: 568
diff changeset
267 logging.error("Error reading page: %s"%e)
565
1b483194901c more new MpiwgXmlTextServer.
casties
parents: 564
diff changeset
268 return None
1b483194901c more new MpiwgXmlTextServer.
casties
parents: 564
diff changeset
269
564
31f562fa7214 first version of MpiwgXmlTextServer.
casties
parents:
diff changeset
270 pagediv = None
31f562fa7214 first version of MpiwgXmlTextServer.
casties
parents:
diff changeset
271 body = dom.find('.//body')
31f562fa7214 first version of MpiwgXmlTextServer.
casties
parents:
diff changeset
272 if body is None:
31f562fa7214 first version of MpiwgXmlTextServer.
casties
parents:
diff changeset
273 logging.error("getTextPage: no body!")
31f562fa7214 first version of MpiwgXmlTextServer.
casties
parents:
diff changeset
274 return None
31f562fa7214 first version of MpiwgXmlTextServer.
casties
parents:
diff changeset
275
565
1b483194901c more new MpiwgXmlTextServer.
casties
parents: 564
diff changeset
276 # the text is in div@class=text
1b483194901c more new MpiwgXmlTextServer.
casties
parents: 564
diff changeset
277 pagediv = body.find(".//div[@class='text']")
1b483194901c more new MpiwgXmlTextServer.
casties
parents: 564
diff changeset
278 logging.debug("pagediv: %s"%repr(pagediv))
564
31f562fa7214 first version of MpiwgXmlTextServer.
casties
parents:
diff changeset
279
566
4a31608f8b0e more new MpiwgXmlTextServer.
casties
parents: 565
diff changeset
280 # plain text or text-with-links mode
4a31608f8b0e more new MpiwgXmlTextServer.
casties
parents: 565
diff changeset
281 if textmode == "text" or textmode == "dict":
564
31f562fa7214 first version of MpiwgXmlTextServer.
casties
parents:
diff changeset
282 if pagediv is not None:
567
8b1e20bf300d more new textserver
casties
parents: 566
diff changeset
283 #self._processPbTag(pagediv, pageinfo)
566
4a31608f8b0e more new MpiwgXmlTextServer.
casties
parents: 565
diff changeset
284 self._processFigures(pagediv, docinfo)
4a31608f8b0e more new MpiwgXmlTextServer.
casties
parents: 565
diff changeset
285 #self._fixEmptyDivs(pagediv)
565
1b483194901c more new MpiwgXmlTextServer.
casties
parents: 564
diff changeset
286 # get full url assuming documentViewer is parent
1b483194901c more new MpiwgXmlTextServer.
casties
parents: 564
diff changeset
287 selfurl = self.getLink()
564
31f562fa7214 first version of MpiwgXmlTextServer.
casties
parents:
diff changeset
288 # check all a-tags
31f562fa7214 first version of MpiwgXmlTextServer.
casties
parents:
diff changeset
289 links = pagediv.findall('.//a')
31f562fa7214 first version of MpiwgXmlTextServer.
casties
parents:
diff changeset
290 for l in links:
31f562fa7214 first version of MpiwgXmlTextServer.
casties
parents:
diff changeset
291 href = l.get('href')
31f562fa7214 first version of MpiwgXmlTextServer.
casties
parents:
diff changeset
292 if href:
31f562fa7214 first version of MpiwgXmlTextServer.
casties
parents:
diff changeset
293 # is link with href
31f562fa7214 first version of MpiwgXmlTextServer.
casties
parents:
diff changeset
294 linkurl = urlparse.urlparse(href)
31f562fa7214 first version of MpiwgXmlTextServer.
casties
parents:
diff changeset
295 if linkurl.path.endswith('GetDictionaryEntries'):
31f562fa7214 first version of MpiwgXmlTextServer.
casties
parents:
diff changeset
296 #TODO: replace wordInfo page
31f562fa7214 first version of MpiwgXmlTextServer.
casties
parents:
diff changeset
297 # is dictionary link - change href (keeping parameters)
31f562fa7214 first version of MpiwgXmlTextServer.
casties
parents:
diff changeset
298 #l.set('href', href.replace('http://mpdl-proto.mpiwg-berlin.mpg.de/mpdl/interface/lt/wordInfo.xql','%s/template/viewer_wordinfo'%viewerurl))
31f562fa7214 first version of MpiwgXmlTextServer.
casties
parents:
diff changeset
299 # add target to open new page
31f562fa7214 first version of MpiwgXmlTextServer.
casties
parents:
diff changeset
300 l.set('target', '_blank')
31f562fa7214 first version of MpiwgXmlTextServer.
casties
parents:
diff changeset
301
566
4a31608f8b0e more new MpiwgXmlTextServer.
casties
parents: 565
diff changeset
302 elif href.startswith('#note-'):
4a31608f8b0e more new MpiwgXmlTextServer.
casties
parents: 565
diff changeset
303 # note link FIXME!
564
31f562fa7214 first version of MpiwgXmlTextServer.
casties
parents:
diff changeset
304 l.set('href', href.replace('#note-',"%s#note-"%selfurl))
566
4a31608f8b0e more new MpiwgXmlTextServer.
casties
parents: 565
diff changeset
305
4a31608f8b0e more new MpiwgXmlTextServer.
casties
parents: 565
diff changeset
306 if punditMode:
4a31608f8b0e more new MpiwgXmlTextServer.
casties
parents: 565
diff changeset
307 self._addPunditAttributes(pagediv, pageinfo, docinfo)
4a31608f8b0e more new MpiwgXmlTextServer.
casties
parents: 565
diff changeset
308
564
31f562fa7214 first version of MpiwgXmlTextServer.
casties
parents:
diff changeset
309 return serialize(pagediv)
31f562fa7214 first version of MpiwgXmlTextServer.
casties
parents:
diff changeset
310
31f562fa7214 first version of MpiwgXmlTextServer.
casties
parents:
diff changeset
311 # xml mode
31f562fa7214 first version of MpiwgXmlTextServer.
casties
parents:
diff changeset
312 elif textmode == "xml":
31f562fa7214 first version of MpiwgXmlTextServer.
casties
parents:
diff changeset
313 if pagediv is not None:
31f562fa7214 first version of MpiwgXmlTextServer.
casties
parents:
diff changeset
314 return serialize(pagediv)
31f562fa7214 first version of MpiwgXmlTextServer.
casties
parents:
diff changeset
315
31f562fa7214 first version of MpiwgXmlTextServer.
casties
parents:
diff changeset
316 # pureXml mode WTF?
31f562fa7214 first version of MpiwgXmlTextServer.
casties
parents:
diff changeset
317 elif textmode == "pureXml":
31f562fa7214 first version of MpiwgXmlTextServer.
casties
parents:
diff changeset
318 if pagediv is not None:
31f562fa7214 first version of MpiwgXmlTextServer.
casties
parents:
diff changeset
319 return serialize(pagediv)
31f562fa7214 first version of MpiwgXmlTextServer.
casties
parents:
diff changeset
320
566
4a31608f8b0e more new MpiwgXmlTextServer.
casties
parents: 565
diff changeset
321 # gis mode FIXME!
564
31f562fa7214 first version of MpiwgXmlTextServer.
casties
parents:
diff changeset
322 elif textmode == "gis":
31f562fa7214 first version of MpiwgXmlTextServer.
casties
parents:
diff changeset
323 if pagediv is not None:
31f562fa7214 first version of MpiwgXmlTextServer.
casties
parents:
diff changeset
324 # fix empty div tags
565
1b483194901c more new MpiwgXmlTextServer.
casties
parents: 564
diff changeset
325 self._fixEmptyDivs(pagediv)
564
31f562fa7214 first version of MpiwgXmlTextServer.
casties
parents:
diff changeset
326 # check all a-tags
31f562fa7214 first version of MpiwgXmlTextServer.
casties
parents:
diff changeset
327 links = pagediv.findall(".//a")
31f562fa7214 first version of MpiwgXmlTextServer.
casties
parents:
diff changeset
328 # add our URL as backlink
31f562fa7214 first version of MpiwgXmlTextServer.
casties
parents:
diff changeset
329 selfurl = self.getLink()
31f562fa7214 first version of MpiwgXmlTextServer.
casties
parents:
diff changeset
330 doc = base64.b64encode(selfurl)
31f562fa7214 first version of MpiwgXmlTextServer.
casties
parents:
diff changeset
331 for l in links:
31f562fa7214 first version of MpiwgXmlTextServer.
casties
parents:
diff changeset
332 href = l.get('href')
31f562fa7214 first version of MpiwgXmlTextServer.
casties
parents:
diff changeset
333 if href:
31f562fa7214 first version of MpiwgXmlTextServer.
casties
parents:
diff changeset
334 if href.startswith('http://mappit.mpiwg-berlin.mpg.de'):
31f562fa7214 first version of MpiwgXmlTextServer.
casties
parents:
diff changeset
335 l.set('href', re.sub(r'doc=[\w+/=]+', 'doc=%s'%doc, href))
31f562fa7214 first version of MpiwgXmlTextServer.
casties
parents:
diff changeset
336 l.set('target', '_blank')
31f562fa7214 first version of MpiwgXmlTextServer.
casties
parents:
diff changeset
337
31f562fa7214 first version of MpiwgXmlTextServer.
casties
parents:
diff changeset
338 return serialize(pagediv)
31f562fa7214 first version of MpiwgXmlTextServer.
casties
parents:
diff changeset
339
31f562fa7214 first version of MpiwgXmlTextServer.
casties
parents:
diff changeset
340 return None
565
1b483194901c more new MpiwgXmlTextServer.
casties
parents: 564
diff changeset
341
566
4a31608f8b0e more new MpiwgXmlTextServer.
casties
parents: 565
diff changeset
342 def _processPbTag(self, pagediv, pageinfo):
565
1b483194901c more new MpiwgXmlTextServer.
casties
parents: 564
diff changeset
343 """extracts information from pb-tag and removes it from pagediv"""
1b483194901c more new MpiwgXmlTextServer.
casties
parents: 564
diff changeset
344 pbdiv = pagediv.find(".//span[@class='pb']")
1b483194901c more new MpiwgXmlTextServer.
casties
parents: 564
diff changeset
345 if pbdiv is None:
1b483194901c more new MpiwgXmlTextServer.
casties
parents: 564
diff changeset
346 logging.warning("getTextPage: no pb-span!")
1b483194901c more new MpiwgXmlTextServer.
casties
parents: 564
diff changeset
347 return pagediv
1b483194901c more new MpiwgXmlTextServer.
casties
parents: 564
diff changeset
348
1b483194901c more new MpiwgXmlTextServer.
casties
parents: 564
diff changeset
349 # extract running head
1b483194901c more new MpiwgXmlTextServer.
casties
parents: 564
diff changeset
350 rh = pbdiv.find(".//span[@class='rhead']")
1b483194901c more new MpiwgXmlTextServer.
casties
parents: 564
diff changeset
351 if rh is not None:
1b483194901c more new MpiwgXmlTextServer.
casties
parents: 564
diff changeset
352 pageinfo['pageHeaderTitle'] = getText(rh)
1b483194901c more new MpiwgXmlTextServer.
casties
parents: 564
diff changeset
353
1b483194901c more new MpiwgXmlTextServer.
casties
parents: 564
diff changeset
354 # remove pb-div from parent
1b483194901c more new MpiwgXmlTextServer.
casties
parents: 564
diff changeset
355 ppdiv = pagediv.find(".//span[@class='pb']/..")
1b483194901c more new MpiwgXmlTextServer.
casties
parents: 564
diff changeset
356 ppdiv.remove(pbdiv)
1b483194901c more new MpiwgXmlTextServer.
casties
parents: 564
diff changeset
357 return pagediv
564
31f562fa7214 first version of MpiwgXmlTextServer.
casties
parents:
diff changeset
358
565
1b483194901c more new MpiwgXmlTextServer.
casties
parents: 564
diff changeset
359 def _addPunditAttributes(self, pagediv, pageinfo, docinfo):
564
31f562fa7214 first version of MpiwgXmlTextServer.
casties
parents:
diff changeset
360 """add about attributes for pundit annotation tool"""
31f562fa7214 first version of MpiwgXmlTextServer.
casties
parents:
diff changeset
361 textid = docinfo.get('DRI', "fn=%s"%docinfo.get('documentPath', '???'))
31f562fa7214 first version of MpiwgXmlTextServer.
casties
parents:
diff changeset
362 pn = pageinfo.get('pn', '1')
31f562fa7214 first version of MpiwgXmlTextServer.
casties
parents:
diff changeset
363 # TODO: use pn as well?
31f562fa7214 first version of MpiwgXmlTextServer.
casties
parents:
diff changeset
364 # check all div-tags
31f562fa7214 first version of MpiwgXmlTextServer.
casties
parents:
diff changeset
365 divs = pagediv.findall(".//div")
31f562fa7214 first version of MpiwgXmlTextServer.
casties
parents:
diff changeset
366 for d in divs:
31f562fa7214 first version of MpiwgXmlTextServer.
casties
parents:
diff changeset
367 id = d.get('id')
31f562fa7214 first version of MpiwgXmlTextServer.
casties
parents:
diff changeset
368 if id:
566
4a31608f8b0e more new MpiwgXmlTextServer.
casties
parents: 565
diff changeset
369 # TODO: check path (cf RFC2396)
564
31f562fa7214 first version of MpiwgXmlTextServer.
casties
parents:
diff changeset
370 d.set('about', "http://echo.mpiwg-berlin.mpg.de/%s/pn=%s/#%s"%(textid,pn,id))
31f562fa7214 first version of MpiwgXmlTextServer.
casties
parents:
diff changeset
371 cls = d.get('class','')
31f562fa7214 first version of MpiwgXmlTextServer.
casties
parents:
diff changeset
372 cls += ' pundit-content'
31f562fa7214 first version of MpiwgXmlTextServer.
casties
parents:
diff changeset
373 d.set('class', cls.strip())
31f562fa7214 first version of MpiwgXmlTextServer.
casties
parents:
diff changeset
374
31f562fa7214 first version of MpiwgXmlTextServer.
casties
parents:
diff changeset
375 return pagediv
31f562fa7214 first version of MpiwgXmlTextServer.
casties
parents:
diff changeset
376
566
4a31608f8b0e more new MpiwgXmlTextServer.
casties
parents: 565
diff changeset
377 def _processFigures(self, pagediv, docinfo):
4a31608f8b0e more new MpiwgXmlTextServer.
casties
parents: 565
diff changeset
378 """processes figure-tags"""
4a31608f8b0e more new MpiwgXmlTextServer.
casties
parents: 565
diff changeset
379 divs = pagediv.findall(".//span[@class='figure']")
4a31608f8b0e more new MpiwgXmlTextServer.
casties
parents: 565
diff changeset
380 scalerUrl = docinfo['digilibScalerUrl']
4a31608f8b0e more new MpiwgXmlTextServer.
casties
parents: 565
diff changeset
381 viewerUrl = docinfo['digilibViewerUrl']
4a31608f8b0e more new MpiwgXmlTextServer.
casties
parents: 565
diff changeset
382 for d in divs:
4a31608f8b0e more new MpiwgXmlTextServer.
casties
parents: 565
diff changeset
383 try:
4a31608f8b0e more new MpiwgXmlTextServer.
casties
parents: 565
diff changeset
384 a = d.find('a')
4a31608f8b0e more new MpiwgXmlTextServer.
casties
parents: 565
diff changeset
385 img = a.find('img')
4a31608f8b0e more new MpiwgXmlTextServer.
casties
parents: 565
diff changeset
386 imgsrc = img.get('src')
4a31608f8b0e more new MpiwgXmlTextServer.
casties
parents: 565
diff changeset
387 imgurl = urlparse.urlparse(imgsrc)
4a31608f8b0e more new MpiwgXmlTextServer.
casties
parents: 565
diff changeset
388 imgq = imgurl.query
4a31608f8b0e more new MpiwgXmlTextServer.
casties
parents: 565
diff changeset
389 imgparams = urlparse.parse_qs(imgq)
4a31608f8b0e more new MpiwgXmlTextServer.
casties
parents: 565
diff changeset
390 fn = imgparams.get('fn', None)
4a31608f8b0e more new MpiwgXmlTextServer.
casties
parents: 565
diff changeset
391 if fn is not None:
4a31608f8b0e more new MpiwgXmlTextServer.
casties
parents: 565
diff changeset
392 # parse_qs puts parameters in lists
4a31608f8b0e more new MpiwgXmlTextServer.
casties
parents: 565
diff changeset
393 fn = fn[0]
4a31608f8b0e more new MpiwgXmlTextServer.
casties
parents: 565
diff changeset
394 # TODO: check valid path
4a31608f8b0e more new MpiwgXmlTextServer.
casties
parents: 565
diff changeset
395 # fix img@src
4a31608f8b0e more new MpiwgXmlTextServer.
casties
parents: 565
diff changeset
396 newsrc = '%s?fn=%s&dw=200&dh=200'%(scalerUrl,fn)
4a31608f8b0e more new MpiwgXmlTextServer.
casties
parents: 565
diff changeset
397 img.set('src', newsrc)
4a31608f8b0e more new MpiwgXmlTextServer.
casties
parents: 565
diff changeset
398 # fix a@href
4a31608f8b0e more new MpiwgXmlTextServer.
casties
parents: 565
diff changeset
399 newlink = '%s?fn=%s'%(viewerUrl,fn)
4a31608f8b0e more new MpiwgXmlTextServer.
casties
parents: 565
diff changeset
400 a.set('href', newlink)
4a31608f8b0e more new MpiwgXmlTextServer.
casties
parents: 565
diff changeset
401 a.set('target', '_blank')
4a31608f8b0e more new MpiwgXmlTextServer.
casties
parents: 565
diff changeset
402
4a31608f8b0e more new MpiwgXmlTextServer.
casties
parents: 565
diff changeset
403 except:
4a31608f8b0e more new MpiwgXmlTextServer.
casties
parents: 565
diff changeset
404 logging.warn("processFigures: strange figure!")
4a31608f8b0e more new MpiwgXmlTextServer.
casties
parents: 565
diff changeset
405
4a31608f8b0e more new MpiwgXmlTextServer.
casties
parents: 565
diff changeset
406
565
1b483194901c more new MpiwgXmlTextServer.
casties
parents: 564
diff changeset
407 def _fixEmptyDivs(self, pagediv):
1b483194901c more new MpiwgXmlTextServer.
casties
parents: 564
diff changeset
408 """fixes empty div-tags by inserting a space"""
1b483194901c more new MpiwgXmlTextServer.
casties
parents: 564
diff changeset
409 divs = pagediv.findall('.//div')
1b483194901c more new MpiwgXmlTextServer.
casties
parents: 564
diff changeset
410 for d in divs:
1b483194901c more new MpiwgXmlTextServer.
casties
parents: 564
diff changeset
411 if len(d) == 0 and not d.text:
1b483194901c more new MpiwgXmlTextServer.
casties
parents: 564
diff changeset
412 # make empty divs non-empty
1b483194901c more new MpiwgXmlTextServer.
casties
parents: 564
diff changeset
413 d.text = ' '
1b483194901c more new MpiwgXmlTextServer.
casties
parents: 564
diff changeset
414
1b483194901c more new MpiwgXmlTextServer.
casties
parents: 564
diff changeset
415 return pagediv
1b483194901c more new MpiwgXmlTextServer.
casties
parents: 564
diff changeset
416
1b483194901c more new MpiwgXmlTextServer.
casties
parents: 564
diff changeset
417
564
31f562fa7214 first version of MpiwgXmlTextServer.
casties
parents:
diff changeset
418 def getSearchResults(self, mode, query=None, pageinfo=None, docinfo=None):
31f562fa7214 first version of MpiwgXmlTextServer.
casties
parents:
diff changeset
419 """loads list of search results and stores XML in docinfo"""
31f562fa7214 first version of MpiwgXmlTextServer.
casties
parents:
diff changeset
420
31f562fa7214 first version of MpiwgXmlTextServer.
casties
parents:
diff changeset
421 logging.debug("getSearchResults mode=%s query=%s"%(mode, query))
31f562fa7214 first version of MpiwgXmlTextServer.
casties
parents:
diff changeset
422 if mode == "none":
31f562fa7214 first version of MpiwgXmlTextServer.
casties
parents:
diff changeset
423 return docinfo
31f562fa7214 first version of MpiwgXmlTextServer.
casties
parents:
diff changeset
424
568
694935574177 more new MpiwgXmlTextServer.
casties
parents: 567
diff changeset
425 #TODO: put mode into query
694935574177 more new MpiwgXmlTextServer.
casties
parents: 567
diff changeset
426
564
31f562fa7214 first version of MpiwgXmlTextServer.
casties
parents:
diff changeset
427 cachedQuery = docinfo.get('cachedQuery', None)
31f562fa7214 first version of MpiwgXmlTextServer.
casties
parents:
diff changeset
428 if cachedQuery is not None:
31f562fa7214 first version of MpiwgXmlTextServer.
casties
parents:
diff changeset
429 # cached search result
31f562fa7214 first version of MpiwgXmlTextServer.
casties
parents:
diff changeset
430 if cachedQuery == '%s_%s'%(mode,query):
31f562fa7214 first version of MpiwgXmlTextServer.
casties
parents:
diff changeset
431 # same query
31f562fa7214 first version of MpiwgXmlTextServer.
casties
parents:
diff changeset
432 return docinfo
31f562fa7214 first version of MpiwgXmlTextServer.
casties
parents:
diff changeset
433
31f562fa7214 first version of MpiwgXmlTextServer.
casties
parents:
diff changeset
434 else:
31f562fa7214 first version of MpiwgXmlTextServer.
casties
parents:
diff changeset
435 # different query
31f562fa7214 first version of MpiwgXmlTextServer.
casties
parents:
diff changeset
436 del docinfo['resultSize']
568
694935574177 more new MpiwgXmlTextServer.
casties
parents: 567
diff changeset
437 del docinfo['results']
564
31f562fa7214 first version of MpiwgXmlTextServer.
casties
parents:
diff changeset
438
31f562fa7214 first version of MpiwgXmlTextServer.
casties
parents:
diff changeset
439 # cache query
31f562fa7214 first version of MpiwgXmlTextServer.
casties
parents:
diff changeset
440 docinfo['cachedQuery'] = '%s_%s'%(mode,query)
31f562fa7214 first version of MpiwgXmlTextServer.
casties
parents:
diff changeset
441
31f562fa7214 first version of MpiwgXmlTextServer.
casties
parents:
diff changeset
442 # fetch full results
31f562fa7214 first version of MpiwgXmlTextServer.
casties
parents:
diff changeset
443 docpath = docinfo['textURLPath']
568
694935574177 more new MpiwgXmlTextServer.
casties
parents: 567
diff changeset
444 params = {'docId': docpath,
564
31f562fa7214 first version of MpiwgXmlTextServer.
casties
parents:
diff changeset
445 'query': query,
568
694935574177 more new MpiwgXmlTextServer.
casties
parents: 567
diff changeset
446 'pageSize': 1000,
694935574177 more new MpiwgXmlTextServer.
casties
parents: 567
diff changeset
447 'page': 1,
694935574177 more new MpiwgXmlTextServer.
casties
parents: 567
diff changeset
448 'outputFormat': 'html'}
694935574177 more new MpiwgXmlTextServer.
casties
parents: 567
diff changeset
449 pagexml = self.getServerData("query/QueryDocument",urllib.urlencode(params))
694935574177 more new MpiwgXmlTextServer.
casties
parents: 567
diff changeset
450 results = []
694935574177 more new MpiwgXmlTextServer.
casties
parents: 567
diff changeset
451 try:
694935574177 more new MpiwgXmlTextServer.
casties
parents: 567
diff changeset
452 dom = ET.fromstring(pagexml)
694935574177 more new MpiwgXmlTextServer.
casties
parents: 567
diff changeset
453 # page content is currently in multiple <td align=left>
694935574177 more new MpiwgXmlTextServer.
casties
parents: 567
diff changeset
454 alldivs = dom.findall(".//td[@align='left']")
694935574177 more new MpiwgXmlTextServer.
casties
parents: 567
diff changeset
455 for div in alldivs:
694935574177 more new MpiwgXmlTextServer.
casties
parents: 567
diff changeset
456 # TODO: can we put etree in the session?
694935574177 more new MpiwgXmlTextServer.
casties
parents: 567
diff changeset
457 results.append(div)
694935574177 more new MpiwgXmlTextServer.
casties
parents: 567
diff changeset
458
694935574177 more new MpiwgXmlTextServer.
casties
parents: 567
diff changeset
459 except Exception, e:
694935574177 more new MpiwgXmlTextServer.
casties
parents: 567
diff changeset
460 logging.error("GetSearchResults: Error parsing search result: %s"%e)
564
31f562fa7214 first version of MpiwgXmlTextServer.
casties
parents:
diff changeset
461
568
694935574177 more new MpiwgXmlTextServer.
casties
parents: 567
diff changeset
462 # store results in docinfo
694935574177 more new MpiwgXmlTextServer.
casties
parents: 567
diff changeset
463 docinfo['resultSize'] = len(results)
694935574177 more new MpiwgXmlTextServer.
casties
parents: 567
diff changeset
464 docinfo['results'] = results
564
31f562fa7214 first version of MpiwgXmlTextServer.
casties
parents:
diff changeset
465
31f562fa7214 first version of MpiwgXmlTextServer.
casties
parents:
diff changeset
466 return docinfo
31f562fa7214 first version of MpiwgXmlTextServer.
casties
parents:
diff changeset
467
31f562fa7214 first version of MpiwgXmlTextServer.
casties
parents:
diff changeset
468
31f562fa7214 first version of MpiwgXmlTextServer.
casties
parents:
diff changeset
469 def getResultsPage(self, mode="text", query=None, pn=None, start=None, size=None, pageinfo=None, docinfo=None):
31f562fa7214 first version of MpiwgXmlTextServer.
casties
parents:
diff changeset
470 """returns single page from the table of contents"""
31f562fa7214 first version of MpiwgXmlTextServer.
casties
parents:
diff changeset
471 logging.debug("getResultsPage mode=%s, pn=%s"%(mode,pn))
31f562fa7214 first version of MpiwgXmlTextServer.
casties
parents:
diff changeset
472 # get (cached) result
31f562fa7214 first version of MpiwgXmlTextServer.
casties
parents:
diff changeset
473 self.getSearchResults(mode=mode, query=query, pageinfo=pageinfo, docinfo=docinfo)
31f562fa7214 first version of MpiwgXmlTextServer.
casties
parents:
diff changeset
474
568
694935574177 more new MpiwgXmlTextServer.
casties
parents: 567
diff changeset
475 resultxml = docinfo.get('results', None)
564
31f562fa7214 first version of MpiwgXmlTextServer.
casties
parents:
diff changeset
476 if not resultxml:
568
694935574177 more new MpiwgXmlTextServer.
casties
parents: 567
diff changeset
477 logging.error("getResultPage: unable to find results")
564
31f562fa7214 first version of MpiwgXmlTextServer.
casties
parents:
diff changeset
478 return "Error: no result!"
31f562fa7214 first version of MpiwgXmlTextServer.
casties
parents:
diff changeset
479
31f562fa7214 first version of MpiwgXmlTextServer.
casties
parents:
diff changeset
480 if size is None:
31f562fa7214 first version of MpiwgXmlTextServer.
casties
parents:
diff changeset
481 size = pageinfo.get('resultPageSize', 10)
31f562fa7214 first version of MpiwgXmlTextServer.
casties
parents:
diff changeset
482
31f562fa7214 first version of MpiwgXmlTextServer.
casties
parents:
diff changeset
483 if start is None:
31f562fa7214 first version of MpiwgXmlTextServer.
casties
parents:
diff changeset
484 start = (pn - 1) * size
31f562fa7214 first version of MpiwgXmlTextServer.
casties
parents:
diff changeset
485
31f562fa7214 first version of MpiwgXmlTextServer.
casties
parents:
diff changeset
486 fullresult = ET.fromstring(resultxml)
31f562fa7214 first version of MpiwgXmlTextServer.
casties
parents:
diff changeset
487
31f562fa7214 first version of MpiwgXmlTextServer.
casties
parents:
diff changeset
488 if fullresult is not None:
31f562fa7214 first version of MpiwgXmlTextServer.
casties
parents:
diff changeset
489 # paginate
31f562fa7214 first version of MpiwgXmlTextServer.
casties
parents:
diff changeset
490 first = start-1
31f562fa7214 first version of MpiwgXmlTextServer.
casties
parents:
diff changeset
491 len = size
31f562fa7214 first version of MpiwgXmlTextServer.
casties
parents:
diff changeset
492 del fullresult[:first]
31f562fa7214 first version of MpiwgXmlTextServer.
casties
parents:
diff changeset
493 del fullresult[len:]
31f562fa7214 first version of MpiwgXmlTextServer.
casties
parents:
diff changeset
494 tocdivs = fullresult
31f562fa7214 first version of MpiwgXmlTextServer.
casties
parents:
diff changeset
495
31f562fa7214 first version of MpiwgXmlTextServer.
casties
parents:
diff changeset
496 # check all a-tags
31f562fa7214 first version of MpiwgXmlTextServer.
casties
parents:
diff changeset
497 links = tocdivs.findall(".//a")
31f562fa7214 first version of MpiwgXmlTextServer.
casties
parents:
diff changeset
498 for l in links:
31f562fa7214 first version of MpiwgXmlTextServer.
casties
parents:
diff changeset
499 href = l.get('href')
31f562fa7214 first version of MpiwgXmlTextServer.
casties
parents:
diff changeset
500 if href:
31f562fa7214 first version of MpiwgXmlTextServer.
casties
parents:
diff changeset
501 # assume all links go to pages
31f562fa7214 first version of MpiwgXmlTextServer.
casties
parents:
diff changeset
502 linkUrl = urlparse.urlparse(href)
31f562fa7214 first version of MpiwgXmlTextServer.
casties
parents:
diff changeset
503 linkParams = urlparse.parse_qs(linkUrl.query)
31f562fa7214 first version of MpiwgXmlTextServer.
casties
parents:
diff changeset
504 # take some parameters
31f562fa7214 first version of MpiwgXmlTextServer.
casties
parents:
diff changeset
505 params = {'pn': linkParams['pn'],
31f562fa7214 first version of MpiwgXmlTextServer.
casties
parents:
diff changeset
506 'highlightQuery': linkParams.get('highlightQuery',''),
31f562fa7214 first version of MpiwgXmlTextServer.
casties
parents:
diff changeset
507 'highlightElement': linkParams.get('highlightElement',''),
31f562fa7214 first version of MpiwgXmlTextServer.
casties
parents:
diff changeset
508 'highlightElementPos': linkParams.get('highlightElementPos','')
31f562fa7214 first version of MpiwgXmlTextServer.
casties
parents:
diff changeset
509 }
31f562fa7214 first version of MpiwgXmlTextServer.
casties
parents:
diff changeset
510 url = self.getLink(params=params)
31f562fa7214 first version of MpiwgXmlTextServer.
casties
parents:
diff changeset
511 l.set('href', url)
31f562fa7214 first version of MpiwgXmlTextServer.
casties
parents:
diff changeset
512
31f562fa7214 first version of MpiwgXmlTextServer.
casties
parents:
diff changeset
513 return serialize(tocdivs)
31f562fa7214 first version of MpiwgXmlTextServer.
casties
parents:
diff changeset
514
31f562fa7214 first version of MpiwgXmlTextServer.
casties
parents:
diff changeset
515 return "ERROR: no results!"
31f562fa7214 first version of MpiwgXmlTextServer.
casties
parents:
diff changeset
516
31f562fa7214 first version of MpiwgXmlTextServer.
casties
parents:
diff changeset
517
31f562fa7214 first version of MpiwgXmlTextServer.
casties
parents:
diff changeset
518 def getToc(self, mode='text', docinfo=None):
31f562fa7214 first version of MpiwgXmlTextServer.
casties
parents:
diff changeset
519 """returns list of table of contents from docinfo"""
31f562fa7214 first version of MpiwgXmlTextServer.
casties
parents:
diff changeset
520 logging.debug("getToc mode=%s"%mode)
31f562fa7214 first version of MpiwgXmlTextServer.
casties
parents:
diff changeset
521 if mode == 'text':
31f562fa7214 first version of MpiwgXmlTextServer.
casties
parents:
diff changeset
522 queryType = 'toc'
31f562fa7214 first version of MpiwgXmlTextServer.
casties
parents:
diff changeset
523 else:
31f562fa7214 first version of MpiwgXmlTextServer.
casties
parents:
diff changeset
524 queryType = mode
31f562fa7214 first version of MpiwgXmlTextServer.
casties
parents:
diff changeset
525
31f562fa7214 first version of MpiwgXmlTextServer.
casties
parents:
diff changeset
526 if not 'full_%s'%queryType in docinfo:
31f562fa7214 first version of MpiwgXmlTextServer.
casties
parents:
diff changeset
527 # get new toc
31f562fa7214 first version of MpiwgXmlTextServer.
casties
parents:
diff changeset
528 docinfo = self.getTextInfo(queryType, docinfo)
31f562fa7214 first version of MpiwgXmlTextServer.
casties
parents:
diff changeset
529
31f562fa7214 first version of MpiwgXmlTextServer.
casties
parents:
diff changeset
530 return docinfo.get('full_%s'%queryType, [])
31f562fa7214 first version of MpiwgXmlTextServer.
casties
parents:
diff changeset
531
568
694935574177 more new MpiwgXmlTextServer.
casties
parents: 567
diff changeset
532
564
31f562fa7214 first version of MpiwgXmlTextServer.
casties
parents:
diff changeset
533 def getTocPage(self, mode='text', pn=None, start=None, size=None, pageinfo=None, docinfo=None):
31f562fa7214 first version of MpiwgXmlTextServer.
casties
parents:
diff changeset
534 """returns single page from the table of contents"""
31f562fa7214 first version of MpiwgXmlTextServer.
casties
parents:
diff changeset
535 logging.debug("getTocPage mode=%s, pn=%s start=%s size=%s"%(mode,repr(pn),repr(start),repr(size)))
31f562fa7214 first version of MpiwgXmlTextServer.
casties
parents:
diff changeset
536 fulltoc = self.getToc(mode=mode, docinfo=docinfo)
31f562fa7214 first version of MpiwgXmlTextServer.
casties
parents:
diff changeset
537 if len(fulltoc) < 1:
31f562fa7214 first version of MpiwgXmlTextServer.
casties
parents:
diff changeset
538 logging.error("getTocPage: unable to find toc!")
31f562fa7214 first version of MpiwgXmlTextServer.
casties
parents:
diff changeset
539 return "Error: no table of contents!"
31f562fa7214 first version of MpiwgXmlTextServer.
casties
parents:
diff changeset
540
31f562fa7214 first version of MpiwgXmlTextServer.
casties
parents:
diff changeset
541 if size is None:
31f562fa7214 first version of MpiwgXmlTextServer.
casties
parents:
diff changeset
542 size = pageinfo.get('tocPageSize', 30)
31f562fa7214 first version of MpiwgXmlTextServer.
casties
parents:
diff changeset
543
31f562fa7214 first version of MpiwgXmlTextServer.
casties
parents:
diff changeset
544 if start is None:
31f562fa7214 first version of MpiwgXmlTextServer.
casties
parents:
diff changeset
545 start = (pn - 1) * size
31f562fa7214 first version of MpiwgXmlTextServer.
casties
parents:
diff changeset
546
31f562fa7214 first version of MpiwgXmlTextServer.
casties
parents:
diff changeset
547 # paginate
31f562fa7214 first version of MpiwgXmlTextServer.
casties
parents:
diff changeset
548 first = (start - 1)
31f562fa7214 first version of MpiwgXmlTextServer.
casties
parents:
diff changeset
549 last = first + size
31f562fa7214 first version of MpiwgXmlTextServer.
casties
parents:
diff changeset
550 tocs = fulltoc[first:last]
31f562fa7214 first version of MpiwgXmlTextServer.
casties
parents:
diff changeset
551 tp = '<div>'
31f562fa7214 first version of MpiwgXmlTextServer.
casties
parents:
diff changeset
552 for toc in tocs:
31f562fa7214 first version of MpiwgXmlTextServer.
casties
parents:
diff changeset
553 pageurl = self.getLink('pn', toc['pn'])
31f562fa7214 first version of MpiwgXmlTextServer.
casties
parents:
diff changeset
554 tp += '<div class="tocline">'
568
694935574177 more new MpiwgXmlTextServer.
casties
parents: 567
diff changeset
555 content = toc['content']
694935574177 more new MpiwgXmlTextServer.
casties
parents: 567
diff changeset
556 if content:
694935574177 more new MpiwgXmlTextServer.
casties
parents: 567
diff changeset
557 tp += '<div class="toc name">[%s] %s</div>'%(toc['level-string'], toc['content'])
694935574177 more new MpiwgXmlTextServer.
casties
parents: 567
diff changeset
558 else:
694935574177 more new MpiwgXmlTextServer.
casties
parents: 567
diff changeset
559 tp += '<div class="toc name">[Figure %s]</div>'%(toc['level-string'])
694935574177 more new MpiwgXmlTextServer.
casties
parents: 567
diff changeset
560
694935574177 more new MpiwgXmlTextServer.
casties
parents: 567
diff changeset
561 if toc.get('no', None):
694935574177 more new MpiwgXmlTextServer.
casties
parents: 567
diff changeset
562 tp += '<div class="toc page"><a href="%s">Page: %s (%s)</a></div>'%(pageurl, toc['pn'], toc['no'])
694935574177 more new MpiwgXmlTextServer.
casties
parents: 567
diff changeset
563 else:
694935574177 more new MpiwgXmlTextServer.
casties
parents: 567
diff changeset
564 tp += '<div class="toc page"><a href="%s">Page: %s</a></div>'%(pageurl, toc['pn'])
694935574177 more new MpiwgXmlTextServer.
casties
parents: 567
diff changeset
565
564
31f562fa7214 first version of MpiwgXmlTextServer.
casties
parents:
diff changeset
566 tp += '</div>\n'
31f562fa7214 first version of MpiwgXmlTextServer.
casties
parents:
diff changeset
567
31f562fa7214 first version of MpiwgXmlTextServer.
casties
parents:
diff changeset
568 tp += '</div>\n'
31f562fa7214 first version of MpiwgXmlTextServer.
casties
parents:
diff changeset
569
31f562fa7214 first version of MpiwgXmlTextServer.
casties
parents:
diff changeset
570 return tp
31f562fa7214 first version of MpiwgXmlTextServer.
casties
parents:
diff changeset
571
31f562fa7214 first version of MpiwgXmlTextServer.
casties
parents:
diff changeset
572
31f562fa7214 first version of MpiwgXmlTextServer.
casties
parents:
diff changeset
573 def manage_changeMpiwgXmlTextServer(self,title="",serverUrl="http://mpdl-text.mpiwg-berlin.mpg.de/mpdl/interface/",timeout=40,repositoryType=None,RESPONSE=None):
31f562fa7214 first version of MpiwgXmlTextServer.
casties
parents:
diff changeset
574 """change settings"""
31f562fa7214 first version of MpiwgXmlTextServer.
casties
parents:
diff changeset
575 self.title=title
31f562fa7214 first version of MpiwgXmlTextServer.
casties
parents:
diff changeset
576 self.timeout = timeout
31f562fa7214 first version of MpiwgXmlTextServer.
casties
parents:
diff changeset
577 self.serverUrl = serverUrl
31f562fa7214 first version of MpiwgXmlTextServer.
casties
parents:
diff changeset
578 if repositoryType:
31f562fa7214 first version of MpiwgXmlTextServer.
casties
parents:
diff changeset
579 self.repositoryType = repositoryType
31f562fa7214 first version of MpiwgXmlTextServer.
casties
parents:
diff changeset
580 if RESPONSE is not None:
31f562fa7214 first version of MpiwgXmlTextServer.
casties
parents:
diff changeset
581 RESPONSE.redirect('manage_main')
31f562fa7214 first version of MpiwgXmlTextServer.
casties
parents:
diff changeset
582
31f562fa7214 first version of MpiwgXmlTextServer.
casties
parents:
diff changeset
583 # management methods
31f562fa7214 first version of MpiwgXmlTextServer.
casties
parents:
diff changeset
584 def manage_addMpiwgXmlTextServerForm(self):
31f562fa7214 first version of MpiwgXmlTextServer.
casties
parents:
diff changeset
585 """Form for adding"""
31f562fa7214 first version of MpiwgXmlTextServer.
casties
parents:
diff changeset
586 pt = PageTemplateFile("zpt/manage_addMpiwgXmlTextServer", globals()).__of__(self)
31f562fa7214 first version of MpiwgXmlTextServer.
casties
parents:
diff changeset
587 return pt()
31f562fa7214 first version of MpiwgXmlTextServer.
casties
parents:
diff changeset
588
31f562fa7214 first version of MpiwgXmlTextServer.
casties
parents:
diff changeset
589 def manage_addMpiwgXmlTextServer(self,id,title="",serverUrl="http://mpdl-text.mpiwg-berlin.mpg.de/mpdl/interface/",timeout=40,RESPONSE=None):
31f562fa7214 first version of MpiwgXmlTextServer.
casties
parents:
diff changeset
590 #def manage_addMpiwgXmlTextServer(self,id,title="",serverUrl="http://mpdl-text.mpiwg-berlin.mpg.de:30030/mpdl/interface/",timeout=40,RESPONSE=None):
31f562fa7214 first version of MpiwgXmlTextServer.
casties
parents:
diff changeset
591 """add zogiimage"""
31f562fa7214 first version of MpiwgXmlTextServer.
casties
parents:
diff changeset
592 newObj = MpiwgXmlTextServer(id=id,title=title,serverUrl=serverUrl,timeout=timeout)
31f562fa7214 first version of MpiwgXmlTextServer.
casties
parents:
diff changeset
593 self.Destination()._setObject(id, newObj)
31f562fa7214 first version of MpiwgXmlTextServer.
casties
parents:
diff changeset
594 if RESPONSE is not None:
31f562fa7214 first version of MpiwgXmlTextServer.
casties
parents:
diff changeset
595 RESPONSE.redirect('manage_main')
31f562fa7214 first version of MpiwgXmlTextServer.
casties
parents:
diff changeset
596
31f562fa7214 first version of MpiwgXmlTextServer.
casties
parents:
diff changeset
597