Mercurial > hg > documentViewer
annotate documentViewer.py @ 133:40730cfbcb8e
fixed problem with getnumpages and **args
author | casties |
---|---|
date | Thu, 17 Jun 2010 20:34:36 +0200 |
parents | 39167e96e582 |
children | 6a33aa624ba4 |
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 |
0 | 10 from Ft.Xml.Domlette import PrettyPrint, Print |
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() |
a6e4f9b6729a
first version with new full-text infrastructure and slightly changed templates
casties
parents:
83
diff
changeset
|
46 Print(node, stream=buf, encoding=encoding) |
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 "" |
132 | 269 if type(mk) is not ListType: |
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 |
308 ps = "&".join(["%s=%s"%(k,urllib.quote(v)) for (k, v) in params.items()]) | |
309 url=self.REQUEST['URL1']+"?"+ps | |
25 | 310 return url |
311 | |
68 | 312 def getLinkAmp(self,param=None,val=None): |
313 """link to documentviewer with parameter param set to val""" | |
314 params=self.REQUEST.form.copy() | |
315 if param is not None: | |
316 if val is None: | |
317 if params.has_key(param): | |
318 del params[param] | |
319 else: | |
320 params[param] = str(val) | |
321 | |
322 # quote values and assemble into query string | |
130
5c779d7b5f71
more modular version with separate object MpdlXmlTextServer
casties
parents:
128
diff
changeset
|
323 logging.debug("XYXXXXX: %s"%repr(params.items())) |
68 | 324 ps = "&".join(["%s=%s"%(k,urllib.quote(v)) for (k, v) in params.items()]) |
325 url=self.REQUEST['URL1']+"?"+ps | |
326 return url | |
81
fae97f071724
fixed problem with info.xml when url without index.meta
casties
parents:
79
diff
changeset
|
327 |
57 | 328 def getInfo_xml(self,url,mode): |
329 """returns info about the document as XML""" | |
330 | |
331 if not self.digilibBaseUrl: | |
332 self.digilibBaseUrl = self.findDigilibUrl() or "http://nausikaa.mpiwg-berlin.mpg.de/digitallibrary" | |
333 | |
334 docinfo = self.getDocinfo(mode=mode,url=url) | |
335 pt = getattr(self.template, 'info_xml') | |
336 return pt(docinfo=docinfo) | |
337 | |
0 | 338 |
35 | 339 def isAccessible(self, docinfo): |
32 | 340 """returns if access to the resource is granted""" |
341 access = docinfo.get('accessType', None) | |
130
5c779d7b5f71
more modular version with separate object MpdlXmlTextServer
casties
parents:
128
diff
changeset
|
342 logging.debug("documentViewer (accessOK) access type %s"%access) |
45 | 343 if access is not None and access == 'free': |
130
5c779d7b5f71
more modular version with separate object MpdlXmlTextServer
casties
parents:
128
diff
changeset
|
344 logging.debug("documentViewer (accessOK) access is free") |
32 | 345 return True |
45 | 346 elif access is None or access in self.authgroups: |
35 | 347 # only local access -- only logged in users |
348 user = getSecurityManager().getUser() | |
349 if user is not None: | |
350 #print "user: ", user | |
351 return (user.getUserName() != "Anonymous User") | |
352 else: | |
353 return False | |
32 | 354 |
130
5c779d7b5f71
more modular version with separate object MpdlXmlTextServer
casties
parents:
128
diff
changeset
|
355 logging.debug("documentViewer (accessOK) unknown access type %s"%access) |
32 | 356 return False |
35 | 357 |
32 | 358 |
73 | 359 def getDirinfoFromDigilib(self,path,docinfo=None,cut=0): |
29 | 360 """gibt param von dlInfo aus""" |
31 | 361 if docinfo is None: |
362 docinfo = {} | |
73 | 363 |
364 for x in range(cut): | |
78 | 365 |
73 | 366 path=getParentDir(path) |
78 | 367 |
40 | 368 infoUrl=self.digilibBaseUrl+"/dirInfo-xml.jsp?mo=dir&fn="+path |
29 | 369 |
130
5c779d7b5f71
more modular version with separate object MpdlXmlTextServer
casties
parents:
128
diff
changeset
|
370 logging.debug("documentViewer (getparamfromdigilib) dirInfo from %s"%(infoUrl)) |
29 | 371 |
130
5c779d7b5f71
more modular version with separate object MpdlXmlTextServer
casties
parents:
128
diff
changeset
|
372 txt = getHttpData(infoUrl) |
5c779d7b5f71
more modular version with separate object MpdlXmlTextServer
casties
parents:
128
diff
changeset
|
373 if txt is None: |
40 | 374 raise IOError("Unable to get dir-info from %s"%(infoUrl)) |
130
5c779d7b5f71
more modular version with separate object MpdlXmlTextServer
casties
parents:
128
diff
changeset
|
375 |
5c779d7b5f71
more modular version with separate object MpdlXmlTextServer
casties
parents:
128
diff
changeset
|
376 dom = Parse(txt) |
37 | 377 sizes=dom.xpath("//dir/size") |
130
5c779d7b5f71
more modular version with separate object MpdlXmlTextServer
casties
parents:
128
diff
changeset
|
378 logging.debug("documentViewer (getparamfromdigilib) dirInfo:size"%sizes) |
29 | 379 |
37 | 380 if sizes: |
381 docinfo['numPages'] = int(getTextFromNode(sizes[0])) | |
31 | 382 else: |
383 docinfo['numPages'] = 0 | |
84
a6e4f9b6729a
first version with new full-text infrastructure and slightly changed templates
casties
parents:
83
diff
changeset
|
384 |
a6e4f9b6729a
first version with new full-text infrastructure and slightly changed templates
casties
parents:
83
diff
changeset
|
385 # TODO: produce and keep list of image names and numbers |
31 | 386 |
387 return docinfo | |
32 | 388 |
29 | 389 |
35 | 390 def getIndexMeta(self, url): |
391 """returns dom of index.meta document at url""" | |
392 dom = None | |
39
1dd90aabd366
added retry when reading index meta from texter applet
casties
parents:
38
diff
changeset
|
393 metaUrl = None |
35 | 394 if url.startswith("http://"): |
395 # real URL | |
39
1dd90aabd366
added retry when reading index meta from texter applet
casties
parents:
38
diff
changeset
|
396 metaUrl = url |
35 | 397 else: |
398 # online path | |
399 server=self.digilibBaseUrl+"/servlet/Texter?fn=" | |
40 | 400 metaUrl=server+url.replace("/mpiwg/online","") |
35 | 401 if not metaUrl.endswith("index.meta"): |
402 metaUrl += "/index.meta" | |
39
1dd90aabd366
added retry when reading index meta from texter applet
casties
parents:
38
diff
changeset
|
403 |
130
5c779d7b5f71
more modular version with separate object MpdlXmlTextServer
casties
parents:
128
diff
changeset
|
404 logging.debug("(getIndexMeta): METAURL: %s"%metaUrl) |
5c779d7b5f71
more modular version with separate object MpdlXmlTextServer
casties
parents:
128
diff
changeset
|
405 txt=getHttpData(metaUrl) |
5c779d7b5f71
more modular version with separate object MpdlXmlTextServer
casties
parents:
128
diff
changeset
|
406 if txt is None: |
39
1dd90aabd366
added retry when reading index meta from texter applet
casties
parents:
38
diff
changeset
|
407 raise IOError("Unable to read index meta from %s"%(url)) |
130
5c779d7b5f71
more modular version with separate object MpdlXmlTextServer
casties
parents:
128
diff
changeset
|
408 |
5c779d7b5f71
more modular version with separate object MpdlXmlTextServer
casties
parents:
128
diff
changeset
|
409 dom = Parse(txt) |
35 | 410 return dom |
50
6c0f20cecc60
added evaluation of the presentation/info.xml in texttools
dwinter
parents:
49
diff
changeset
|
411 |
6c0f20cecc60
added evaluation of the presentation/info.xml in texttools
dwinter
parents:
49
diff
changeset
|
412 def getPresentationInfoXML(self, url): |
6c0f20cecc60
added evaluation of the presentation/info.xml in texttools
dwinter
parents:
49
diff
changeset
|
413 """returns dom of info.xml document at url""" |
6c0f20cecc60
added evaluation of the presentation/info.xml in texttools
dwinter
parents:
49
diff
changeset
|
414 dom = None |
6c0f20cecc60
added evaluation of the presentation/info.xml in texttools
dwinter
parents:
49
diff
changeset
|
415 metaUrl = None |
6c0f20cecc60
added evaluation of the presentation/info.xml in texttools
dwinter
parents:
49
diff
changeset
|
416 if url.startswith("http://"): |
6c0f20cecc60
added evaluation of the presentation/info.xml in texttools
dwinter
parents:
49
diff
changeset
|
417 # real URL |
6c0f20cecc60
added evaluation of the presentation/info.xml in texttools
dwinter
parents:
49
diff
changeset
|
418 metaUrl = url |
6c0f20cecc60
added evaluation of the presentation/info.xml in texttools
dwinter
parents:
49
diff
changeset
|
419 else: |
6c0f20cecc60
added evaluation of the presentation/info.xml in texttools
dwinter
parents:
49
diff
changeset
|
420 # online path |
6c0f20cecc60
added evaluation of the presentation/info.xml in texttools
dwinter
parents:
49
diff
changeset
|
421 server=self.digilibBaseUrl+"/servlet/Texter?fn=" |
6c0f20cecc60
added evaluation of the presentation/info.xml in texttools
dwinter
parents:
49
diff
changeset
|
422 metaUrl=server+url.replace("/mpiwg/online","") |
6c0f20cecc60
added evaluation of the presentation/info.xml in texttools
dwinter
parents:
49
diff
changeset
|
423 |
130
5c779d7b5f71
more modular version with separate object MpdlXmlTextServer
casties
parents:
128
diff
changeset
|
424 txt=getHttpData(metaUrl) |
5c779d7b5f71
more modular version with separate object MpdlXmlTextServer
casties
parents:
128
diff
changeset
|
425 if txt is None: |
50
6c0f20cecc60
added evaluation of the presentation/info.xml in texttools
dwinter
parents:
49
diff
changeset
|
426 raise IOError("Unable to read infoXMLfrom %s"%(url)) |
130
5c779d7b5f71
more modular version with separate object MpdlXmlTextServer
casties
parents:
128
diff
changeset
|
427 |
5c779d7b5f71
more modular version with separate object MpdlXmlTextServer
casties
parents:
128
diff
changeset
|
428 dom = Parse(txt) |
50
6c0f20cecc60
added evaluation of the presentation/info.xml in texttools
dwinter
parents:
49
diff
changeset
|
429 return dom |
35 | 430 |
431 | |
70 | 432 def getAuthinfoFromIndexMeta(self,path,docinfo=None,dom=None,cut=0): |
35 | 433 """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
|
434 logging.debug("documentViewer (getauthinfofromindexmeta) path: %s"%(path)) |
32 | 435 |
436 access = None | |
437 | |
438 if docinfo is None: | |
439 docinfo = {} | |
440 | |
441 if dom is None: | |
78 | 442 for x in range(cut): |
70 | 443 path=getParentDir(path) |
444 dom = self.getIndexMeta(path) | |
46 | 445 |
32 | 446 acctype = dom.xpath("//access-conditions/access/@type") |
447 if acctype and (len(acctype)>0): | |
448 access=acctype[0].value | |
35 | 449 if access in ['group', 'institution']: |
32 | 450 access = getTextFromNode(dom.xpath("//access-conditions/access/name")[0]).lower() |
451 | |
452 docinfo['accessType'] = access | |
453 return docinfo | |
29 | 454 |
32 | 455 |
70 | 456 def getBibinfoFromIndexMeta(self,path,docinfo=None,dom=None,cut=0): |
35 | 457 """gets bibliographical info from the index.meta file at path or given by dom""" |
59 | 458 logging.debug("documentViewer (getbibinfofromindexmeta) path: %s"%(path)) |
20 | 459 |
22 | 460 if docinfo is None: |
461 docinfo = {} | |
78 | 462 |
22 | 463 if dom is None: |
78 | 464 for x in range(cut): |
70 | 465 path=getParentDir(path) |
466 dom = self.getIndexMeta(path) | |
79
df6952ac93e9
bug in getDocInforFromImagePath, relative lage der index.meta zu path war falsch.
dwinter
parents:
78
diff
changeset
|
467 |
df6952ac93e9
bug in getDocInforFromImagePath, relative lage der index.meta zu path war falsch.
dwinter
parents:
78
diff
changeset
|
468 logging.debug("documentViewer (getbibinfofromindexmeta cutted) path: %s"%(path)) |
59 | 469 # put in all raw bib fields as dict "bib" |
470 bib = dom.xpath("//bib/*") | |
471 if bib and len(bib)>0: | |
472 bibinfo = {} | |
473 for e in bib: | |
474 bibinfo[e.localName] = getTextFromNode(e) | |
475 docinfo['bib'] = bibinfo | |
476 | |
477 # extract some fields (author, title, year) according to their mapping | |
25 | 478 metaData=self.metadata.main.meta.bib |
479 bibtype=dom.xpath("//bib/@type") | |
480 if bibtype and (len(bibtype)>0): | |
481 bibtype=bibtype[0].value | |
20 | 482 else: |
25 | 483 bibtype="generic" |
59 | 484 |
25 | 485 bibtype=bibtype.replace("-"," ") # wrong typesiin index meta "-" instead of " " (not wrong! ROC) |
59 | 486 docinfo['bib_type'] = bibtype |
25 | 487 bibmap=metaData.generateMappingForType(bibtype) |
32 | 488 # if there is no mapping bibmap is empty (mapping sometimes has empty fields) |
31 | 489 if len(bibmap) > 0 and len(bibmap['author'][0]) > 0: |
63 | 490 try: |
491 docinfo['author']=getTextFromNode(dom.xpath("//bib/%s"%bibmap['author'][0])[0]) | |
492 except: pass | |
493 try: | |
494 docinfo['title']=getTextFromNode(dom.xpath("//bib/%s"%bibmap['title'][0])[0]) | |
495 except: pass | |
496 try: | |
497 docinfo['year']=getTextFromNode(dom.xpath("//bib/%s"%bibmap['year'][0])[0]) | |
498 except: pass | |
59 | 499 logging.debug("documentViewer (getbibinfofromindexmeta) using mapping for %s"%bibtype) |
52 | 500 try: |
501 docinfo['lang']=getTextFromNode(dom.xpath("//bib/lang")[0]) | |
502 except: | |
503 docinfo['lang']='' | |
59 | 504 |
22 | 505 return docinfo |
83 | 506 |
507 | |
84
a6e4f9b6729a
first version with new full-text infrastructure and slightly changed templates
casties
parents:
83
diff
changeset
|
508 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
|
509 """parse texttool tag in index meta""" |
130
5c779d7b5f71
more modular version with separate object MpdlXmlTextServer
casties
parents:
128
diff
changeset
|
510 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
|
511 if docinfo is None: |
a6e4f9b6729a
first version with new full-text infrastructure and slightly changed templates
casties
parents:
83
diff
changeset
|
512 docinfo = {} |
a6e4f9b6729a
first version with new full-text infrastructure and slightly changed templates
casties
parents:
83
diff
changeset
|
513 if docinfo.get('lang', None) is None: |
a6e4f9b6729a
first version with new full-text infrastructure and slightly changed templates
casties
parents:
83
diff
changeset
|
514 docinfo['lang'] = '' # default keine Sprache gesetzt |
a6e4f9b6729a
first version with new full-text infrastructure and slightly changed templates
casties
parents:
83
diff
changeset
|
515 if dom is None: |
a6e4f9b6729a
first version with new full-text infrastructure and slightly changed templates
casties
parents:
83
diff
changeset
|
516 dom = self.getIndexMeta(url) |
a6e4f9b6729a
first version with new full-text infrastructure and slightly changed templates
casties
parents:
83
diff
changeset
|
517 |
a6e4f9b6729a
first version with new full-text infrastructure and slightly changed templates
casties
parents:
83
diff
changeset
|
518 archivePath = None |
a6e4f9b6729a
first version with new full-text infrastructure and slightly changed templates
casties
parents:
83
diff
changeset
|
519 archiveName = None |
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 archiveNames = dom.xpath("//resource/name") |
a6e4f9b6729a
first version with new full-text infrastructure and slightly changed templates
casties
parents:
83
diff
changeset
|
522 if archiveNames and (len(archiveNames) > 0): |
a6e4f9b6729a
first version with new full-text infrastructure and slightly changed templates
casties
parents:
83
diff
changeset
|
523 archiveName = getTextFromNode(archiveNames[0]) |
a6e4f9b6729a
first version with new full-text infrastructure and slightly changed templates
casties
parents:
83
diff
changeset
|
524 else: |
130
5c779d7b5f71
more modular version with separate object MpdlXmlTextServer
casties
parents:
128
diff
changeset
|
525 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
|
526 |
a6e4f9b6729a
first version with new full-text infrastructure and slightly changed templates
casties
parents:
83
diff
changeset
|
527 archivePaths = dom.xpath("//resource/archive-path") |
a6e4f9b6729a
first version with new full-text infrastructure and slightly changed templates
casties
parents:
83
diff
changeset
|
528 if archivePaths and (len(archivePaths) > 0): |
a6e4f9b6729a
first version with new full-text infrastructure and slightly changed templates
casties
parents:
83
diff
changeset
|
529 archivePath = getTextFromNode(archivePaths[0]) |
a6e4f9b6729a
first version with new full-text infrastructure and slightly changed templates
casties
parents:
83
diff
changeset
|
530 # clean up archive path |
a6e4f9b6729a
first version with new full-text infrastructure and slightly changed templates
casties
parents:
83
diff
changeset
|
531 if archivePath[0] != '/': |
a6e4f9b6729a
first version with new full-text infrastructure and slightly changed templates
casties
parents:
83
diff
changeset
|
532 archivePath = '/' + archivePath |
a6e4f9b6729a
first version with new full-text infrastructure and slightly changed templates
casties
parents:
83
diff
changeset
|
533 if archiveName and (not archivePath.endswith(archiveName)): |
a6e4f9b6729a
first version with new full-text infrastructure and slightly changed templates
casties
parents:
83
diff
changeset
|
534 archivePath += "/" + archiveName |
a6e4f9b6729a
first version with new full-text infrastructure and slightly changed templates
casties
parents:
83
diff
changeset
|
535 else: |
a6e4f9b6729a
first version with new full-text infrastructure and slightly changed templates
casties
parents:
83
diff
changeset
|
536 # try to get archive-path from url |
130
5c779d7b5f71
more modular version with separate object MpdlXmlTextServer
casties
parents:
128
diff
changeset
|
537 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
|
538 if (not url.startswith('http')): |
a6e4f9b6729a
first version with new full-text infrastructure and slightly changed templates
casties
parents:
83
diff
changeset
|
539 archivePath = url.replace('index.meta', '') |
a6e4f9b6729a
first version with new full-text infrastructure and slightly changed templates
casties
parents:
83
diff
changeset
|
540 |
a6e4f9b6729a
first version with new full-text infrastructure and slightly changed templates
casties
parents:
83
diff
changeset
|
541 if archivePath is None: |
a6e4f9b6729a
first version with new full-text infrastructure and slightly changed templates
casties
parents:
83
diff
changeset
|
542 # we balk without archive-path |
a6e4f9b6729a
first version with new full-text infrastructure and slightly changed templates
casties
parents:
83
diff
changeset
|
543 raise IOError("Missing archive-path (for text-tool) in %s" % (url)) |
22 | 544 |
84
a6e4f9b6729a
first version with new full-text infrastructure and slightly changed templates
casties
parents:
83
diff
changeset
|
545 imageDirs = dom.xpath("//texttool/image") |
a6e4f9b6729a
first version with new full-text infrastructure and slightly changed templates
casties
parents:
83
diff
changeset
|
546 if imageDirs and (len(imageDirs) > 0): |
a6e4f9b6729a
first version with new full-text infrastructure and slightly changed templates
casties
parents:
83
diff
changeset
|
547 imageDir = getTextFromNode(imageDirs[0]) |
a6e4f9b6729a
first version with new full-text infrastructure and slightly changed templates
casties
parents:
83
diff
changeset
|
548 |
a6e4f9b6729a
first version with new full-text infrastructure and slightly changed templates
casties
parents:
83
diff
changeset
|
549 else: |
a6e4f9b6729a
first version with new full-text infrastructure and slightly changed templates
casties
parents:
83
diff
changeset
|
550 # 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
|
551 #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
|
552 imageDir = "" |
a6e4f9b6729a
first version with new full-text infrastructure and slightly changed templates
casties
parents:
83
diff
changeset
|
553 #xquery="//pb" |
a6e4f9b6729a
first version with new full-text infrastructure and slightly changed templates
casties
parents:
83
diff
changeset
|
554 docinfo['imagePath'] = "" # keine Bilder |
a6e4f9b6729a
first version with new full-text infrastructure and slightly changed templates
casties
parents:
83
diff
changeset
|
555 docinfo['imageURL'] = "" |
a6e4f9b6729a
first version with new full-text infrastructure and slightly changed templates
casties
parents:
83
diff
changeset
|
556 |
a6e4f9b6729a
first version with new full-text infrastructure and slightly changed templates
casties
parents:
83
diff
changeset
|
557 if imageDir and archivePath: |
a6e4f9b6729a
first version with new full-text infrastructure and slightly changed templates
casties
parents:
83
diff
changeset
|
558 #print "image: ", imageDir, " archivepath: ", archivePath |
a6e4f9b6729a
first version with new full-text infrastructure and slightly changed templates
casties
parents:
83
diff
changeset
|
559 imageDir = os.path.join(archivePath, imageDir) |
a6e4f9b6729a
first version with new full-text infrastructure and slightly changed templates
casties
parents:
83
diff
changeset
|
560 imageDir = imageDir.replace("/mpiwg/online", '') |
a6e4f9b6729a
first version with new full-text infrastructure and slightly changed templates
casties
parents:
83
diff
changeset
|
561 docinfo = self.getDirinfoFromDigilib(imageDir, docinfo=docinfo) |
a6e4f9b6729a
first version with new full-text infrastructure and slightly changed templates
casties
parents:
83
diff
changeset
|
562 docinfo['imagePath'] = imageDir |
a6e4f9b6729a
first version with new full-text infrastructure and slightly changed templates
casties
parents:
83
diff
changeset
|
563 |
a6e4f9b6729a
first version with new full-text infrastructure and slightly changed templates
casties
parents:
83
diff
changeset
|
564 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
|
565 |
a6e4f9b6729a
first version with new full-text infrastructure and slightly changed templates
casties
parents:
83
diff
changeset
|
566 viewerUrls = dom.xpath("//texttool/digiliburlprefix") |
a6e4f9b6729a
first version with new full-text infrastructure and slightly changed templates
casties
parents:
83
diff
changeset
|
567 if viewerUrls and (len(viewerUrls) > 0): |
a6e4f9b6729a
first version with new full-text infrastructure and slightly changed templates
casties
parents:
83
diff
changeset
|
568 viewerUrl = getTextFromNode(viewerUrls[0]) |
a6e4f9b6729a
first version with new full-text infrastructure and slightly changed templates
casties
parents:
83
diff
changeset
|
569 docinfo['viewerURL'] = viewerUrl |
130
5c779d7b5f71
more modular version with separate object MpdlXmlTextServer
casties
parents:
128
diff
changeset
|
570 |
5c779d7b5f71
more modular version with separate object MpdlXmlTextServer
casties
parents:
128
diff
changeset
|
571 # old style text URL |
84
a6e4f9b6729a
first version with new full-text infrastructure and slightly changed templates
casties
parents:
83
diff
changeset
|
572 textUrls = dom.xpath("//texttool/text") |
a6e4f9b6729a
first version with new full-text infrastructure and slightly changed templates
casties
parents:
83
diff
changeset
|
573 if textUrls and (len(textUrls) > 0): |
a6e4f9b6729a
first version with new full-text infrastructure and slightly changed templates
casties
parents:
83
diff
changeset
|
574 textUrl = getTextFromNode(textUrls[0]) |
a6e4f9b6729a
first version with new full-text infrastructure and slightly changed templates
casties
parents:
83
diff
changeset
|
575 if urlparse.urlparse(textUrl)[0] == "": #keine url |
a6e4f9b6729a
first version with new full-text infrastructure and slightly changed templates
casties
parents:
83
diff
changeset
|
576 textUrl = os.path.join(archivePath, textUrl) |
a6e4f9b6729a
first version with new full-text infrastructure and slightly changed templates
casties
parents:
83
diff
changeset
|
577 # fix URLs starting with /mpiwg/online |
a6e4f9b6729a
first version with new full-text infrastructure and slightly changed templates
casties
parents:
83
diff
changeset
|
578 if textUrl.startswith("/mpiwg/online"): |
a6e4f9b6729a
first version with new full-text infrastructure and slightly changed templates
casties
parents:
83
diff
changeset
|
579 textUrl = textUrl.replace("/mpiwg/online", '', 1) |
a6e4f9b6729a
first version with new full-text infrastructure and slightly changed templates
casties
parents:
83
diff
changeset
|
580 |
a6e4f9b6729a
first version with new full-text infrastructure and slightly changed templates
casties
parents:
83
diff
changeset
|
581 docinfo['textURL'] = textUrl |
a6e4f9b6729a
first version with new full-text infrastructure and slightly changed templates
casties
parents:
83
diff
changeset
|
582 |
130
5c779d7b5f71
more modular version with separate object MpdlXmlTextServer
casties
parents:
128
diff
changeset
|
583 # new style text-url-path |
84
a6e4f9b6729a
first version with new full-text infrastructure and slightly changed templates
casties
parents:
83
diff
changeset
|
584 textUrls = dom.xpath("//texttool/text-url-path") |
a6e4f9b6729a
first version with new full-text infrastructure and slightly changed templates
casties
parents:
83
diff
changeset
|
585 if textUrls and (len(textUrls) > 0): |
a6e4f9b6729a
first version with new full-text infrastructure and slightly changed templates
casties
parents:
83
diff
changeset
|
586 textUrl = getTextFromNode(textUrls[0]) |
102 | 587 docinfo['textURLPath'] = textUrl |
588 if not docinfo['imagePath']: | |
589 # text-only, no page images | |
133 | 590 docinfo = self.getNumPages(docinfo) |
84
a6e4f9b6729a
first version with new full-text infrastructure and slightly changed templates
casties
parents:
83
diff
changeset
|
591 |
a6e4f9b6729a
first version with new full-text infrastructure and slightly changed templates
casties
parents:
83
diff
changeset
|
592 presentationUrls = dom.xpath("//texttool/presentation") |
a6e4f9b6729a
first version with new full-text infrastructure and slightly changed templates
casties
parents:
83
diff
changeset
|
593 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
|
594 |
a6e4f9b6729a
first version with new full-text infrastructure and slightly changed templates
casties
parents:
83
diff
changeset
|
595 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
|
596 # 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
|
597 # 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
|
598 presentationPath = getTextFromNode(presentationUrls[0]) |
a6e4f9b6729a
first version with new full-text infrastructure and slightly changed templates
casties
parents:
83
diff
changeset
|
599 if url.endswith("index.meta"): |
a6e4f9b6729a
first version with new full-text infrastructure and slightly changed templates
casties
parents:
83
diff
changeset
|
600 presentationUrl = url.replace('index.meta', presentationPath) |
a6e4f9b6729a
first version with new full-text infrastructure and slightly changed templates
casties
parents:
83
diff
changeset
|
601 else: |
a6e4f9b6729a
first version with new full-text infrastructure and slightly changed templates
casties
parents:
83
diff
changeset
|
602 presentationUrl = url + "/" + presentationPath |
102 | 603 |
84
a6e4f9b6729a
first version with new full-text infrastructure and slightly changed templates
casties
parents:
83
diff
changeset
|
604 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
|
605 |
a6e4f9b6729a
first version with new full-text infrastructure and slightly changed templates
casties
parents:
83
diff
changeset
|
606 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
|
607 |
a6e4f9b6729a
first version with new full-text infrastructure and slightly changed templates
casties
parents:
83
diff
changeset
|
608 return docinfo |
22 | 609 |
50
6c0f20cecc60
added evaluation of the presentation/info.xml in texttools
dwinter
parents:
49
diff
changeset
|
610 |
6c0f20cecc60
added evaluation of the presentation/info.xml in texttools
dwinter
parents:
49
diff
changeset
|
611 def getBibinfoFromTextToolPresentation(self,url,docinfo=None,dom=None): |
6c0f20cecc60
added evaluation of the presentation/info.xml in texttools
dwinter
parents:
49
diff
changeset
|
612 """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
|
613 """ |
6c0f20cecc60
added evaluation of the presentation/info.xml in texttools
dwinter
parents:
49
diff
changeset
|
614 dom=self.getPresentationInfoXML(url) |
62 | 615 try: |
616 docinfo['author']=getTextFromNode(dom.xpath("//author")[0]) | |
617 except: | |
618 pass | |
619 try: | |
620 docinfo['title']=getTextFromNode(dom.xpath("//title")[0]) | |
621 except: | |
622 pass | |
623 try: | |
624 docinfo['year']=getTextFromNode(dom.xpath("//date")[0]) | |
625 except: | |
626 pass | |
50
6c0f20cecc60
added evaluation of the presentation/info.xml in texttools
dwinter
parents:
49
diff
changeset
|
627 return docinfo |
6c0f20cecc60
added evaluation of the presentation/info.xml in texttools
dwinter
parents:
49
diff
changeset
|
628 |
70 | 629 def getDocinfoFromImagePath(self,path,docinfo=None,cut=0): |
22 | 630 """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
|
631 logging.debug("documentViewer (getdocinfofromimagepath) path: %s"%(path)) |
22 | 632 if docinfo is None: |
633 docinfo = {} | |
29 | 634 path=path.replace("/mpiwg/online","") |
22 | 635 docinfo['imagePath'] = path |
73 | 636 docinfo=self.getDirinfoFromDigilib(path,docinfo=docinfo,cut=cut) |
78 | 637 |
79
df6952ac93e9
bug in getDocInforFromImagePath, relative lage der index.meta zu path war falsch.
dwinter
parents:
78
diff
changeset
|
638 pathorig=path |
78 | 639 for x in range(cut): |
640 path=getParentDir(path) | |
130
5c779d7b5f71
more modular version with separate object MpdlXmlTextServer
casties
parents:
128
diff
changeset
|
641 logging.debug("documentViewer (getdocinfofromimagepath) PATH:"+path) |
31 | 642 imageUrl=self.digilibBaseUrl+"/servlet/Scaler?fn="+path |
22 | 643 docinfo['imageURL'] = imageUrl |
644 | |
79
df6952ac93e9
bug in getDocInforFromImagePath, relative lage der index.meta zu path war falsch.
dwinter
parents:
78
diff
changeset
|
645 #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
|
646 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
|
647 docinfo = self.getAuthinfoFromIndexMeta(pathorig,docinfo=docinfo,cut=cut+1) |
22 | 648 return docinfo |
20 | 649 |
22 | 650 |
651 def getDocinfo(self, mode, url): | |
652 """returns docinfo depending on mode""" | |
130
5c779d7b5f71
more modular version with separate object MpdlXmlTextServer
casties
parents:
128
diff
changeset
|
653 logging.debug("documentViewer (getdocinfo) mode: %s, url: %s"%(mode,url)) |
22 | 654 # look for cached docinfo in session |
51
c5d3aabbf61b
textviewer now integrated, new modus auto introduced as standard for viewing
dwinter
parents:
50
diff
changeset
|
655 if self.REQUEST.SESSION.has_key('docinfo'): |
22 | 656 docinfo = self.REQUEST.SESSION['docinfo'] |
657 # check if its still current | |
658 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
|
659 logging.debug("documentViewer (getdocinfo) docinfo in session: %s"%docinfo) |
22 | 660 return docinfo |
661 # new docinfo | |
662 docinfo = {'mode': mode, 'url': url} | |
663 if mode=="texttool": #index.meta with texttool information | |
664 docinfo = self.getDocinfoFromTextTool(url, docinfo=docinfo) | |
665 elif mode=="imagepath": | |
666 docinfo = self.getDocinfoFromImagePath(url, docinfo=docinfo) | |
70 | 667 elif mode=="filepath": |
75
9673218e155b
minorCVS: ----------------------------------------------------------------------
dwinter
parents:
74
diff
changeset
|
668 docinfo = self.getDocinfoFromImagePath(url, docinfo=docinfo,cut=1) |
22 | 669 else: |
130
5c779d7b5f71
more modular version with separate object MpdlXmlTextServer
casties
parents:
128
diff
changeset
|
670 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
|
671 raise ValueError("Unknown mode %s! Has to be one of 'texttool','imagepath','filepath'."%(mode)) |
37 | 672 |
130
5c779d7b5f71
more modular version with separate object MpdlXmlTextServer
casties
parents:
128
diff
changeset
|
673 logging.debug("documentViewer (getdocinfo) docinfo: %s"%docinfo) |
22 | 674 self.REQUEST.SESSION['docinfo'] = docinfo |
675 return docinfo | |
128 | 676 |
90
6a4a72033d58
new version with new full-text infrastructure and some more changed templates
casties
parents:
84
diff
changeset
|
677 def getPageinfo(self, current, start=None, rows=None, cols=None, docinfo=None, viewMode=None, tocMode=None): |
22 | 678 """returns pageinfo with the given parameters""" |
679 pageinfo = {} | |
25 | 680 current = getInt(current) |
681 pageinfo['current'] = current | |
682 rows = int(rows or self.thumbrows) | |
683 pageinfo['rows'] = rows | |
684 cols = int(cols or self.thumbcols) | |
685 pageinfo['cols'] = cols | |
686 grpsize = cols * rows | |
687 pageinfo['groupsize'] = grpsize | |
61 | 688 start = getInt(start, default=(math.ceil(float(current)/float(grpsize))*grpsize-(grpsize-1))) |
689 # int(current / grpsize) * grpsize +1)) | |
22 | 690 pageinfo['start'] = start |
25 | 691 pageinfo['end'] = start + grpsize |
90
6a4a72033d58
new version with new full-text infrastructure and some more changed templates
casties
parents:
84
diff
changeset
|
692 if (docinfo is not None) and ('numPages' in docinfo): |
25 | 693 np = int(docinfo['numPages']) |
694 pageinfo['end'] = min(pageinfo['end'], np) | |
695 pageinfo['numgroups'] = int(np / grpsize) | |
696 if np % grpsize > 0: | |
128 | 697 pageinfo['numgroups'] += 1 |
90
6a4a72033d58
new version with new full-text infrastructure and some more changed templates
casties
parents:
84
diff
changeset
|
698 pageinfo['viewMode'] = viewMode |
6a4a72033d58
new version with new full-text infrastructure and some more changed templates
casties
parents:
84
diff
changeset
|
699 pageinfo['tocMode'] = tocMode |
95 | 700 pageinfo['query'] = self.REQUEST.get('query',' ') |
701 pageinfo['queryType'] = self.REQUEST.get('queryType',' ') | |
702 pageinfo['querySearch'] =self.REQUEST.get('querySearch', 'fulltext') | |
99 | 703 pageinfo['textPN'] = self.REQUEST.get('textPN','1') |
106 | 704 pageinfo['highlightQuery'] = self.REQUEST.get('highlightQuery','') |
95 | 705 pageinfo['tocPageSize'] = self.REQUEST.get('tocPageSize', '30') |
105 | 706 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
|
707 pageinfo['tocPN'] = self.REQUEST.get('tocPN', '1') |
99 | 708 toc = int (pageinfo['tocPN']) |
709 pageinfo['textPages'] =int (toc) | |
710 | |
711 if 'tocSize_%s'%tocMode in docinfo: | |
712 tocSize = int(docinfo['tocSize_%s'%tocMode]) | |
713 tocPageSize = int(pageinfo['tocPageSize']) | |
128 | 714 # cached toc |
99 | 715 if tocSize%tocPageSize>0: |
716 tocPages=tocSize/tocPageSize+1 | |
717 else: | |
718 tocPages=tocSize/tocPageSize | |
128 | 719 pageinfo['tocPN'] = min (tocPages,toc) |
95 | 720 pageinfo['searchPN'] =self.REQUEST.get('searchPN','1') |
112 | 721 pageinfo['sn'] =self.REQUEST.get('sn','') |
22 | 722 return pageinfo |
723 | |
128 | 724 def changeDocumentViewer(self,title="",digilibBaseUrl=None,thumbrows=2,thumbcols=5,authgroups='mpiwg',RESPONSE=None): |
22 | 725 """init document viewer""" |
726 self.title=title | |
727 self.digilibBaseUrl = digilibBaseUrl | |
25 | 728 self.thumbrows = thumbrows |
729 self.thumbcols = thumbcols | |
32 | 730 self.authgroups = [s.strip().lower() for s in authgroups.split(',')] |
22 | 731 if RESPONSE is not None: |
732 RESPONSE.redirect('manage_main') | |
0 | 733 |
734 def manage_AddDocumentViewerForm(self): | |
735 """add the viewer form""" | |
22 | 736 pt=PageTemplateFile('zpt/addDocumentViewer', globals()).__of__(self) |
0 | 737 return pt() |
738 | |
84
a6e4f9b6729a
first version with new full-text infrastructure and slightly changed templates
casties
parents:
83
diff
changeset
|
739 def manage_AddDocumentViewer(self,id,imageScalerUrl="",textServerName="",title="",RESPONSE=None): |
0 | 740 """add the viewer""" |
84
a6e4f9b6729a
first version with new full-text infrastructure and slightly changed templates
casties
parents:
83
diff
changeset
|
741 newObj=documentViewer(id,imageScalerUrl=imageScalerUrl,title=title,textServerName=textServerName) |
0 | 742 self._setObject(id,newObj) |
743 | |
744 if RESPONSE is not None: | |
745 RESPONSE.redirect('manage_main') | |
22 | 746 |
747 ## DocumentViewerTemplate class | |
748 class DocumentViewerTemplate(ZopePageTemplate): | |
749 """Template for document viewer""" | |
750 meta_type="DocumentViewer Template" | |
751 | |
752 | |
753 def manage_addDocumentViewerTemplateForm(self): | |
754 """Form for adding""" | |
755 pt=PageTemplateFile('zpt/addDocumentViewerTemplate', globals()).__of__(self) | |
756 return pt() | |
757 | |
758 def manage_addDocumentViewerTemplate(self, id='viewer_main', title=None, text=None, | |
759 REQUEST=None, submit=None): | |
760 "Add a Page Template with optional file content." | |
761 | |
762 self._setObject(id, DocumentViewerTemplate(id)) | |
763 ob = getattr(self, id) | |
53
f4e0af8c281d
NEW - # 44: ECHO - vollst?ndige bibliographische Angabe
dwinter
parents:
52
diff
changeset
|
764 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
|
765 logging.info("txt %s:"%txt) |
f4e0af8c281d
NEW - # 44: ECHO - vollst?ndige bibliographische Angabe
dwinter
parents:
52
diff
changeset
|
766 ob.pt_edit(txt,"text/html") |
22 | 767 if title: |
768 ob.pt_setTitle(title) | |
769 try: | |
770 u = self.DestinationURL() | |
771 except AttributeError: | |
772 u = REQUEST['URL1'] | |
773 | |
774 u = "%s/%s" % (u, urllib.quote(id)) | |
775 REQUEST.RESPONSE.redirect(u+'/manage_main') | |
776 return '' | |
777 | |
778 | |
41 | 779 |