Branch: Tag:

2004-08-07

2004-08-07 15:27:00 by Johan Schön <js@opera.com>

Merge from external js/per/nilsson fork

Rev: lib/modules/Search.pmod/Database.pmod/Base.pike:1.5
Rev: lib/modules/Search.pmod/Database.pmod/Base.pmod:1.20(DEAD)
Rev: lib/modules/Search.pmod/Database.pmod/MySQL.pike:1.77
Rev: lib/modules/Search.pmod/Filter.pmod/Base.pike:1.16
Rev: lib/modules/Search.pmod/Filter.pmod/HTML.pmod:1.37
Rev: lib/modules/Search.pmod/Filter.pmod/Output.pike:1.1
Rev: lib/modules/Search.pmod/Filter.pmod/PDF.pmod:1.16
Rev: lib/modules/Search.pmod/Filter.pmod/PlainText.pmod:1.9
Rev: lib/modules/Search.pmod/Filter.pmod/Word.pmod:1.12
Rev: lib/modules/Search.pmod/Grammar.pmod/AbstractParser.pike:1.7
Rev: lib/modules/Search.pmod/Grammar.pmod/DefaultParser.pike:1.11
Rev: lib/modules/Search.pmod/Grammar.pmod/Lexer.pmod:1.7
Rev: lib/modules/Search.pmod/Grammar.pmod/module.pmod:1.12
Rev: lib/modules/Search.pmod/Indexer.pmod:1.17
Rev: lib/modules/Search.pmod/MergeFile.pike:1.1
Rev: lib/modules/Search.pmod/Process.pmod:1.12
Rev: lib/modules/Search.pmod/Query.pmod:1.26
Rev: src/modules/_WhiteFish/Makefile.in:1.7
Rev: src/modules/_WhiteFish/blob.c:1.34
Rev: src/modules/_WhiteFish/blobs.c:1.12
Rev: src/modules/_WhiteFish/buffer.c:1.13
Rev: src/modules/_WhiteFish/linkfarm.c:1.5
Rev: src/modules/_WhiteFish/resultset.c:1.24
Rev: src/modules/_WhiteFish/resultset.h:1.9
Rev: src/modules/_WhiteFish/whitefish.c:1.35

