documentViewer: documentViewer.py annotate

annotate documentViewer.py @ 84:a6e4f9b6729a

first version with new full-text infrastructure and slightly changed templates

author	casties
date	Fri, 19 Mar 2010 12:42:40 +0100
parents	ec12a2440daa
children	6a4a72033d58

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

Mercurial > hg > documentViewer

annotate documentViewer.py @ 84:a6e4f9b6729a