Mercurial > hg > documentViewer

comparison documentViewer.py @ 54:f87b6844503b

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
fixed missing getauthinfo in getdocinfofromtexttool
author casties
date Thu, 03 May 2007 19:28:23 +0200
parents f4e0af8c281d
children ba8917b93c84
comparison
equal deleted inserted replaced
53:f4e0af8c281d 54:f87b6844503b
397 textUrl=getTextFromNode(textUrls[0]) 397 textUrl=getTextFromNode(textUrls[0])
398 if urlparse.urlparse(textUrl)[0]=="": #keine url 398 if urlparse.urlparse(textUrl)[0]=="": #keine url
399 textUrl=os.path.join(archivePath,textUrl) 399 textUrl=os.path.join(archivePath,textUrl)
400 400
401 docinfo['textURL'] = textUrl 401 docinfo['textURL'] = textUrl
402
403 402
404 presentationUrls=dom.xpath("//texttool/presentation") 403 presentationUrls=dom.xpath("//texttool/presentation")
405 docinfo = self.getBibinfoFromIndexMeta(url,docinfo=docinfo,dom=dom) # get info von bib tag 404 docinfo = self.getBibinfoFromIndexMeta(url,docinfo=docinfo,dom=dom) # get info von bib tag
406 405
407 if presentationUrls and (len(presentationUrls)>0): # ueberschreibe diese durch presentation informationen 406 if presentationUrls and (len(presentationUrls)>0): # ueberschreibe diese durch presentation informationen
408 # presentation url ergiebt sich ersetzen von index.meta in der url der fŸr die Metadaten 407 # presentation url ergiebt sich ersetzen von index.meta in der url der fŸr die Metadaten
409 # durch den relativen Pfad auf die presentation infos 408 # durch den relativen Pfad auf die presentation infos
410 presentationUrl=url.replace('index.meta',getTextFromNode(presentationUrls[0])) 409 presentationUrl=url.replace('index.meta',getTextFromNode(presentationUrls[0]))
411
412 docinfo = self.getBibinfoFromTextToolPresentation(presentationUrl,docinfo=docinfo,dom=dom) 410 docinfo = self.getBibinfoFromTextToolPresentation(presentationUrl,docinfo=docinfo,dom=dom)
413 411
414 412 docinfo = self.getAuthinfoFromIndexMeta(path,docinfo=docinfo)
415
416 return docinfo 413 return docinfo
417 414
418 415
419 def getBibinfoFromTextToolPresentation(self,url,docinfo=None,dom=None): 416 def getBibinfoFromTextToolPresentation(self,url,docinfo=None,dom=None):
420 """gets the bibliographical information from the preseantion entry in texttools 417 """gets the bibliographical information from the preseantion entry in texttools