Mercurial > hg > documentViewer
annotate documentViewer.py @ 137:2fa9d30f4ab0
debugging user authentication
author | casties |
---|---|
date | Mon, 21 Jun 2010 13:47:47 +0200 |
parents | a2114cd4673c |
children | 6345583d809a |
rev | line source |
---|---|
46 | 1 |
0 | 2 from OFS.Folder import Folder |
3 from Products.PageTemplates.ZopePageTemplate import ZopePageTemplate | |
52 | 4 from Products.PageTemplates.PageTemplateFile import PageTemplateFile |
0 | 5 from AccessControl import ClassSecurityInfo |
32 | 6 from AccessControl import getSecurityManager |
0 | 7 from Globals import package_home |
8 | |
130
5c779d7b5f71
more modular version with separate object MpdlXmlTextServer
casties
parents:
128
diff
changeset
|
9 from Ft.Xml import EMPTY_NAMESPACE, Parse |
134 | 10 import Ft.Xml.Domlette |
0 | 11 import os.path |
31 | 12 import sys |
0 | 13 import urllib |
130
5c779d7b5f71
more modular version with separate object MpdlXmlTextServer
casties
parents:
128
diff
changeset
|
14 import urllib2 |
50
6c0f20cecc60
added evaluation of the presentation/info.xml in texttools
dwinter
parents:
49
diff
changeset
|
15 import logging |
61 | 16 import math |
46 | 17 import urlparse |
130
5c779d7b5f71
more modular version with separate object MpdlXmlTextServer
casties
parents:
128
diff
changeset
|
18 import cStringIO |
84
a6e4f9b6729a
first version with new full-text infrastructure and slightly changed templates
casties
parents:
83
diff
changeset
|
19 |
52 | 20 def logger(txt,method,txt2): |
21 """logging""" | |
22 logging.info(txt+ txt2) | |
23 | |
24 | |
25 | 25 def getInt(number, default=0): |
26 """returns always an int (0 in case of problems)""" | |
27 try: | |
28 return int(number) | |
29 except: | |
62 | 30 return int(default) |
25 | 31 |
0 | 32 def getTextFromNode(nodename): |
46 | 33 """get the cdata content of a node""" |
32 | 34 if nodename is None: |
35 return "" | |
0 | 36 nodelist=nodename.childNodes |
37 rc = "" | |
38 for node in nodelist: | |
39 if node.nodeType == node.TEXT_NODE: | |
40 rc = rc + node.data | |
41 return rc | |
42 | |
84
a6e4f9b6729a
first version with new full-text infrastructure and slightly changed templates
casties
parents:
83
diff
changeset
|
43 def serializeNode(node, encoding='utf-8'): |
a6e4f9b6729a
first version with new full-text infrastructure and slightly changed templates
casties
parents:
83
diff
changeset
|
44 """returns a string containing node as XML""" |
a6e4f9b6729a
first version with new full-text infrastructure and slightly changed templates
casties
parents:
83
diff
changeset
|
45 buf = cStringIO.StringIO() |
136 | 46 Ft.Xml.Domlette.Print(node, stream=buf, encoding=encoding) |
84
a6e4f9b6729a
first version with new full-text infrastructure and slightly changed templates
casties
parents:
83
diff
changeset
|
47 s = buf.getvalue() |
a6e4f9b6729a
first version with new full-text infrastructure and slightly changed templates
casties
parents:
83
diff
changeset
|
48 buf.close() |
a6e4f9b6729a
first version with new full-text infrastructure and slightly changed templates
casties
parents:
83
diff
changeset
|
49 return s |
a6e4f9b6729a
first version with new full-text infrastructure and slightly changed templates
casties
parents:
83
diff
changeset
|
50 |
35 | 51 |
52 def getParentDir(path): | |
53 """returns pathname shortened by one""" | |
54 return '/'.join(path.split('/')[0:-1]) | |
55 | |
56 | |
130
5c779d7b5f71
more modular version with separate object MpdlXmlTextServer
casties
parents:
128
diff
changeset
|
57 def getHttpData(url, data=None, num_tries=3, timeout=10): |
5c779d7b5f71
more modular version with separate object MpdlXmlTextServer
casties
parents:
128
diff
changeset
|
58 """returns result from url+data HTTP request""" |
5c779d7b5f71
more modular version with separate object MpdlXmlTextServer
casties
parents:
128
diff
changeset
|
59 # we do GET (by appending data to url) |
5c779d7b5f71
more modular version with separate object MpdlXmlTextServer
casties
parents:
128
diff
changeset
|
60 if isinstance(data, str) or isinstance(data, unicode): |
5c779d7b5f71
more modular version with separate object MpdlXmlTextServer
casties
parents:
128
diff
changeset
|
61 # if data is string then append |
5c779d7b5f71
more modular version with separate object MpdlXmlTextServer
casties
parents:
128
diff
changeset
|
62 url = "%s?%s"%(url,data) |
5c779d7b5f71
more modular version with separate object MpdlXmlTextServer
casties
parents:
128
diff
changeset
|
63 elif isinstance(data, dict) or isinstance(data, list) or isinstance(data, tuple): |
5c779d7b5f71
more modular version with separate object MpdlXmlTextServer
casties
parents:
128
diff
changeset
|
64 # urlencode |
5c779d7b5f71
more modular version with separate object MpdlXmlTextServer
casties
parents:
128
diff
changeset
|
65 url = "%s?%s"%(url,urllib.urlencode(data)) |
5c779d7b5f71
more modular version with separate object MpdlXmlTextServer
casties
parents:
128
diff
changeset
|
66 |
5c779d7b5f71
more modular version with separate object MpdlXmlTextServer
casties
parents:
128
diff
changeset
|
67 response = None |
5c779d7b5f71
more modular version with separate object MpdlXmlTextServer
casties
parents:
128
diff
changeset
|
68 errmsg = None |
5c779d7b5f71
more modular version with separate object MpdlXmlTextServer
casties
parents:
128
diff
changeset
|
69 for cnt in range(num_tries): |
5c779d7b5f71
more modular version with separate object MpdlXmlTextServer
casties
parents:
128
diff
changeset
|
70 try: |
5c779d7b5f71
more modular version with separate object MpdlXmlTextServer
casties
parents:
128
diff
changeset
|
71 logging.debug("getHttpData(#%s %ss) url=%s"%(cnt+1,timeout,url)) |
5c779d7b5f71
more modular version with separate object MpdlXmlTextServer
casties
parents:
128
diff
changeset
|
72 if sys.version_info < (2, 6): |
5c779d7b5f71
more modular version with separate object MpdlXmlTextServer
casties
parents:
128
diff
changeset
|
73 # set timeout on socket -- ugly :-( |
5c779d7b5f71
more modular version with separate object MpdlXmlTextServer
casties
parents:
128
diff
changeset
|
74 import socket |
5c779d7b5f71
more modular version with separate object MpdlXmlTextServer
casties
parents:
128
diff
changeset
|
75 socket.setdefaulttimeout(float(timeout)) |
5c779d7b5f71
more modular version with separate object MpdlXmlTextServer
casties
parents:
128
diff
changeset
|
76 response = urllib2.urlopen(url) |
5c779d7b5f71
more modular version with separate object MpdlXmlTextServer
casties
parents:
128
diff
changeset
|
77 else: |
5c779d7b5f71
more modular version with separate object MpdlXmlTextServer
casties
parents:
128
diff
changeset
|
78 response = urllib2.urlopen(url,timeout=float(timeout)) |
5c779d7b5f71
more modular version with separate object MpdlXmlTextServer
casties
parents:
128
diff
changeset
|
79 # check result? |
5c779d7b5f71
more modular version with separate object MpdlXmlTextServer
casties
parents:
128
diff
changeset
|
80 break |
5c779d7b5f71
more modular version with separate object MpdlXmlTextServer
casties
parents:
128
diff
changeset
|
81 except urllib2.HTTPError, e: |
5c779d7b5f71
more modular version with separate object MpdlXmlTextServer
casties
parents:
128
diff
changeset
|
82 logging.error("getHttpData: HTTP error(%s): %s"%(e.code,e)) |
5c779d7b5f71
more modular version with separate object MpdlXmlTextServer
casties
parents:
128
diff
changeset
|
83 errmsg = str(e) |
5c779d7b5f71
more modular version with separate object MpdlXmlTextServer
casties
parents:
128
diff
changeset
|
84 # stop trying |
5c779d7b5f71
more modular version with separate object MpdlXmlTextServer
casties
parents:
128
diff
changeset
|
85 break |
5c779d7b5f71
more modular version with separate object MpdlXmlTextServer
casties
parents:
128
diff
changeset
|
86 except urllib2.URLError, e: |
5c779d7b5f71
more modular version with separate object MpdlXmlTextServer
casties
parents:
128
diff
changeset
|
87 logging.error("getHttpData: URLLIB error(%s): %s"%(e.reason,e)) |
5c779d7b5f71
more modular version with separate object MpdlXmlTextServer
casties
parents:
128
diff
changeset
|
88 errmsg = str(e) |
5c779d7b5f71
more modular version with separate object MpdlXmlTextServer
casties
parents:
128
diff
changeset
|
89 # stop trying |
5c779d7b5f71
more modular version with separate object MpdlXmlTextServer
casties
parents:
128
diff
changeset
|
90 #break |
0 | 91 |
130
5c779d7b5f71
more modular version with separate object MpdlXmlTextServer
casties
parents:
128
diff
changeset
|
92 if response is not None: |
5c779d7b5f71
more modular version with separate object MpdlXmlTextServer
casties
parents:
128
diff
changeset
|
93 data = response.read() |
5c779d7b5f71
more modular version with separate object MpdlXmlTextServer
casties
parents:
128
diff
changeset
|
94 response.close() |
5c779d7b5f71
more modular version with separate object MpdlXmlTextServer
casties
parents:
128
diff
changeset
|
95 return data |
5c779d7b5f71
more modular version with separate object MpdlXmlTextServer
casties
parents:
128
diff
changeset
|
96 |
5c779d7b5f71
more modular version with separate object MpdlXmlTextServer
casties
parents:
128
diff
changeset
|
97 raise IOError("ERROR fetching HTTP data from %s: %s"%(url,errmsg)) |
5c779d7b5f71
more modular version with separate object MpdlXmlTextServer
casties
parents:
128
diff
changeset
|
98 #return None |
5c779d7b5f71
more modular version with separate object MpdlXmlTextServer
casties
parents:
128
diff
changeset
|
99 |
0 | 100 |
101 | |
22 | 102 ## |
103 ## documentViewer class | |
104 ## | |
105 class documentViewer(Folder): | |
0 | 106 """document viewer""" |
107 meta_type="Document viewer" | |
108 | |
109 security=ClassSecurityInfo() | |
22 | 110 manage_options=Folder.manage_options+( |
0 | 111 {'label':'main config','action':'changeDocumentViewerForm'}, |
112 ) | |
113 | |
22 | 114 # templates and forms |
115 viewer_main = PageTemplateFile('zpt/viewer_main', globals()) | |
90
6a4a72033d58
new version with new full-text infrastructure and some more changed templates
casties
parents:
84
diff
changeset
|
116 toc_thumbs = PageTemplateFile('zpt/toc_thumbs', globals()) |
6a4a72033d58
new version with new full-text infrastructure and some more changed templates
casties
parents:
84
diff
changeset
|
117 toc_text = PageTemplateFile('zpt/toc_text', globals()) |
6a4a72033d58
new version with new full-text infrastructure and some more changed templates
casties
parents:
84
diff
changeset
|
118 toc_figures = PageTemplateFile('zpt/toc_figures', globals()) |
84
a6e4f9b6729a
first version with new full-text infrastructure and slightly changed templates
casties
parents:
83
diff
changeset
|
119 page_main_images = PageTemplateFile('zpt/page_main_images', globals()) |
a6e4f9b6729a
first version with new full-text infrastructure and slightly changed templates
casties
parents:
83
diff
changeset
|
120 page_main_text = PageTemplateFile('zpt/page_main_text', globals()) |
90
6a4a72033d58
new version with new full-text infrastructure and some more changed templates
casties
parents:
84
diff
changeset
|
121 page_main_text_dict = PageTemplateFile('zpt/page_main_text_dict', globals()) |
99 | 122 page_main_xml = PageTemplateFile('zpt/page_main_xml', globals()) |
22 | 123 head_main = PageTemplateFile('zpt/head_main', globals()) |
124 docuviewer_css = PageTemplateFile('css/docuviewer.css', globals()) | |
57 | 125 info_xml = PageTemplateFile('zpt/info_xml', globals()) |
130
5c779d7b5f71
more modular version with separate object MpdlXmlTextServer
casties
parents:
128
diff
changeset
|
126 |
5c779d7b5f71
more modular version with separate object MpdlXmlTextServer
casties
parents:
128
diff
changeset
|
127 |
68 | 128 thumbs_main_rss = PageTemplateFile('zpt/thumbs_main_rss', globals()) |
22 | 129 security.declareProtected('View management screens','changeDocumentViewerForm') |
130 changeDocumentViewerForm = PageTemplateFile('zpt/changeDocumentViewer', globals()) | |
131 | |
0 | 132 |
95 | 133 def __init__(self,id,imageScalerUrl=None,textServerName=None,title="",digilibBaseUrl=None,thumbcols=2,thumbrows=5,authgroups="mpiwg"): |
0 | 134 """init document viewer""" |
135 self.id=id | |
136 self.title=title | |
25 | 137 self.thumbcols = thumbcols |
138 self.thumbrows = thumbrows | |
32 | 139 # authgroups is list of authorized groups (delimited by ,) |
140 self.authgroups = [s.strip().lower() for s in authgroups.split(',')] | |
84
a6e4f9b6729a
first version with new full-text infrastructure and slightly changed templates
casties
parents:
83
diff
changeset
|
141 # create template folder so we can always use template.something |
a6e4f9b6729a
first version with new full-text infrastructure and slightly changed templates
casties
parents:
83
diff
changeset
|
142 |
a6e4f9b6729a
first version with new full-text infrastructure and slightly changed templates
casties
parents:
83
diff
changeset
|
143 templateFolder = Folder('template') |
a6e4f9b6729a
first version with new full-text infrastructure and slightly changed templates
casties
parents:
83
diff
changeset
|
144 #self['template'] = templateFolder # Zope-2.12 style |
a6e4f9b6729a
first version with new full-text infrastructure and slightly changed templates
casties
parents:
83
diff
changeset
|
145 self._setObject('template',templateFolder) # old style |
a6e4f9b6729a
first version with new full-text infrastructure and slightly changed templates
casties
parents:
83
diff
changeset
|
146 try: |
130
5c779d7b5f71
more modular version with separate object MpdlXmlTextServer
casties
parents:
128
diff
changeset
|
147 import MpdlXmlTextServer |
132 | 148 textServer = MpdlXmlTextServer.MpdlXmlTextServer(id='fulltextclient',serverName=textServerName) |
84
a6e4f9b6729a
first version with new full-text infrastructure and slightly changed templates
casties
parents:
83
diff
changeset
|
149 #templateFolder['fulltextclient'] = xmlRpcClient |
130
5c779d7b5f71
more modular version with separate object MpdlXmlTextServer
casties
parents:
128
diff
changeset
|
150 templateFolder._setObject('fulltextclient',textServer) |
84
a6e4f9b6729a
first version with new full-text infrastructure and slightly changed templates
casties
parents:
83
diff
changeset
|
151 except Exception, e: |
130
5c779d7b5f71
more modular version with separate object MpdlXmlTextServer
casties
parents:
128
diff
changeset
|
152 logging.error("Unable to create MpdlXmlTextServer for fulltextclient: "+str(e)) |
84
a6e4f9b6729a
first version with new full-text infrastructure and slightly changed templates
casties
parents:
83
diff
changeset
|
153 try: |
a6e4f9b6729a
first version with new full-text infrastructure and slightly changed templates
casties
parents:
83
diff
changeset
|
154 from Products.zogiLib.zogiLib import zogiLib |
a6e4f9b6729a
first version with new full-text infrastructure and slightly changed templates
casties
parents:
83
diff
changeset
|
155 zogilib = zogiLib(id="zogilib", title="zogilib for docuviewer", dlServerURL=imageScalerUrl, layout="book") |
a6e4f9b6729a
first version with new full-text infrastructure and slightly changed templates
casties
parents:
83
diff
changeset
|
156 #templateFolder['zogilib'] = zogilib |
a6e4f9b6729a
first version with new full-text infrastructure and slightly changed templates
casties
parents:
83
diff
changeset
|
157 templateFolder._setObject('zogilib',zogilib) |
a6e4f9b6729a
first version with new full-text infrastructure and slightly changed templates
casties
parents:
83
diff
changeset
|
158 except Exception, e: |
a6e4f9b6729a
first version with new full-text infrastructure and slightly changed templates
casties
parents:
83
diff
changeset
|
159 logging.error("Unable to create zogiLib for zogilib: "+str(e)) |
a6e4f9b6729a
first version with new full-text infrastructure and slightly changed templates
casties
parents:
83
diff
changeset
|
160 |
130
5c779d7b5f71
more modular version with separate object MpdlXmlTextServer
casties
parents:
128
diff
changeset
|
161 |
5c779d7b5f71
more modular version with separate object MpdlXmlTextServer
casties
parents:
128
diff
changeset
|
162 # proxy text server methods to fulltextclient |
5c779d7b5f71
more modular version with separate object MpdlXmlTextServer
casties
parents:
128
diff
changeset
|
163 def getTextPage(self, **args): |
5c779d7b5f71
more modular version with separate object MpdlXmlTextServer
casties
parents:
128
diff
changeset
|
164 """get page""" |
5c779d7b5f71
more modular version with separate object MpdlXmlTextServer
casties
parents:
128
diff
changeset
|
165 return self.template.fulltextclient.getTextPage(**args) |
22 | 166 |
130
5c779d7b5f71
more modular version with separate object MpdlXmlTextServer
casties
parents:
128
diff
changeset
|
167 def getQuery(self, **args): |
5c779d7b5f71
more modular version with separate object MpdlXmlTextServer
casties
parents:
128
diff
changeset
|
168 """get query""" |
5c779d7b5f71
more modular version with separate object MpdlXmlTextServer
casties
parents:
128
diff
changeset
|
169 return self.template.fulltextclient.getQuery(**args) |
5c779d7b5f71
more modular version with separate object MpdlXmlTextServer
casties
parents:
128
diff
changeset
|
170 |
5c779d7b5f71
more modular version with separate object MpdlXmlTextServer
casties
parents:
128
diff
changeset
|
171 def getSearch(self, **args): |
5c779d7b5f71
more modular version with separate object MpdlXmlTextServer
casties
parents:
128
diff
changeset
|
172 """get search""" |
5c779d7b5f71
more modular version with separate object MpdlXmlTextServer
casties
parents:
128
diff
changeset
|
173 return self.template.fulltextclient.getSearch(**args) |
5c779d7b5f71
more modular version with separate object MpdlXmlTextServer
casties
parents:
128
diff
changeset
|
174 |
133 | 175 def getNumPages(self, docinfo): |
130
5c779d7b5f71
more modular version with separate object MpdlXmlTextServer
casties
parents:
128
diff
changeset
|
176 """get numpages""" |
133 | 177 return self.template.fulltextclient.getNumPages(docinfo) |
130
5c779d7b5f71
more modular version with separate object MpdlXmlTextServer
casties
parents:
128
diff
changeset
|
178 |
5c779d7b5f71
more modular version with separate object MpdlXmlTextServer
casties
parents:
128
diff
changeset
|
179 def getTranslate(self, **args): |
5c779d7b5f71
more modular version with separate object MpdlXmlTextServer
casties
parents:
128
diff
changeset
|
180 """get translate""" |
5c779d7b5f71
more modular version with separate object MpdlXmlTextServer
casties
parents:
128
diff
changeset
|
181 return self.template.fulltextclient.getTranslate(**args) |
5c779d7b5f71
more modular version with separate object MpdlXmlTextServer
casties
parents:
128
diff
changeset
|
182 |
5c779d7b5f71
more modular version with separate object MpdlXmlTextServer
casties
parents:
128
diff
changeset
|
183 def getLemma(self, **args): |
5c779d7b5f71
more modular version with separate object MpdlXmlTextServer
casties
parents:
128
diff
changeset
|
184 """get lemma""" |
5c779d7b5f71
more modular version with separate object MpdlXmlTextServer
casties
parents:
128
diff
changeset
|
185 return self.template.fulltextclient.getLemma(**args) |
5c779d7b5f71
more modular version with separate object MpdlXmlTextServer
casties
parents:
128
diff
changeset
|
186 |
5c779d7b5f71
more modular version with separate object MpdlXmlTextServer
casties
parents:
128
diff
changeset
|
187 def getToc(self, **args): |
5c779d7b5f71
more modular version with separate object MpdlXmlTextServer
casties
parents:
128
diff
changeset
|
188 """get toc""" |
5c779d7b5f71
more modular version with separate object MpdlXmlTextServer
casties
parents:
128
diff
changeset
|
189 return self.template.fulltextclient.getToc(**args) |
5c779d7b5f71
more modular version with separate object MpdlXmlTextServer
casties
parents:
128
diff
changeset
|
190 |
5c779d7b5f71
more modular version with separate object MpdlXmlTextServer
casties
parents:
128
diff
changeset
|
191 def getTocPage(self, **args): |
5c779d7b5f71
more modular version with separate object MpdlXmlTextServer
casties
parents:
128
diff
changeset
|
192 """get tocpage""" |
5c779d7b5f71
more modular version with separate object MpdlXmlTextServer
casties
parents:
128
diff
changeset
|
193 return self.template.fulltextclient.getTocPage(**args) |
5c779d7b5f71
more modular version with separate object MpdlXmlTextServer
casties
parents:
128
diff
changeset
|
194 |
5c779d7b5f71
more modular version with separate object MpdlXmlTextServer
casties
parents:
128
diff
changeset
|
195 |
68 | 196 security.declareProtected('View','thumbs_rss') |
197 def thumbs_rss(self,mode,url,viewMode="auto",start=None,pn=1): | |
198 ''' | |
199 view it | |
200 @param mode: defines how to access the document behind url | |
201 @param url: url which contains display information | |
202 @param viewMode: if images display images, if text display text, default is images (text,images or auto) | |
203 | |
204 ''' | |
84
a6e4f9b6729a
first version with new full-text infrastructure and slightly changed templates
casties
parents:
83
diff
changeset
|
205 logging.debug("HHHHHHHHHHHHHH:load the rss") |
68 | 206 logger("documentViewer (index)", logging.INFO, "mode: %s url:%s start:%s pn:%s"%(mode,url,start,pn)) |
207 | |
208 if not hasattr(self, 'template'): | |
209 # create template folder if it doesn't exist | |
210 self.manage_addFolder('template') | |
211 | |
212 if not self.digilibBaseUrl: | |
213 self.digilibBaseUrl = self.findDigilibUrl() or "http://nausikaa.mpiwg-berlin.mpg.de/digitallibrary" | |
214 | |
215 docinfo = self.getDocinfo(mode=mode,url=url) | |
216 pageinfo = self.getPageinfo(start=start,current=pn,docinfo=docinfo) | |
217 pt = getattr(self.template, 'thumbs_main_rss') | |
218 | |
219 if viewMode=="auto": # automodus gewaehlt | |
130
5c779d7b5f71
more modular version with separate object MpdlXmlTextServer
casties
parents:
128
diff
changeset
|
220 if docinfo.has_key("textURL") or docinfo.has_key('textURLPath'): #texturl gesetzt und textViewer konfiguriert |
68 | 221 viewMode="text" |
222 else: | |
223 viewMode="images" | |
224 | |
225 return pt(docinfo=docinfo,pageinfo=pageinfo,viewMode=viewMode) | |
226 | |
22 | 227 security.declareProtected('View','index_html') |
95 | 228 def index_html(self,url,mode="texttool",viewMode="auto",tocMode="thumbs",start=None,pn=1,mk=None, query=None, querySearch=None): |
22 | 229 ''' |
230 view it | |
57 | 231 @param mode: defines how to access the document behind url |
22 | 232 @param url: url which contains display information |
90
6a4a72033d58
new version with new full-text infrastructure and some more changed templates
casties
parents:
84
diff
changeset
|
233 @param viewMode: if images display images, if text display text, default is auto (text,images or auto) |
99 | 234 @param tocMode: type of 'table of contents' for navigation (thumbs, text, figures, none) |
100 | 235 @param querySearch: type of different search modes (fulltext, fulltextMorph, xpath, xquery, ftIndex, ftIndexMorph, fulltextMorphLemma) |
22 | 236 ''' |
0 | 237 |
84
a6e4f9b6729a
first version with new full-text infrastructure and slightly changed templates
casties
parents:
83
diff
changeset
|
238 logging.debug("documentViewer (index) mode: %s url:%s start:%s pn:%s"%(mode,url,start,pn)) |
22 | 239 |
240 if not hasattr(self, 'template'): | |
84
a6e4f9b6729a
first version with new full-text infrastructure and slightly changed templates
casties
parents:
83
diff
changeset
|
241 # this won't work |
a6e4f9b6729a
first version with new full-text infrastructure and slightly changed templates
casties
parents:
83
diff
changeset
|
242 logging.error("template folder missing!") |
a6e4f9b6729a
first version with new full-text infrastructure and slightly changed templates
casties
parents:
83
diff
changeset
|
243 return "ERROR: template folder missing!" |
22 | 244 |
84
a6e4f9b6729a
first version with new full-text infrastructure and slightly changed templates
casties
parents:
83
diff
changeset
|
245 if not getattr(self, 'digilibBaseUrl', None): |
132 | 246 self.digilibBaseUrl = self.findDigilibUrl() or "http://digilib.mpiwg-berlin.mpg.de/digitallibrary" |
22 | 247 |
25 | 248 docinfo = self.getDocinfo(mode=mode,url=url) |
97 | 249 |
90
6a4a72033d58
new version with new full-text infrastructure and some more changed templates
casties
parents:
84
diff
changeset
|
250 if tocMode != "thumbs": |
6a4a72033d58
new version with new full-text infrastructure and some more changed templates
casties
parents:
84
diff
changeset
|
251 # get table of contents |
6a4a72033d58
new version with new full-text infrastructure and some more changed templates
casties
parents:
84
diff
changeset
|
252 docinfo = self.getToc(mode=tocMode, docinfo=docinfo) |
97 | 253 |
51
c5d3aabbf61b
textviewer now integrated, new modus auto introduced as standard for viewing
dwinter
parents:
50
diff
changeset
|
254 if viewMode=="auto": # automodus gewaehlt |
132 | 255 if docinfo.has_key('textURL') or docinfo.has_key('textURLPath'): #texturl gesetzt und textViewer konfiguriert |
127 | 256 viewMode="text_dict" |
51
c5d3aabbf61b
textviewer now integrated, new modus auto introduced as standard for viewing
dwinter
parents:
50
diff
changeset
|
257 else: |
c5d3aabbf61b
textviewer now integrated, new modus auto introduced as standard for viewing
dwinter
parents:
50
diff
changeset
|
258 viewMode="images" |
90
6a4a72033d58
new version with new full-text infrastructure and some more changed templates
casties
parents:
84
diff
changeset
|
259 |
127 | 260 pageinfo = self.getPageinfo(start=start,current=pn,docinfo=docinfo,viewMode=viewMode,tocMode=tocMode) |
261 | |
90
6a4a72033d58
new version with new full-text infrastructure and some more changed templates
casties
parents:
84
diff
changeset
|
262 pt = getattr(self.template, 'viewer_main') |
75
9673218e155b
minorCVS: ----------------------------------------------------------------------
dwinter
parents:
74
diff
changeset
|
263 return pt(docinfo=docinfo,pageinfo=pageinfo,viewMode=viewMode,mk=self.generateMarks(mk)) |
0 | 264 |
74 | 265 def generateMarks(self,mk): |
266 ret="" | |
90
6a4a72033d58
new version with new full-text infrastructure and some more changed templates
casties
parents:
84
diff
changeset
|
267 if mk is None: |
6a4a72033d58
new version with new full-text infrastructure and some more changed templates
casties
parents:
84
diff
changeset
|
268 return "" |
134 | 269 if not isinstance(mk, list): |
132 | 270 mk=[mk] |
74 | 271 for m in mk: |
75
9673218e155b
minorCVS: ----------------------------------------------------------------------
dwinter
parents:
74
diff
changeset
|
272 ret+="mk=%s"%m |
74 | 273 return ret |
84
a6e4f9b6729a
first version with new full-text infrastructure and slightly changed templates
casties
parents:
83
diff
changeset
|
274 |
90
6a4a72033d58
new version with new full-text infrastructure and some more changed templates
casties
parents:
84
diff
changeset
|
275 |
84
a6e4f9b6729a
first version with new full-text infrastructure and slightly changed templates
casties
parents:
83
diff
changeset
|
276 def findDigilibUrl(self): |
a6e4f9b6729a
first version with new full-text infrastructure and slightly changed templates
casties
parents:
83
diff
changeset
|
277 """try to get the digilib URL from zogilib""" |
a6e4f9b6729a
first version with new full-text infrastructure and slightly changed templates
casties
parents:
83
diff
changeset
|
278 url = self.template.zogilib.getDLBaseUrl() |
a6e4f9b6729a
first version with new full-text infrastructure and slightly changed templates
casties
parents:
83
diff
changeset
|
279 return url |
126 | 280 |
281 def getDocumentViewerURL(self): | |
282 """returns the URL of this instance""" | |
283 return self.absolute_url() | |
84
a6e4f9b6729a
first version with new full-text infrastructure and slightly changed templates
casties
parents:
83
diff
changeset
|
284 |
a6e4f9b6729a
first version with new full-text infrastructure and slightly changed templates
casties
parents:
83
diff
changeset
|
285 def getStyle(self, idx, selected, style=""): |
a6e4f9b6729a
first version with new full-text infrastructure and slightly changed templates
casties
parents:
83
diff
changeset
|
286 """returns a string with the given style and append 'sel' if path == selected.""" |
a6e4f9b6729a
first version with new full-text infrastructure and slightly changed templates
casties
parents:
83
diff
changeset
|
287 #logger("documentViewer (getstyle)", logging.INFO, "idx: %s selected: %s style: %s"%(idx,selected,style)) |
a6e4f9b6729a
first version with new full-text infrastructure and slightly changed templates
casties
parents:
83
diff
changeset
|
288 if idx == selected: |
a6e4f9b6729a
first version with new full-text infrastructure and slightly changed templates
casties
parents:
83
diff
changeset
|
289 return style + 'sel' |
a6e4f9b6729a
first version with new full-text infrastructure and slightly changed templates
casties
parents:
83
diff
changeset
|
290 else: |
a6e4f9b6729a
first version with new full-text infrastructure and slightly changed templates
casties
parents:
83
diff
changeset
|
291 return style |
74 | 292 |
25 | 293 def getLink(self,param=None,val=None): |
294 """link to documentviewer with parameter param set to val""" | |
35 | 295 params=self.REQUEST.form.copy() |
25 | 296 if param is not None: |
31 | 297 if val is None: |
298 if params.has_key(param): | |
299 del params[param] | |
25 | 300 else: |
35 | 301 params[param] = str(val) |
84
a6e4f9b6729a
first version with new full-text infrastructure and slightly changed templates
casties
parents:
83
diff
changeset
|
302 |
a6e4f9b6729a
first version with new full-text infrastructure and slightly changed templates
casties
parents:
83
diff
changeset
|
303 if params.get("mode", None) == "filepath": #wenn beim erst Aufruf filepath gesetzt wurde aendere das nun zu imagepath |
78 | 304 params["mode"] = "imagepath" |
305 params["url"] = getParentDir(params["url"]) | |
31 | 306 |
35 | 307 # quote values and assemble into query string |
135 | 308 #ps = "&".join(["%s=%s"%(k,urllib.quote(v)) for (k, v) in params.items()]) |
309 ps = urllib.urlencode(params) | |
35 | 310 url=self.REQUEST['URL1']+"?"+ps |
25 | 311 return url |
312 | |
68 | 313 def getLinkAmp(self,param=None,val=None): |
314 """link to documentviewer with parameter param set to val""" | |
315 params=self.REQUEST.form.copy() | |
316 if param is not None: | |
317 if val is None: | |
318 if params.has_key(param): | |
319 del params[param] | |
320 else: | |
321 params[param] = str(val) | |
322 | |
323 # quote values and assemble into query string | |
130
5c779d7b5f71
more modular version with separate object MpdlXmlTextServer
casties
parents:
128
diff
changeset
|
324 logging.debug("XYXXXXX: %s"%repr(params.items())) |
68 | 325 ps = "&".join(["%s=%s"%(k,urllib.quote(v)) for (k, v) in params.items()]) |
326 url=self.REQUEST['URL1']+"?"+ps | |
327 return url | |
81
fae97f071724
fixed problem with info.xml when url without index.meta
casties
parents:
79
diff
changeset
|
328 |
57 | 329 def getInfo_xml(self,url,mode): |
330 """returns info about the document as XML""" | |
331 | |
332 if not self.digilibBaseUrl: | |
333 self.digilibBaseUrl = self.findDigilibUrl() or "http://nausikaa.mpiwg-berlin.mpg.de/digitallibrary" | |
334 | |
335 docinfo = self.getDocinfo(mode=mode,url=url) | |
336 pt = getattr(self.template, 'info_xml') | |
337 return pt(docinfo=docinfo) | |
338 | |
0 | 339 |
35 | 340 def isAccessible(self, docinfo): |
32 | 341 """returns if access to the resource is granted""" |
342 access = docinfo.get('accessType', None) | |
130
5c779d7b5f71
more modular version with separate object MpdlXmlTextServer
casties
parents:
128
diff
changeset
|
343 logging.debug("documentViewer (accessOK) access type %s"%access) |
45 | 344 if access is not None and access == 'free': |
130
5c779d7b5f71
more modular version with separate object MpdlXmlTextServer
casties
parents:
128
diff
changeset
|
345 logging.debug("documentViewer (accessOK) access is free") |
32 | 346 return True |
45 | 347 elif access is None or access in self.authgroups: |
35 | 348 # only local access -- only logged in users |
349 user = getSecurityManager().getUser() | |
137 | 350 logging.debug("documentViewer (accessOK) user=%s ip=%s"%(user,self.REQUEST.getClientAddr())) |
35 | 351 if user is not None: |
352 #print "user: ", user | |
353 return (user.getUserName() != "Anonymous User") | |
354 else: | |
355 return False | |
32 | 356 |
137 | 357 logging.error("documentViewer (accessOK) unknown access type %s"%access) |
32 | 358 return False |
35 | 359 |
32 | 360 |
73 | 361 def getDirinfoFromDigilib(self,path,docinfo=None,cut=0): |
29 | 362 """gibt param von dlInfo aus""" |
31 | 363 if docinfo is None: |
364 docinfo = {} | |
73 | 365 |
366 for x in range(cut): | |
78 | 367 |
73 | 368 path=getParentDir(path) |
78 | 369 |
40 | 370 infoUrl=self.digilibBaseUrl+"/dirInfo-xml.jsp?mo=dir&fn="+path |
29 | 371 |
130
5c779d7b5f71
more modular version with separate object MpdlXmlTextServer
casties
parents:
128
diff
changeset
|
372 logging.debug("documentViewer (getparamfromdigilib) dirInfo from %s"%(infoUrl)) |
29 | 373 |
130
5c779d7b5f71
more modular version with separate object MpdlXmlTextServer
casties
parents:
128
diff
changeset
|
374 txt = getHttpData(infoUrl) |
5c779d7b5f71
more modular version with separate object MpdlXmlTextServer
casties
parents:
128
diff
changeset
|
375 if txt is None: |
40 | 376 raise IOError("Unable to get dir-info from %s"%(infoUrl)) |
130
5c779d7b5f71
more modular version with separate object MpdlXmlTextServer
casties
parents:
128
diff
changeset
|
377 |
5c779d7b5f71
more modular version with separate object MpdlXmlTextServer
casties
parents:
128
diff
changeset
|
378 dom = Parse(txt) |
37 | 379 sizes=dom.xpath("//dir/size") |
130
5c779d7b5f71
more modular version with separate object MpdlXmlTextServer
casties
parents:
128
diff
changeset
|
380 logging.debug("documentViewer (getparamfromdigilib) dirInfo:size"%sizes) |
29 | 381 |
37 | 382 if sizes: |
383 docinfo['numPages'] = int(getTextFromNode(sizes[0])) | |
31 | 384 else: |
385 docinfo['numPages'] = 0 | |
84
a6e4f9b6729a
first version with new full-text infrastructure and slightly changed templates
casties
parents:
83
diff
changeset
|
386 |
a6e4f9b6729a
first version with new full-text infrastructure and slightly changed templates
casties
parents:
83
diff
changeset
|
387 # TODO: produce and keep list of image names and numbers |
31 | 388 |
389 return docinfo | |
32 | 390 |
29 | 391 |
35 | 392 def getIndexMeta(self, url): |
393 """returns dom of index.meta document at url""" | |
394 dom = None | |
39
1dd90aabd366
added retry when reading index meta from texter applet
casties
parents:
38
diff
changeset
|
395 metaUrl = None |
35 | 396 if url.startswith("http://"): |
397 # real URL | |
39
1dd90aabd366
added retry when reading index meta from texter applet
casties
parents:
38
diff
changeset
|
398 metaUrl = url |
35 | 399 else: |
400 # online path | |
401 server=self.digilibBaseUrl+"/servlet/Texter?fn=" | |
40 | 402 metaUrl=server+url.replace("/mpiwg/online","") |
35 | 403 if not metaUrl.endswith("index.meta"): |
404 metaUrl += "/index.meta" | |
39
1dd90aabd366
added retry when reading index meta from texter applet
casties
parents:
38
diff
changeset
|
405 |
130
5c779d7b5f71
more modular version with separate object MpdlXmlTextServer
casties
parents:
128
diff
changeset
|
406 logging.debug("(getIndexMeta): METAURL: %s"%metaUrl) |
5c779d7b5f71
more modular version with separate object MpdlXmlTextServer
casties
parents:
128
diff
changeset
|
407 txt=getHttpData(metaUrl) |
5c779d7b5f71
more modular version with separate object MpdlXmlTextServer
casties
parents:
128
diff
changeset
|
408 if txt is None: |
39
1dd90aabd366
added retry when reading index meta from texter applet
casties
parents:
38
diff
changeset
|
409 raise IOError("Unable to read index meta from %s"%(url)) |
130
5c779d7b5f71
more modular version with separate object MpdlXmlTextServer
casties
parents:
128
diff
changeset
|
410 |
5c779d7b5f71
more modular version with separate object MpdlXmlTextServer
casties
parents:
128
diff
changeset
|
411 dom = Parse(txt) |
35 | 412 return dom |
50
6c0f20cecc60
added evaluation of the presentation/info.xml in texttools
dwinter
parents:
49
diff
changeset
|
413 |
6c0f20cecc60
added evaluation of the presentation/info.xml in texttools
dwinter
parents:
49
diff
changeset
|
414 def getPresentationInfoXML(self, url): |
6c0f20cecc60
added evaluation of the presentation/info.xml in texttools
dwinter
parents:
49
diff
changeset
|
415 """returns dom of info.xml document at url""" |
6c0f20cecc60
added evaluation of the presentation/info.xml in texttools
dwinter
parents:
49
diff
changeset
|
416 dom = None |
6c0f20cecc60
added evaluation of the presentation/info.xml in texttools
dwinter
parents:
49
diff
changeset
|
417 metaUrl = None |
6c0f20cecc60
added evaluation of the presentation/info.xml in texttools
dwinter
parents:
49
diff
changeset
|
418 if url.startswith("http://"): |
6c0f20cecc60
added evaluation of the presentation/info.xml in texttools
dwinter
parents:
49
diff
changeset
|
419 # real URL |
6c0f20cecc60
added evaluation of the presentation/info.xml in texttools
dwinter
parents:
49
diff
changeset
|
420 metaUrl = url |
6c0f20cecc60
added evaluation of the presentation/info.xml in texttools
dwinter
parents:
49
diff
changeset
|
421 else: |
6c0f20cecc60
added evaluation of the presentation/info.xml in texttools
dwinter
parents:
49
diff
changeset
|
422 # online path |
6c0f20cecc60
added evaluation of the presentation/info.xml in texttools
dwinter
parents:
49
diff
changeset
|
423 server=self.digilibBaseUrl+"/servlet/Texter?fn=" |
6c0f20cecc60
added evaluation of the presentation/info.xml in texttools
dwinter
parents:
49
diff
changeset
|
424 metaUrl=server+url.replace("/mpiwg/online","") |
6c0f20cecc60
added evaluation of the presentation/info.xml in texttools
dwinter
parents:
49
diff
changeset
|
425 |
130
5c779d7b5f71
more modular version with separate object MpdlXmlTextServer
casties
parents:
128
diff
changeset
|
426 txt=getHttpData(metaUrl) |
5c779d7b5f71
more modular version with separate object MpdlXmlTextServer
casties
parents:
128
diff
changeset
|
427 if txt is None: |
50
6c0f20cecc60
added evaluation of the presentation/info.xml in texttools
dwinter
parents:
49
diff
changeset
|
428 raise IOError("Unable to read infoXMLfrom %s"%(url)) |
130
5c779d7b5f71
more modular version with separate object MpdlXmlTextServer
casties
parents:
128
diff
changeset
|
429 |
5c779d7b5f71
more modular version with separate object MpdlXmlTextServer
casties
parents:
128
diff
changeset
|
430 dom = Parse(txt) |
50
6c0f20cecc60
added evaluation of the presentation/info.xml in texttools
dwinter
parents:
49
diff
changeset
|
431 return dom |
35 | 432 |
433 | |
70 | 434 def getAuthinfoFromIndexMeta(self,path,docinfo=None,dom=None,cut=0): |
35 | 435 """gets authorization info from the index.meta file at path or given by dom""" |
130
5c779d7b5f71
more modular version with separate object MpdlXmlTextServer
casties
parents:
128
diff
changeset
|
436 logging.debug("documentViewer (getauthinfofromindexmeta) path: %s"%(path)) |
32 | 437 |
438 access = None | |
439 | |
440 if docinfo is None: | |
441 docinfo = {} | |
442 | |
443 if dom is None: | |
78 | 444 for x in range(cut): |
70 | 445 path=getParentDir(path) |
446 dom = self.getIndexMeta(path) | |
46 | 447 |
32 | 448 acctype = dom.xpath("//access-conditions/access/@type") |
449 if acctype and (len(acctype)>0): | |
450 access=acctype[0].value | |
35 | 451 if access in ['group', 'institution']: |
32 | 452 access = getTextFromNode(dom.xpath("//access-conditions/access/name")[0]).lower() |
453 | |
454 docinfo['accessType'] = access | |
455 return docinfo | |
29 | 456 |
32 | 457 |
70 | 458 def getBibinfoFromIndexMeta(self,path,docinfo=None,dom=None,cut=0): |
35 | 459 """gets bibliographical info from the index.meta file at path or given by dom""" |
59 | 460 logging.debug("documentViewer (getbibinfofromindexmeta) path: %s"%(path)) |
20 | 461 |
22 | 462 if docinfo is None: |
463 docinfo = {} | |
78 | 464 |
22 | 465 if dom is None: |
78 | 466 for x in range(cut): |
70 | 467 path=getParentDir(path) |
468 dom = self.getIndexMeta(path) | |
79
df6952ac93e9
bug in getDocInforFromImagePath, relative lage der index.meta zu path war falsch.
dwinter
parents:
78
diff
changeset
|
469 |
df6952ac93e9
bug in getDocInforFromImagePath, relative lage der index.meta zu path war falsch.
dwinter
parents:
78
diff
changeset
|
470 logging.debug("documentViewer (getbibinfofromindexmeta cutted) path: %s"%(path)) |
59 | 471 # put in all raw bib fields as dict "bib" |
472 bib = dom.xpath("//bib/*") | |
473 if bib and len(bib)>0: | |
474 bibinfo = {} | |
475 for e in bib: | |
476 bibinfo[e.localName] = getTextFromNode(e) | |
477 docinfo['bib'] = bibinfo | |
478 | |
479 # extract some fields (author, title, year) according to their mapping | |
25 | 480 metaData=self.metadata.main.meta.bib |
481 bibtype=dom.xpath("//bib/@type") | |
482 if bibtype and (len(bibtype)>0): | |
483 bibtype=bibtype[0].value | |
20 | 484 else: |
25 | 485 bibtype="generic" |
59 | 486 |
25 | 487 bibtype=bibtype.replace("-"," ") # wrong typesiin index meta "-" instead of " " (not wrong! ROC) |
59 | 488 docinfo['bib_type'] = bibtype |
25 | 489 bibmap=metaData.generateMappingForType(bibtype) |
32 | 490 # if there is no mapping bibmap is empty (mapping sometimes has empty fields) |
31 | 491 if len(bibmap) > 0 and len(bibmap['author'][0]) > 0: |
63 | 492 try: |
493 docinfo['author']=getTextFromNode(dom.xpath("//bib/%s"%bibmap['author'][0])[0]) | |
494 except: pass | |
495 try: | |
496 docinfo['title']=getTextFromNode(dom.xpath("//bib/%s"%bibmap['title'][0])[0]) | |
497 except: pass | |
498 try: | |
499 docinfo['year']=getTextFromNode(dom.xpath("//bib/%s"%bibmap['year'][0])[0]) | |
500 except: pass | |
59 | 501 logging.debug("documentViewer (getbibinfofromindexmeta) using mapping for %s"%bibtype) |
52 | 502 try: |
503 docinfo['lang']=getTextFromNode(dom.xpath("//bib/lang")[0]) | |
504 except: | |
505 docinfo['lang']='' | |
59 | 506 |
22 | 507 return docinfo |
83 | 508 |
509 | |
84
a6e4f9b6729a
first version with new full-text infrastructure and slightly changed templates
casties
parents:
83
diff
changeset
|
510 def getDocinfoFromTextTool(self, url, dom=None, docinfo=None): |
a6e4f9b6729a
first version with new full-text infrastructure and slightly changed templates
casties
parents:
83
diff
changeset
|
511 """parse texttool tag in index meta""" |
130
5c779d7b5f71
more modular version with separate object MpdlXmlTextServer
casties
parents:
128
diff
changeset
|
512 logging.debug("documentViewer (getdocinfofromtexttool) url: %s" % (url)) |
84
a6e4f9b6729a
first version with new full-text infrastructure and slightly changed templates
casties
parents:
83
diff
changeset
|
513 if docinfo is None: |
a6e4f9b6729a
first version with new full-text infrastructure and slightly changed templates
casties
parents:
83
diff
changeset
|
514 docinfo = {} |
a6e4f9b6729a
first version with new full-text infrastructure and slightly changed templates
casties
parents:
83
diff
changeset
|
515 if docinfo.get('lang', None) is None: |
a6e4f9b6729a
first version with new full-text infrastructure and slightly changed templates
casties
parents:
83
diff
changeset
|
516 docinfo['lang'] = '' # default keine Sprache gesetzt |
a6e4f9b6729a
first version with new full-text infrastructure and slightly changed templates
casties
parents:
83
diff
changeset
|
517 if dom is None: |
a6e4f9b6729a
first version with new full-text infrastructure and slightly changed templates
casties
parents:
83
diff
changeset
|
518 dom = self.getIndexMeta(url) |
a6e4f9b6729a
first version with new full-text infrastructure and slightly changed templates
casties
parents:
83
diff
changeset
|
519 |
a6e4f9b6729a
first version with new full-text infrastructure and slightly changed templates
casties
parents:
83
diff
changeset
|
520 archivePath = None |
a6e4f9b6729a
first version with new full-text infrastructure and slightly changed templates
casties
parents:
83
diff
changeset
|
521 archiveName = None |
a6e4f9b6729a
first version with new full-text infrastructure and slightly changed templates
casties
parents:
83
diff
changeset
|
522 |
a6e4f9b6729a
first version with new full-text infrastructure and slightly changed templates
casties
parents:
83
diff
changeset
|
523 archiveNames = dom.xpath("//resource/name") |
a6e4f9b6729a
first version with new full-text infrastructure and slightly changed templates
casties
parents:
83
diff
changeset
|
524 if archiveNames and (len(archiveNames) > 0): |
a6e4f9b6729a
first version with new full-text infrastructure and slightly changed templates
casties
parents:
83
diff
changeset
|
525 archiveName = getTextFromNode(archiveNames[0]) |
a6e4f9b6729a
first version with new full-text infrastructure and slightly changed templates
casties
parents:
83
diff
changeset
|
526 else: |
130
5c779d7b5f71
more modular version with separate object MpdlXmlTextServer
casties
parents:
128
diff
changeset
|
527 logging.warning("documentViewer (getdocinfofromtexttool) resource/name missing in: %s" % (url)) |
84
a6e4f9b6729a
first version with new full-text infrastructure and slightly changed templates
casties
parents:
83
diff
changeset
|
528 |
a6e4f9b6729a
first version with new full-text infrastructure and slightly changed templates
casties
parents:
83
diff
changeset
|
529 archivePaths = dom.xpath("//resource/archive-path") |
a6e4f9b6729a
first version with new full-text infrastructure and slightly changed templates
casties
parents:
83
diff
changeset
|
530 if archivePaths and (len(archivePaths) > 0): |
a6e4f9b6729a
first version with new full-text infrastructure and slightly changed templates
casties
parents:
83
diff
changeset
|
531 archivePath = getTextFromNode(archivePaths[0]) |
a6e4f9b6729a
first version with new full-text infrastructure and slightly changed templates
casties
parents:
83
diff
changeset
|
532 # clean up archive path |
a6e4f9b6729a
first version with new full-text infrastructure and slightly changed templates
casties
parents:
83
diff
changeset
|
533 if archivePath[0] != '/': |
a6e4f9b6729a
first version with new full-text infrastructure and slightly changed templates
casties
parents:
83
diff
changeset
|
534 archivePath = '/' + archivePath |
a6e4f9b6729a
first version with new full-text infrastructure and slightly changed templates
casties
parents:
83
diff
changeset
|
535 if archiveName and (not archivePath.endswith(archiveName)): |
a6e4f9b6729a
first version with new full-text infrastructure and slightly changed templates
casties
parents:
83
diff
changeset
|
536 archivePath += "/" + archiveName |
a6e4f9b6729a
first version with new full-text infrastructure and slightly changed templates
casties
parents:
83
diff
changeset
|
537 else: |
a6e4f9b6729a
first version with new full-text infrastructure and slightly changed templates
casties
parents:
83
diff
changeset
|
538 # try to get archive-path from url |
130
5c779d7b5f71
more modular version with separate object MpdlXmlTextServer
casties
parents:
128
diff
changeset
|
539 logging.warning("documentViewer (getdocinfofromtexttool) resource/archive-path missing in: %s" % (url)) |
84
a6e4f9b6729a
first version with new full-text infrastructure and slightly changed templates
casties
parents:
83
diff
changeset
|
540 if (not url.startswith('http')): |
a6e4f9b6729a
first version with new full-text infrastructure and slightly changed templates
casties
parents:
83
diff
changeset
|
541 archivePath = url.replace('index.meta', '') |
a6e4f9b6729a
first version with new full-text infrastructure and slightly changed templates
casties
parents:
83
diff
changeset
|
542 |
a6e4f9b6729a
first version with new full-text infrastructure and slightly changed templates
casties
parents:
83
diff
changeset
|
543 if archivePath is None: |
a6e4f9b6729a
first version with new full-text infrastructure and slightly changed templates
casties
parents:
83
diff
changeset
|
544 # we balk without archive-path |
a6e4f9b6729a
first version with new full-text infrastructure and slightly changed templates
casties
parents:
83
diff
changeset
|
545 raise IOError("Missing archive-path (for text-tool) in %s" % (url)) |
22 | 546 |
84
a6e4f9b6729a
first version with new full-text infrastructure and slightly changed templates
casties
parents:
83
diff
changeset
|
547 imageDirs = dom.xpath("//texttool/image") |
a6e4f9b6729a
first version with new full-text infrastructure and slightly changed templates
casties
parents:
83
diff
changeset
|
548 if imageDirs and (len(imageDirs) > 0): |
a6e4f9b6729a
first version with new full-text infrastructure and slightly changed templates
casties
parents:
83
diff
changeset
|
549 imageDir = getTextFromNode(imageDirs[0]) |
a6e4f9b6729a
first version with new full-text infrastructure and slightly changed templates
casties
parents:
83
diff
changeset
|
550 |
a6e4f9b6729a
first version with new full-text infrastructure and slightly changed templates
casties
parents:
83
diff
changeset
|
551 else: |
a6e4f9b6729a
first version with new full-text infrastructure and slightly changed templates
casties
parents:
83
diff
changeset
|
552 # we balk with no image tag / not necessary anymore because textmode is now standard |
a6e4f9b6729a
first version with new full-text infrastructure and slightly changed templates
casties
parents:
83
diff
changeset
|
553 #raise IOError("No text-tool info in %s"%(url)) |
a6e4f9b6729a
first version with new full-text infrastructure and slightly changed templates
casties
parents:
83
diff
changeset
|
554 imageDir = "" |
a6e4f9b6729a
first version with new full-text infrastructure and slightly changed templates
casties
parents:
83
diff
changeset
|
555 #xquery="//pb" |
a6e4f9b6729a
first version with new full-text infrastructure and slightly changed templates
casties
parents:
83
diff
changeset
|
556 docinfo['imagePath'] = "" # keine Bilder |
a6e4f9b6729a
first version with new full-text infrastructure and slightly changed templates
casties
parents:
83
diff
changeset
|
557 docinfo['imageURL'] = "" |
a6e4f9b6729a
first version with new full-text infrastructure and slightly changed templates
casties
parents:
83
diff
changeset
|
558 |
a6e4f9b6729a
first version with new full-text infrastructure and slightly changed templates
casties
parents:
83
diff
changeset
|
559 if imageDir and archivePath: |
a6e4f9b6729a
first version with new full-text infrastructure and slightly changed templates
casties
parents:
83
diff
changeset
|
560 #print "image: ", imageDir, " archivepath: ", archivePath |
a6e4f9b6729a
first version with new full-text infrastructure and slightly changed templates
casties
parents:
83
diff
changeset
|
561 imageDir = os.path.join(archivePath, imageDir) |
a6e4f9b6729a
first version with new full-text infrastructure and slightly changed templates
casties
parents:
83
diff
changeset
|
562 imageDir = imageDir.replace("/mpiwg/online", '') |
a6e4f9b6729a
first version with new full-text infrastructure and slightly changed templates
casties
parents:
83
diff
changeset
|
563 docinfo = self.getDirinfoFromDigilib(imageDir, docinfo=docinfo) |
a6e4f9b6729a
first version with new full-text infrastructure and slightly changed templates
casties
parents:
83
diff
changeset
|
564 docinfo['imagePath'] = imageDir |
a6e4f9b6729a
first version with new full-text infrastructure and slightly changed templates
casties
parents:
83
diff
changeset
|
565 |
a6e4f9b6729a
first version with new full-text infrastructure and slightly changed templates
casties
parents:
83
diff
changeset
|
566 docinfo['imageURL'] = self.digilibBaseUrl + "/servlet/Scaler?fn=" + imageDir |
a6e4f9b6729a
first version with new full-text infrastructure and slightly changed templates
casties
parents:
83
diff
changeset
|
567 |
a6e4f9b6729a
first version with new full-text infrastructure and slightly changed templates
casties
parents:
83
diff
changeset
|
568 viewerUrls = dom.xpath("//texttool/digiliburlprefix") |
a6e4f9b6729a
first version with new full-text infrastructure and slightly changed templates
casties
parents:
83
diff
changeset
|
569 if viewerUrls and (len(viewerUrls) > 0): |
a6e4f9b6729a
first version with new full-text infrastructure and slightly changed templates
casties
parents:
83
diff
changeset
|
570 viewerUrl = getTextFromNode(viewerUrls[0]) |
a6e4f9b6729a
first version with new full-text infrastructure and slightly changed templates
casties
parents:
83
diff
changeset
|
571 docinfo['viewerURL'] = viewerUrl |
130
5c779d7b5f71
more modular version with separate object MpdlXmlTextServer
casties
parents:
128
diff
changeset
|
572 |
5c779d7b5f71
more modular version with separate object MpdlXmlTextServer
casties
parents:
128
diff
changeset
|
573 # old style text URL |
84
a6e4f9b6729a
first version with new full-text infrastructure and slightly changed templates
casties
parents:
83
diff
changeset
|
574 textUrls = dom.xpath("//texttool/text") |
a6e4f9b6729a
first version with new full-text infrastructure and slightly changed templates
casties
parents:
83
diff
changeset
|
575 if textUrls and (len(textUrls) > 0): |
a6e4f9b6729a
first version with new full-text infrastructure and slightly changed templates
casties
parents:
83
diff
changeset
|
576 textUrl = getTextFromNode(textUrls[0]) |
a6e4f9b6729a
first version with new full-text infrastructure and slightly changed templates
casties
parents:
83
diff
changeset
|
577 if urlparse.urlparse(textUrl)[0] == "": #keine url |
a6e4f9b6729a
first version with new full-text infrastructure and slightly changed templates
casties
parents:
83
diff
changeset
|
578 textUrl = os.path.join(archivePath, textUrl) |
a6e4f9b6729a
first version with new full-text infrastructure and slightly changed templates
casties
parents:
83
diff
changeset
|
579 # fix URLs starting with /mpiwg/online |
a6e4f9b6729a
first version with new full-text infrastructure and slightly changed templates
casties
parents:
83
diff
changeset
|
580 if textUrl.startswith("/mpiwg/online"): |
a6e4f9b6729a
first version with new full-text infrastructure and slightly changed templates
casties
parents:
83
diff
changeset
|
581 textUrl = textUrl.replace("/mpiwg/online", '', 1) |
a6e4f9b6729a
first version with new full-text infrastructure and slightly changed templates
casties
parents:
83
diff
changeset
|
582 |
a6e4f9b6729a
first version with new full-text infrastructure and slightly changed templates
casties
parents:
83
diff
changeset
|
583 docinfo['textURL'] = textUrl |
a6e4f9b6729a
first version with new full-text infrastructure and slightly changed templates
casties
parents:
83
diff
changeset
|
584 |
130
5c779d7b5f71
more modular version with separate object MpdlXmlTextServer
casties
parents:
128
diff
changeset
|
585 # new style text-url-path |
84
a6e4f9b6729a
first version with new full-text infrastructure and slightly changed templates
casties
parents:
83
diff
changeset
|
586 textUrls = dom.xpath("//texttool/text-url-path") |
a6e4f9b6729a
first version with new full-text infrastructure and slightly changed templates
casties
parents:
83
diff
changeset
|
587 if textUrls and (len(textUrls) > 0): |
a6e4f9b6729a
first version with new full-text infrastructure and slightly changed templates
casties
parents:
83
diff
changeset
|
588 textUrl = getTextFromNode(textUrls[0]) |
102 | 589 docinfo['textURLPath'] = textUrl |
590 if not docinfo['imagePath']: | |
591 # text-only, no page images | |
133 | 592 docinfo = self.getNumPages(docinfo) |
84
a6e4f9b6729a
first version with new full-text infrastructure and slightly changed templates
casties
parents:
83
diff
changeset
|
593 |
a6e4f9b6729a
first version with new full-text infrastructure and slightly changed templates
casties
parents:
83
diff
changeset
|
594 presentationUrls = dom.xpath("//texttool/presentation") |
a6e4f9b6729a
first version with new full-text infrastructure and slightly changed templates
casties
parents:
83
diff
changeset
|
595 docinfo = self.getBibinfoFromIndexMeta(url, docinfo=docinfo, dom=dom) # get info von bib tag |
a6e4f9b6729a
first version with new full-text infrastructure and slightly changed templates
casties
parents:
83
diff
changeset
|
596 |
a6e4f9b6729a
first version with new full-text infrastructure and slightly changed templates
casties
parents:
83
diff
changeset
|
597 if presentationUrls and (len(presentationUrls) > 0): # ueberschreibe diese durch presentation informationen |
a6e4f9b6729a
first version with new full-text infrastructure and slightly changed templates
casties
parents:
83
diff
changeset
|
598 # presentation url ergiebt sich ersetzen von index.meta in der url der fuer die Metadaten |
a6e4f9b6729a
first version with new full-text infrastructure and slightly changed templates
casties
parents:
83
diff
changeset
|
599 # durch den relativen Pfad auf die presentation infos |
a6e4f9b6729a
first version with new full-text infrastructure and slightly changed templates
casties
parents:
83
diff
changeset
|
600 presentationPath = getTextFromNode(presentationUrls[0]) |
a6e4f9b6729a
first version with new full-text infrastructure and slightly changed templates
casties
parents:
83
diff
changeset
|
601 if url.endswith("index.meta"): |
a6e4f9b6729a
first version with new full-text infrastructure and slightly changed templates
casties
parents:
83
diff
changeset
|
602 presentationUrl = url.replace('index.meta', presentationPath) |
a6e4f9b6729a
first version with new full-text infrastructure and slightly changed templates
casties
parents:
83
diff
changeset
|
603 else: |
a6e4f9b6729a
first version with new full-text infrastructure and slightly changed templates
casties
parents:
83
diff
changeset
|
604 presentationUrl = url + "/" + presentationPath |
102 | 605 |
84
a6e4f9b6729a
first version with new full-text infrastructure and slightly changed templates
casties
parents:
83
diff
changeset
|
606 docinfo = self.getBibinfoFromTextToolPresentation(presentationUrl, docinfo=docinfo, dom=dom) |
a6e4f9b6729a
first version with new full-text infrastructure and slightly changed templates
casties
parents:
83
diff
changeset
|
607 |
a6e4f9b6729a
first version with new full-text infrastructure and slightly changed templates
casties
parents:
83
diff
changeset
|
608 docinfo = self.getAuthinfoFromIndexMeta(url, docinfo=docinfo, dom=dom) # get access info |
a6e4f9b6729a
first version with new full-text infrastructure and slightly changed templates
casties
parents:
83
diff
changeset
|
609 |
a6e4f9b6729a
first version with new full-text infrastructure and slightly changed templates
casties
parents:
83
diff
changeset
|
610 return docinfo |
22 | 611 |
50
6c0f20cecc60
added evaluation of the presentation/info.xml in texttools
dwinter
parents:
49
diff
changeset
|
612 |
6c0f20cecc60
added evaluation of the presentation/info.xml in texttools
dwinter
parents:
49
diff
changeset
|
613 def getBibinfoFromTextToolPresentation(self,url,docinfo=None,dom=None): |
6c0f20cecc60
added evaluation of the presentation/info.xml in texttools
dwinter
parents:
49
diff
changeset
|
614 """gets the bibliographical information from the preseantion entry in texttools |
6c0f20cecc60
added evaluation of the presentation/info.xml in texttools
dwinter
parents:
49
diff
changeset
|
615 """ |
6c0f20cecc60
added evaluation of the presentation/info.xml in texttools
dwinter
parents:
49
diff
changeset
|
616 dom=self.getPresentationInfoXML(url) |
62 | 617 try: |
618 docinfo['author']=getTextFromNode(dom.xpath("//author")[0]) | |
619 except: | |
620 pass | |
621 try: | |
622 docinfo['title']=getTextFromNode(dom.xpath("//title")[0]) | |
623 except: | |
624 pass | |
625 try: | |
626 docinfo['year']=getTextFromNode(dom.xpath("//date")[0]) | |
627 except: | |
628 pass | |
50
6c0f20cecc60
added evaluation of the presentation/info.xml in texttools
dwinter
parents:
49
diff
changeset
|
629 return docinfo |
6c0f20cecc60
added evaluation of the presentation/info.xml in texttools
dwinter
parents:
49
diff
changeset
|
630 |
70 | 631 def getDocinfoFromImagePath(self,path,docinfo=None,cut=0): |
22 | 632 """path ist the path to the images it assumes that the index.meta file is one level higher.""" |
130
5c779d7b5f71
more modular version with separate object MpdlXmlTextServer
casties
parents:
128
diff
changeset
|
633 logging.debug("documentViewer (getdocinfofromimagepath) path: %s"%(path)) |
22 | 634 if docinfo is None: |
635 docinfo = {} | |
29 | 636 path=path.replace("/mpiwg/online","") |
22 | 637 docinfo['imagePath'] = path |
73 | 638 docinfo=self.getDirinfoFromDigilib(path,docinfo=docinfo,cut=cut) |
78 | 639 |
79
df6952ac93e9
bug in getDocInforFromImagePath, relative lage der index.meta zu path war falsch.
dwinter
parents:
78
diff
changeset
|
640 pathorig=path |
78 | 641 for x in range(cut): |
642 path=getParentDir(path) | |
130
5c779d7b5f71
more modular version with separate object MpdlXmlTextServer
casties
parents:
128
diff
changeset
|
643 logging.debug("documentViewer (getdocinfofromimagepath) PATH:"+path) |
31 | 644 imageUrl=self.digilibBaseUrl+"/servlet/Scaler?fn="+path |
22 | 645 docinfo['imageURL'] = imageUrl |
646 | |
79
df6952ac93e9
bug in getDocInforFromImagePath, relative lage der index.meta zu path war falsch.
dwinter
parents:
78
diff
changeset
|
647 #path ist the path to the images it assumes that the index.meta file is one level higher. |
df6952ac93e9
bug in getDocInforFromImagePath, relative lage der index.meta zu path war falsch.
dwinter
parents:
78
diff
changeset
|
648 docinfo = self.getBibinfoFromIndexMeta(pathorig,docinfo=docinfo,cut=cut+1) |
df6952ac93e9
bug in getDocInforFromImagePath, relative lage der index.meta zu path war falsch.
dwinter
parents:
78
diff
changeset
|
649 docinfo = self.getAuthinfoFromIndexMeta(pathorig,docinfo=docinfo,cut=cut+1) |
22 | 650 return docinfo |
20 | 651 |
22 | 652 |
653 def getDocinfo(self, mode, url): | |
654 """returns docinfo depending on mode""" | |
130
5c779d7b5f71
more modular version with separate object MpdlXmlTextServer
casties
parents:
128
diff
changeset
|
655 logging.debug("documentViewer (getdocinfo) mode: %s, url: %s"%(mode,url)) |
22 | 656 # look for cached docinfo in session |
51
c5d3aabbf61b
textviewer now integrated, new modus auto introduced as standard for viewing
dwinter
parents:
50
diff
changeset
|
657 if self.REQUEST.SESSION.has_key('docinfo'): |
22 | 658 docinfo = self.REQUEST.SESSION['docinfo'] |
659 # check if its still current | |
660 if docinfo is not None and docinfo.get('mode') == mode and docinfo.get('url') == url: | |
130
5c779d7b5f71
more modular version with separate object MpdlXmlTextServer
casties
parents:
128
diff
changeset
|
661 logging.debug("documentViewer (getdocinfo) docinfo in session: %s"%docinfo) |
22 | 662 return docinfo |
663 # new docinfo | |
664 docinfo = {'mode': mode, 'url': url} | |
665 if mode=="texttool": #index.meta with texttool information | |
666 docinfo = self.getDocinfoFromTextTool(url, docinfo=docinfo) | |
667 elif mode=="imagepath": | |
668 docinfo = self.getDocinfoFromImagePath(url, docinfo=docinfo) | |
70 | 669 elif mode=="filepath": |
75
9673218e155b
minorCVS: ----------------------------------------------------------------------
dwinter
parents:
74
diff
changeset
|
670 docinfo = self.getDocinfoFromImagePath(url, docinfo=docinfo,cut=1) |
22 | 671 else: |
130
5c779d7b5f71
more modular version with separate object MpdlXmlTextServer
casties
parents:
128
diff
changeset
|
672 logging.error("documentViewer (getdocinfo) unknown mode: %s!"%mode) |
90
6a4a72033d58
new version with new full-text infrastructure and some more changed templates
casties
parents:
84
diff
changeset
|
673 raise ValueError("Unknown mode %s! Has to be one of 'texttool','imagepath','filepath'."%(mode)) |
37 | 674 |
130
5c779d7b5f71
more modular version with separate object MpdlXmlTextServer
casties
parents:
128
diff
changeset
|
675 logging.debug("documentViewer (getdocinfo) docinfo: %s"%docinfo) |
22 | 676 self.REQUEST.SESSION['docinfo'] = docinfo |
677 return docinfo | |
128 | 678 |
90
6a4a72033d58
new version with new full-text infrastructure and some more changed templates
casties
parents:
84
diff
changeset
|
679 def getPageinfo(self, current, start=None, rows=None, cols=None, docinfo=None, viewMode=None, tocMode=None): |
22 | 680 """returns pageinfo with the given parameters""" |
681 pageinfo = {} | |
25 | 682 current = getInt(current) |
683 pageinfo['current'] = current | |
684 rows = int(rows or self.thumbrows) | |
685 pageinfo['rows'] = rows | |
686 cols = int(cols or self.thumbcols) | |
687 pageinfo['cols'] = cols | |
688 grpsize = cols * rows | |
689 pageinfo['groupsize'] = grpsize | |
61 | 690 start = getInt(start, default=(math.ceil(float(current)/float(grpsize))*grpsize-(grpsize-1))) |
691 # int(current / grpsize) * grpsize +1)) | |
22 | 692 pageinfo['start'] = start |
25 | 693 pageinfo['end'] = start + grpsize |
90
6a4a72033d58
new version with new full-text infrastructure and some more changed templates
casties
parents:
84
diff
changeset
|
694 if (docinfo is not None) and ('numPages' in docinfo): |
25 | 695 np = int(docinfo['numPages']) |
696 pageinfo['end'] = min(pageinfo['end'], np) | |
697 pageinfo['numgroups'] = int(np / grpsize) | |
698 if np % grpsize > 0: | |
128 | 699 pageinfo['numgroups'] += 1 |
90
6a4a72033d58
new version with new full-text infrastructure and some more changed templates
casties
parents:
84
diff
changeset
|
700 pageinfo['viewMode'] = viewMode |
6a4a72033d58
new version with new full-text infrastructure and some more changed templates
casties
parents:
84
diff
changeset
|
701 pageinfo['tocMode'] = tocMode |
95 | 702 pageinfo['query'] = self.REQUEST.get('query',' ') |
703 pageinfo['queryType'] = self.REQUEST.get('queryType',' ') | |
704 pageinfo['querySearch'] =self.REQUEST.get('querySearch', 'fulltext') | |
99 | 705 pageinfo['textPN'] = self.REQUEST.get('textPN','1') |
106 | 706 pageinfo['highlightQuery'] = self.REQUEST.get('highlightQuery','') |
95 | 707 pageinfo['tocPageSize'] = self.REQUEST.get('tocPageSize', '30') |
105 | 708 pageinfo['queryPageSize'] =self.REQUEST.get('queryPageSize', '10') |
90
6a4a72033d58
new version with new full-text infrastructure and some more changed templates
casties
parents:
84
diff
changeset
|
709 pageinfo['tocPN'] = self.REQUEST.get('tocPN', '1') |
99 | 710 toc = int (pageinfo['tocPN']) |
711 pageinfo['textPages'] =int (toc) | |
712 | |
713 if 'tocSize_%s'%tocMode in docinfo: | |
714 tocSize = int(docinfo['tocSize_%s'%tocMode]) | |
715 tocPageSize = int(pageinfo['tocPageSize']) | |
128 | 716 # cached toc |
99 | 717 if tocSize%tocPageSize>0: |
718 tocPages=tocSize/tocPageSize+1 | |
719 else: | |
720 tocPages=tocSize/tocPageSize | |
128 | 721 pageinfo['tocPN'] = min (tocPages,toc) |
95 | 722 pageinfo['searchPN'] =self.REQUEST.get('searchPN','1') |
112 | 723 pageinfo['sn'] =self.REQUEST.get('sn','') |
22 | 724 return pageinfo |
725 | |
128 | 726 def changeDocumentViewer(self,title="",digilibBaseUrl=None,thumbrows=2,thumbcols=5,authgroups='mpiwg',RESPONSE=None): |
22 | 727 """init document viewer""" |
728 self.title=title | |
729 self.digilibBaseUrl = digilibBaseUrl | |
25 | 730 self.thumbrows = thumbrows |
731 self.thumbcols = thumbcols | |
32 | 732 self.authgroups = [s.strip().lower() for s in authgroups.split(',')] |
22 | 733 if RESPONSE is not None: |
734 RESPONSE.redirect('manage_main') | |
0 | 735 |
736 def manage_AddDocumentViewerForm(self): | |
737 """add the viewer form""" | |
22 | 738 pt=PageTemplateFile('zpt/addDocumentViewer', globals()).__of__(self) |
0 | 739 return pt() |
740 | |
84
a6e4f9b6729a
first version with new full-text infrastructure and slightly changed templates
casties
parents:
83
diff
changeset
|
741 def manage_AddDocumentViewer(self,id,imageScalerUrl="",textServerName="",title="",RESPONSE=None): |
0 | 742 """add the viewer""" |
84
a6e4f9b6729a
first version with new full-text infrastructure and slightly changed templates
casties
parents:
83
diff
changeset
|
743 newObj=documentViewer(id,imageScalerUrl=imageScalerUrl,title=title,textServerName=textServerName) |
0 | 744 self._setObject(id,newObj) |
745 | |
746 if RESPONSE is not None: | |
747 RESPONSE.redirect('manage_main') | |
22 | 748 |
749 ## DocumentViewerTemplate class | |
750 class DocumentViewerTemplate(ZopePageTemplate): | |
751 """Template for document viewer""" | |
752 meta_type="DocumentViewer Template" | |
753 | |
754 | |
755 def manage_addDocumentViewerTemplateForm(self): | |
756 """Form for adding""" | |
757 pt=PageTemplateFile('zpt/addDocumentViewerTemplate', globals()).__of__(self) | |
758 return pt() | |
759 | |
760 def manage_addDocumentViewerTemplate(self, id='viewer_main', title=None, text=None, | |
761 REQUEST=None, submit=None): | |
762 "Add a Page Template with optional file content." | |
763 | |
764 self._setObject(id, DocumentViewerTemplate(id)) | |
765 ob = getattr(self, id) | |
53
f4e0af8c281d
NEW - # 44: ECHO - vollst?ndige bibliographische Angabe
dwinter
parents:
52
diff
changeset
|
766 txt=file(os.path.join(package_home(globals()),'zpt/viewer_main.zpt'),'r').read() |
f4e0af8c281d
NEW - # 44: ECHO - vollst?ndige bibliographische Angabe
dwinter
parents:
52
diff
changeset
|
767 logging.info("txt %s:"%txt) |
f4e0af8c281d
NEW - # 44: ECHO - vollst?ndige bibliographische Angabe
dwinter
parents:
52
diff
changeset
|
768 ob.pt_edit(txt,"text/html") |
22 | 769 if title: |
770 ob.pt_setTitle(title) | |
771 try: | |
772 u = self.DestinationURL() | |
773 except AttributeError: | |
774 u = REQUEST['URL1'] | |
775 | |
776 u = "%s/%s" % (u, urllib.quote(id)) | |
777 REQUEST.RESPONSE.redirect(u+'/manage_main') | |
778 return '' | |
779 | |
780 | |
41 | 781 |