Changeset 735

Timestamp:

06/17/08 21:00:43 (5 years ago)

Author:

pvalsecc

Message:

Uses print.url for the {id}.pdf url

Files:

• sandbox/camptocamp/MapFishUnhcr/server/python/mapfish/controllers/printer.py (modified) (2 diffs)

sandbox/camptocamp/MapFishUnhcr/server/python/mapfish/controllers/printer.py

@@ -115 +115 @@
             self.start_response('200 OK', [
                     ('Content-Type','application/json; charset=utf-8')])
-            baseURL = "http://" + request.host
+            baseURL = self._getBaseURL()
             return simplejson.dumps({
                 'getURL': baseURL + url_for(action = "get", id = curId)
@@ -147 +147 @@
             self.url = None
 
+    def _getBaseURL(self):
+        if self.url:
+            return self.url
+        else:
+            return "http://" + request.host
+    
+
     def _addURLs(self, json):
         expr = re.compile('}$')
-        if self.url:
-            baseURL = self.url
-        else:
-            baseURL = "http://" + request.host
+        baseURL = self._getBaseURL()
         printURL = simplejson.dumps(baseURL + url_for(action = "doPrint"))
         createURL = simplejson.dumps(baseURL + url_for(action = "create"))