Changeset 1075

Timestamp:

09/06/08 01:14:49 (4 months ago)

Author:

laurentj

Message:

made performance improvements in jRequest
removed also deprecated members of jRequest: allowedResponses, , , .

Files:

• trunk/build/buildjelix.php (modified) (2 diffs)
• trunk/lib/jelix/core/defaultconfig.ini.php (modified) (2 diffs)
• trunk/lib/jelix/core/jConfigCompiler.class.php (modified) (8 diffs)
• trunk/lib/jelix/core/jInstallChecker.class.php (modified) (3 diffs)
• trunk/lib/jelix/core/jRequest.class.php (modified) (4 diffs)
• trunk/lib/jelix/core/request/jCmdLineRequest.class.php (modified) (1 diff)
• trunk/lib/jelix/core/request/jCssRequest.class.php (modified) (1 diff)
• trunk/lib/jelix/core/request/jJsonRpcRequest.class.php (modified) (1 diff)
• trunk/lib/jelix/core/request/jRdfRequest.class.php (modified) (1 diff)
• trunk/lib/jelix/core/request/jSoapRequest.class.php (modified) (1 diff)
• trunk/lib/jelix/core/request/jXmlRpcRequest.class.php (modified) (1 diff)
• trunk/lib/jelix/init.php (modified) (1 diff)
• trunk/testapp/modules/jelix_tests/tests/core.jrequest.html_cli.php (modified) (16 diffs)

trunk/build/buildjelix.php

