Made the Variable and Value headers pull from imported reports.

hellifiknow · Jun 13, 2012 · 96baa3e · 96baa3e
1 parent 995859c
commit 96baa3e
Show file tree

Hide file tree

Showing 5 changed files with 23 additions and 4 deletions.
diff --git a/classes/headers/HeaderBase.php b/classes/headers/HeaderBase.php
@@ -8,7 +8,7 @@ public static function beforeRender(&$report) {
 
 	}
 
-	public function afterParse(&$report) {
+	public static function afterParse(&$report) {
 
 	}
 }
diff --git a/classes/headers/IncludeHeader.php b/classes/headers/IncludeHeader.php
@@ -39,7 +39,7 @@ public static function beforeRender(&$report) {
 
 	}
 
-	public function afterParse(&$report) {
+	public static function afterParse(&$report) {
 
 	}
 }
diff --git a/classes/headers/ValueHeader.php b/classes/headers/ValueHeader.php
@@ -15,4 +15,10 @@ public static function parse($key, $value, &$report) {
 			$report->macros[$var] = $default;
 		}
 	}
+
+	public static function afterParse(&$report) {
+		foreach($report->options['Includes'] as $included_report) {
+			$report->importHeaders($included_report,'Value');
+		}
+	}
 }
diff --git a/classes/headers/VariableHeader.php b/classes/headers/VariableHeader.php
@@ -105,9 +105,13 @@ public static function parse($key, $value, &$report) {
 		}
 	}
 
-	public function afterParse(&$report) {
+	public static function afterParse(&$report) {
 		$classname = $report->options['Type'].'ReportType';
 
+		foreach($report->options['Includes'] as $included_report) {
+			$report->importHeaders($included_report,'Variable');
+		}
+
 		foreach($report->options['Variables'] as $var=>$params) {
 			if(isset($params['values_database'])) {
 				$classname::openConnection($report);

diff --git a/lib/PhpReports/Report.php b/lib/PhpReports/Report.php
@@ -57,7 +57,8 @@ protected function parseHeaders() {
 
 		$this->options = array(
 			'Filters'=>array(),
-			'Variables'=>array()
+			'Variables'=>array(),
+			'Includes'=>array()
 		);
 		$this->headers = array();
 
@@ -148,6 +149,14 @@ protected function parseHeaders() {
 		if(!isset($this->options['Name'])) $this->options['Name'] = $this->report;
 	}
 
+	public function importHeaders($report, $name=null) {
+		foreach($report->header_lines as $line) {
+			if(!$name || $line['name']===$name) {
+				$this->parseHeader($line['name'],$line['value']);
+			}
+		}
+	}
+
 	public function parseHeader($name,$value) {
 		$classname = $name.'Header';
 		if(class_exists($classname)) {
-Original file line number
+Diff line change
@@ Expand Up / @@ -8,7 +8,7 @@ public static function beforeRender(&$report) { @@
     	}
-    	public function afterParse(&$report) {
+    	public static function afterParse(&$report) {
     	}
     }