Changeset 622:bc68ca0d2c0a in documentViewer for documentViewer.py

Timestamp:

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

Author:

casties

Branch:

default

Message:

make annotationServerUrl work with protocol-relative URL ().

File:

• documentViewer.py (modified) (1 diff)

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)