developer.intra2net.com Git - mnogosearch-rpm/blob - mnogosearch-distconfig.patch

   1 diff -r -u mnogosearch-3.3.11.orig/etc/indexer.conf-dist mnogosearch-3.3.11/etc/indexer.conf-dist
   2 --- mnogosearch-3.3.11.orig/etc/indexer.conf-dist       2011-01-31 14:02:07.000000000 +0100
   3 +++ mnogosearch-3.3.11/etc/indexer.conf-dist    2011-02-01 10:33:30.000000000 +0100
   4 @@ -1,4 +1,4 @@
   5 -#!/usr/local/mnogosearch/sbin/indexer -d
   6 +#!/usr/bin/indexer -d
   7
   8  ###########################################################################
   9  # This is a sample indexer config file.
  10 @@ -49,7 +49,7 @@
  11  # then PostgreSQL will not work via TCP, but will use Unix socket.
  12  #
  13
  14 -DBAddr mysql://root@localhost/test/?dbmode=blob
  15 +DBAddr sqlite3://localhost/var/lib/mnogosearch/default.db/?dbmode=blob
  16
  17
  18
  19 @@ -139,7 +139,7 @@
  20  #LocalCharset Shift-JIS
  21
  22  # Full UNICODE
  23 -#LocalCharset UTF-8
  24 +LocalCharset UTF-8
  25
  26  #######################################################################
  27  #ForceIISCharset1251 yes/no
  28 @@ -180,7 +180,7 @@
  29  #
  30  #LangMapFile langmap/en.ascii.lm
  31
  32 -#Include langmap.conf
  33 +Include langmap.conf
  34
  35
  36  #######################################################################
  37 @@ -310,11 +310,11 @@
  38
  39  # Disallow document extensions that are not understood by default.
  40  # Comment these lines if you have corresponding external parsers.
  41 -Disallow *.rtf
  42 -Disallow *.doc
  43 -Disallow *.xls
  44 -Disallow *.ppt
  45 -Disallow *.pdf
  46 +#Disallow *.rtf
  47 +#Disallow *.doc
  48 +#Disallow *.xls
  49 +#Disallow *.ppt
  50 +#Disallow *.pdf
  51
  52  # Exclude some known extensions using fast "String" match:
  53  Disallow *.b    *.sh   *.md5  *.rpm
  54 @@ -531,16 +531,16 @@
  55  #       from_mime                to_mime[charset]             [command line [$1]]
  56  #
  57  #Mime application/msword      "text/plain; charset=utf-8" "catdoc -a -dutf-8 $1"
  58 -#Mime application/msword      "text/html; charset=utf-8"  "wvHtml --charset=utf-8 $1 -"
  59 +Mime application/msword       "text/html; charset=utf-8"  "wvHtml --charset=utf-8 $1 -"
  60  #Mime application/x-troff-man  text/plain                 "deroff"
  61  #Mime text/x-postscript        text/plain                 "ps2ascii"
  62 -#Mime application/pdf          text/plain                 "pdftotext $1 -"
  63 +Mime application/pdf           text/html                  "pdftohtml -noframes -enc UTF-8 -i -stdout $1"
  64  #Mime application/vnd.ms-excel text/plain                 "xls2csv $1"
  65 -#Mime application/vnd.ms-excel text/html                  "xlhtml $1"
  66 +Mime application/vnd.ms-excel "text/html; charset=utf-8"  "xlhtml $1"
  67  #Mime "text/rtf*"              text/html                  "rthc --use-stdout $1 2>/dev/null"
  68  #Mime "text/rtf*"              text/xml                   "rtfx -w $1 2>/dev/null"
  69 -#Mime "text/rtf*"              text/html                  "unrtf --html $1"
  70 -#Mime application/vnd.ms-powerpoint "text/html; charset=utf-8" "pptohtml $1"
  71 +Mime "text/rtf*"               text/html                  "unrtf --html $1"
  72 +Mime application/vnd.ms-powerpoint "text/html; charset=utf-8" "ppthtml $1"
  73  #Mime application/vnd.ms-powerpoint text/html             "ppthtml $1"
  74
  75
  76 @@ -975,7 +975,7 @@
  77  # Default value is "path".
  78  #
  79  # To index whole server "localhost":
  80 -#Server http://localhost/
  81 +Server http://localhost/
  82  #
  83  # You can also specify some path to index subdirectory only:
  84  #Server http://localhost/subdir/
  85 diff -r -u mnogosearch-3.3.11.orig/etc/search.htm-dist mnogosearch-3.3.11/etc/search.htm-dist
  86 --- mnogosearch-3.3.11.orig/etc/search.htm-dist 2011-01-27 16:10:07.000000000 +0100
  87 +++ mnogosearch-3.3.11/etc/search.htm-dist      2011-02-01 09:50:26.000000000 +0100
  88 @@ -13,7 +13,7 @@
  89  <!--variables
  90  # Database parameters
  91  # Format: <DBType>:[//[DBUser[:DBPass]@]DBHost[:DBPort]]/DBName/[?dbmode=mode]
  92 -DBAddr mysql://root@localhost/test/?dbmode=blob
  93 +DBAddr sqlite3://localhost/var/lib/mnogosearch/default.db/?dbmode=blob
  94
  95  # Uncomment this line to enable search result cache
  96  #Cache yes
  97 @@ -25,8 +25,8 @@
  98  # Default charset is iso-8859-1 (latin1)
  99  # which is suitable for the most Western European languages
 100
 101 -LocalCharset   iso-8859-1
 102 -BrowserCharset iso-8859-1
 103 +LocalCharset   utf-8
 104 +BrowserCharset utf-8
 105
 106  # Load stopwords file.  File name is either absolute
 107  # or relative to /etc directory of mnoGoSearch installation.
 108 @@ -35,6 +35,8 @@
 109  #StopwordFile stopwords/ru.sl
 110  #
 111
 112 +Include langmap.conf
 113 +
 114  #
 115  # Minimum and maximum word lengths
 116  #