Changeset 86

Show
Ignore:
Timestamp:
04/11/09 23:49:39 (1 year ago)
Author:
nperriault
Message:

totally dropped lucene integration, too many bugs and limitation since the very beginning

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • branches/1.0/apps/main/config/filters.yml

    r2 r86  
    1919  class:    conditionalCacheFilter 
    2020 
    21 highlight: 
    22   class:    sfLuceneHighlightFilter 
    23  
    2421cache:     ~ 
    2522 

  • branches/1.0/apps/main/config/routing.yml

    r85 r86  
    99  param: { module: utils, action: i18nRelocate } 
    1010 
    11 # Search 
    12 search_advanced: 
    13   url:   /search/advanced 
    14   param: { module: sfLucene, action: advancedSearch } 
    15  
    1611# Blog 
    1712blog_admin: 

  • branches/1.0/apps/main/config/settings.yml

    r80 r86  
    1010    error_reporting:        4095 
    1111    web_debug:              on 
    12     cache:                  off 
    13     no_script_name:         off 
    14     etag:                   off 
    15     timeout:                86400 
    16  
    17 search: 
    18   .settings: 
    19     # E_ALL | E_STRICT = 4095 
    20     error_reporting:        4095 
    21     web_debug:              off 
    2212    cache:                  off 
    2313    no_script_name:         off 
    …… 
    111101# 
    112102#    # Activated modules from plugins or from the symfony core 
    113     enabled_modules:        [cryptographp, sfGuardAuth, sfLucene] 
     103    enabled_modules:        [cryptographp, sfGuardAuth] 
    114104# 
    115105#    # Charset used for the response 

  • branches/1.0/apps/main/templates/_menu.php

    r2 r86  
    3333</ul> 
    3434 
    35 <?php echo form_tag('sfLucene/search', 'method=get class=search-controls id=search') ?> 
    36   <?php echo input_tag('query', $sf_params->get('query'), 'accesskey=q') ?> 
    37   <?php // if (has_search_categories()): ?> 
    38     <?php // include_search_categories() ?> 
    39   <?php //endif ?> 
     35<!-- 
     36<form action="" method="get"> 
     37  <?php echo input_tag('q', null, 'accesskey=q') ?> 
    4038  <?php echo submit_tag(__('Search'), 'accesskey=s') ?> 
    41   <?php if (sfConfig::get('app_lucene_advanced', true)): ?> 
    42     <?php echo submit_tag(__('Advanced'), 'accesskey=a') ?> 
    43   <?php endif ?> 
    44 <?php echo end_form() ?> 
     39</form> 
     40--> 
    4541 
    4642<div style="clear:both"></div> 

  • branches/1.0/lib/model/Application.php

    r2 r86  
    302302                                  'permanent' => true), 
    303303                            'sfPropelActAsTaggableBehavior')); 
    304  
    305 sfLucenePropelBehavior::getInitializer()->setupModel('Application'); 

  • branches/1.0/lib/model/BlogPost.php

    r2 r86  
    4848                                  'permanent' => true), 
    4949                            'sfPropelActAsTaggableBehavior')); 
    50  
    51 sfLucenePropelBehavior::getInitializer()->setupModel('BlogPost'); 

  • branches/1.0/lib/model/Company.php

    r2 r86  
    250250                            'sfPropelActAsLocalizableBehavior' => 
    251251                              array('location_getter' => 'getFullAddress'))); 
    252  
    253 sfLucenePropelBehavior::getInitializer()->setupModel('Company'); 

  • branches/1.0/lib/model/Job.php

    r2 r86  
    147147                            'sfPropelActAsLocalizableBehavior' =>  
    148148                              array('location_getter' => 'getPlace'))); 
    149  
    150 sfLucenePropelBehavior::getInitializer()->setupModel('Job'); 

  • branches/1.0/lib/model/PluginsfGuardUser.php

    r80 r86  
    850850                            array('location_getter' => 'getPlace'), 
    851851                            'sfPropelActAsTaggableBehavior')); 
    852  
    853 sfLucenePropelBehavior::getInitializer()->setupModel('sfGuardUser'); 

  • branches/1.0/test/unit/KarmaTest.php

    r2 r86  
    1818$karma = $niko->getKarma(); 
    1919$t->diag(sprintf('Actual karma is %d', $karma)); 
    20  
    21 sfLucenePropelBehavior::setLock(true); 
    2220 
    2321$job1 = new Job(); 
    …… 
    5351$karma -= sfConfig::get('app_karma_companies_submitted'); 
    5452$t->is($niko->getKarma(), $karma, 'Deleting a company decrease karma correctly'); 
    55  
    56 sfLucenePropelBehavior::setLock(false);