• R/O
  • SSH
  • HTTPS

tritonn: Commit


Commit MetaInfo

Revision182 (tree)
Time2010-06-30 16:28:35
Authormyuka

Log Message

modified the senna_score_sort variables

  • using the senn_score_sort both boolean mode and not boolean mode

Change Summary

Incremental Difference

--- tags/tritonn-1.0.12-mysql-5.0.83/myisam/ft_boolean_search.c (revision 181)
+++ tags/tritonn-1.0.12-mysql-5.0.83/myisam/ft_boolean_search.c (revision 182)
@@ -439,14 +439,13 @@
439439 ftb->sir = sen_records_open(sen_rec_document, sen_rec_none, 0);
440440 SEN_LOG(sen_log_info, "ft_init_boolean_search => sen_query_exec: i=%p, q=%p, r=%p", i, q, ftb->sir);
441441 sen_query_exec(i, q, ftb->sir, sen_sel_or);
442-/* yuka wrote 100324 */
443- SEN_LOG(sen_log_info, "ft_init_boolean_search => sen_records_sort");
444- if ( *(my_thread_var->sen_sort_flags) == 1) {
445- SEN_LOG(sen_log_info, "!!!!!!!!!!!!!!!!!!!!senna_score_sort !!!!!!!!!!!!!!!!!!!!");
446- sen_records_sort(ftb->sir,0,NULL);
442+/* yuka wrote 100324 */
443+ SEN_LOG(sen_log_info, "ft_init_boolean_search => my_thread_var->sen_sort_flags=%d",*my_thread_var->sen_sort_flags);
444+ //SEN_LOG(sen_log_info, "ft_init_boolean_search => SENNA_SCORE_SORT=%d", SENNA_SCORE_SORT);
445+ if ( *(my_thread_var->sen_sort_flags) == 1) {
446+ SEN_LOG(sen_log_info, "ft_init_boolean_search => sen_records_sort");
447+ sen_records_sort(ftb->sir,0,NULL);
447448 }
448- SEN_LOG(sen_log_info, "ft_init_boolean_search => my_thread_var->sen_sort_flags=%d",*my_thread_var->sen_sort_flags);
449- SEN_LOG(sen_log_info, "ft_init_boolean_search => SENNA_SCORE_SORT=%d", SENNA_SCORE_SORT);
450449 /* end yuka wrote 100324 */
451450 SEN_LOG(sen_log_debug, "ft_init_boolean_search => sen_query_close: q=%p", q);
452451 sen_query_close(q);
--- tags/tritonn-1.0.12-mysql-5.0.83/myisam/ft_nlq_search.c (revision 181)
+++ tags/tritonn-1.0.12-mysql-5.0.83/myisam/ft_nlq_search.c (revision 182)
@@ -437,6 +437,14 @@
437437 SEN_LOG(sen_log_debug, "ft_nlq_reinit_search => sen_records_rewind: r=%p",
438438 handler->sir);
439439 sen_records_rewind(handler->sir);
440+ /* yuka wrote 100630 */
441+ SEN_LOG(sen_log_info, "ft_nlq_reinit_search => my_thread_var->sen_sort_flags=%d",*my_thread_var->sen_sort_flags);
442+ //SEN_LOG(sen_log_info, "ft_nlq_reinit_search => SENNA_SCORE_SORT=%d", SENNA_SCORE_SORT);
443+ if ( *(my_thread_var->sen_sort_flags) == 1) {
444+ SEN_LOG(sen_log_info, "ft_nlq_reinit_search => sen_records_sort");
445+ sen_records_sort(handler->sir,0,NULL);
446+ }
447+ /* end yuka wrote 100630 */
440448 }
441449 #endif /* ENABLE_SENNA */
442450 handler->curdoc=-1;
Show on old repository browser