version 1.37, 2008/11/04 22:03:56
|
version 1.40, 2010/02/12 13:17:09
|
Line 189 class documentViewer(Folder):
|
Line 189 class documentViewer(Folder):
|
del params[param] |
del params[param] |
else: |
else: |
params[param] = str(val) |
params[param] = str(val) |
|
if params["mode"] == "filepath": #wenn beim erst Aufruf filepath gesetzt wurde aendere das nun zu imagepath |
|
params["mode"] = "imagepath" |
|
params["url"] = getParentDir(params["url"]) |
|
|
# quote values and assemble into query string |
# quote values and assemble into query string |
ps = "&".join(["%s=%s"%(k,urllib.quote(v)) for (k, v) in params.items()]) |
ps = "&".join(["%s=%s"%(k,urllib.quote(v)) for (k, v) in params.items()]) |
Line 210 class documentViewer(Folder):
|
Line 213 class documentViewer(Folder):
|
ps = "&".join(["%s=%s"%(k,urllib.quote(v)) for (k, v) in params.items()]) |
ps = "&".join(["%s=%s"%(k,urllib.quote(v)) for (k, v) in params.items()]) |
url=self.REQUEST['URL1']+"?"+ps |
url=self.REQUEST['URL1']+"?"+ps |
return url |
return url |
|
|
def getInfo_xml(self,url,mode): |
def getInfo_xml(self,url,mode): |
"""returns info about the document as XML""" |
"""returns info about the document as XML""" |
|
|
Line 257 class documentViewer(Folder):
|
Line 261 class documentViewer(Folder):
|
docinfo = {} |
docinfo = {} |
|
|
for x in range(cut): |
for x in range(cut): |
|
|
path=getParentDir(path) |
path=getParentDir(path) |
|
|
infoUrl=self.digilibBaseUrl+"/dirInfo-xml.jsp?mo=dir&fn="+path |
infoUrl=self.digilibBaseUrl+"/dirInfo-xml.jsp?mo=dir&fn="+path |
|
|
logger("documentViewer (getparamfromdigilib)", logging.INFO, "dirInfo from %s"%(infoUrl)) |
logger("documentViewer (getparamfromdigilib)", logging.INFO, "dirInfo from %s"%(infoUrl)) |
Line 332 class documentViewer(Folder):
|
Line 338 class documentViewer(Folder):
|
try: |
try: |
# patch dirk encoding fehler treten dann nicht mehr auf |
# patch dirk encoding fehler treten dann nicht mehr auf |
# dom = NonvalidatingReader.parseUri(metaUrl) |
# dom = NonvalidatingReader.parseUri(metaUrl) |
|
logging.debug("getpresentationinfoxml: metaurl=%s"%metaUrl) |
txt=urllib.urlopen(metaUrl).read() |
txt=urllib.urlopen(metaUrl).read() |
dom = Parse(txt) |
dom = Parse(txt) |
break |
break |
Line 354 class documentViewer(Folder):
|
Line 361 class documentViewer(Folder):
|
docinfo = {} |
docinfo = {} |
|
|
if dom is None: |
if dom is None: |
for x in range(cut+1): |
for x in range(cut): |
path=getParentDir(path) |
path=getParentDir(path) |
dom = self.getIndexMeta(path) |
dom = self.getIndexMeta(path) |
|
|
Line 376 class documentViewer(Folder):
|
Line 383 class documentViewer(Folder):
|
docinfo = {} |
docinfo = {} |
|
|
if dom is None: |
if dom is None: |
for x in range(cut+1): |
for x in range(cut): |
path=getParentDir(path) |
path=getParentDir(path) |
dom = self.getIndexMeta(path) |
dom = self.getIndexMeta(path) |
|
|
|
logging.debug("documentViewer (getbibinfofromindexmeta cutted) path: %s"%(path)) |
# put in all raw bib fields as dict "bib" |
# put in all raw bib fields as dict "bib" |
bib = dom.xpath("//bib/*") |
bib = dom.xpath("//bib/*") |
if bib and len(bib)>0: |
if bib and len(bib)>0: |
Line 475 class documentViewer(Folder):
|
Line 483 class documentViewer(Folder):
|
imageDir=imageDir.replace("/mpiwg/online",'') |
imageDir=imageDir.replace("/mpiwg/online",'') |
docinfo=self.getDirinfoFromDigilib(imageDir,docinfo=docinfo) |
docinfo=self.getDirinfoFromDigilib(imageDir,docinfo=docinfo) |
docinfo['imagePath'] = imageDir |
docinfo['imagePath'] = imageDir |
|
|
docinfo['imageURL'] = self.digilibBaseUrl+"/servlet/Scaler?fn="+imageDir |
docinfo['imageURL'] = self.digilibBaseUrl+"/servlet/Scaler?fn="+imageDir |
|
|
viewerUrls=dom.xpath("//texttool/digiliburlprefix") |
viewerUrls=dom.xpath("//texttool/digiliburlprefix") |
Line 499 class documentViewer(Folder):
|
Line 508 class documentViewer(Folder):
|
if presentationUrls and (len(presentationUrls)>0): # ueberschreibe diese durch presentation informationen |
if presentationUrls and (len(presentationUrls)>0): # ueberschreibe diese durch presentation informationen |
# presentation url ergiebt sich ersetzen von index.meta in der url der fuer die Metadaten |
# presentation url ergiebt sich ersetzen von index.meta in der url der fuer die Metadaten |
# durch den relativen Pfad auf die presentation infos |
# durch den relativen Pfad auf die presentation infos |
presentationUrl=url.replace('index.meta',getTextFromNode(presentationUrls[0])) |
presentationPath = getTextFromNode(presentationUrls[0]) |
|
if url.endswith("index.meta"): |
|
presentationUrl=url.replace('index.meta',presentationPath) |
|
else: |
|
presentationUrl=url + "/" + presentationPath |
|
|
docinfo = self.getBibinfoFromTextToolPresentation(presentationUrl,docinfo=docinfo,dom=dom) |
docinfo = self.getBibinfoFromTextToolPresentation(presentationUrl,docinfo=docinfo,dom=dom) |
|
|
docinfo = self.getAuthinfoFromIndexMeta(url,docinfo=docinfo,dom=dom) # get access info |
docinfo = self.getAuthinfoFromIndexMeta(url,docinfo=docinfo,dom=dom) # get access info |
Line 532 class documentViewer(Folder):
|
Line 546 class documentViewer(Folder):
|
path=path.replace("/mpiwg/online","") |
path=path.replace("/mpiwg/online","") |
docinfo['imagePath'] = path |
docinfo['imagePath'] = path |
docinfo=self.getDirinfoFromDigilib(path,docinfo=docinfo,cut=cut) |
docinfo=self.getDirinfoFromDigilib(path,docinfo=docinfo,cut=cut) |
|
|
|
pathorig=path |
|
for x in range(cut): |
|
path=getParentDir(path) |
|
logging.error("PATH:"+path) |
imageUrl=self.digilibBaseUrl+"/servlet/Scaler?fn="+path |
imageUrl=self.digilibBaseUrl+"/servlet/Scaler?fn="+path |
docinfo['imageURL'] = imageUrl |
docinfo['imageURL'] = imageUrl |
|
|
docinfo = self.getBibinfoFromIndexMeta(path,docinfo=docinfo,cut=cut) |
#path ist the path to the images it assumes that the index.meta file is one level higher. |
docinfo = self.getAuthinfoFromIndexMeta(path,docinfo=docinfo,cut=cut) |
docinfo = self.getBibinfoFromIndexMeta(pathorig,docinfo=docinfo,cut=cut+1) |
|
docinfo = self.getAuthinfoFromIndexMeta(pathorig,docinfo=docinfo,cut=cut+1) |
return docinfo |
return docinfo |
|
|
|
|
Line 588 class documentViewer(Folder):
|
Line 608 class documentViewer(Folder):
|
pageinfo['numgroups'] = int(np / grpsize) |
pageinfo['numgroups'] = int(np / grpsize) |
if np % grpsize > 0: |
if np % grpsize > 0: |
pageinfo['numgroups'] += 1 |
pageinfo['numgroups'] += 1 |
logging.debug("getPageInfo: %s"%repr(pageinfo)) |
|
return pageinfo |
return pageinfo |
|
|
def text(self,mode,url,pn): |
def text(self,mode,url,pn): |