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