Changeset 7785 for trunk/src

Timestamp:

Apr 16, 2010, 11:25:48 AM (15 years ago)

Author:

janveeden

Message:

All data information from kml is now in the array $markers. Now also shows nothing if data is empty instead of giving undefined variable error.

File:

• trunk/src/map/inc/kmlHandler.php (modified) (3 diffs)

trunk/src/map/inc/kmlHandler.php

@@ -24 +24 @@
                  * Then we itirate trough all the data and fill the variables
                  */
-                $location;
-                $status;
-                $interfaces;
-                $masterIP;
-                $nodeType;
-                $type;
-                $hostname;
-                $hasBeenChecked;
-                $checkExecutionTime;
-                $currentState;
-                $lastCheck;
-                $problemHasBeenAcknowledged;
+                $location = "";
+                $status = "";
+                $interfaces = "";
+                $masterIP = "";
+                $nodeType = "";
+                $type = "";
+                $hostname = "";
+                $hasBeenChecked = "";
+                $checkExecutionTime = "";
+                $currentState = "";
+                $lastCheck = "";
+                $problemHasBeenAcknowledged = "";
                 
                 foreach($placemark->ExtendedData->Data as $data)
@@ -43 +43 @@
                                 if($name == "location")
                                         $location = $data->value;
-                                elseif($name == "status")
+                                
+                                if($name == "status")
                                         $status = $data->value;
-                                elseif($name == "interfaces")
+                                
+                                if($name == "interfaces")
                                         $interfaces = $data->value;
-                                elseif($name == "masterIP")
+
+                                if($name == "masterIP")
                                         $masterIP = $data->value;
-                                elseif($name == "nodeType")
+                                        
+                                if($name == "nodeType")
                                         $nodeType = $data->value;
-                                elseif($name == "type")
+                                        
+                                if($name == "type")
                                         $type = $data->value;
-                                elseif($name == "hostname")
+                                        
+                                if($name == "hostname")
                                         $hostname = $data->value;
-                                elseif($name == "hasBeenChecked")
+                                        
+                                if($name == "hasBeenChecked")
                                         $hasBeenChecked = $data->value; 
-                                elseif($name == "checkExecutionTime")
+                                        
+                                if($name == "checkExecutionTime")
                                         $checkExecutionTime = $data->value;
-                                elseif($name == "currentState")
+                                        
+                                if($name == "currentState")
                                         $currentState = $data->value;
-                                elseif($name == "problemHasBeenAcknowledged")
+                                        
+                                if($name == "problemHasBeenAcknowledged")
                                         $problemHasBeenAcknowledged = $data->value;
-                                elseif($name == "location")
-                                        $location = $data->value;
                         }
                 }
@@ -77 +85 @@
                                                         "name"=>$placemark->name,
                                                         "location"=>$location,
-                                                        "status"=>$status);
-                
+                                                        "status"=>$status,
+                                                        "interfaces"=>$interfaces,
+                                                        "masterIP"=>$masterIP,
+                                                        "nodeType"=>$nodeType,
+                                                        "type"=>$type,
+                                                        "hostname"=>$hostname,
+                                                        "hasBeenChecked"=>$hasBeenChecked,
+                                                        "checkExecutionTime"=>$checkExecutionTime,
+                                                        "currentState"=>$currentState,
+                                                        "lastCheck"=>$lastCheck,
+                                                        "problemHasBeenAcknowledged"=>$problemHasBeenAcknowledged);
         }
         return $markers;