version 1.65.2.1, 2010/06/17 17:35:24
|
version 1.69.2.9, 2010/06/16 18:46:29
|
Line 7 from AccessControl import getSecurityMan
|
Line 7 from AccessControl import getSecurityMan
|
from Globals import package_home |
from Globals import package_home |
|
|
from Ft.Xml import EMPTY_NAMESPACE, Parse |
from Ft.Xml import EMPTY_NAMESPACE, Parse |
from Ft.Xml.Domlette import PrettyPrint, Print |
|
import os.path |
import os.path |
import sys |
import sys |
import urllib |
import urllib |
Line 145 class documentViewer(Folder):
|
Line 144 class documentViewer(Folder):
|
self._setObject('template',templateFolder) # old style |
self._setObject('template',templateFolder) # old style |
try: |
try: |
import MpdlXmlTextServer |
import MpdlXmlTextServer |
textServer = MpdlXmlTextServer.MpdlXmlTextServer(id='fulltextclient',serverName=textServerName) |
textServer = MpdlXmlTextServer(id='fulltextclient') |
#templateFolder['fulltextclient'] = xmlRpcClient |
#templateFolder['fulltextclient'] = xmlRpcClient |
templateFolder._setObject('fulltextclient',textServer) |
templateFolder._setObject('fulltextclient',textServer) |
except Exception, e: |
except Exception, e: |
Line 217 class documentViewer(Folder):
|
Line 216 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.has_key("textURL") or docinfo.has_key('textURLPath'): #texturl gesetzt und textViewer konfiguriert |
if docinfo.get("textURL",'') and self.textViewerUrl: #texturl gesetzt und textViewer konfiguriert |
viewMode="text" |
viewMode="text" |
else: |
else: |
viewMode="images" |
viewMode="images" |
Line 243 class documentViewer(Folder):
|
Line 242 class documentViewer(Folder):
|
return "ERROR: template folder missing!" |
return "ERROR: template folder missing!" |
|
|
if not getattr(self, 'digilibBaseUrl', None): |
if not getattr(self, 'digilibBaseUrl', None): |
self.digilibBaseUrl = self.findDigilibUrl() or "http://digilib.mpiwg-berlin.mpg.de/digitallibrary" |
self.digilibBaseUrl = self.findDigilibUrl() or "http://nausikaa.mpiwg-berlin.mpg.de/digitallibrary" |
|
|
docinfo = self.getDocinfo(mode=mode,url=url) |
docinfo = self.getDocinfo(mode=mode,url=url) |
|
|
|
|
if tocMode != "thumbs": |
if tocMode != "thumbs": |
# get table of contents |
# get table of contents |
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.has_key('textURL') or docinfo.has_key('textURLPath'): #texturl gesetzt und textViewer konfiguriert |
if docinfo.get("textURL",''): #texturl gesetzt und textViewer konfiguriert |
viewMode="text_dict" |
viewMode="text_dict" |
else: |
else: |
viewMode="images" |
viewMode="images" |
Line 568 class documentViewer(Folder):
|
Line 568 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 579 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]) |