version 1.69.2.5, 2010/06/16 18:35:59
|
version 1.72, 2010/06/17 18:34:36
|
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 |
import urllib2 |
import urllib2 |
import logging |
import logging |
import math |
import math |
|
|
import urlparse |
import urlparse |
from types import * |
import cStringIO |
|
|
def logger(txt,method,txt2): |
def logger(txt,method,txt2): |
"""logging""" |
"""logging""" |
Line 72 def getHttpData(url, data=None, num_trie
|
Line 72 def getHttpData(url, data=None, num_trie
|
if sys.version_info < (2, 6): |
if sys.version_info < (2, 6): |
# set timeout on socket -- ugly :-( |
# set timeout on socket -- ugly :-( |
import socket |
import socket |
socket.setdefaulttimeout(timeout) |
socket.setdefaulttimeout(float(timeout)) |
response = urllib2.urlopen(url) |
response = urllib2.urlopen(url) |
else: |
else: |
response = urllib2.urlopen(url,timeout=float(timeout)) |
response = urllib2.urlopen(url,timeout=float(timeout)) |
Line 145 class documentViewer(Folder):
|
Line 145 class documentViewer(Folder):
|
self._setObject('template',templateFolder) # old style |
self._setObject('template',templateFolder) # old style |
try: |
try: |
import MpdlXmlTextServer |
import MpdlXmlTextServer |
textServer = MpdlXmlTextServer(id='fulltextclient') |
textServer = MpdlXmlTextServer.MpdlXmlTextServer(id='fulltextclient',serverName=textServerName) |
#templateFolder['fulltextclient'] = xmlRpcClient |
#templateFolder['fulltextclient'] = xmlRpcClient |
templateFolder._setObject('fulltextclient',textServer) |
templateFolder._setObject('fulltextclient',textServer) |
except Exception, e: |
except Exception, e: |
Line 172 class documentViewer(Folder):
|
Line 172 class documentViewer(Folder):
|
"""get search""" |
"""get search""" |
return self.template.fulltextclient.getSearch(**args) |
return self.template.fulltextclient.getSearch(**args) |
|
|
def getNumPages(self, **args): |
def getNumPages(self, docinfo): |
"""get numpages""" |
"""get numpages""" |
return self.template.fulltextclient.getNumPages(**args) |
return self.template.fulltextclient.getNumPages(docinfo) |
|
|
def getTranslate(self, **args): |
def getTranslate(self, **args): |
"""get translate""" |
"""get translate""" |
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 243 class documentViewer(Folder):
|
Line 243 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://nausikaa.mpiwg-berlin.mpg.de/digitallibrary" |
self.digilibBaseUrl = self.findDigilibUrl() or "http://digilib.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.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 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 580 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]) |
docinfo['textURLPath'] = textUrl |
docinfo['textURLPath'] = textUrl |
if not docinfo['imagePath']: |
if not docinfo['imagePath']: |
# text-only, no page images |
# text-only, no page images |
docinfo = self.getNumPages(docinfo) #im moment einfach auf eins setzen, navigation ueber die thumbs geht natuerlich nicht |
docinfo = self.getNumPages(docinfo) |
|
|
presentationUrls = dom.xpath("//texttool/presentation") |
presentationUrls = dom.xpath("//texttool/presentation") |
docinfo = self.getBibinfoFromIndexMeta(url, docinfo=docinfo, dom=dom) # get info von bib tag |
docinfo = self.getBibinfoFromIndexMeta(url, docinfo=docinfo, dom=dom) # get info von bib tag |