Menu
▾
▴
Re: [Tikiwiki-cvs/svn] SF.net SVN: tikiwiki:[40866] branches/9.x
|
From: Marc L. <ma...@ma...> - 2012-04-16 22:44:36
|
source vs rendered: but rendered for whom? current user? On 2012-04-12 11:43 AM, "Robert Plummer" <rob...@gm...> wrote: > > Just checked, works great. However it seems that some pages are executed and others are not, I'm having trouble with the group plugin particularly. Shouldn't the source be searched but the rendered page be displayed? > > On Wed, Apr 11, 2012 at 11:39 PM, Robert Plummer <rob...@gm...> wrote: >> >> I did a few searches, it worked. In fact I had integrated lucene in the past in c# and it only took a few seconds for small indexes, so I wondered why 3 pages and a tracker with 1 item would take so long. Now it works like I thought it should. I will double check in the morning. >> >> On Apr 11, 2012 4:50 PM, "Marc Laporte" <ma...@ma...> wrote: >>> >>> Makes you wonder if it worked! :-) >>> >>> On 2012-04-11 10:08 AM, "Robert Plummer" <rob...@gm...> wrote: >>>> >>>> I'm not sure why, but before rebuilding indexes on my site took about 1 to 3 min. Now it takes just a few seconds, I wonder why..... >>>> >>>> On Apr 10, 2012 9:42 PM, "Marc Laporte" <ma...@ma...> wrote: >>>>> >>>>> awesome! >>>>> >>>>> I hope doc.tiki.org and dev.tiki.org can complete index rebuilding with these new preferences! >>>>> >>>>> On 2012-04-10 5:37 PM, <rob...@us...> wrote: >>>>>> >>>>>> Revision: 40866 >>>>>> http://tikiwiki.svn.sourceforge.net/tikiwiki/?rev=40866&view=rev >>>>>> Author: robertplummer >>>>>> Date: 2012-04-10 21:36:38 +0000 (Tue, 10 Apr 2012) >>>>>> Log Message: >>>>>> ----------- >>>>>> [NEW] Some much needed prefs for lucene search to help make it more controllable, from jonnyb >>>>>> >>>>>> Modified Paths: >>>>>> -------------- >>>>>> branches/9.x/lib/core/Search/Index/Lucene.php >>>>>> branches/9.x/lib/prefs/unified.php >>>>>> branches/9.x/templates/admin/include_search.tpl >>>>>> >>>>>> Modified: branches/9.x/lib/core/Search/Index/Lucene.php >>>>>> =================================================================== >>>>>> --- branches/9.x/lib/core/Search/Index/Lucene.php 2012-04-10 21:26:17 UTC (rev 40865) >>>>>> +++ branches/9.x/lib/core/Search/Index/Lucene.php 2012-04-10 21:36:38 UTC (rev 40866) >>>>>> @@ -40,10 +40,16 @@ >>>>>> } catch (Zend_Search_Lucene_Exception $e) { >>>>>> $this->lucene = Zend_Search_Lucene::create($this->directory); >>>>>> } >>>>>> - >>>>>> - $this->lucene->setMaxBufferedDocs(100); >>>>>> - $this->lucene->setMaxMergeDocs(5000); >>>>>> - $this->lucene->setMergeFactor(50); >>>>>> + global $prefs; >>>>>> + if (!empty($prefs['unified_lucene_max_buffered_docs'])) { // these break indexing if set empty >>>>>> + $this->lucene->setMaxBufferedDocs($prefs['unified_lucene_max_buffered_docs']); // default is 10 >>>>>> + } >>>>>> + if (!empty($prefs['unified_lucene_max_merge_docs'])) { >>>>>> + $this->lucene->setMaxMergeDocs($prefs['unified_lucene_max_merge_docs']); // default is PHP_INT_MAX (effectively "infinite") >>>>>> + } >>>>>> + if (!empty($prefs['unified_lucene_merge_factor'])) { >>>>>> + $this->lucene->setMergeFactor($prefs['unified_lucene_merge_factor']); // default is 10 >>>>>> + } >>>>>> $this->lucene->setResultSetLimit($this->resultSetLimit); >>>>>> >>>>>> return $this->lucene; >>>>>> >>>>>> Modified: branches/9.x/lib/prefs/unified.php >>>>>> =================================================================== >>>>>> --- branches/9.x/lib/prefs/unified.php 2012-04-10 21:26:17 UTC (rev 40865) >>>>>> +++ branches/9.x/lib/prefs/unified.php 2012-04-10 21:36:38 UTC (rev 40866) >>>>>> @@ -40,8 +40,8 @@ >>>>>> ), >>>>>> 'unified_lucene_max_resultset_limit' => array( >>>>>> 'name' => tra('Lucene Maximum Result Set Limit'), >>>>>> - 'description' => tra('Maximum size of result set to consider. Default 1000, 0 = unlimited.'), >>>>>> - 'hint' => tra('This is used when calculating result scores and sort order which can lead to out of memory errors on large data sets. The default of 1000 is safe with the PHP memory_limit set to 128M'), >>>>>> + 'hint' => tra('Maximum size of result set to consider. Default 1000, 0 = unlimited.'), >>>>>> + 'description' => tra('This is used when calculating result scores and sort order which can lead to out of memory errors on large data sets. The default of 1000 is safe with the PHP memory_limit set to 128M'), >>>>>> 'type' => 'text', >>>>>> 'filter' => 'int', >>>>>> 'default' => 1000, >>>>>> @@ -55,6 +55,33 @@ >>>>>> 'default' => 1024, >>>>>> 'size' => 6, >>>>>> ), >>>>>> + 'unified_lucene_max_buffered_docs' => array( >>>>>> + 'name' => tra('Lucene Max Buffered Documents'), >>>>>> + 'description' => tra('Number of documents required before the buffered in-memory documents are written into a new segment.'), >>>>>> + 'hint' => tra(''), >>>>>> + 'type' => 'text', >>>>>> + 'filter' => 'int', >>>>>> + 'default' => 10, >>>>>> + 'size' => 6, >>>>>> + ), >>>>>> + 'unified_lucene_max_merge_docs' => array( >>>>>> + 'name' => tra('Lucene Max Merge Documents'), >>>>>> + 'description' => tra('Largest number of documents ever merged by addDocument(). Small values (e.g., less than 10,000) are best for interactive indexing, as this limits the length of pauses while indexing to a few seconds. Larger values are best for batched indexing and speedier searches.'), >>>>>> + 'hint' => tra('Small values (e.g., less than 10,000) are best for interactive indexing. Use 0 for the Lucene default, which is practically infinite.'), >>>>>> + 'type' => 'text', >>>>>> + 'filter' => 'int', >>>>>> + 'default' => 0, >>>>>> + 'size' => 8, >>>>>> + ), >>>>>> + 'unified_lucene_merge_factor' => array( >>>>>> + 'name' => tra('Lucene Merge Factor'), >>>>>> + 'description' => tra('How often segment indices are merged by addDocument(). With smaller values, less RAM is used while indexing, and searches on unoptimized indices are faster, but indexing speed is slower. With larger values, more RAM is used during indexing, and while searches on unoptimized indices are slower, indexing is faster. Thus larger values (> 10) are best for batch index creation, and smaller values (< 10) for indices that are interactively maintained.'), >>>>>> + 'hint' => tra('Large values (> 10) are best for batch index creation, and smaller values (< 10) for indices that are interactively maintained.'), >>>>>> + 'type' => 'text', >>>>>> + 'filter' => 'int', >>>>>> + 'default' => 10, >>>>>> + 'size' => 6, >>>>>> + ), >>>>>> 'unified_incremental_update' => array( >>>>>> 'name' => tra('Incremental Index Update'), >>>>>> 'description' => tra('Update the index incrementally as the site content is modified. This may lead to lower performance and accuracy than processing the index on a periodic basis.'), >>>>>> >>>>>> Modified: branches/9.x/templates/admin/include_search.tpl >>>>>> =================================================================== >>>>>> --- branches/9.x/templates/admin/include_search.tpl 2012-04-10 21:26:17 UTC (rev 40865) >>>>>> +++ branches/9.x/templates/admin/include_search.tpl 2012-04-10 21:36:38 UTC (rev 40866) >>>>>> @@ -22,14 +22,20 @@ >>>>>> >>>>>> {preference name=feature_search visible="always"} >>>>>> <div class="adminoptionboxchild" id="feature_search_childcontainer"> >>>>>> - {preference name="unified_incremental_update"} >>>>>> {preference name="unified_engine"} >>>>>> <div class="adminoptionboxchild unified_engine_childcontainer lucene"> >>>>>> + {preference name="unified_incremental_update"} >>>>>> + {preference name="unified_lucene_highlight"} >>>>>> {preference name="unified_lucene_location"} >>>>>> - {preference name="unified_lucene_highlight"} >>>>>> - {preference name="unified_lucene_max_result"} >>>>>> - {preference name="unified_lucene_max_resultset_limit"} >>>>>> - {preference name="unified_lucene_terms_limit"} >>>>>> + <fieldset> >>>>>> + <legend>{tr}Search Engine Settings{/tr}</legend> >>>>>> + {preference name="unified_lucene_max_result"} >>>>>> + {preference name="unified_lucene_max_resultset_limit"} >>>>>> + {preference name="unified_lucene_terms_limit"} >>>>>> + {preference name="unified_lucene_max_buffered_docs"} >>>>>> + {preference name="unified_lucene_max_merge_docs"} >>>>>> + {preference name="unified_lucene_merge_factor"} >>>>>> + </fieldset> >>>>>> </div> >>>>>> >>>>>> {preference name=unified_forum_deepindexing} >>>>>> @@ -48,7 +54,19 @@ >>>>>> <ul> >>>>>> <li><a href="tiki-admin.php?page=search&optimize=now">{tr}Optimize{/tr}</a></li> >>>>>> <li> >>>>>> - <a href="tiki-admin.php?page=search&rebuild=now">{tr}Rebuild Index{/tr}</a> >>>>>> + <a href="tiki-admin.php?page=search&rebuild=now" id="rebuild-link">{tr}Rebuild Index{/tr}</a><br /> >>>>>> + <label for="log-rebuild">{tr}Log rebuild?{/tr}</label> >>>>>> + <input type="checkbox" id="log-rebuild" /> >>>>>> + <span class="description">{tr}Log file is saved as temp/Search_Indexer.log{/tr}</span> >>>>>> + {jq} >>>>>> +$("#log-rebuild").click(function(){ >>>>>> + if ($(this).prop("checked")) { >>>>>> + $("#rebuild-link").attr("href", $("#rebuild-link").attr("href") + "&loggit"); >>>>>> + } else { >>>>>> + $("#rebuild-link").attr("href", $("#rebuild-link").attr("href").replace("&loggit","")); >>>>>> + } >>>>>> +}); >>>>>> + {/jq} >>>>>> {if !empty($stat)} >>>>>> {remarksbox type='feedback' title="{tr}Indexation{/tr}"} >>>>>> <ul> >>>>>> >>>>>> This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. >>>>>> >>>>>> >>>>>> ------------------------------------------------------------------------------ >>>>>> Better than sec? Nothing is better than sec when it comes to >>>>>> monitoring Big Data applications. Try Boundary one-second >>>>>> resolution app monitoring today. Free. >>>>>> http://p.sf.net/sfu/Boundary-dev2dev >>>>>> _______________________________________________ >>>>>> Tikiwiki-cvs mailing list >>>>>> Tik...@li... >>>>>> https://lists.sourceforge.net/lists/listinfo/tikiwiki-cvs >>>>> >>>>> >>>>> ------------------------------------------------------------------------------ >>>>> Better than sec? Nothing is better than sec when it comes to >>>>> monitoring Big Data applications. Try Boundary one-second >>>>> resolution app monitoring today. Free. >>>>> http://p.sf.net/sfu/Boundary-dev2dev >>>>> _______________________________________________ >>>>> Tikiwiki-cvs mailing list >>>>> Tik...@li... >>>>> https://lists.sourceforge.net/lists/listinfo/tikiwiki-cvs >>>>> >>>> >>>> ------------------------------------------------------------------------------ >>>> Better than sec? Nothing is better than sec when it comes to >>>> monitoring Big Data applications. Try Boundary one-second >>>> resolution app monitoring today. Free. >>>> http://p.sf.net/sfu/Boundary-dev2dev >>>> _______________________________________________ >>>> Tikiwiki-cvs mailing list >>>> Tik...@li... >>>> https://lists.sourceforge.net/lists/listinfo/tikiwiki-cvs >>>> >>> >>> ------------------------------------------------------------------------------ >>> Better than sec? Nothing is better than sec when it comes to >>> monitoring Big Data applications. Try Boundary one-second >>> resolution app monitoring today. Free. >>> http://p.sf.net/sfu/Boundary-dev2dev >>> _______________________________________________ >>> Tikiwiki-cvs mailing list >>> Tik...@li... >>> https://lists.sourceforge.net/lists/listinfo/tikiwiki-cvs >>> > > > > -- > Robert Plummer > > ------------------------------------------------------------------------------ > For Developers, A Lot Can Happen In A Second. > Boundary is the first to Know...and Tell You. > Monitor Your Applications in Ultra-Fine Resolution. Try it FREE! > http://p.sf.net/sfu/Boundary-d2dvs2 > _______________________________________________ > Tikiwiki-cvs mailing list > Tik...@li... > https://lists.sourceforge.net/lists/listinfo/tikiwiki-cvs > |