Changeset 3568 for sandbox

Timestamp:

06/16/10 21:34:48 (2 years ago)

Author:

elemoine

Message:

svn merge -r 3498:HEAD http://www.mapfish.org/svn/mapfish/framework/server/trunk .

Location:

sandbox/tsauerwein/server

Files:

• . (modified) (1 prop)
• mapfish/controllers/printer.py (modified) (3 diffs)

sandbox/tsauerwein/server/mapfish/controllers/printer.py

@@ -27 +27 @@
 import re
 import simplejson
+import urlparse
 
 from pylons.controllers import WSGIController
@@ -207 +208 @@
         """
         actionUrl = url(controller="printer", action=actionName, id=id)
+
+        # in 2.0 we'll support "baseurl" only, so the following code
+        # block will be removed. And the fromAction argument of this
+        # function will also be removed.
         if request.params.has_key('url'):
             fullUrl = request.params['url'].encode('utf8')
@@ -215 +220 @@
                 return fullUrl[0:-len(myUrl)] + actionUrl
             log.warn("Cannot guess the base URL for " + fullUrl + " (action=" + myUrl + ")")
-        return request.scheme + "://" + request.host + actionUrl
+
+        if request.params.has_key('baseurl'):
+            return request.params['baseurl'].encode('utf8') + actionUrl.split('/')[-1]
+        return urlparse.urlunparse((request.scheme, request.host, actionUrl, None, None, None))
 
     def _addURLs(self, json):