added report objects

Signed-off-by: Adrian Jones <adrianj1998@hotmail.com>

class/JasperGroovy.php

@@ -7,7 +7,7 @@
  * @author adrian
  */
 
-class jasperJavascript extends JasperExp
+class JasperGroovy extends JasperExp
 {
 
  function _setVar($name,$codename,$value) {
@@ -17,10 +17,25 @@ function _setVar($name,$codename,$value) {
 }
 
 
+    function right($value, $count) {
+
+        return substr($value, ($count * -1));
+    }
+
+    function left($string, $count) {
+        return substr($string, 0, $count);
+    }
+
+public $arraysqltable;
+public $previousarraydata ;
+public $arrayVariable;
+public $global_pointer;
+public $arrayParameter;
+
 function run($code)
 {
 
-$code = $this->replaceVars($code); 
+//$code = $this->replaceVars($code); 
 
 	$arrdata=explode("+",$code);
 
@@ -108,7 +123,7 @@ function run($code)
 
             return implode($arrdata);
         }
-return $result ;
+return false ;
 
  }
 

class/JasperJS.php

@@ -1,41 +1,39 @@
 <?php
 
+require_once(dirname(__FILE__) . '/j4p5/js.php');
 
-require_once(dirname(__FILE__).'/j4p5/js.php');
+class jasperJavascript extends JasperExp {
 
-
-class jasperJavascript extends JasperExp
-{
+    static $compiled = array();
 
- function _setVar($name,$codename,$value) {
-
-  js::define($codename ,array(),array('value'=>$value));        
-
-}
-
-
-function run($code)
-{
-   // echo $code .' - ';
-   $code = trim($code);
-if (empty($code))
-    return $code;
-$code = $this->replaceVars($code); 
+    function _setVar($name, $codename, $value) {
 
-$code = 'var result = ( '.$code .');';
+        js::define($codename, array(), array('value' => $value));
+    }
 
-#-- Run the js code.
+    function run($code) {
+        $code = trim($code);
+        if (empty($code))
+            return $code;
+        $code = $this->replaceVars($code);
+        $id = md5($code);
+        $code = 'function func_' . $id . ' ()  {  return (' . $code . '); }';
 
+    // -- compile script
+        if (!self::$compiled[$id]) {
+            js::run($code, JS_DIRECT, $id);
+            self::$compiled[$id] = jsrt::$jsfunctions['func_' . $id];
+         }
 
-js::run($code);
+        $func = self::$compiled[$id];
+
+            //-- Run the js code.
 
+        $result = php_str(call_user_func($func));
+        // $result = php_str(jsrt::idv('result'));
 
-$result = php_str(jsrt::idv('result'));
+        return $result;
+    }
 
-return $result ;
-
- }
-
- }
+}
 
-