improve search

classes/WDTSTranscript.php

@@ -1,18 +1,19 @@
 <?php
 
-class WDTSTranscriptManager { 
+class WDTSTranscriptManager {
   var $key = null;
+  var $search_key = null;
   var $post_id = null;
   var $allow_multiple = false;
-  
+
   function __construct($post_id = null) {
-    if (is_numeric($post_id)) { $this->post_id = $post_id; }     
+    if (is_numeric($post_id)) { $this->post_id = $post_id; }
   }
-  
+
   function WDTSTranscriptManager($post_id = null) {
     $this->__construct($post_id);
   }
-  
+
   function _get_transcripts_metadata() {
     $transcripts = false;
     if (!is_null($this->key)) {
@@ -24,7 +25,7 @@ class WDTSTranscriptManager {
     }
     return $transcripts;
   }
-  
+
   /**
    * Save a transcript to a post.
    * @param int $post_id The post to attach the transcript to.
@@ -32,24 +33,24 @@ class WDTSTranscriptManager {
    * @param string $transcript The transcript content.
    * @return bool True if the transcript was saved, false otherwise.
    */
-  function save_transcript($transcript_info) {    
+  function save_transcript($transcript_info) {
     $user = wp_get_current_user();
     if (!empty($user)) {
-      $transcript_info = (array)$transcript_info;          
+      $transcript_info = (array)$transcript_info;
       $transcript_info['user_id'] = $user->ID;
       unset($transcript_info['key']);
-      
+
       foreach (array_keys($transcript_info) as $key) {
-        if (strpos($key, "_") === 0) { unset($transcript_info[$key]); } 
+        if (strpos($key, "_") === 0) { unset($transcript_info[$key]); }
       }
-      
+
       if (($transcripts = $this->_get_transcripts_metadata()) !== false) {
         $max_key = 0;
         foreach ($transcripts as $transcript) {
-          $max_key = max($max_key, $transcript['key']) + 1;  
+          $max_key = max($max_key, $transcript['key']) + 1;
         }
         $transcript_info['key'] = $max_key;
-        
+
         if ($this->allow_multiple) {
           $transcripts[] = $transcript_info;
         } else {
@@ -61,29 +62,39 @@ class WDTSTranscriptManager {
               $transcript_info['key']--;
               $new_transcripts[] = $transcript_info;
             } else {
-              $new_transcripts[] = $transcript; 
+              $new_transcripts[] = $transcript;
             }
           }
           if (!$was_added) { $new_transcripts[] = $transcript_info; }
           $transcripts = $new_transcripts;
         }
-        
+
+        $this->_update_search_field($transcripts);
+
         return update_post_meta($this->post_id, $this->key, $transcripts);
       }
     }
-    return false;       
+    return false;
   }
-  
+
+  function _update_search_field($transcripts) {
+    if (!empty($this->search_key)) {
+      $search_lines = array();
+      foreach ($transcripts as $transcript) { $search_lines[] = $transcript['transcript']; }
+      update_post_meta($this->post_id, $this->search_key, implode(" ", $search_lines));
+    }
+  }
+
   function delete_transcript($language = null) {
     return $this->_delete_transcript_by_field('language', $language);
   }
-  
+
   function delete_transcript_by_key($key = null) {
     return $this->_delete_transcript_by_field('key', $key);
   }
-  
+
   function _delete_transcript_by_field($field, $value) {
-    if (($transcripts = $this->_get_transcripts_metadata()) !== false) {      
+    if (($transcripts = $this->_get_transcripts_metadata()) !== false) {
       $new_transcripts = array();
       $deleted_transcript = false;
       foreach ($transcripts as $transcript) {
@@ -94,31 +105,33 @@ class WDTSTranscriptManager {
         }
       }
 
+      $this->_update_search_field($new_transcripts);
+      
       update_post_meta($this->post_id, $this->key, $new_transcripts);
       return $deleted_transcript;
-    } 
+    }
-    return false;    
+    return false;
   }
-  
+
   function get_transcripts() {
     return $this->_get_transcripts_metadata();
   }
-  
+
   function get_transcripts_for_user($user_id) {
     $user_transcripts = array();
-    if (($transcripts = $this->_get_transcripts_metadata()) !== false) {      
+    if (($transcripts = $this->_get_transcripts_metadata()) !== false) {
       foreach ($transcripts as $transcript) {
         if ($transcript['user_id'] == $user_id) { $user_transcripts[] = $transcript; }
       }
     }
     return $user_transcripts;
   }
-  
+
   function get_languages() {
     $languages = array();
-    if (($transcripts = $this->_get_transcripts_metadata()) !== false) {      
+    if (($transcripts = $this->_get_transcripts_metadata()) !== false) {
       foreach ($transcripts as $transcript) {
-        $languages[$transcript['language']] = true; 
+        $languages[$transcript['language']] = true;
       }
     }
     return array_keys($languages);

classes/WDTSTranscriptClasses.php

@@ -9,6 +9,7 @@ class WDTSQueuedTranscript extends WDTSTranscriptManager {
 
 class WDTSApprovedTranscript extends WDTSTranscriptManager {
   var $key = "approved_transcripts";
+  var $search_key = "approved_transcripts_words";
 }
 
 ?>

classes/WhatDidTheySayAdmin.php

@@ -80,7 +80,7 @@ class WhatDidTheySayAdmin {
     
     $search = get_query_var('s');
     if (!empty($search)) {
-      $where .= $wpdb->prepare(" OR ($wpdb->postmeta.meta_key = %s ", 'approved_transcripts');
+      $where .= $wpdb->prepare(" OR ($wpdb->postmeta.meta_key = %s ", 'approved_transcripts_words');
       $search = addslashes_gpc($search);
       $where .= " AND $wpdb->postmeta.meta_value LIKE '%$search%') ";
     }

test/WDTSTranscriptTest.php

@@ -14,6 +14,7 @@ class WDTSTranscriptTest extends PHPUnit_Framework_TestCase {
     
     $this->w = new WDTSTranscriptManager(1);
     $this->w->key = "test";
+		$this->w->search_key = "test_search";
   }
   
   function testSaveTranscript() {
@@ -36,6 +37,8 @@ class WDTSTranscriptTest extends PHPUnit_Framework_TestCase {
       get_post_meta(1, $this->w->key, true)
     );
 
+		$this->assertEquals("this is a transcript", get_post_meta(1, $this->w->search_key, true));
+
     $this->w->save_transcript(array(
       'language' => 'en',
       'transcript' => 'this is another transcript'
@@ -53,6 +56,8 @@ class WDTSTranscriptTest extends PHPUnit_Framework_TestCase {
       get_post_meta(1, $this->w->key, true)
     );
 
+    $this->assertEquals("this is another transcript", get_post_meta(1, $this->w->search_key, true));
+
     $this->w->save_transcript(array(
       'language' => 'fr',
       'transcript' => "il s'agit d'une nouvelle transcription"
@@ -76,6 +81,8 @@ class WDTSTranscriptTest extends PHPUnit_Framework_TestCase {
       get_post_meta(1, $this->w->key, true)
     );
     
+    $this->assertEquals("this is another transcript il s'agit d'une nouvelle transcription", get_post_meta(1, $this->w->search_key, true));
+
     $this->w->allow_multiple = true;
     
     $this->w->save_transcript(array(
@@ -106,6 +113,8 @@ class WDTSTranscriptTest extends PHPUnit_Framework_TestCase {
       ),
       get_post_meta(1, $this->w->key, true)
     );
+
+    $this->assertEquals("this is another transcript il s'agit d'une nouvelle transcription this is yet another transcript", get_post_meta(1, $this->w->search_key, true));
   }
   
   function testDeleteTranscript() {
@@ -129,6 +138,8 @@ class WDTSTranscriptTest extends PHPUnit_Framework_TestCase {
         'key' => 1
       ), 
     ), get_post_meta(1, $this->w->key, true));
+
+    $this->assertEquals("il s'agit d'une nouvelle transcription", get_post_meta(1, $this->w->search_key, true));
   }
   
   function testDeleteTranscriptByKey() {
@@ -160,6 +171,8 @@ class WDTSTranscriptTest extends PHPUnit_Framework_TestCase {
         'key' => 1
       ), 
     ), get_post_meta(1, $this->w->key, true));
+
+    $this->assertEquals("il s'agit d'une nouvelle transcription", get_post_meta(1, $this->w->search_key, true));
   }
   
   function testGetLanguages() {