r5028 - branches/bmas-staging/lib/org/freemedsoftware/module

[subve...@svn.freemedsoftware.org]

Author: jeff
Date: 2010-02-08 13:40:54 -0500 (Mon, 08 Feb 2010)
New Revision: 5028

Modified:
branches/bmas-staging/lib/org/freemedsoftware/module/Reporting.class.php
Log:
- Reverse merge back to [5020] to remove extra function which is not needed.

Modified: branches/bmas-staging/lib/org/freemedsoftware/module/Reporting.class.php
===================================================================
--- branches/bmas-staging/lib/org/freemedsoftware/module/Reporting.class.php 2010-02-08 18:31:06 UTC (rev 5027)
+++ branches/bmas-staging/lib/org/freemedsoftware/module/Reporting.class.php 2010-02-08 18:40:54 UTC (rev 5028)
@@ -239,54 +239,7 @@
}
} // end method GenerateReport

- public function GenerateJasperReport ( $uuid, $format, $param ) {
- freemed::acl_enforce( 'reporting', 'generate' );
-
- $report = $this->GetReportParameters( $uuid, false );
-
- // Sanity checking
- if (!$report['report_name']) { return false; }
-
- $s = CreateObject('org.freemedsoftware.api.Scheduler');
- $i=0;
- foreach ($report['params'] AS $k => $v) {
- if ( !$v['optional'] and !$param[$k] ) {
- syslog(LOG_INFO, get_class($this)."| parameter $k failed for report $uuid");
- return false;
- }
-
-
- switch ($v['type']) {
- case 'Date':
- $pass['param'.$i] = $GLOBALS['sql']->quote( $s->ImportDate( $param[$k] ) );
- break;
-
- case 'Facility':
- $pass['param'.$i] = $GLOBALS['sql']->quote( ((int) HTTP_Session2::get('facility_id')));
- break;
-
- case 'User':
- $pass['param'.$i] = freemed::user_cache()->user_number+0;
- break;
-
- default:
- $pass['param'.$i] = $GLOBALS['sql']->quote( $param[$k] );
- break;
- }
- $i=$i+1;
- }
-
- // Form query
- $query = "CALL ".$report['report_sp']." ( ". @join( ', ', $pass )." ); ";
-
- //print_r($result); die();
-
- // Handle graphing, or at least non-standard, reports
- if ( $report['report_type'] != 'standard' ) {
- return call_user_func_array( array( &$this, 'GenerateReport_'.ucfirst($report['report_type']) ), array( $report, $format, $query, $pass ) );
- }
- $this->GenerateReport_Jasper( $report, $format, $query,$pass);
- } // end method GenerateReport
+
//----- Pluggable methods go below -----

// Method: GenerateReport_Graph