Changeset 7637 for trunk/src/inc/KMLFile.class.php

Timestamp:

Mar 31, 2010, 1:32:46 PM (15 years ago)

Author:

Pieter Naber

Message:

Updated ErrorHandler to use our LogHandler. Updated LogHandler with an adjustable error level.

File:

• trunk/src/inc/KMLFile.class.php (modified) (3 diffs)

trunk/src/inc/KMLFile.class.php

@@ -55 +55 @@
                 </kml>';
 
-        private $fileFirst = 'type,host_name,has_been_checked,check_execution_time,current_state,last_hard_state,last_check,problem_has_been_acknowledged';
+        static $fileFirst = 'type,host_name,has_been_checked,check_execution_time,current_state,last_hard_state,last_check,problem_has_been_acknowledged';
         private $fileContent = array('string', 'string', 'integer', 'double', 'integer', 'integer', 'integer', 'integer');
 
@@ -94 +94 @@
 
         public function parseFile($file) {
-                $fileContents = explode("\r\n", $nodeStatus->getFile());
+                $fileContents = explode("\r\n", $file);
 
-                if ($fileContents[0] != $this->fileFirst) {
-                        // TODO: Better error description
-                        trigger_error();
+                if ($fileContents[0] != KMLFile::$fileFirst) {
+                        trigger_log(LOG_WARNING, 'Contents of file do not match with template of first line', __FILE__, __LINE__);
                 }
 
@@ -106 +105 @@
 
                         if (count($lineContent) != count($this->fileContent)) {
-                                // TODO: Better error description
-                                trigger_error();
+                                trigger_log(LOG_WARNING, 'Contents of file do not match with template of lines', __FILE__, __LINE__);
                         }