Changeset 6:3c70a7d2f35b in documentViewer

Timestamp:

Jun 16, 2010, 6:27:04 PM (14 years ago)

Author:

casties

Branch:

modularisierung

Message:

made extraFunction into separate object MpdlXmlTextServer?

Files:

• MpdlXmlTextServer.py (added)
• __init__.py (modified) (2 diffs)
• documentViewer.py (modified) (9 diffs)
• extraFunction.py (deleted)
• version.txt (modified) (1 diff)
• zpt/manage_addMpdlXmlTextServer.zpt (added)
• zpt/manage_changeMpdlXmlTextServer.zpt (added)

__init__.py

@@ -1 +1 @@
 import documentViewer
-
+import MpdlXmlTextServer
 
 def initialize(context):
@@ -11 +11 @@
           )
         )
+
+    context.registerClass(
+        documentViewer.DocumentViewerTemplate,
+        constructors = (
+          documentViewer.manage_addDocumentViewerTemplateForm,
+          documentViewer.manage_addDocumentViewerTemplate
+          )
+        )
+
+    context.registerClass(
+        MpdlXmlTextServer.MpdlXmlTextServer,
+        constructors = (
+          MpdlXmlTextServer.manage_addMpdlXmlTextServerForm,
+          MpdlXmlTextServer.manage_addMpdlXmlTextServer
+          )
+        )
+    

documentViewer.py

@@ -67 +67 @@
         
 
-import socket
-
-def urlopen(url,timeout=2):
-        """urlopen mit timeout"""
-        socket.setdefaulttimeout(timeout)
-        ret=urllib.urlopen(url)
-        socket.setdefaulttimeout(5)
-        return ret
+def getHttpData(url, data=None, num_tries=3, timeout=10):
+    """returns result from url+data HTTP request"""
+    # we do GET (by appending data to url)
+    if isinstance(data, str) or isinstance(data, unicode):
+        # if data is string then append
+        url = "%s?%s"%(url,data)
+    elif isinstance(data, dict) or isinstance(data, list) or isinstance(data, tuple):
+        # urlencode
+        url = "%s?%s"%(url,urllib.urlencode(data))
+    
+    response = None
+    errmsg = None
+    for cnt in range(num_tries):
+        try:
+            logging.debug("getHttpData(#%s %ss) url=%s"%(cnt+1,timeout,url))
+            if sys.version_info < (2, 6):
+                # set timeout on socket -- ugly :-(
+                import socket
+                socket.setdefaulttimeout(timeout)
+                response = urllib2.urlopen(url)
+            else:
+                response = urllib2.urlopen(url,timeout=float(timeout))
+            # check result?
+            break
+        except urllib2.HTTPError, e:
+            logging.error("getHttpData: HTTP error(%s): %s"%(e.code,e))
+            errmsg = str(e)
+            # stop trying
+            break
+        except urllib2.URLError, e:
+            logging.error("getHttpData: URLLIB error(%s): %s"%(e.reason,e))
+            errmsg = str(e)
+            # stop trying
+            #break
+
+    if response is not None:
+        data = response.read()
+        response.close()
+        return data
+    
+    raise IOError("ERROR fetching HTTP data from %s: %s"%(url,errmsg))
+    #return None
+
 
 
@@ -80 +115 @@
 ## documentViewer class
 ##
-class documentViewer(Folder, extraFunction):
+class documentViewer(Folder):
     """document viewer"""
-    #textViewerUrl="http://127.0.0.1:8080/HFQP/testXSLT/getPage?"
-    
     meta_type="Document viewer"
     
@@ -124 +157 @@
         self._setObject('template',templateFolder) # old style
         try:
-            from Products.XMLRpcTools.XMLRpcTools import XMLRpcServerProxy
-            xmlRpcClient = XMLRpcServerProxy(id='fulltextclient', serverUrl=textServerName, use_xmlrpc=False)
+            import MpdlXmlTextServer
+            textServer = MpdlXmlTextServer(id='fulltextclient')
             #templateFolder['fulltextclient'] = xmlRpcClient
-            templateFolder._setObject('fulltextclient',xmlRpcClient)
+            templateFolder._setObject('fulltextclient',textServer)
         except Exception, e:
-            logging.error("Unable to create XMLRpcTools for fulltextclient: "+str(e))
+            logging.error("Unable to create MpdlXmlTextServer for fulltextclient: "+str(e))
         try:
             from Products.zogiLib.zogiLib import zogiLib
