Changeset 2786

Show
Ignore:
Timestamp:
07/16/08 02:06:07 (5 months ago)
Author:
fumiakiy
Message:

Support count_format in dynamic template tags related to scoring. BugId:80592

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • branches/release-41/php/lib/function.mtassetrank.php

    r1174 r2786  
    1010function smarty_function_mtassetrank($args, &$ctx) { 
    1111    return hdlr_rank($ctx, 'asset', $args['namespace'], $args['max'], 
    12         "" 
     12        "", $args 
    1313    ); 
    1414} 

  • branches/release-41/php/lib/function.mtassetscore.php

    r1174 r2786  
    99 
    1010function smarty_function_mtassetscore($args, &$ctx) { 
    11     return hdlr_score($ctx, 'asset', $args['namespace'], $args['default']); 
     11    return hdlr_score($ctx, 'asset', $args['namespace'], $args['default'], $args); 
    1212} 
    1313?> 

  • branches/release-41/php/lib/function.mtassetscoreavg.php

    r1174 r2786  
    99 
    1010function smarty_function_mtassetscoreavg($args, &$ctx) { 
    11     return hdlr_score_avg($ctx, 'asset', $args['namespace']); 
     11    return hdlr_score_avg($ctx, 'asset', $args['namespace'], $args); 
    1212} 
    1313?> 

  • branches/release-41/php/lib/function.mtassetscorecount.php

    r1956 r2786  
    99 
    1010function smarty_function_mtassetscorecount($args, &$ctx) { 
    11     $count = hdlr_score_count($ctx, 'asset', $args['namespace']); 
    12     return $ctx->count_format($count, $args); 
     11    return hdlr_score_count($ctx, 'asset', $args['namespace'], $args); 
    1312} 

  • branches/release-41/php/lib/function.mtassetscorehigh.php

    r1174 r2786  
    99 
    1010function smarty_function_mtassetscorehigh($args, &$ctx) { 
    11     return hdlr_score_high($ctx, 'asset', $args['namespace']); 
     11    return hdlr_score_high($ctx, 'asset', $args['namespace'], $args); 
    1212} 
    1313?> 

  • branches/release-41/php/lib/function.mtassetscorelow.php

    r1174 r2786  
    99 
    1010function smarty_function_mtassetscorelow($args, &$ctx) { 
    11     return hdlr_score_low($ctx, 'asset', $args['namespace']); 
     11    return hdlr_score_low($ctx, 'asset', $args['namespace'], $args); 
    1212} 
    1313?> 

  • branches/release-41/php/lib/function.mtcommentrank.php

    r1174 r2786  
    1010function smarty_function_mtcommentrank($args, &$ctx) { 
    1111    return hdlr_rank($ctx, 'comment', $args['namespace'], $args['max'], 
    12         "AND (comment_visible = 1)\n" 
     12        "AND (comment_visible = 1)\n", $args 
    1313    ); 
    1414} 

  • branches/release-41/php/lib/function.mtcommentscore.php

    r1174 r2786  
    99 
    1010function smarty_function_mtcommentscore($args, &$ctx) { 
    11     return hdlr_score($ctx, 'comment', $args['namespace'], $args['default']); 
     11    return hdlr_score($ctx, 'comment', $args['namespace'], $args['default'], $args); 
    1212} 
    1313?> 

  • branches/release-41/php/lib/function.mtcommentscoreavg.php

    r1174 r2786  
    99 
    1010function smarty_function_mtcommentscoreavg($args, &$ctx) { 
    11     return hdlr_score_avg($ctx, 'comment', $args['namespace']); 
     11    return hdlr_score_avg($ctx, 'comment', $args['namespace'], $args); 
    1212} 
    1313?> 

  • branches/release-41/php/lib/function.mtcommentscorecount.php

    r1956 r2786  
    99 
    1010function smarty_function_mtcommentscorecount($args, &$ctx) { 
    11     $count = hdlr_score_count($ctx, 'comment', $args['namespace']); 
    12     return $ctx->count_format($count, $args); 
     11    return hdlr_score_count($ctx, 'comment', $args['namespace'], $args); 
    1312} 

  • branches/release-41/php/lib/function.mtcommentscorehigh.php

    r1174 r2786  
    99 
    1010function smarty_function_mtcommentscorehigh($args, &$ctx) { 
    11     return hdlr_score_high($ctx, 'comment', $args['namespace']); 
     11    return hdlr_score_high($ctx, 'comment', $args['namespace'], $args); 
    1212} 
    1313?> 

  • branches/release-41/php/lib/function.mtcommentscorelow.php

    r1174 r2786  
    99 
    1010function smarty_function_mtcommentscorelow($args, &$ctx) { 
    11     return hdlr_score_low($ctx, 'comment', $args['namespace']); 
     11    return hdlr_score_low($ctx, 'comment', $args['namespace'], $args); 
    1212} 
    1313?> 

  • branches/release-41/php/lib/function.mtentryrank.php

    r1174 r2786  
    1010function smarty_function_mtentryrank($args, &$ctx) { 
    1111    return hdlr_rank($ctx, 'entry', $args['namespace'], $args['max'], 
    12         "AND (entry_status = 2)\n" 
     12        "AND (entry_status = 2)\n", $args 
    1313    ); 
    1414} 

  • branches/release-41/php/lib/function.mtentryscore.php

    r1174 r2786  
    99 
    1010function smarty_function_mtentryscore($args, &$ctx) { 
    11     return hdlr_score($ctx, 'entry', $args['namespace'], $args['default']); 
     11    return hdlr_score($ctx, 'entry', $args['namespace'], $args['default'], $args); 
    1212} 
    1313?> 

  • branches/release-41/php/lib/function.mtentryscoreavg.php

    r1174 r2786  
    99 
    1010function smarty_function_mtentryscoreavg($args, &$ctx) { 
    11     return hdlr_score_avg($ctx, 'entry', $args['namespace']); 
     11    return hdlr_score_avg($ctx, 'entry', $args['namespace'], $args); 
    1212} 
    1313?> 

  • branches/release-41/php/lib/function.mtentryscorecount.php

    r1956 r2786  
    99 
    1010function smarty_function_mtentryscorecount($args, &$ctx) { 
    11     $count = hdlr_score_count($ctx, 'entry', $args['namespace']); 
    12     return $ctx->count_format($count, $args); 
     11    return hdlr_score_count($ctx, 'entry', $args['namespace'], $args); 
    1312} 

  • branches/release-41/php/lib/function.mtentryscorehigh.php

    r1174 r2786  
    99 
    1010function smarty_function_mtentryscorehigh($args, &$ctx) { 
    11     return hdlr_score_high($ctx, 'entry', $args['namespace']); 
     11    return hdlr_score_high($ctx, 'entry', $args['namespace'], $args); 
    1212} 
    1313?> 

  • branches/release-41/php/lib/function.mtentryscorelow.php

    r1174 r2786  
    99 
    1010function smarty_function_mtentryscorelow($args, &$ctx) { 
    11     return hdlr_score_low($ctx, 'entry', $args['namespace']); 
     11    return hdlr_score_low($ctx, 'entry', $args['namespace'], $args); 
    1212} 
    1313?> 

  • branches/release-41/php/lib/function.mtpingrank.php

    r1174 r2786  
    1010function smarty_function_mtpingrank($args, &$ctx) { 
    1111    return hdlr_rank($ctx, 'tbping', $args['namespace'], $args['max'], 
    12         "AND (tbping_visible = 1)\n" 
     12        "AND (tbping_visible = 1)\n", $args 
    1313    ); 
    1414} 

  • branches/release-41/php/lib/function.mtpingscore.php

    r1174 r2786  
    99 
    1010function smarty_function_mtpingscore($args, &$ctx) { 
    11     return hdlr_score($ctx, 'tbping', $args['namespace'], $args['default']); 
     11    return hdlr_score($ctx, 'tbping', $args['namespace'], $args['default'], $args); 
    1212} 
    1313?> 

  • branches/release-41/php/lib/function.mtpingscoreavg.php

    r1174 r2786  
    99 
    1010function smarty_function_mtpingscoreavg($args, &$ctx) { 
    11     return hdlr_score_avg($ctx, 'tbping', $args['namespace']); 
     11    return hdlr_score_avg($ctx, 'tbping', $args['namespace'], $args); 
    1212} 
    1313?> 

  • branches/release-41/php/lib/function.mtpingscorecount.php

    r1956 r2786  
    99 
    1010function smarty_function_mtpingscorecount($args, &$ctx) { 
    11     $count = hdlr_score_count($ctx, 'tbping', $args['namespace']); 
    12     return $ctx->count_format($count, $args); 
     11    return hdlr_score_count($ctx, 'tbping', $args['namespace'], $args); 
    1312} 

  • branches/release-41/php/lib/function.mtpingscorehigh.php

    r1174 r2786  
    99 
    1010function smarty_function_mtpingscorehigh($args, &$ctx) { 
    11     return hdlr_score_high($ctx, 'tbping', $args['namespace']); 
     11    return hdlr_score_high($ctx, 'tbping', $args['namespace'], $args); 
    1212} 
    1313?> 

  • branches/release-41/php/lib/function.mtpingscorelow.php

    r1174 r2786  
    99 
    1010function smarty_function_mtpingscorelow($args, &$ctx) { 
    11     return hdlr_score_low($ctx, 'tbping', $args['namespace']); 
     11    return hdlr_score_low($ctx, 'tbping', $args['namespace'], $args); 
    1212} 
    1313?> 

  • branches/release-41/php/lib/rating_lib.php

    r1174 r2786  
    135135} 
    136136 
    137 function hdlr_score($ctx, $datasource, $namespace, $default) { 
     137function hdlr_score($ctx, $datasource, $namespace, $default, $args = null) { 
    138138    if (!isset($namespace)) { 
    139139        return ''; 
    …… 
    151151    if ( !$score && isset($default) ) 
    152152        return $default; 
     153    if ( $score )  
     154        return $ctx->count_format($score, $args); 
    153155    return $score; 
    154156} 
    155157 
    156 function hdlr_score_high($ctx, $datasource, $namespace) { 
     158function hdlr_score_high($ctx, $datasource, $namespace, $args = null) { 
    157159    if (!isset($namespace)) { 
    158160        return ''; 
    …… 
    170172} 
    171173 
    172 function hdlr_score_low($ctx, $datasource, $namespace) { 
     174function hdlr_score_low($ctx, $datasource, $namespace, $args = null) { 
    173175    if (!isset($namespace)) { 
    174176        return ''; 
    …… 
    186188} 
    187189 
    188 function hdlr_score_avg($ctx, $datasource, $namespace) { 
    189     if (!isset($namespace)) { 
    190         return ''; 
    191     } 
    192     if ($datasource == 'tbping') { 
    193         $key = 'ping'; 
    194     } else { 
    195         $key = $datasource; 
    196     } 
    197     $object = $ctx->stash($key); 
    198     if (!isset($object)) { 
    199         return ''; 
    200     } 
    201     return score_avg($ctx, $object[$datasource . '_id'], $datasource, $namespace); 
    202 } 
    203  
    204 function hdlr_score_count($ctx, $datasource, $namespace) { 
    205     if (!isset($namespace)) { 
    206         return ''; 
    207     } 
    208     if ($datasource == 'tbping') { 
    209         $key = 'ping'; 
    210     } else { 
    211         $key = $datasource; 
    212     } 
    213     $object = $ctx->stash($key); 
    214     if (!isset($object)) { 
    215         return ''; 
    216     } 
    217     return score_count($ctx, $object[$datasource . '_id'], $datasource, $namespace); 
    218 } 
    219  
    220 function hdlr_rank($ctx, $datasource, $namespace, $max, $filter) { 
     190function hdlr_score_avg($ctx, $datasource, $namespace, $args = null) { 
     191    if (!isset($namespace)) { 
     192        return ''; 
     193    } 
     194    if ($datasource == 'tbping') { 
     195        $key = 'ping'; 
     196    } else { 
     197        $key = $datasource; 
     198    } 
     199    $object = $ctx->stash($key); 
     200    if (!isset($object)) { 
     201        return ''; 
     202    } 
     203    $avg = score_avg($ctx, $object[$datasource . '_id'], $datasource, $namespace); 
     204    if ( $avg )  
     205        return $ctx->count_format($avg, $args); 
     206    return $avg; 
     207} 
     208 
     209function hdlr_score_count($ctx, $datasource, $namespace, $args = null) { 
     210    if (!isset($namespace)) { 
     211        return ''; 
     212    } 
     213    if ($datasource == 'tbping') { 
     214        $key = 'ping'; 
     215    } else { 
     216        $key = $datasource; 
     217    } 
     218    $object = $ctx->stash($key); 
     219    if (!isset($object)) { 
     220        return ''; 
     221    } 
     222    $count = score_count($ctx, $object[$datasource . '_id'], $datasource, $namespace); 
     223    if ( $count )  
     224        return $ctx->count_format($count, $args); 
     225    return $count; 
     226} 
     227 
     228function hdlr_rank($ctx, $datasource, $namespace, $max, $filter, $args = null) { 
    221229    if (!isset($namespace)) { 
    222230        return '';