[Rt-commit] rt branch, 4.0-trunk, updated. rt-4.0.0-387-ga3f2a39

[Kevin Falcone]

The branch, 4.0-trunk has been updated
       via  a3f2a3960a0c8bf4c1b1a423be79fef5042e2a9b (commit)
       via  2a4329de93c95ed09c361fc3b5c5ec7c5800a2ee (commit)
       via  5669f76dd873d7d64f9e6d34772dbc91ea056250 (commit)
       via  d789bd3986a4ad63a71bd2450c9aad0c7763a7de (commit)
       via  d99fb385b2b46191d749b48be83f21c7cbf2fd7f (commit)
       via  3f5c3b21406eec4ac9f468edff351521801ca1b3 (commit)
       via  3bc42827b3468ba5b7d49efed7905273418de8c4 (commit)
       via  01f01dc5d4b60cf066d331795109bf5e3c321891 (commit)
       via  5024fd730f98860998558264cf81fae13c9d392e (commit)
       via  6f4a74cf049e8442bbd3697995b7fd9b68fb75e9 (commit)
       via  8184d0dd6ca2dba83388e5bbc7eff49bac049eb4 (commit)
       via  8d3788994d7ab67a2131992063e1d4c0739a22af (commit)
       via  0c29841b426b0134c925004f2e4a55f77d5b9571 (commit)
       via  95254c056cec58450c5de36fb86d9ca704fb47a1 (commit)
       via  947f1c8ed08b86b7106fac2454184249947f2093 (commit)
       via  538c8fe0bdcd96c64f92ce107d89a01bb089a650 (commit)
       via  ad2ba5cdead18d56ec83f7c1d30f65f1f6688945 (commit)
       via  201eee7a0d4feb39e926a7591c679abb08d1e474 (commit)
       via  fa5dffcb4e2ce943e7506cd4bc56c608725554a9 (commit)
       via  1b66c9baa565369eb1bfb5c13d0e2d3a26407949 (commit)
       via  d16cafcd37bce065739c57fe641c5030fed106cf (commit)
       via  1d665c448c8eb8625c27f8da8bb1a71103d712f2 (commit)
       via  6657efc19964327dfa3a586732de60da55dbfc90 (commit)
       via  a3fc4ec3c8992098473ec5ad4a6cd3ad6f35a4ad (commit)
       via  3507d83cc474220b69066e876ceae0827fca9ebb (commit)
       via  21c99c80ea60623e2497fd94eadc3889cdd355db (commit)
       via  0c3013f00fe2af4ae8f517c964a6299f276bf618 (commit)
       via  45224b8941994098c349a14b0e1fc1c7de3eee9e (commit)
       via  8869a17145154928226362e2cae608ad427dfe51 (commit)
       via  b7d981f521647e14faf9d496068c0c6d6523770b (commit)
       via  d15c50306b4bdd99ee3d20da515c4162b6d4d2a9 (commit)
       via  dbfe8313247f15735503118cea65b9d2e3685d8f (commit)
       via  7ec3ef1677d732ad5c8f62462a001b226aaf8611 (commit)
       via  af9c935ff986de58ff6e80bf119d4d81498789dd (commit)
       via  49eef0687344df57168b3458dc9bf6a57560d1f4 (commit)
       via  a8bdbc76bf180f13995e87b39bb828e5af35209d (commit)
       via  ad0c132a903321b9e79a686afd1b2804b520420e (commit)
       via  8aad388284e8c0c8eb57cfbcd6713e09ece69ea1 (commit)
       via  7b651f2b26b67634a7a7c45c6bafd62cfebbe54d (commit)
       via  4a6338c7eefeed5b60137ae2a0ab1330fd7c7313 (commit)
       via  3ea82f572a7c011ea328ccadf104f55569138ce1 (commit)
       via  824597b330031248e6661e5e1cc3c5030a4214a5 (commit)
       via  7d8b153e6f84b2f4e776bd1941df6fe290cc46f1 (commit)
       via  a30bb0dbd89e451665d3b7d15ba6105c9c0d8f78 (commit)
       via  606e5e609e98642cc9aa91364e0d94e3d7797f1b (commit)
       via  937048032ab17743fafec3a6fe1b2eeb3dcade5c (commit)
       via  af90bde1a96cc0f40630d2a5a608b321a4ed6b2c (commit)
       via  d93045d138fa908ae13ee1293a7e9458e0cc8542 (commit)
       via  39f03a2a20194f3bb70e6e67a72ca48dbca882e1 (commit)
       via  b2ca5f26b83639f7b780fb3bd8b61e4c5980f4a0 (commit)
       via  ca91cf50be71497f04fd4bcb2f10ce304678cf4a (commit)
       via  bce3688d864a83f9bf51642770fa6f09b488ed7d (commit)
       via  6040de1c294fe72c34aacce55832d337f0cb4abc (commit)
       via  0a028a14c1e06959da61fce716549b1851787c72 (commit)
       via  cf6ca2967e5d325cb4064fa868d5b2effcb3824b (commit)
       via  c967e2dca96c50c354b9047c23944e3d63870fda (commit)
       via  5bff1d032162d72b95ff765930c830ef1df243cf (commit)
       via  fab3d7af082bae8b20e5cb62351029310f13b9e2 (commit)
       via  0e6012143b4856359d79987b9537c5ae4d266b19 (commit)
       via  2a7bc4f0b3d16ebc4867e772f8833dded0e11f9c (commit)
       via  f619b0462883d3c5d2e331881e9c91be3fd2fe61 (commit)
       via  1c258cbacc756f405240a31a3f53973727fe570c (commit)
       via  8703f1c3246fab5315c78760f131808739a5bc3f (commit)
       via  11a447a11bdd7ae697e0f0d77e2f35c649db7e91 (commit)
       via  feb6d53a6c08b2c3a6f8d08267dab61f216dd3c6 (commit)
       via  d351275efc28e26b7b6bfd9e5166bef3fddd935a (commit)
       via  50a856c6d7e13881af48b98a4bec157bfd6fe739 (commit)
       via  5a85181b49ff95f6f241bbf14524d66f0d920d86 (commit)
       via  8a4a5d5bf6c498f5803d86e23344a1713ffeb8ed (commit)
       via  14492925702ddeee76d165e27d57693a98137248 (commit)
       via  e7f378895ec06e64bd056e1c966277aeee2ef6bd (commit)
      from  88797ea1ce4470e29ffb989bfa5af2f0f0fbb374 (commit)

