comparison documentViewer.py @ 473:74e9e74277e9 elementtree

smaller improvements
author casties
date Fri, 05 Aug 2011 11:24:42 +0200
parents 9705161bc888
children 0bc4a153863a
comparison
equal deleted inserted replaced
472:9705161bc888 473:74e9e74277e9
459 logging.error("documentViewer (getdocinfo) unknown mode: %s!"%mode) 459 logging.error("documentViewer (getdocinfo) unknown mode: %s!"%mode)
460 raise ValueError("Unknown mode %s! Has to be one of 'texttool','imagepath','filepath'."%(mode)) 460 raise ValueError("Unknown mode %s! Has to be one of 'texttool','imagepath','filepath'."%(mode))
461 461
462 docinfo['documentUrl'] = docUrl 462 docinfo['documentUrl'] = docUrl
463 # process index.meta contents 463 # process index.meta contents
464 if metaDom is not None: 464 if metaDom is not None and metaDom.tag == 'resource':
465 # document directory name and path 465 # document directory name and path
466 resource = self.metadataService.getResourceData(dom=metaDom) 466 resource = self.metadataService.getResourceData(dom=metaDom)
467 if resource: 467 if resource:
468 docinfo = self.getDocinfoFromResource(docinfo, resource) 468 docinfo = self.getDocinfoFromResource(docinfo, resource)
469 469