annotate documentViewer.py @ 459:aabfa6124cfb elementtree

nicer comments
author casties
date Wed, 20 Jul 2011 10:22:36 +0200
parents 48b135b089c8
children 76bc2317146f
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
rev   line source
0
dwinter
parents:
diff changeset
1 from OFS.Folder import Folder
dwinter
parents:
diff changeset
2 from Products.PageTemplates.ZopePageTemplate import ZopePageTemplate
52
92047eaa6272 zLOG exchanged by logging
dwinter
parents: 51
diff changeset
3 from Products.PageTemplates.PageTemplateFile import PageTemplateFile
0
dwinter
parents:
diff changeset
4 from AccessControl import ClassSecurityInfo
32
b25c89d693cf version 0.2.3 - first version with access control!
casties
parents: 31
diff changeset
5 from AccessControl import getSecurityManager
0
dwinter
parents:
diff changeset
6 from Globals import package_home
dwinter
parents:
diff changeset
7
453
beb7ccb92564 first version using elementtree instead of 4suite xml
casties
parents: 405
diff changeset
8 #from Ft.Xml import EMPTY_NAMESPACE, Parse
beb7ccb92564 first version using elementtree instead of 4suite xml
casties
parents: 405
diff changeset
9 #import Ft.Xml.Domlette
beb7ccb92564 first version using elementtree instead of 4suite xml
casties
parents: 405
diff changeset
10
beb7ccb92564 first version using elementtree instead of 4suite xml
casties
parents: 405
diff changeset
11 import xml.etree.ElementTree as ET
beb7ccb92564 first version using elementtree instead of 4suite xml
casties
parents: 405
diff changeset
12
0
dwinter
parents:
diff changeset
13 import os.path
31
c6451e8d5d23 more small fixes - now version 0.2.2
casties
parents: 29
diff changeset
14 import sys
0
dwinter
parents:
diff changeset
15 import urllib
50
6c0f20cecc60 added evaluation of the presentation/info.xml in texttools
dwinter
parents: 49
diff changeset
16 import logging
61
f3d2f240692c fixed bug in calculation of group numbers
casties
parents: 59
diff changeset
17 import math
46
31059e3d9338 has now also a text mode viewMode=text
dwinter
parents: 45
diff changeset
18 import urlparse
174
5780092e4989 *** empty log message ***
dwinter
parents: 173
diff changeset
19 import re
389
114d40b358ab *** empty log message ***
abukhman
parents: 387
diff changeset
20 import string
231
a88ece9a5e74 *** empty log message ***
abukhman
parents: 230
diff changeset
21
458
48b135b089c8 more renovation
casties
parents: 457
diff changeset
22 from SrvTxtUtils import getInt, getText, getHttpData
48b135b089c8 more renovation
casties
parents: 457
diff changeset
23
52
92047eaa6272 zLOG exchanged by logging
dwinter
parents: 51
diff changeset
24 def logger(txt,method,txt2):
92047eaa6272 zLOG exchanged by logging
dwinter
parents: 51
diff changeset
25 """logging"""
92047eaa6272 zLOG exchanged by logging
dwinter
parents: 51
diff changeset
26 logging.info(txt+ txt2)
92047eaa6272 zLOG exchanged by logging
dwinter
parents: 51
diff changeset
27
92047eaa6272 zLOG exchanged by logging
dwinter
parents: 51
diff changeset
28
453
beb7ccb92564 first version using elementtree instead of 4suite xml
casties
parents: 405
diff changeset
29 def serializeNode(node, encoding="utf-8"):
84
a6e4f9b6729a first version with new full-text infrastructure and slightly changed templates
casties
parents: 83
diff changeset
30 """returns a string containing node as XML"""
453
beb7ccb92564 first version using elementtree instead of 4suite xml
casties
parents: 405
diff changeset
31 s = ET.tostring(node)
beb7ccb92564 first version using elementtree instead of 4suite xml
casties
parents: 405
diff changeset
32
beb7ccb92564 first version using elementtree instead of 4suite xml
casties
parents: 405
diff changeset
33 # 4Suite:
beb7ccb92564 first version using elementtree instead of 4suite xml
casties
parents: 405
diff changeset
34 # stream = cStringIO.StringIO()
beb7ccb92564 first version using elementtree instead of 4suite xml
casties
parents: 405
diff changeset
35 # Ft.Xml.Domlette.Print(node, stream=stream, encoding=encoding)
beb7ccb92564 first version using elementtree instead of 4suite xml
casties
parents: 405
diff changeset
36 # s = stream.getvalue()
beb7ccb92564 first version using elementtree instead of 4suite xml
casties
parents: 405
diff changeset
37 # stream.close()
84
a6e4f9b6729a first version with new full-text infrastructure and slightly changed templates
casties
parents: 83
diff changeset
38 return s
a6e4f9b6729a first version with new full-text infrastructure and slightly changed templates
casties
parents: 83
diff changeset
39
387
580db757e0eb *** empty log message ***
abukhman
parents: 386
diff changeset
40 def browserCheck(self):
580db757e0eb *** empty log message ***
abukhman
parents: 386
diff changeset
41 """check the browsers request to find out the browser type"""
580db757e0eb *** empty log message ***
abukhman
parents: 386
diff changeset
42 bt = {}
580db757e0eb *** empty log message ***
abukhman
parents: 386
diff changeset
43 ua = self.REQUEST.get_header("HTTP_USER_AGENT")
580db757e0eb *** empty log message ***
abukhman
parents: 386
diff changeset
44 bt['ua'] = ua
580db757e0eb *** empty log message ***
abukhman
parents: 386
diff changeset
45 bt['isIE'] = False
580db757e0eb *** empty log message ***
abukhman
parents: 386
diff changeset
46 bt['isN4'] = False
453
beb7ccb92564 first version using elementtree instead of 4suite xml
casties
parents: 405
diff changeset
47 bt['versFirefox']=""
beb7ccb92564 first version using elementtree instead of 4suite xml
casties
parents: 405
diff changeset
48 bt['versIE']=""
beb7ccb92564 first version using elementtree instead of 4suite xml
casties
parents: 405
diff changeset
49 bt['versSafariChrome']=""
beb7ccb92564 first version using elementtree instead of 4suite xml
casties
parents: 405
diff changeset
50 bt['versOpera']=""
beb7ccb92564 first version using elementtree instead of 4suite xml
casties
parents: 405
diff changeset
51
387
580db757e0eb *** empty log message ***
abukhman
parents: 386
diff changeset
52 if string.find(ua, 'MSIE') > -1:
580db757e0eb *** empty log message ***
abukhman
parents: 386
diff changeset
53 bt['isIE'] = True
580db757e0eb *** empty log message ***
abukhman
parents: 386
diff changeset
54 else:
580db757e0eb *** empty log message ***
abukhman
parents: 386
diff changeset
55 bt['isN4'] = (string.find(ua, 'Mozilla/4.') > -1)
453
beb7ccb92564 first version using elementtree instead of 4suite xml
casties
parents: 405
diff changeset
56 # Safari oder Chrome identification
beb7ccb92564 first version using elementtree instead of 4suite xml
casties
parents: 405
diff changeset
57 try:
beb7ccb92564 first version using elementtree instead of 4suite xml
casties
parents: 405
diff changeset
58 nav = ua[string.find(ua, '('):]
beb7ccb92564 first version using elementtree instead of 4suite xml
casties
parents: 405
diff changeset
59 nav1=ua[string.find(ua,')'):]
beb7ccb92564 first version using elementtree instead of 4suite xml
casties
parents: 405
diff changeset
60 nav2=nav1[string.find(nav1,'('):]
beb7ccb92564 first version using elementtree instead of 4suite xml
casties
parents: 405
diff changeset
61 nav3=nav2[string.find(nav2,')'):]
beb7ccb92564 first version using elementtree instead of 4suite xml
casties
parents: 405
diff changeset
62 ie = string.split(nav, "; ")[1]
beb7ccb92564 first version using elementtree instead of 4suite xml
casties
parents: 405
diff changeset
63 ie1 =string.split(nav1, " ")[2]
beb7ccb92564 first version using elementtree instead of 4suite xml
casties
parents: 405
diff changeset
64 ie2 =string.split(nav3, " ")[1]
beb7ccb92564 first version using elementtree instead of 4suite xml
casties
parents: 405
diff changeset
65 ie3 =string.split(nav3, " ")[2]
beb7ccb92564 first version using elementtree instead of 4suite xml
casties
parents: 405
diff changeset
66 if string.find(ie3, "Safari") >-1:
beb7ccb92564 first version using elementtree instead of 4suite xml
casties
parents: 405
diff changeset
67 bt['versSafariChrome']=string.split(ie2, "/")[1]
beb7ccb92564 first version using elementtree instead of 4suite xml
casties
parents: 405
diff changeset
68 except: pass
beb7ccb92564 first version using elementtree instead of 4suite xml
casties
parents: 405
diff changeset
69 # IE identification
387
580db757e0eb *** empty log message ***
abukhman
parents: 386
diff changeset
70 try:
580db757e0eb *** empty log message ***
abukhman
parents: 386
diff changeset
71 nav = ua[string.find(ua, '('):]
580db757e0eb *** empty log message ***
abukhman
parents: 386
diff changeset
72 ie = string.split(nav, "; ")[1]
580db757e0eb *** empty log message ***
abukhman
parents: 386
diff changeset
73 if string.find(ie, "MSIE") > -1:
580db757e0eb *** empty log message ***
abukhman
parents: 386
diff changeset
74 bt['versIE'] = string.split(ie, " ")[1]
453
beb7ccb92564 first version using elementtree instead of 4suite xml
casties
parents: 405
diff changeset
75 except:pass
beb7ccb92564 first version using elementtree instead of 4suite xml
casties
parents: 405
diff changeset
76 # Firefox identification
beb7ccb92564 first version using elementtree instead of 4suite xml
casties
parents: 405
diff changeset
77 try:
beb7ccb92564 first version using elementtree instead of 4suite xml
casties
parents: 405
diff changeset
78 nav = ua[string.find(ua, '('):]
beb7ccb92564 first version using elementtree instead of 4suite xml
casties
parents: 405
diff changeset
79 nav1=ua[string.find(ua,')'):]
beb7ccb92564 first version using elementtree instead of 4suite xml
casties
parents: 405
diff changeset
80 if string.find(ie1, "Firefox") >-1:
beb7ccb92564 first version using elementtree instead of 4suite xml
casties
parents: 405
diff changeset
81 nav5= string.split(ie1, "/")[1]
beb7ccb92564 first version using elementtree instead of 4suite xml
casties
parents: 405
diff changeset
82 logging.debug("FIREFOX: %s"%(nav5))
beb7ccb92564 first version using elementtree instead of 4suite xml
casties
parents: 405
diff changeset
83 bt['versFirefox']=nav5[0:3]
beb7ccb92564 first version using elementtree instead of 4suite xml
casties
parents: 405
diff changeset
84 except:pass
beb7ccb92564 first version using elementtree instead of 4suite xml
casties
parents: 405
diff changeset
85 #Opera identification
beb7ccb92564 first version using elementtree instead of 4suite xml
casties
parents: 405
diff changeset
86 try:
beb7ccb92564 first version using elementtree instead of 4suite xml
casties
parents: 405
diff changeset
87 if string.find(ua,"Opera") >-1:
beb7ccb92564 first version using elementtree instead of 4suite xml
casties
parents: 405
diff changeset
88 nav = ua[string.find(ua, '('):]
beb7ccb92564 first version using elementtree instead of 4suite xml
casties
parents: 405
diff changeset
89 nav1=nav[string.find(nav,')'):]
beb7ccb92564 first version using elementtree instead of 4suite xml
casties
parents: 405
diff changeset
90 bt['versOpera']=string.split(nav1,"/")[2]
beb7ccb92564 first version using elementtree instead of 4suite xml
casties
parents: 405
diff changeset
91 except:pass
387
580db757e0eb *** empty log message ***
abukhman
parents: 386
diff changeset
92
580db757e0eb *** empty log message ***
abukhman
parents: 386
diff changeset
93 bt['isMac'] = string.find(ua, 'Macintosh') > -1
580db757e0eb *** empty log message ***
abukhman
parents: 386
diff changeset
94 bt['isWin'] = string.find(ua, 'Windows') > -1
580db757e0eb *** empty log message ***
abukhman
parents: 386
diff changeset
95 bt['isIEWin'] = bt['isIE'] and bt['isWin']
580db757e0eb *** empty log message ***
abukhman
parents: 386
diff changeset
96 bt['isIEMac'] = bt['isIE'] and bt['isMac']
580db757e0eb *** empty log message ***
abukhman
parents: 386
diff changeset
97 bt['staticHTML'] = False
580db757e0eb *** empty log message ***
abukhman
parents: 386
diff changeset
98
580db757e0eb *** empty log message ***
abukhman
parents: 386
diff changeset
99 return bt
234
0813585df9f4 *** empty log message ***
abukhman
parents: 231
diff changeset
100
35
2d9261aea8f3 version 0.2.4
casties
parents: 32
diff changeset
101 def getParentDir(path):
2d9261aea8f3 version 0.2.4
casties
parents: 32
diff changeset
102 """returns pathname shortened by one"""
2d9261aea8f3 version 0.2.4
casties
parents: 32
diff changeset
103 return '/'.join(path.split('/')[0:-1])
2d9261aea8f3 version 0.2.4
casties
parents: 32
diff changeset
104
458
48b135b089c8 more renovation
casties
parents: 457
diff changeset
105 def getBibdataFromDom(dom):
48b135b089c8 more renovation
casties
parents: 457
diff changeset
106 """returns dict with all elements from bib-tag"""
48b135b089c8 more renovation
casties
parents: 457
diff changeset
107 bibinfo = {}
48b135b089c8 more renovation
casties
parents: 457
diff changeset
108 bib = dom.find(".//meta/bib")
48b135b089c8 more renovation
casties
parents: 457
diff changeset
109 if bib is not None:
48b135b089c8 more renovation
casties
parents: 457
diff changeset
110 # put type in @type
48b135b089c8 more renovation
casties
parents: 457
diff changeset
111 type = bib.get('type')
48b135b089c8 more renovation
casties
parents: 457
diff changeset
112 bibinfo['@type'] = type
48b135b089c8 more renovation
casties
parents: 457
diff changeset
113 # put all subelements in dict
48b135b089c8 more renovation
casties
parents: 457
diff changeset
114 for e in bib:
48b135b089c8 more renovation
casties
parents: 457
diff changeset
115 bibinfo[e.tag] = getText(e)
48b135b089c8 more renovation
casties
parents: 457
diff changeset
116
48b135b089c8 more renovation
casties
parents: 457
diff changeset
117 return bibinfo
130
5c779d7b5f71 more modular version with separate object MpdlXmlTextServer
casties
parents: 128
diff changeset
118
22
b139f9937e97 preliminary version 0.2
casties
parents: 20
diff changeset
119 ##
b139f9937e97 preliminary version 0.2
casties
parents: 20
diff changeset
120 ## documentViewer class
b139f9937e97 preliminary version 0.2
casties
parents: 20
diff changeset
121 ##
b139f9937e97 preliminary version 0.2
casties
parents: 20
diff changeset
122 class documentViewer(Folder):
0
dwinter
parents:
diff changeset
123 """document viewer"""
dwinter
parents:
diff changeset
124 meta_type="Document viewer"
dwinter
parents:
diff changeset
125
dwinter
parents:
diff changeset
126 security=ClassSecurityInfo()
22
b139f9937e97 preliminary version 0.2
casties
parents: 20
diff changeset
127 manage_options=Folder.manage_options+(
0
dwinter
parents:
diff changeset
128 {'label':'main config','action':'changeDocumentViewerForm'},
dwinter
parents:
diff changeset
129 )
dwinter
parents:
diff changeset
130
22
b139f9937e97 preliminary version 0.2
casties
parents: 20
diff changeset
131 # templates and forms
b139f9937e97 preliminary version 0.2
casties
parents: 20
diff changeset
132 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
133 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
134 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
135 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
136 page_main_images = PageTemplateFile('zpt/page_main_images', globals())
453
beb7ccb92564 first version using elementtree instead of 4suite xml
casties
parents: 405
diff changeset
137 page_main_double = PageTemplateFile('zpt/page_main_double', globals())
84
a6e4f9b6729a first version with new full-text infrastructure and slightly changed templates
casties
parents: 83
diff changeset
138 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
139 page_main_text_dict = PageTemplateFile('zpt/page_main_text_dict', globals())
140
6345583d809a Gis mode
abukhman
parents: 137
diff changeset
140 page_main_gis =PageTemplateFile ('zpt/page_main_gis', globals())
99
4738a696d265 Search function update
abukhman
parents: 97
diff changeset
141 page_main_xml = PageTemplateFile('zpt/page_main_xml', globals())
404
29a87dc92750 *** empty log message ***
abukhman
parents: 398
diff changeset
142 page_main_pureXml = PageTemplateFile('zpt/page_main_pureXml', globals())
22
b139f9937e97 preliminary version 0.2
casties
parents: 20
diff changeset
143 head_main = PageTemplateFile('zpt/head_main', globals())
b139f9937e97 preliminary version 0.2
casties
parents: 20
diff changeset
144 docuviewer_css = PageTemplateFile('css/docuviewer.css', globals())
57
7cdb0fc34a92 added getInfo_xml method
casties
parents: 55
diff changeset
145 info_xml = PageTemplateFile('zpt/info_xml', globals())
130
5c779d7b5f71 more modular version with separate object MpdlXmlTextServer
casties
parents: 128
diff changeset
146
5c779d7b5f71 more modular version with separate object MpdlXmlTextServer
casties
parents: 128
diff changeset
147
68
b8457fc33446 piclens rss/support
dwinter
parents: 65
diff changeset
148 thumbs_main_rss = PageTemplateFile('zpt/thumbs_main_rss', globals())
22
b139f9937e97 preliminary version 0.2
casties
parents: 20
diff changeset
149 security.declareProtected('View management screens','changeDocumentViewerForm')
b139f9937e97 preliminary version 0.2
casties
parents: 20
diff changeset
150 changeDocumentViewerForm = PageTemplateFile('zpt/changeDocumentViewer', globals())
b139f9937e97 preliminary version 0.2
casties
parents: 20
diff changeset
151
0
dwinter
parents:
diff changeset
152
95
db6d594aa4d9 Last update with search function (getSearch)
abukhman
parents: 90
diff changeset
153 def __init__(self,id,imageScalerUrl=None,textServerName=None,title="",digilibBaseUrl=None,thumbcols=2,thumbrows=5,authgroups="mpiwg"):
0
dwinter
parents:
diff changeset
154 """init document viewer"""
dwinter
parents:
diff changeset
155 self.id=id
dwinter
parents:
diff changeset
156 self.title=title
25
e93fb8cadd3a new, less preliminary version 0.2
casties
parents: 22
diff changeset
157 self.thumbcols = thumbcols
e93fb8cadd3a new, less preliminary version 0.2
casties
parents: 22
diff changeset
158 self.thumbrows = thumbrows
32
b25c89d693cf version 0.2.3 - first version with access control!
casties
parents: 31
diff changeset
159 # authgroups is list of authorized groups (delimited by ,)
b25c89d693cf version 0.2.3 - first version with access control!
casties
parents: 31
diff changeset
160 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
161 # 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
162
a6e4f9b6729a first version with new full-text infrastructure and slightly changed templates
casties
parents: 83
diff changeset
163 templateFolder = Folder('template')
a6e4f9b6729a first version with new full-text infrastructure and slightly changed templates
casties
parents: 83
diff changeset
164 #self['template'] = templateFolder # Zope-2.12 style
a6e4f9b6729a first version with new full-text infrastructure and slightly changed templates
casties
parents: 83
diff changeset
165 self._setObject('template',templateFolder) # old style
a6e4f9b6729a first version with new full-text infrastructure and slightly changed templates
casties
parents: 83
diff changeset
166 try:
130
5c779d7b5f71 more modular version with separate object MpdlXmlTextServer
casties
parents: 128
diff changeset
167 import MpdlXmlTextServer
132
39167e96e582 fixed creation of text server on __init__
casties
parents: 130
diff changeset
168 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
169 #templateFolder['fulltextclient'] = xmlRpcClient
130
5c779d7b5f71 more modular version with separate object MpdlXmlTextServer
casties
parents: 128
diff changeset
170 templateFolder._setObject('fulltextclient',textServer)
84
a6e4f9b6729a first version with new full-text infrastructure and slightly changed templates
casties
parents: 83
diff changeset
171 except Exception, e:
130
5c779d7b5f71 more modular version with separate object MpdlXmlTextServer
casties
parents: 128
diff changeset
172 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
173 try:
a6e4f9b6729a first version with new full-text infrastructure and slightly changed templates
casties
parents: 83
diff changeset
174 from Products.zogiLib.zogiLib import zogiLib
a6e4f9b6729a first version with new full-text infrastructure and slightly changed templates
casties
parents: 83
diff changeset
175 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
176 #templateFolder['zogilib'] = zogilib
a6e4f9b6729a first version with new full-text infrastructure and slightly changed templates
casties
parents: 83
diff changeset
177 templateFolder._setObject('zogilib',zogilib)
a6e4f9b6729a first version with new full-text infrastructure and slightly changed templates
casties
parents: 83
diff changeset
178 except Exception, e:
a6e4f9b6729a first version with new full-text infrastructure and slightly changed templates
casties
parents: 83
diff changeset
179 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
180
130
5c779d7b5f71 more modular version with separate object MpdlXmlTextServer
casties
parents: 128
diff changeset
181
5c779d7b5f71 more modular version with separate object MpdlXmlTextServer
casties
parents: 128
diff changeset
182 # proxy text server methods to fulltextclient
5c779d7b5f71 more modular version with separate object MpdlXmlTextServer
casties
parents: 128
diff changeset
183 def getTextPage(self, **args):
5c779d7b5f71 more modular version with separate object MpdlXmlTextServer
casties
parents: 128
diff changeset
184 """get page"""
5c779d7b5f71 more modular version with separate object MpdlXmlTextServer
casties
parents: 128
diff changeset
185 return self.template.fulltextclient.getTextPage(**args)
22
b139f9937e97 preliminary version 0.2
casties
parents: 20
diff changeset
186
453
beb7ccb92564 first version using elementtree instead of 4suite xml
casties
parents: 405
diff changeset
187 def getOrigPages(self, **args):
beb7ccb92564 first version using elementtree instead of 4suite xml
casties
parents: 405
diff changeset
188 """get page"""
beb7ccb92564 first version using elementtree instead of 4suite xml
casties
parents: 405
diff changeset
189 return self.template.fulltextclient.getOrigPages(**args)
396
28a03e25a0e8 *** empty log message ***
abukhman
parents: 394
diff changeset
190
453
beb7ccb92564 first version using elementtree instead of 4suite xml
casties
parents: 405
diff changeset
191 def getOrigPagesNorm(self, **args):
beb7ccb92564 first version using elementtree instead of 4suite xml
casties
parents: 405
diff changeset
192 """get page"""
beb7ccb92564 first version using elementtree instead of 4suite xml
casties
parents: 405
diff changeset
193 return self.template.fulltextclient.getOrigPagesNorm(**args)
130
5c779d7b5f71 more modular version with separate object MpdlXmlTextServer
casties
parents: 128
diff changeset
194
453
beb7ccb92564 first version using elementtree instead of 4suite xml
casties
parents: 405
diff changeset
195 def getQuery(self, **args):
beb7ccb92564 first version using elementtree instead of 4suite xml
casties
parents: 405
diff changeset
196 """get query in search"""
beb7ccb92564 first version using elementtree instead of 4suite xml
casties
parents: 405
diff changeset
197 return self.template.fulltextclient.getQuery(**args)
beb7ccb92564 first version using elementtree instead of 4suite xml
casties
parents: 405
diff changeset
198
130
5c779d7b5f71 more modular version with separate object MpdlXmlTextServer
casties
parents: 128
diff changeset
199 def getSearch(self, **args):
5c779d7b5f71 more modular version with separate object MpdlXmlTextServer
casties
parents: 128
diff changeset
200 """get search"""
5c779d7b5f71 more modular version with separate object MpdlXmlTextServer
casties
parents: 128
diff changeset
201 return self.template.fulltextclient.getSearch(**args)
256
ad1458aff8a6 *** empty log message ***
abukhman
parents: 235
diff changeset
202
ad1458aff8a6 *** empty log message ***
abukhman
parents: 235
diff changeset
203 def getGisPlaces(self, **args):
307
ec5e920a61e6 *** empty log message ***
abukhman
parents: 256
diff changeset
204 """get gis places"""
256
ad1458aff8a6 *** empty log message ***
abukhman
parents: 235
diff changeset
205 return self.template.fulltextclient.getGisPlaces(**args)
307
ec5e920a61e6 *** empty log message ***
abukhman
parents: 256
diff changeset
206
ec5e920a61e6 *** empty log message ***
abukhman
parents: 256
diff changeset
207 def getAllGisPlaces(self, **args):
310
80ae2324562b *** empty log message ***
abukhman
parents: 307
diff changeset
208 """get all gis places """
80ae2324562b *** empty log message ***
abukhman
parents: 307
diff changeset
209 return self.template.fulltextclient.getAllGisPlaces(**args)
453
beb7ccb92564 first version using elementtree instead of 4suite xml
casties
parents: 405
diff changeset
210
130
5c779d7b5f71 more modular version with separate object MpdlXmlTextServer
casties
parents: 128
diff changeset
211 def getTranslate(self, **args):
5c779d7b5f71 more modular version with separate object MpdlXmlTextServer
casties
parents: 128
diff changeset
212 """get translate"""
5c779d7b5f71 more modular version with separate object MpdlXmlTextServer
casties
parents: 128
diff changeset
213 return self.template.fulltextclient.getTranslate(**args)
5c779d7b5f71 more modular version with separate object MpdlXmlTextServer
casties
parents: 128
diff changeset
214
5c779d7b5f71 more modular version with separate object MpdlXmlTextServer
casties
parents: 128
diff changeset
215 def getLemma(self, **args):
5c779d7b5f71 more modular version with separate object MpdlXmlTextServer
casties
parents: 128
diff changeset
216 """get lemma"""
5c779d7b5f71 more modular version with separate object MpdlXmlTextServer
casties
parents: 128
diff changeset
217 return self.template.fulltextclient.getLemma(**args)
5c779d7b5f71 more modular version with separate object MpdlXmlTextServer
casties
parents: 128
diff changeset
218
453
beb7ccb92564 first version using elementtree instead of 4suite xml
casties
parents: 405
diff changeset
219 def getLemmaQuery(self, **args):
beb7ccb92564 first version using elementtree instead of 4suite xml
casties
parents: 405
diff changeset
220 """get query"""
beb7ccb92564 first version using elementtree instead of 4suite xml
casties
parents: 405
diff changeset
221 return self.template.fulltextclient.getLemmaQuery(**args)
beb7ccb92564 first version using elementtree instead of 4suite xml
casties
parents: 405
diff changeset
222
beb7ccb92564 first version using elementtree instead of 4suite xml
casties
parents: 405
diff changeset
223 def getLex(self, **args):
beb7ccb92564 first version using elementtree instead of 4suite xml
casties
parents: 405
diff changeset
224 """get lex"""
beb7ccb92564 first version using elementtree instead of 4suite xml
casties
parents: 405
diff changeset
225 return self.template.fulltextclient.getLex(**args)
beb7ccb92564 first version using elementtree instead of 4suite xml
casties
parents: 405
diff changeset
226
130
5c779d7b5f71 more modular version with separate object MpdlXmlTextServer
casties
parents: 128
diff changeset
227 def getToc(self, **args):
5c779d7b5f71 more modular version with separate object MpdlXmlTextServer
casties
parents: 128
diff changeset
228 """get toc"""
5c779d7b5f71 more modular version with separate object MpdlXmlTextServer
casties
parents: 128
diff changeset
229 return self.template.fulltextclient.getToc(**args)
5c779d7b5f71 more modular version with separate object MpdlXmlTextServer
casties
parents: 128
diff changeset
230
5c779d7b5f71 more modular version with separate object MpdlXmlTextServer
casties
parents: 128
diff changeset
231 def getTocPage(self, **args):
5c779d7b5f71 more modular version with separate object MpdlXmlTextServer
casties
parents: 128
diff changeset
232 """get tocpage"""
5c779d7b5f71 more modular version with separate object MpdlXmlTextServer
casties
parents: 128
diff changeset
233 return self.template.fulltextclient.getTocPage(**args)
5c779d7b5f71 more modular version with separate object MpdlXmlTextServer
casties
parents: 128
diff changeset
234
5c779d7b5f71 more modular version with separate object MpdlXmlTextServer
casties
parents: 128
diff changeset
235
68
b8457fc33446 piclens rss/support
dwinter
parents: 65
diff changeset
236 security.declareProtected('View','thumbs_rss')
b8457fc33446 piclens rss/support
dwinter
parents: 65
diff changeset
237 def thumbs_rss(self,mode,url,viewMode="auto",start=None,pn=1):
b8457fc33446 piclens rss/support
dwinter
parents: 65
diff changeset
238 '''
b8457fc33446 piclens rss/support
dwinter
parents: 65
diff changeset
239 view it
b8457fc33446 piclens rss/support
dwinter
parents: 65
diff changeset
240 @param mode: defines how to access the document behind url
b8457fc33446 piclens rss/support
dwinter
parents: 65
diff changeset
241 @param url: url which contains display information
b8457fc33446 piclens rss/support
dwinter
parents: 65
diff changeset
242 @param viewMode: if images display images, if text display text, default is images (text,images or auto)
b8457fc33446 piclens rss/support
dwinter
parents: 65
diff changeset
243
b8457fc33446 piclens rss/support
dwinter
parents: 65
diff changeset
244 '''
167
7e2b97941a66 characterNormalization
abukhman
parents: 166
diff changeset
245 logging.debug("HHHHHHHHHHHHHH:load the rss")
458
48b135b089c8 more renovation
casties
parents: 457
diff changeset
246 logging.debug("documentViewer (index) mode: %s url:%s start:%s pn:%s"%(mode,url,start,pn))
68
b8457fc33446 piclens rss/support
dwinter
parents: 65
diff changeset
247
b8457fc33446 piclens rss/support
dwinter
parents: 65
diff changeset
248 if not hasattr(self, 'template'):
b8457fc33446 piclens rss/support
dwinter
parents: 65
diff changeset
249 # create template folder if it doesn't exist
b8457fc33446 piclens rss/support
dwinter
parents: 65
diff changeset
250 self.manage_addFolder('template')
b8457fc33446 piclens rss/support
dwinter
parents: 65
diff changeset
251
b8457fc33446 piclens rss/support
dwinter
parents: 65
diff changeset
252 if not self.digilibBaseUrl:
b8457fc33446 piclens rss/support
dwinter
parents: 65
diff changeset
253 self.digilibBaseUrl = self.findDigilibUrl() or "http://nausikaa.mpiwg-berlin.mpg.de/digitallibrary"
b8457fc33446 piclens rss/support
dwinter
parents: 65
diff changeset
254
b8457fc33446 piclens rss/support
dwinter
parents: 65
diff changeset
255 docinfo = self.getDocinfo(mode=mode,url=url)
338
0576f524e2ee *** empty log message ***
abukhman
parents: 337
diff changeset
256 #pageinfo = self.getPageinfo(start=start,current=pn,docinfo=docinfo)
345
c39c252a3186 *** empty log message ***
abukhman
parents: 343
diff changeset
257 pageinfo = self.getPageinfo(start=start,current=pn, docinfo=docinfo)
331
6cde7f02786e *** empty log message ***
abukhman
parents: 330
diff changeset
258 ''' ZDES '''
68
b8457fc33446 piclens rss/support
dwinter
parents: 65
diff changeset
259 pt = getattr(self.template, 'thumbs_main_rss')
b8457fc33446 piclens rss/support
dwinter
parents: 65
diff changeset
260
b8457fc33446 piclens rss/support
dwinter
parents: 65
diff changeset
261 if viewMode=="auto": # automodus gewaehlt
453
beb7ccb92564 first version using elementtree instead of 4suite xml
casties
parents: 405
diff changeset
262 if docinfo.has_key("textURL") or docinfo.get('textURLPath',None): #texturl gesetzt und textViewer konfiguriert
68
b8457fc33446 piclens rss/support
dwinter
parents: 65
diff changeset
263 viewMode="text"
b8457fc33446 piclens rss/support
dwinter
parents: 65
diff changeset
264 else:
b8457fc33446 piclens rss/support
dwinter
parents: 65
diff changeset
265 viewMode="images"
b8457fc33446 piclens rss/support
dwinter
parents: 65
diff changeset
266
b8457fc33446 piclens rss/support
dwinter
parents: 65
diff changeset
267 return pt(docinfo=docinfo,pageinfo=pageinfo,viewMode=viewMode)
b8457fc33446 piclens rss/support
dwinter
parents: 65
diff changeset
268
22
b139f9937e97 preliminary version 0.2
casties
parents: 20
diff changeset
269 security.declareProtected('View','index_html')
405
b8fb4c750d74 fix for characternormalization default
casties
parents: 404
diff changeset
270 def index_html(self,url,mode="texttool",viewMode="auto",tocMode="thumbs",start=None,pn=1,mk=None):
22
b139f9937e97 preliminary version 0.2
casties
parents: 20
diff changeset
271 '''
b139f9937e97 preliminary version 0.2
casties
parents: 20
diff changeset
272 view it
57
7cdb0fc34a92 added getInfo_xml method
casties
parents: 55
diff changeset
273 @param mode: defines how to access the document behind url
22
b139f9937e97 preliminary version 0.2
casties
parents: 20
diff changeset
274 @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
275 @param viewMode: if images display images, if text display text, default is auto (text,images or auto)
99
4738a696d265 Search function update
abukhman
parents: 97
diff changeset
276 @param tocMode: type of 'table of contents' for navigation (thumbs, text, figures, none)
141
39c7d6164da8 characterNormalization (reg,norm, none)
abukhman
parents: 140
diff changeset
277 @param characterNormalization type of text display (reg, norm, none)
100
137459e3b378 Last update
abukhman
parents: 99
diff changeset
278 @param querySearch: type of different search modes (fulltext, fulltextMorph, xpath, xquery, ftIndex, ftIndexMorph, fulltextMorphLemma)
22
b139f9937e97 preliminary version 0.2
casties
parents: 20
diff changeset
279 '''
0
dwinter
parents:
diff changeset
280
345
c39c252a3186 *** empty log message ***
abukhman
parents: 343
diff changeset
281 logging.debug("documentViewer (index) mode: %s url:%s start:%s pn:%s"%(mode,url,start,pn))
22
b139f9937e97 preliminary version 0.2
casties
parents: 20
diff changeset
282
b139f9937e97 preliminary version 0.2
casties
parents: 20
diff changeset
283 if not hasattr(self, 'template'):
84
a6e4f9b6729a first version with new full-text infrastructure and slightly changed templates
casties
parents: 83
diff changeset
284 # this won't work
a6e4f9b6729a first version with new full-text infrastructure and slightly changed templates
casties
parents: 83
diff changeset
285 logging.error("template folder missing!")
a6e4f9b6729a first version with new full-text infrastructure and slightly changed templates
casties
parents: 83
diff changeset
286 return "ERROR: template folder missing!"
22
b139f9937e97 preliminary version 0.2
casties
parents: 20
diff changeset
287
84
a6e4f9b6729a first version with new full-text infrastructure and slightly changed templates
casties
parents: 83
diff changeset
288 if not getattr(self, 'digilibBaseUrl', None):
132
39167e96e582 fixed creation of text server on __init__
casties
parents: 130
diff changeset
289 self.digilibBaseUrl = self.findDigilibUrl() or "http://digilib.mpiwg-berlin.mpg.de/digitallibrary"
22
b139f9937e97 preliminary version 0.2
casties
parents: 20
diff changeset
290
25
e93fb8cadd3a new, less preliminary version 0.2
casties
parents: 22
diff changeset
291 docinfo = self.getDocinfo(mode=mode,url=url)
97
2b8fd19432fb Last update
abukhman
parents: 96
diff changeset
292
90
6a4a72033d58 new version with new full-text infrastructure and some more changed templates
casties
parents: 84
diff changeset
293 if tocMode != "thumbs":
6a4a72033d58 new version with new full-text infrastructure and some more changed templates
casties
parents: 84
diff changeset
294 # get table of contents
6a4a72033d58 new version with new full-text infrastructure and some more changed templates
casties
parents: 84
diff changeset
295 docinfo = self.getToc(mode=tocMode, docinfo=docinfo)
455
0a53fea83df7 more work renovating
casties
parents: 454
diff changeset
296
0a53fea83df7 more work renovating
casties
parents: 454
diff changeset
297 # auto viewMode: text_dict if text else images
0a53fea83df7 more work renovating
casties
parents: 454
diff changeset
298 if viewMode=="auto":
0a53fea83df7 more work renovating
casties
parents: 454
diff changeset
299 if docinfo.get('textURL', None) or docinfo.get('textURLPath', None):
0a53fea83df7 more work renovating
casties
parents: 454
diff changeset
300 #texturl gesetzt und textViewer konfiguriert
127
49f381f896d0 try to make text_dict default for texts
casties
parents: 126
diff changeset
301 viewMode="text_dict"
51
c5d3aabbf61b textviewer now integrated, new modus auto introduced as standard for viewing
dwinter
parents: 50
diff changeset
302 else:
c5d3aabbf61b textviewer now integrated, new modus auto introduced as standard for viewing
dwinter
parents: 50
diff changeset
303 viewMode="images"
90
6a4a72033d58 new version with new full-text infrastructure and some more changed templates
casties
parents: 84
diff changeset
304
455
0a53fea83df7 more work renovating
casties
parents: 454
diff changeset
305 pageinfo = self.getPageinfo(start=start, current=pn, docinfo=docinfo, viewMode=viewMode, tocMode=tocMode)
127
49f381f896d0 try to make text_dict default for texts
casties
parents: 126
diff changeset
306
455
0a53fea83df7 more work renovating
casties
parents: 454
diff changeset
307 if viewMode != 'images' and docinfo.get('textURLPath', None):
0a53fea83df7 more work renovating
casties
parents: 454
diff changeset
308 # get full text page
0a53fea83df7 more work renovating
casties
parents: 454
diff changeset
309 page = self.getTextPage(mode=viewMode, pn=pn, docinfo=docinfo, pageinfo=pageinfo)
453
beb7ccb92564 first version using elementtree instead of 4suite xml
casties
parents: 405
diff changeset
310 pageinfo['textPage'] = page
455
0a53fea83df7 more work renovating
casties
parents: 454
diff changeset
311
0a53fea83df7 more work renovating
casties
parents: 454
diff changeset
312 # get template /template/viewer_main
0a53fea83df7 more work renovating
casties
parents: 454
diff changeset
313 pt = getattr(self.template, 'viewer_main')
0a53fea83df7 more work renovating
casties
parents: 454
diff changeset
314 # and execute with parameters
0a53fea83df7 more work renovating
casties
parents: 454
diff changeset
315 return pt(docinfo=docinfo, pageinfo=pageinfo, viewMode=viewMode, mk=self.generateMarks(mk))
0
dwinter
parents:
diff changeset
316
74
dwinter
parents: 73
diff changeset
317 def generateMarks(self,mk):
dwinter
parents: 73
diff changeset
318 ret=""
90
6a4a72033d58 new version with new full-text infrastructure and some more changed templates
casties
parents: 84
diff changeset
319 if mk is None:
6a4a72033d58 new version with new full-text infrastructure and some more changed templates
casties
parents: 84
diff changeset
320 return ""
134
6a33aa624ba4 fixed more oopsies
casties
parents: 133
diff changeset
321 if not isinstance(mk, list):
132
39167e96e582 fixed creation of text server on __init__
casties
parents: 130
diff changeset
322 mk=[mk]
74
dwinter
parents: 73
diff changeset
323 for m in mk:
75
9673218e155b minorCVS: ----------------------------------------------------------------------
dwinter
parents: 74
diff changeset
324 ret+="mk=%s"%m
74
dwinter
parents: 73
diff changeset
325 return ret
389
114d40b358ab *** empty log message ***
abukhman
parents: 387
diff changeset
326
114d40b358ab *** empty log message ***
abukhman
parents: 387
diff changeset
327
387
580db757e0eb *** empty log message ***
abukhman
parents: 386
diff changeset
328 def getBrowser(self):
580db757e0eb *** empty log message ***
abukhman
parents: 386
diff changeset
329 """getBrowser the version of browser """
453
beb7ccb92564 first version using elementtree instead of 4suite xml
casties
parents: 405
diff changeset
330 bt = browserCheck(self)
beb7ccb92564 first version using elementtree instead of 4suite xml
casties
parents: 405
diff changeset
331 logging.debug("BROWSER VERSION: %s"%(bt))
beb7ccb92564 first version using elementtree instead of 4suite xml
casties
parents: 405
diff changeset
332 return bt
387
580db757e0eb *** empty log message ***
abukhman
parents: 386
diff changeset
333
84
a6e4f9b6729a first version with new full-text infrastructure and slightly changed templates
casties
parents: 83
diff changeset
334 def findDigilibUrl(self):
a6e4f9b6729a first version with new full-text infrastructure and slightly changed templates
casties
parents: 83
diff changeset
335 """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
336 url = self.template.zogilib.getDLBaseUrl()
a6e4f9b6729a first version with new full-text infrastructure and slightly changed templates
casties
parents: 83
diff changeset
337 return url
126
c6dcf12e3807 added method to get url of viewer instance
casties
parents: 124
diff changeset
338
c6dcf12e3807 added method to get url of viewer instance
casties
parents: 124
diff changeset
339 def getDocumentViewerURL(self):
c6dcf12e3807 added method to get url of viewer instance
casties
parents: 124
diff changeset
340 """returns the URL of this instance"""
c6dcf12e3807 added method to get url of viewer instance
casties
parents: 124
diff changeset
341 return self.absolute_url()
84
a6e4f9b6729a first version with new full-text infrastructure and slightly changed templates
casties
parents: 83
diff changeset
342
a6e4f9b6729a first version with new full-text infrastructure and slightly changed templates
casties
parents: 83
diff changeset
343 def getStyle(self, idx, selected, style=""):
a6e4f9b6729a first version with new full-text infrastructure and slightly changed templates
casties
parents: 83
diff changeset
344 """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
345 #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
346 if idx == selected:
a6e4f9b6729a first version with new full-text infrastructure and slightly changed templates
casties
parents: 83
diff changeset
347 return style + 'sel'
a6e4f9b6729a first version with new full-text infrastructure and slightly changed templates
casties
parents: 83
diff changeset
348 else:
a6e4f9b6729a first version with new full-text infrastructure and slightly changed templates
casties
parents: 83
diff changeset
349 return style
74
dwinter
parents: 73
diff changeset
350
453
beb7ccb92564 first version using elementtree instead of 4suite xml
casties
parents: 405
diff changeset
351 def getLink(self, param=None, val=None, params=None, baseUrl=None, paramSep='&'):
beb7ccb92564 first version using elementtree instead of 4suite xml
casties
parents: 405
diff changeset
352 """returns URL to documentviewer with parameter param set to val or from dict params"""
beb7ccb92564 first version using elementtree instead of 4suite xml
casties
parents: 405
diff changeset
353 # copy existing request params
beb7ccb92564 first version using elementtree instead of 4suite xml
casties
parents: 405
diff changeset
354 urlParams=self.REQUEST.form.copy()
beb7ccb92564 first version using elementtree instead of 4suite xml
casties
parents: 405
diff changeset
355 # change single param
25
e93fb8cadd3a new, less preliminary version 0.2
casties
parents: 22
diff changeset
356 if param is not None:
31
c6451e8d5d23 more small fixes - now version 0.2.2
casties
parents: 29
diff changeset
357 if val is None:
453
beb7ccb92564 first version using elementtree instead of 4suite xml
casties
parents: 405
diff changeset
358 if urlParams.has_key(param):
beb7ccb92564 first version using elementtree instead of 4suite xml
casties
parents: 405
diff changeset
359 del urlParams[param]
25
e93fb8cadd3a new, less preliminary version 0.2
casties
parents: 22
diff changeset
360 else:
453
beb7ccb92564 first version using elementtree instead of 4suite xml
casties
parents: 405
diff changeset
361 urlParams[param] = str(val)
84
a6e4f9b6729a first version with new full-text infrastructure and slightly changed templates
casties
parents: 83
diff changeset
362
453
beb7ccb92564 first version using elementtree instead of 4suite xml
casties
parents: 405
diff changeset
363 # change more params
beb7ccb92564 first version using elementtree instead of 4suite xml
casties
parents: 405
diff changeset
364 if params is not None:
beb7ccb92564 first version using elementtree instead of 4suite xml
casties
parents: 405
diff changeset
365 for k in params.keys():
beb7ccb92564 first version using elementtree instead of 4suite xml
casties
parents: 405
diff changeset
366 v = params[k]
beb7ccb92564 first version using elementtree instead of 4suite xml
casties
parents: 405
diff changeset
367 if v is None:
beb7ccb92564 first version using elementtree instead of 4suite xml
casties
parents: 405
diff changeset
368 # val=None removes param
beb7ccb92564 first version using elementtree instead of 4suite xml
casties
parents: 405
diff changeset
369 if urlParams.has_key(k):
beb7ccb92564 first version using elementtree instead of 4suite xml
casties
parents: 405
diff changeset
370 del urlParams[k]
beb7ccb92564 first version using elementtree instead of 4suite xml
casties
parents: 405
diff changeset
371
beb7ccb92564 first version using elementtree instead of 4suite xml
casties
parents: 405
diff changeset
372 else:
beb7ccb92564 first version using elementtree instead of 4suite xml
casties
parents: 405
diff changeset
373 urlParams[k] = v
beb7ccb92564 first version using elementtree instead of 4suite xml
casties
parents: 405
diff changeset
374
beb7ccb92564 first version using elementtree instead of 4suite xml
casties
parents: 405
diff changeset
375 # FIXME: does this belong here?
beb7ccb92564 first version using elementtree instead of 4suite xml
casties
parents: 405
diff changeset
376 if urlParams.get("mode", None) == "filepath": #wenn beim erst Aufruf filepath gesetzt wurde aendere das nun zu imagepath
beb7ccb92564 first version using elementtree instead of 4suite xml
casties
parents: 405
diff changeset
377 urlParams["mode"] = "imagepath"
beb7ccb92564 first version using elementtree instead of 4suite xml
casties
parents: 405
diff changeset
378 urlParams["url"] = getParentDir(urlParams["url"])
31
c6451e8d5d23 more small fixes - now version 0.2.2
casties
parents: 29
diff changeset
379
453
beb7ccb92564 first version using elementtree instead of 4suite xml
casties
parents: 405
diff changeset
380 # quote values and assemble into query string (not escaping '/')
beb7ccb92564 first version using elementtree instead of 4suite xml
casties
parents: 405
diff changeset
381 ps = paramSep.join(["%s=%s"%(k,urllib.quote_plus(v,'/')) for (k, v) in urlParams.items()])
beb7ccb92564 first version using elementtree instead of 4suite xml
casties
parents: 405
diff changeset
382 #ps = urllib.urlencode(urlParams)
beb7ccb92564 first version using elementtree instead of 4suite xml
casties
parents: 405
diff changeset
383 if baseUrl is None:
beb7ccb92564 first version using elementtree instead of 4suite xml
casties
parents: 405
diff changeset
384 baseUrl = self.REQUEST['URL1']
beb7ccb92564 first version using elementtree instead of 4suite xml
casties
parents: 405
diff changeset
385
beb7ccb92564 first version using elementtree instead of 4suite xml
casties
parents: 405
diff changeset
386 url = "%s?%s"%(baseUrl, ps)
25
e93fb8cadd3a new, less preliminary version 0.2
casties
parents: 22
diff changeset
387 return url
e93fb8cadd3a new, less preliminary version 0.2
casties
parents: 22
diff changeset
388
453
beb7ccb92564 first version using elementtree instead of 4suite xml
casties
parents: 405
diff changeset
389
beb7ccb92564 first version using elementtree instead of 4suite xml
casties
parents: 405
diff changeset
390 def getLinkAmp(self, param=None, val=None, params=None, baseUrl=None):
68
b8457fc33446 piclens rss/support
dwinter
parents: 65
diff changeset
391 """link to documentviewer with parameter param set to val"""
453
beb7ccb92564 first version using elementtree instead of 4suite xml
casties
parents: 405
diff changeset
392 return self.getLink(param, val, params, baseUrl, '&')
81
fae97f071724 fixed problem with info.xml when url without index.meta
casties
parents: 79
diff changeset
393
57
7cdb0fc34a92 added getInfo_xml method
casties
parents: 55
diff changeset
394 def getInfo_xml(self,url,mode):
7cdb0fc34a92 added getInfo_xml method
casties
parents: 55
diff changeset
395 """returns info about the document as XML"""
7cdb0fc34a92 added getInfo_xml method
casties
parents: 55
diff changeset
396
7cdb0fc34a92 added getInfo_xml method
casties
parents: 55
diff changeset
397 if not self.digilibBaseUrl:
7cdb0fc34a92 added getInfo_xml method
casties
parents: 55
diff changeset
398 self.digilibBaseUrl = self.findDigilibUrl() or "http://nausikaa.mpiwg-berlin.mpg.de/digitallibrary"
7cdb0fc34a92 added getInfo_xml method
casties
parents: 55
diff changeset
399
7cdb0fc34a92 added getInfo_xml method
casties
parents: 55
diff changeset
400 docinfo = self.getDocinfo(mode=mode,url=url)
7cdb0fc34a92 added getInfo_xml method
casties
parents: 55
diff changeset
401 pt = getattr(self.template, 'info_xml')
7cdb0fc34a92 added getInfo_xml method
casties
parents: 55
diff changeset
402 return pt(docinfo=docinfo)
7cdb0fc34a92 added getInfo_xml method
casties
parents: 55
diff changeset
403
394
ce9fa69f81c3 new toggle option method
casties
parents: 392
diff changeset
404 def getOptionToggle(self, newState=None, optionName='text_options_open', initialState=True):
ce9fa69f81c3 new toggle option method
casties
parents: 392
diff changeset
405 """returns new option state"""
397
5b078a6d8909 new toggle option method
casties
parents: 396
diff changeset
406 if not self.REQUEST.SESSION.has_key(optionName):
394
ce9fa69f81c3 new toggle option method
casties
parents: 392
diff changeset
407 # not in session -- initial
ce9fa69f81c3 new toggle option method
casties
parents: 392
diff changeset
408 opt = {'lastState': newState, 'state': initialState}
ce9fa69f81c3 new toggle option method
casties
parents: 392
diff changeset
409 else:
397
5b078a6d8909 new toggle option method
casties
parents: 396
diff changeset
410 opt = self.REQUEST.SESSION.get(optionName)
394
ce9fa69f81c3 new toggle option method
casties
parents: 392
diff changeset
411 if opt['lastState'] != newState:
ce9fa69f81c3 new toggle option method
casties
parents: 392
diff changeset
412 # state in session has changed -- toggle
ce9fa69f81c3 new toggle option method
casties
parents: 392
diff changeset
413 opt['state'] = not opt['state']
ce9fa69f81c3 new toggle option method
casties
parents: 392
diff changeset
414 opt['lastState'] = newState
ce9fa69f81c3 new toggle option method
casties
parents: 392
diff changeset
415
ce9fa69f81c3 new toggle option method
casties
parents: 392
diff changeset
416 self.REQUEST.SESSION[optionName] = opt
ce9fa69f81c3 new toggle option method
casties
parents: 392
diff changeset
417 return opt['state']
0
dwinter
parents:
diff changeset
418
35
2d9261aea8f3 version 0.2.4
casties
parents: 32
diff changeset
419 def isAccessible(self, docinfo):
32
b25c89d693cf version 0.2.3 - first version with access control!
casties
parents: 31
diff changeset
420 """returns if access to the resource is granted"""
b25c89d693cf version 0.2.3 - first version with access control!
casties
parents: 31
diff changeset
421 access = docinfo.get('accessType', None)
167
7e2b97941a66 characterNormalization
abukhman
parents: 166
diff changeset
422 logging.debug("documentViewer (accessOK) access type %s"%access)
45
0391fe75aef3 fixed handling of documents with missing access tag
casties
parents: 43
diff changeset
423 if access is not None and access == 'free':
167
7e2b97941a66 characterNormalization
abukhman
parents: 166
diff changeset
424 logging.debug("documentViewer (accessOK) access is free")
32
b25c89d693cf version 0.2.3 - first version with access control!
casties
parents: 31
diff changeset
425 return True
45
0391fe75aef3 fixed handling of documents with missing access tag
casties
parents: 43
diff changeset
426 elif access is None or access in self.authgroups:
35
2d9261aea8f3 version 0.2.4
casties
parents: 32
diff changeset
427 # only local access -- only logged in users
2d9261aea8f3 version 0.2.4
casties
parents: 32
diff changeset
428 user = getSecurityManager().getUser()
167
7e2b97941a66 characterNormalization
abukhman
parents: 166
diff changeset
429 logging.debug("documentViewer (accessOK) user=%s ip=%s"%(user,self.REQUEST.getClientAddr()))
35
2d9261aea8f3 version 0.2.4
casties
parents: 32
diff changeset
430 if user is not None:
2d9261aea8f3 version 0.2.4
casties
parents: 32
diff changeset
431 #print "user: ", user
2d9261aea8f3 version 0.2.4
casties
parents: 32
diff changeset
432 return (user.getUserName() != "Anonymous User")
2d9261aea8f3 version 0.2.4
casties
parents: 32
diff changeset
433 else:
2d9261aea8f3 version 0.2.4
casties
parents: 32
diff changeset
434 return False
32
b25c89d693cf version 0.2.3 - first version with access control!
casties
parents: 31
diff changeset
435
167
7e2b97941a66 characterNormalization
abukhman
parents: 166
diff changeset
436 logging.error("documentViewer (accessOK) unknown access type %s"%access)
32
b25c89d693cf version 0.2.3 - first version with access control!
casties
parents: 31
diff changeset
437 return False
35
2d9261aea8f3 version 0.2.4
casties
parents: 32
diff changeset
438
32
b25c89d693cf version 0.2.3 - first version with access control!
casties
parents: 31
diff changeset
439
73
dwinter
parents: 71
diff changeset
440 def getDirinfoFromDigilib(self,path,docinfo=None,cut=0):
29
e1bed068b351 small fixes
casties
parents: 28
diff changeset
441 """gibt param von dlInfo aus"""
31
c6451e8d5d23 more small fixes - now version 0.2.2
casties
parents: 29
diff changeset
442 if docinfo is None:
c6451e8d5d23 more small fixes - now version 0.2.2
casties
parents: 29
diff changeset
443 docinfo = {}
73
dwinter
parents: 71
diff changeset
444
dwinter
parents: 71
diff changeset
445 for x in range(cut):
454
73e3273c7624 more work
casties
parents: 453
diff changeset
446 path=getParentDir(path)
78
70ab234a18dc bugs in filepath mode fixes
dwinter
parents: 75
diff changeset
447
40
749ee5389892 try to ignore superfluous /mpiwg/online in urls
casties
parents: 39
diff changeset
448 infoUrl=self.digilibBaseUrl+"/dirInfo-xml.jsp?mo=dir&fn="+path
29
e1bed068b351 small fixes
casties
parents: 28
diff changeset
449
167
7e2b97941a66 characterNormalization
abukhman
parents: 166
diff changeset
450 logging.debug("documentViewer (getparamfromdigilib) dirInfo from %s"%(infoUrl))
29
e1bed068b351 small fixes
casties
parents: 28
diff changeset
451
130
5c779d7b5f71 more modular version with separate object MpdlXmlTextServer
casties
parents: 128
diff changeset
452 txt = getHttpData(infoUrl)
5c779d7b5f71 more modular version with separate object MpdlXmlTextServer
casties
parents: 128
diff changeset
453 if txt is None:
40
749ee5389892 try to ignore superfluous /mpiwg/online in urls
casties
parents: 39
diff changeset
454 raise IOError("Unable to get dir-info from %s"%(infoUrl))
130
5c779d7b5f71 more modular version with separate object MpdlXmlTextServer
casties
parents: 128
diff changeset
455
453
beb7ccb92564 first version using elementtree instead of 4suite xml
casties
parents: 405
diff changeset
456 dom = ET.fromstring(txt)
beb7ccb92564 first version using elementtree instead of 4suite xml
casties
parents: 405
diff changeset
457 #dom = Parse(txt)
beb7ccb92564 first version using elementtree instead of 4suite xml
casties
parents: 405
diff changeset
458 size=getText(dom.find("size"))
beb7ccb92564 first version using elementtree instead of 4suite xml
casties
parents: 405
diff changeset
459 #sizes=dom.xpath("//dir/size")
beb7ccb92564 first version using elementtree instead of 4suite xml
casties
parents: 405
diff changeset
460 logging.debug("documentViewer (getparamfromdigilib) dirInfo:size=%s"%size)
29
e1bed068b351 small fixes
casties
parents: 28
diff changeset
461
453
beb7ccb92564 first version using elementtree instead of 4suite xml
casties
parents: 405
diff changeset
462 if size:
beb7ccb92564 first version using elementtree instead of 4suite xml
casties
parents: 405
diff changeset
463 docinfo['numPages'] = int(size)
31
c6451e8d5d23 more small fixes - now version 0.2.2
casties
parents: 29
diff changeset
464 else:
c6451e8d5d23 more small fixes - now version 0.2.2
casties
parents: 29
diff changeset
465 docinfo['numPages'] = 0
84
a6e4f9b6729a first version with new full-text infrastructure and slightly changed templates
casties
parents: 83
diff changeset
466
a6e4f9b6729a first version with new full-text infrastructure and slightly changed templates
casties
parents: 83
diff changeset
467 # TODO: produce and keep list of image names and numbers
31
c6451e8d5d23 more small fixes - now version 0.2.2
casties
parents: 29
diff changeset
468
c6451e8d5d23 more small fixes - now version 0.2.2
casties
parents: 29
diff changeset
469 return docinfo
32
b25c89d693cf version 0.2.3 - first version with access control!
casties
parents: 31
diff changeset
470
174
5780092e4989 *** empty log message ***
dwinter
parents: 173
diff changeset
471 def getIndexMetaPath(self,url):
5780092e4989 *** empty log message ***
dwinter
parents: 173
diff changeset
472 """gib nur den Pfad zurueck"""
5780092e4989 *** empty log message ***
dwinter
parents: 173
diff changeset
473 regexp = re.compile(r".*(experimental|permanent)/(.*)")
5780092e4989 *** empty log message ***
dwinter
parents: 173
diff changeset
474 regpath = regexp.match(url)
5780092e4989 *** empty log message ***
dwinter
parents: 173
diff changeset
475 if (regpath==None):
5780092e4989 *** empty log message ***
dwinter
parents: 173
diff changeset
476 return ""
224
58c5338749c7 *** empty log message ***
abukhman
parents: 223
diff changeset
477 logging.debug("(getDomFromIndexMeta): URLXAXA: %s"%regpath.group(2))
174
5780092e4989 *** empty log message ***
dwinter
parents: 173
diff changeset
478 return ("/mpiwg/online/"+regpath.group(1)+"/"+regpath.group(2))
5780092e4989 *** empty log message ***
dwinter
parents: 173
diff changeset
479
225
57c2f5b6ada5 *** empty log message ***
abukhman
parents: 224
diff changeset
480
57c2f5b6ada5 *** empty log message ***
abukhman
parents: 224
diff changeset
481
174
5780092e4989 *** empty log message ***
dwinter
parents: 173
diff changeset
482 def getIndexMetaUrl(self,url):
5780092e4989 *** empty log message ***
dwinter
parents: 173
diff changeset
483 """returns utr of index.meta document at url"""
5780092e4989 *** empty log message ***
dwinter
parents: 173
diff changeset
484
39
1dd90aabd366 added retry when reading index meta from texter applet
casties
parents: 38
diff changeset
485 metaUrl = None
35
2d9261aea8f3 version 0.2.4
casties
parents: 32
diff changeset
486 if url.startswith("http://"):
2d9261aea8f3 version 0.2.4
casties
parents: 32
diff changeset
487 # real URL
39
1dd90aabd366 added retry when reading index meta from texter applet
casties
parents: 38
diff changeset
488 metaUrl = url
35
2d9261aea8f3 version 0.2.4
casties
parents: 32
diff changeset
489 else:
2d9261aea8f3 version 0.2.4
casties
parents: 32
diff changeset
490 # online path
2d9261aea8f3 version 0.2.4
casties
parents: 32
diff changeset
491 server=self.digilibBaseUrl+"/servlet/Texter?fn="
40
749ee5389892 try to ignore superfluous /mpiwg/online in urls
casties
parents: 39
diff changeset
492 metaUrl=server+url.replace("/mpiwg/online","")
35
2d9261aea8f3 version 0.2.4
casties
parents: 32
diff changeset
493 if not metaUrl.endswith("index.meta"):
2d9261aea8f3 version 0.2.4
casties
parents: 32
diff changeset
494 metaUrl += "/index.meta"
174
5780092e4989 *** empty log message ***
dwinter
parents: 173
diff changeset
495
5780092e4989 *** empty log message ***
dwinter
parents: 173
diff changeset
496 return metaUrl
5780092e4989 *** empty log message ***
dwinter
parents: 173
diff changeset
497
5780092e4989 *** empty log message ***
dwinter
parents: 173
diff changeset
498 def getDomFromIndexMeta(self, url):
5780092e4989 *** empty log message ***
dwinter
parents: 173
diff changeset
499 """get dom from index meta"""
5780092e4989 *** empty log message ***
dwinter
parents: 173
diff changeset
500 dom = None
5780092e4989 *** empty log message ***
dwinter
parents: 173
diff changeset
501 metaUrl = self.getIndexMetaUrl(url)
39
1dd90aabd366 added retry when reading index meta from texter applet
casties
parents: 38
diff changeset
502
174
5780092e4989 *** empty log message ***
dwinter
parents: 173
diff changeset
503 logging.debug("(getDomFromIndexMeta): METAURL: %s"%metaUrl)
130
5c779d7b5f71 more modular version with separate object MpdlXmlTextServer
casties
parents: 128
diff changeset
504 txt=getHttpData(metaUrl)
5c779d7b5f71 more modular version with separate object MpdlXmlTextServer
casties
parents: 128
diff changeset
505 if txt is None:
39
1dd90aabd366 added retry when reading index meta from texter applet
casties
parents: 38
diff changeset
506 raise IOError("Unable to read index meta from %s"%(url))
130
5c779d7b5f71 more modular version with separate object MpdlXmlTextServer
casties
parents: 128
diff changeset
507
453
beb7ccb92564 first version using elementtree instead of 4suite xml
casties
parents: 405
diff changeset
508 dom = ET.fromstring(txt)
beb7ccb92564 first version using elementtree instead of 4suite xml
casties
parents: 405
diff changeset
509 #dom = Parse(txt)
35
2d9261aea8f3 version 0.2.4
casties
parents: 32
diff changeset
510 return dom
50
6c0f20cecc60 added evaluation of the presentation/info.xml in texttools
dwinter
parents: 49
diff changeset
511
6c0f20cecc60 added evaluation of the presentation/info.xml in texttools
dwinter
parents: 49
diff changeset
512 def getPresentationInfoXML(self, url):
6c0f20cecc60 added evaluation of the presentation/info.xml in texttools
dwinter
parents: 49
diff changeset
513 """returns dom of info.xml document at url"""
6c0f20cecc60 added evaluation of the presentation/info.xml in texttools
dwinter
parents: 49
diff changeset
514 dom = None
6c0f20cecc60 added evaluation of the presentation/info.xml in texttools
dwinter
parents: 49
diff changeset
515 metaUrl = None
6c0f20cecc60 added evaluation of the presentation/info.xml in texttools
dwinter
parents: 49
diff changeset
516 if url.startswith("http://"):
6c0f20cecc60 added evaluation of the presentation/info.xml in texttools
dwinter
parents: 49
diff changeset
517 # real URL
6c0f20cecc60 added evaluation of the presentation/info.xml in texttools
dwinter
parents: 49
diff changeset
518 metaUrl = url
6c0f20cecc60 added evaluation of the presentation/info.xml in texttools
dwinter
parents: 49
diff changeset
519 else:
6c0f20cecc60 added evaluation of the presentation/info.xml in texttools
dwinter
parents: 49
diff changeset
520 # online path
6c0f20cecc60 added evaluation of the presentation/info.xml in texttools
dwinter
parents: 49
diff changeset
521 server=self.digilibBaseUrl+"/servlet/Texter?fn="
6c0f20cecc60 added evaluation of the presentation/info.xml in texttools
dwinter
parents: 49
diff changeset
522 metaUrl=server+url.replace("/mpiwg/online","")
6c0f20cecc60 added evaluation of the presentation/info.xml in texttools
dwinter
parents: 49
diff changeset
523
130
5c779d7b5f71 more modular version with separate object MpdlXmlTextServer
casties
parents: 128
diff changeset
524 txt=getHttpData(metaUrl)
5c779d7b5f71 more modular version with separate object MpdlXmlTextServer
casties
parents: 128
diff changeset
525 if txt is None:
50
6c0f20cecc60 added evaluation of the presentation/info.xml in texttools
dwinter
parents: 49
diff changeset
526 raise IOError("Unable to read infoXMLfrom %s"%(url))
130
5c779d7b5f71 more modular version with separate object MpdlXmlTextServer
casties
parents: 128
diff changeset
527
453
beb7ccb92564 first version using elementtree instead of 4suite xml
casties
parents: 405
diff changeset
528 dom = ET.fromstring(txt)
beb7ccb92564 first version using elementtree instead of 4suite xml
casties
parents: 405
diff changeset
529 #dom = Parse(txt)
50
6c0f20cecc60 added evaluation of the presentation/info.xml in texttools
dwinter
parents: 49
diff changeset
530 return dom
35
2d9261aea8f3 version 0.2.4
casties
parents: 32
diff changeset
531
2d9261aea8f3 version 0.2.4
casties
parents: 32
diff changeset
532
70
0049d64aa464 filepath introduced
dwinter
parents: 68
diff changeset
533 def getAuthinfoFromIndexMeta(self,path,docinfo=None,dom=None,cut=0):
35
2d9261aea8f3 version 0.2.4
casties
parents: 32
diff changeset
534 """gets authorization info from the index.meta file at path or given by dom"""
167
7e2b97941a66 characterNormalization
abukhman
parents: 166
diff changeset
535 logging.debug("documentViewer (getauthinfofromindexmeta) path: %s"%(path))
32
b25c89d693cf version 0.2.3 - first version with access control!
casties
parents: 31
diff changeset
536
b25c89d693cf version 0.2.3 - first version with access control!
casties
parents: 31
diff changeset
537 access = None
b25c89d693cf version 0.2.3 - first version with access control!
casties
parents: 31
diff changeset
538
b25c89d693cf version 0.2.3 - first version with access control!
casties
parents: 31
diff changeset
539 if docinfo is None:
b25c89d693cf version 0.2.3 - first version with access control!
casties
parents: 31
diff changeset
540 docinfo = {}
b25c89d693cf version 0.2.3 - first version with access control!
casties
parents: 31
diff changeset
541
b25c89d693cf version 0.2.3 - first version with access control!
casties
parents: 31
diff changeset
542 if dom is None:
78
70ab234a18dc bugs in filepath mode fixes
dwinter
parents: 75
diff changeset
543 for x in range(cut):
70
0049d64aa464 filepath introduced
dwinter
parents: 68
diff changeset
544 path=getParentDir(path)
174
5780092e4989 *** empty log message ***
dwinter
parents: 173
diff changeset
545 dom = self.getDomFromIndexMeta(path)
46
31059e3d9338 has now also a text mode viewMode=text
dwinter
parents: 45
diff changeset
546
453
beb7ccb92564 first version using elementtree instead of 4suite xml
casties
parents: 405
diff changeset
547 acc = dom.find(".//access-conditions/access")
beb7ccb92564 first version using elementtree instead of 4suite xml
casties
parents: 405
diff changeset
548 if acc is not None:
beb7ccb92564 first version using elementtree instead of 4suite xml
casties
parents: 405
diff changeset
549 acctype = acc.get('type')
beb7ccb92564 first version using elementtree instead of 4suite xml
casties
parents: 405
diff changeset
550 #acctype = dom.xpath("//access-conditions/access/@type")
beb7ccb92564 first version using elementtree instead of 4suite xml
casties
parents: 405
diff changeset
551 if acctype:
beb7ccb92564 first version using elementtree instead of 4suite xml
casties
parents: 405
diff changeset
552 access=acctype
beb7ccb92564 first version using elementtree instead of 4suite xml
casties
parents: 405
diff changeset
553 if access in ['group', 'institution']:
beb7ccb92564 first version using elementtree instead of 4suite xml
casties
parents: 405
diff changeset
554 access = dom.find(".//access-conditions/access/name").text.lower()
32
b25c89d693cf version 0.2.3 - first version with access control!
casties
parents: 31
diff changeset
555
b25c89d693cf version 0.2.3 - first version with access control!
casties
parents: 31
diff changeset
556 docinfo['accessType'] = access
b25c89d693cf version 0.2.3 - first version with access control!
casties
parents: 31
diff changeset
557 return docinfo
29
e1bed068b351 small fixes
casties
parents: 28
diff changeset
558
32
b25c89d693cf version 0.2.3 - first version with access control!
casties
parents: 31
diff changeset
559
70
0049d64aa464 filepath introduced
dwinter
parents: 68
diff changeset
560 def getBibinfoFromIndexMeta(self,path,docinfo=None,dom=None,cut=0):
35
2d9261aea8f3 version 0.2.4
casties
parents: 32
diff changeset
561 """gets bibliographical info from the index.meta file at path or given by dom"""
167
7e2b97941a66 characterNormalization
abukhman
parents: 166
diff changeset
562 logging.debug("documentViewer (getbibinfofromindexmeta) path: %s"%(path))
20
9884703dae70 new modi
dwinter
parents: 0
diff changeset
563
22
b139f9937e97 preliminary version 0.2
casties
parents: 20
diff changeset
564 if docinfo is None:
b139f9937e97 preliminary version 0.2
casties
parents: 20
diff changeset
565 docinfo = {}
78
70ab234a18dc bugs in filepath mode fixes
dwinter
parents: 75
diff changeset
566
22
b139f9937e97 preliminary version 0.2
casties
parents: 20
diff changeset
567 if dom is None:
78
70ab234a18dc bugs in filepath mode fixes
dwinter
parents: 75
diff changeset
568 for x in range(cut):
70
0049d64aa464 filepath introduced
dwinter
parents: 68
diff changeset
569 path=getParentDir(path)
174
5780092e4989 *** empty log message ***
dwinter
parents: 173
diff changeset
570 dom = self.getDomFromIndexMeta(path)
5780092e4989 *** empty log message ***
dwinter
parents: 173
diff changeset
571
5780092e4989 *** empty log message ***
dwinter
parents: 173
diff changeset
572 docinfo['indexMetaPath']=self.getIndexMetaPath(path);
79
df6952ac93e9 bug in getDocInforFromImagePath, relative lage der index.meta zu path war falsch.
dwinter
parents: 78
diff changeset
573
167
7e2b97941a66 characterNormalization
abukhman
parents: 166
diff changeset
574 logging.debug("documentViewer (getbibinfofromindexmeta cutted) path: %s"%(path))
459
aabfa6124cfb nicer comments
casties
parents: 458
diff changeset
575 # put all raw bib fields in dict "bib"
458
48b135b089c8 more renovation
casties
parents: 457
diff changeset
576 bib = getBibdataFromDom(dom)
48b135b089c8 more renovation
casties
parents: 457
diff changeset
577 docinfo['bib'] = bib
59
996b61d71351 added all fields from bib tag to docinfo
casties
parents: 57
diff changeset
578
996b61d71351 added all fields from bib tag to docinfo
casties
parents: 57
diff changeset
579 # extract some fields (author, title, year) according to their mapping
25
e93fb8cadd3a new, less preliminary version 0.2
casties
parents: 22
diff changeset
580 metaData=self.metadata.main.meta.bib
458
48b135b089c8 more renovation
casties
parents: 457
diff changeset
581 bibtype=bib.get("@type")
453
beb7ccb92564 first version using elementtree instead of 4suite xml
casties
parents: 405
diff changeset
582 #bibtype=dom.xpath("//bib/@type")
beb7ccb92564 first version using elementtree instead of 4suite xml
casties
parents: 405
diff changeset
583 if not bibtype:
25
e93fb8cadd3a new, less preliminary version 0.2
casties
parents: 22
diff changeset
584 bibtype="generic"
59
996b61d71351 added all fields from bib tag to docinfo
casties
parents: 57
diff changeset
585
458
48b135b089c8 more renovation
casties
parents: 457
diff changeset
586 bibtype=bibtype.replace("-"," ") # wrong types in index meta "-" instead of " " (not wrong! ROC)
59
996b61d71351 added all fields from bib tag to docinfo
casties
parents: 57
diff changeset
587 docinfo['bib_type'] = bibtype
25
e93fb8cadd3a new, less preliminary version 0.2
casties
parents: 22
diff changeset
588 bibmap=metaData.generateMappingForType(bibtype)
174
5780092e4989 *** empty log message ***
dwinter
parents: 173
diff changeset
589 logging.debug("documentViewer (getbibinfofromindexmeta) bibmap:"+repr(bibmap))
5780092e4989 *** empty log message ***
dwinter
parents: 173
diff changeset
590 logging.debug("documentViewer (getbibinfofromindexmeta) bibtype:"+repr(bibtype))
32
b25c89d693cf version 0.2.3 - first version with access control!
casties
parents: 31
diff changeset
591 # if there is no mapping bibmap is empty (mapping sometimes has empty fields)
457
9fb231ad0bd2 made to work (barely) with Dirks ISMI-Version
casties
parents: 455
diff changeset
592 if len(bibmap) > 0 and bibmap.get('author',None) or bibmap.get('title',None):
63
4a17b755bfc7 added more try/excepts to bib-meta reading code
casties
parents: 62
diff changeset
593 try:
458
48b135b089c8 more renovation
casties
parents: 457
diff changeset
594 docinfo['author']=bib.get(bibmap['author'][0])
63
4a17b755bfc7 added more try/excepts to bib-meta reading code
casties
parents: 62
diff changeset
595 except: pass
4a17b755bfc7 added more try/excepts to bib-meta reading code
casties
parents: 62
diff changeset
596 try:
458
48b135b089c8 more renovation
casties
parents: 457
diff changeset
597 docinfo['title']=bib.get(bibmap['title'][0])
63
4a17b755bfc7 added more try/excepts to bib-meta reading code
casties
parents: 62
diff changeset
598 except: pass
4a17b755bfc7 added more try/excepts to bib-meta reading code
casties
parents: 62
diff changeset
599 try:
458
48b135b089c8 more renovation
casties
parents: 457
diff changeset
600 docinfo['year']=bib.get(bibmap['year'][0])
63
4a17b755bfc7 added more try/excepts to bib-meta reading code
casties
parents: 62
diff changeset
601 except: pass
453
beb7ccb92564 first version using elementtree instead of 4suite xml
casties
parents: 405
diff changeset
602
beb7ccb92564 first version using elementtree instead of 4suite xml
casties
parents: 405
diff changeset
603 # ROC: why is this here?
beb7ccb92564 first version using elementtree instead of 4suite xml
casties
parents: 405
diff changeset
604 # logging.debug("documentViewer (getbibinfofromindexmeta) using mapping for %s"%bibtype)
beb7ccb92564 first version using elementtree instead of 4suite xml
casties
parents: 405
diff changeset
605 # try:
beb7ccb92564 first version using elementtree instead of 4suite xml
casties
parents: 405
diff changeset
606 # docinfo['lang']=getTextFromNode(dom.find(".//bib/lang")[0])
beb7ccb92564 first version using elementtree instead of 4suite xml
casties
parents: 405
diff changeset
607 # except:
beb7ccb92564 first version using elementtree instead of 4suite xml
casties
parents: 405
diff changeset
608 # docinfo['lang']=''
beb7ccb92564 first version using elementtree instead of 4suite xml
casties
parents: 405
diff changeset
609 # try:
beb7ccb92564 first version using elementtree instead of 4suite xml
casties
parents: 405
diff changeset
610 # docinfo['city']=getTextFromNode(dom.find(".//bib/city")[0])
beb7ccb92564 first version using elementtree instead of 4suite xml
casties
parents: 405
diff changeset
611 # except:
beb7ccb92564 first version using elementtree instead of 4suite xml
casties
parents: 405
diff changeset
612 # docinfo['city']=''
beb7ccb92564 first version using elementtree instead of 4suite xml
casties
parents: 405
diff changeset
613 # try:
beb7ccb92564 first version using elementtree instead of 4suite xml
casties
parents: 405
diff changeset
614 # docinfo['number_of_pages']=getTextFromNode(dom.find(".//bib/number_of_pages")[0])
beb7ccb92564 first version using elementtree instead of 4suite xml
casties
parents: 405
diff changeset
615 # except:
beb7ccb92564 first version using elementtree instead of 4suite xml
casties
parents: 405
diff changeset
616 # docinfo['number_of_pages']=''
beb7ccb92564 first version using elementtree instead of 4suite xml
casties
parents: 405
diff changeset
617 # try:
beb7ccb92564 first version using elementtree instead of 4suite xml
casties
parents: 405
diff changeset
618 # docinfo['series_volume']=getTextFromNode(dom.find(".//bib/series_volume")[0])
beb7ccb92564 first version using elementtree instead of 4suite xml
casties
parents: 405
diff changeset
619 # except:
beb7ccb92564 first version using elementtree instead of 4suite xml
casties
parents: 405
diff changeset
620 # docinfo['series_volume']=''
beb7ccb92564 first version using elementtree instead of 4suite xml
casties
parents: 405
diff changeset
621 # try:
beb7ccb92564 first version using elementtree instead of 4suite xml
casties
parents: 405
diff changeset
622 # docinfo['number_of_volumes']=getTextFromNode(dom.find(".//bib/number_of_volumes")[0])
beb7ccb92564 first version using elementtree instead of 4suite xml
casties
parents: 405
diff changeset
623 # except:
beb7ccb92564 first version using elementtree instead of 4suite xml
casties
parents: 405
diff changeset
624 # docinfo['number_of_volumes']=''
beb7ccb92564 first version using elementtree instead of 4suite xml
casties
parents: 405
diff changeset
625 # try:
beb7ccb92564 first version using elementtree instead of 4suite xml
casties
parents: 405
diff changeset
626 # docinfo['translator']=getTextFromNode(dom.find(".//bib/translator")[0])
beb7ccb92564 first version using elementtree instead of 4suite xml
casties
parents: 405
diff changeset
627 # except:
beb7ccb92564 first version using elementtree instead of 4suite xml
casties
parents: 405
diff changeset
628 # docinfo['translator']=''
beb7ccb92564 first version using elementtree instead of 4suite xml
casties
parents: 405
diff changeset
629 # try:
beb7ccb92564 first version using elementtree instead of 4suite xml
casties
parents: 405
diff changeset
630 # docinfo['edition']=getTextFromNode(dom.find(".//bib/edition")[0])
beb7ccb92564 first version using elementtree instead of 4suite xml
casties
parents: 405
diff changeset
631 # except:
beb7ccb92564 first version using elementtree instead of 4suite xml
casties
parents: 405
diff changeset
632 # docinfo['edition']=''
beb7ccb92564 first version using elementtree instead of 4suite xml
casties
parents: 405
diff changeset
633 # try:
beb7ccb92564 first version using elementtree instead of 4suite xml
casties
parents: 405
diff changeset
634 # docinfo['series_author']=getTextFromNode(dom.find(".//bib/series_author")[0])
beb7ccb92564 first version using elementtree instead of 4suite xml
casties
parents: 405
diff changeset
635 # except:
beb7ccb92564 first version using elementtree instead of 4suite xml
casties
parents: 405
diff changeset
636 # docinfo['series_author']=''
beb7ccb92564 first version using elementtree instead of 4suite xml
casties
parents: 405
diff changeset
637 # try:
beb7ccb92564 first version using elementtree instead of 4suite xml
casties
parents: 405
diff changeset
638 # docinfo['publisher']=getTextFromNode(dom.find(".//bib/publisher")[0])
beb7ccb92564 first version using elementtree instead of 4suite xml
casties
parents: 405
diff changeset
639 # except:
beb7ccb92564 first version using elementtree instead of 4suite xml
casties
parents: 405
diff changeset
640 # docinfo['publisher']=''
beb7ccb92564 first version using elementtree instead of 4suite xml
casties
parents: 405
diff changeset
641 # try:
beb7ccb92564 first version using elementtree instead of 4suite xml
casties
parents: 405
diff changeset
642 # docinfo['series_title']=getTextFromNode(dom.find(".//bib/series_title")[0])
beb7ccb92564 first version using elementtree instead of 4suite xml
casties
parents: 405
diff changeset
643 # except:
beb7ccb92564 first version using elementtree instead of 4suite xml
casties
parents: 405
diff changeset
644 # docinfo['series_title']=''
beb7ccb92564 first version using elementtree instead of 4suite xml
casties
parents: 405
diff changeset
645 # try:
beb7ccb92564 first version using elementtree instead of 4suite xml
casties
parents: 405
diff changeset
646 # docinfo['isbn_issn']=getTextFromNode(dom.find(".//bib/isbn_issn")[0])
beb7ccb92564 first version using elementtree instead of 4suite xml
casties
parents: 405
diff changeset
647 # except:
beb7ccb92564 first version using elementtree instead of 4suite xml
casties
parents: 405
diff changeset
648 # docinfo['isbn_issn']=''
22
b139f9937e97 preliminary version 0.2
casties
parents: 20
diff changeset
649 return docinfo
83
ec12a2440daa My last update Bukhman Andrey
abukhman
parents: 82
diff changeset
650
454
73e3273c7624 more work
casties
parents: 453
diff changeset
651
73e3273c7624 more work
casties
parents: 453
diff changeset
652 # TODO: is this needed?
218
66f334ec3256 *** empty log message ***
abukhman
parents: 205
diff changeset
653 def getNameFromIndexMeta(self,path,docinfo=None,dom=None,cut=0):
66f334ec3256 *** empty log message ***
abukhman
parents: 205
diff changeset
654 """gets name info from the index.meta file at path or given by dom"""
66f334ec3256 *** empty log message ***
abukhman
parents: 205
diff changeset
655 if docinfo is None:
66f334ec3256 *** empty log message ***
abukhman
parents: 205
diff changeset
656 docinfo = {}
66f334ec3256 *** empty log message ***
abukhman
parents: 205
diff changeset
657
66f334ec3256 *** empty log message ***
abukhman
parents: 205
diff changeset
658 if dom is None:
66f334ec3256 *** empty log message ***
abukhman
parents: 205
diff changeset
659 for x in range(cut):
66f334ec3256 *** empty log message ***
abukhman
parents: 205
diff changeset
660 path=getParentDir(path)
66f334ec3256 *** empty log message ***
abukhman
parents: 205
diff changeset
661 dom = self.getDomFromIndexMeta(path)
330
c81509acead9 *** empty log message ***
abukhman
parents: 327
diff changeset
662
453
beb7ccb92564 first version using elementtree instead of 4suite xml
casties
parents: 405
diff changeset
663 docinfo['name']=getText(dom.find("name"))
230
87c6aac31003 *** empty log message ***
abukhman
parents: 229
diff changeset
664 logging.debug("documentViewer docinfo[name] %s"%docinfo['name'])
218
66f334ec3256 *** empty log message ***
abukhman
parents: 205
diff changeset
665 return docinfo
83
ec12a2440daa My last update Bukhman Andrey
abukhman
parents: 82
diff changeset
666
84
a6e4f9b6729a first version with new full-text infrastructure and slightly changed templates
casties
parents: 83
diff changeset
667 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
668 """parse texttool tag in index meta"""
167
7e2b97941a66 characterNormalization
abukhman
parents: 166
diff changeset
669 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
670 if docinfo is None:
a6e4f9b6729a first version with new full-text infrastructure and slightly changed templates
casties
parents: 83
diff changeset
671 docinfo = {}
a6e4f9b6729a first version with new full-text infrastructure and slightly changed templates
casties
parents: 83
diff changeset
672 if docinfo.get('lang', None) is None:
a6e4f9b6729a first version with new full-text infrastructure and slightly changed templates
casties
parents: 83
diff changeset
673 docinfo['lang'] = '' # default keine Sprache gesetzt
a6e4f9b6729a first version with new full-text infrastructure and slightly changed templates
casties
parents: 83
diff changeset
674 if dom is None:
174
5780092e4989 *** empty log message ***
dwinter
parents: 173
diff changeset
675 dom = self.getDomFromIndexMeta(url)
84
a6e4f9b6729a first version with new full-text infrastructure and slightly changed templates
casties
parents: 83
diff changeset
676
a6e4f9b6729a first version with new full-text infrastructure and slightly changed templates
casties
parents: 83
diff changeset
677 archivePath = None
a6e4f9b6729a first version with new full-text infrastructure and slightly changed templates
casties
parents: 83
diff changeset
678 archiveName = None
a6e4f9b6729a first version with new full-text infrastructure and slightly changed templates
casties
parents: 83
diff changeset
679
454
73e3273c7624 more work
casties
parents: 453
diff changeset
680 archiveName = getText(dom.find("name"))
453
beb7ccb92564 first version using elementtree instead of 4suite xml
casties
parents: 405
diff changeset
681 if not archiveName:
130
5c779d7b5f71 more modular version with separate object MpdlXmlTextServer
casties
parents: 128
diff changeset
682 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
683
454
73e3273c7624 more work
casties
parents: 453
diff changeset
684 archivePath = getText(dom.find("archive-path"))
453
beb7ccb92564 first version using elementtree instead of 4suite xml
casties
parents: 405
diff changeset
685 if archivePath:
84
a6e4f9b6729a first version with new full-text infrastructure and slightly changed templates
casties
parents: 83
diff changeset
686 # clean up archive path
a6e4f9b6729a first version with new full-text infrastructure and slightly changed templates
casties
parents: 83
diff changeset
687 if archivePath[0] != '/':
a6e4f9b6729a first version with new full-text infrastructure and slightly changed templates
casties
parents: 83
diff changeset
688 archivePath = '/' + archivePath
a6e4f9b6729a first version with new full-text infrastructure and slightly changed templates
casties
parents: 83
diff changeset
689 if archiveName and (not archivePath.endswith(archiveName)):
a6e4f9b6729a first version with new full-text infrastructure and slightly changed templates
casties
parents: 83
diff changeset
690 archivePath += "/" + archiveName
a6e4f9b6729a first version with new full-text infrastructure and slightly changed templates
casties
parents: 83
diff changeset
691 else:
a6e4f9b6729a first version with new full-text infrastructure and slightly changed templates
casties
parents: 83
diff changeset
692 # try to get archive-path from url
167
7e2b97941a66 characterNormalization
abukhman
parents: 166
diff changeset
693 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
694 if (not url.startswith('http')):
a6e4f9b6729a first version with new full-text infrastructure and slightly changed templates
casties
parents: 83
diff changeset
695 archivePath = url.replace('index.meta', '')
a6e4f9b6729a first version with new full-text infrastructure and slightly changed templates
casties
parents: 83
diff changeset
696
a6e4f9b6729a first version with new full-text infrastructure and slightly changed templates
casties
parents: 83
diff changeset
697 if archivePath is None:
a6e4f9b6729a first version with new full-text infrastructure and slightly changed templates
casties
parents: 83
diff changeset
698 # we balk without archive-path
a6e4f9b6729a first version with new full-text infrastructure and slightly changed templates
casties
parents: 83
diff changeset
699 raise IOError("Missing archive-path (for text-tool) in %s" % (url))
22
b139f9937e97 preliminary version 0.2
casties
parents: 20
diff changeset
700
453
beb7ccb92564 first version using elementtree instead of 4suite xml
casties
parents: 405
diff changeset
701 imageDir = getText(dom.find(".//texttool/image"))
84
a6e4f9b6729a first version with new full-text infrastructure and slightly changed templates
casties
parents: 83
diff changeset
702
453
beb7ccb92564 first version using elementtree instead of 4suite xml
casties
parents: 405
diff changeset
703 if not imageDir:
84
a6e4f9b6729a first version with new full-text infrastructure and slightly changed templates
casties
parents: 83
diff changeset
704 # 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
705 #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
706 imageDir = ""
a6e4f9b6729a first version with new full-text infrastructure and slightly changed templates
casties
parents: 83
diff changeset
707 #xquery="//pb"
a6e4f9b6729a first version with new full-text infrastructure and slightly changed templates
casties
parents: 83
diff changeset
708 docinfo['imagePath'] = "" # keine Bilder
a6e4f9b6729a first version with new full-text infrastructure and slightly changed templates
casties
parents: 83
diff changeset
709 docinfo['imageURL'] = ""
a6e4f9b6729a first version with new full-text infrastructure and slightly changed templates
casties
parents: 83
diff changeset
710
a6e4f9b6729a first version with new full-text infrastructure and slightly changed templates
casties
parents: 83
diff changeset
711 if imageDir and archivePath:
a6e4f9b6729a first version with new full-text infrastructure and slightly changed templates
casties
parents: 83
diff changeset
712 #print "image: ", imageDir, " archivepath: ", archivePath
a6e4f9b6729a first version with new full-text infrastructure and slightly changed templates
casties
parents: 83
diff changeset
713 imageDir = os.path.join(archivePath, imageDir)
a6e4f9b6729a first version with new full-text infrastructure and slightly changed templates
casties
parents: 83
diff changeset
714 imageDir = imageDir.replace("/mpiwg/online", '')
a6e4f9b6729a first version with new full-text infrastructure and slightly changed templates
casties
parents: 83
diff changeset
715 docinfo = self.getDirinfoFromDigilib(imageDir, docinfo=docinfo)
a6e4f9b6729a first version with new full-text infrastructure and slightly changed templates
casties
parents: 83
diff changeset
716 docinfo['imagePath'] = imageDir
a6e4f9b6729a first version with new full-text infrastructure and slightly changed templates
casties
parents: 83
diff changeset
717
a6e4f9b6729a first version with new full-text infrastructure and slightly changed templates
casties
parents: 83
diff changeset
718 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
719
453
beb7ccb92564 first version using elementtree instead of 4suite xml
casties
parents: 405
diff changeset
720 viewerUrl = getText(dom.find(".//texttool/digiliburlprefix"))
beb7ccb92564 first version using elementtree instead of 4suite xml
casties
parents: 405
diff changeset
721 if viewerUrl:
84
a6e4f9b6729a first version with new full-text infrastructure and slightly changed templates
casties
parents: 83
diff changeset
722 docinfo['viewerURL'] = viewerUrl
130
5c779d7b5f71 more modular version with separate object MpdlXmlTextServer
casties
parents: 128
diff changeset
723
5c779d7b5f71 more modular version with separate object MpdlXmlTextServer
casties
parents: 128
diff changeset
724 # old style text URL
453
beb7ccb92564 first version using elementtree instead of 4suite xml
casties
parents: 405
diff changeset
725 textUrl = getText(dom.find(".//texttool/text"))
beb7ccb92564 first version using elementtree instead of 4suite xml
casties
parents: 405
diff changeset
726 if textUrl:
84
a6e4f9b6729a first version with new full-text infrastructure and slightly changed templates
casties
parents: 83
diff changeset
727 if urlparse.urlparse(textUrl)[0] == "": #keine url
a6e4f9b6729a first version with new full-text infrastructure and slightly changed templates
casties
parents: 83
diff changeset
728 textUrl = os.path.join(archivePath, textUrl)
a6e4f9b6729a first version with new full-text infrastructure and slightly changed templates
casties
parents: 83
diff changeset
729 # fix URLs starting with /mpiwg/online
a6e4f9b6729a first version with new full-text infrastructure and slightly changed templates
casties
parents: 83
diff changeset
730 if textUrl.startswith("/mpiwg/online"):
a6e4f9b6729a first version with new full-text infrastructure and slightly changed templates
casties
parents: 83
diff changeset
731 textUrl = textUrl.replace("/mpiwg/online", '', 1)
a6e4f9b6729a first version with new full-text infrastructure and slightly changed templates
casties
parents: 83
diff changeset
732
a6e4f9b6729a first version with new full-text infrastructure and slightly changed templates
casties
parents: 83
diff changeset
733 docinfo['textURL'] = textUrl
a6e4f9b6729a first version with new full-text infrastructure and slightly changed templates
casties
parents: 83
diff changeset
734
130
5c779d7b5f71 more modular version with separate object MpdlXmlTextServer
casties
parents: 128
diff changeset
735 # new style text-url-path
453
beb7ccb92564 first version using elementtree instead of 4suite xml
casties
parents: 405
diff changeset
736 textUrl = getText(dom.find(".//texttool/text-url-path"))
beb7ccb92564 first version using elementtree instead of 4suite xml
casties
parents: 405
diff changeset
737 if textUrl:
102
27513c893ba9 trying to fix text-only documents
casties
parents: 101
diff changeset
738 docinfo['textURLPath'] = textUrl
453
beb7ccb92564 first version using elementtree instead of 4suite xml
casties
parents: 405
diff changeset
739 textUrlkurz = string.split(textUrl, ".")[0]
beb7ccb92564 first version using elementtree instead of 4suite xml
casties
parents: 405
diff changeset
740 docinfo['textURLPathkurz'] = textUrlkurz
beb7ccb92564 first version using elementtree instead of 4suite xml
casties
parents: 405
diff changeset
741 #if not docinfo['imagePath']:
102
27513c893ba9 trying to fix text-only documents
casties
parents: 101
diff changeset
742 # text-only, no page images
453
beb7ccb92564 first version using elementtree instead of 4suite xml
casties
parents: 405
diff changeset
743 #docinfo = self.getNumTextPages(docinfo)
beb7ccb92564 first version using elementtree instead of 4suite xml
casties
parents: 405
diff changeset
744
84
a6e4f9b6729a first version with new full-text infrastructure and slightly changed templates
casties
parents: 83
diff changeset
745
453
beb7ccb92564 first version using elementtree instead of 4suite xml
casties
parents: 405
diff changeset
746 presentationUrl = getText(dom.find(".//texttool/presentation"))
84
a6e4f9b6729a first version with new full-text infrastructure and slightly changed templates
casties
parents: 83
diff changeset
747 docinfo = self.getBibinfoFromIndexMeta(url, docinfo=docinfo, dom=dom) # get info von bib tag
454
73e3273c7624 more work
casties
parents: 453
diff changeset
748 # TODO: is this needed here?
228
9306c8d0dc4a *** empty log message ***
abukhman
parents: 227
diff changeset
749 docinfo = self.getNameFromIndexMeta(url, docinfo=docinfo, dom=dom)
386
48d27e100d19 *** empty log message ***
abukhman
parents: 384
diff changeset
750
84
a6e4f9b6729a first version with new full-text infrastructure and slightly changed templates
casties
parents: 83
diff changeset
751
453
beb7ccb92564 first version using elementtree instead of 4suite xml
casties
parents: 405
diff changeset
752 if presentationUrl: # ueberschreibe diese durch presentation informationen
84
a6e4f9b6729a first version with new full-text infrastructure and slightly changed templates
casties
parents: 83
diff changeset
753 # 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
754 # durch den relativen Pfad auf die presentation infos
453
beb7ccb92564 first version using elementtree instead of 4suite xml
casties
parents: 405
diff changeset
755 presentationPath = presentationUrl
84
a6e4f9b6729a first version with new full-text infrastructure and slightly changed templates
casties
parents: 83
diff changeset
756 if url.endswith("index.meta"):
a6e4f9b6729a first version with new full-text infrastructure and slightly changed templates
casties
parents: 83
diff changeset
757 presentationUrl = url.replace('index.meta', presentationPath)
a6e4f9b6729a first version with new full-text infrastructure and slightly changed templates
casties
parents: 83
diff changeset
758 else:
a6e4f9b6729a first version with new full-text infrastructure and slightly changed templates
casties
parents: 83
diff changeset
759 presentationUrl = url + "/" + presentationPath
102
27513c893ba9 trying to fix text-only documents
casties
parents: 101
diff changeset
760
84
a6e4f9b6729a first version with new full-text infrastructure and slightly changed templates
casties
parents: 83
diff changeset
761 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
762
a6e4f9b6729a first version with new full-text infrastructure and slightly changed templates
casties
parents: 83
diff changeset
763 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
764
a6e4f9b6729a first version with new full-text infrastructure and slightly changed templates
casties
parents: 83
diff changeset
765 return docinfo
22
b139f9937e97 preliminary version 0.2
casties
parents: 20
diff changeset
766
50
6c0f20cecc60 added evaluation of the presentation/info.xml in texttools
dwinter
parents: 49
diff changeset
767
6c0f20cecc60 added evaluation of the presentation/info.xml in texttools
dwinter
parents: 49
diff changeset
768 def getBibinfoFromTextToolPresentation(self,url,docinfo=None,dom=None):
6c0f20cecc60 added evaluation of the presentation/info.xml in texttools
dwinter
parents: 49
diff changeset
769 """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
770 """
6c0f20cecc60 added evaluation of the presentation/info.xml in texttools
dwinter
parents: 49
diff changeset
771 dom=self.getPresentationInfoXML(url)
454
73e3273c7624 more work
casties
parents: 453
diff changeset
772 docinfo['author']=getText(dom.find(".//author"))
73e3273c7624 more work
casties
parents: 453
diff changeset
773 docinfo['title']=getText(dom.find(".//title"))
73e3273c7624 more work
casties
parents: 453
diff changeset
774 docinfo['year']=getText(dom.find(".//date"))
50
6c0f20cecc60 added evaluation of the presentation/info.xml in texttools
dwinter
parents: 49
diff changeset
775 return docinfo
6c0f20cecc60 added evaluation of the presentation/info.xml in texttools
dwinter
parents: 49
diff changeset
776
70
0049d64aa464 filepath introduced
dwinter
parents: 68
diff changeset
777 def getDocinfoFromImagePath(self,path,docinfo=None,cut=0):
22
b139f9937e97 preliminary version 0.2
casties
parents: 20
diff changeset
778 """path ist the path to the images it assumes that the index.meta file is one level higher."""
167
7e2b97941a66 characterNormalization
abukhman
parents: 166
diff changeset
779 logging.debug("documentViewer (getdocinfofromimagepath) path: %s"%(path))
22
b139f9937e97 preliminary version 0.2
casties
parents: 20
diff changeset
780 if docinfo is None:
b139f9937e97 preliminary version 0.2
casties
parents: 20
diff changeset
781 docinfo = {}
29
e1bed068b351 small fixes
casties
parents: 28
diff changeset
782 path=path.replace("/mpiwg/online","")
22
b139f9937e97 preliminary version 0.2
casties
parents: 20
diff changeset
783 docinfo['imagePath'] = path
73
dwinter
parents: 71
diff changeset
784 docinfo=self.getDirinfoFromDigilib(path,docinfo=docinfo,cut=cut)
78
70ab234a18dc bugs in filepath mode fixes
dwinter
parents: 75
diff changeset
785
79
df6952ac93e9 bug in getDocInforFromImagePath, relative lage der index.meta zu path war falsch.
dwinter
parents: 78
diff changeset
786 pathorig=path
78
70ab234a18dc bugs in filepath mode fixes
dwinter
parents: 75
diff changeset
787 for x in range(cut):
70ab234a18dc bugs in filepath mode fixes
dwinter
parents: 75
diff changeset
788 path=getParentDir(path)
167
7e2b97941a66 characterNormalization
abukhman
parents: 166
diff changeset
789 logging.debug("documentViewer (getdocinfofromimagepath) PATH:"+path)
31
c6451e8d5d23 more small fixes - now version 0.2.2
casties
parents: 29
diff changeset
790 imageUrl=self.digilibBaseUrl+"/servlet/Scaler?fn="+path
22
b139f9937e97 preliminary version 0.2
casties
parents: 20
diff changeset
791 docinfo['imageURL'] = imageUrl
b139f9937e97 preliminary version 0.2
casties
parents: 20
diff changeset
792
79
df6952ac93e9 bug in getDocInforFromImagePath, relative lage der index.meta zu path war falsch.
dwinter
parents: 78
diff changeset
793 #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
794 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
795 docinfo = self.getAuthinfoFromIndexMeta(pathorig,docinfo=docinfo,cut=cut+1)
22
b139f9937e97 preliminary version 0.2
casties
parents: 20
diff changeset
796 return docinfo
20
9884703dae70 new modi
dwinter
parents: 0
diff changeset
797
22
b139f9937e97 preliminary version 0.2
casties
parents: 20
diff changeset
798
b139f9937e97 preliminary version 0.2
casties
parents: 20
diff changeset
799 def getDocinfo(self, mode, url):
b139f9937e97 preliminary version 0.2
casties
parents: 20
diff changeset
800 """returns docinfo depending on mode"""
167
7e2b97941a66 characterNormalization
abukhman
parents: 166
diff changeset
801 logging.debug("documentViewer (getdocinfo) mode: %s, url: %s"%(mode,url))
22
b139f9937e97 preliminary version 0.2
casties
parents: 20
diff changeset
802 # look for cached docinfo in session
51
c5d3aabbf61b textviewer now integrated, new modus auto introduced as standard for viewing
dwinter
parents: 50
diff changeset
803 if self.REQUEST.SESSION.has_key('docinfo'):
22
b139f9937e97 preliminary version 0.2
casties
parents: 20
diff changeset
804 docinfo = self.REQUEST.SESSION['docinfo']
b139f9937e97 preliminary version 0.2
casties
parents: 20
diff changeset
805 # check if its still current
b139f9937e97 preliminary version 0.2
casties
parents: 20
diff changeset
806 if docinfo is not None and docinfo.get('mode') == mode and docinfo.get('url') == url:
455
0a53fea83df7 more work renovating
casties
parents: 454
diff changeset
807 logging.debug("documentViewer (getdocinfo) docinfo in session. keys=%s"%docinfo.keys())
22
b139f9937e97 preliminary version 0.2
casties
parents: 20
diff changeset
808 return docinfo
455
0a53fea83df7 more work renovating
casties
parents: 454
diff changeset
809
22
b139f9937e97 preliminary version 0.2
casties
parents: 20
diff changeset
810 # new docinfo
b139f9937e97 preliminary version 0.2
casties
parents: 20
diff changeset
811 docinfo = {'mode': mode, 'url': url}
455
0a53fea83df7 more work renovating
casties
parents: 454
diff changeset
812 # add self url
0a53fea83df7 more work renovating
casties
parents: 454
diff changeset
813 docinfo['viewerUrl'] = self.getDocumentViewerURL()
0a53fea83df7 more work renovating
casties
parents: 454
diff changeset
814 if mode=="texttool":
0a53fea83df7 more work renovating
casties
parents: 454
diff changeset
815 # index.meta with texttool information
22
b139f9937e97 preliminary version 0.2
casties
parents: 20
diff changeset
816 docinfo = self.getDocinfoFromTextTool(url, docinfo=docinfo)
b139f9937e97 preliminary version 0.2
casties
parents: 20
diff changeset
817 elif mode=="imagepath":
455
0a53fea83df7 more work renovating
casties
parents: 454
diff changeset
818 # folder with images, index.meta optional
22
b139f9937e97 preliminary version 0.2
casties
parents: 20
diff changeset
819 docinfo = self.getDocinfoFromImagePath(url, docinfo=docinfo)
70
0049d64aa464 filepath introduced
dwinter
parents: 68
diff changeset
820 elif mode=="filepath":
455
0a53fea83df7 more work renovating
casties
parents: 454
diff changeset
821 # filename
75
9673218e155b minorCVS: ----------------------------------------------------------------------
dwinter
parents: 74
diff changeset
822 docinfo = self.getDocinfoFromImagePath(url, docinfo=docinfo,cut=1)
22
b139f9937e97 preliminary version 0.2
casties
parents: 20
diff changeset
823 else:
167
7e2b97941a66 characterNormalization
abukhman
parents: 166
diff changeset
824 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
825 raise ValueError("Unknown mode %s! Has to be one of 'texttool','imagepath','filepath'."%(mode))
453
beb7ccb92564 first version using elementtree instead of 4suite xml
casties
parents: 405
diff changeset
826
beb7ccb92564 first version using elementtree instead of 4suite xml
casties
parents: 405
diff changeset
827 # FIXME: fake texturlpath
beb7ccb92564 first version using elementtree instead of 4suite xml
casties
parents: 405
diff changeset
828 if not docinfo.has_key('textURLPath'):
beb7ccb92564 first version using elementtree instead of 4suite xml
casties
parents: 405
diff changeset
829 docinfo['textURLPath'] = None
beb7ccb92564 first version using elementtree instead of 4suite xml
casties
parents: 405
diff changeset
830
458
48b135b089c8 more renovation
casties
parents: 457
diff changeset
831 logging.debug("documentViewer (getdocinfo) docinfo: keys=%s"%docinfo.keys())
48b135b089c8 more renovation
casties
parents: 457
diff changeset
832 #logging.debug("documentViewer (getdocinfo) docinfo: %s"%docinfo)
22
b139f9937e97 preliminary version 0.2
casties
parents: 20
diff changeset
833 self.REQUEST.SESSION['docinfo'] = docinfo
b139f9937e97 preliminary version 0.2
casties
parents: 20
diff changeset
834 return docinfo
128
4db49915d825 Last lemma
abukhman
parents: 127
diff changeset
835
405
b8fb4c750d74 fix for characternormalization default
casties
parents: 404
diff changeset
836 def getPageinfo(self, current, start=None, rows=None, cols=None, docinfo=None, viewMode=None, tocMode=None):
22
b139f9937e97 preliminary version 0.2
casties
parents: 20
diff changeset
837 """returns pageinfo with the given parameters"""
b139f9937e97 preliminary version 0.2
casties
parents: 20
diff changeset
838 pageinfo = {}
25
e93fb8cadd3a new, less preliminary version 0.2
casties
parents: 22
diff changeset
839 current = getInt(current)
338
0576f524e2ee *** empty log message ***
abukhman
parents: 337
diff changeset
840
25
e93fb8cadd3a new, less preliminary version 0.2
casties
parents: 22
diff changeset
841 pageinfo['current'] = current
e93fb8cadd3a new, less preliminary version 0.2
casties
parents: 22
diff changeset
842 rows = int(rows or self.thumbrows)
e93fb8cadd3a new, less preliminary version 0.2
casties
parents: 22
diff changeset
843 pageinfo['rows'] = rows
e93fb8cadd3a new, less preliminary version 0.2
casties
parents: 22
diff changeset
844 cols = int(cols or self.thumbcols)
e93fb8cadd3a new, less preliminary version 0.2
casties
parents: 22
diff changeset
845 pageinfo['cols'] = cols
e93fb8cadd3a new, less preliminary version 0.2
casties
parents: 22
diff changeset
846 grpsize = cols * rows
e93fb8cadd3a new, less preliminary version 0.2
casties
parents: 22
diff changeset
847 pageinfo['groupsize'] = grpsize
61
f3d2f240692c fixed bug in calculation of group numbers
casties
parents: 59
diff changeset
848 start = getInt(start, default=(math.ceil(float(current)/float(grpsize))*grpsize-(grpsize-1)))
f3d2f240692c fixed bug in calculation of group numbers
casties
parents: 59
diff changeset
849 # int(current / grpsize) * grpsize +1))
22
b139f9937e97 preliminary version 0.2
casties
parents: 20
diff changeset
850 pageinfo['start'] = start
25
e93fb8cadd3a new, less preliminary version 0.2
casties
parents: 22
diff changeset
851 pageinfo['end'] = start + grpsize
90
6a4a72033d58 new version with new full-text infrastructure and some more changed templates
casties
parents: 84
diff changeset
852 if (docinfo is not None) and ('numPages' in docinfo):
25
e93fb8cadd3a new, less preliminary version 0.2
casties
parents: 22
diff changeset
853 np = int(docinfo['numPages'])
e93fb8cadd3a new, less preliminary version 0.2
casties
parents: 22
diff changeset
854 pageinfo['end'] = min(pageinfo['end'], np)
e93fb8cadd3a new, less preliminary version 0.2
casties
parents: 22
diff changeset
855 pageinfo['numgroups'] = int(np / grpsize)
e93fb8cadd3a new, less preliminary version 0.2
casties
parents: 22
diff changeset
856 if np % grpsize > 0:
128
4db49915d825 Last lemma
abukhman
parents: 127
diff changeset
857 pageinfo['numgroups'] += 1
90
6a4a72033d58 new version with new full-text infrastructure and some more changed templates
casties
parents: 84
diff changeset
858 pageinfo['viewMode'] = viewMode
6a4a72033d58 new version with new full-text infrastructure and some more changed templates
casties
parents: 84
diff changeset
859 pageinfo['tocMode'] = tocMode
453
beb7ccb92564 first version using elementtree instead of 4suite xml
casties
parents: 405
diff changeset
860 pageinfo['characterNormalization'] = self.REQUEST.get('characterNormalization','reg')
beb7ccb92564 first version using elementtree instead of 4suite xml
casties
parents: 405
diff changeset
861 #pageinfo['optionToggle'] = self.REQUEST.get('optionToggle','1')
398
55f9eeebc338 *** empty log message ***
abukhman
parents: 397
diff changeset
862 pageinfo['query'] = self.REQUEST.get('query','')
384
4ec393062711 *** empty log message ***
abukhman
parents: 382
diff changeset
863 pageinfo['queryType'] = self.REQUEST.get('queryType','')
95
db6d594aa4d9 Last update with search function (getSearch)
abukhman
parents: 90
diff changeset
864 pageinfo['querySearch'] =self.REQUEST.get('querySearch', 'fulltext')
99
4738a696d265 Search function update
abukhman
parents: 97
diff changeset
865 pageinfo['textPN'] = self.REQUEST.get('textPN','1')
384
4ec393062711 *** empty log message ***
abukhman
parents: 382
diff changeset
866 pageinfo['highlightQuery'] = self.REQUEST.get('highlightQuery','')
95
db6d594aa4d9 Last update with search function (getSearch)
abukhman
parents: 90
diff changeset
867 pageinfo['tocPageSize'] = self.REQUEST.get('tocPageSize', '30')
105
6bffb612cd6a *** empty log message ***
abukhman
parents: 104
diff changeset
868 pageinfo['queryPageSize'] =self.REQUEST.get('queryPageSize', '10')
453
beb7ccb92564 first version using elementtree instead of 4suite xml
casties
parents: 405
diff changeset
869 pageinfo['tocPN'] = self.REQUEST.get('tocPN', '1')
99
4738a696d265 Search function update
abukhman
parents: 97
diff changeset
870 toc = int (pageinfo['tocPN'])
4738a696d265 Search function update
abukhman
parents: 97
diff changeset
871 pageinfo['textPages'] =int (toc)
158
4f4fe4e56ffe characterNormalization
abukhman
parents: 157
diff changeset
872
99
4738a696d265 Search function update
abukhman
parents: 97
diff changeset
873 if 'tocSize_%s'%tocMode in docinfo:
4738a696d265 Search function update
abukhman
parents: 97
diff changeset
874 tocSize = int(docinfo['tocSize_%s'%tocMode])
4738a696d265 Search function update
abukhman
parents: 97
diff changeset
875 tocPageSize = int(pageinfo['tocPageSize'])
128
4db49915d825 Last lemma
abukhman
parents: 127
diff changeset
876 # cached toc
99
4738a696d265 Search function update
abukhman
parents: 97
diff changeset
877 if tocSize%tocPageSize>0:
4738a696d265 Search function update
abukhman
parents: 97
diff changeset
878 tocPages=tocSize/tocPageSize+1
4738a696d265 Search function update
abukhman
parents: 97
diff changeset
879 else:
4738a696d265 Search function update
abukhman
parents: 97
diff changeset
880 tocPages=tocSize/tocPageSize
128
4db49915d825 Last lemma
abukhman
parents: 127
diff changeset
881 pageinfo['tocPN'] = min (tocPages,toc)
95
db6d594aa4d9 Last update with search function (getSearch)
abukhman
parents: 90
diff changeset
882 pageinfo['searchPN'] =self.REQUEST.get('searchPN','1')
112
d48c1d507556 *** empty log message ***
abukhman
parents: 109
diff changeset
883 pageinfo['sn'] =self.REQUEST.get('sn','')
22
b139f9937e97 preliminary version 0.2
casties
parents: 20
diff changeset
884 return pageinfo
b139f9937e97 preliminary version 0.2
casties
parents: 20
diff changeset
885
128
4db49915d825 Last lemma
abukhman
parents: 127
diff changeset
886 def changeDocumentViewer(self,title="",digilibBaseUrl=None,thumbrows=2,thumbcols=5,authgroups='mpiwg',RESPONSE=None):
22
b139f9937e97 preliminary version 0.2
casties
parents: 20
diff changeset
887 """init document viewer"""
b139f9937e97 preliminary version 0.2
casties
parents: 20
diff changeset
888 self.title=title
b139f9937e97 preliminary version 0.2
casties
parents: 20
diff changeset
889 self.digilibBaseUrl = digilibBaseUrl
25
e93fb8cadd3a new, less preliminary version 0.2
casties
parents: 22
diff changeset
890 self.thumbrows = thumbrows
e93fb8cadd3a new, less preliminary version 0.2
casties
parents: 22
diff changeset
891 self.thumbcols = thumbcols
32
b25c89d693cf version 0.2.3 - first version with access control!
casties
parents: 31
diff changeset
892 self.authgroups = [s.strip().lower() for s in authgroups.split(',')]
22
b139f9937e97 preliminary version 0.2
casties
parents: 20
diff changeset
893 if RESPONSE is not None:
b139f9937e97 preliminary version 0.2
casties
parents: 20
diff changeset
894 RESPONSE.redirect('manage_main')
0
dwinter
parents:
diff changeset
895
dwinter
parents:
diff changeset
896 def manage_AddDocumentViewerForm(self):
dwinter
parents:
diff changeset
897 """add the viewer form"""
22
b139f9937e97 preliminary version 0.2
casties
parents: 20
diff changeset
898 pt=PageTemplateFile('zpt/addDocumentViewer', globals()).__of__(self)
0
dwinter
parents:
diff changeset
899 return pt()
dwinter
parents:
diff changeset
900
84
a6e4f9b6729a first version with new full-text infrastructure and slightly changed templates
casties
parents: 83
diff changeset
901 def manage_AddDocumentViewer(self,id,imageScalerUrl="",textServerName="",title="",RESPONSE=None):
0
dwinter
parents:
diff changeset
902 """add the viewer"""
84
a6e4f9b6729a first version with new full-text infrastructure and slightly changed templates
casties
parents: 83
diff changeset
903 newObj=documentViewer(id,imageScalerUrl=imageScalerUrl,title=title,textServerName=textServerName)
0
dwinter
parents:
diff changeset
904 self._setObject(id,newObj)
dwinter
parents:
diff changeset
905
dwinter
parents:
diff changeset
906 if RESPONSE is not None:
dwinter
parents:
diff changeset
907 RESPONSE.redirect('manage_main')
22
b139f9937e97 preliminary version 0.2
casties
parents: 20
diff changeset
908
b139f9937e97 preliminary version 0.2
casties
parents: 20
diff changeset
909 ## DocumentViewerTemplate class
b139f9937e97 preliminary version 0.2
casties
parents: 20
diff changeset
910 class DocumentViewerTemplate(ZopePageTemplate):
b139f9937e97 preliminary version 0.2
casties
parents: 20
diff changeset
911 """Template for document viewer"""
b139f9937e97 preliminary version 0.2
casties
parents: 20
diff changeset
912 meta_type="DocumentViewer Template"
b139f9937e97 preliminary version 0.2
casties
parents: 20
diff changeset
913
b139f9937e97 preliminary version 0.2
casties
parents: 20
diff changeset
914
b139f9937e97 preliminary version 0.2
casties
parents: 20
diff changeset
915 def manage_addDocumentViewerTemplateForm(self):
b139f9937e97 preliminary version 0.2
casties
parents: 20
diff changeset
916 """Form for adding"""
b139f9937e97 preliminary version 0.2
casties
parents: 20
diff changeset
917 pt=PageTemplateFile('zpt/addDocumentViewerTemplate', globals()).__of__(self)
b139f9937e97 preliminary version 0.2
casties
parents: 20
diff changeset
918 return pt()
b139f9937e97 preliminary version 0.2
casties
parents: 20
diff changeset
919
b139f9937e97 preliminary version 0.2
casties
parents: 20
diff changeset
920 def manage_addDocumentViewerTemplate(self, id='viewer_main', title=None, text=None,
b139f9937e97 preliminary version 0.2
casties
parents: 20
diff changeset
921 REQUEST=None, submit=None):
b139f9937e97 preliminary version 0.2
casties
parents: 20
diff changeset
922 "Add a Page Template with optional file content."
b139f9937e97 preliminary version 0.2
casties
parents: 20
diff changeset
923
b139f9937e97 preliminary version 0.2
casties
parents: 20
diff changeset
924 self._setObject(id, DocumentViewerTemplate(id))
b139f9937e97 preliminary version 0.2
casties
parents: 20
diff changeset
925 ob = getattr(self, id)
53
f4e0af8c281d NEW - # 44: ECHO - vollst?ndige bibliographische Angabe
dwinter
parents: 52
diff changeset
926 txt=file(os.path.join(package_home(globals()),'zpt/viewer_main.zpt'),'r').read()
167
7e2b97941a66 characterNormalization
abukhman
parents: 166
diff changeset
927 logging.info("txt %s:"%txt)
53
f4e0af8c281d NEW - # 44: ECHO - vollst?ndige bibliographische Angabe
dwinter
parents: 52
diff changeset
928 ob.pt_edit(txt,"text/html")
22
b139f9937e97 preliminary version 0.2
casties
parents: 20
diff changeset
929 if title:
b139f9937e97 preliminary version 0.2
casties
parents: 20
diff changeset
930 ob.pt_setTitle(title)
b139f9937e97 preliminary version 0.2
casties
parents: 20
diff changeset
931 try:
b139f9937e97 preliminary version 0.2
casties
parents: 20
diff changeset
932 u = self.DestinationURL()
b139f9937e97 preliminary version 0.2
casties
parents: 20
diff changeset
933 except AttributeError:
b139f9937e97 preliminary version 0.2
casties
parents: 20
diff changeset
934 u = REQUEST['URL1']
b139f9937e97 preliminary version 0.2
casties
parents: 20
diff changeset
935
b139f9937e97 preliminary version 0.2
casties
parents: 20
diff changeset
936 u = "%s/%s" % (u, urllib.quote(id))
b139f9937e97 preliminary version 0.2
casties
parents: 20
diff changeset
937 REQUEST.RESPONSE.redirect(u+'/manage_main')
b139f9937e97 preliminary version 0.2
casties
parents: 20
diff changeset
938 return ''
b139f9937e97 preliminary version 0.2
casties
parents: 20
diff changeset
939
b139f9937e97 preliminary version 0.2
casties
parents: 20
diff changeset
940
41
0c8ee8fcfd76 some more logging
casties
parents: 40
diff changeset
941