Summary of changes:
 docs/full_text_indexing.pod     |  168 +++++++++++++++++++++
 etc/RT_Config.pm.in             |   43 +-----
 lib/RT/Config.pm                |   39 +++++
 lib/RT/Handle.pm                |   15 ++
 lib/RT/Test.pm                  |    4 +
 lib/RT/Tickets.pm               |   36 ++++-
 sbin/rt-fulltext-indexer.in     |  158 +++++++++-----------
 sbin/rt-setup-fulltext-index.in |  310 +++++++++++++++++++++------------------
 t/fts/indexed_mysql.t           |  132 +++++++++++++++++
 t/fts/indexed_oracle.t          |    2 +
 t/fts/indexed_pg.t              |   26 +++-
 t/fts/not_indexed.t             |    8 +-
 12 files changed, 658 insertions(+), 283 deletions(-)
 create mode 100644 docs/full_text_indexing.pod
 create mode 100644 t/fts/indexed_mysql.t

- Log -----------------------------------------------------------------
commit a3f2a3960a0c8bf4c1b1a423be79fef5042e2a9b
Merge: 88797ea 2a4329d
Author: Kevin Falcone <falcone at bestpractical.com>
Date:   Wed May 18 12:45:18 2011 -0400

    Merge branch '4.0/fulltext-search' into 4.0-trunk
    
    Conflicts:
    	t/fts/indexed_pg.t
    	t/fts/not_indexed.t

diff --cc lib/RT/Test.pm
index 9cf8c36,b3f8c0a..b468aae
--- a/lib/RT/Test.pm
+++ b/lib/RT/Test.pm
@@@ -1344,21 -1325,24 +1344,25 @@@ sub start_apache_server 
  sub stop_server {
      my $self = shift;
      my $in_end = shift;
 +    return unless @SERVERS;
  
      my $sig = 'TERM';
 -    $sig = 'INT' if !$ENV{'RT_TEST_WEB_HANDLER'}
 -                    || $ENV{'RT_TEST_WEB_HANDLER'} =~/^standalone(?:\+|\z)/;
 +    $sig = 'INT' if $ENV{'RT_TEST_WEB_HANDLER'} eq "plack";
      kill $sig, @SERVERS;
      foreach my $pid (@SERVERS) {
 -        waitpid $pid, 0;
 +        if ($ENV{RT_TEST_WEB_HANDLER} =~ /^apache/) {
 +            sleep 1 while kill 0, $pid;
 +        } else {
 +            waitpid $pid, 0;
 +        }
      }
  
 -    sleep 2
 -      if !$in_end && $ENV{'RT_TEST_WEB_HANDLER'} && $ENV{'RT_TEST_WEB_HANDLER'} =~ /apache/;
 -
      @SERVERS = ();
  }
+ 
+ sub temp_directory {
+     return $tmp{'directory'};
+ }
  
  sub file_content {
      my $self = shift;
diff --cc t/fts/indexed_pg.t
index c95db24,3192197..ea5cad1
--- a/t/fts/indexed_pg.t
+++ b/t/fts/indexed_pg.t
@@@ -10,9 -10,9 +10,9 @@@ my ($major, $minor) = $RT::Handle->dbh-
  plan skip_all => "Need Pg 8.2 or higher; we have $major.$minor"
      if "$major.$minor" < 8.2;
  
- plan tests => 13;
 -plan tests => 19;
++plan tests => 21;
  
- RT->Config->Set( FullTextSearch => Enable => 1, Indexed => 1 );
+ RT->Config->Set( FullTextSearch => Enable => 1, Indexed => 1, Column => 'ContentIndex', Table => 'Attachments' );
  
  setup_indexing();
  
diff --cc t/fts/not_indexed.t
index c96aacd,f0549fb..0a1abd0
--- a/t/fts/not_indexed.t
+++ b/t/fts/not_indexed.t
@@@ -3,7 -3,7 +3,7 @@@
  use strict;
  use warnings;
  
- use RT::Test tests => 11;
 -use RT::Test tests => 17;
++use RT::Test tests => 20;
  
  RT->Config->Set( FullTextSearch => Enable => 1, Indexed => 0 );
  

-----------------------------------------------------------------------