Changeset 622:bc68ca0d2c0a in documentViewer

Timestamp:

Dec 12, 2014, 3:27:58 PM (9 years ago)

Author:

casties

Branch:

default

Message:

make annotationServerUrl work with protocol-relative URL ().

Files:

• SrvTxtUtils.py (modified) (1 diff)
• documentViewer.py (modified) (1 diff)
• zpt/viewer/layer_text_annotator.zpt (modified) (1 diff)

SrvTxtUtils.py

@@ -281 +281 @@
             try:
                 logging.debug("getHttp(lib2)Data(#%s %ss) url=%s"%(cnt+1,timeout,url))
+                # I would prefer at least disable_ssl_certificate_validation=insecure
+                # but python < 2.7.9 doesn't do SNI :-(
                 h = httplib2.Http(cache=cache, timeout=float(timeout), disable_ssl_certificate_validation=True)
                 if username:

documentViewer.py

@@ -1162 +1162 @@
         """returns list of groups {name:*, id:*} on the annotation server for the user"""
         groups = []
+        if annotationServerUrl.startswith('//'):
+            # add matching http(s) from our URL
+            myUrl = self.REQUEST['URL']
+            logging.debug("my URL: %s"%myUrl)
+            if myUrl.startswith('https:'):
+                annotationServerUrl = "https:%s"%annotationServerUrl
+            else:
+                annotationServerUrl = "http:%s"%annotationServerUrl
+            
         groupsUrl = "%s/annotator/groups?user=%s"%(annotationServerUrl,user)
         data = getHttpData(url=groupsUrl, noExceptions=True)

zpt/viewer/layer_text_annotator.zpt

@@ -28 +28 @@
 
   <script type="text/javascript" 
-    tal:define="global annServerUrl string:https://tuxserve03.mpiwg-berlin.mpg.de/AnnotationManager;
+    tal:define="global annServerUrl string://tuxserve03.mpiwg-berlin.mpg.de/AnnotationManager;
     annUrl python:'http://echo.mpiwg-berlin.mpg.de/documents%s?pn=%s'%(docinfo['documentPath'],pageinfo['pn']);
     resUrl python:'http://echo.mpiwg-berlin.mpg.de/documents%s'%(docinfo['documentPath']);