Changeset 358

Timestamp:

08/27/08 13:18:13 (4 months ago)

Author:

arneke

Message:

Vendorparameters were not being passed properly. This is a reminder to clean up the Request , WMSParameters, Parameters story.

Location:

trunk/geowebcache/src/main/java/org/geowebcache/service

Files:

• Parameters.java (modified) (1 diff)
• Request.java (modified) (4 diffs)
• wms/WMSParameters.java (modified) (3 diffs)

trunk/geowebcache/src/main/java/org/geowebcache/service/Parameters.java

@@ -134 +134 @@
     }
 
-    /**
-     * Outputs an HTTP parameter string
-     */
-    public StringBuffer getURLString(boolean prefixAmpersand) {
-        StringBuffer arg_str = new StringBuffer(256);
-        String param_name;
-
-        Iterator itr = params.keySet().iterator();
-        while (itr.hasNext()) {
-            param_name = (String) itr.next();
-            if (param_name != null && param_name.length() > 0) {
-                if (arg_str.length() > 0) {
-                    arg_str.append('&');
-                } else {
-                    if (prefixAmpersand) {
-                        arg_str.append('&');
-                    }
-                }
-
-                try {
-                    arg_str.append(URLEncoder.encode(param_name, CHARSET));
-                    arg_str.append('=');
-                    arg_str.append(URLEncoder.encode(
-                            convertToString(get(param_name)), CHARSET));
-
-                } catch (UnsupportedEncodingException uee) {
-                    log.fatal("Unsupported URL Encoding: ", uee);
-                    return null;
-                } catch (NullPointerException npe) {
-                    System.out.println("Missing value for parameter: "
-                            + param_name);
-                    log.error("Missing value for parameter: " + param_name);
-                }
-            }
-        }
-        return arg_str;
-    }
+//    /**
+//     * Outputs an HTTP parameter string
+//     */
+//    public StringBuffer getURLString(boolean prefixAmpersand) {
+//        StringBuffer arg_str = new StringBuffer(256);
+//        String param_name;
+//
+//        Iterator itr = params.keySet().iterator();
+//        while (itr.hasNext()) {
+//            param_name = (String) itr.next();
+//            if (param_name != null && param_name.length() > 0) {
+//                if (arg_str.length() > 0) {
+//                    arg_str.append('&');
+//                } else {
+//                    if (prefixAmpersand) {
+//                        arg_str.append('&');
+//                    }
+//                }
+//
+//                try {
+//                    arg_str.append(URLEncoder.encode(param_name, CHARSET));
+//                    arg_str.append('=');
+//                    arg_str.append(URLEncoder.encode(convertToString(get(param_name)), CHARSET));
+//
+//                } catch (UnsupportedEncodingException uee) {
+//                    log.fatal("Unsupported URL Encoding: ", uee);
+//                    return null;
+//                } catch (NullPointerException npe) {
+//                    System.out.println("Missing value for parameter: "+ param_name);
+//                    log.error("Missing value for parameter: " + param_name);
+//                }
+//            }
+//        }
+//        return arg_str;
+//    }
 
     /**

trunk/geowebcache/src/main/java/org/geowebcache/service/Request.java

@@ -23 +23 @@
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
+import org.geowebcache.service.wms.WMSParameters;
 
 public class Request {
@@ -31 +32 @@
     private URL server = null;
 
-    private Parameters params = null;
+    private WMSParameters params = null;
 
-    public Request(String server, Parameters params) {
+    public Request(String server, WMSParameters params) {
         this.setServer(server);
         // this.setParametersFromConfiguration();
@@ -71 +72 @@
     }
 
-    public void setParameters(Parameters params) {
+    public void setParameters(WMSParameters params) {
         this.params = params;
     }
@@ -80 +81 @@
             String serverAdr = server.toExternalForm();
             if(serverAdr.charAt(serverAdr.length() - 1) != '?') { 
-                address = new URL( serverAdr +'?'+ params.getURLString(false));
+                address = new URL( serverAdr +'?'+ params.getURLString());
             } else {
-                address = new URL( serverAdr + params.getURLString(false));
+                address = new URL( serverAdr + params.getURLString());
             }
             

trunk/geowebcache/src/main/java/org/geowebcache/service/wms/WMSParameters.java

@@ -389 +389 @@
         String param_name;
 
+        boolean prev = false;
+        
         Iterator itr = super.params.keySet().iterator();
         while (itr.hasNext()) {
             param_name = (String) itr.next();
             if (param_name != null && param_name.length() > 0) {
-                if (arg_str == null || arg_str.length() == 0) {
-                    arg_str.append('?');
-                } else {
+                if (prev) {
                     arg_str.append('&');
+                    prev = false;
                 }
 
@@ -402 +403 @@
                     if (param_name.equalsIgnoreCase(VENDOR_PARAMS)) {
                         arg_str.append(get(VENDOR_PARAMS));
+                        prev = true;
                     } else {
                         arg_str.append(URLEncoder.encode(param_name, CHARSET));
@@ -407 +409 @@
                         arg_str.append(URLEncoder.encode(
                                 convertToString(get(param_name)), CHARSET));
+                        prev = true;
                     }