version 1.69.2.10, 2010/06/16 18:48:34
|
version 1.69.2.11, 2010/06/16 19:04:42
|
Line 217 class documentViewer(Folder):
|
Line 217 class documentViewer(Folder):
|
pt = getattr(self.template, 'thumbs_main_rss') |
pt = getattr(self.template, 'thumbs_main_rss') |
|
|
if viewMode=="auto": # automodus gewaehlt |
if viewMode=="auto": # automodus gewaehlt |
if docinfo.get("textURL",'') and self.textViewerUrl: #texturl gesetzt und textViewer konfiguriert |
if docinfo.has_key("textURL") or docinfo.has_key('textURLPath'): #texturl gesetzt und textViewer konfiguriert |
viewMode="text" |
viewMode="text" |
else: |
else: |
viewMode="images" |
viewMode="images" |
Line 253 class documentViewer(Folder):
|
Line 253 class documentViewer(Folder):
|
docinfo = self.getToc(mode=tocMode, docinfo=docinfo) |
docinfo = self.getToc(mode=tocMode, docinfo=docinfo) |
|
|
if viewMode=="auto": # automodus gewaehlt |
if viewMode=="auto": # automodus gewaehlt |
if docinfo.get("textURL",''): #texturl gesetzt und textViewer konfiguriert |
if docinfo.has_key("textURL") or docinfo.has_key('textURLPath'): #texturl gesetzt und textViewer konfiguriert |
viewMode="text_dict" |
viewMode="text_dict" |
else: |
else: |
viewMode="images" |
viewMode="images" |
Line 569 class documentViewer(Folder):
|
Line 569 class documentViewer(Folder):
|
viewerUrl = getTextFromNode(viewerUrls[0]) |
viewerUrl = getTextFromNode(viewerUrls[0]) |
docinfo['viewerURL'] = viewerUrl |
docinfo['viewerURL'] = viewerUrl |
|
|
|
# old style text URL |
textUrls = dom.xpath("//texttool/text") |
textUrls = dom.xpath("//texttool/text") |
if textUrls and (len(textUrls) > 0): |
if textUrls and (len(textUrls) > 0): |
textUrl = getTextFromNode(textUrls[0]) |
textUrl = getTextFromNode(textUrls[0]) |
Line 580 class documentViewer(Folder):
|
Line 581 class documentViewer(Folder):
|
|
|
docinfo['textURL'] = textUrl |
docinfo['textURL'] = textUrl |
|
|
|
# new style text-url-path |
textUrls = dom.xpath("//texttool/text-url-path") |
textUrls = dom.xpath("//texttool/text-url-path") |
if textUrls and (len(textUrls) > 0): |
if textUrls and (len(textUrls) > 0): |
textUrl = getTextFromNode(textUrls[0]) |
textUrl = getTextFromNode(textUrls[0]) |