3:   #include "global.h"   #include "stralloc.h"   #include "global.h" - RCSID("$Id: whitefish.c,v 1.34 2003/02/18 10:35:38 mast Exp $"); + RCSID("$Id: whitefish.c,v 1.35 2004/08/07 15:26:57 js Exp $");   #include "pike_macros.h"   #include "interpret.h"   #include "program.h" - #include "program_id.h" +    #include "object.h" - #include "operators.h" +    #include "array.h"   #include "module_support.h"   #include "module.h"
384:    return res;   }    + /*! @module Search +  */      static void f_do_query_phrase( INT32 args )   /*! @decl ResultSet do_query_phrase( array(string) words, @    *! array(int) field_coefficients, @    *! function(int:string) blobfeeder) -  *! @[words] +  *! @param words    *! -  *! Arrays of word ids. Note that the order is significant -  *! for the ranking. +  *! Arrays of word ids. Note that the order is significant for the +  *! ranking.    *! -  *! @[field_coefficients] +  *! @param field_coefficients    *! -  *! An array of ranking coefficients for the different fields. -  *! In the range of [0x0000-0xffff]. The array (always) has 65 -  *! elements: +  *! An array of ranking coefficients for the different fields. In the +  *! range of [0x0000-0xffff]. The array (always) has 65 elements:    *! -  *! Index Coefficient for field -  *! ----- --------------------- -  *! 0 body -  *! 1..64 Special field 0..63 +  *! @array +  *! @elem int 0 +  *! body +  *! @elem int 1..64 +  *! Special field 0..63. +  *! @endarray    *! -  *! @[blobfeeder] +  *! @param blobfeeder    *! -  *! This function returns a Pike string containing the word hits -  *! for a certain word_id. Call repeatedly until it returns 0. +  *! This function returns a Pike string containing the word hits for a +  *! certain word_id. Call repeatedly until it returns @expr{0@}.    */   {    double proximity_coefficients[8];
454:    *! array(int) field_coefficients, @    *! array(int) proximity_coefficients, @    *! function(int:string) blobfeeder) -  *! @[words] +  *! @param words    *! -  *! Arrays of word ids. Note that the order is significant -  *! for the ranking. +  *! Arrays of word ids. Note that the order is significant for the +  *! ranking.    *! -  *! @[field_coefficients] +  *! @param field_coefficients    *! -  *! An array of ranking coefficients for the different fields. -  *! In the range of [0x0000-0xffff]. The array (always) has 65 -  *! elements: +  *! An array of ranking coefficients for the different fields. In the +  *! range of [0x0000-0xffff]. The array (always) has 65 elements:    *! -  *! Index Coefficient for field -  *! ----- --------------------- -  *! 0 body -  *! 1..64 Special field 0..63 +  *! @array +  *! @elem int 0 +  *! body +  *! @elem int 1..64 +  *! Special field 0..63. +  *! @endarray    *! -  *! @[proximity_coefficients] +  *! @param proximity_coefficients    *! -  *! An array of ranking coefficients for the different -  *! proximity categories. Always has 8 elements, in the range -  *! of [0x0000-0xffff]. +  *! An array of ranking coefficients for the different proximity +  *! categories. Always has 8 elements, in the range of +  *! [0x0000-0xffff].    *! -  *! Index Meaning -  *! ----- ------- -  *! 0 spread: 0 (Perfect hit) -  *! 1 spread: 1-5 -  *! 2 spread: 6-10 -  *! 3 spread: 11-20 -  *! 4 spread: 21-40 -  *! 5 spread: 41-80 -  *! 6 spread: 81-160 -  *! 7 spread: 161- +  *! @array +  *! @elem int 0 +  *! spread: 0 (Perfect hit) +  *! @elem int 1 +  *! spread: 1-5 +  *! @elem int 2 +  *! spread: 6-10 +  *! @elem int 3 +  *! spread: 11-20 +  *! @elem int 4 +  *! spread: 21-40 +  *! @elem int 5 +  *! spread: 41-80 +  *! @elem int 6 +  *! spread: 81-160 +  *! @elem int 7 +  *! spread: 161- +  *! @endarray    *! -  *! The 'spread' value should be defined somehow. +  *! @param blobfeeder    *! -  *! @[blobfeeder] -  *! -  *! This function returns a Pike string containing the word hits -  *! for a certain word_id. Call repeatedly until it returns 0. +  *! This function returns a Pike string containing the word hits for a +  *! certain word_id. Call repeatedly until it returns @expr{0@}.    */   {    double proximity_coefficients[8];
547:    *! array(int) field_coefficients, @    *! array(int) proximity_coefficients, @    *! function(int:string) blobfeeder) -  *! @[words] +  *! @param words    *! -  *! Arrays of word ids. Note that the order is significant -  *! for the ranking. +  *! Arrays of word ids. Note that the order is significant for the +  *! ranking.    *! -  *! @[field_coefficients] +  *! @param field_coefficients    *! -  *! An array of ranking coefficients for the different fields. -  *! In the range of [0x0000-0xffff]. The array (always) has 65 -  *! elements: +  *! An array of ranking coefficients for the different fields. In the +  *! range of [0x0000-0xffff]. The array (always) has 65 elements:    *! -  *! Index Coefficient for field -  *! ----- --------------------- -  *! 0 body -  *! 1..64 Special field 0..63 +  *! @array +  *! @elem int 0 +  *! body +  *! @elem int 1..64 +  *! Special field 0..63. +  *! @endarray    *! -  *! @[proximity_coefficients] +  *! @param proximity_coefficients    *! -  *! An array of ranking coefficients for the different -  *! proximity categories. Always has 8 elements, in the range -  *! of [0x0000-0xffff]. +  *! An array of ranking coefficients for the different proximity +  *! categories. Always has 8 elements, in the range of +  *! [0x0000-0xffff].    *! -  *! Index Meaning -  *! ----- ------- -  *! 0 spread: 0 (Perfect hit) -  *! 1 spread: 1-5 -  *! 2 spread: 6-10 -  *! 3 spread: 11-20 -  *! 4 spread: 21-40 -  *! 5 spread: 41-80 -  *! 6 spread: 81-160 -  *! 7 spread: 161- +  *! @array +  *! @elem int 0 +  *! spread: 0 (Perfect hit) +  *! @elem int 1 +  *! spread: 1-5 +  *! @elem int 2 +  *! spread: 6-10 +  *! @elem int 3 +  *! spread: 11-20 +  *! @elem int 4 +  *! spread: 21-40 +  *! @elem int 5 +  *! spread: 41-80 +  *! @elem int 6 +  *! spread: 81-160 +  *! @elem int 7 +  *! spread: 161- +  *! @endarray    *! -  *! The 'spread' value should be defined somehow. +  *! @param blobfeeder    *! -  *! @[blobfeeder] -  *! -  *! This function returns a Pike string containing the word hits -  *! for a certain word_id. Call repeatedly until it returns 0. +  *! This function returns a Pike string containing the word hits for a +  *! certain word_id. Call repeatedly until it returns @expr{0@}.    */   {    double proximity_coefficients[8];
634:    wf_resultset_push( res );   }    + /*! @endmodule +  */    -  +    PIKE_MODULE_INIT   {    init_resultset_program();