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

1:   // This file is part of Roxen Search   // Copyright © 2001 Roxen IS. All rights reserved.   // - // $Id: Word.pmod,v 1.11 2003/03/19 10:53:26 jonasw Exp $ + // $Id: Word.pmod,v 1.12 2004/08/07 15:27:00 js Exp $    - inherit Search.Filter.HTML; + inherit .HTML;      constant contenttypes = ({ "application/msword", "application/vnd.ms-word" });   constant fields = ({ "body", "title", "keywords"});    - Output filter(Standards.URI uri, string|Stdio.File data, string content_type) + .Output filter(Standards.URI uri, string|Stdio.File data, string content_type)   { -  Output res=Output(); +  .Output res=.Output();       if(objectp(data))    data=data->read();
41:       return ::filter(uri, text, "text/html", ([]), "utf-8");   } -  - string _sprintf() - { -  return "Search.Filter.Word"; - } +