@@ -138 +171 @@
             logging.error("Unable to create zogiLib for zogilib: "+str(e))
         
-
+        
+    # proxy text server methods to fulltextclient
+    def getTextPage(self, **args):
+        """get page"""
+        return self.template.fulltextclient.getTextPage(**args)
+
+    def getQuery(self, **args):
+        """get query"""
+        return self.template.fulltextclient.getQuery(**args)
+
+    def getSearch(self, **args):
+        """get search"""
+        return self.template.fulltextclient.getSearch(**args)
+
+    def getNumPages(self, **args):
+        """get numpages"""
+        return self.template.fulltextclient.getNumPages(**args)
+
+    def getTranslate(self, **args):
+        """get translate"""
+        return self.template.fulltextclient.getTranslate(**args)
+
+    def getLemma(self, **args):
+        """get lemma"""
+        return self.template.fulltextclient.getLemma(**args)
+
+    def getToc(self, **args):
+        """get toc"""
+        return self.template.fulltextclient.getToc(**args)
+
+    def getTocPage(self, **args):
+        """get tocpage"""
+        return self.template.fulltextclient.getTocPage(**args)
+
+    
     security.declareProtected('View','thumbs_rss')
     def thumbs_rss(self,mode,url,viewMode="auto",start=None,pn=1):
@@ -305 +372 @@
     def getDirinfoFromDigilib(self,path,docinfo=None,cut=0):
         """gibt param von dlInfo aus"""
-        num_retries = 3
         if docinfo is None:
             docinfo = {}
@@ -317 +383 @@
         logging.debug("documentViewer (getparamfromdigilib) dirInfo from %s"%(infoUrl))
         
-        for cnt in range(num_retries):
-            try:
-                # dom = NonvalidatingReader.parseUri(imageUrl)
-                txt=urllib.urlopen(infoUrl).read()
-                dom = Parse(txt)
-                break
-            except:
-                logging.error("documentViewer (getdirinfofromdigilib) error reading %s (try %d)"%(infoUrl,cnt))
-        else:
+        txt = getHttpData(infoUrl)
+        if txt is None:
             raise IOError("Unable to get dir-info from %s"%(infoUrl))
-        
+
+        dom = Parse(txt)
         sizes=dom.xpath("//dir/size")
         logging.debug("documentViewer (getparamfromdigilib) dirInfo:size"%sizes)
@@ -343 +403 @@
     def getIndexMeta(self, url):
         """returns dom of index.meta document at url"""
-        num_retries = 3
         dom = None
         metaUrl = None
@@ -355 +414 @@
             if not metaUrl.endswith("index.meta"):
                 metaUrl += "/index.meta"
-        logging.debug("METAURL: %s"%metaUrl)
-        for cnt in range(num_retries):
-            try:
-                # patch dirk encoding fehler treten dann nicht mehr auf
-                # dom = NonvalidatingReader.parseUri(metaUrl)
-                txt=urllib.urlopen(metaUrl).read()
-                dom = Parse(txt)
-                break
-            except:
-                logging.error("ERROR documentViewer (getIndexMeta) %s (%s)"%sys.exc_info()[0:2])
                 
-        if dom is None:
+        logging.debug("(getIndexMeta): METAURL: %s"%metaUrl)
+        txt=getHttpData(metaUrl)
+        if txt is None:
             raise IOError("Unable to read index meta from %s"%(url))
-                 
+        
+        dom = Parse(txt)
         return dom
     
     def getPresentationInfoXML(self, url):
         """returns dom of info.xml document at url"""
-        num_retries = 3
         dom = None
         metaUrl = None
@@ -384 +435 @@
             metaUrl=server+url.replace("/mpiwg/online","")
         
-        for cnt in range(num_retries):
-            try:
-                # patch dirk encoding fehler treten dann nicht mehr auf
-                # dom = NonvalidatingReader.parseUri(metaUrl)
-                txt=urllib.urlopen(metaUrl).read()
-                dom = Parse(txt)
-                break
-            except:
-                logging.error("ERROR documentViewer (getPresentationInfoXML) %s (%s)"%sys.exc_info()[0:2])
-                
-        if dom is None:
+        txt=getHttpData(metaUrl)
+        if txt is None:
             raise IOError("Unable to read infoXMLfrom %s"%(url))
-                 
+            
+        dom = Parse(txt)
         return dom
                         

version.txt

@@ -1 @@
-DocumentViewer 0.4.0
+DocumentViewer 0.5.1