Changeset trunk,183

Show
Ignore:
Timestamp:
02/12/10 17:58:47 (6 months ago)
Author:
Suren A. Chilingaryan <csa@dside.dyndns.org>
revision id:
csa@dside.dyndns.org-20100212175847-011ijrhjalukrack
branch-nick:
adei
Message:

Info service

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved
  • trunk/classes/cache/cachedb.php

    r157 r183  
    126126    } else { 
    127127        if ($postfix) { 
    128             throw new ADEIException(translate("Unsupported postfix is specified: %s", $string)); 
     128            throw new ADEIException(translate("Unsupported postfix (%s) is supplied", $postfix)); 
    129129        } else { 
    130130            throw new ADEIException(translate("Postfix should be specified")); 
     
    193193    $supported = $info['supported']; 
    194194     
    195  
    196195    if ($flags&CACHE::NEED_REQUESTS) { 
    197196            if ($supported) { 
     
    238237    } 
    239238 
    240     if (($flags&CACHEDB::TABLE_INFO)&&($supported)) { 
    241             $info['info'] = $this->GetCacheInfo($postfix); 
     239    if (($flags&CACHEDB::TABLE_INFO)&&($supported)&&($cache_info=$this->GetCacheInfo($postfix))) { 
     240            $info['info'] = $cache_info; 
     241             
    242242            if (is_array($postfix_or_row)) { 
    243243                $info['info']['records'] = $postfix_or_row[4]; 
     
    276276                } else { 
    277277                    $info['info']['tables'] = array( 
    278                         0 => &$info['info'] 
     278                        0 => $info['info'] 
    279279                    ); 
    280280                } 
  • trunk/classes/request.php

    r175 r183  
    120120 const ENCODING_JSON = 2; 
    121121 const ENCODING_LABVIEW = 3; 
     122 const ENCODING_TEXT = 4; 
    122123 
    123124 function __construct(&$props = NULL) { 
     
    157158        case "json": 
    158159            return BASICRequest::ENCODING_JSON; 
     160        case "text": 
     161            return BASICRequest::ENCODING_TEXT; 
    159162        default: 
    160163            if ($default === false)  
  • trunk/config.actual.php

    r178 r183  
    99    ); 
    1010 
    11     $ADEI_SETUP = "test"; 
    12 //    $ADEI_SETUP = "all"; 
     11//    $ADEI_SETUP = "test"; 
     12    $ADEI_SETUP = "all"; 
    1313    $DEFAULT_MODULE = "wiki"; 
    1414 
  • trunk/release

    r178 r183  
    4343    make -C apps/csv2root clean 
    4444    make -C apps/mod_root2 clean 
     45     
     46    rm -rf *.diff 
     47     
    4548    rm -rf tmp/* 
    4649    rm -rf test/tmp/*