Revision: 20970 http://svn.sv.gnu.org/viewvc/?view=rev&root=phpgroupware&revision=20970 Author: sigurdne Date: 2010-01-17 12:18:45 +0000 (Sun, 17 Jan 2010) Log Message: ----------- improvement: update code to make use of the improved wrapper
Modified Paths: -------------- people/sigurdne/modules/property/trunk/inc/class.bofiles.inc.php Modified: people/sigurdne/modules/property/trunk/inc/class.bofiles.inc.php =================================================================== --- people/sigurdne/modules/property/trunk/inc/class.bofiles.inc.php 2010-01-17 12:17:11 UTC (rev 20969) +++ people/sigurdne/modules/property/trunk/inc/class.bofiles.inc.php 2010-01-17 12:18:45 UTC (rev 20970) @@ -242,56 +242,18 @@ { $output_type = 'PDF'; - /** - * 'parameters' will be in the following format: - * 'key1|value1;key2|value2;key3|value3' where key1, key2 ... keyX are - * unique - */ -/* - $jasper_parameters = sprintf("\"BK_DATE_FROM|%s;BK_DATE_TO|%s;BK_BUILDINGS|%s\"", - 1,//$from, - 1,//$to, - 1);//implode(",", $building_list)); - -*/ - $jasper_parameters = '"DUMMY|1"'; - - - // DEBUG - //print_r($jasper_parameters);die(); - //exit(0); - - $info = pathinfo($file); - $report_name = 'report_' . basename($file,'.'.$info['extension']); - $report_source = "{$this->rootdir}{$file}"; - $memory = xmlwriter_open_memory(); - xmlwriter_start_document($memory,'1.0','UTF-8'); - - xmlwriter_start_element ($memory,'JasperConfig'); // <JasperConfig> - xmlwriter_start_element ($memory,'Reports'); // <Reports> - xmlwriter_start_element ($memory,'Report'); // <Report> - xmlwriter_write_attribute( $memory, 'name', $report_name); - xmlwriter_write_attribute( $memory, 'source', $report_source); - xmlwriter_end_element($memory); // </Report> - xmlwriter_end_element($memory); // </Reports> - xmlwriter_end_element($memory); // </JasperConfig> - - $xml = xmlwriter_output_memory($memory,true); - - $jasper_config = $GLOBALS['phpgw_info']['server']['temp_dir'] . '/config_' . basename($file); - $file_written = false; - $fp = fopen($jasper_config, "wb"); - fwrite($fp,$xml); - - if(fclose($fp)) + $report_source = "{$this->rootdir}{$file}"; + $jasper_wrapper = CreateObject('phpgwapi.jasper_wrapper'); + try { - $file_written=true; + $jasper_wrapper->execute('', $output_type, $report_source, $errors); } - - $jasper_wrapper = CreateObject('phpgwapi.jasper_wrapper'); - $jasper_wrapper->jasper_config = $jasper_config; - $jasper_wrapper->execute($jasper_parameters, $output_type, $report_name, $errors); - unlink($jasper_config); + catch(Exception $e) + { + $error = $e->getMessage(); + //FIXME Do something clever with the error + echo "<H1>{$error}</H1>"; + } } } } _______________________________________________ phpGroupWare-cvs mailing list phpGroupWare-cvs@gnu.org http://lists.gnu.org/mailman/listinfo/phpgroupware-cvs