annotate documentViewer.py @ 455:0a53fea83df7 elementtree

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