annotate documentViewer.py @ 97:2b8fd19432fb

Last update
author abukhman
date Tue, 27 Apr 2010 14:58:31 +0200
parents a679c8c7148d
children 4738a696d265
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
rev   line source
46
31059e3d9338 has now also a text mode viewMode=text
dwinter
parents: 45
diff changeset
1
0
dwinter
parents:
diff changeset
2 from OFS.Folder import Folder
dwinter
parents:
diff changeset
3 from Products.PageTemplates.ZopePageTemplate import ZopePageTemplate
52
92047eaa6272 zLOG exchanged by logging
dwinter
parents: 51
diff changeset
4 from Products.PageTemplates.PageTemplateFile import PageTemplateFile
0
dwinter
parents:
diff changeset
5 from AccessControl import ClassSecurityInfo
32
b25c89d693cf version 0.2.3 - first version with access control!
casties
parents: 31
diff changeset
6 from AccessControl import getSecurityManager
0
dwinter
parents:
diff changeset
7 from Globals import package_home
dwinter
parents:
diff changeset
8
dwinter
parents:
diff changeset
9 from Ft.Xml.Domlette import NonvalidatingReader
dwinter
parents:
diff changeset
10 from Ft.Xml.Domlette import PrettyPrint, Print
38
025d3b6cba51 fixes by dirk
casties
parents: 37
diff changeset
11 from Ft.Xml import EMPTY_NAMESPACE, Parse
0
dwinter
parents:
diff changeset
12
97
2b8fd19432fb Last update
abukhman
parents: 96
diff changeset
13 from xml.dom.minidom import parse, parseString
2b8fd19432fb Last update
abukhman
parents: 96
diff changeset
14
2b8fd19432fb Last update
abukhman
parents: 96
diff changeset
15
83
ec12a2440daa My last update Bukhman Andrey
abukhman
parents: 82
diff changeset
16
0
dwinter
parents:
diff changeset
17 import Ft.Xml.XPath
84
a6e4f9b6729a first version with new full-text infrastructure and slightly changed templates
casties
parents: 83
diff changeset
18 import cStringIO
83
ec12a2440daa My last update Bukhman Andrey
abukhman
parents: 82
diff changeset
19 import xmlrpclib
0
dwinter
parents:
diff changeset
20 import os.path
31
c6451e8d5d23 more small fixes - now version 0.2.2
casties
parents: 29
diff changeset
21 import sys
0
dwinter
parents:
diff changeset
22 import cgi
dwinter
parents:
diff changeset
23 import urllib
50
6c0f20cecc60 added evaluation of the presentation/info.xml in texttools
dwinter
parents: 49
diff changeset
24 import logging
61
f3d2f240692c fixed bug in calculation of group numbers
casties
parents: 59
diff changeset
25 import math
52
92047eaa6272 zLOG exchanged by logging
dwinter
parents: 51
diff changeset
26
46
31059e3d9338 has now also a text mode viewMode=text
dwinter
parents: 45
diff changeset
27 import urlparse
75
9673218e155b minorCVS: ----------------------------------------------------------------------
dwinter
parents: 74
diff changeset
28 from types import *
84
a6e4f9b6729a first version with new full-text infrastructure and slightly changed templates
casties
parents: 83
diff changeset
29
52
92047eaa6272 zLOG exchanged by logging
dwinter
parents: 51
diff changeset
30 def logger(txt,method,txt2):
92047eaa6272 zLOG exchanged by logging
dwinter
parents: 51
diff changeset
31 """logging"""
92047eaa6272 zLOG exchanged by logging
dwinter
parents: 51
diff changeset
32 logging.info(txt+ txt2)
92047eaa6272 zLOG exchanged by logging
dwinter
parents: 51
diff changeset
33
92047eaa6272 zLOG exchanged by logging
dwinter
parents: 51
diff changeset
34
25
e93fb8cadd3a new, less preliminary version 0.2
casties
parents: 22
diff changeset
35 def getInt(number, default=0):
e93fb8cadd3a new, less preliminary version 0.2
casties
parents: 22
diff changeset
36 """returns always an int (0 in case of problems)"""
e93fb8cadd3a new, less preliminary version 0.2
casties
parents: 22
diff changeset
37 try:
e93fb8cadd3a new, less preliminary version 0.2
casties
parents: 22
diff changeset
38 return int(number)
e93fb8cadd3a new, less preliminary version 0.2
casties
parents: 22
diff changeset
39 except:
62
8a16ea8db858 fixed bug in getInt
casties
parents: 61
diff changeset
40 return int(default)
25
e93fb8cadd3a new, less preliminary version 0.2
casties
parents: 22
diff changeset
41
0
dwinter
parents:
diff changeset
42 def getTextFromNode(nodename):
46
31059e3d9338 has now also a text mode viewMode=text
dwinter
parents: 45
diff changeset
43 """get the cdata content of a node"""
32
b25c89d693cf version 0.2.3 - first version with access control!
casties
parents: 31
diff changeset
44 if nodename is None:
b25c89d693cf version 0.2.3 - first version with access control!
casties
parents: 31
diff changeset
45 return ""
0
dwinter
parents:
diff changeset
46 nodelist=nodename.childNodes
dwinter
parents:
diff changeset
47 rc = ""
dwinter
parents:
diff changeset
48 for node in nodelist:
dwinter
parents:
diff changeset
49 if node.nodeType == node.TEXT_NODE:
dwinter
parents:
diff changeset
50 rc = rc + node.data
dwinter
parents:
diff changeset
51 return rc
dwinter
parents:
diff changeset
52
84
a6e4f9b6729a first version with new full-text infrastructure and slightly changed templates
casties
parents: 83
diff changeset
53 def serializeNode(node, encoding='utf-8'):
a6e4f9b6729a first version with new full-text infrastructure and slightly changed templates
casties
parents: 83
diff changeset
54 """returns a string containing node as XML"""
a6e4f9b6729a first version with new full-text infrastructure and slightly changed templates
casties
parents: 83
diff changeset
55 buf = cStringIO.StringIO()
a6e4f9b6729a first version with new full-text infrastructure and slightly changed templates
casties
parents: 83
diff changeset
56 Print(node, stream=buf, encoding=encoding)
a6e4f9b6729a first version with new full-text infrastructure and slightly changed templates
casties
parents: 83
diff changeset
57 s = buf.getvalue()
a6e4f9b6729a first version with new full-text infrastructure and slightly changed templates
casties
parents: 83
diff changeset
58 buf.close()
a6e4f9b6729a first version with new full-text infrastructure and slightly changed templates
casties
parents: 83
diff changeset
59 return s
a6e4f9b6729a first version with new full-text infrastructure and slightly changed templates
casties
parents: 83
diff changeset
60
35
2d9261aea8f3 version 0.2.4
casties
parents: 32
diff changeset
61
2d9261aea8f3 version 0.2.4
casties
parents: 32
diff changeset
62 def getParentDir(path):
2d9261aea8f3 version 0.2.4
casties
parents: 32
diff changeset
63 """returns pathname shortened by one"""
2d9261aea8f3 version 0.2.4
casties
parents: 32
diff changeset
64 return '/'.join(path.split('/')[0:-1])
2d9261aea8f3 version 0.2.4
casties
parents: 32
diff changeset
65
2d9261aea8f3 version 0.2.4
casties
parents: 32
diff changeset
66
0
dwinter
parents:
diff changeset
67 import socket
dwinter
parents:
diff changeset
68
32
b25c89d693cf version 0.2.3 - first version with access control!
casties
parents: 31
diff changeset
69 def urlopen(url,timeout=2):
0
dwinter
parents:
diff changeset
70 """urlopen mit timeout"""
32
b25c89d693cf version 0.2.3 - first version with access control!
casties
parents: 31
diff changeset
71 socket.setdefaulttimeout(timeout)
0
dwinter
parents:
diff changeset
72 ret=urllib.urlopen(url)
dwinter
parents:
diff changeset
73 socket.setdefaulttimeout(5)
dwinter
parents:
diff changeset
74 return ret
dwinter
parents:
diff changeset
75
dwinter
parents:
diff changeset
76
22
b139f9937e97 preliminary version 0.2
casties
parents: 20
diff changeset
77 ##
b139f9937e97 preliminary version 0.2
casties
parents: 20
diff changeset
78 ## documentViewer class
b139f9937e97 preliminary version 0.2
casties
parents: 20
diff changeset
79 ##
b139f9937e97 preliminary version 0.2
casties
parents: 20
diff changeset
80 class documentViewer(Folder):
0
dwinter
parents:
diff changeset
81 """document viewer"""
50
6c0f20cecc60 added evaluation of the presentation/info.xml in texttools
dwinter
parents: 49
diff changeset
82 #textViewerUrl="http://127.0.0.1:8080/HFQP/testXSLT/getPage?"
46
31059e3d9338 has now also a text mode viewMode=text
dwinter
parents: 45
diff changeset
83
0
dwinter
parents:
diff changeset
84 meta_type="Document viewer"
dwinter
parents:
diff changeset
85
dwinter
parents:
diff changeset
86 security=ClassSecurityInfo()
22
b139f9937e97 preliminary version 0.2
casties
parents: 20
diff changeset
87 manage_options=Folder.manage_options+(
0
dwinter
parents:
diff changeset
88 {'label':'main config','action':'changeDocumentViewerForm'},
dwinter
parents:
diff changeset
89 )
dwinter
parents:
diff changeset
90
22
b139f9937e97 preliminary version 0.2
casties
parents: 20
diff changeset
91 # templates and forms
b139f9937e97 preliminary version 0.2
casties
parents: 20
diff changeset
92 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
93 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
94 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
95 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
96 page_main_images = PageTemplateFile('zpt/page_main_images', globals())
a6e4f9b6729a first version with new full-text infrastructure and slightly changed templates
casties
parents: 83
diff changeset
97 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
98 page_main_text_dict = PageTemplateFile('zpt/page_main_text_dict', globals())
22
b139f9937e97 preliminary version 0.2
casties
parents: 20
diff changeset
99 head_main = PageTemplateFile('zpt/head_main', globals())
b139f9937e97 preliminary version 0.2
casties
parents: 20
diff changeset
100 docuviewer_css = PageTemplateFile('css/docuviewer.css', globals())
57
7cdb0fc34a92 added getInfo_xml method
casties
parents: 55
diff changeset
101 info_xml = PageTemplateFile('zpt/info_xml', globals())
22
b139f9937e97 preliminary version 0.2
casties
parents: 20
diff changeset
102
68
b8457fc33446 piclens rss/support
dwinter
parents: 65
diff changeset
103 thumbs_main_rss = PageTemplateFile('zpt/thumbs_main_rss', globals())
22
b139f9937e97 preliminary version 0.2
casties
parents: 20
diff changeset
104 security.declareProtected('View management screens','changeDocumentViewerForm')
b139f9937e97 preliminary version 0.2
casties
parents: 20
diff changeset
105 changeDocumentViewerForm = PageTemplateFile('zpt/changeDocumentViewer', globals())
b139f9937e97 preliminary version 0.2
casties
parents: 20
diff changeset
106
0
dwinter
parents:
diff changeset
107
95
db6d594aa4d9 Last update with search function (getSearch)
abukhman
parents: 90
diff changeset
108 def __init__(self,id,imageScalerUrl=None,textServerName=None,title="",digilibBaseUrl=None,thumbcols=2,thumbrows=5,authgroups="mpiwg"):
0
dwinter
parents:
diff changeset
109 """init document viewer"""
dwinter
parents:
diff changeset
110 self.id=id
dwinter
parents:
diff changeset
111 self.title=title
25
e93fb8cadd3a new, less preliminary version 0.2
casties
parents: 22
diff changeset
112 self.thumbcols = thumbcols
e93fb8cadd3a new, less preliminary version 0.2
casties
parents: 22
diff changeset
113 self.thumbrows = thumbrows
32
b25c89d693cf version 0.2.3 - first version with access control!
casties
parents: 31
diff changeset
114 # authgroups is list of authorized groups (delimited by ,)
b25c89d693cf version 0.2.3 - first version with access control!
casties
parents: 31
diff changeset
115 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
116 # 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
117
a6e4f9b6729a first version with new full-text infrastructure and slightly changed templates
casties
parents: 83
diff changeset
118 templateFolder = Folder('template')
a6e4f9b6729a first version with new full-text infrastructure and slightly changed templates
casties
parents: 83
diff changeset
119 #self['template'] = templateFolder # Zope-2.12 style
a6e4f9b6729a first version with new full-text infrastructure and slightly changed templates
casties
parents: 83
diff changeset
120 self._setObject('template',templateFolder) # old style
a6e4f9b6729a first version with new full-text infrastructure and slightly changed templates
casties
parents: 83
diff changeset
121 try:
a6e4f9b6729a first version with new full-text infrastructure and slightly changed templates
casties
parents: 83
diff changeset
122 from Products.XMLRpcTools.XMLRpcTools import XMLRpcServerProxy
a6e4f9b6729a first version with new full-text infrastructure and slightly changed templates
casties
parents: 83
diff changeset
123 xmlRpcClient = XMLRpcServerProxy(id='fulltextclient', serverUrl=textServerName, use_xmlrpc=False)
a6e4f9b6729a first version with new full-text infrastructure and slightly changed templates
casties
parents: 83
diff changeset
124 #templateFolder['fulltextclient'] = xmlRpcClient
a6e4f9b6729a first version with new full-text infrastructure and slightly changed templates
casties
parents: 83
diff changeset
125 templateFolder._setObject('fulltextclient',xmlRpcClient)
a6e4f9b6729a first version with new full-text infrastructure and slightly changed templates
casties
parents: 83
diff changeset
126 except Exception, e:
a6e4f9b6729a first version with new full-text infrastructure and slightly changed templates
casties
parents: 83
diff changeset
127 logging.error("Unable to create XMLRpcTools for fulltextclient: "+str(e))
a6e4f9b6729a first version with new full-text infrastructure and slightly changed templates
casties
parents: 83
diff changeset
128 try:
a6e4f9b6729a first version with new full-text infrastructure and slightly changed templates
casties
parents: 83
diff changeset
129 from Products.zogiLib.zogiLib import zogiLib
a6e4f9b6729a first version with new full-text infrastructure and slightly changed templates
casties
parents: 83
diff changeset
130 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
131 #templateFolder['zogilib'] = zogilib
a6e4f9b6729a first version with new full-text infrastructure and slightly changed templates
casties
parents: 83
diff changeset
132 templateFolder._setObject('zogilib',zogilib)
a6e4f9b6729a first version with new full-text infrastructure and slightly changed templates
casties
parents: 83
diff changeset
133 except Exception, e:
a6e4f9b6729a first version with new full-text infrastructure and slightly changed templates
casties
parents: 83
diff changeset
134 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
135
22
b139f9937e97 preliminary version 0.2
casties
parents: 20
diff changeset
136
68
b8457fc33446 piclens rss/support
dwinter
parents: 65
diff changeset
137 security.declareProtected('View','thumbs_rss')
b8457fc33446 piclens rss/support
dwinter
parents: 65
diff changeset
138 def thumbs_rss(self,mode,url,viewMode="auto",start=None,pn=1):
b8457fc33446 piclens rss/support
dwinter
parents: 65
diff changeset
139 '''
b8457fc33446 piclens rss/support
dwinter
parents: 65
diff changeset
140 view it
b8457fc33446 piclens rss/support
dwinter
parents: 65
diff changeset
141 @param mode: defines how to access the document behind url
b8457fc33446 piclens rss/support
dwinter
parents: 65
diff changeset
142 @param url: url which contains display information
b8457fc33446 piclens rss/support
dwinter
parents: 65
diff changeset
143 @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
144
b8457fc33446 piclens rss/support
dwinter
parents: 65
diff changeset
145 '''
84
a6e4f9b6729a first version with new full-text infrastructure and slightly changed templates
casties
parents: 83
diff changeset
146 logging.debug("HHHHHHHHHHHHHH:load the rss")
68
b8457fc33446 piclens rss/support
dwinter
parents: 65
diff changeset
147 logger("documentViewer (index)", logging.INFO, "mode: %s url:%s start:%s pn:%s"%(mode,url,start,pn))
b8457fc33446 piclens rss/support
dwinter
parents: 65
diff changeset
148
b8457fc33446 piclens rss/support
dwinter
parents: 65
diff changeset
149 if not hasattr(self, 'template'):
b8457fc33446 piclens rss/support
dwinter
parents: 65
diff changeset
150 # create template folder if it doesn't exist
b8457fc33446 piclens rss/support
dwinter
parents: 65
diff changeset
151 self.manage_addFolder('template')
b8457fc33446 piclens rss/support
dwinter
parents: 65
diff changeset
152
b8457fc33446 piclens rss/support
dwinter
parents: 65
diff changeset
153 if not self.digilibBaseUrl:
b8457fc33446 piclens rss/support
dwinter
parents: 65
diff changeset
154 self.digilibBaseUrl = self.findDigilibUrl() or "http://nausikaa.mpiwg-berlin.mpg.de/digitallibrary"
b8457fc33446 piclens rss/support
dwinter
parents: 65
diff changeset
155
b8457fc33446 piclens rss/support
dwinter
parents: 65
diff changeset
156 docinfo = self.getDocinfo(mode=mode,url=url)
b8457fc33446 piclens rss/support
dwinter
parents: 65
diff changeset
157 pageinfo = self.getPageinfo(start=start,current=pn,docinfo=docinfo)
b8457fc33446 piclens rss/support
dwinter
parents: 65
diff changeset
158 pt = getattr(self.template, 'thumbs_main_rss')
b8457fc33446 piclens rss/support
dwinter
parents: 65
diff changeset
159
b8457fc33446 piclens rss/support
dwinter
parents: 65
diff changeset
160 if viewMode=="auto": # automodus gewaehlt
b8457fc33446 piclens rss/support
dwinter
parents: 65
diff changeset
161 if docinfo.get("textURL",'') and self.textViewerUrl: #texturl gesetzt und textViewer konfiguriert
b8457fc33446 piclens rss/support
dwinter
parents: 65
diff changeset
162 viewMode="text"
b8457fc33446 piclens rss/support
dwinter
parents: 65
diff changeset
163 else:
b8457fc33446 piclens rss/support
dwinter
parents: 65
diff changeset
164 viewMode="images"
b8457fc33446 piclens rss/support
dwinter
parents: 65
diff changeset
165
b8457fc33446 piclens rss/support
dwinter
parents: 65
diff changeset
166 return pt(docinfo=docinfo,pageinfo=pageinfo,viewMode=viewMode)
b8457fc33446 piclens rss/support
dwinter
parents: 65
diff changeset
167
22
b139f9937e97 preliminary version 0.2
casties
parents: 20
diff changeset
168 security.declareProtected('View','index_html')
95
db6d594aa4d9 Last update with search function (getSearch)
abukhman
parents: 90
diff changeset
169 def index_html(self,url,mode="texttool",viewMode="auto",tocMode="thumbs",start=None,pn=1,mk=None, query=None, querySearch=None):
22
b139f9937e97 preliminary version 0.2
casties
parents: 20
diff changeset
170 '''
b139f9937e97 preliminary version 0.2
casties
parents: 20
diff changeset
171 view it
57
7cdb0fc34a92 added getInfo_xml method
casties
parents: 55
diff changeset
172 @param mode: defines how to access the document behind url
22
b139f9937e97 preliminary version 0.2
casties
parents: 20
diff changeset
173 @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
174 @param viewMode: if images display images, if text display text, default is auto (text,images or auto)
95
db6d594aa4d9 Last update with search function (getSearch)
abukhman
parents: 90
diff changeset
175 @param tocMode: type of 'table of contents' for navigation (thumbs, text, figures, search)
db6d594aa4d9 Last update with search function (getSearch)
abukhman
parents: 90
diff changeset
176 @param querySearch: type of different search modes (fulltext, fulltextMorph, xpath, xquery, ftIndex, ftIndexMorph)
22
b139f9937e97 preliminary version 0.2
casties
parents: 20
diff changeset
177 '''
0
dwinter
parents:
diff changeset
178
84
a6e4f9b6729a first version with new full-text infrastructure and slightly changed templates
casties
parents: 83
diff changeset
179 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
180
b139f9937e97 preliminary version 0.2
casties
parents: 20
diff changeset
181 if not hasattr(self, 'template'):
84
a6e4f9b6729a first version with new full-text infrastructure and slightly changed templates
casties
parents: 83
diff changeset
182 # this won't work
a6e4f9b6729a first version with new full-text infrastructure and slightly changed templates
casties
parents: 83
diff changeset
183 logging.error("template folder missing!")
a6e4f9b6729a first version with new full-text infrastructure and slightly changed templates
casties
parents: 83
diff changeset
184 return "ERROR: template folder missing!"
22
b139f9937e97 preliminary version 0.2
casties
parents: 20
diff changeset
185
84
a6e4f9b6729a first version with new full-text infrastructure and slightly changed templates
casties
parents: 83
diff changeset
186 if not getattr(self, 'digilibBaseUrl', None):
22
b139f9937e97 preliminary version 0.2
casties
parents: 20
diff changeset
187 self.digilibBaseUrl = self.findDigilibUrl() or "http://nausikaa.mpiwg-berlin.mpg.de/digitallibrary"
b139f9937e97 preliminary version 0.2
casties
parents: 20
diff changeset
188
25
e93fb8cadd3a new, less preliminary version 0.2
casties
parents: 22
diff changeset
189 docinfo = self.getDocinfo(mode=mode,url=url)
97
2b8fd19432fb Last update
abukhman
parents: 96
diff changeset
190
2b8fd19432fb Last update
abukhman
parents: 96
diff changeset
191
90
6a4a72033d58 new version with new full-text infrastructure and some more changed templates
casties
parents: 84
diff changeset
192 if tocMode != "thumbs":
6a4a72033d58 new version with new full-text infrastructure and some more changed templates
casties
parents: 84
diff changeset
193 # get table of contents
6a4a72033d58 new version with new full-text infrastructure and some more changed templates
casties
parents: 84
diff changeset
194 docinfo = self.getToc(mode=tocMode, docinfo=docinfo)
97
2b8fd19432fb Last update
abukhman
parents: 96
diff changeset
195
2b8fd19432fb Last update
abukhman
parents: 96
diff changeset
196 pageinfo = self.getPageinfo(start=start,current=pn,docinfo=docinfo,viewMode=viewMode,tocMode=tocMode)
2b8fd19432fb Last update
abukhman
parents: 96
diff changeset
197
51
c5d3aabbf61b textviewer now integrated, new modus auto introduced as standard for viewing
dwinter
parents: 50
diff changeset
198 if viewMode=="auto": # automodus gewaehlt
84
a6e4f9b6729a first version with new full-text infrastructure and slightly changed templates
casties
parents: 83
diff changeset
199 if docinfo.get("textURL",''): #texturl gesetzt und textViewer konfiguriert
51
c5d3aabbf61b textviewer now integrated, new modus auto introduced as standard for viewing
dwinter
parents: 50
diff changeset
200 viewMode="text"
c5d3aabbf61b textviewer now integrated, new modus auto introduced as standard for viewing
dwinter
parents: 50
diff changeset
201 else:
c5d3aabbf61b textviewer now integrated, new modus auto introduced as standard for viewing
dwinter
parents: 50
diff changeset
202 viewMode="images"
90
6a4a72033d58 new version with new full-text infrastructure and some more changed templates
casties
parents: 84
diff changeset
203
6a4a72033d58 new version with new full-text infrastructure and some more changed templates
casties
parents: 84
diff changeset
204 pt = getattr(self.template, 'viewer_main')
75
9673218e155b minorCVS: ----------------------------------------------------------------------
dwinter
parents: 74
diff changeset
205 return pt(docinfo=docinfo,pageinfo=pageinfo,viewMode=viewMode,mk=self.generateMarks(mk))
0
dwinter
parents:
diff changeset
206
74
dwinter
parents: 73
diff changeset
207 def generateMarks(self,mk):
dwinter
parents: 73
diff changeset
208 ret=""
90
6a4a72033d58 new version with new full-text infrastructure and some more changed templates
casties
parents: 84
diff changeset
209 if mk is None:
6a4a72033d58 new version with new full-text infrastructure and some more changed templates
casties
parents: 84
diff changeset
210 return ""
6a4a72033d58 new version with new full-text infrastructure and some more changed templates
casties
parents: 84
diff changeset
211 if type(mk) is not ListType:
6a4a72033d58 new version with new full-text infrastructure and some more changed templates
casties
parents: 84
diff changeset
212 mk=[mk]
74
dwinter
parents: 73
diff changeset
213 for m in mk:
75
9673218e155b minorCVS: ----------------------------------------------------------------------
dwinter
parents: 74
diff changeset
214 ret+="mk=%s"%m
74
dwinter
parents: 73
diff changeset
215 return ret
84
a6e4f9b6729a first version with new full-text infrastructure and slightly changed templates
casties
parents: 83
diff changeset
216
90
6a4a72033d58 new version with new full-text infrastructure and some more changed templates
casties
parents: 84
diff changeset
217
84
a6e4f9b6729a first version with new full-text infrastructure and slightly changed templates
casties
parents: 83
diff changeset
218 def findDigilibUrl(self):
a6e4f9b6729a first version with new full-text infrastructure and slightly changed templates
casties
parents: 83
diff changeset
219 """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
220 url = self.template.zogilib.getDLBaseUrl()
a6e4f9b6729a first version with new full-text infrastructure and slightly changed templates
casties
parents: 83
diff changeset
221 return url
a6e4f9b6729a first version with new full-text infrastructure and slightly changed templates
casties
parents: 83
diff changeset
222
a6e4f9b6729a first version with new full-text infrastructure and slightly changed templates
casties
parents: 83
diff changeset
223 def getStyle(self, idx, selected, style=""):
a6e4f9b6729a first version with new full-text infrastructure and slightly changed templates
casties
parents: 83
diff changeset
224 """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
225 #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
226 if idx == selected:
a6e4f9b6729a first version with new full-text infrastructure and slightly changed templates
casties
parents: 83
diff changeset
227 return style + 'sel'
a6e4f9b6729a first version with new full-text infrastructure and slightly changed templates
casties
parents: 83
diff changeset
228 else:
a6e4f9b6729a first version with new full-text infrastructure and slightly changed templates
casties
parents: 83
diff changeset
229 return style
74
dwinter
parents: 73
diff changeset
230
25
e93fb8cadd3a new, less preliminary version 0.2
casties
parents: 22
diff changeset
231 def getLink(self,param=None,val=None):
e93fb8cadd3a new, less preliminary version 0.2
casties
parents: 22
diff changeset
232 """link to documentviewer with parameter param set to val"""
35
2d9261aea8f3 version 0.2.4
casties
parents: 32
diff changeset
233 params=self.REQUEST.form.copy()
25
e93fb8cadd3a new, less preliminary version 0.2
casties
parents: 22
diff changeset
234 if param is not None:
31
c6451e8d5d23 more small fixes - now version 0.2.2
casties
parents: 29
diff changeset
235 if val is None:
c6451e8d5d23 more small fixes - now version 0.2.2
casties
parents: 29
diff changeset
236 if params.has_key(param):
c6451e8d5d23 more small fixes - now version 0.2.2
casties
parents: 29
diff changeset
237 del params[param]
25
e93fb8cadd3a new, less preliminary version 0.2
casties
parents: 22
diff changeset
238 else:
35
2d9261aea8f3 version 0.2.4
casties
parents: 32
diff changeset
239 params[param] = str(val)
84
a6e4f9b6729a first version with new full-text infrastructure and slightly changed templates
casties
parents: 83
diff changeset
240
a6e4f9b6729a first version with new full-text infrastructure and slightly changed templates
casties
parents: 83
diff changeset
241 if params.get("mode", None) == "filepath": #wenn beim erst Aufruf filepath gesetzt wurde aendere das nun zu imagepath
78
70ab234a18dc bugs in filepath mode fixes
dwinter
parents: 75
diff changeset
242 params["mode"] = "imagepath"
70ab234a18dc bugs in filepath mode fixes
dwinter
parents: 75
diff changeset
243 params["url"] = getParentDir(params["url"])
31
c6451e8d5d23 more small fixes - now version 0.2.2
casties
parents: 29
diff changeset
244
35
2d9261aea8f3 version 0.2.4
casties
parents: 32
diff changeset
245 # quote values and assemble into query string
2d9261aea8f3 version 0.2.4
casties
parents: 32
diff changeset
246 ps = "&".join(["%s=%s"%(k,urllib.quote(v)) for (k, v) in params.items()])
2d9261aea8f3 version 0.2.4
casties
parents: 32
diff changeset
247 url=self.REQUEST['URL1']+"?"+ps
25
e93fb8cadd3a new, less preliminary version 0.2
casties
parents: 22
diff changeset
248 return url
e93fb8cadd3a new, less preliminary version 0.2
casties
parents: 22
diff changeset
249
68
b8457fc33446 piclens rss/support
dwinter
parents: 65
diff changeset
250 def getLinkAmp(self,param=None,val=None):
b8457fc33446 piclens rss/support
dwinter
parents: 65
diff changeset
251 """link to documentviewer with parameter param set to val"""
b8457fc33446 piclens rss/support
dwinter
parents: 65
diff changeset
252 params=self.REQUEST.form.copy()
b8457fc33446 piclens rss/support
dwinter
parents: 65
diff changeset
253 if param is not None:
b8457fc33446 piclens rss/support
dwinter
parents: 65
diff changeset
254 if val is None:
b8457fc33446 piclens rss/support
dwinter
parents: 65
diff changeset
255 if params.has_key(param):
b8457fc33446 piclens rss/support
dwinter
parents: 65
diff changeset
256 del params[param]
b8457fc33446 piclens rss/support
dwinter
parents: 65
diff changeset
257 else:
b8457fc33446 piclens rss/support
dwinter
parents: 65
diff changeset
258 params[param] = str(val)
b8457fc33446 piclens rss/support
dwinter
parents: 65
diff changeset
259
b8457fc33446 piclens rss/support
dwinter
parents: 65
diff changeset
260 # quote values and assemble into query string
b8457fc33446 piclens rss/support
dwinter
parents: 65
diff changeset
261 logging.info("XYXXXXX: %s"%repr(params.items()))
b8457fc33446 piclens rss/support
dwinter
parents: 65
diff changeset
262 ps = "&".join(["%s=%s"%(k,urllib.quote(v)) for (k, v) in params.items()])
b8457fc33446 piclens rss/support
dwinter
parents: 65
diff changeset
263 url=self.REQUEST['URL1']+"?"+ps
b8457fc33446 piclens rss/support
dwinter
parents: 65
diff changeset
264 return url
81
fae97f071724 fixed problem with info.xml when url without index.meta
casties
parents: 79
diff changeset
265
57
7cdb0fc34a92 added getInfo_xml method
casties
parents: 55
diff changeset
266 def getInfo_xml(self,url,mode):
7cdb0fc34a92 added getInfo_xml method
casties
parents: 55
diff changeset
267 """returns info about the document as XML"""
7cdb0fc34a92 added getInfo_xml method
casties
parents: 55
diff changeset
268
7cdb0fc34a92 added getInfo_xml method
casties
parents: 55
diff changeset
269 if not self.digilibBaseUrl:
7cdb0fc34a92 added getInfo_xml method
casties
parents: 55
diff changeset
270 self.digilibBaseUrl = self.findDigilibUrl() or "http://nausikaa.mpiwg-berlin.mpg.de/digitallibrary"
7cdb0fc34a92 added getInfo_xml method
casties
parents: 55
diff changeset
271
7cdb0fc34a92 added getInfo_xml method
casties
parents: 55
diff changeset
272 docinfo = self.getDocinfo(mode=mode,url=url)
7cdb0fc34a92 added getInfo_xml method
casties
parents: 55
diff changeset
273 pt = getattr(self.template, 'info_xml')
7cdb0fc34a92 added getInfo_xml method
casties
parents: 55
diff changeset
274 return pt(docinfo=docinfo)
7cdb0fc34a92 added getInfo_xml method
casties
parents: 55
diff changeset
275
0
dwinter
parents:
diff changeset
276
35
2d9261aea8f3 version 0.2.4
casties
parents: 32
diff changeset
277 def isAccessible(self, docinfo):
32
b25c89d693cf version 0.2.3 - first version with access control!
casties
parents: 31
diff changeset
278 """returns if access to the resource is granted"""
b25c89d693cf version 0.2.3 - first version with access control!
casties
parents: 31
diff changeset
279 access = docinfo.get('accessType', None)
52
92047eaa6272 zLOG exchanged by logging
dwinter
parents: 51
diff changeset
280 logger("documentViewer (accessOK)", logging.INFO, "access type %s"%access)
45
0391fe75aef3 fixed handling of documents with missing access tag
casties
parents: 43
diff changeset
281 if access is not None and access == 'free':
52
92047eaa6272 zLOG exchanged by logging
dwinter
parents: 51
diff changeset
282 logger("documentViewer (accessOK)", logging.INFO, "access is free")
32
b25c89d693cf version 0.2.3 - first version with access control!
casties
parents: 31
diff changeset
283 return True
45
0391fe75aef3 fixed handling of documents with missing access tag
casties
parents: 43
diff changeset
284 elif access is None or access in self.authgroups:
35
2d9261aea8f3 version 0.2.4
casties
parents: 32
diff changeset
285 # only local access -- only logged in users
2d9261aea8f3 version 0.2.4
casties
parents: 32
diff changeset
286 user = getSecurityManager().getUser()
2d9261aea8f3 version 0.2.4
casties
parents: 32
diff changeset
287 if user is not None:
2d9261aea8f3 version 0.2.4
casties
parents: 32
diff changeset
288 #print "user: ", user
2d9261aea8f3 version 0.2.4
casties
parents: 32
diff changeset
289 return (user.getUserName() != "Anonymous User")
2d9261aea8f3 version 0.2.4
casties
parents: 32
diff changeset
290 else:
2d9261aea8f3 version 0.2.4
casties
parents: 32
diff changeset
291 return False
32
b25c89d693cf version 0.2.3 - first version with access control!
casties
parents: 31
diff changeset
292
52
92047eaa6272 zLOG exchanged by logging
dwinter
parents: 51
diff changeset
293 logger("documentViewer (accessOK)", logging.INFO, "unknown access type %s"%access)
32
b25c89d693cf version 0.2.3 - first version with access control!
casties
parents: 31
diff changeset
294 return False
35
2d9261aea8f3 version 0.2.4
casties
parents: 32
diff changeset
295
32
b25c89d693cf version 0.2.3 - first version with access control!
casties
parents: 31
diff changeset
296
73
dwinter
parents: 71
diff changeset
297 def getDirinfoFromDigilib(self,path,docinfo=None,cut=0):
29
e1bed068b351 small fixes
casties
parents: 28
diff changeset
298 """gibt param von dlInfo aus"""
40
749ee5389892 try to ignore superfluous /mpiwg/online in urls
casties
parents: 39
diff changeset
299 num_retries = 3
31
c6451e8d5d23 more small fixes - now version 0.2.2
casties
parents: 29
diff changeset
300 if docinfo is None:
c6451e8d5d23 more small fixes - now version 0.2.2
casties
parents: 29
diff changeset
301 docinfo = {}
73
dwinter
parents: 71
diff changeset
302
dwinter
parents: 71
diff changeset
303 for x in range(cut):
78
70ab234a18dc bugs in filepath mode fixes
dwinter
parents: 75
diff changeset
304
73
dwinter
parents: 71
diff changeset
305 path=getParentDir(path)
78
70ab234a18dc bugs in filepath mode fixes
dwinter
parents: 75
diff changeset
306
40
749ee5389892 try to ignore superfluous /mpiwg/online in urls
casties
parents: 39
diff changeset
307 infoUrl=self.digilibBaseUrl+"/dirInfo-xml.jsp?mo=dir&fn="+path
29
e1bed068b351 small fixes
casties
parents: 28
diff changeset
308
52
92047eaa6272 zLOG exchanged by logging
dwinter
parents: 51
diff changeset
309 logger("documentViewer (getparamfromdigilib)", logging.INFO, "dirInfo from %s"%(infoUrl))
29
e1bed068b351 small fixes
casties
parents: 28
diff changeset
310
40
749ee5389892 try to ignore superfluous /mpiwg/online in urls
casties
parents: 39
diff changeset
311 for cnt in range(num_retries):
35
2d9261aea8f3 version 0.2.4
casties
parents: 32
diff changeset
312 try:
40
749ee5389892 try to ignore superfluous /mpiwg/online in urls
casties
parents: 39
diff changeset
313 # dom = NonvalidatingReader.parseUri(imageUrl)
749ee5389892 try to ignore superfluous /mpiwg/online in urls
casties
parents: 39
diff changeset
314 txt=urllib.urlopen(infoUrl).read()
749ee5389892 try to ignore superfluous /mpiwg/online in urls
casties
parents: 39
diff changeset
315 dom = Parse(txt)
35
2d9261aea8f3 version 0.2.4
casties
parents: 32
diff changeset
316 break
2d9261aea8f3 version 0.2.4
casties
parents: 32
diff changeset
317 except:
52
92047eaa6272 zLOG exchanged by logging
dwinter
parents: 51
diff changeset
318 logger("documentViewer (getdirinfofromdigilib)", logging.ERROR, "error reading %s (try %d)"%(infoUrl,cnt))
35
2d9261aea8f3 version 0.2.4
casties
parents: 32
diff changeset
319 else:
40
749ee5389892 try to ignore superfluous /mpiwg/online in urls
casties
parents: 39
diff changeset
320 raise IOError("Unable to get dir-info from %s"%(infoUrl))
29
e1bed068b351 small fixes
casties
parents: 28
diff changeset
321
37
ead830ce45d6 better error messages
casties
parents: 35
diff changeset
322 sizes=dom.xpath("//dir/size")
52
92047eaa6272 zLOG exchanged by logging
dwinter
parents: 51
diff changeset
323 logger("documentViewer (getparamfromdigilib)", logging.INFO, "dirInfo:size"%sizes)
29
e1bed068b351 small fixes
casties
parents: 28
diff changeset
324
37
ead830ce45d6 better error messages
casties
parents: 35
diff changeset
325 if sizes:
ead830ce45d6 better error messages
casties
parents: 35
diff changeset
326 docinfo['numPages'] = int(getTextFromNode(sizes[0]))
31
c6451e8d5d23 more small fixes - now version 0.2.2
casties
parents: 29
diff changeset
327 else:
c6451e8d5d23 more small fixes - now version 0.2.2
casties
parents: 29
diff changeset
328 docinfo['numPages'] = 0
84
a6e4f9b6729a first version with new full-text infrastructure and slightly changed templates
casties
parents: 83
diff changeset
329
a6e4f9b6729a first version with new full-text infrastructure and slightly changed templates
casties
parents: 83
diff changeset
330 # 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
331
c6451e8d5d23 more small fixes - now version 0.2.2
casties
parents: 29
diff changeset
332 return docinfo
32
b25c89d693cf version 0.2.3 - first version with access control!
casties
parents: 31
diff changeset
333
29
e1bed068b351 small fixes
casties
parents: 28
diff changeset
334
35
2d9261aea8f3 version 0.2.4
casties
parents: 32
diff changeset
335 def getIndexMeta(self, url):
2d9261aea8f3 version 0.2.4
casties
parents: 32
diff changeset
336 """returns dom of index.meta document at url"""
39
1dd90aabd366 added retry when reading index meta from texter applet
casties
parents: 38
diff changeset
337 num_retries = 3
35
2d9261aea8f3 version 0.2.4
casties
parents: 32
diff changeset
338 dom = None
39
1dd90aabd366 added retry when reading index meta from texter applet
casties
parents: 38
diff changeset
339 metaUrl = None
35
2d9261aea8f3 version 0.2.4
casties
parents: 32
diff changeset
340 if url.startswith("http://"):
2d9261aea8f3 version 0.2.4
casties
parents: 32
diff changeset
341 # real URL
39
1dd90aabd366 added retry when reading index meta from texter applet
casties
parents: 38
diff changeset
342 metaUrl = url
35
2d9261aea8f3 version 0.2.4
casties
parents: 32
diff changeset
343 else:
2d9261aea8f3 version 0.2.4
casties
parents: 32
diff changeset
344 # online path
2d9261aea8f3 version 0.2.4
casties
parents: 32
diff changeset
345 server=self.digilibBaseUrl+"/servlet/Texter?fn="
40
749ee5389892 try to ignore superfluous /mpiwg/online in urls
casties
parents: 39
diff changeset
346 metaUrl=server+url.replace("/mpiwg/online","")
35
2d9261aea8f3 version 0.2.4
casties
parents: 32
diff changeset
347 if not metaUrl.endswith("index.meta"):
2d9261aea8f3 version 0.2.4
casties
parents: 32
diff changeset
348 metaUrl += "/index.meta"
75
9673218e155b minorCVS: ----------------------------------------------------------------------
dwinter
parents: 74
diff changeset
349 logging.debug("METAURL: %s"%metaUrl)
40
749ee5389892 try to ignore superfluous /mpiwg/online in urls
casties
parents: 39
diff changeset
350 for cnt in range(num_retries):
35
2d9261aea8f3 version 0.2.4
casties
parents: 32
diff changeset
351 try:
39
1dd90aabd366 added retry when reading index meta from texter applet
casties
parents: 38
diff changeset
352 # patch dirk encoding fehler treten dann nicht mehr auf
38
025d3b6cba51 fixes by dirk
casties
parents: 37
diff changeset
353 # dom = NonvalidatingReader.parseUri(metaUrl)
39
1dd90aabd366 added retry when reading index meta from texter applet
casties
parents: 38
diff changeset
354 txt=urllib.urlopen(metaUrl).read()
1dd90aabd366 added retry when reading index meta from texter applet
casties
parents: 38
diff changeset
355 dom = Parse(txt)
40
749ee5389892 try to ignore superfluous /mpiwg/online in urls
casties
parents: 39
diff changeset
356 break
35
2d9261aea8f3 version 0.2.4
casties
parents: 32
diff changeset
357 except:
90
6a4a72033d58 new version with new full-text infrastructure and some more changed templates
casties
parents: 84
diff changeset
358 logger("ERROR documentViewer (getIndexMeta)", logging.INFO,"%s (%s)"%sys.exc_info()[0:2])
39
1dd90aabd366 added retry when reading index meta from texter applet
casties
parents: 38
diff changeset
359
1dd90aabd366 added retry when reading index meta from texter applet
casties
parents: 38
diff changeset
360 if dom is None:
1dd90aabd366 added retry when reading index meta from texter applet
casties
parents: 38
diff changeset
361 raise IOError("Unable to read index meta from %s"%(url))
35
2d9261aea8f3 version 0.2.4
casties
parents: 32
diff changeset
362
2d9261aea8f3 version 0.2.4
casties
parents: 32
diff changeset
363 return dom
50
6c0f20cecc60 added evaluation of the presentation/info.xml in texttools
dwinter
parents: 49
diff changeset
364
6c0f20cecc60 added evaluation of the presentation/info.xml in texttools
dwinter
parents: 49
diff changeset
365 def getPresentationInfoXML(self, url):
6c0f20cecc60 added evaluation of the presentation/info.xml in texttools
dwinter
parents: 49
diff changeset
366 """returns dom of info.xml document at url"""
6c0f20cecc60 added evaluation of the presentation/info.xml in texttools
dwinter
parents: 49
diff changeset
367 num_retries = 3
6c0f20cecc60 added evaluation of the presentation/info.xml in texttools
dwinter
parents: 49
diff changeset
368 dom = None
6c0f20cecc60 added evaluation of the presentation/info.xml in texttools
dwinter
parents: 49
diff changeset
369 metaUrl = None
6c0f20cecc60 added evaluation of the presentation/info.xml in texttools
dwinter
parents: 49
diff changeset
370 if url.startswith("http://"):
6c0f20cecc60 added evaluation of the presentation/info.xml in texttools
dwinter
parents: 49
diff changeset
371 # real URL
6c0f20cecc60 added evaluation of the presentation/info.xml in texttools
dwinter
parents: 49
diff changeset
372 metaUrl = url
6c0f20cecc60 added evaluation of the presentation/info.xml in texttools
dwinter
parents: 49
diff changeset
373 else:
6c0f20cecc60 added evaluation of the presentation/info.xml in texttools
dwinter
parents: 49
diff changeset
374 # online path
6c0f20cecc60 added evaluation of the presentation/info.xml in texttools
dwinter
parents: 49
diff changeset
375 server=self.digilibBaseUrl+"/servlet/Texter?fn="
6c0f20cecc60 added evaluation of the presentation/info.xml in texttools
dwinter
parents: 49
diff changeset
376 metaUrl=server+url.replace("/mpiwg/online","")
6c0f20cecc60 added evaluation of the presentation/info.xml in texttools
dwinter
parents: 49
diff changeset
377
6c0f20cecc60 added evaluation of the presentation/info.xml in texttools
dwinter
parents: 49
diff changeset
378 for cnt in range(num_retries):
6c0f20cecc60 added evaluation of the presentation/info.xml in texttools
dwinter
parents: 49
diff changeset
379 try:
6c0f20cecc60 added evaluation of the presentation/info.xml in texttools
dwinter
parents: 49
diff changeset
380 # patch dirk encoding fehler treten dann nicht mehr auf
6c0f20cecc60 added evaluation of the presentation/info.xml in texttools
dwinter
parents: 49
diff changeset
381 # dom = NonvalidatingReader.parseUri(metaUrl)
6c0f20cecc60 added evaluation of the presentation/info.xml in texttools
dwinter
parents: 49
diff changeset
382 txt=urllib.urlopen(metaUrl).read()
6c0f20cecc60 added evaluation of the presentation/info.xml in texttools
dwinter
parents: 49
diff changeset
383 dom = Parse(txt)
6c0f20cecc60 added evaluation of the presentation/info.xml in texttools
dwinter
parents: 49
diff changeset
384 break
6c0f20cecc60 added evaluation of the presentation/info.xml in texttools
dwinter
parents: 49
diff changeset
385 except:
52
92047eaa6272 zLOG exchanged by logging
dwinter
parents: 51
diff changeset
386 logger("ERROR documentViewer (getPresentationInfoXML)", logging.INFO,"%s (%s)"%sys.exc_info()[0:2])
50
6c0f20cecc60 added evaluation of the presentation/info.xml in texttools
dwinter
parents: 49
diff changeset
387
6c0f20cecc60 added evaluation of the presentation/info.xml in texttools
dwinter
parents: 49
diff changeset
388 if dom is None:
6c0f20cecc60 added evaluation of the presentation/info.xml in texttools
dwinter
parents: 49
diff changeset
389 raise IOError("Unable to read infoXMLfrom %s"%(url))
6c0f20cecc60 added evaluation of the presentation/info.xml in texttools
dwinter
parents: 49
diff changeset
390
6c0f20cecc60 added evaluation of the presentation/info.xml in texttools
dwinter
parents: 49
diff changeset
391 return dom
35
2d9261aea8f3 version 0.2.4
casties
parents: 32
diff changeset
392
2d9261aea8f3 version 0.2.4
casties
parents: 32
diff changeset
393
70
0049d64aa464 filepath introduced
dwinter
parents: 68
diff changeset
394 def getAuthinfoFromIndexMeta(self,path,docinfo=None,dom=None,cut=0):
35
2d9261aea8f3 version 0.2.4
casties
parents: 32
diff changeset
395 """gets authorization info from the index.meta file at path or given by dom"""
52
92047eaa6272 zLOG exchanged by logging
dwinter
parents: 51
diff changeset
396 logger("documentViewer (getauthinfofromindexmeta)", logging.INFO,"path: %s"%(path))
32
b25c89d693cf version 0.2.3 - first version with access control!
casties
parents: 31
diff changeset
397
b25c89d693cf version 0.2.3 - first version with access control!
casties
parents: 31
diff changeset
398 access = None
b25c89d693cf version 0.2.3 - first version with access control!
casties
parents: 31
diff changeset
399
b25c89d693cf version 0.2.3 - first version with access control!
casties
parents: 31
diff changeset
400 if docinfo is None:
b25c89d693cf version 0.2.3 - first version with access control!
casties
parents: 31
diff changeset
401 docinfo = {}
b25c89d693cf version 0.2.3 - first version with access control!
casties
parents: 31
diff changeset
402
b25c89d693cf version 0.2.3 - first version with access control!
casties
parents: 31
diff changeset
403 if dom is None:
78
70ab234a18dc bugs in filepath mode fixes
dwinter
parents: 75
diff changeset
404 for x in range(cut):
70
0049d64aa464 filepath introduced
dwinter
parents: 68
diff changeset
405 path=getParentDir(path)
0049d64aa464 filepath introduced
dwinter
parents: 68
diff changeset
406 dom = self.getIndexMeta(path)
46
31059e3d9338 has now also a text mode viewMode=text
dwinter
parents: 45
diff changeset
407
32
b25c89d693cf version 0.2.3 - first version with access control!
casties
parents: 31
diff changeset
408 acctype = dom.xpath("//access-conditions/access/@type")
b25c89d693cf version 0.2.3 - first version with access control!
casties
parents: 31
diff changeset
409 if acctype and (len(acctype)>0):
b25c89d693cf version 0.2.3 - first version with access control!
casties
parents: 31
diff changeset
410 access=acctype[0].value
35
2d9261aea8f3 version 0.2.4
casties
parents: 32
diff changeset
411 if access in ['group', 'institution']:
32
b25c89d693cf version 0.2.3 - first version with access control!
casties
parents: 31
diff changeset
412 access = getTextFromNode(dom.xpath("//access-conditions/access/name")[0]).lower()
b25c89d693cf version 0.2.3 - first version with access control!
casties
parents: 31
diff changeset
413
b25c89d693cf version 0.2.3 - first version with access control!
casties
parents: 31
diff changeset
414 docinfo['accessType'] = access
b25c89d693cf version 0.2.3 - first version with access control!
casties
parents: 31
diff changeset
415 return docinfo
29
e1bed068b351 small fixes
casties
parents: 28
diff changeset
416
32
b25c89d693cf version 0.2.3 - first version with access control!
casties
parents: 31
diff changeset
417
70
0049d64aa464 filepath introduced
dwinter
parents: 68
diff changeset
418 def getBibinfoFromIndexMeta(self,path,docinfo=None,dom=None,cut=0):
35
2d9261aea8f3 version 0.2.4
casties
parents: 32
diff changeset
419 """gets bibliographical info from the index.meta file at path or given by dom"""
59
996b61d71351 added all fields from bib tag to docinfo
casties
parents: 57
diff changeset
420 logging.debug("documentViewer (getbibinfofromindexmeta) path: %s"%(path))
20
9884703dae70 new modi
dwinter
parents: 0
diff changeset
421
22
b139f9937e97 preliminary version 0.2
casties
parents: 20
diff changeset
422 if docinfo is None:
b139f9937e97 preliminary version 0.2
casties
parents: 20
diff changeset
423 docinfo = {}
78
70ab234a18dc bugs in filepath mode fixes
dwinter
parents: 75
diff changeset
424
22
b139f9937e97 preliminary version 0.2
casties
parents: 20
diff changeset
425 if dom is None:
78
70ab234a18dc bugs in filepath mode fixes
dwinter
parents: 75
diff changeset
426 for x in range(cut):
70
0049d64aa464 filepath introduced
dwinter
parents: 68
diff changeset
427 path=getParentDir(path)
0049d64aa464 filepath introduced
dwinter
parents: 68
diff changeset
428 dom = self.getIndexMeta(path)
79
df6952ac93e9 bug in getDocInforFromImagePath, relative lage der index.meta zu path war falsch.
dwinter
parents: 78
diff changeset
429
df6952ac93e9 bug in getDocInforFromImagePath, relative lage der index.meta zu path war falsch.
dwinter
parents: 78
diff changeset
430 logging.debug("documentViewer (getbibinfofromindexmeta cutted) path: %s"%(path))
59
996b61d71351 added all fields from bib tag to docinfo
casties
parents: 57
diff changeset
431 # put in all raw bib fields as dict "bib"
996b61d71351 added all fields from bib tag to docinfo
casties
parents: 57
diff changeset
432 bib = dom.xpath("//bib/*")
996b61d71351 added all fields from bib tag to docinfo
casties
parents: 57
diff changeset
433 if bib and len(bib)>0:
996b61d71351 added all fields from bib tag to docinfo
casties
parents: 57
diff changeset
434 bibinfo = {}
996b61d71351 added all fields from bib tag to docinfo
casties
parents: 57
diff changeset
435 for e in bib:
996b61d71351 added all fields from bib tag to docinfo
casties
parents: 57
diff changeset
436 bibinfo[e.localName] = getTextFromNode(e)
996b61d71351 added all fields from bib tag to docinfo
casties
parents: 57
diff changeset
437 docinfo['bib'] = bibinfo
996b61d71351 added all fields from bib tag to docinfo
casties
parents: 57
diff changeset
438
996b61d71351 added all fields from bib tag to docinfo
casties
parents: 57
diff changeset
439 # extract some fields (author, title, year) according to their mapping
25
e93fb8cadd3a new, less preliminary version 0.2
casties
parents: 22
diff changeset
440 metaData=self.metadata.main.meta.bib
e93fb8cadd3a new, less preliminary version 0.2
casties
parents: 22
diff changeset
441 bibtype=dom.xpath("//bib/@type")
e93fb8cadd3a new, less preliminary version 0.2
casties
parents: 22
diff changeset
442 if bibtype and (len(bibtype)>0):
e93fb8cadd3a new, less preliminary version 0.2
casties
parents: 22
diff changeset
443 bibtype=bibtype[0].value
20
9884703dae70 new modi
dwinter
parents: 0
diff changeset
444 else:
25
e93fb8cadd3a new, less preliminary version 0.2
casties
parents: 22
diff changeset
445 bibtype="generic"
59
996b61d71351 added all fields from bib tag to docinfo
casties
parents: 57
diff changeset
446
25
e93fb8cadd3a new, less preliminary version 0.2
casties
parents: 22
diff changeset
447 bibtype=bibtype.replace("-"," ") # wrong typesiin index meta "-" instead of " " (not wrong! ROC)
59
996b61d71351 added all fields from bib tag to docinfo
casties
parents: 57
diff changeset
448 docinfo['bib_type'] = bibtype
25
e93fb8cadd3a new, less preliminary version 0.2
casties
parents: 22
diff changeset
449 bibmap=metaData.generateMappingForType(bibtype)
32
b25c89d693cf version 0.2.3 - first version with access control!
casties
parents: 31
diff changeset
450 # if there is no mapping bibmap is empty (mapping sometimes has empty fields)
31
c6451e8d5d23 more small fixes - now version 0.2.2
casties
parents: 29
diff changeset
451 if len(bibmap) > 0 and len(bibmap['author'][0]) > 0:
63
4a17b755bfc7 added more try/excepts to bib-meta reading code
casties
parents: 62
diff changeset
452 try:
4a17b755bfc7 added more try/excepts to bib-meta reading code
casties
parents: 62
diff changeset
453 docinfo['author']=getTextFromNode(dom.xpath("//bib/%s"%bibmap['author'][0])[0])
4a17b755bfc7 added more try/excepts to bib-meta reading code
casties
parents: 62
diff changeset
454 except: pass
4a17b755bfc7 added more try/excepts to bib-meta reading code
casties
parents: 62
diff changeset
455 try:
4a17b755bfc7 added more try/excepts to bib-meta reading code
casties
parents: 62
diff changeset
456 docinfo['title']=getTextFromNode(dom.xpath("//bib/%s"%bibmap['title'][0])[0])
4a17b755bfc7 added more try/excepts to bib-meta reading code
casties
parents: 62
diff changeset
457 except: pass
4a17b755bfc7 added more try/excepts to bib-meta reading code
casties
parents: 62
diff changeset
458 try:
4a17b755bfc7 added more try/excepts to bib-meta reading code
casties
parents: 62
diff changeset
459 docinfo['year']=getTextFromNode(dom.xpath("//bib/%s"%bibmap['year'][0])[0])
4a17b755bfc7 added more try/excepts to bib-meta reading code
casties
parents: 62
diff changeset
460 except: pass
59
996b61d71351 added all fields from bib tag to docinfo
casties
parents: 57
diff changeset
461 logging.debug("documentViewer (getbibinfofromindexmeta) using mapping for %s"%bibtype)
52
92047eaa6272 zLOG exchanged by logging
dwinter
parents: 51
diff changeset
462 try:
92047eaa6272 zLOG exchanged by logging
dwinter
parents: 51
diff changeset
463 docinfo['lang']=getTextFromNode(dom.xpath("//bib/lang")[0])
92047eaa6272 zLOG exchanged by logging
dwinter
parents: 51
diff changeset
464 except:
92047eaa6272 zLOG exchanged by logging
dwinter
parents: 51
diff changeset
465 docinfo['lang']=''
59
996b61d71351 added all fields from bib tag to docinfo
casties
parents: 57
diff changeset
466
22
b139f9937e97 preliminary version 0.2
casties
parents: 20
diff changeset
467 return docinfo
83
ec12a2440daa My last update Bukhman Andrey
abukhman
parents: 82
diff changeset
468
ec12a2440daa My last update Bukhman Andrey
abukhman
parents: 82
diff changeset
469
84
a6e4f9b6729a first version with new full-text infrastructure and slightly changed templates
casties
parents: 83
diff changeset
470 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
471 """parse texttool tag in index meta"""
a6e4f9b6729a first version with new full-text infrastructure and slightly changed templates
casties
parents: 83
diff changeset
472 logger("documentViewer (getdocinfofromtexttool)", logging.INFO, "url: %s" % (url))
a6e4f9b6729a first version with new full-text infrastructure and slightly changed templates
casties
parents: 83
diff changeset
473 if docinfo is None:
a6e4f9b6729a first version with new full-text infrastructure and slightly changed templates
casties
parents: 83
diff changeset
474 docinfo = {}
a6e4f9b6729a first version with new full-text infrastructure and slightly changed templates
casties
parents: 83
diff changeset
475 if docinfo.get('lang', None) is None:
a6e4f9b6729a first version with new full-text infrastructure and slightly changed templates
casties
parents: 83
diff changeset
476 docinfo['lang'] = '' # default keine Sprache gesetzt
a6e4f9b6729a first version with new full-text infrastructure and slightly changed templates
casties
parents: 83
diff changeset
477 if dom is None:
a6e4f9b6729a first version with new full-text infrastructure and slightly changed templates
casties
parents: 83
diff changeset
478 dom = self.getIndexMeta(url)
a6e4f9b6729a first version with new full-text infrastructure and slightly changed templates
casties
parents: 83
diff changeset
479
a6e4f9b6729a first version with new full-text infrastructure and slightly changed templates
casties
parents: 83
diff changeset
480 archivePath = None
a6e4f9b6729a first version with new full-text infrastructure and slightly changed templates
casties
parents: 83
diff changeset
481 archiveName = None
a6e4f9b6729a first version with new full-text infrastructure and slightly changed templates
casties
parents: 83
diff changeset
482
a6e4f9b6729a first version with new full-text infrastructure and slightly changed templates
casties
parents: 83
diff changeset
483 archiveNames = dom.xpath("//resource/name")
a6e4f9b6729a first version with new full-text infrastructure and slightly changed templates
casties
parents: 83
diff changeset
484 if archiveNames and (len(archiveNames) > 0):
a6e4f9b6729a first version with new full-text infrastructure and slightly changed templates
casties
parents: 83
diff changeset
485 archiveName = getTextFromNode(archiveNames[0])
a6e4f9b6729a first version with new full-text infrastructure and slightly changed templates
casties
parents: 83
diff changeset
486 else:
a6e4f9b6729a first version with new full-text infrastructure and slightly changed templates
casties
parents: 83
diff changeset
487 logger("documentViewer (getdocinfofromtexttool)", logging.WARNING, "resource/name missing in: %s" % (url))
a6e4f9b6729a first version with new full-text infrastructure and slightly changed templates
casties
parents: 83
diff changeset
488
a6e4f9b6729a first version with new full-text infrastructure and slightly changed templates
casties
parents: 83
diff changeset
489 archivePaths = dom.xpath("//resource/archive-path")
a6e4f9b6729a first version with new full-text infrastructure and slightly changed templates
casties
parents: 83
diff changeset
490 if archivePaths and (len(archivePaths) > 0):
a6e4f9b6729a first version with new full-text infrastructure and slightly changed templates
casties
parents: 83
diff changeset
491 archivePath = getTextFromNode(archivePaths[0])
a6e4f9b6729a first version with new full-text infrastructure and slightly changed templates
casties
parents: 83
diff changeset
492 # clean up archive path
a6e4f9b6729a first version with new full-text infrastructure and slightly changed templates
casties
parents: 83
diff changeset
493 if archivePath[0] != '/':
a6e4f9b6729a first version with new full-text infrastructure and slightly changed templates
casties
parents: 83
diff changeset
494 archivePath = '/' + archivePath
a6e4f9b6729a first version with new full-text infrastructure and slightly changed templates
casties
parents: 83
diff changeset
495 if archiveName and (not archivePath.endswith(archiveName)):
a6e4f9b6729a first version with new full-text infrastructure and slightly changed templates
casties
parents: 83
diff changeset
496 archivePath += "/" + archiveName
a6e4f9b6729a first version with new full-text infrastructure and slightly changed templates
casties
parents: 83
diff changeset
497 else:
a6e4f9b6729a first version with new full-text infrastructure and slightly changed templates
casties
parents: 83
diff changeset
498 # try to get archive-path from url
a6e4f9b6729a first version with new full-text infrastructure and slightly changed templates
casties
parents: 83
diff changeset
499 logger("documentViewer (getdocinfofromtexttool)", logging.WARNING, "resource/archive-path missing in: %s" % (url))
a6e4f9b6729a first version with new full-text infrastructure and slightly changed templates
casties
parents: 83
diff changeset
500 if (not url.startswith('http')):
a6e4f9b6729a first version with new full-text infrastructure and slightly changed templates
casties
parents: 83
diff changeset
501 archivePath = url.replace('index.meta', '')
a6e4f9b6729a first version with new full-text infrastructure and slightly changed templates
casties
parents: 83
diff changeset
502
a6e4f9b6729a first version with new full-text infrastructure and slightly changed templates
casties
parents: 83
diff changeset
503 if archivePath is None:
a6e4f9b6729a first version with new full-text infrastructure and slightly changed templates
casties
parents: 83
diff changeset
504 # we balk without archive-path
a6e4f9b6729a first version with new full-text infrastructure and slightly changed templates
casties
parents: 83
diff changeset
505 raise IOError("Missing archive-path (for text-tool) in %s" % (url))
22
b139f9937e97 preliminary version 0.2
casties
parents: 20
diff changeset
506
84
a6e4f9b6729a first version with new full-text infrastructure and slightly changed templates
casties
parents: 83
diff changeset
507 imageDirs = dom.xpath("//texttool/image")
a6e4f9b6729a first version with new full-text infrastructure and slightly changed templates
casties
parents: 83
diff changeset
508 if imageDirs and (len(imageDirs) > 0):
a6e4f9b6729a first version with new full-text infrastructure and slightly changed templates
casties
parents: 83
diff changeset
509 imageDir = getTextFromNode(imageDirs[0])
a6e4f9b6729a first version with new full-text infrastructure and slightly changed templates
casties
parents: 83
diff changeset
510
a6e4f9b6729a first version with new full-text infrastructure and slightly changed templates
casties
parents: 83
diff changeset
511 else:
a6e4f9b6729a first version with new full-text infrastructure and slightly changed templates
casties
parents: 83
diff changeset
512 # 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
513 #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
514 imageDir = ""
a6e4f9b6729a first version with new full-text infrastructure and slightly changed templates
casties
parents: 83
diff changeset
515 #xquery="//pb"
a6e4f9b6729a first version with new full-text infrastructure and slightly changed templates
casties
parents: 83
diff changeset
516 docinfo['imagePath'] = "" # keine Bilder
a6e4f9b6729a first version with new full-text infrastructure and slightly changed templates
casties
parents: 83
diff changeset
517 docinfo['imageURL'] = ""
a6e4f9b6729a first version with new full-text infrastructure and slightly changed templates
casties
parents: 83
diff changeset
518
a6e4f9b6729a first version with new full-text infrastructure and slightly changed templates
casties
parents: 83
diff changeset
519 if imageDir and archivePath:
a6e4f9b6729a first version with new full-text infrastructure and slightly changed templates
casties
parents: 83
diff changeset
520 #print "image: ", imageDir, " archivepath: ", archivePath
a6e4f9b6729a first version with new full-text infrastructure and slightly changed templates
casties
parents: 83
diff changeset
521 imageDir = os.path.join(archivePath, imageDir)
a6e4f9b6729a first version with new full-text infrastructure and slightly changed templates
casties
parents: 83
diff changeset
522 imageDir = imageDir.replace("/mpiwg/online", '')
a6e4f9b6729a first version with new full-text infrastructure and slightly changed templates
casties
parents: 83
diff changeset
523 docinfo = self.getDirinfoFromDigilib(imageDir, docinfo=docinfo)
a6e4f9b6729a first version with new full-text infrastructure and slightly changed templates
casties
parents: 83
diff changeset
524 docinfo['imagePath'] = imageDir
a6e4f9b6729a first version with new full-text infrastructure and slightly changed templates
casties
parents: 83
diff changeset
525
a6e4f9b6729a first version with new full-text infrastructure and slightly changed templates
casties
parents: 83
diff changeset
526 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
527
a6e4f9b6729a first version with new full-text infrastructure and slightly changed templates
casties
parents: 83
diff changeset
528 viewerUrls = dom.xpath("//texttool/digiliburlprefix")
a6e4f9b6729a first version with new full-text infrastructure and slightly changed templates
casties
parents: 83
diff changeset
529 if viewerUrls and (len(viewerUrls) > 0):
a6e4f9b6729a first version with new full-text infrastructure and slightly changed templates
casties
parents: 83
diff changeset
530 viewerUrl = getTextFromNode(viewerUrls[0])
a6e4f9b6729a first version with new full-text infrastructure and slightly changed templates
casties
parents: 83
diff changeset
531 docinfo['viewerURL'] = viewerUrl
a6e4f9b6729a first version with new full-text infrastructure and slightly changed templates
casties
parents: 83
diff changeset
532
a6e4f9b6729a first version with new full-text infrastructure and slightly changed templates
casties
parents: 83
diff changeset
533 textUrls = dom.xpath("//texttool/text")
a6e4f9b6729a first version with new full-text infrastructure and slightly changed templates
casties
parents: 83
diff changeset
534 if textUrls and (len(textUrls) > 0):
a6e4f9b6729a first version with new full-text infrastructure and slightly changed templates
casties
parents: 83
diff changeset
535 textUrl = getTextFromNode(textUrls[0])
a6e4f9b6729a first version with new full-text infrastructure and slightly changed templates
casties
parents: 83
diff changeset
536 if urlparse.urlparse(textUrl)[0] == "": #keine url
a6e4f9b6729a first version with new full-text infrastructure and slightly changed templates
casties
parents: 83
diff changeset
537 textUrl = os.path.join(archivePath, textUrl)
a6e4f9b6729a first version with new full-text infrastructure and slightly changed templates
casties
parents: 83
diff changeset
538 # fix URLs starting with /mpiwg/online
a6e4f9b6729a first version with new full-text infrastructure and slightly changed templates
casties
parents: 83
diff changeset
539 if textUrl.startswith("/mpiwg/online"):
a6e4f9b6729a first version with new full-text infrastructure and slightly changed templates
casties
parents: 83
diff changeset
540 textUrl = textUrl.replace("/mpiwg/online", '', 1)
a6e4f9b6729a first version with new full-text infrastructure and slightly changed templates
casties
parents: 83
diff changeset
541
a6e4f9b6729a first version with new full-text infrastructure and slightly changed templates
casties
parents: 83
diff changeset
542 docinfo['textURL'] = textUrl
a6e4f9b6729a first version with new full-text infrastructure and slightly changed templates
casties
parents: 83
diff changeset
543
a6e4f9b6729a first version with new full-text infrastructure and slightly changed templates
casties
parents: 83
diff changeset
544 textUrls = dom.xpath("//texttool/text-url-path")
a6e4f9b6729a first version with new full-text infrastructure and slightly changed templates
casties
parents: 83
diff changeset
545 if textUrls and (len(textUrls) > 0):
a6e4f9b6729a first version with new full-text infrastructure and slightly changed templates
casties
parents: 83
diff changeset
546 textUrl = getTextFromNode(textUrls[0])
a6e4f9b6729a first version with new full-text infrastructure and slightly changed templates
casties
parents: 83
diff changeset
547 docinfo['textURLPath'] = textUrl
a6e4f9b6729a first version with new full-text infrastructure and slightly changed templates
casties
parents: 83
diff changeset
548
a6e4f9b6729a first version with new full-text infrastructure and slightly changed templates
casties
parents: 83
diff changeset
549 presentationUrls = dom.xpath("//texttool/presentation")
a6e4f9b6729a first version with new full-text infrastructure and slightly changed templates
casties
parents: 83
diff changeset
550 docinfo = self.getBibinfoFromIndexMeta(url, docinfo=docinfo, dom=dom) # get info von bib tag
a6e4f9b6729a first version with new full-text infrastructure and slightly changed templates
casties
parents: 83
diff changeset
551
a6e4f9b6729a first version with new full-text infrastructure and slightly changed templates
casties
parents: 83
diff changeset
552 if presentationUrls and (len(presentationUrls) > 0): # ueberschreibe diese durch presentation informationen
a6e4f9b6729a first version with new full-text infrastructure and slightly changed templates
casties
parents: 83
diff changeset
553 # 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
554 # durch den relativen Pfad auf die presentation infos
a6e4f9b6729a first version with new full-text infrastructure and slightly changed templates
casties
parents: 83
diff changeset
555 presentationPath = getTextFromNode(presentationUrls[0])
a6e4f9b6729a first version with new full-text infrastructure and slightly changed templates
casties
parents: 83
diff changeset
556 if url.endswith("index.meta"):
a6e4f9b6729a first version with new full-text infrastructure and slightly changed templates
casties
parents: 83
diff changeset
557 presentationUrl = url.replace('index.meta', presentationPath)
a6e4f9b6729a first version with new full-text infrastructure and slightly changed templates
casties
parents: 83
diff changeset
558 else:
a6e4f9b6729a first version with new full-text infrastructure and slightly changed templates
casties
parents: 83
diff changeset
559 presentationUrl = url + "/" + presentationPath
a6e4f9b6729a first version with new full-text infrastructure and slightly changed templates
casties
parents: 83
diff changeset
560 docinfo = self.getNumPages(docinfo) #im moment einfach auf eins setzen, navigation ueber die thumbs geht natuerlich nicht
a6e4f9b6729a first version with new full-text infrastructure and slightly changed templates
casties
parents: 83
diff changeset
561 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
562
a6e4f9b6729a first version with new full-text infrastructure and slightly changed templates
casties
parents: 83
diff changeset
563 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
564
a6e4f9b6729a first version with new full-text infrastructure and slightly changed templates
casties
parents: 83
diff changeset
565 return docinfo
22
b139f9937e97 preliminary version 0.2
casties
parents: 20
diff changeset
566
50
6c0f20cecc60 added evaluation of the presentation/info.xml in texttools
dwinter
parents: 49
diff changeset
567
6c0f20cecc60 added evaluation of the presentation/info.xml in texttools
dwinter
parents: 49
diff changeset
568 def getBibinfoFromTextToolPresentation(self,url,docinfo=None,dom=None):
6c0f20cecc60 added evaluation of the presentation/info.xml in texttools
dwinter
parents: 49
diff changeset
569 """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
570 """
6c0f20cecc60 added evaluation of the presentation/info.xml in texttools
dwinter
parents: 49
diff changeset
571 dom=self.getPresentationInfoXML(url)
62
8a16ea8db858 fixed bug in getInt
casties
parents: 61
diff changeset
572 try:
8a16ea8db858 fixed bug in getInt
casties
parents: 61
diff changeset
573 docinfo['author']=getTextFromNode(dom.xpath("//author")[0])
8a16ea8db858 fixed bug in getInt
casties
parents: 61
diff changeset
574 except:
8a16ea8db858 fixed bug in getInt
casties
parents: 61
diff changeset
575 pass
8a16ea8db858 fixed bug in getInt
casties
parents: 61
diff changeset
576 try:
8a16ea8db858 fixed bug in getInt
casties
parents: 61
diff changeset
577 docinfo['title']=getTextFromNode(dom.xpath("//title")[0])
8a16ea8db858 fixed bug in getInt
casties
parents: 61
diff changeset
578 except:
8a16ea8db858 fixed bug in getInt
casties
parents: 61
diff changeset
579 pass
8a16ea8db858 fixed bug in getInt
casties
parents: 61
diff changeset
580 try:
8a16ea8db858 fixed bug in getInt
casties
parents: 61
diff changeset
581 docinfo['year']=getTextFromNode(dom.xpath("//date")[0])
8a16ea8db858 fixed bug in getInt
casties
parents: 61
diff changeset
582 except:
8a16ea8db858 fixed bug in getInt
casties
parents: 61
diff changeset
583 pass
50
6c0f20cecc60 added evaluation of the presentation/info.xml in texttools
dwinter
parents: 49
diff changeset
584 return docinfo
6c0f20cecc60 added evaluation of the presentation/info.xml in texttools
dwinter
parents: 49
diff changeset
585
70
0049d64aa464 filepath introduced
dwinter
parents: 68
diff changeset
586 def getDocinfoFromImagePath(self,path,docinfo=None,cut=0):
22
b139f9937e97 preliminary version 0.2
casties
parents: 20
diff changeset
587 """path ist the path to the images it assumes that the index.meta file is one level higher."""
52
92047eaa6272 zLOG exchanged by logging
dwinter
parents: 51
diff changeset
588 logger("documentViewer (getdocinfofromimagepath)", logging.INFO,"path: %s"%(path))
22
b139f9937e97 preliminary version 0.2
casties
parents: 20
diff changeset
589 if docinfo is None:
b139f9937e97 preliminary version 0.2
casties
parents: 20
diff changeset
590 docinfo = {}
29
e1bed068b351 small fixes
casties
parents: 28
diff changeset
591 path=path.replace("/mpiwg/online","")
22
b139f9937e97 preliminary version 0.2
casties
parents: 20
diff changeset
592 docinfo['imagePath'] = path
73
dwinter
parents: 71
diff changeset
593 docinfo=self.getDirinfoFromDigilib(path,docinfo=docinfo,cut=cut)
78
70ab234a18dc bugs in filepath mode fixes
dwinter
parents: 75
diff changeset
594
79
df6952ac93e9 bug in getDocInforFromImagePath, relative lage der index.meta zu path war falsch.
dwinter
parents: 78
diff changeset
595 pathorig=path
78
70ab234a18dc bugs in filepath mode fixes
dwinter
parents: 75
diff changeset
596 for x in range(cut):
70ab234a18dc bugs in filepath mode fixes
dwinter
parents: 75
diff changeset
597 path=getParentDir(path)
70ab234a18dc bugs in filepath mode fixes
dwinter
parents: 75
diff changeset
598 logging.error("PATH:"+path)
31
c6451e8d5d23 more small fixes - now version 0.2.2
casties
parents: 29
diff changeset
599 imageUrl=self.digilibBaseUrl+"/servlet/Scaler?fn="+path
22
b139f9937e97 preliminary version 0.2
casties
parents: 20
diff changeset
600 docinfo['imageURL'] = imageUrl
b139f9937e97 preliminary version 0.2
casties
parents: 20
diff changeset
601
79
df6952ac93e9 bug in getDocInforFromImagePath, relative lage der index.meta zu path war falsch.
dwinter
parents: 78
diff changeset
602 #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
603 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
604 docinfo = self.getAuthinfoFromIndexMeta(pathorig,docinfo=docinfo,cut=cut+1)
22
b139f9937e97 preliminary version 0.2
casties
parents: 20
diff changeset
605 return docinfo
20
9884703dae70 new modi
dwinter
parents: 0
diff changeset
606
22
b139f9937e97 preliminary version 0.2
casties
parents: 20
diff changeset
607
b139f9937e97 preliminary version 0.2
casties
parents: 20
diff changeset
608 def getDocinfo(self, mode, url):
b139f9937e97 preliminary version 0.2
casties
parents: 20
diff changeset
609 """returns docinfo depending on mode"""
52
92047eaa6272 zLOG exchanged by logging
dwinter
parents: 51
diff changeset
610 logger("documentViewer (getdocinfo)", logging.INFO,"mode: %s, url: %s"%(mode,url))
22
b139f9937e97 preliminary version 0.2
casties
parents: 20
diff changeset
611 # look for cached docinfo in session
51
c5d3aabbf61b textviewer now integrated, new modus auto introduced as standard for viewing
dwinter
parents: 50
diff changeset
612 if self.REQUEST.SESSION.has_key('docinfo'):
22
b139f9937e97 preliminary version 0.2
casties
parents: 20
diff changeset
613 docinfo = self.REQUEST.SESSION['docinfo']
b139f9937e97 preliminary version 0.2
casties
parents: 20
diff changeset
614 # check if its still current
b139f9937e97 preliminary version 0.2
casties
parents: 20
diff changeset
615 if docinfo is not None and docinfo.get('mode') == mode and docinfo.get('url') == url:
52
92047eaa6272 zLOG exchanged by logging
dwinter
parents: 51
diff changeset
616 logger("documentViewer (getdocinfo)", logging.INFO,"docinfo in session: %s"%docinfo)
22
b139f9937e97 preliminary version 0.2
casties
parents: 20
diff changeset
617 return docinfo
b139f9937e97 preliminary version 0.2
casties
parents: 20
diff changeset
618 # new docinfo
b139f9937e97 preliminary version 0.2
casties
parents: 20
diff changeset
619 docinfo = {'mode': mode, 'url': url}
b139f9937e97 preliminary version 0.2
casties
parents: 20
diff changeset
620 if mode=="texttool": #index.meta with texttool information
b139f9937e97 preliminary version 0.2
casties
parents: 20
diff changeset
621 docinfo = self.getDocinfoFromTextTool(url, docinfo=docinfo)
b139f9937e97 preliminary version 0.2
casties
parents: 20
diff changeset
622 elif mode=="imagepath":
b139f9937e97 preliminary version 0.2
casties
parents: 20
diff changeset
623 docinfo = self.getDocinfoFromImagePath(url, docinfo=docinfo)
70
0049d64aa464 filepath introduced
dwinter
parents: 68
diff changeset
624 elif mode=="filepath":
75
9673218e155b minorCVS: ----------------------------------------------------------------------
dwinter
parents: 74
diff changeset
625 docinfo = self.getDocinfoFromImagePath(url, docinfo=docinfo,cut=1)
22
b139f9937e97 preliminary version 0.2
casties
parents: 20
diff changeset
626 else:
52
92047eaa6272 zLOG exchanged by logging
dwinter
parents: 51
diff changeset
627 logger("documentViewer (getdocinfo)", logging.ERROR,"unknown mode!")
90
6a4a72033d58 new version with new full-text infrastructure and some more changed templates
casties
parents: 84
diff changeset
628 raise ValueError("Unknown mode %s! Has to be one of 'texttool','imagepath','filepath'."%(mode))
37
ead830ce45d6 better error messages
casties
parents: 35
diff changeset
629
52
92047eaa6272 zLOG exchanged by logging
dwinter
parents: 51
diff changeset
630 logger("documentViewer (getdocinfo)", logging.INFO,"docinfo: %s"%docinfo)
22
b139f9937e97 preliminary version 0.2
casties
parents: 20
diff changeset
631 self.REQUEST.SESSION['docinfo'] = docinfo
b139f9937e97 preliminary version 0.2
casties
parents: 20
diff changeset
632 return docinfo
20
9884703dae70 new modi
dwinter
parents: 0
diff changeset
633
9884703dae70 new modi
dwinter
parents: 0
diff changeset
634
90
6a4a72033d58 new version with new full-text infrastructure and some more changed templates
casties
parents: 84
diff changeset
635 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
636 """returns pageinfo with the given parameters"""
b139f9937e97 preliminary version 0.2
casties
parents: 20
diff changeset
637 pageinfo = {}
25
e93fb8cadd3a new, less preliminary version 0.2
casties
parents: 22
diff changeset
638 current = getInt(current)
e93fb8cadd3a new, less preliminary version 0.2
casties
parents: 22
diff changeset
639 pageinfo['current'] = current
e93fb8cadd3a new, less preliminary version 0.2
casties
parents: 22
diff changeset
640 rows = int(rows or self.thumbrows)
e93fb8cadd3a new, less preliminary version 0.2
casties
parents: 22
diff changeset
641 pageinfo['rows'] = rows
e93fb8cadd3a new, less preliminary version 0.2
casties
parents: 22
diff changeset
642 cols = int(cols or self.thumbcols)
e93fb8cadd3a new, less preliminary version 0.2
casties
parents: 22
diff changeset
643 pageinfo['cols'] = cols
e93fb8cadd3a new, less preliminary version 0.2
casties
parents: 22
diff changeset
644 grpsize = cols * rows
e93fb8cadd3a new, less preliminary version 0.2
casties
parents: 22
diff changeset
645 pageinfo['groupsize'] = grpsize
61
f3d2f240692c fixed bug in calculation of group numbers
casties
parents: 59
diff changeset
646 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
647 # int(current / grpsize) * grpsize +1))
22
b139f9937e97 preliminary version 0.2
casties
parents: 20
diff changeset
648 pageinfo['start'] = start
25
e93fb8cadd3a new, less preliminary version 0.2
casties
parents: 22
diff changeset
649 pageinfo['end'] = start + grpsize
90
6a4a72033d58 new version with new full-text infrastructure and some more changed templates
casties
parents: 84
diff changeset
650 if (docinfo is not None) and ('numPages' in docinfo):
25
e93fb8cadd3a new, less preliminary version 0.2
casties
parents: 22
diff changeset
651 np = int(docinfo['numPages'])
e93fb8cadd3a new, less preliminary version 0.2
casties
parents: 22
diff changeset
652 pageinfo['end'] = min(pageinfo['end'], np)
e93fb8cadd3a new, less preliminary version 0.2
casties
parents: 22
diff changeset
653 pageinfo['numgroups'] = int(np / grpsize)
e93fb8cadd3a new, less preliminary version 0.2
casties
parents: 22
diff changeset
654 if np % grpsize > 0:
e93fb8cadd3a new, less preliminary version 0.2
casties
parents: 22
diff changeset
655 pageinfo['numgroups'] += 1
90
6a4a72033d58 new version with new full-text infrastructure and some more changed templates
casties
parents: 84
diff changeset
656
6a4a72033d58 new version with new full-text infrastructure and some more changed templates
casties
parents: 84
diff changeset
657 pageinfo['viewMode'] = viewMode
6a4a72033d58 new version with new full-text infrastructure and some more changed templates
casties
parents: 84
diff changeset
658 pageinfo['tocMode'] = tocMode
95
db6d594aa4d9 Last update with search function (getSearch)
abukhman
parents: 90
diff changeset
659 pageinfo['query'] = self.REQUEST.get('query',' ')
db6d594aa4d9 Last update with search function (getSearch)
abukhman
parents: 90
diff changeset
660 pageinfo['queryType'] = self.REQUEST.get('queryType',' ')
db6d594aa4d9 Last update with search function (getSearch)
abukhman
parents: 90
diff changeset
661 pageinfo['querySearch'] =self.REQUEST.get('querySearch', 'fulltext')
db6d594aa4d9 Last update with search function (getSearch)
abukhman
parents: 90
diff changeset
662 pageinfo['tocPageSize'] = self.REQUEST.get('tocPageSize', '30')
db6d594aa4d9 Last update with search function (getSearch)
abukhman
parents: 90
diff changeset
663 pageinfo['queryPageSize'] =self.REQUEST.get('queryPageSize', '20')
90
6a4a72033d58 new version with new full-text infrastructure and some more changed templates
casties
parents: 84
diff changeset
664 pageinfo['tocPN'] = self.REQUEST.get('tocPN', '1')
97
2b8fd19432fb Last update
abukhman
parents: 96
diff changeset
665 #if 'tocSize_%s'%tocMode in docinfo:
2b8fd19432fb Last update
abukhman
parents: 96
diff changeset
666 # cached toc
2b8fd19432fb Last update
abukhman
parents: 96
diff changeset
667 # pageinfo['tocPN'] = min (int (docinfo['tocSize_%s'%tocMode])/int(pageinfo['tocPageSize']),int(pageinfo['tocPN']))
2b8fd19432fb Last update
abukhman
parents: 96
diff changeset
668
95
db6d594aa4d9 Last update with search function (getSearch)
abukhman
parents: 90
diff changeset
669 pageinfo['searchPN'] =self.REQUEST.get('searchPN','1')
db6d594aa4d9 Last update with search function (getSearch)
abukhman
parents: 90
diff changeset
670 pageinfo['sn'] =self.REQUEST.get('sn','1')
78
70ab234a18dc bugs in filepath mode fixes
dwinter
parents: 75
diff changeset
671
22
b139f9937e97 preliminary version 0.2
casties
parents: 20
diff changeset
672 return pageinfo
b139f9937e97 preliminary version 0.2
casties
parents: 20
diff changeset
673
95
db6d594aa4d9 Last update with search function (getSearch)
abukhman
parents: 90
diff changeset
674 def getSearch(self, pn=1, pageinfo=None, docinfo=None, query=None, queryType=None):
db6d594aa4d9 Last update with search function (getSearch)
abukhman
parents: 90
diff changeset
675 """get search list"""
db6d594aa4d9 Last update with search function (getSearch)
abukhman
parents: 90
diff changeset
676 docpath = docinfo['textURLPath']
db6d594aa4d9 Last update with search function (getSearch)
abukhman
parents: 90
diff changeset
677 pagesize = pageinfo['queryPageSize']
db6d594aa4d9 Last update with search function (getSearch)
abukhman
parents: 90
diff changeset
678 pn = pageinfo['searchPN']
db6d594aa4d9 Last update with search function (getSearch)
abukhman
parents: 90
diff changeset
679 sn = pageinfo['sn']
db6d594aa4d9 Last update with search function (getSearch)
abukhman
parents: 90
diff changeset
680 query =pageinfo['query']
db6d594aa4d9 Last update with search function (getSearch)
abukhman
parents: 90
diff changeset
681 queryType =pageinfo['queryType']
96
a679c8c7148d getTranslate, getLemma
abukhman
parents: 95
diff changeset
682 viewMode= pageinfo['viewMode']
a679c8c7148d getTranslate, getLemma
abukhman
parents: 95
diff changeset
683 tocMode = pageinfo['tocMode']
a679c8c7148d getTranslate, getLemma
abukhman
parents: 95
diff changeset
684 tocPN = pageinfo['tocPN']
95
db6d594aa4d9 Last update with search function (getSearch)
abukhman
parents: 90
diff changeset
685 pagexml=self.template.fulltextclient.eval("/mpdl/interface/doc-query.xql","document=%s&mode=%s&queryType=%s&query=%s&queryResultPageSize=%s&queryResultPN=%s&sn=%s"%(docpath, 'text', queryType, query, pagesize, pn, sn) ,outputUnicode=False)
db6d594aa4d9 Last update with search function (getSearch)
abukhman
parents: 90
diff changeset
686 pagedom = Parse(pagexml)
97
2b8fd19432fb Last update
abukhman
parents: 96
diff changeset
687 pagedivs = pagedom.xpath("//div[@class='queryResultPage']")
2b8fd19432fb Last update
abukhman
parents: 96
diff changeset
688
96
a679c8c7148d getTranslate, getLemma
abukhman
parents: 95
diff changeset
689 selfurl = self.absolute_url()
97
2b8fd19432fb Last update
abukhman
parents: 96
diff changeset
690
96
a679c8c7148d getTranslate, getLemma
abukhman
parents: 95
diff changeset
691 page = pagexml.replace('page-fragment.xql?document=/echo/la/Benedetti_1585.xml','%s?url=/mpiwg/online/permanent/library/163127KK&viewMode=%s&tocMode=%s&tocPN=%s&query=%s&queryType=%s'%(selfurl, viewMode, tocMode, tocPN, query, queryType))
a679c8c7148d getTranslate, getLemma
abukhman
parents: 95
diff changeset
692 text =page.replace('mode=text','mode=texttool')
97
2b8fd19432fb Last update
abukhman
parents: 96
diff changeset
693 href = text.replace('lt/lex.xql','%s/template/head_main_voc'%selfurl)
2b8fd19432fb Last update
abukhman
parents: 96
diff changeset
694 lemma= href.replace('lt/lemma.xql','%s/template/head_main_lemma'%selfurl)
2b8fd19432fb Last update
abukhman
parents: 96
diff changeset
695 #logging.debug("documentViewer (gettoc) lemma: %s"%(lemma))
2b8fd19432fb Last update
abukhman
parents: 96
diff changeset
696
2b8fd19432fb Last update
abukhman
parents: 96
diff changeset
697 return lemma
2b8fd19432fb Last update
abukhman
parents: 96
diff changeset
698
2b8fd19432fb Last update
abukhman
parents: 96
diff changeset
699
95
db6d594aa4d9 Last update with search function (getSearch)
abukhman
parents: 90
diff changeset
700 #if len(pagedivs) > 0:
db6d594aa4d9 Last update with search function (getSearch)
abukhman
parents: 90
diff changeset
701 # pagenode = pagedom[0]
db6d594aa4d9 Last update with search function (getSearch)
abukhman
parents: 90
diff changeset
702 # return serializeNode(pagenode)
db6d594aa4d9 Last update with search function (getSearch)
abukhman
parents: 90
diff changeset
703 #else:
db6d594aa4d9 Last update with search function (getSearch)
abukhman
parents: 90
diff changeset
704 # return "xaxa"
0
dwinter
parents:
diff changeset
705
84
a6e4f9b6729a first version with new full-text infrastructure and slightly changed templates
casties
parents: 83
diff changeset
706 def getNumPages(self,docinfo=None):
a6e4f9b6729a first version with new full-text infrastructure and slightly changed templates
casties
parents: 83
diff changeset
707 """get list of pages from fulltext and put in docinfo"""
a6e4f9b6729a first version with new full-text infrastructure and slightly changed templates
casties
parents: 83
diff changeset
708 xquery = '//pb'
a6e4f9b6729a first version with new full-text infrastructure and slightly changed templates
casties
parents: 83
diff changeset
709 text = self.template.fulltextclient.eval("/mpdl/interface/xquery.xql", "document=%s&xquery=%s"%(docinfo['textURLPath'],xquery))
a6e4f9b6729a first version with new full-text infrastructure and slightly changed templates
casties
parents: 83
diff changeset
710 # TODO: better processing of the page list. do we need the info somewhere else also?
a6e4f9b6729a first version with new full-text infrastructure and slightly changed templates
casties
parents: 83
diff changeset
711 docinfo['numPages'] = text.count("<pb ")
a6e4f9b6729a first version with new full-text infrastructure and slightly changed templates
casties
parents: 83
diff changeset
712 return docinfo
a6e4f9b6729a first version with new full-text infrastructure and slightly changed templates
casties
parents: 83
diff changeset
713
96
a679c8c7148d getTranslate, getLemma
abukhman
parents: 95
diff changeset
714 def getTextPage(self, mode="text", pn=1, docinfo=None, pageinfo=None,):
84
a6e4f9b6729a first version with new full-text infrastructure and slightly changed templates
casties
parents: 83
diff changeset
715 """returns single page from fulltext"""
90
6a4a72033d58 new version with new full-text infrastructure and some more changed templates
casties
parents: 84
diff changeset
716 docpath = docinfo['textURLPath']
6a4a72033d58 new version with new full-text infrastructure and some more changed templates
casties
parents: 84
diff changeset
717 if mode == "text_dict":
6a4a72033d58 new version with new full-text infrastructure and some more changed templates
casties
parents: 84
diff changeset
718 textmode = "textPollux"
6a4a72033d58 new version with new full-text infrastructure and some more changed templates
casties
parents: 84
diff changeset
719 else:
6a4a72033d58 new version with new full-text infrastructure and some more changed templates
casties
parents: 84
diff changeset
720 textmode = mode
6a4a72033d58 new version with new full-text infrastructure and some more changed templates
casties
parents: 84
diff changeset
721
96
a679c8c7148d getTranslate, getLemma
abukhman
parents: 95
diff changeset
722 #selfurl = self.absolute_url()
a679c8c7148d getTranslate, getLemma
abukhman
parents: 95
diff changeset
723 #viewMode= pageinfo['viewMode']
a679c8c7148d getTranslate, getLemma
abukhman
parents: 95
diff changeset
724 #tocMode = pageinfo['tocMode']
a679c8c7148d getTranslate, getLemma
abukhman
parents: 95
diff changeset
725 #tocPN = pageinfo['tocPN']
a679c8c7148d getTranslate, getLemma
abukhman
parents: 95
diff changeset
726
90
6a4a72033d58 new version with new full-text infrastructure and some more changed templates
casties
parents: 84
diff changeset
727 pagexml=self.template.fulltextclient.eval("/mpdl/interface/page-fragment.xql", "document=%s&mode=%s&pn=%s"%(docpath,textmode,pn), outputUnicode=False)
95
db6d594aa4d9 Last update with search function (getSearch)
abukhman
parents: 90
diff changeset
728 #######
96
a679c8c7148d getTranslate, getLemma
abukhman
parents: 95
diff changeset
729 #page = pagexml.replace('page-fragment.xql?document=/echo/la/Benedetti_1585.xml','%s?url=/mpiwg/online/permanent/library/163127KK&viewMode=%s&tocMode=%s&tocPN=%s'%(selfurl, viewMode, tocMode, tocPN))
a679c8c7148d getTranslate, getLemma
abukhman
parents: 95
diff changeset
730 #text =page.replace('mode=text','mode=texttool')
95
db6d594aa4d9 Last update with search function (getSearch)
abukhman
parents: 90
diff changeset
731 #######
84
a6e4f9b6729a first version with new full-text infrastructure and slightly changed templates
casties
parents: 83
diff changeset
732 # post-processing downloaded xml
a6e4f9b6729a first version with new full-text infrastructure and slightly changed templates
casties
parents: 83
diff changeset
733 pagedom = Parse(pagexml)
a6e4f9b6729a first version with new full-text infrastructure and slightly changed templates
casties
parents: 83
diff changeset
734 # plain text mode
a6e4f9b6729a first version with new full-text infrastructure and slightly changed templates
casties
parents: 83
diff changeset
735 if mode == "text":
a6e4f9b6729a first version with new full-text infrastructure and slightly changed templates
casties
parents: 83
diff changeset
736 # first div contains text
a6e4f9b6729a first version with new full-text infrastructure and slightly changed templates
casties
parents: 83
diff changeset
737 pagedivs = pagedom.xpath("/div")
95
db6d594aa4d9 Last update with search function (getSearch)
abukhman
parents: 90
diff changeset
738 #queryResultPage
84
a6e4f9b6729a first version with new full-text infrastructure and slightly changed templates
casties
parents: 83
diff changeset
739 if len(pagedivs) > 0:
a6e4f9b6729a first version with new full-text infrastructure and slightly changed templates
casties
parents: 83
diff changeset
740 pagenode = pagedivs[0]
a6e4f9b6729a first version with new full-text infrastructure and slightly changed templates
casties
parents: 83
diff changeset
741 return serializeNode(pagenode)
a6e4f9b6729a first version with new full-text infrastructure and slightly changed templates
casties
parents: 83
diff changeset
742
a6e4f9b6729a first version with new full-text infrastructure and slightly changed templates
casties
parents: 83
diff changeset
743 # text-with-links mode
90
6a4a72033d58 new version with new full-text infrastructure and some more changed templates
casties
parents: 84
diff changeset
744 if mode == "text_dict":
84
a6e4f9b6729a first version with new full-text infrastructure and slightly changed templates
casties
parents: 83
diff changeset
745 # first div contains text
a6e4f9b6729a first version with new full-text infrastructure and slightly changed templates
casties
parents: 83
diff changeset
746 pagedivs = pagedom.xpath("/div")
a6e4f9b6729a first version with new full-text infrastructure and slightly changed templates
casties
parents: 83
diff changeset
747 if len(pagedivs) > 0:
a6e4f9b6729a first version with new full-text infrastructure and slightly changed templates
casties
parents: 83
diff changeset
748 pagenode = pagedivs[0]
a6e4f9b6729a first version with new full-text infrastructure and slightly changed templates
casties
parents: 83
diff changeset
749 # check all a-tags
a6e4f9b6729a first version with new full-text infrastructure and slightly changed templates
casties
parents: 83
diff changeset
750 links = pagenode.xpath("//a")
a6e4f9b6729a first version with new full-text infrastructure and slightly changed templates
casties
parents: 83
diff changeset
751 for l in links:
a6e4f9b6729a first version with new full-text infrastructure and slightly changed templates
casties
parents: 83
diff changeset
752 hrefNode = l.getAttributeNodeNS(None, u"href")
a6e4f9b6729a first version with new full-text infrastructure and slightly changed templates
casties
parents: 83
diff changeset
753 if hrefNode:
a6e4f9b6729a first version with new full-text infrastructure and slightly changed templates
casties
parents: 83
diff changeset
754 # is link with href
a6e4f9b6729a first version with new full-text infrastructure and slightly changed templates
casties
parents: 83
diff changeset
755 href = hrefNode.nodeValue
a6e4f9b6729a first version with new full-text infrastructure and slightly changed templates
casties
parents: 83
diff changeset
756 if href.startswith('lt/lex.xql'):
a6e4f9b6729a first version with new full-text infrastructure and slightly changed templates
casties
parents: 83
diff changeset
757 # is pollux link
a6e4f9b6729a first version with new full-text infrastructure and slightly changed templates
casties
parents: 83
diff changeset
758 selfurl = self.absolute_url()
a6e4f9b6729a first version with new full-text infrastructure and slightly changed templates
casties
parents: 83
diff changeset
759 # change href
96
a679c8c7148d getTranslate, getLemma
abukhman
parents: 95
diff changeset
760 hrefNode.nodeValue = href.replace('lt/lex.xql','%s/template/head_main_voc'%selfurl)
84
a6e4f9b6729a first version with new full-text infrastructure and slightly changed templates
casties
parents: 83
diff changeset
761 # add target
a6e4f9b6729a first version with new full-text infrastructure and slightly changed templates
casties
parents: 83
diff changeset
762 l.setAttributeNS(None, 'target', '_blank')
96
a679c8c7148d getTranslate, getLemma
abukhman
parents: 95
diff changeset
763
a679c8c7148d getTranslate, getLemma
abukhman
parents: 95
diff changeset
764 if href.startswith('lt/lemma.xql'):
a679c8c7148d getTranslate, getLemma
abukhman
parents: 95
diff changeset
765 selfurl = self.absolute_url()
a679c8c7148d getTranslate, getLemma
abukhman
parents: 95
diff changeset
766 hrefNode.nodeValue = href.replace('lt/lemma.xql','%s/template/head_main_lemma'%selfurl)
a679c8c7148d getTranslate, getLemma
abukhman
parents: 95
diff changeset
767 l.setAttributeNS(None, 'target', '_blank')
84
a6e4f9b6729a first version with new full-text infrastructure and slightly changed templates
casties
parents: 83
diff changeset
768 return serializeNode(pagenode)
0
dwinter
parents:
diff changeset
769
84
a6e4f9b6729a first version with new full-text infrastructure and slightly changed templates
casties
parents: 83
diff changeset
770 return "no text here"
22
b139f9937e97 preliminary version 0.2
casties
parents: 20
diff changeset
771
96
a679c8c7148d getTranslate, getLemma
abukhman
parents: 95
diff changeset
772 def getTranslate(self, query=None, language=None):
a679c8c7148d getTranslate, getLemma
abukhman
parents: 95
diff changeset
773 """translate into another languages"""
a679c8c7148d getTranslate, getLemma
abukhman
parents: 95
diff changeset
774 pagexml=self.template.fulltextclient.eval("/mpdl/interface/lt/lex.xql","query=%s&language=%s"%(query,language),outputUnicode=False)
a679c8c7148d getTranslate, getLemma
abukhman
parents: 95
diff changeset
775 return pagexml
a679c8c7148d getTranslate, getLemma
abukhman
parents: 95
diff changeset
776
97
2b8fd19432fb Last update
abukhman
parents: 96
diff changeset
777 def getLemma(self, lemma=None, language=None):
96
a679c8c7148d getTranslate, getLemma
abukhman
parents: 95
diff changeset
778 """lemma"""
97
2b8fd19432fb Last update
abukhman
parents: 96
diff changeset
779 pagexml=self.template.fulltextclient.eval("/mpdl/interface/lt/lemma.xql","lemma=%s&language=%s"%(lemma,language),outputUnicode=False)
96
a679c8c7148d getTranslate, getLemma
abukhman
parents: 95
diff changeset
780 return pagexml
a679c8c7148d getTranslate, getLemma
abukhman
parents: 95
diff changeset
781
97
2b8fd19432fb Last update
abukhman
parents: 96
diff changeset
782 def getQuery (self, docinfo=None, pageinfo=None, query=None, queryType=None, pn=1):
2b8fd19432fb Last update
abukhman
parents: 96
diff changeset
783 """number of"""
2b8fd19432fb Last update
abukhman
parents: 96
diff changeset
784 docpath = docinfo['textURLPath']
2b8fd19432fb Last update
abukhman
parents: 96
diff changeset
785 pagesize = pageinfo['queryPageSize']
2b8fd19432fb Last update
abukhman
parents: 96
diff changeset
786 pn = pageinfo['searchPN']
2b8fd19432fb Last update
abukhman
parents: 96
diff changeset
787 query =pageinfo['query']
2b8fd19432fb Last update
abukhman
parents: 96
diff changeset
788 queryType =pageinfo['queryType']
2b8fd19432fb Last update
abukhman
parents: 96
diff changeset
789
2b8fd19432fb Last update
abukhman
parents: 96
diff changeset
790 tocSearch = 0
2b8fd19432fb Last update
abukhman
parents: 96
diff changeset
791 tocDiv = None
2b8fd19432fb Last update
abukhman
parents: 96
diff changeset
792 pagexml=self.template.fulltextclient.eval("/mpdl/interface/doc-query.xql","document=%s&mode=%s&queryType=%s&query=%s&queryResultPageSize=%s&queryResultPN=%s"%(docpath, 'text', queryType, query, pagesize, pn) ,outputUnicode=False)
2b8fd19432fb Last update
abukhman
parents: 96
diff changeset
793
2b8fd19432fb Last update
abukhman
parents: 96
diff changeset
794 pagedom = Parse(pagexml)
2b8fd19432fb Last update
abukhman
parents: 96
diff changeset
795 numdivs = pagedom.xpath("//div[@class='queryResultHits']")
2b8fd19432fb Last update
abukhman
parents: 96
diff changeset
796 tocSearch = int(getTextFromNode(numdivs[0]))
2b8fd19432fb Last update
abukhman
parents: 96
diff changeset
797 tc=int((tocSearch/20)+1)
2b8fd19432fb Last update
abukhman
parents: 96
diff changeset
798 logging.debug("documentViewer (gettoc) tc: %s"%(tc))
2b8fd19432fb Last update
abukhman
parents: 96
diff changeset
799 return tc
2b8fd19432fb Last update
abukhman
parents: 96
diff changeset
800
90
6a4a72033d58 new version with new full-text infrastructure and some more changed templates
casties
parents: 84
diff changeset
801 def getToc(self, mode="text", docinfo=None):
6a4a72033d58 new version with new full-text infrastructure and some more changed templates
casties
parents: 84
diff changeset
802 """loads table of contents and stores in docinfo"""
6a4a72033d58 new version with new full-text infrastructure and some more changed templates
casties
parents: 84
diff changeset
803 logging.debug("documentViewer (gettoc) mode: %s"%(mode))
6a4a72033d58 new version with new full-text infrastructure and some more changed templates
casties
parents: 84
diff changeset
804 if 'tocSize_%s'%mode in docinfo:
6a4a72033d58 new version with new full-text infrastructure and some more changed templates
casties
parents: 84
diff changeset
805 # cached toc
97
2b8fd19432fb Last update
abukhman
parents: 96
diff changeset
806 return docinfo
90
6a4a72033d58 new version with new full-text infrastructure and some more changed templates
casties
parents: 84
diff changeset
807 docpath = docinfo['textURLPath']
6a4a72033d58 new version with new full-text infrastructure and some more changed templates
casties
parents: 84
diff changeset
808 # we need to set a result set size
6a4a72033d58 new version with new full-text infrastructure and some more changed templates
casties
parents: 84
diff changeset
809 pagesize = 1000
6a4a72033d58 new version with new full-text infrastructure and some more changed templates
casties
parents: 84
diff changeset
810 pn = 1
6a4a72033d58 new version with new full-text infrastructure and some more changed templates
casties
parents: 84
diff changeset
811 if mode == "text":
6a4a72033d58 new version with new full-text infrastructure and some more changed templates
casties
parents: 84
diff changeset
812 queryType = "toc"
6a4a72033d58 new version with new full-text infrastructure and some more changed templates
casties
parents: 84
diff changeset
813 else:
6a4a72033d58 new version with new full-text infrastructure and some more changed templates
casties
parents: 84
diff changeset
814 queryType = mode
6a4a72033d58 new version with new full-text infrastructure and some more changed templates
casties
parents: 84
diff changeset
815 # number of entries in toc
6a4a72033d58 new version with new full-text infrastructure and some more changed templates
casties
parents: 84
diff changeset
816 tocSize = 0
6a4a72033d58 new version with new full-text infrastructure and some more changed templates
casties
parents: 84
diff changeset
817 tocDiv = None
6a4a72033d58 new version with new full-text infrastructure and some more changed templates
casties
parents: 84
diff changeset
818 pagexml=self.template.fulltextclient.eval("/mpdl/interface/doc-query.xql", "document=%s&queryType=%s&queryResultPageSize=%s&queryResultPN=%s"%(docpath,queryType,pagesize,pn), outputUnicode=False)
6a4a72033d58 new version with new full-text infrastructure and some more changed templates
casties
parents: 84
diff changeset
819 # post-processing downloaded xml
6a4a72033d58 new version with new full-text infrastructure and some more changed templates
casties
parents: 84
diff changeset
820 pagedom = Parse(pagexml)
6a4a72033d58 new version with new full-text infrastructure and some more changed templates
casties
parents: 84
diff changeset
821 # get number of entries
6a4a72033d58 new version with new full-text infrastructure and some more changed templates
casties
parents: 84
diff changeset
822 numdivs = pagedom.xpath("//div[@class='queryResultHits']")
6a4a72033d58 new version with new full-text infrastructure and some more changed templates
casties
parents: 84
diff changeset
823 if len(numdivs) > 0:
6a4a72033d58 new version with new full-text infrastructure and some more changed templates
casties
parents: 84
diff changeset
824 tocSize = int(getTextFromNode(numdivs[0]))
6a4a72033d58 new version with new full-text infrastructure and some more changed templates
casties
parents: 84
diff changeset
825 # div contains text
6a4a72033d58 new version with new full-text infrastructure and some more changed templates
casties
parents: 84
diff changeset
826 #pagedivs = pagedom.xpath("//div[@class='queryResultPage']")
6a4a72033d58 new version with new full-text infrastructure and some more changed templates
casties
parents: 84
diff changeset
827 #if len(pagedivs) > 0:
6a4a72033d58 new version with new full-text infrastructure and some more changed templates
casties
parents: 84
diff changeset
828 # tocDiv = pagedivs[0]
6a4a72033d58 new version with new full-text infrastructure and some more changed templates
casties
parents: 84
diff changeset
829
6a4a72033d58 new version with new full-text infrastructure and some more changed templates
casties
parents: 84
diff changeset
830 docinfo['tocSize_%s'%mode] = tocSize
6a4a72033d58 new version with new full-text infrastructure and some more changed templates
casties
parents: 84
diff changeset
831 #docinfo['tocDiv_%s'%mode] = tocDiv
6a4a72033d58 new version with new full-text infrastructure and some more changed templates
casties
parents: 84
diff changeset
832 return docinfo
6a4a72033d58 new version with new full-text infrastructure and some more changed templates
casties
parents: 84
diff changeset
833
95
db6d594aa4d9 Last update with search function (getSearch)
abukhman
parents: 90
diff changeset
834 def getTocPage(self, mode="text", pn=1, pageinfo=None, docinfo=None):
90
6a4a72033d58 new version with new full-text infrastructure and some more changed templates
casties
parents: 84
diff changeset
835 """returns single page from the table of contents"""
6a4a72033d58 new version with new full-text infrastructure and some more changed templates
casties
parents: 84
diff changeset
836 # TODO: this should use the cached TOC
6a4a72033d58 new version with new full-text infrastructure and some more changed templates
casties
parents: 84
diff changeset
837 if mode == "text":
6a4a72033d58 new version with new full-text infrastructure and some more changed templates
casties
parents: 84
diff changeset
838 queryType = "toc"
6a4a72033d58 new version with new full-text infrastructure and some more changed templates
casties
parents: 84
diff changeset
839 else:
6a4a72033d58 new version with new full-text infrastructure and some more changed templates
casties
parents: 84
diff changeset
840 queryType = mode
6a4a72033d58 new version with new full-text infrastructure and some more changed templates
casties
parents: 84
diff changeset
841 docpath = docinfo['textURLPath']
6a4a72033d58 new version with new full-text infrastructure and some more changed templates
casties
parents: 84
diff changeset
842 pagesize = pageinfo['tocPageSize']
6a4a72033d58 new version with new full-text infrastructure and some more changed templates
casties
parents: 84
diff changeset
843 pn = pageinfo['tocPN']
96
a679c8c7148d getTranslate, getLemma
abukhman
parents: 95
diff changeset
844
a679c8c7148d getTranslate, getLemma
abukhman
parents: 95
diff changeset
845 selfurl = self.absolute_url()
a679c8c7148d getTranslate, getLemma
abukhman
parents: 95
diff changeset
846 viewMode= pageinfo['viewMode']
a679c8c7148d getTranslate, getLemma
abukhman
parents: 95
diff changeset
847 tocMode = pageinfo['tocMode']
a679c8c7148d getTranslate, getLemma
abukhman
parents: 95
diff changeset
848 tocPN = pageinfo['tocPN']
a679c8c7148d getTranslate, getLemma
abukhman
parents: 95
diff changeset
849
95
db6d594aa4d9 Last update with search function (getSearch)
abukhman
parents: 90
diff changeset
850 pagexml=self.template.fulltextclient.eval("/mpdl/interface/doc-query.xql", "document=%s&queryType=%s&queryResultPageSize=%s&queryResultPN=%s"%(docpath,queryType, pagesize, pn), outputUnicode=False)
96
a679c8c7148d getTranslate, getLemma
abukhman
parents: 95
diff changeset
851 page = pagexml.replace('page-fragment.xql?document=/echo/la/Benedetti_1585.xml','%s?url=/mpiwg/online/permanent/library/163127KK&viewMode=%s&tocMode=%s&tocPN=%s'%(selfurl, viewMode, tocMode, tocPN))
a679c8c7148d getTranslate, getLemma
abukhman
parents: 95
diff changeset
852 text = page.replace('mode=image','mode=texttool')
a679c8c7148d getTranslate, getLemma
abukhman
parents: 95
diff changeset
853 return text
90
6a4a72033d58 new version with new full-text infrastructure and some more changed templates
casties
parents: 84
diff changeset
854 # post-processing downloaded xml
96
a679c8c7148d getTranslate, getLemma
abukhman
parents: 95
diff changeset
855 #pagedom = Parse(text)
90
6a4a72033d58 new version with new full-text infrastructure and some more changed templates
casties
parents: 84
diff changeset
856 # div contains text
96
a679c8c7148d getTranslate, getLemma
abukhman
parents: 95
diff changeset
857 #pagedivs = pagedom.xpath("//div[@class='queryResultPage']")
a679c8c7148d getTranslate, getLemma
abukhman
parents: 95
diff changeset
858 #if len(pagedivs) > 0:
a679c8c7148d getTranslate, getLemma
abukhman
parents: 95
diff changeset
859 # pagenode = pagedivs[0]
a679c8c7148d getTranslate, getLemma
abukhman
parents: 95
diff changeset
860 # return serializeNode(pagenode)
a679c8c7148d getTranslate, getLemma
abukhman
parents: 95
diff changeset
861 #else:
a679c8c7148d getTranslate, getLemma
abukhman
parents: 95
diff changeset
862 # return "No TOC!"
90
6a4a72033d58 new version with new full-text infrastructure and some more changed templates
casties
parents: 84
diff changeset
863
22
b139f9937e97 preliminary version 0.2
casties
parents: 20
diff changeset
864
95
db6d594aa4d9 Last update with search function (getSearch)
abukhman
parents: 90
diff changeset
865 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
866 """init document viewer"""
b139f9937e97 preliminary version 0.2
casties
parents: 20
diff changeset
867 self.title=title
b139f9937e97 preliminary version 0.2
casties
parents: 20
diff changeset
868 self.digilibBaseUrl = digilibBaseUrl
25
e93fb8cadd3a new, less preliminary version 0.2
casties
parents: 22
diff changeset
869 self.thumbrows = thumbrows
e93fb8cadd3a new, less preliminary version 0.2
casties
parents: 22
diff changeset
870 self.thumbcols = thumbcols
32
b25c89d693cf version 0.2.3 - first version with access control!
casties
parents: 31
diff changeset
871 self.authgroups = [s.strip().lower() for s in authgroups.split(',')]
22
b139f9937e97 preliminary version 0.2
casties
parents: 20
diff changeset
872 if RESPONSE is not None:
b139f9937e97 preliminary version 0.2
casties
parents: 20
diff changeset
873 RESPONSE.redirect('manage_main')
0
dwinter
parents:
diff changeset
874
dwinter
parents:
diff changeset
875
dwinter
parents:
diff changeset
876
dwinter
parents:
diff changeset
877 def manage_AddDocumentViewerForm(self):
dwinter
parents:
diff changeset
878 """add the viewer form"""
22
b139f9937e97 preliminary version 0.2
casties
parents: 20
diff changeset
879 pt=PageTemplateFile('zpt/addDocumentViewer', globals()).__of__(self)
0
dwinter
parents:
diff changeset
880 return pt()
dwinter
parents:
diff changeset
881
84
a6e4f9b6729a first version with new full-text infrastructure and slightly changed templates
casties
parents: 83
diff changeset
882 def manage_AddDocumentViewer(self,id,imageScalerUrl="",textServerName="",title="",RESPONSE=None):
0
dwinter
parents:
diff changeset
883 """add the viewer"""
84
a6e4f9b6729a first version with new full-text infrastructure and slightly changed templates
casties
parents: 83
diff changeset
884 newObj=documentViewer(id,imageScalerUrl=imageScalerUrl,title=title,textServerName=textServerName)
0
dwinter
parents:
diff changeset
885 self._setObject(id,newObj)
dwinter
parents:
diff changeset
886
dwinter
parents:
diff changeset
887 if RESPONSE is not None:
dwinter
parents:
diff changeset
888 RESPONSE.redirect('manage_main')
22
b139f9937e97 preliminary version 0.2
casties
parents: 20
diff changeset
889
b139f9937e97 preliminary version 0.2
casties
parents: 20
diff changeset
890
b139f9937e97 preliminary version 0.2
casties
parents: 20
diff changeset
891 ##
b139f9937e97 preliminary version 0.2
casties
parents: 20
diff changeset
892 ## DocumentViewerTemplate class
b139f9937e97 preliminary version 0.2
casties
parents: 20
diff changeset
893 ##
b139f9937e97 preliminary version 0.2
casties
parents: 20
diff changeset
894 class DocumentViewerTemplate(ZopePageTemplate):
b139f9937e97 preliminary version 0.2
casties
parents: 20
diff changeset
895 """Template for document viewer"""
b139f9937e97 preliminary version 0.2
casties
parents: 20
diff changeset
896 meta_type="DocumentViewer Template"
b139f9937e97 preliminary version 0.2
casties
parents: 20
diff changeset
897
b139f9937e97 preliminary version 0.2
casties
parents: 20
diff changeset
898
b139f9937e97 preliminary version 0.2
casties
parents: 20
diff changeset
899 def manage_addDocumentViewerTemplateForm(self):
b139f9937e97 preliminary version 0.2
casties
parents: 20
diff changeset
900 """Form for adding"""
b139f9937e97 preliminary version 0.2
casties
parents: 20
diff changeset
901 pt=PageTemplateFile('zpt/addDocumentViewerTemplate', globals()).__of__(self)
b139f9937e97 preliminary version 0.2
casties
parents: 20
diff changeset
902 return pt()
b139f9937e97 preliminary version 0.2
casties
parents: 20
diff changeset
903
b139f9937e97 preliminary version 0.2
casties
parents: 20
diff changeset
904 def manage_addDocumentViewerTemplate(self, id='viewer_main', title=None, text=None,
b139f9937e97 preliminary version 0.2
casties
parents: 20
diff changeset
905 REQUEST=None, submit=None):
b139f9937e97 preliminary version 0.2
casties
parents: 20
diff changeset
906 "Add a Page Template with optional file content."
b139f9937e97 preliminary version 0.2
casties
parents: 20
diff changeset
907
b139f9937e97 preliminary version 0.2
casties
parents: 20
diff changeset
908 self._setObject(id, DocumentViewerTemplate(id))
b139f9937e97 preliminary version 0.2
casties
parents: 20
diff changeset
909 ob = getattr(self, id)
53
f4e0af8c281d NEW - # 44: ECHO - vollst?ndige bibliographische Angabe
dwinter
parents: 52
diff changeset
910 txt=file(os.path.join(package_home(globals()),'zpt/viewer_main.zpt'),'r').read()
f4e0af8c281d NEW - # 44: ECHO - vollst?ndige bibliographische Angabe
dwinter
parents: 52
diff changeset
911 logging.info("txt %s:"%txt)
f4e0af8c281d NEW - # 44: ECHO - vollst?ndige bibliographische Angabe
dwinter
parents: 52
diff changeset
912 ob.pt_edit(txt,"text/html")
22
b139f9937e97 preliminary version 0.2
casties
parents: 20
diff changeset
913 if title:
b139f9937e97 preliminary version 0.2
casties
parents: 20
diff changeset
914 ob.pt_setTitle(title)
b139f9937e97 preliminary version 0.2
casties
parents: 20
diff changeset
915 try:
b139f9937e97 preliminary version 0.2
casties
parents: 20
diff changeset
916 u = self.DestinationURL()
b139f9937e97 preliminary version 0.2
casties
parents: 20
diff changeset
917 except AttributeError:
b139f9937e97 preliminary version 0.2
casties
parents: 20
diff changeset
918 u = REQUEST['URL1']
b139f9937e97 preliminary version 0.2
casties
parents: 20
diff changeset
919
b139f9937e97 preliminary version 0.2
casties
parents: 20
diff changeset
920 u = "%s/%s" % (u, urllib.quote(id))
b139f9937e97 preliminary version 0.2
casties
parents: 20
diff changeset
921 REQUEST.RESPONSE.redirect(u+'/manage_main')
b139f9937e97 preliminary version 0.2
casties
parents: 20
diff changeset
922 return ''
b139f9937e97 preliminary version 0.2
casties
parents: 20
diff changeset
923
b139f9937e97 preliminary version 0.2
casties
parents: 20
diff changeset
924
41
0c8ee8fcfd76 some more logging
casties
parents: 40
diff changeset
925