Item11187: Fix status codes

git-svn-id: http://svn.foswiki.org/trunk/OpenLayersPlugin@13271 0b4bb1d4-4e5a-0410-9cc4-b2b747904278
foswiki · Dec 2, 2011 · 0fb51c9 · 0fb51c9
1 parent 5aaa570
commit 0fb51c9
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 6 deletions.
diff --git a/data/System/OpenLayersPlugin.txt b/data/System/OpenLayersPlugin.txt
@@ -44,7 +44,7 @@ Example
    viewport1="Applications/OpenLayers/Layers/ALA_GreatBarrierReef"
    viewportzoom="-1"
    mapprojection="EPSG:4326"
-   layertopics="Applications/OpenLayers/Layers/DefaultMap,Applications/OpenLayers/Layers/Demis_Layer,Applications/OpenLayers/Layers/ALA_GreatBarrierReef,Applications/OpenLayers/Layers/TRIN_Specimens,Applications/OpenLayers/Layers/MyKMLFeatures,Applications/OpenLayers/Layers/MarineEcoRegions"
+   layertopics="Applications/OpenLayers/Layers/DefaultMap,Applications/OpenLayers/Layers/Demis_Layer,Applications/OpenLayers/Layers/ALA_GreatBarrierReef,Applications/OpenLayers/Layers/TRIN_Specimens,Applications/OpenLayers/Layers/MyKMLFeatures,Applications/OpenLayers/Layers.ALA_GreatBarrierReef"
    mapelement="myMap"
    styleobject=""
    basetopics=""
@@ -57,7 +57,7 @@ Preview
    viewport1="Applications/OpenLayers/Layers/ALA_GreatBarrierReef"
    viewportzoom="-1"
    mapprojection="EPSG:4326"
-   layertopics="Applications/OpenLayers/Layers/DefaultMap,Applications/OpenLayers/Layers/Demis_Layer,Applications/OpenLayers/Layers/ALA_GreatBarrierReef,Applications/OpenLayers/Layers/TRIN_Specimens,Applications/OpenLayers/Layers/MyKMLFeatures,Applications/OpenLayers/Layers/MarineEcoRegions"
+   layertopics="Applications/OpenLayers/Layers/DefaultMap,Applications/OpenLayers/Layers/Demis_Layer,Applications/OpenLayers/Layers/ALA_GreatBarrierReef,Applications/OpenLayers/Layers/TRIN_Specimens,Applications/OpenLayers/Layers/MyKMLFeatures,Applications/OpenLayers/Layers.ALA_GreatBarrierReef"
    mapelement1="myMap"
    styleobject=""
    basetopics=""

diff --git a/lib/Foswiki/Plugins/OpenLayersPlugin.pm b/lib/Foswiki/Plugins/OpenLayersPlugin.pm
@@ -143,23 +143,24 @@ sub _getJSON {
                     );
                 }
                 else {
-                    $output = "$url did not return valid JSON.";
+                    $output = "502 Bad Gateway\n\nInvalid JSON from $url";
                     $response->header( %header, -status => 502 );
                 }
             }
             else {
                 $output =
-                  "Request to $url failed: " . $ua_response->status_line();
+"500 Internal Server Error\n\nRequest failed $url\n\nError was: '"
+                  . $ua_response->status_line() . "'";
                 $response->header( %header, -status => 500 );
             }
         }
         else {
-            $output = "$url not in whitelist";
+            $output = "403 Forbidden\n\nURL not whitelisted $url";
             $response->header( %header, -status => 403 );
         }
     }
     else {
-        $output = 'Invalid request: missing url';
+        $output = "400 Bad Request\n\nMissing url parameter";
         $response->header( %header, -status => 400 );
     }