@@ -41 +41 @@
-    ),
-'WITH_BYTECODE_CACHE'=> array(
-
+, 'xcache'
-    'auto',
-
+|xcache
-    ),
-'ENABLE_DEVELOPER'=>array(
@@ -167 +167 @@
-if($ENABLE_PHP_FILTER)  $BUILD_FLAGS |=8;
-switch($WITH_BYTECODE_CACHE){
-48
+112
-    case 'apc': $BUILD_FLAGS |=16; break;
-    case 'eaccelerator': $BUILD_FLAGS |=32; break;
+    case 'xcache': $BUILD_FLAGS |=64; break;
-}
-if($ENABLE_OLD_CLASS_NAMING)  $BUILD_FLAGS |=256;

trunk/lib/jelix/core/defaultconfig.ini.php

@@ -25 +25 @@
-
-enableOldActionSelector =
+
+; reserved variable
+requestScript=
-
-[coordplugins]
@@ -160 +163 @@
-significantFile = "urls.xml"
-
+; filled automatically by jelix
+urlScript=
+urlScriptPath=
+urlScriptName=
+
-[simple_urlengine_entrypoints]
-; parameters for the simple url engine. This is the list of entry points

trunk/lib/jelix/core/jConfigCompiler.class.php

@@ -45 +45 @@
-        @jelix_read_ini(JELIX_APP_CONFIG_PATH.'defaultconfig.ini.php', $config);
-
-
+ 
-            if(!file_exists(JELIX_APP_CONFIG_PATH.$configFile))
-                die("Jelix config file $configFile is missing !");
@@ -51 +51 @@
-                die("Syntax error in the Jelix config file $configFile !");
-        }
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-        $config->isWindows = (DIRECTORY_SEPARATOR === '\\');
-        if(trim( $config->startAction) == '') {
@@ -74 +123 @@
-            $config->urlengine['scriptNameServerVariable'] = self::_findServerName($config->urlengine['entrypointExtension']);
-        }
-
-
-
+
+
+
+
+
+
+
-            if($path{0} != '/') $path='/'.$path;
-            if(substr($path,-1) != '/') $path.='/';
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
-            $config->urlengine['jelixWWWPath'] = $path.$config->urlengine['jelixWWWPath'];
-
@@ -110 +171 @@
-            die("Syntax error in the locale parameter in Jelix config file $configFile !");
-        }*/
-#else
-        $config = jIniFile::read(JELIX_LIB_CORE_PATH.'defaultconfig.ini.php');
-
-        if( $commonConfig = parse_ini_file(JELIX_APP_CONFIG_PATH.'defaultconfig.ini.php',true)){
-            self::_mergeConfig($config, $commonConfig);
-        }
-
-        if($configFile !='defaultconfig.ini.php'){
-            if(!file_exists(JELIX_APP_CONFIG_PATH.$configFile))
-                die("Jelix config file $configFile is missing !");
-            if( false === ($userConfig = parse_ini_file(JELIX_APP_CONFIG_PATH.$configFile,true)))
-                die("Syntax error in the Jelix config file $configFile !");
-            self::_mergeConfig($config, $userConfig);
-        }
-        $config['isWindows'] =  (DIRECTORY_SEPARATOR == '\\');
-        if(trim( $config['startAction']) == '') {
-            $config['startAction'] = ':';
-        }
-
-        $config['_allBasePath'] = array();
-        $config['_modulesPathList'] = self::_loadPathList($config['modulesPath'], $config['_allBasePath']);
-
-        self::_loadPluginsPathList($config);
-
-        if($config['checkTrustedModules']){
-            $config['_trustedModules'] = explode(',',$config['trustedModules']);
-            if(!in_array('jelix',$config['_trustedModules']))
-                $config['_trustedModules'][]='jelix';
-        }else{
-            $config['_trustedModules'] = array_keys($config['_modulesPathList']);
-        }
-
-        if($config['urlengine']['scriptNameServerVariable'] == '') {
-            $config['urlengine']['scriptNameServerVariable'] = self::_findServerName($config['urlengine']['entrypointExtension']);
-        }
-
-        $path=$config['urlengine']['basePath'];
-        if($path!='/' && $path!=''){
-            if($path{0} != '/') $path='/'.$path;
-            if(substr($path,-1) != '/') $path.='/';
-            $config['urlengine']['basePath'] = $path;
-        }
-
-        if($path!='' && $config['urlengine']['jelixWWWPath']{0} != '/')
-            $config['urlengine']['jelixWWWPath'] = $path.$config['urlengine']['jelixWWWPath'];
-
-        self::_initResponsesPath($config['responses']);
-        self::_initResponsesPath($config['_coreResponses']);
-        if (trim($config['timeZone']) === '') {
-#if PHP50
-            $config['timeZone'] = "Europe/Paris";
-#else
-            $tz = ini_get('date.timezone');
-            if ($tz != '')
-                $config['timeZone'] = $tz;
-            else
-                $config['timeZone'] = "Europe/Paris";
-#endif
-        }
-
-        /*if(preg_match("/^([a-zA-Z]{2})(?:_([a-zA-Z]{2}))?$/",$config['locale'],$m)){
-            if(!isset($m[2])){
-                $m[2] = $m[1];
-            }
-            $config['defaultLang'] = strtolower($m[1]);
-            $config['defaultCountry'] = strtoupper($m[2]);
-            $config['locale'] = $config['defaultLang'].'_'.$config['defaultCountry'];
-        }else{
-            die("Syntax error in the locale parameter in Jelix config file $configFile !");
-        }*/
-#endif
-
-#if WITH_BYTECODE_CACHE == 'auto'
-        if(BYTECODE_CACHE_EXISTS){
-            $filename=JELIX_APP_TEMP_PATH.str_replace('/','~',$configFile).'.conf.php';
-            if ($f = @fopen($filename, 'wb')) {
-#if ENABLE_PHP_JELIX
-                fwrite($f, '<?php $config = '.var_export(get_object_vars($config),true).";\n?>");
-#else
-                fwrite($f, '<?php $config = '.var_export($config,true).";\n?>");
-#endif
-                fclose($f);
-            } else {
-                throw new Exception('(24)Error while writing config cache file '.$filename);
-            }
-        }else{
-#if ENABLE_PHP_JELIX
-            jIniFile::write(get_object_vars($config), JELIX_APP_TEMP_PATH.str_replace('/','~',$configFile).'.resultini.php', ";<?php die('');?>\n");
-#else
-            jIniFile::write($config, JELIX_APP_TEMP_PATH.str_replace('/','~',$configFile).'.resultini.php', ";<?php die('');?>\n");
-#endif
-        }
-#elseif WITH_BYTECODE_CACHE 
-        $filename=JELIX_APP_TEMP_PATH.str_replace('/','~',$configFile).'.conf.php';
-        if ($f = @fopen($filename, 'wb')) {
-#if ENABLE_PHP_JELIX
-            fwrite($f, '<?php $config = '.var_export(get_object_vars($config),true).";\n?>");
-#else
-            fwrite($f, '<?php $config = '.var_export($config,true).";\n?>");
-#endif
-            fclose($f);
-        } else {
-            throw new Exception('(24)Error while writing config cache file '.$filename);
-        }
-#else
-#if ENABLE_PHP_JELIX
-        jIniFile::write(get_object_vars($config), JELIX_APP_TEMP_PATH.str_replace('/','~',$configFile).'.resultini.php', ";<?php die('');?>\n");
-#else
-        jIniFile::write($config, JELIX_APP_TEMP_PATH.str_replace('/','~',$configFile).'.resultini.php', ";<?php die('');?>\n");
-#endif
-#endif
-#ifnot ENABLE_PHP_JELIX
-        $config = (object) $config;
-#endif
-        return $config;
-    }
-
@@ -232 +178 @@
-     * @return array list of full path
-     */
-ivate
+otected
-        $list = split(' *, *',$list);
-        array_unshift($list, JELIX_LIB_PATH.'core-modules/');
@@ -259 +205 @@
-    }
-
-
-    /**
-     * Analyse plugin paths
-     * @param array|object $config the config container
-     */
-
-
+
-        $list = split(' *, *',$config->pluginsPath);
-#else
-        $list = split(' *, *',$config['pluginsPath']);
-#endif
-        array_unshift($list, JELIX_LIB_PATH.'plugins/'); 
-        foreach($list as $k=>$path){
@@ -286 +227 @@
-                        if($subdir = opendir($p.$f)){
-                            if($k!=0) 
-#if ENABLE_PHP_JELIX
-                               $config->_allBasePath[]=$p.$f.'/';
-#else
-                               $config['_allBasePath'][]=$p.$f.'/';
-#endif
-                            while (false !== ($subf = readdir($subdir))) {
-                                if ($subf{0} != '.' && is_dir($p.$f.'/'.$subf)) {
-                                    if($f == 'tpl'){
-#if ENABLE_PHP_JELIX
-                                        $prop = '_tplpluginsPathList_'.$subf;
-                                        $config->{$prop}[] = $p.$f.'/'.$subf.'/';
@@ -300 +236 @@
-                                        $prop = '_pluginsPathList_'.$f;
-                                        $config->{$prop}[$subf] = $p.$f.'/'.$subf.'/';
-#else
-                                        $config['_tplpluginsPathList_'.$subf][] = $p.$f.'/'.$subf.'/';
-                                    }else{
-                                        $config['_pluginsPathList_'.$f][$subf] =$p.$f.'/'.$subf.'/';
-#endif
-                                    }
-                                }

trunk/lib/jelix/core/jInstallChecker.class.php

@@ -67 +67 @@
-            'extension.xmlrpc'=>'Cette édition de Jelix a besoin de l\'extension xmlrpc',
-            'extension.jelix'=>'Cette édition de Jelix a besoin de l\'extension jelix',
-
-
+
-            'path.core'=>'Le fichier init.php  de jelix ou le fichier application.ini.php de votre application n\'est pas chargé',
-            'path.temp'=>'Le repertoire temporaire n\'est pas accessible en écriture ou alors JELIX_APP_TEMP_PATH n\'est pas configurée comme il faut',
@@ -122 +121 @@
-            'extension.xmlrpc'=>'This Jelix edition require the xmlrpc extension',
-            'extension.jelix'=>'This Jelix edition require the jelix extension',
-
-
+
-            'path.core'=>'jelix init.php file or application.ini.php file is not loaded',
-            'path.temp'=>'temp/yourApp directory is not writable or JELIX_APP_TEMP_PATH is not correctly set !',
@@ -306 +304 @@
-            $ok=false;
-        }
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
-        if($ok)
-            $this->ok('extensions.required.ok');

trunk/lib/jelix/core/jRequest.class.php

@@ -67 +67 @@
-    public $urlPathInfo;
-
-
-    /**
-     * @var string
-     * @deprecated see $urlScriptPath
-     */
-    public $url_script_path;
-
-    /**
-     * @var string
-     * @deprecated see $urlScriptName
-     */
-    public $url_script_name;
-
-    /**
-     * @var string
-     * @deprecated see $urlPathInfo
-     */
-    public $url_path_info;
-
-
-
-    function __construct(){  }
-
@@ -109 +88 @@
-        global $gJConfig;
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
-
-        $piiqp = $gJConfig->urlengine['pathInfoInQueryParameter'];
@@ -151 +116 @@
-        }
-
-_path_info = $this->url
+
-    }
-
@@ -175 +140 @@
-
-    /**
-     * return a list of class name of allowed response corresponding to the request
-     * @return array the list, or false which means everything
-     * @see jRequest::getResponse()
-     */
-    public function allowedResponses(){ return false;}
-
-    /**
-     * @param string $respclass the name of a response class
-     */
-    public function isAllowedResponse($respclass){
-
-
-
-
+
-    }
-

