Changeset 88

Show
Ignore:
Timestamp:
11/29/06 16:05:09 (2 years ago)
Author:
fabien
Message:

updated to symfony 1.0 beta 1

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • trunk/SYMFONY

    r2 r88  
     1#!/usr/bin/env php 
     2<?php 
     3 
     4/* 
     5 * This file is part of the symfony package. 
     6 * (c) 2004-2006 Fabien Potencier <fabien.potencier@symfony-project.com> 
     7 *  
     8 * For the full copyright and license information, please view the LICENSE 
     9 * file that was distributed with this source code. 
     10 */ 
     11 
     12chdir(dirname(__FILE__)); 
     13include('config/config.php'); 
     14include($sf_symfony_data_dir.'/bin/symfony.php'); 

  • trunk/apps/frontend/config/cache.yml

    r2 r88  
    11default: 
    2   activate:  off 
    3   type:      slot 
     2  enabled:   off 
     3  with_layout: false 
    44  lifetime:  86400 

  • trunk/apps/frontend/config/config.php

    r71 r88  
    11<?php 
    22 
    3 // symfony directories 
    4 if (is_readable(SF_ROOT_DIR.'/lib/symfony/symfony.php')) 
    5 { 
    6   // symlink exists 
    7   $sf_symfony_lib_dir  = SF_ROOT_DIR.'/lib/symfony'; 
    8   $sf_symfony_data_dir = SF_ROOT_DIR.'/data/symfony'; 
    9   $sf_version          = '@DEV@'; 
    10 } 
    11 else 
    12 { 
    13   // PEAR config 
    14   if ((include('symfony/pear.php')) != 'OK') 
    15   { 
    16     throw new Exception('Unable to find symfony librairies'); 
    17   } 
    18 } 
     3// include project configuration 
     4include(SF_ROOT_DIR.DIRECTORY_SEPARATOR.'config'.DIRECTORY_SEPARATOR.'config.php'); 
    195 
    20 require_once($sf_symfony_lib_dir.'/config/sfConfig.class.php'); 
    21  
    22 sfConfig::add(array( 
    23   'sf_root_dir'         => SF_ROOT_DIR, 
    24   'sf_app'              => SF_APP, 
    25   'sf_environment'      => SF_ENVIRONMENT, 
    26   'sf_debug'            => SF_DEBUG, 
    27   'sf_symfony_lib_dir'  => $sf_symfony_lib_dir, 
    28   'sf_symfony_data_dir' => $sf_symfony_data_dir, 
    29   'sf_test'             => false, 
    30   'sf_version'          => $sf_version, 
    31 )); 
    32  
    33 // start timer 
    34 if (sfConfig::get('sf_debug')) 
    35 { 
    36   sfConfig::set('sf_timer_start', microtime(true)); 
    37 } 
    38  
    39 // directory layout 
    40 include($sf_symfony_data_dir.'/config/constants.php'); 
    41  
    42 // include path 
    43 set_include_path( 
    44   sfConfig::get('sf_lib_dir').PATH_SEPARATOR. 
    45   sfConfig::get('sf_app_lib_dir').PATH_SEPARATOR. 
    46   sfConfig::get('sf_symfony_lib_dir').DIRECTORY_SEPARATOR.'vendor'.PATH_SEPARATOR. 
    47   get_include_path() 
    48 ); 
    49  
    50 // check to see if we're not in a cache cleaning process 
    51 require_once(sfConfig::get('sf_symfony_lib_dir').'/util/sfToolkit.class.php'); 
    52 if (sfToolkit::hasLockFile(SF_ROOT_DIR.DIRECTORY_SEPARATOR.SF_APP.'_'.SF_ENVIRONMENT.'.lck', 5)) 
    53 { 
    54   // application is not yet available 
    55   include(SF_WEB_DIR.'/unavailable.html'); 
    56   die(1); 
    57 } 
    58  
    59 // require project configuration 
    60 require_once(sfConfig::get('sf_config_dir').'/config.php'); 
    61  
    62 // recent symfony update? 
    63 $version = @file_get_contents(sfConfig::get('sf_config_cache_dir').'/VERSION'); 
    64 if ($version != $sf_version) 
    65 { 
    66   // force cache regeneration 
    67   foreach (array(sfConfig::get('sf_config_cache_dir').'/config_bootstrap_compile.yml.php', sfConfig::get('sf_config_cache_dir').'/config_core_compile.yml.php') as $file) 
    68   { 
    69     if (is_readable($file)) 
    70     { 
    71       unlink($file); 
    72     } 
    73   } 
    74 } 
    75  
    76 // go 
    77 $bootstrap = sfConfig::get('sf_config_cache_dir').'/config_bootstrap_compile.yml.php'; 
    78 if (is_readable($bootstrap)) 
    79 { 
    80   require_once($bootstrap); 
    81 } 
    82 else 
    83 { 
    84   require_once(sfConfig::get('sf_symfony_lib_dir').'/symfony.php'); 
    85 } 
    86  
    87 ?> 
     6// symfony bootstraping 
     7require_once($sf_symfony_lib_dir.'/util/sfCore.class.php'); 
     8sfCore::bootstrap($sf_symfony_lib_dir, $sf_symfony_data_dir); 

  • trunk/apps/frontend/config/filters.yml

    r49 r88  
     1rendering: ~ 
     2web_debug: ~ 
     3security:  ~ 
     4 
     5# generally, you will want to insert your own filters here 
    16myTagFilter: 
    27  class: myTagFilter 
    38  param: 
    49    host_exclude_regex: /^(www|askeet)/ 
     10 
     11 
     12cache:     ~ 
     13common:    ~ 
     14flash:     ~ 
     15execution: ~ 

  • trunk/apps/frontend/config/logging.yml

    r71 r88  
    77 
    88all: 
    9 #  active: on 
     9#  enabled: on 
    1010#  level:  debug 

  • trunk/apps/frontend/config/view.yml

    r76 r88  
    1212  stylesheets:    [main, layout] 
    1313 
    14   javascripts:    [/sf/js/prototype/prototype.js] 
     14  javascripts:    [%SF_PROTOTYPE_WEB_DIR%/js/prototype.js] 
    1515 
    1616  has_layout:     on 

  • trunk/apps/frontend/lib/helper/UserHelper.php

    r64 r88  
    11<?php 
    22 
    3 use_helpers('Javascript', 'Global'); 
     3use_helper('Javascript', 'Global'); 
    44 
    55function link_to_user_interested($user, $question) 

  • trunk/apps/frontend/modules/answer/templates/_answer.php

    r69 r88  
    1 <?php use_helpers('Date', 'User') ?> 
     1<?php use_helper('Date', 'User') ?> 
    22 
    33<div class="vote_block" id="vote_<?php echo $answer->getId() ?>"> 

  • trunk/apps/frontend/modules/answer/templates/recentSuccess.php

    r80 r88  
    1 <?php use_helpers('Date', 'Answer', 'Question') ?> 
     1<?php use_helper('Date', 'Answer', 'Question') ?> 
    22 
    33<h1><?php echo __('recent answers') ?></h1> 

  • trunk/apps/frontend/modules/moderator/templates/reportedAnswersSuccess.php

    r74 r88  
    1 <?php use_helpers('Date', 'User', 'Global', 'Question') ?> 
     1<?php use_helper('Date', 'User', 'Global', 'Question') ?> 
    22 
    33<h1><?php echo __('answers reported as spam') ?></h1> 

  • trunk/apps/frontend/modules/moderator/templates/reportedQuestionsSuccess.php

    r74 r88  
    1 <?php use_helpers('Text', 'Global', 'Question', 'Date', 'User') ?> 
     1<?php use_helper('Text', 'Global', 'Question', 'Date', 'User') ?> 
    22 
    33<h1><?php echo __('questions reported as spam') ?></h1> 

  • trunk/apps/frontend/modules/question/templates/_question_block.php

    r69 r88  
    1 <?php use_helpers('Text', 'Global', 'Question', 'Date') ?> 
     1<?php use_helper('Text', 'Global', 'Question', 'Date') ?> 
    22 
    33<div class="question"> 

  • trunk/apps/frontend/modules/question/templates/_question_list.php

    r79 r88  
    1 <?php use_helpers('Global') ?> 
     1<?php use_helper('Global') ?> 
    22 
    33<?php foreach($question_pager->getResults() as $question): ?> 

  • trunk/apps/frontend/modules/question/templates/addSuccess.php

    r69 r88  
    1 <?php use_helper('Javascript') ?> 
     1<?php use_helper('Javascript', 'Validation') ?> 
    22 
    33<h1><?php echo __('ask a question') ?></h1> 

  • trunk/apps/frontend/modules/question/templates/searchSuccess.php

    r69 r88  
    1 <?php use_helpers('Global') ?> 
     1<?php use_helper('Global') ?> 
    22 
    33<h1><?php echo __('questions matching "%1%"', array('%1%' => htmlspecialchars($sf_params->get('search')))) ?></h1> 

  • trunk/apps/frontend/modules/question/templates/showSuccess.php

    r69 r88  
    1 <?php use_helpers('Date', 'Answer', 'Question') ?> 
     1<?php use_helper('Date', 'Answer', 'Question') ?> 
    22 
    33<h1></h1> 

  • trunk/apps/frontend/modules/tag/config/cache.yml

    r53 r88  
    11popular: 
    2   activate:   on 
    3   type:       slot 
     2  enabled:    on 
     3  with_layout: false 
    44 
    55all: 

  • trunk/apps/frontend/modules/user/templates/listInterestedBySuccess.php

    r69 r88  
    1 <?php use_helpers('Date', 'Global') ?> 
     1<?php use_helper('Date', 'Global') ?> 
    22 
    33<h2><?php echo $question->getTitle() ?></h2> 

  • trunk/apps/frontend/modules/user/templates/loginSuccess.php

    r76 r88  
    1 <?php use_helpers('Validation', 'Javascript') ?> 
     1<?php use_helper('Validation', 'Javascript') ?> 
    22 
    33<h1><?php echo __('sign in / register') ?></h1> 

  • trunk/apps/frontend/modules/user/templates/showSuccess.php

    r69 r88  
    1 <?php use_helpers('Date', 'Question', 'Text', 'Object') ?> 
     1<?php use_helper('Date', 'Question', 'Text', 'Object', 'Validation') ?> 
    22 
    33<h1><?php echo __('%1%\'s profile', array('%1%' => $subscriber->__toString())) ?> 

  • trunk/apps/frontend/templates/layout.php

    r72 r88  
    88<?php echo include_title() ?> 
    99 
    10 <?php echo include_stylesheets() ?> 
    11 <?php echo include_javascripts() ?> 
     10 
     11 
    1212 
    1313<?php echo auto_discovery_link_tag('rss', 'feed/popular') ?> 

  • trunk/config/config.php

    r2 r88  
    11<?php 
    22 
     3$sf_symfony_lib_dir  = dirname(__FILE__).'/../lib/vendor/symfony/lib'; 
     4$sf_symfony_data_dir = dirname(__FILE__).'/../lib/vendor/symfony/data'; 
     5 
     6 
    37?> 

  • trunk/config/propel.ini

    r71 r88  
    1 propel.targetPackage = model 
     1propel.targetPackage = lib.model 
    22propel.project = askeet 
    33propel.database = mysql 
    44propel.database.createUrl = mysql://localhost/ 
    5 propel.database.url = mysql://localhost/askeet 
     5propel.database.url = mysql://root@localhost/askeet 
    66 
    77propel.mysql.tableType = InnoDB 
    8  
     8propel.schema.validate     = false 
    99propel.addGenericAccessors = true 
    1010propel.addGenericMutators = true 
    …… 
    1919propel.sql.dir = ${propel.output.dir}/data/sql 
    2020propel.runtime.conf.file = runtime-conf.xml 
    21 propel.php.dir = ${propel.output.dir}/lib 
     21propel.php.dir = ${propel.output.dir} 
    2222propel.default.schema.basename = schema 
    2323propel.datadump.mapper.from = *schema.xml 
    …… 
    2525 
    2626; builder settings 
    27 propel.builder.peer.class = symfony.addon.propel.builder.SfPeerBuilder 
    28 propel.builder.object.class = symfony.addon.propel.builder.SfObjectBuilder 
     27propel.builder.peer.class = addon.propel.builder.SfPeerBuilder 
     28propel.builder.object.class = addon.propel.builder.SfObjectBuilder 
    2929 
    30 propel.builder.objectstub.class = propel.engine.builder.om.php5.PHP5ExtensionObjectBuilder 
    31 propel.builder.peerstub.class = propel.engine.builder.om.php5.PHP5ExtensionPeerBuilder 
    32 propel.builder.objectmultiextend.class = propel.engine.builder.om.php5.PHP5MultiExtendObjectBuilder 
    33 propel.builder.mapbuilder.class = propel.engine.builder.om.php5.PHP5MapBuilderBuilder 
     30propel.builder.objectstub.class = addon.propel.builder.SfExtensionObjectBuilder 
     31propel.builder.peerstub.class = addon.propel.builder.SfExtensionPeerBuilder 
     32propel.builder.objectmultiextend.class = addon.propel.builder.SfMultiExtendObjectBuilder 
     33propel.builder.mapbuilder.class = addon.propel.builder.SfMapBuilderBuilder 
    3434propel.builder.interface.class = propel.engine.builder.om.php5.PHP5InterfaceBuilder 
    3535propel.builder.node.class = propel.engine.builder.om.php5.PHP5NodeBuilder 
    …… 
    3737propel.builder.nodestub.class = propel.engine.builder.om.php5.PHP5ExtensionNodeBuilder 
    3838propel.builder.nodepeerstub.class = propel.engine.builder.om.php5.PHP5ExtensionNodePeerBuilder 
     39propel.packageObjectModel = true 
     40 
     41propel.builder.addIncludes = false 
     42propel.builder.addComments = false 

  • trunk/config/schema.xml

    r62 r88  
    11<?xml version="1.0" encoding="UTF-8"?> 
    2  <database name="symfony" defaultIdMethod="native"> 
     2 <database package="lib.model" name="symfony" defaultIdMethod="native"> 
    33   <table name="ask_question" phpName="Question"> 
    44     <column name="id" type="integer" required="true" primaryKey="true" autoincrement="true" /> 

  • trunk/data/sql/sqldb.map

    r4 r88  
    11# Sqlfile -> Database map 
    22schema.sql=symfony 
     3lib.model.schema.sql=symfony 

  • trunk/lib/model/Answer.php

    r85 r88  
    11<?php 
    22 
    3 require_once 'model/om/BaseAnswer.php'; 
     3require_once 'lib/model/om/BaseAnswer.php'; 
    44 
    55 

  • trunk/lib/model/AnswerPeer.php

    r69 r88  
    22 
    33  // include base peer class 
    4   require_once 'model/om/BaseAnswerPeer.php'; 
     4  require_once 'lib/model/om/BaseAnswerPeer.php'; 
    55   
    66  // include object class 
    7   include_once 'model/Answer.php'; 
     7  include_once 'lib/model/Answer.php'; 
    88 
    99 

  • trunk/lib/model/Interest.php

    r12 r88  
    11<?php 
    22 
    3 require_once 'model/om/BaseInterest.php'; 
     3require_once 'lib/model/om/BaseInterest.php'; 
    44 
    55 

  • trunk/lib/model/InterestPeer.php

    r4 r88  
    22 
    33  // include base peer class 
    4   require_once 'model/om/BaseInterestPeer.php'; 
     4  require_once 'lib/model/om/BaseInterestPeer.php'; 
    55   
    66  // include object class 
    7   include_once 'model/Interest.php'; 
     7  include_once 'lib/model/Interest.php'; 
    88 
    99 

  • trunk/lib/model/Question.php

    r85 r88  
    11<?php 
    22 
    3 require_once 'model/om/BaseQuestion.php'; 
     3require_once 'lib/model/om/BaseQuestion.php'; 
    44 
    55 

  • trunk/lib/model/QuestionPeer.php

    r82 r88  
    22 
    33  // include base peer class 
    4   require_once 'model/om/BaseQuestionPeer.php'; 
     4  require_once 'lib/model/om/BaseQuestionPeer.php'; 
    55   
    66  // include object class 
    7   include_once 'model/Question.php'; 
     7  include_once 'lib/model/Question.php'; 
    88 
    99 
    …… 
    6565  } 
    6666 
    67   public function getPopular($max = 10) 
     67  public static function getPopular($max = 10) 
    6868  { 
    6969    $c = new Criteria(); 

  • trunk/lib/model/QuestionTag.php

    r58 r88  
    11<?php 
    22 
    3 require_once 'model/om/BaseQuestionTag.php'; 
     3require_once 'lib/model/om/BaseQuestionTag.php'; 
    44 
    55 

  • trunk/lib/model/QuestionTagPeer.php

    r72 r88  
    22 
    33  // include base peer class 
    4   require_once 'model/om/BaseQuestionTagPeer.php'; 
     4  require_once 'lib/model/om/BaseQuestionTagPeer.php'; 
    55   
    66  // include object class 
    7   include_once 'model/QuestionTag.php'; 
     7  include_once 'lib/model/QuestionTag.php'; 
    88 
    99 

  • trunk/lib/model/Relevancy.php

    r12 r88  
    11<?php 
    22 
    3 require_once 'model/om/BaseRelevancy.php'; 
     3require_once 'lib/model/om/BaseRelevancy.php'; 
    44 
    55 

  • trunk/lib/model/RelevancyPeer.php

    r4 r88  
    22 
    33  // include base peer class 
    4   require_once 'model/om/BaseRelevancyPeer.php'; 
     4  require_once 'lib/model/om/BaseRelevancyPeer.php'; 
    55   
    66  // include object class 
    7   include_once 'model/Relevancy.php'; 
     7  include_once 'lib/model/Relevancy.php'; 
    88 
    99 

  • trunk/lib/model/ReportAnswer.php

    r55 r88  
    11<?php 
    22 
    3 require_once 'model/om/BaseReportAnswer.php'; 
     3require_once 'lib/model/om/BaseReportAnswer.php'; 
    44 
    55 

  • trunk/lib/model/ReportAnswerPeer.php

    r55 r88  
    22 
    33  // include base peer class 
    4   require_once 'model/om/BaseReportAnswerPeer.php'; 
     4  require_once 'lib/model/om/BaseReportAnswerPeer.php'; 
    55   
    66  // include object class 
    7   include_once 'model/ReportAnswer.php'; 
     7  include_once 'lib/model/ReportAnswer.php'; 
    88 
    99 

  • trunk/lib/model/ReportQuestion.php

    r55 r88  
    11<?php 
    22 
    3 require_once 'model/om/BaseReportQuestion.php'; 
     3require_once 'lib/model/om/BaseReportQuestion.php'; 
    44 
    55 

  • trunk/lib/model/ReportQuestionPeer.php

    r55 r88  
    22 
    33  // include base peer class 
    4   require_once 'model/om/BaseReportQuestionPeer.php'; 
     4  require_once 'lib/model/om/BaseReportQuestionPeer.php'; 
    55   
    66  // include object class 
    7   include_once 'model/ReportQuestion.php'; 
     7  include_once 'lib/model/ReportQuestion.php'; 
    88 
    99 

  • trunk/lib/model/SearchIndex.php

    r58 r88  
    11<?php 
    22 
    3 require_once 'model/om/BaseSearchIndex.php'; 
     3require_once 'lib/model/om/BaseSearchIndex.php'; 
    44 
    55 

  • trunk/lib/model/SearchIndexPeer.php

    r58 r88  
    22 
    33  // include base peer class 
    4   require_once 'model/om/BaseSearchIndexPeer.php'; 
     4  require_once 'lib/model/om/BaseSearchIndexPeer.php'; 
    55   
    66  // include object class 
    7   include_once 'model/SearchIndex.php'; 
     7  include_once 'lib/model/SearchIndex.php'; 
    88 
    99 

  • trunk/lib/model/User.php

    r69 r88  
    11<?php 
    22 
    3 require_once 'model/om/BaseUser.php'; 
     3require_once 'lib/model/om/BaseUser.php'; 
    44 
    55 

  • trunk/lib/model/UserPeer.php

    r55 r88  
    22 
    33  // include base peer class 
    4   require_once 'model/om/BaseUserPeer.php'; 
     4  require_once 'lib/model/om/BaseUserPeer.php'; 
    55   
    66  // include object class 
    7   include_once 'model/User.php'; 
     7  include_once 'lib/model/User.php'; 
    88 
    99 

  • trunk/lib/model/map/AnswerMapBuilder.php

    r55 r88  
    11<?php 
    2          
    3 require_once 'propel/map/MapBuilder.php'; 
    4 include_once 'creole/CreoleTypes.php'; 
    52 
    63 
    7 /** 
    8  * This class adds structure of 'ask_answer' table to 'symfony' DatabaseMap object. 
    9  * 
    10  * 
    11  * 
    12  * These statically-built map classes are used by Propel to do runtime db structure discovery. 
    13  * For example, the createSelectSql() method checks the type of a given column used in an  
    14  * ORDER BY clause to know whether it needs to apply SQL to make the ORDER BY case-insensitive  
    15  * (i.e. if it's a text column type). 
    16  * 
    17  * @package model.map 
    18  */  
     4     
    195class AnswerMapBuilder { 
    206 
    21     /** 
    22      * The (dot-path) name of this class 
    23      */ 
    24     const CLASS_NAME = 'model.map.AnswerMapBuilder';     
     7     
     8    const CLASS_NAME = 'lib.model.map.AnswerMapBuilder';     
    259 
    26     /** 
    27      * The database map. 
    28      */ 
     10     
    2911    private $dbMap; 
    3012 
    31     /** 
    32      * Tells us if this DatabaseMapBuilder is built so that we 
    33      * don't have to re-build it every time. 
    34      * 
    35      * @return boolean true if this DatabaseMapBuilder is built, false otherwise. 
    36      */ 
     13     
    3714    public function isBuilt() 
    3815    { 
    …… 
    4017    } 
    4118 
    42     /** 
    43      * Gets the databasemap this map builder built. 
    44      * 
    45      * @return the databasemap 
    46      */ 
     19     
    4720    public function getDatabaseMap() 
    4821    { 
    …… 
    5023    } 
    5124 
    52     /** 
    53      * The doBuild() method builds the DatabaseMap 
    54      * 
    55      * @return void 
    56      * @throws PropelException 
    57      */ 
     25     
    5826    public function doBuild() 
    5927    { 
    …… 
    8351        $tMap->addColumn('CREATED_AT', 'CreatedAt', 'int', CreoleTypes::TIMESTAMP, false); 
    8452                 
    85     } // doBuild() 
    86  
    87 } // AnswerMapBuilder 
     53    }  
     54}  

  • trunk/lib/model/map/InterestMapBuilder.php

    r4 r88  
    11<?php 
    2          
    3 require_once 'propel/map/MapBuilder.php'; 
    4 include_once 'creole/CreoleTypes.php'; 
    52 
    63 
    7 /** 
    8  * This class adds structure of 'ask_interest' table to 'symfony' DatabaseMap object. 
    9  * 
    10  * 
    11  * 
    12  * These statically-built map classes are used by Propel to do runtime db structure discovery. 
    13  * For example, the createSelectSql() method checks the type of a given column used in an  
    14  * ORDER BY clause to know whether it needs to apply SQL to make the ORDER BY case-insensitive  
    15  * (i.e. if it's a text column type). 
    16  * 
    17  * @package model.map 
    18  */  
     4     
    195class InterestMapBuilder { 
    206 
    21     /** 
    22      * The (dot-path) name of this class 
    23      */ 
    24     const CLASS_NAME = 'model.map.InterestMapBuilder';   
     7     
     8    const CLASS_NAME = 'lib.model.map.InterestMapBuilder';   
    259 
    26     /** 
    27      * The database map. 
    28      */ 
     10     
    2911    private $dbMap; 
    3012 
    31     /** 
    32      * Tells us if this DatabaseMapBuilder is built so that we 
    33      * don't have to re-build it every time. 
    34      * 
    35      * @return boolean true if this DatabaseMapBuilder is built, false otherwise. 
    36      */ 
     13     
    3714    public function isBuilt() 
    3815    { 
    …… 
    4017    } 
    4118 
    42     /** 
    43      * Gets the databasemap this map builder built. 
    44      * 
    45      * @return the databasemap 
    46      */ 
     19     
    4720    public function getDatabaseMap() 
    4821    { 
    …… 
    5023    } 
    5124 
    52     /** 
    53      * The doBuild() method builds the DatabaseMap 
    54      * 
    55      * @return void 
    56      * @throws PropelException 
    57      */ 
     25     
    5826    public function doBuild() 
    5927    { 
    …… 
    7139        $tMap->addColumn('CREATED_AT', 'CreatedAt', 'int', CreoleTypes::TIMESTAMP, false); 
    7240                 
    73     } // doBuild() 
    74  
    75 } // InterestMapBuilder 
     41    }  
     4