[Pkg-ocaml-maint-commits] r3379 - in /trunk/packages/mldonkey/trunk/debian: changelog patches/00list patches/search.dpatch

[smimram at users.alioth.debian.org]

Author: smimram
Date: Thu Nov 23 11:50:36 2006
New Revision: 3379

URL: http://svn.debian.org/wsvn/pkg-ocaml-maint/?sc=1&rev=3379
Log:
Added search.dpatch to support logical -not in searches.

Added:
    trunk/packages/mldonkey/trunk/debian/patches/search.dpatch   (with props)
Modified:
    trunk/packages/mldonkey/trunk/debian/changelog
    trunk/packages/mldonkey/trunk/debian/patches/00list

Modified: trunk/packages/mldonkey/trunk/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-ocaml-maint/trunk/packages/mldonkey/trunk/debian/changelog?rev=3379&op=diff
==============================================================================
--- trunk/packages/mldonkey/trunk/debian/changelog (original)
+++ trunk/packages/mldonkey/trunk/debian/changelog Thu Nov 23 11:50:36 2006
@@ -8,6 +8,7 @@
     given to mlguistarter, closes: #396754.
   * Updated German debconf translation (thanks Matthias Julius),
     closes: #399962.
+  * Added search.dpatch to support logical -not in searches, closes: #293016.
 
   [ Sylvain Le Gall ]
   * Upgrade debhelper debian/compat to 5,
@@ -18,7 +19,7 @@
     xinclude,
   * Upgrade docbook version to 4.4,
 
- -- Samuel Mimram <smimram at debian.org>  Thu, 23 Nov 2006 10:23:55 +0000
+ -- Samuel Mimram <smimram at debian.org>  Thu, 23 Nov 2006 10:48:54 +0000
 
 mldonkey (2.8.1-2) unstable; urgency=low
 

Modified: trunk/packages/mldonkey/trunk/debian/patches/00list
URL: http://svn.debian.org/wsvn/pkg-ocaml-maint/trunk/packages/mldonkey/trunk/debian/patches/00list?rev=3379&op=diff
==============================================================================
--- trunk/packages/mldonkey/trunk/debian/patches/00list (original)
+++ trunk/packages/mldonkey/trunk/debian/patches/00list Thu Nov 23 11:50:36 2006
@@ -1,3 +1,4 @@
 01_see
 newdns
 mlguistarter
+search

Added: trunk/packages/mldonkey/trunk/debian/patches/search.dpatch
URL: http://svn.debian.org/wsvn/pkg-ocaml-maint/trunk/packages/mldonkey/trunk/debian/patches/search.dpatch?rev=3379&op=file
==============================================================================
--- trunk/packages/mldonkey/trunk/debian/patches/search.dpatch (added)
+++ trunk/packages/mldonkey/trunk/debian/patches/search.dpatch Thu Nov 23 11:50:36 2006
@@ -1,0 +1,60 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## search.dpatch by spiralvoice <spiralvoice at hotmail.com>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: Support logical -not in searches.
+
+ at DPATCH@
+diff -urNad mldonkey-2.8.1~/src/daemon/common/commonComplexOptions.ml mldonkey-2.8.1/src/daemon/common/commonComplexOptions.ml
+--- mldonkey-2.8.1~/src/daemon/common/commonComplexOptions.ml	2006-09-01 16:22:14.000000000 +0000
++++ mldonkey-2.8.1/src/daemon/common/commonComplexOptions.ml	2006-11-23 10:45:40.000000000 +0000
+@@ -512,7 +512,7 @@
+     "-movies", "avi -minsize 650000000 -1cd";
+     "-mp3s", "mp3 -minsize 3000000 -maxsize 10000000";
+     "-albums", "album -minsize 30000000 -maxsize 150000000";
+-    "-nosex", "-without xxx";
++    "-nosex", "-not xxx";
+   ]
+   
+ let customized_queries =
+diff -urNad mldonkey-2.8.1~/src/daemon/common/commonSearch.ml mldonkey-2.8.1/src/daemon/common/commonSearch.ml
+--- mldonkey-2.8.1~/src/daemon/common/commonSearch.ml	2006-01-19 00:44:47.000000000 +0000
++++ mldonkey-2.8.1/src/daemon/common/commonSearch.ml	2006-11-23 10:45:40.000000000 +0000
+@@ -117,8 +117,12 @@
+     | "-network" :: name :: args ->
+         net := (network_find_by_name name).network_num;
+         iter args q
+-    | "-without" :: name :: args ->
++    | "-not" :: name :: args ->
+         iter args ((QAndNot (QHasWord name, QHasWord name)) :: q)
++    | "-and" :: name :: args ->
++        iter args ((QAnd (QHasWord name, QHasWord name)) :: q)
++    | "-or" :: name :: args ->
++        iter args ((QOr (QHasWord name, QHasWord name)) :: q)
+     | s :: args ->
+         if s.[0] = '-' then
+           let args = 
+@@ -134,16 +138,19 @@
+           iter args ((QHasWord(s)) :: q)
+   in
+   let q = iter args [] in
+-  (match q with 
++  (match (List.rev q) with 
+       [] -> failwith "Void query"
+-    | [QAndNot _] -> failwith "Bad without query"
+     | q1 :: tail ->
+         List.fold_left (fun q1 q2 ->
+             match q2 with
+-              QAndNot (QHasWord x,_) ->
++              QAndNot (QHasWord x, _) ->
+                 QAndNot (q1, QHasWord x)
++            | QAnd (QHasWord x, _) ->
++                QAnd (q1, QHasWord x)
++            | QOr (QHasWord x, _) ->
++                QOr (q1, QHasWord x)
+             | _ ->
+-                QAnd (q1,q2)
++                QAnd (q1,q2) 
+         ) q1 tail), !net
+   
+ 

Propchange: trunk/packages/mldonkey/trunk/debian/patches/search.dpatch
------------------------------------------------------------------------------
    svn:executable = *