trunk/lib/jelix/core/request/jCmdLineRequest.class.php

@@ -25 +25 @@
-    public $defaultResponseType = 'cmdline';
-
-allowedResponses(
-array('jResponseCmdline'
+isAllowedResponse($respclass
+('jResponseCmdline' == $respclass
-    }
-
-    protected function _initUrlData(){ 
-        global $gJConfig; 
-_script_path = $this->url
-_script_name = $this->url
-_path_info = $this->url
+
+
+
-    }
-

trunk/lib/jelix/core/request/jCssRequest.class.php

@@ -27 +27 @@
-    }
-
-
+
+
+
-}

trunk/lib/jelix/core/request/jJsonRpcRequest.class.php

@@ -61 +61 @@
-    }
-
-
+
+
+
-
-}

trunk/lib/jelix/core/request/jRdfRequest.class.php

@@ -26 +26 @@
-        $this->params = array_merge($url->params, $_POST);
-    }
-    public function allowedResponses(){ return array('jResponseRdf');}
-
+    public function isAllowedResponse($respclass){
+        return ('jResponseRdf' == $respclass);
+    }
-}
-

trunk/lib/jelix/core/request/jSoapRequest.class.php

@@ -58 +58 @@
-    protected function _initParams(){}
-
-allowedResponses(){ 
-array('jResponseSoap'
+isAllowedResponse($respclass){
+('jResponseSoap' == $respclass
-    }
-

trunk/lib/jelix/core/request/jXmlRpcRequest.class.php

@@ -57 +57 @@
-    }
-
-
+
+
+
-
-}

trunk/lib/jelix/init.php

@@ -53 +53 @@
-
-#if WITH_BYTECODE_CACHE == 'auto'
-
+
+
+
+
+
-#endif
-

trunk/testapp/modules/jelix_tests/tests/core.jrequest.html_cli.php

@@ -10 +10 @@
-*/
-
-
+
+
+
+
+
+
+
+
+
-
-class requestTest extends jRequest {
@@ -21 +29 @@
-class UTjrequest extends jUnitTestCase {
-    protected $currentServer;
-
-
-
+
+
-    function setUp() {
-        $this->currentServer = $_SERVER;
-
-
+
-        $GLOBALS['gJConfig']->urlengine['basePath'] = '/';
+        $GLOBALS['gJConfig']->responses=array();
+        $GLOBALS['gJConfig']->_coreResponses=array();
-    }
-
-    function tearDown() {
-        $_SERVER = $this->currentServer;
-
-
+
-    }
-
@@ -53 +60 @@
-        );
-        $req = new requestTest();
+        configCompileTest::prepareConfig2($GLOBALS['gJConfig']);
-        $req->init();
-
@@ -78 +86 @@
-        );
-        $req = new requestTest();
+        configCompileTest::prepareConfig2($GLOBALS['gJConfig']);
-        $req->init();
-
@@ -99 +108 @@
-        );
-        $req = new requestTest();
+        configCompileTest::prepareConfig2($GLOBALS['gJConfig']);
-        $req->init();
-
@@ -121 +131 @@
-        );
-        $req = new requestTest();
+        configCompileTest::prepareConfig2($GLOBALS['gJConfig']);
-        $req->init();
-
@@ -141 +152 @@
-        );
-        $req = new requestTest();
+        configCompileTest::prepareConfig2($GLOBALS['gJConfig']);
-        $req->init();
-
@@ -168 +180 @@
-        );
-        $req = new requestTest();
+        configCompileTest::prepareConfig2($GLOBALS['gJConfig']);
-        $req->init();
-        $this->assertEqual('/foo/', $req->urlScriptPath);
@@ -189 +202 @@
-        );
-        $req = new requestTest();
+        configCompileTest::prepareConfig2($GLOBALS['gJConfig']);
-        $req->init();
-        $this->assertEqual('/foo/', $req->urlScriptPath);
@@ -210 +224 @@
-        );
-        $req = new requestTest();
+        configCompileTest::prepareConfig2($GLOBALS['gJConfig']);
-        $req->init();
-        $this->assertEqual('/foo/', $req->urlScriptPath);
@@ -230 +245 @@
-        );
-        $req = new requestTest();
+        configCompileTest::prepareConfig2($GLOBALS['gJConfig']);
-        $req->init();
-        $this->assertEqual('/foo/', $req->urlScriptPath);
@@ -256 +272 @@
-        );
-        $req = new requestTest();
+        configCompileTest::prepareConfig2($GLOBALS['gJConfig']);
-        $req->init();
-        $this->assertEqual('/foo/', $req->urlScriptPath);
@@ -279 +296 @@
-       );
-        $req = new requestTest();
+        configCompileTest::prepareConfig2($GLOBALS['gJConfig']);
-        $req->init();
-        $this->assertEqual('/foo/', $req->urlScriptPath);
@@ -304 +322 @@
-       );
-        $req = new requestTest();
+        configCompileTest::prepareConfig2($GLOBALS['gJConfig']);
-        $req->init();
-        $this->assertEqual('/foo/', $req->urlScriptPath);
@@ -326 +345 @@
-        );
-        $req = new requestTest();
+        configCompileTest::prepareConfig2($GLOBALS['gJConfig']);
-        $req->init();
-        $this->assertEqual('/foo/', $req->urlScriptPath);
@@ -334 +354 @@
-}
-
-?>