Changeset 658221

Timestamp:

01/24/2013 06:47:45 PM (13 years ago)

Author:

voceplatforms

Message:

releasing version 1.2

Location:

lift-search/trunk

Files:

• admin/admin.php (added)
• admin/setup.php (modified) (5 diffs)
• admin/status.php (modified) (9 diffs)
• api/cloud-api.php (modified) (7 diffs)
• api/cloud-config.php (modified) (36 diffs)
• api/cloud-schemas.php (modified) (2 diffs)
• api/cloud-search.php (modified) (4 diffs)
• api/lift-batch.php (modified) (17 diffs)
• api/lift-http.php (modified) (12 diffs)
• lib/posts-to-sdf.php (modified) (7 diffs)
• lift-search.php (modified) (16 diffs)
• readme.txt (modified) (3 diffs)
• sass/admin.css (modified) (1 diff)
• sass/admin.scss (modified) (1 diff)
• wp/lift-batch-handler.php (added)
• wp/lift-health.php (modified) (7 diffs)
• wp/lift-search-form.php (modified) (17 diffs)
• wp/lift-update-queue.php (modified) (6 diffs)
• wp/lift-wp-search.php (modified) (22 diffs)
• wp/update-watchers/post.php (modified) (8 diffs)

lift-search/trunk/admin/setup.php

@@ -20 +20 @@
                     <em>1</em> You will need an Amazon Web Services account, visit <a target="_blank" href="http://aws.amazon.com/">Amazon AWS</a>. <a href="http://aws.amazon.com/documentation/" class="button button-secondary" target="_blank">AWS Documentation</a>
                 </p>
-                <?php if ( ! $step_completed[4] ): ?>
+                <?php if ( !$step_completed[4] ): ?>
                     <br />
                     <input type="button" value="Next" class="lift-next-step lift-step-button button-primary" data-lift_step="next" />
                 <?php endif; ?>
             </div>
-            <div class="lift-step lift-step-2 <?php echo ( ! $step_completed[4] ? 'hidden' : '' ); ?>">
+            <div class="lift-step lift-step-2 <?php echo (!$step_completed[4] ? 'hidden' : '' ); ?>">
                 <p>
                     <em>2</em> Add your account info. You can retrieve your access keys from the
@@ -58 +58 @@
                     </tr>
                 </table>
-                <?php if ( ! $step_completed[4] ): ?>
+                <?php if ( !$step_completed[4] ): ?>
                     <br />
                     <input type="button" value="Back" class="lift-prev-step lift-step-button button-primary" data-lift_step="prev"/>
@@ -64 +64 @@
                 <?php endif; ?>
             </div>
-            <div class="lift-step lift-step-3 <?php echo ( ! $step_completed[4] ? 'hidden' : '' ); ?>">
+            <div class="lift-step lift-step-3 <?php echo (!$step_completed[4] ? 'hidden' : '' ); ?>">
                 <p><em>3</em> Please enter a search domain name. This must be a unique string to your AWS account. The domain name string can only contain the following characters: a-z (lowercase), 0-9, and - (hyphen). Uppercase letters and underscores are not allowed. The string has a max length of 28 characters.</p>
                 <table class="form-table">
@@ -85 +85 @@
                     </tr>
                 </table>
-                <?php if ( ! $step_completed[4] ): ?>
+                <?php if ( !$step_completed[4] ): ?>
                     <br />
                     <input type="button" value="Back" class="lift-prev-step lift-step-button button-primary" data-lift_step="prev"/>
@@ -91 +91 @@
                 <?php endif; ?>
             </div>
-            <div class="lift-step lift-step-4 <?php echo ( ! $step_completed[4] ? 'hidden' : '' ); ?>">
+            <div class="lift-step lift-step-4 <?php echo (!$step_completed[4] ? 'hidden' : '' ); ?>">
                 <p>
                     <em>4</em> Your search domain is ready to go! If this is a new search domain, it will take approximately 30-40 minutes for it to become active and ready to index your documents.
                 </p>
                 <p>
-                    <?php if ( ! $step_completed[4] ): ?>
+                    <?php if ( !$step_completed[4] ): ?>
                         <input type="button" value="Back" class="lift-prev-step lift-step-button button-primary"data-lift_step="prev" />
                     <?php endif; ?>
-                    <a href="<?php echo admin_url( sprintf( 'options-general.php?page=%s', Lift_Search::ADMIN_STATUS_PAGE ) ); ?>" class="lift-admin-panel<?php echo ($step_completed[4] ? '-initial-completed' : ''); ?> button-primary">View Lift Search Dashboard</a> 
+                    <a href="<?php echo admin_url( sprintf( 'options-general.php?page=%s', Lift_Admin::STATUS_PAGE ) ); ?>" class="lift-admin-panel<?php echo ($step_completed[4] ? '-initial-completed' : ''); ?> button-primary">View Lift Search Dashboard</a> 
                 </p>
             </div>

lift-search/trunk/admin/status.php

@@ -1 +1 @@
 <?php
-
-$cron_enabled = Lift_Batch_Queue::cron_enabled();
+$cron_enabled = Lift_Batch_Handler::cron_enabled();
 $status = Lift_Health::get_overall_status();
 
@@ -8 +7 @@
 
 if ( 1 == $status['severity'] ) {
-    $overall_status_text = 'Warning';
-    $overall_status_class = 'caution';
+    $overall_status_text = 'Warning';
+    $overall_status_class = 'caution';
 } else if ( 2 == $status['severity'] ) {
-    $overall_status_text = 'Critical';
-    $overall_status_class = 'error';
+    $overall_status_text = 'Critical';
+    $overall_status_class = 'error';
 }
 
 $overall_status_reasons = $status['reason'];
-$remote_domain_status = ( isset( $status['remote_status'] ) ) ? $status['remote_status'] : false ;
+$remote_domain_status = ( isset( $status['remote_status'] ) ) ? $status['remote_status'] : false;
 
-if ( ! isset( $remote_domain_status['fatal'] ) ) {
-    $remote_document_text = ( 1 != $status['remote_status']['num_searchable_docs'] ) ? 'documents' : 'document';
-    $remote_partition_text = ( 1 != $status['remote_status']['search_partition_count'] ) ? 'partitions' : 'partition';
-    $remote_instance_text = ( 1 != $status['remote_status']['search_instance_count'] ) ? 'instances' : 'instance';
+if ( !isset( $remote_domain_status['fatal'] ) ) {
+    $remote_document_text = ( 1 != $status['remote_status']['num_searchable_docs'] ) ? 'documents' : 'document';
+    $remote_partition_text = ( 1 != $status['remote_status']['search_partition_count'] ) ? 'partitions' : 'partition';
+    $remote_instance_text = ( 1 != $status['remote_status']['search_instance_count'] ) ? 'instances' : 'instance';
 }
 
 $remote_domain_status_text = $remote_domain_status['text'];
 $domain = Lift_Search::get_search_domain();
+
+$batch_interval_display = Lift_Search::get_batch_interval_display();
 
 ?>
@@ -35 +36 @@
                 <td class="status <?php echo esc_attr( $overall_status_class ); ?>">
                     <h3><?php echo esc_html( $overall_status_text ); ?></h3>
-                    <?php if ( $overall_status_reasons ) : ?>
-                        <ul>
-                        <?php foreach ( $overall_status_reasons as $reason ) : ?>
-                            <li><?php echo esc_html( $reason ); ?></li>
-                        <?php endforeach; ?>
-                        </ul>
-                    <?php endif; ?>
+                    <?php if ( $overall_status_reasons ) : ?>
+                        <ul>
+                            <?php foreach ( $overall_status_reasons as $reason ) : ?>
+                                <li><?php echo esc_html( $reason ); ?></li>
+                            <?php endforeach; ?>
+                        </ul>
+                    <?php endif; ?>
                     <p><a href="#lift-logs">view logs below</a></p>
                 </td>
@@ -50 +51 @@
                                 <td>Last: </td>
                                 <td>
-                                    <strong id="last-cron"><?php echo esc_html(Lift_Batch_Queue::get_last_cron_time()); ?></strong>
+                                    <strong id="last-cron"><?php echo esc_html( Lift_Batch_Handler::get_last_cron_time() ); ?></strong>
                                 </td>
                             </tr>
@@ -56 +57 @@
                                 <td>Next: </td>
                                 <td>
-                                    <strong id="next-cron"><?php echo esc_html(Lift_Batch_Queue::get_next_cron_time()); ?></strong>
+                                    <strong id="next-cron"><?php echo esc_html( Lift_Batch_Handler::get_next_cron_time() ); ?></strong>
                                 </td>
                             </tr>
@@ -71 +72 @@
                         <div class="clr"></div>
                         <div class="lift-index-now">
-                            <form method="get" action="">
-                                <input type="hidden" name="page" value="<?php echo esc_attr( Lift_Search::ADMIN_STATUS_PAGE ); ?>">
-                                <input type="hidden" name="sync-queue" value="1">
-                                <button class="button-primary" <?php echo ( Lift_Batch_Queue::is_batch_locked() || ! Lift_Batch_Queue::ready_for_batch( Lift_Search::get_search_domain() ) ) ? 'disabled' : ''; ?>>Sync Queue Now</button>
-                            </form>
+                            <form method="get" action="">
+                                <input type="hidden" name="page" value="<?php echo esc_attr( Lift_Admin::STATUS_PAGE ); ?>">
+                                <input type="hidden" name="sync-queue" value="1">
+                                <button class="button-primary" <?php echo ( Lift_Batch_Handler::is_batch_locked() || !Lift_Batch_Handler::ready_for_batch( Lift_Search::get_search_domain() ) ) ? 'disabled' : ''; ?>>Sync Queue Now</button>
+                            </form>
                         </div>
                         <div class="clr"></div>
@@ -83 +84 @@
                         <div class="alignleft">
                             <div class="misc-pub-section alignleft">
-                                <input name="batch-interval" id="lift-search-settings-page-search-config-settings-batch-interval" class="regular-text cron-update" value="<?php echo Lift_Search::get_batch_interval_adjusted(); ?>" type="text">
+                                <input name="batch-interval" id="lift-search-settings-page-search-config-settings-batch-interval" class="regular-text cron-update" value="<?php echo $batch_interval_display['value']; ?>" type="text">
                                 <select name="batch-interval-units" id="lift-search-settings-page-search-config-settings-batch-units">
-                                    <option value="m" <?php selected( Lift_Search::get_batch_interval_unit(), 'm' ); ?>>Minutes</option>
-                                    <option value="h" <?php selected( Lift_Search::get_batch_interval_unit(), 'h' ); ?>>Hours</option>
-                                    <option value="d" <?php selected( Lift_Search::get_batch_interval_unit(), 'd' ); ?>>Days</option>
+                                    <option value="m" <?php selected( $batch_interval_display['unit'], 'm' ); ?>>Minutes</option>
+                                    <option value="h" <?php selected( $batch_interval_display['unit'], 'h' ); ?>>Hours</option>
+                                    <option value="d" <?php selected( $batch_interval_display['unit'], 'd' ); ?>>Days</option>
                                 </select>
                                 <input type="button" id="update-cron-interval" value="Save" class="button button-secondary"/>
@@ -98 +99 @@
                 </td>
                 <td class="edit">
-                    <a class="button" href="<?php echo admin_url( 'options-general.php?page=' . Lift_Search::ADMIN_LANDING_PAGE ); ?>">Settings</a>
+                    <a class="button" href="<?php echo admin_url( 'options-general.php?page=' . Lift_Admin::LANDING_PAGE ); ?>">Settings</a>
                     <div class="clr"></div>
                     <br />
@@ -105 +106 @@
             </tr>
         </table>
-        
-        <div id="lift-remote-status">
-            <p>
-                Amazon CloudSearch search domain status for <i><?php echo esc_html( $domain ); ?></i>: 
-                <b><?php echo esc_html( strtoupper( $remote_domain_status_text ) ); ?></b><?php if ( $remote_domain_status && ! ( isset( $remote_domain_status['fatal'] ) ) && $remote_domain_status['needs_indexing'] ) : ?>
-                <a href="<?php echo admin_url( 'options-general.php?page=' . Lift_Search::ADMIN_STATUS_PAGE . '&lift-indexdocuments' ); ?>" class="button">Index Now</a><?php endif; ?>.
-                <?php if ( ! isset( $remote_domain_status['fatal'] ) ) : ?>
-                        Your index has <?php echo esc_html( $remote_domain_status['num_searchable_docs'] ); ?> searchable <?php echo $remote_document_text; ?>
-                        using <?php echo esc_html( $remote_domain_status['search_partition_count'] ); ?> search <?php echo $remote_partition_text; ?> 
-                        served by <?php echo esc_html( $remote_domain_status['search_instance_count'] ); ?> <i><?php echo esc_html( $remote_domain_status['search_instance_type'] ); ?></i> <?php echo $remote_instance_text; ?>.
-                <?php endif; ?>
-            </p>
-        </div>
-        
-        <div class="indent">
-            <h3><span class="alignright">Documents in Queue: <strong><?php echo number_format( Lift_Batch_Queue::get_queue_count() ); ?></strong></span>Documents to be Synced</h3>
-            <?php echo Lift_Batch_Queue::get_queue_list(); ?>           
-            <h3 class="alignleft" id="lift-logs">Recent Logs</h3> 
-            <p class="alignleft" style="padding-top:3px ;margin-left:15px;">
-                <a href="<?php echo esc_attr( admin_url( sprintf( 'edit.php?post_type=%s', Voce_Error_Logging::POST_TYPE ) ) ); ?>" class="alignleft">View All</a>
+
+        <div id="lift-remote-status">
+            <p>
+                Amazon CloudSearch search domain status for <i><?php echo esc_html( $domain ); ?></i>: 
+                <b><?php echo esc_html( strtoupper( $remote_domain_status_text ) ); ?></b>
+                <?php if ( $remote_domain_status && !( isset( $remote_domain_status['fatal'] ) ) && $remote_domain_status['needs_indexing'] ) : ?>
+                    <a href="<?php echo admin_url( 'options-general.php?page=' . Lift_Admin::STATUS_PAGE . '&lift-indexdocuments' ); ?>" class="button">Index Now</a>
+                <?php endif; ?>.
+                <?php if ( !isset( $remote_domain_status['fatal'] ) ) : ?>
+                    Your index has <?php echo esc_html( $remote_domain_status['num_searchable_docs'] ); ?> searchable <?php echo $remote_document_text; ?>
+                    using <?php echo esc_html( $remote_domain_status['search_partition_count'] ); ?> search <?php echo $remote_partition_text; ?> 
+                    served by <?php echo esc_html( $remote_domain_status['search_instance_count'] ); ?> <i><?php echo esc_html( $remote_domain_status['search_instance_type'] ); ?></i> <?php echo $remote_instance_text; ?>.
+                <?php endif; ?>
             </p>
-            <?php if ( Voce_Error_Logging::get_log_count() && Voce_Error_Logging::get_log_count() > 0 ): ?>
-                <div class="alignright" style="margin-bottom:5px;"><p>
-                        <span class="alignleft status-message" id="clear-log-status-message" style="padding-top:3px; margin-right:15px;"></span>
-                        <img id="clear-logs-loader" style="padding-top:3px; margin-right:15px;" src="<?php echo site_url( '/wp-admin/images/loading.gif' ); ?>" class="alignleft hidden"/>
-                        <input type="button" class="button alignright" id="voce-lift-admin-settings-clear-status-logs" value="Clear Logs" />
-                    </p></div>
+        </div>
+
+        <div class="indent">
+            <?php echo Lift_Batch_Handler::get_queue_list(); ?> 
+            <?php if(Lift_Search::error_logging_enabled()) : ?>
+                <h3 class="alignleft" id="lift-logs">Recent Logs</h3> 
+                <p class="alignleft" style="padding-top:3px ;margin-left:15px;">
+                    <a href="<?php echo esc_attr( admin_url( sprintf( 'edit.php?post_type=%s', Voce_Error_Logging::POST_TYPE ) ) ); ?>" class="alignleft">View All</a>
+                </p>
+                <?php if ( Voce_Error_Logging::get_log_count() && Voce_Error_Logging::get_log_count() > 0 ): ?>
+                    <div class="alignright" style="margin-bottom:5px;">
+                        <p>
+                            <span class="alignleft status-message" id="clear-log-status-message" style="padding-top:3px; margin-right:15px;"></span>
+                            <img id="clear-logs-loader" style="padding-top:3px; margin-right:15px;" src="<?php echo site_url( '/wp-admin/images/loading.gif' ); ?>" class="alignleft hidden"/>
+                            <input type="button" class="button alignright" id="voce-lift-admin-settings-clear-status-logs" value="Clear Logs" />
+                        </p>
+                    </div>
+                <?php endif; ?>
+                <?php echo Lift_Search::RecentLogTable(); ?>
             <?php endif; ?>
-            <?php echo Lift_Search::RecentLogTable(); ?>
         </div><!-- end indent -->
     </div> <!-- end dashboard -->

lift-search/trunk/api/cloud-api.php

@@ -3 +3 @@
 class Cloud_API {
 
-    private $search_version;
     private $error_messages;
     private $submission_uri;
     private $search_uri;
+
     const API_VERSION = '2011-02-01';
 
@@ -20 +20 @@
      * @param iLift_HTTP $http_interface
      */
-    public function __construct($http_interface, $document_endpoint, $search_endpoint, $version = '2011-02-01') {
+    public function __construct( $http_interface, $document_endpoint, $search_endpoint, $version = '2011-02-01' ) {
 
         $this->http_interface = $http_interface;
 
         $this->submission_uri = sprintf( 'http://%s/%s/documents/batch', $document_endpoint, $version );
-        $this->search_uri     = sprintf( 'http://%s/%s/search?', $search_endpoint, $version );
+        $this->search_uri = sprintf( 'http://%s/%s/search?', $search_endpoint, $version );
     }
 
-    private function send($method = 'POST', $data = null) {
+    private function send( $method = 'POST', $data = null ) {
 
-        $method = strtoupper($method);
+        $method = strtoupper( $method );
 
         // only use JSON for now
         $headers = array(
             'Content-Type' => 'application/json',
-            'Accept'       => 'application/json'
+            'Accept' => 'application/json'
         );
 
-        switch ($method) {
+        switch ( $method ) {
 
             case 'POST':
@@ -49 +49 @@
 
             default:
-                throw new Exception('you did it wrong');
+                throw new Exception( 'you did it wrong' );
+        }
 
+        $json = json_decode( $response );
+
+        if ( !$json ) {
+            $this->error_messages = $response;
         }
-        
-        $json = json_decode( $response );
-        
-        if ( ! $json ) {
-            $this->error_messages = $response;
-        }
 
         return $json;
-
     }
 
@@ -67 +65 @@
      * @param Cloud_Search_Query $query
      */
-    public function sendSearch($query) {
-        $response = $this->send('GET', $query->get_query_string());
+    public function sendSearch( $query ) {
+        $response = $this->send( 'GET', $query->get_query_string() );
 
         if ( $response && property_exists( $response, 'error' ) ) {
@@ -75 +73 @@
         }
 
-        if( in_array( $this->http_interface->getStatusCode(), array( 200, 201, 204 ) ) ) {
+        if ( in_array( $this->http_interface->getStatusCode(), array( 200, 201, 204 ) ) ) {
             return $response;
         }
 
         return false;
-
     }
 
@@ -87 +84 @@
      * @param LiftBatch $batch
      */
-    public function sendBatch($batch) {
+    public function sendBatch( $batch ) {
 
-        $response = $this->send('POST', $batch->convert_to_JSON());
+        $response = $this->send( 'POST', $batch->convert_to_JSON() );
 
         if ( $response && ( 'error' === $response->status ) ) {
@@ -106 +103 @@
         return $this->error_messages;
     }
+
 }

lift-search/trunk/api/cloud-config.php

@@ -13 +13 @@
         $this->operation = $operation;
         $this->payload = $payload;
-        $this->key = $credentials['access-key-id'];
-        $this->secret_key = $credentials['secret-access-key'];
+        $this->key = $credentials['access-key-id'];
+        $this->secret_key = $credentials['secret-access-key'];
         $this->http_api = $api;
     }
@@ -21 +21 @@
         $temp = array( );
 
-        foreach ($array as $key => $value) {
+        foreach ( $array as $key => $value ) {
             if ( is_string( $key ) && !is_array( $value ) ) {
                 $temp[] = rawurlencode( $key ) . '=' . rawurlencode( $value );
@@ -71 +71 @@
 
         // Add headers to request and compute the string to sign
-        foreach ($this->headers as $header_key => $header_value) {
+        foreach ( $this->headers as $header_key => $header_value ) {
             // Strip line breaks and remove consecutive spaces. Services collapse whitespace in signature calculation
             $this->headers[$header_key] = preg_replace( '/\s+/', ' ', trim( $header_value ) );
@@ -89 +89 @@
         $raw = '';
 
-        for ($i = 0; $i < strlen( $str ); $i += 2) {
+        for ( $i = 0; $i < strlen( $str ); $i += 2 ) {
             $raw .= chr( hexdec( substr( $str, $i, 2 ) ) );
         }
@@ -112 +112 @@
         $t = array( );
 
-        foreach ($array as $k => $v) {
-            if ( is_array($v) ) {
-                // json encode value if it is an array
-                $value = $this->encode_signature2( json_encode( $v ) );
-            } else {
-                $value = $this->encode_signature2( $v );
-            }
+        foreach ( $array as $k => $v ) {
+            if ( is_array( $v ) ) {
+                // json encode value if it is an array
+                $value = $this->encode_signature2( json_encode( $v ) );
+            } else {
+                $value = $this->encode_signature2( $v );
+            }
             $t[] = $this->encode_signature2( $k ) . '=' . $value;
         }
@@ -230 +230 @@
     protected static function __flatten_keys( $array, $prefix = '' ) {
 
-        $result = array();
-
-        foreach( $array as $key => $value ) {
+        $result = array( );
+
+        foreach ( $array as $key => $value ) {
 
             if ( is_array( $value ) ) {
 
                 $result += self::__flatten_keys( $value, ( $prefix . $key . '.' ) );
-
             } else {
 
                 $result[$prefix . $key] = $value;
-
-            }
-
+            }
         }
 
         return $result;
-
     }
 
@@ -257 +253 @@
      * @return array [response string, Cloud_Config object used for request]
      */
-    protected static function __make_request( $method, $payload = array(), $credentials = null, $flatten_keys = true ) {
+    protected static function __make_request( $method, $payload = array( ), $credentials = null, $flatten_keys = true ) {
 
         if ( $payload && $flatten_keys ) {
 
             $payload = self::__flatten_keys( $payload );
-
-        }
-        
-        if ( ! $credentials ) {
+        }
+
+        if ( !$credentials ) {
             $credentials['access-key-id'] = Lift_Search::get_access_key_id();
             $credentials['secret-access-key'] = Lift_Search::get_secret_access_key();
         }
-        
-        $api = Lift_Search::get_http_api();
-
-        $config = new Cloud_Config( $credentials, $api, $method, $payload);
+
+        $api = Lift_Search::get_http_api();
+
+        $config = new Cloud_Config( $credentials, $api, $method, $payload );
 
         $r = $config->authenticate();
@@ -281 +276 @@
 
             if ( isset( $r_json->Error ) ) {
-                
-                self::SetLastError( $r_json );
+
+                self::SetLastError( $r_json );
 
                 return false;
-
-            }
-
-        }
-
-        return array($r, $config);
-
+            }
+        }
+
+        return array( $r, $config );
     }
 
@@ -298 +290 @@
      * @return boolean 
      */
-    public static function GetDomains( $domain_names = array() ) {
-
-        $payload = array();
-
-        if ( ! empty( $domain_names ) ) {
-
-            foreach (array_values($domain_names) as $i => $domain_name) {
+    public static function GetDomains( $domain_names = array( ) ) {
+
+        $payload = array( );
+
+        if ( !empty( $domain_names ) ) {
+
+            foreach ( array_values( $domain_names ) as $i => $domain_name ) {
                 $payload['DomainNames.member.' . ($i + 1)] = $domain_name;
             }
-
         }
 
@@ -313 +304 @@
 
         return ( $r ? json_decode( $r ) : false );
-
     }
 
@@ -324 +314 @@
      */
     public static function TestDomain( $domain_name ) {
-        $domains = self::GetDomains(array($domain_name));
+        $domains = self::GetDomains( array( $domain_name ) );
         if ( $domains ) {
             $ds = $domains->DescribeDomainsResponse->DescribeDomainsResult->DomainStatusList;
@@ -331 +321 @@
         return false;
     }
-    
+
     /**
      * @method CreateDomain
@@ -339 +329 @@
 
         list($r, $config) = self::__make_request( 'CreateDomain', array( 'DomainName' => $domain_name ) );
-        
+
         return ( $r ? json_decode( $r ) : false );
-
     }
 
@@ -381 +370 @@
         return false;
     }
-    
-    public static function DescribeDomain( $domain_name ) {
-        $domains = self::GetDomains(  array($domain_name)  );
+
+    public static function DescribeDomain( $domain_name ) {
+        $domains = self::GetDomains( array( $domain_name ) );
         if ( $domains ) {
             $d = $domains->DescribeDomainsResponse->DescribeDomainsResult->DomainStatusList;
@@ -390 +379 @@
                 return $d[0];
             } else {
-                return false;
-            }
-        }
-        return false;
-    }
-    
-    public static function DescribeServiceAccessPolicies( $domain_name ) {
-        list($r, $config) = self::__make_request( 'DescribeServiceAccessPolicies', array( 'DomainName' => $domain_name ) );
+                return false;
+            }
+        }
+        return false;
+    }
+
+    public static function DescribeServiceAccessPolicies( $domain_name ) {
+        list($r, $config) = self::__make_request( 'DescribeServiceAccessPolicies', array( 'DomainName' => $domain_name ) );
 
         return ( $r ? json_decode( $r ) : false );
-    }
-    
-    /**
+    }
+
+    /**
      * Retrieve Search Service endpoint for a domain
      *
@@ -414 +403 @@
             return $domain->SearchService;
         }
-        
-        return false;
-    }
-    
-    /**
+
+        return false;
+    }
+
+    /**
      * Retrieve Doc Service endpoint for a domain
      *
@@ -430 +419 @@
             return $domain->DocService;
         }
-        
+
         return false;
     }
@@ -445 +434 @@
 
         $payload = array(
-            'DomainName'     => $domain,
+            'DomainName' => $domain,
             'RankExpression' => array(
-                'RankName'       => $rank_name,
+                'RankName' => $rank_name,
                 'RankExpression' => $rank_expression
             )
@@ -461 +450 @@
 
                 return true;
-
-            }
-
-        }
-
-        return false;
-
+            }
+        }
+
+        return false;
     }
 
@@ -481 +467 @@
         $payload = array(
             'DomainName' => $domain,
-            'RankName'   => $rank_name,
+            'RankName' => $rank_name,
         );
 
@@ -493 +479 @@
 
                 return true;
-
-            }
-
-        }
-
-        return false;
-
-    }
-    
-    /**
-     * get a default service access policy. try to be restrictive and use
-     * the outbound ip/32 and fall back to allow everyone if it can't be determined
-     * 
-     * @param string $domain
-     * @return boolean|array 
-     */
-    public static function GetDefaultServiceAccessPolicy( $domain ) {
-        $search_service = self::SearchService( $domain );
-        $doc_service = self::DocService( $domain );
-      
-        $services = array($search_service, $doc_service);
-        $statement = array();
-        $net = '0.0.0.0/0';
-        $warn = true; // for future error handling to warn of wide open access
-        
-        // try to get the IP address external services see to be more restrictive
-        if ( $ip = Lift_Search::get_http_api()->get( 'http://ifconfig.me/ip' ) ) {
-            $net = sprintf( '%s/32', str_replace( "\n", '', $ip) );
-            $warn = false;
-        }
-        
-        foreach ($services as $service) {
-            if ($service) {
-                $statement[] = array(
-                    'Effect' => 'Allow',
-                    'Action' => '*',
-                    'Resource' => $service->Arn,
-                    'Condition' => array(
-                        'IpAddress' => array(
-                            'aws:SourceIp' => array($net),
-                        )
-                    )
-                );
-            }
-        }
-        
-        if ( ! $statement ) {
-            return false;
-        }
-        
-        $policies = array('Statement' => $statement);
-        
-        return $policies;
-    }
-    
-    /**
-     * call UpdateServiceAccessPolicies for the domain with the given policies
-     * 
-     * @param string $domain
-     * @param array $policies
-     * @return boolean 
-     */
-    public static function UpdateServiceAccessPolicies( $domain, $policies ) {
-        
-        if ( ! $policies ) {
-            return false;
-        }
-        
-        $payload = array(
-            'AccessPolicies' => $policies,
-            'DomainName' => $domain,
-        );
-
-        list($r, $config) = self::__make_request( 'UpdateServiceAccessPolicies', $payload, null, false );
+            }
+        }
+
+        return false;
+    }
+
+    /**
+     * get a default service access policy. try to be restrictive and use
+     * the outbound ip/32 and fall back to allow everyone if it can't be determined
+     * 
+     * @param string $domain
+     * @return boolean|array 
+     */
+    public static function GetDefaultServiceAccessPolicy( $domain ) {
+        $search_service = self::SearchService( $domain );
+        $doc_service = self::DocService( $domain );
+
+        $services = array( $search_service, $doc_service );
+        $statement = array( );
+        $net = '0.0.0.0/0';
+        $warn = true; // for future error handling to warn of wide open access
+        // try to get the IP address external services see to be more restrictive
+        if ( $ip = Lift_Search::get_http_api()->get( 'http://ifconfig.me/ip' ) ) {
+            $net = sprintf( '%s/32', str_replace( "\n", '', $ip ) );
+            $warn = false;
+        }
+
+        foreach ( $services as $service ) {
+            if ( $service ) {
+                $statement[] = array(
+                    'Effect' => 'Allow',
+                    'Action' => '*',
+                    'Resource' => $service->Arn,
+                    'Condition' => array(
+                        'IpAddress' => array(
+                            'aws:SourceIp' => array( $net ),
+                        )
+                    )
+                );
+            }
+        }
+
+        if ( !$statement ) {
+            return false;
+        }
+
+        $policies = array( 'Statement' => $statement );
+
+        return $policies;
+    }
+
+    /**
+     * call UpdateServiceAccessPolicies for the domain with the given policies
+     * 
+     * @param string $domain
+     * @param array $policies
+     * @return boolean 
+     */
+    public static function UpdateServiceAccessPolicies( $domain, $policies ) {
+
+        if ( !$policies ) {
+            return false;
+        }
+
+        $payload = array(
+            'AccessPolicies' => $policies,
+            'DomainName' => $domain,
+        );
+
+        list($r, $config) = self::__make_request( 'UpdateServiceAccessPolicies', $payload, null, false );
 
         if ( $r ) {
@@ -574 +556 @@
                 self::SetLastError( $r );
             } else if ( isset( $r->UpdateServiceAccessPoliciesResponse->UpdateServiceAccessPoliciesResult->AccessPolicies ) ) {
-                $policies = $r->UpdateServiceAccessPoliciesResponse->UpdateServiceAccessPoliciesResult->AccessPolicies;
-                if ( ! $options = json_decode( $policies->Options ) || 'Processing' != $policies->Status->State ) {
-                    // $policies->Options will be blank if there was a malformed request
-                    return false;
-                }
-                
+                $policies = $r->UpdateServiceAccessPoliciesResponse->UpdateServiceAccessPoliciesResult->AccessPolicies;
+                if ( !$options = json_decode( $policies->Options ) || 'Processing' != $policies->Status->State ) {
+                    // $policies->Options will be blank if there was a malformed request
+                    return false;
+                }
+
                 return true;
             }
@@ -585 +567 @@
 
         return false;
-    }
-    
-    /**
+    }
+
+    /**
      * @method IndexDocuments
      * @param string $domain_name 
-     * 
-     * @return bool true if request completed and documents will be/are being
-     * indexed or false if request could not be completed or domain was in a 
-     * status that documents could not be indexed
+     * 
+     * @return bool true if request completed and documents will be/are being
+     * indexed or false if request could not be completed or domain was in a 
+     * status that documents could not be indexed
      */
     public static function IndexDocuments( $domain_name ) {
@@ -599 +581 @@
         list($r, $config) = self::__make_request( 'IndexDocuments', array( 'DomainName' => $domain_name ) );
 
-        return ( isset( $config->status_code ) && 200 == $config->status_code ) ;
-
-    }
-
-    public static function __parse_index_options( $field_type, $passed_options = array() ) {
+        return ( isset( $config->status_code ) && 200 == $config->status_code );
+    }
+
+    public static function __parse_index_options( $field_type, $passed_options = array( ) ) {
 
         $field_types = array(
@@ -610 +591 @@
                 'options' => array(
                     'default' => array(
-                        'name'    => 'DefaultValue',
+                        'name' => 'DefaultValue',
                         'default' => null
                     )
@@ -619 +600 @@
                 'options' => array(
                     'default' => array(
-                        'name'    => 'DefaultValue',
+                        'name' => 'DefaultValue',
                         'default' => null
                     ),
-                    'facet'   => array(
-                        'name'    => 'FacetEnabled',
+                    'facet' => array(
+                        'name' => 'FacetEnabled',
                         'default' => 'false'
                     ),
-                    'result'  => array(
-                        'name'    => 'ResultEnabled',
+                    'result' => array(
+                        'name' => 'ResultEnabled',
                         'default' => 'false'
                     )
@@ -636 +617 @@
                 'options' => array(
                     'default' => array(
-                        'name'    => 'DefaultValue',
+                        'name' => 'DefaultValue',
                         'default' => null
                     ),
-                    'facet'   => array(
-                        'name'    => 'FacetEnabled',
+                    'facet' => array(
+                        'name' => 'FacetEnabled',
                         'default' => 'false'
                     ),
-                    'result'  => array(
-                        'name'    => 'ResultEnabled',
+                    'result' => array(
+                        'name' => 'ResultEnabled',
                         'default' => 'false'
                     ),
-                    'search'  => array(
-                        'name'    => 'SearchEnabled',
+                    'search' => array(
+                        'name' => 'SearchEnabled',
                         'default' => 'false'
                     )
@@ -656 +637 @@
 
         $index_option_name = $field_types[$field_type]['option_name'];
-        $index_options = array();
+        $index_options = array( );
 
         foreach ( $field_types[$field_type]['options'] as $option_key => $option_info ) {
 
-            $option_name  = $option_info['name'];
+            $option_name = $option_info['name'];
             $option_value = $option_info['default'];
 
@@ -666 +647 @@
 
                 $option_value = $passed_options[$option_key];
-
-            }
-
-            if ( ! is_null( $option_value ) ) {
+            }
+
+            if ( !is_null( $option_value ) ) {
 
                 $index_options[$option_name] = $option_value;
-
-            }
-
+            }
         }
 
         return array( $index_option_name => $index_options );
-
     }
 
@@ -690 +667 @@
      * @return bool
      */
-    public static function DefineIndexField( $domain, $field_name, $field_type, $options = array() ) {
+    public static function DefineIndexField( $domain, $field_name, $field_type, $options = array( ) ) {
 
         // @TODO: check valid domain format
@@ -697 +674 @@
         // @TODO: check text field isn't both "facet" and "result"
 
-        if ( ! in_array( $field_type, array( 'uint', 'text', 'literal' ) ) ) {
+        if ( !in_array( $field_type, array( 'uint', 'text', 'literal' ) ) ) {
 
             return false;
-
         }
 
@@ -722 +698 @@
 
                 self::SetLastError( $r );
-
             } else if ( isset( $r->DefineIndexFieldResponse->DefineIndexFieldResult->IndexField ) ) {
 
                 return true;
-
-            }
-
-        }
-
-        return false;
-
-
+            }
+        }
+
+        return false;
     }
 
@@ -743 +714 @@
      * @return boolean True if a position response
      */
-    public static function TestConnection( $credentials = array() ) {
-
-        list($r, $config) = self::__make_request( 'DescribeDomains', array(), $credentials );
-
-        if ( ! $config ) {
-            return false;
-        }
-        
+    public static function TestConnection( $credentials = array( ) ) {
+
+        list($r, $config) = self::__make_request( 'DescribeDomains', array( ), $credentials );
+
+        if ( !$config ) {
+            return false;
+        }
+
         return ( 200 == $config->status_code );
-
     }
 
@@ -766 +736 @@
         $schema = Cloud_Schemas::GetSchema( $schema );
 
-        if ( ! $schema ) {
+        if ( !$schema ) {
             return false;
         }
@@ -772 +742 @@
         foreach ( $schema as $index ) {
 
-            $index = array_merge( array( 'options' => array() ), $index );
+            $index = array_merge( array( 'options' => array( ) ), $index );
 
             $r = self::DefineIndexField( $domain, $index['field_name'], $index['field_type'], $index['options'] );
@@ -779 +749 @@
                 return false;
             }
-
         }
 
         return self::GetDomains( array( $domain ) );
-
-    }
-
+    }
 
 }

lift-search/trunk/api/cloud-schemas.php

@@ -77 +77 @@
     );
 
-    public static function GetSchema($schema){
+    public static function GetSchema( $schema ) {
         $schema = self::$$schema;
-        if($schema){
+        if ( $schema ) {
             return $schema;
         } else {
@@ -85 +85 @@
         }
     }
+
 }

lift-search/trunk/api/cloud-search.php

@@ -1 +1 @@
 <?php
+
 /*
 
-Example usage:
+  Example usage:
 
-$query = new Cloud_Search_Query('post_content:"ratchet"');
+  $query = new Cloud_Search_Query('post_content:"ratchet"');
 
-$query->add_facet('post_category');
-$query->add_return_field('id');
-$query->add_rank('post_date_gmt', 'DESC');
+  $query->add_facet('post_category');
+  $query->add_return_field('id');
+  $query->add_rank('post_date_gmt', 'DESC');
 
-$query_string = $query->get_query_string();
+  $query_string = $query->get_query_string();
 
-*/
-
+ */
 
 class Cloud_Search_Query {
 
-    protected $facets = array();
-    protected $return_fields = array();
-    protected $size  = 10;
+    protected $facets = array( );
+    protected $return_fields = array( );
+    protected $size = 10;
     protected $start = 0;
     protected $boolean_query = '';
-    protected $ranks = array();
+    protected $ranks = array( );
 
     public function __construct( $boolean_query = '' ) {
-
         $this->boolean_query = $boolean_query;
-
     }
 
     public function set_boolean_query( $boolean_query ) {
-
         $this->boolean_query = $boolean_query;
-
     }
 
     public function add_facet( $facet ) {
-
-        $this->facets = array_merge( $this->facets, (array) $facet );
-
+        $this->facets = array_merge( $this->facets, ( array ) $facet );
     }
 
     public function add_return_field( $field ) { // string or array
-
-        $this->return_fields = array_merge( $this->return_fields, (array) $field );
-
+        $this->return_fields = array_merge( $this->return_fields, ( array ) $field );
     }
 
     private function __validate_size( $size ) {
-        if( (int)$size != $size || (int)$size < 0 ) {
+        if ( ( int ) $size != $size || ( int ) $size < 0 ) {
             throw new CloudSearchAPIException( 'Size must be a positive integer.', 2 );
         }
@@ -55 +47 @@
 
     public function set_size( $size = 10 ) {
-        
         $this->__validate_size( $size );
-
         $this->size = $size;
     }
 
     private function __validate_start( $start ) {
-        if( (int)$start != $start || (int)$start < 0 ) {
+        if ( ( int ) $start != $start || ( int ) $start < 0 ) {
             throw new CloudSearchAPIException( 'Start must be a positive integer', 1 );
         }
@@ -68 +58 @@
 
     public function set_start( $start ) {
-
         $this->__validate_start( $start );
-
         $this->start = $start;
-
     }
 
     public function add_rank( $field, $order ) {
-
-        $order = ('DESC' === strtoupper($order)) ? 'DESC' : 'ASC';
-
+        $order = ('DESC' === strtoupper( $order )) ? 'DESC' : 'ASC';
         $this->ranks[$field] = $order;
-
     }
 
     public function get_query_string() {
+        $ranks = array( );
 
-        $ranks = array();
-        foreach ($this->ranks as $field => $order) {
+        foreach ( $this->ranks as $field => $order ) {
             $ranks[] = ('DESC' === $order) ? "-{$field}" : $field;
         }
 
-        $params = array_filter(array(
-            'bq'            => $this->boolean_query,
-            'facet'         => implode(',', $this->facets),
-            'return-fields' => implode(',', $this->return_fields),
-            'size'          => $this->size,
-            'start'         => $this->start,
-            'rank'          => implode(',', $ranks)
-        ));
+        $params = array_filter( array(
+            'bq' => $this->boolean_query,
+            'facet' => implode( ',', $this->facets ),
+            'return-fields' => implode( ',', $this->return_fields ),
+            'size' => $this->size,
+            'start' => $this->start,
+            'rank' => implode( ',', $ranks )
+            ) );
 
         return http_build_query( $params );
-
     }
 
@@ -106 +89 @@
 
 class CloudSearchAPIException extends Exception {
-
+    
 }

lift-search/trunk/api/lift-batch.php

@@ -51 +51 @@
             // pass
         } else {
-            $this->errors[] = array(
-                'code' => 100,
-                'message' => 'Tried to pass an invalid data type to constructor',
-            );
+            $this->errors[] = array(
+                'code' => 100,
+                'message' => 'Tried to pass an invalid data type to constructor',
+            );
             throw new Lift_Batch_Exception( $this->errors );
         }
@@ -69 +69 @@
         }
 
-        foreach (array( 'type', 'id', 'version' ) as $prop) {
+        foreach ( array( 'type', 'id', 'version' ) as $prop ) {
             if ( !property_exists( $document, $prop ) ) {
                 $this->errors[] = array(
@@ -78 +78 @@
             if ( empty( $document->{$prop} ) ) {
                 $this->errors[] = array(
-                    'code' => 310,
+                    'code' => 310,
                     'message' => sprintf( 'Required field is empty: %s', $prop )
                 );
@@ -96 +96 @@
      */
     public function add_document( $document ) {
-        $document = (object) $document;
+        $document = ( object ) $document;
         if ( !$this->can_add( $document ) ) {
             throw new Lift_Batch_Exception( $this->errors );
@@ -113 +113 @@
             if ( empty( $documents ) ) {
                 $this->errors[] = array(
-                    'code' => 220,
-                    'message' => 'Passed empty array'
-                );
+                    'code' => 220,
+                    'message' => 'Passed empty array'
+                );
                 throw new Lift_Batch_Exception( $this->errors );
             }
-            for ($i = 0; $i < count( $documents ); $i++) {
+            for ( $i = 0; $i < count( $documents ); $i++ ) {
                 try {
                     $this->add_document( $documents[$i] );
                 } catch ( Lift_Batch_Exception $e ) {
                     $this->errors[] = array(
-                        'code' => 400,
+                        'code' => 400,
                         'message' => sprintf( 'Failed adding document at index %s', $i ),
                         'failedIndex' => $i
@@ -132 +132 @@
             return $this->documents;
         } else {
-            $this->errors[] = array(
-                'code' => 110,
-                'message' => sprintf( 'Expecting array, given: %s', gettype( $documents ) ),
-            );
+            $this->errors[] = array(
+                'code' => 110,
+                'message' => sprintf( 'Expecting array, given: %s', gettype( $documents ) ),
+            );
             throw new Lift_Batch_Exception( $this->errors );
         }
@@ -151 +151 @@
      * @return int Number of rows deleted, or FALSE on failure ( # / 2 = documents )
      */
-    public function delete_document( $args = array() ) {
-
+    public function delete_document( $args = array( ) ) {
         global $wpdb;
 
 
         // set conditions
-        $where = array();
+        $where = array( );
         $where[] = 'sub_p.post_type = "lift_queued_document"';
 
         // remove specific ID
-        if ( array_key_exists('id', $args) && (int)$args['id'] >= 1 ) {
-            $where[] = sprintf( 'sub_p.ID = %d', (int)$args['id'] );
+        if ( array_key_exists( 'id', $args ) && ( int ) $args['id'] >= 1 ) {
+            $where[] = sprintf( 'sub_p.ID = %d', ( int ) $args['id'] );
         }
 
         // remove batch starting from specific ID
-        if ( array_key_exists('start_from', $args) && (int)$args['start_from'] >= 1 ) {
-            $where[] = sprintf( 'sub_p.ID >= %d', (int)$args['start_from'] );
+        if ( array_key_exists( 'start_from', $args ) && ( int ) $args['start_from'] >= 1 ) {
+            $where[] = sprintf( 'sub_p.ID >= %d', ( int ) $args['start_from'] );
         }
 
@@ -174 +173 @@
         $limit = '';
 
-        if ( array_key_exists('limit', $args) && (int)$args['limit'] >= 1 ) {
-            $limit = sprintf( 'LIMIT %d', (int)$args['limit'] );
-        }
-
+        if ( array_key_exists( 'limit', $args ) && ( int ) $args['limit'] >= 1 ) {
+            $limit = sprintf( 'LIMIT %d', ( int ) $args['limit'] );
+        }
 
         return $wpdb->query(
@@ -186 +184 @@
                             SELECT sub_p.ID 
                                 FROM {$wpdb->posts} sub_p
-                                WHERE ".implode(' AND ', $where)."
+                                WHERE " . implode( ' AND ', $where ) . "
                                 ORDER BY sub_p.ID ASC
                                 {$limit}
@@ -192 +190 @@
                         LEFT JOIN {$wpdb->postmeta} pm ON p.ID = pm.post_id"
                 )
-            );
-
+        );
     }
 
@@ -203 +200 @@
     public function check_document_length( $document ) {
         $json = json_encode( $document );
-        return (bool) (strlen( $json ) <= self::DOCUMENT_LIMIT);
+        return ( bool ) (strlen( $json ) <= self::DOCUMENT_LIMIT);
     }
 
@@ -211 +208 @@
      */
     public function check_documents_length() {
-        return (bool) ($this->get_documents_length() <= self::BATCH_LIMIT);
+        return ( bool ) ($this->get_documents_length() <= self::BATCH_LIMIT);
     }
 
@@ -229 +226 @@
     public function can_add( $document ) {
         if ( !is_object( $document ) || !$this->check_required_fields( $document ) ) {
-            $this->errors[] = array(
-                'code' => 120,
-                'message' => 'Document is not an object',
-            );
+            $this->errors[] = array(
+                'code' => 120,
+                'message' => 'Document is not an object',
+            );
             throw new Lift_Batch_Exception( $this->errors );
         }
@@ -242 +239 @@
         } else {
             $this->errors[] = array(
-                'code' => 500,
+                'code' => 500,
                 'message' => 'Batch limit reached',
                 'current_count' => count( $this->documents ),
@@ -249 +246 @@
             return false;
         }
-        
-        return false;
+
+        return false;
     }
 
@@ -260 +257 @@
      */
     public function sanitize( $document ) {
-        if ( property_exists($document, 'fields') && is_array( $document->fields ) ) {
-            $document->fields = array_change_key_case($document->fields);
-            foreach ($document->fields as $key => $value) {
+        if ( property_exists( $document, 'fields' ) && is_array( $document->fields ) ) {
+            $document->fields = array_change_key_case( $document->fields );
+            foreach ( $document->fields as $key => $value ) {
                 if ( $value === null ) {
                     $document->fields[$key] = "";
@@ -274 +271 @@
         $json = json_encode( $this->documents );
         if ( empty( $this->documents ) ||
-                $json === null ||
-                !$json ) {
+            $json === null ||
+            !$json ) {
             return false;
         } else {

lift-search/trunk/api/lift-http.php

@@ -3 +3 @@
 interface iLift_HTTP {
 
-    public function post( $url, $data, $headers = array() );
+    public function post( $url, $data, $headers = array( ) );
 
-    public function get( $url, $headers = array() );
+    public function get( $url, $headers = array( ) );
 
     public function getStatusCode();
 
     public function getResponse();
-
 }
 
@@ -18 +17 @@
     protected $response;
 
-    private function makeRequest( $url, $method = 'POST', $data = '', $headers = array() ) {
-        // @TODO: better error handling to pass up to caller
-        
+    private function makeRequest( $url, $method = 'POST', $data = '', $headers = array( ) ) {
+        // @TODO: better error handling to pass up to caller
+
         $args = array(
             'method' => strtoupper( $method ),
@@ -43 +42 @@
     }
 
-    public function get( $url, $headers = array() ) {
+    public function get( $url, $headers = array( ) ) {
         if ( empty( $url ) ) {
             return false;
@@ -51 +50 @@
     }
 
-    public function post( $url, $data, $headers = array() ) {
+    public function post( $url, $data, $headers = array( ) ) {
         if ( empty( $url ) || empty( $data ) ) {
             return false;
@@ -66 +65 @@
         return $this->response;
     }
+
 }
 
 class Lift_HTTP_WP_VIP extends Lift_HTTP_WP implements iLift_HTTP {
 
-    public function get( $url, $headers = array() ) {
+    public function get( $url, $headers = array( ) ) {
 
         $this->response = vip_safe_wp_remote_get( $url, '', 3, 1, 20, compact( 'headers' ) );
@@ -81 +81 @@
 
         return wp_remote_retrieve_body( $this->response );
-
     }
 
@@ -96 +95 @@
         //Setup cURL
         $this->setOptions();
-
     }
 
@@ -122 +120 @@
     }
 
-    public function get( $url, $headers = array() ) {
+    public function get( $url, $headers = array( ) ) {
         $request = $this->makeRequest( 'get', $url, '', $headers );
         return $request;
     }
 
-    public function post( $url, $data, $headers = array() ) {
+    public function post( $url, $data, $headers = array( ) ) {
         $request = $this->makeRequest( 'post', $url, $data, $headers );
         return $request;
@@ -133 +131 @@
 
     function makeRequest( $method, $url, $data, $headers ) {
-        
+
         curl_setopt( $this->channel, CURLOPT_URL, $url );
 
@@ -139 +137 @@
             curl_setopt( $this->channel, CURLOPT_POST, true );
             curl_setopt( $this->channel, CURLOPT_POSTFIELDS, $data );
-            
         }
 
-        curl_setopt( $this->channel, CURLOPT_HTTPHEADER, $headers); 
+        curl_setopt( $this->channel, CURLOPT_HTTPHEADER, $headers );
 
         $this->response = curl_exec( $this->channel );
@@ -149 +146 @@
 
         // @TODO: wp_error style handling here (timeouts, etc)
-        if( ! in_array( $this->response_code, array( 200, 201, 204 ) ) ) {
+        if ( !in_array( $this->response_code, array( 200, 201, 204 ) ) ) {
             return false;
         }
@@ -155 +152 @@
         return $this->response;
     }
+
 }

lift-search/trunk/lib/posts-to-sdf.php

@@ -14 +14 @@
      */
     private static $post_fields = array(
-        'ID'            => 'intval',
-        'post_content'  => array(__CLASS__, '__strip_tags_shortcodes'),
+        'ID' => 'intval',
+        'post_content' => array( __CLASS__, '__strip_tags_shortcodes' ),
         'post_date_gmt' => 'strtotime',
-        'post_excerpt'  => array(__CLASS__, '__strip_tags_shortcodes'),
-        'post_author'   => 'intval',
-        'post_category' => array(__CLASS__, '__format_post_categories'),
-        'tags_input'    => array(__CLASS__, '__format_post_tags')
+        'post_excerpt' => array( __CLASS__, '__strip_tags_shortcodes' ),
+        'post_author' => 'intval',
+        'post_category' => array( __CLASS__, '__format_post_categories' ),
+        'tags_input' => array( __CLASS__, '__format_post_tags' )
     );
 
@@ -52 +52 @@
         // @TODO: performance
         return array_map( function( $tag ) {
-            $term = get_term_by( 'name', $tag, 'post_tag' );
-            return (int) $term->term_id;
-        }, $tags );
-
+                    $term = get_term_by( 'name', $tag, 'post_tag' );
+                    return ( int ) $term->term_id;
+                }, $tags );
     }
 
@@ -78 +77 @@
 
             self::$document_id_prefix = apply_filters( 'lift_document_id_prefix', self::$document_id_prefix );
-
         }
 
@@ -90 +88 @@
      * @return array formatted posts
      */
-    function get_posts_for_batch_add( $args = array() ) {
+    function get_posts_for_batch_add( $args = array( ) ) {
 
-        $posts = get_posts($args);
+        $posts = get_posts( $args );
 
-        foreach ($posts as $i => $post) {
+        foreach ( $posts as $i => $post ) {
             $posts[$i] = self::format_post( $post->ID, array( 'action' => 'add', 'time' => time() ) );
         }
@@ -112 +110 @@
 
         // Only valid actions
-        if ( ! in_array( $data['action'], $valid_types ) ) {
+        if ( !in_array( $data['action'], $valid_types ) ) {
             return false;
         }
 
         // Any non-negative number
-        if ( $data['time'] == (int)$data['time'] && $data['time'] < 0 ) {
+        if ( $data['time'] == ( int ) $data['time'] && $data['time'] < 0 ) {
             return false;
         }
 
         // $post must be post ID or object
-        if ( ! is_numeric( $post ) && ! is_object( $post ) ) {
+        if ( !is_numeric( $post ) && !is_object( $post ) ) {
             return false;
         }
 
-        $fields = array();
-        $_post  = is_numeric( $post ) ? get_post( $post, ARRAY_A ) : (array) $post;
+        $fields = array( );
+        $_post = is_numeric( $post ) ? get_post( $post, ARRAY_A ) : ( array ) $post;
 
         if ( 'add' === $data['action'] ) {
 
-            $field_names = apply_filters( 'lift_document_fields', array_keys($_post), $_post['ID'] );
+            $field_names = apply_filters( 'lift_document_fields', array_keys( $_post ), $_post['ID'] );
 
             foreach ( $field_names as $field ) {
-                $value = isset($_post[$field]) ? $_post[$field] : null;
-                
-                if(isset(self::$post_fields[$field])) {
+                $value = isset( $_post[$field] ) ? $_post[$field] : null;
+
+                if ( isset( self::$post_fields[$field] ) ) {
                     $value = call_user_func( self::$post_fields[$field], $value );
                 }
-                
+
                 $value = apply_filters( 'lift_document_field_' . $field, $value, $_post['ID'] );
 
@@ -147 +145 @@
 
                     $value = preg_replace( '/[\x00-\x09\x0B\x0C\x0E-\x1F\x7F]/', '', $value );
-
                 }
 
@@ -154 +151 @@
 
             $fields = array_change_key_case( $fields );
-            
-            $fields = apply_filters('lift_document_fields_result', $fields, $_post['ID']);
 
+            $fields = apply_filters( 'lift_document_fields_result', $fields, $_post['ID'] );
         }
 
         $document = array(
-            'type'    => $data['action'],
-            'id'      => self::get_document_id_prefix() . $_post['ID'],
+            'type' => $data['action'],
+            'id' => self::get_document_id_prefix() . $_post['ID'],
             'version' => $data['time'],
         );
-        
-        if($data['action'] == 'add') {
-            $document['lang']    = 'en';
-            $document['fields']  = $fields;
+
+        if ( $data['action'] == 'add' ) {
+            $document['lang'] = 'en';
+            $document['fields'] = $fields;
         }
 
         $document = apply_filters( 'lift_document', $document, $_post['ID'], $data['action'] );
 
-        $document['fields'] = (object) array_filter($document['fields'], function( $value ) {
-            return ! is_null( $value );
-        });
+        if(isset($document['fields'])) {
+            $document['fields'] = ( object ) array_filter( $document['fields'], function( $value ) {
+                        return !is_null( $value );
+                    } );
+        }
 
         return $document;

lift-search/trunk/lift-search.php

@@ -1 +1 @@
 <?php
+
 /*
   Plugin Name: Lift Search
-  Version: 1.1
+  Version: 1.2
   Plugin URI: http://getliftsearch.com/
   Description: Improves WordPress search using Amazon CloudSearch
@@ -16 +17 @@
 require_once('api/cloud-config.php');
 require_once('lib/posts-to-sdf.php');
-require_once('wp/lift-batch-queue.php');
+require_once('wp/lift-batch-handler.php');
 require_once('wp/lift-health.php');
 require_once('wp/lift-wp-search.php');
@@ -26 +27 @@
 
     class Lift_Search {
+        /**
+         * Option name for the marker of whether the user finisehd the setup process 
+         */
 
         const INITIAL_SETUP_COMPLETE_OPTION = 'lift-initial-setup-complete';
+        const DB_VERSION = 2;
+
+        /**
+         * Option name for storing all user based options 
+         */
         const SETTINGS_OPTION = 'lift-settings';
-        const SEARCH_DOMAIN = 'search-domain';
-
-        // Note: batch-interval should be in seconds, regardless of what batch-interval-units is set to
-        private static $default_settings = array( 'batch-interval' => 300, 'batch-interval-units' => 'm' );
-        private static $allowed_post_types = array( 'post', 'page' );
-
-        const ADMIN_LANDING_PAGE = 'lift-search/admin/setup.php';
-        const ADMIN_STATUS_PAGE = 'lift-search/admin/status.php';
         const INDEX_DOCUMENTS_HOOK = 'lift_index_documents';
         const SET_ENDPOINTS_HOOK = 'lift_set_endpoints';
         const NEW_DOMAIN_CRON_INTERVAL = 'lift-index-documents';
 
+        /**
+         * Returns whether setup has been complete by testing whether all
+         * required data is set
+         * @return bool 
+         */
+        public static function is_setup_complete() {
+            return self::get_access_key_id() && self::get_secret_access_key()
+                && self::get_search_domain() && get_option( self::INITIAL_SETUP_COMPLETE_OPTION, 0 );
+        }
+
+        public static function error_logging_enabled() {
+            return !( defined( 'DISABLE_LIFT_ERROR_LOGGING' ) && DISABLE_LIFT_ERROR_LOGGING )
+                && ( class_exists( 'Voce_Error_Logging' ) || file_exists( __DIR__ . '/lib/voce-error-loggin/voce-error-logging' ) );
+        }
+
         public static function init() {
-            add_action( 'admin_menu', array( __CLASS__, 'add_settings' ) );
-
-            add_action( 'admin_init', array( __CLASS__, 'admin_init' ) );
-            add_filter( 'plugin_row_meta', array( __CLASS__, 'settings_link' ), 10, 2 );
-            add_filter( 'plugin_action_links_' . plugin_basename( __FILE__ ), array( __CLASS__, 'settings_link' ), 10, 2 );
-
-            add_action( 'wp_ajax_lift_test_access', array( __CLASS__, 'ajax_test_access' ) );
-            add_action( 'wp_ajax_lift_test_domain', array( __CLASS__, 'ajax_test_domain' ) );
-
-            add_action( 'wp_ajax_lift_delete_error_logs', array( __CLASS__, 'ajax_delete_error_logs' ) );
-
-            add_action( 'wp_ajax_lift_update_cron_interval', array( __CLASS__, 'ajax_update_cron_interval' ) );
-
-            add_action( 'wp_ajax_lift_create_domain', array( __CLASS__, 'ajax_create_domain' ) );
-
-            add_action( 'wp_ajax_lift_set_cron_status', array( __CLASS__, 'ajax_set_cron_status' ) );
+
+            if ( self::error_logging_enabled() && !class_exists( 'Voce_Error_Logging' )
+                && file_exists( __DIR__ . '/lib/voce-error-loggin/voce-error-logging' ) ) {
+                require_once (__DIR__ . '/lib/voce-error-loggin/voce-error-logging');
+            }
+
+            if ( self::get_search_endpoint() ) {
+                add_action( 'init', array( 'Lift_WP_Search', 'init' ) );
+            }
+
+            if ( self::get_document_endpoint() ) {
+                add_action( 'init', array( 'Lift_Batch_Handler', 'init' ) );
+            }
+
+            if ( is_admin() ) {
+                require_once(__DIR__ . '/admin/admin.php');
+                Lift_Admin::init();
+            }
+
+            add_action( 'init', array( __CLASS__, '__upgrade_check' ) );
+
+            //need cron hooks to be set prior to init
+            add_action( Lift_Batch_Handler::BATCH_CRON_HOOK, array( 'Lift_Batch_Handler', 'send_next_batch' ) );
+            add_action( Lift_Batch_Handler::QUEUE_ALL_CRON_HOOK, array( 'Lift_Batch_Handler', 'process_queue_all' ) );
+
 
             // @TODO only enqueue on search template or if someone calls the form
             add_action( 'wp_enqueue_scripts', function() {
-                        wp_enqueue_script( 'lift-search-form', plugins_url( 'js/lift-search-form.js', __FILE__ ), array( 'jquery' ) );
-                        wp_enqueue_style( 'lift-search', plugins_url( 'sass/style.css', __FILE__ ) );
-                    } );
-
-            if ( self::get_search_endpoint() ) {
-                Lift_WP_Search::init();
-            }
-
-            if ( self::get_document_endpoint() ) {
-                Lift_Batch_Queue::init();
-            }
+                    wp_enqueue_script( 'lift-search-form', plugins_url( 'js/lift-search-form.js', __FILE__ ), array( 'jquery' ) );
+                    wp_enqueue_style( 'lift-search', plugins_url( 'sass/style.css', __FILE__ ) );
+                } );
 
             //default sdf filters
             add_filter( 'lift_document_fields_result', function($fields, $post_id) {
-                        $taxonomies = array( 'post_tag', 'category' );
-                        foreach ($taxonomies as $taxonomy) {
-                            if ( array_key_exists( 'taxonomy_' . $taxonomy, $fields ) ) {
-                                unset( $fields['taxonomy_' . $taxonomy] );
-                                $terms = get_the_terms( $post_id, $taxonomy );
-                                $fields['taxonomy_' . $taxonomy . '_id'] = array( );
-                                $fields['taxonomy_' . $taxonomy . '_label'] = array( );
-                                foreach ($terms as $term) {
-                                    $fields['taxonomy_' . $taxonomy . '_id'][] = $term->term_id;
-                                    $fields['taxonomy_' . $taxonomy . '_label'][] = $term->name;
-                                }
+                    $taxonomies = array( 'post_tag', 'category' );
+                    foreach ( $taxonomies as $taxonomy ) {
+                        if ( array_key_exists( 'taxonomy_' . $taxonomy, $fields ) ) {
+                            unset( $fields['taxonomy_' . $taxonomy] );
+                            $terms = get_the_terms( $post_id, $taxonomy );
+                            $fields['taxonomy_' . $taxonomy . '_id'] = array( );
+                            $fields['taxonomy_' . $taxonomy . '_label'] = array( );
+                            foreach ( $terms as $term ) {
+                                $fields['taxonomy_' . $taxonomy . '_id'][] = $term->term_id;
+                                $fields['taxonomy_' . $taxonomy . '_label'][] = $term->name;
                             }
                         }
-
-                        if ( array_key_exists( 'post_author', $fields ) ) {
-                            $display_name = get_user_meta( $fields['post_author'], 'display_name', true );
-
-                            if ( $display_name ) {
-                                $fields['post_author_name'] = $display_name;
-                            }
+                    }
+
+                    if ( array_key_exists( 'post_author', $fields ) ) {
+                        $display_name = get_user_meta( $fields['post_author'], 'display_name', true );
+
+                        if ( $display_name ) {
+                            $fields['post_author_name'] = $display_name;
                         }
-
-                        return $fields;
-                    }, 10, 2 );
+                    }
+
+                    return $fields;
+                }, 10, 2 );
 
             add_filter( 'cron_schedules', function( $schedules ) {
-                        $schedules[Lift_Search::NEW_DOMAIN_CRON_INTERVAL] = array(
-                            'interval' => 60 * 5, // 5 mins
-                            'display' => '',
-                        );
-
-                        return $schedules;
-                    } );
-
-            add_action( self::INDEX_DOCUMENTS_HOOK, array( __CLASS__, 'cron_index_documents' ) );
-            add_action( self::SET_ENDPOINTS_HOOK, array( __CLASS__, 'cron_set_endpoints' ) );
-        }
-
-        public static function admin_init() {
-
-            // delete all data
-            if ( current_user_can( 'administrator' ) && isset( $_GET['lift-delete-all'] ) ) {
-                self::delete_all_data();
-                wp_redirect( admin_url( 'options-general.php?page=' . Lift_Search::ADMIN_STATUS_PAGE ) );
-            }
-
-            if ( isset( $_GET['page'] ) && Lift_Search::ADMIN_STATUS_PAGE == $_GET['page'] ) {
-
-                // require landing page to be filled out
-                if ( !isset( $_GET['lift-setup-complete'] ) &&
-                        (!(self::get_access_key_id() && self::get_secret_access_key() && self::get_search_domain() && get_option( self::INITIAL_SETUP_COMPLETE_OPTION, 0 )) )
-                ) {
-                    wp_redirect( admin_url( 'options-general.php?page=' . Lift_Search::ADMIN_LANDING_PAGE ) );
-                }
-
-                // send IndexDocuments request
-                if ( current_user_can( 'manage_options' ) && isset( $_GET['lift-indexdocuments'] ) ) {
-                    Cloud_Config_Request::IndexDocuments( self::get_search_domain() );
-                    wp_redirect( admin_url( 'options-general.php?page=' . Lift_Search::ADMIN_STATUS_PAGE ) );
-                }
-
-                // send next batch
-                if ( current_user_can( 'manage_options' ) && isset( $_GET['sync-queue'] ) ) {
-                    Lift_Batch_Queue::send_next_batch();
-                    wp_redirect( admin_url( 'options-general.php?page=' . Lift_Search::ADMIN_STATUS_PAGE ) );
-                }
-            }
-
-            foreach (array( 'user_admin_notices', 'admin_notices' ) as $filter) {
-                add_action( $filter, function() {
-                            if ( !(get_option( Lift_Search::INITIAL_SETUP_COMPLETE_OPTION, 0 ) && Lift_Search::get_access_key_id() && Lift_Search::get_secret_access_key() && Lift_Search::get_search_domain() ) ) {
-                                if ( !isset( $_GET['page'] ) || (isset( $_GET['page'] ) && Lift_Search::ADMIN_LANDING_PAGE != $_GET['page']) ) {
-                                    Lift_Search::configure_lift_nag();
-                                }
-                            }
-                        } );
-            }
-        }
-
-        /**
-         * Add link to access settings page on Plugin mainpage
-         * @param array $links
-         * @param string $page
-         * @return array 
-         */
-        public static function settings_link( $links, $page ) {
-            if ( $page == plugin_basename( __FILE__ ) ) {
-                $links[] = '<a href="' . admin_url( 'options-general.php?page=' . Lift_Search::ADMIN_LANDING_PAGE ) . '">Settings</a>';
-            }
-            return $links;
-        }
-
-        /**
-         * Setup settings in admin
-         * @method add_settings
-         */
-        public static function add_settings() {
-            $capability = apply_filters( 'lift_settings_capability', 'manage_options' );
-
-            add_options_page( 'Lift: Search for WordPress', 'Lift Search', $capability, self::ADMIN_STATUS_PAGE );
-            add_submenu_page( '', 'Lift: Search for Wordpress', 'Lift Search', $capability, self::ADMIN_LANDING_PAGE );
-
-            wp_enqueue_style( 'lift-search', plugins_url( 'sass/admin.css', __FILE__ ) );
-
-            // since add_options/submenu_page doesn't give us the correct hook...
-            foreach (array( 'lift-search/admin/setup.php', 'lift-search/admin/status.php' ) as $hook) {
-                add_action( "load-{$hook}", function() {
-                            wp_enqueue_script( 'lift-admin-settings', plugins_url( 'js/admin-settings.js', __FILE__ ), array( 'jquery' ) );
-                        } );
-            }
-        }
-
-        /**
-         * deletes all Lift: options, transients, queued posts, error logs, cron
-         * jobs
-         * 
-         * NOTE: not currently used anywhere but intended to be run manually for
-         * debugging/testing but can be used in a uninstall hook later
-         */
-        public static function delete_all_data() {
-            global $wpdb;
-
-            delete_option( self::SETTINGS_OPTION );
-            delete_option( self::INITIAL_SETUP_COMPLETE_OPTION );
-            delete_option( Lift_Batch_Queue::LAST_CRON_TIME_OPTION );
-            delete_option( self::INITIAL_SETUP_COMPLETE_OPTION );
-            delete_option( Lift_Batch_Queue::QUEUE_ALL_MARKER_OPTION );
-            delete_transient( Lift_Batch_Queue::BATCH_LOCK );
-
-            $wpdb->delete( $wpdb->posts, array( 'post_type ' => Lift_Document_Update_Queue::STORAGE_POST_TYPE ) );
-
-            Voce_Error_Logging::delete_logs( array( 'lift-search' ) );
-
-            wp_clear_scheduled_hook( self::INDEX_DOCUMENTS_HOOK );
-            wp_clear_scheduled_hook( Lift_Batch_Queue::BATCH_CRON_HOOK );
-            wp_clear_scheduled_hook( Lift_Batch_Queue::QUEUE_ALL_CRON_HOOK );
-        }
-
-        public static function ajax_set_cron_status() {
-            $set_cron = (bool) intval( $_POST['cron'] );
-
-            if ( $set_cron ) {
-                Lift_Batch_Queue::enable_cron();
-            } else {
-                Lift_Batch_Queue::disable_cron();
-            }
-
-            echo json_encode( array(
-                'set_cron' => $set_cron,
-                'last_cron' => Lift_Batch_Queue::get_last_cron_time(),
-                'next_cron' => Lift_Batch_Queue::get_next_cron_time()
-            ) );
-            die;
-        }
-
-        public static function ajax_test_access() {
-            echo json_encode( self::test_access( trim( $_POST['id'] ), trim( $_POST['secret'] ) ) );
-            die;
-        }
-
-        private function test_access( $id = '', $secret = '' ) {
+                    $schedules[Lift_Search::NEW_DOMAIN_CRON_INTERVAL] = array(
+                        'interval' => 60 * 5, // 5 mins
+                        'display' => '',
+                    );
+
+                    if ( Lift_Search::get_batch_interval() > 0 ) {
+                        $interval = Lift_Search::get_batch_interval();
+                    } else {
+                        $interval = 86400;
+                    }
+
+                    $schedules[Lift_Batch_Handler::CRON_INTERVAL] = array(
+                        'interval' => $interval,
+                        'display' => '',
+                    );
+
+                    return $schedules;
+                } );
+
+            //hooking into the index documents cron to tell AWS to start indexing documents
+            add_action( self::INDEX_DOCUMENTS_HOOK, function() {
+                    $domain_name = self::__get_setting( 'search-domain' );
+
+                    if ( !$domain_name ) {
+                        return;
+                    }
+
+                    $r = Cloud_Config_Request::IndexDocuments( $domain_name );
+
+                    if ( $r ) {
+                        wp_clear_scheduled_hook( self::INDEX_DOCUMENTS_HOOK );
+                    }
+                } );
+
+            //hooking into endpoints cron to "asynchronously" retrieve the endpoint data 
+            //from AWS
+            add_action( self::SET_ENDPOINTS_HOOK, function() {
+                    $domain_name = self::get_search_domain();
+
+                    if ( !$domain_name ) {
+                        return;
+                    }
+
+                    $document_endpoint = Cloud_Config_Request::DocumentEndpoint( $domain_name );
+                    $search_endpoint = Cloud_Config_Request::SearchEndpoint( $domain_name );
+
+                    if ( $document_endpoint && $search_endpoint ) {
+                        self::__set_setting( 'document-endpoint', $document_endpoint );
+                        self::__set_setting( 'search-endpoint', $search_endpoint );
+                        wp_clear_scheduled_hook( self::SET_ENDPOINTS_HOOK );
+                    }
+                } );
+        }
+
+        public function test_access( $id = '', $secret = '' ) {
 
             $credentials = array( 'access-key-id' => $id, 'secret-access-key' => $secret );
@@ -260 +197 @@
         }
 
-        public static function ajax_test_domain() {
-
-            $test_access = self::test_access( self::get_access_key_id(), self::get_secret_access_key() );
-            if ( $test_access['error'] ) {
-                echo json_encode( $test_access );
-                die;
-            }
-
-            $domain = strtolower( trim( $_POST['domain'] ) );
-
-            $error = false;
-            $replacing_domain = ( self::get_search_domain() != $domain );
-
-            try {
-                if ( Cloud_Config_Request::TestDomain( $domain ) ) {
-                    $status_message = 'Success';
-                    self::__set_setting( self::SEARCH_DOMAIN, $domain );
-
-                    $document_endpoint = Cloud_Config_Request::DocumentEndpoint( $domain );
-                    $search_endpoint = Cloud_Config_Request::SearchEndpoint( $domain );
-
-                    try {
-                        if ( $document_endpoint && $search_endpoint ) {
-                            self::__set_setting( 'document-endpoint', $document_endpoint );
-                            self::__set_setting( 'search-endpoint', $search_endpoint );
-                        } else {
-                            $status_message = 'Unable to set endpoints. If this is a newly-created search domain it will take up to 30 minutes for endpoints to become available. Please try back later.';
-                            $error = true;
-
-                            self::__set_setting( self::SEARCH_DOMAIN, $domain );
-                        }
-                    } catch ( Exception $e ) {
-                        //@todo add exception logging for endpoint failure
-                        $status_message = "Unable to set endpoints. Please check the search domain's status in the AWS Console";
-                        $error = true;
-
-                        self::__set_setting( self::SEARCH_DOMAIN, $domain );
-                    }
-                } else {
-                    $status_message = 'Domain could not be found. <span class="">Would you like to <a id="lift-create-domain" data-domain="' . esc_attr( $domain ) . '" href="#">create this domain with Lift\'s default indexes</a>?</span>';
-                    $error = true;
-                }
-            } catch ( Exception $e ) {
-                // @todo add exception logging for domain check failure
-                $status_message = 'There was an error checking the domain. Please try again.';
-                $error = true;
-            }
-
-            if ( !$error && $replacing_domain ) {
-                // mark setup complete
-                update_option( self::INITIAL_SETUP_COMPLETE_OPTION, 1 );
-                Lift_Batch_Queue::enable_cron();
-                Lift_Batch_Queue::queue_all();
-            }
-
-            echo json_encode( array( 'error' => $error, 'message' => $status_message ) );
-            die;
-        }
-
-        public static function ajax_create_domain() {
-
-            $domain = strtolower( trim( $_POST['domain'] ) );
-
-            $error = false;
-            $status_messages = array( );
-
-            $r = Cloud_Config_Request::CreateDomain( $domain );
-
-            if ( $r ) {
-
-                self::__set_setting( self::SEARCH_DOMAIN, $domain );
-
-                $r = Cloud_Config_Request::LoadSchema( $domain );
-
-                if ( $r ) {
-                    if ( $r->DescribeDomainsResponse->DescribeDomainsResult->DomainStatusList ) {
-                        $status_messages[] = 'Index created succesfully.';
-                        self::__set_setting( 'document-endpoint', '' );
-                        self::__set_setting( 'search-endpoint', '' );
-                        self::add_new_domain_crons(); // add crons
-                    } else {
-                        $status_messages[] = 'There was an error creating an index for your domain.';
-                        $error = true;
-
-                        Lift_Search::event_log( 'Cloud_Config_Request::LoadSchema (http success)', $r, array( 'error' ) );
-                    }
-                } else {
-                    $status_message = 'There was an error creating an index for your domain.';
-                    $status_messages[] = $status_message;
-                    $error = true;
-
-                    Lift_Search::event_log( 'Cloud_Config_Request::LoadSchema', $status_message, array( 'error' ) );
-                }
-
-                $r = Cloud_Config_Request::UpdateServiceAccessPolicies( $domain, Cloud_Config_Request::GetDefaultServiceAccessPolicy( $domain ) );
-
-                if ( $r ) {
-                    $status_messages[] = 'Service Access Policies successfully configured.';
-                } else {
-                    $status_messages[] = 'Service Access Policies could not be set. You will need to use the AWS Console to set them for this search domain.';
-                    $error = true;
-
-                    Lift_Search::event_log( 'Cloud_Config_Request::UpdateServiceAccessPolicies', $r, array( 'error' ) );
-                }
-            } else {
-                $status_message = 'There was an error creating your domain. Please make sure the domain name follows the rules above and try again.';
-                $status_messages[] = $status_message;
-                $error = true;
-
-                Lift_Search::event_log( 'Cloud_Config_Request::CreateDomain', $status_message, array('error' ) );
-            }
-
-            if ( !$error ) {
-                // mark setup complete, enable cron and queue all posts
-                update_option( self::INITIAL_SETUP_COMPLETE_OPTION, 1 );
-                Lift_Batch_Queue::enable_cron();
-                Lift_Batch_Queue::queue_all();
-
-                $status_messages[] = "New search domains take approximately 30-45 minutes to become active. Once your search domain is 
-                    available on CloudSearch, Lift will complete it's configuration, index all posts on your site, and 
-                    queue up new posts to be synced periodically.";
-            }
-
-            echo json_encode( array(
-                'error' => $error,
-                'message' => join( ' ', $status_messages ),
-            ) );
-
-            exit;
-        }
-
-        public static function ajax_delete_error_logs() {
-            $response = Voce_Error_Logging::delete_logs( array( 'lift-search' ) );
-            echo json_encode( $response );
-            die();
-        }
-
         /**
          * schedule crons needed for new domains. clear existing crons first.
          * 
          */
-        private static function add_new_domain_crons() {
+        public static function add_new_domain_crons() {
             wp_clear_scheduled_hook( self::INDEX_DOCUMENTS_HOOK );
             wp_clear_scheduled_hook( self::SET_ENDPOINTS_HOOK );
@@ -407 +207 @@
             wp_schedule_event( time(), self::NEW_DOMAIN_CRON_INTERVAL, self::INDEX_DOCUMENTS_HOOK );
             wp_schedule_event( time(), self::NEW_DOMAIN_CRON_INTERVAL, self::SET_ENDPOINTS_HOOK );
-        }
-
-        /**
-         * cron hook to send an IndexDocuments request to CloudSearch. cron
-         * is unscheduled when the documents are indexed successfully.
-         *
-         */
-        public static function cron_index_documents() {
-            $domain_name = self::__get_setting( self::SEARCH_DOMAIN );
-
-            if ( !$domain_name ) {
-                return;
-            }
-
-            $r = Cloud_Config_Request::IndexDocuments( $domain_name );
-
-            if ( $r ) {
-                wp_clear_scheduled_hook( self::INDEX_DOCUMENTS_HOOK );
-            }
         }
 
@@ -450 +231 @@
         }
 
-        public static function ajax_update_cron_interval() {
-            $units = (string) $_POST['cron_interval_units'];
-            $units = in_array( $units, array( 'm', 'h', 'd' ) ) ? $units : 'm';
-
-            $interval = (int) $_POST['cron_interval'];
-            $interval = ($units == 'm' && $interval < 1 ? 1 : $interval);
-
-            switch ( $units ) {
-                case 'd':
-                    $interval *= 24;
-                case 'h':
-                    $interval *= 60;
-                case 'm':
-                    $interval *= 60;
-            }
-
-            self::__set_setting( 'batch-interval', $interval );
-            self::__set_setting( 'batch-interval-units', $units );
-
-            if ( Lift_Batch_Queue::cron_enabled() ) {
-                Lift_Batch_Queue::disable_cron(); // kill the scheduled event
-                $last_time = get_option( Lift_Batch_Queue::LAST_CRON_TIME_OPTION, time() );
-
-                wp_schedule_event( $last_time + $interval, Lift_Batch_Queue::CRON_INTERVAL, Lift_Batch_Queue::BATCH_CRON_HOOK ); // schedule the next one based on the last
-
-                Lift_Batch_Queue::enable_cron();
-            }
-
-            echo json_encode( array(
-                'last_cron' => Lift_Batch_Queue::get_last_cron_time(),
-                'next_cron' => Lift_Batch_Queue::get_next_cron_time()
-            ) );
-            die;
-        }
-
-        /**
-         * Get a setting using Voce_Settings_API
+        /**
+         * Get a setting lift setting
          * @param string $setting
          * @param string $group
@@ -492 +238 @@
          */
         private static function __get_setting( $setting ) {
-            $option = get_option( self::SETTINGS_OPTION, array( ) );
-            // Ensure this is an array. WP does not despite the request for a default.
-            if ( is_array( $option ) ) {
-                $settings = array_merge( self::$default_settings, $option );
-                return (isset( $settings[$setting] )) ? $settings[$setting] : false;
+            // Note: batch-interval should be in seconds, regardless of what batch-interval-units is set to
+            $default_settings = array( 'batch-interval' => 300, 'batch-interval-units' => 'm' );
+
+            $settings = get_option( self::SETTINGS_OPTION, array( ) );
+
+            if ( !is_array( $settings ) ) {
+                $settings = $default_settings;
             } else {
-                return $option;
-            }
+                $settings = wp_parse_args( $settings, $default_settings );
+            }
+
+            return (isset( $settings[$setting] )) ? $settings[$setting] : false;
         }
 
@@ -517 +267 @@
 
         /**
+         * Sets the access key id
+         * @param type $value 
+         */
+        public static function set_access_key_id( $value ) {
+            self::__set_setting( 'access-key-id', $value );
+        }
+
+        /**
          * Get secret access key
          * @return string
@@ -525 +283 @@
 
         /**
+         * Sets the secret key id
+         * @param type $value 
+         */
+        public static function set_secret_access_key( $value ) {
+            self::__set_setting( 'secret-access-key', $value );
+        }
+
+        /**
          * Get search domain
          * @return string
          */
         public static function get_search_domain() {
-            return apply_filters( 'lift_search_domain', self::__get_setting( self::SEARCH_DOMAIN ) );
+            return apply_filters( 'lift_search_domain', self::__get_setting( 'search-domain' ) );
+        }
+
+        public static function set_search_domain( $value ) {
+            self::__set_setting( 'search-domain', $value );
+            self::__update_endpoints();
+        }
+
+        private static function __update_endpoints() {
+            if ( $search_domain = self::get_search_domain() ) {
+                $document_endpoint = Cloud_Config_Request::DocumentEndpoint( $search_domain );
+                $search_endpoint = Cloud_Config_Request::SearchEndpoint( $search_domain );
+
+                if ( $document_endpoint && $search_endpoint ) {
+                    self::__set_setting( 'document-endpoint', $document_endpoint );
+                    self::__set_setting( 'search-endpoint', $search_endpoint );
+                }
+            }
         }
 
@@ -537 +320 @@
          */
         public static function get_search_endpoint() {
+            if ( !self::__get_setting( 'search-endpoint' ) ) {
+                self::__update_endpoints();
+            }
             return apply_filters( 'lift_search_endpoint', self::__get_setting( 'search-endpoint' ) );
+        }
+
+        public static function set_search_endpoint( $value ) {
+            self::__set_setting( 'search-endpoint', $value );
         }
 
@@ -545 +335 @@
          */
         public static function get_document_endpoint() {
+            if ( !self::__get_setting( 'document-endpoint' ) ) {
+                self::__update_endpoints();
+            }
             return apply_filters( 'lift_document_endpoint', self::__get_setting( 'document-endpoint' ) );
+        }
+
+        public static function set_document_endpoint( $value ) {
+            self::__set_setting( 'document-endpoint', $value );
         }
 
@@ -556 +353 @@
         }
 
-        /**
-         * Get batch interval setting, adjusted for time unit
-         * @return int
-         */
-        public static function get_batch_interval_adjusted() {
-            $adjusted = self::get_batch_interval();
-
-            switch ( self::get_batch_interval_unit() ) {
+        public static function get_batch_interval_display() {
+            $value = self::get_batch_interval();
+            $unit = self::__get_setting( 'batch-interval-unit' );
+            switch ( $unit ) {
                 case 'd':
-                    $adjusted /= 24;
+                    $value /= 24;
                 case 'h':
-                    $adjusted /= 60;
+                    $value /= 60;
                 case 'm':
-                    $adjusted /= 60;
-            }
-
-            return apply_filters( 'lift_batch_interval_adjusted', $adjusted );
-        }
-
-        /**
-         * Get batch interval unit setting
-         * @return string
-         */
-        public static function get_batch_interval_unit() {
-            return apply_filters( 'lift_batch_interval_unit', self::__get_setting( 'batch-interval-units' ) );
+                default:
+                    $unit = 'm';
+                    $value /= 60;
+            }
+
+            return apply_filters( 'lift_batch_interval_display', compact( 'value', 'unit' ) );
+        }
+
+        /**
+         * Sets the batch interval based off of user facing values
+         * @param int $value The number of units
+         * @param string $unit The shorthand value of the unit, options are 'm','h','d'
+         */
+        public static function set_batch_interval_display( $value, $unit ) {
+            $old_interval = self::get_batch_interval_display();
+            $has_changed = false;
+
+            foreach ( array( 'value', 'unit' ) as $key ) {
+                if ( $old_interval[$key] != $$key ) {
+                    $has_changed = true;
+                    break;
+                }
+            }
+
+            if ( $has_changed ) {
+                $interval = $value;
+                switch ( $unit ) {
+                    case 'd':
+                        $interval *= 24;
+                    case 'h':
+                        $interval *= 60;
+                    case 'm':
+                    default:
+                        $unit = 'm';
+                        $interval *= 60;
+                }
+
+                self::__set_setting( 'batch-interval-unit', $unit );
+                self::__set_setting( 'batch-interval', $interval );
+
+                if ( Lift_Batch_Handler::cron_enabled() ) {
+                    $last_time = get_option( Lift_Batch_Handler::LAST_CRON_TIME_OPTION, time() );
+
+                    Lift_Batch_Handler::enable_cron( $last_time + $interval );
+                }
+            }
         }
 
@@ -598 +425 @@
             $lift_http = self::get_http_api();
             return new Cloud_API( $lift_http,
-                            Lift_Search::get_document_endpoint(), Lift_Search::get_search_endpoint(), '2011-02-01' );
+                    Lift_Search::get_document_endpoint(), Lift_Search::get_search_endpoint(), '2011-02-01' );
         }
 
         public static function get_indexed_post_types() {
-            return apply_filters( 'lift_indexed_post_types', self::$allowed_post_types );
-        }
-
-        public static function configure_lift_nag() {
-            ?>
-            <div id="banneralert" class="lift-colorized">
-                <div class="lift-balloon">
-                    <img src="<?php echo plugin_dir_url( __FILE__ ) ?>img/logo.png" alt="Lift Logo">
-                </div>
-                <div class="lift-message"><p><strong>Welcome to Lift</strong>:  Now that you've activated the Lift plugin it's time to set it up. Click below to get started. </p></div>
-                <div><a class="lift-btn" href="<?php echo admin_url( 'options-general.php?page=' . Lift_Search::ADMIN_LANDING_PAGE ) ?>">Configure Lift</a></div>
-                <div class="clr"></div>
-            </div>
-            <script>
-                jQuery(document).ready(function($) {
-                    var $bannerAlert = $('#banneralert');
-                    if ( $bannerAlert.length ) {
-                        $('.wrap h2').first().after($bannerAlert);
-                    }
-                });
-            </script>
-            <?php
+            return apply_filters( 'lift_indexed_post_types', array( 'post', 'page' ) );
+        }
+
+        public static function get_indexed_post_fields( $post_type ) {
+            return apply_filters( 'lift_indexed_post_fields', array(
+                    'post_title',
+                    'post_content',
+                    'post_excerpt',
+                    'post_date_gmt',
+                    'post_excerpt',
+                    'post_status',
+                    'post_type',
+                    'post_author'
+                    ), $post_type );
         }
 
         public static function RecentLogTable() {
+            if ( !self::error_logging_enabled() ) {
+                return '<div class="notice">Error Logging is Disabled</div>';
+            }
+
             $args = array(
                 'post_type' => Voce_Error_Logging::POST_TYPE,
@@ -666 +489 @@
             return $html;
         }
-        
+
         /**
          * Log Events
@@ -673 +496 @@
          * @return boolean 
          */
-        public static function event_log($message, $error, $tags = array()){
-            if(function_exists('voce_error_log')){
-                return voce_error_log( $message, $error, array_merge(array( 'lift-search'), (array) $tags) );
+        public static function event_log( $message, $error, $tags = array( ) ) {
+            if ( function_exists( 'voce_error_log' ) ) {
+                return voce_error_log( $message, $error, array_merge( array( 'lift-search' ), ( array ) $tags ) );
             } else {
                 return false;
@@ -681 +504 @@
         }
 
+        public static function __upgrade_check() {
+            global $wpdb;
+
+            $db_version = get_option( 'lift_db_version', 0 );
+            if ( $db_version < 2 ) {
+
+                $post_ids = $wpdb->get_col( "SELECT ID FROM $wpdb->posts " .
+                    "WHERE post_type = '" . Lift_Document_Update_Queue::STORAGE_POST_TYPE . "'" );
+
+                $queue_id = Lift_Document_Update_Queue::get_active_queue_id();
+
+                foreach ( $post_ids as $post_id ) {
+                    if ( $update_meta = get_post_meta( $post_id, 'lift_content', true ) ) {
+                        if ( is_string( $update_meta ) )
+                            $update_meta = maybe_unserialize( $update_meta ); //previous versions double serialized meta
+
+                        $meta_key = 'lift_update_' . $update_meta['document_type'] . '_' . $update_meta['document_id'];
+                        $new_meta = array(
+                            'document_id' => $update_meta['document_id'],
+                            'document_type' => $update_meta['document_type'],
+                            'action' => $update_meta['action'],
+                            'fields' => $update_meta['fields'],
+                            'update_date_gmt' => get_post_time( 'Y-m-d H:i:s', true, $post_id ),
+                            'update_date' => get_post_time( 'Y-m-d H:i:s', false, $post_id )
+                        );
+                        update_post_meta( $queue_id, $meta_key, $new_meta );
+
+                        wp_delete_post( $post_id );
+                    }
+                }
+
+                update_option( 'lift_db_version', 2 );
+            }
+        }
+
     }
 
-    Lift_Search::init();
+    add_action( 'plugins_loaded', array( 'Lift_Search', 'init' ) );
 }
+
+
+register_deactivation_hook( __FILE__, '_lift_deactivate' );
+
+function _lift_deactivate() {
+    // @TODO Clean up batch posts and any scheduled crons
+    //clean up options
+    delete_option( Lift_Search::INITIAL_SETUP_COMPLETE_OPTION );
+    delete_option( Lift_Search::SETTINGS_OPTION );
+    delete_option( 'lift_db_version' );
+
+    if ( class_exists( 'Voce_Error_Logging' ) ) {
+        Voce_Error_Logging::delete_logs( array( 'lift-search' ) );
+    }
+
+    wp_clear_scheduled_hook( Lift_Search::INDEX_DOCUMENTS_HOOK );
+
+    Lift_Batch_Handler::_deactivation_cleanup();
+    Lift_Document_Update_Queue::_deactivation_cleanup();
+}

lift-search/trunk/readme.txt

@@ -4 +4 @@
 Requires at least: 3.4.2
 Tested up to: 3.5
-Stable tag: 1.1
+Stable tag: 1.2
 License: GPLv2 or later
 License URI: http://www.gnu.org/licenses/gpl-2.0.html
@@ -84 +84 @@
 The Query Parameter to enter (step #8) is "s".
 
+= What index fields are used when Lift configures a new search domain? =
+The index fields are set as follows:
+`Field                    Type     Facet          Result   Search
+-----------------------  -------  -------------  ------   -------------
+id                       uint     Yes (default)  No       Yes (default)
+post_author              uint     Yes (default)  No       Yes (default)
+post_author_name         text     No             Yes      Yes (default)
+taxonomy_category_id     literal  Yes            No       No
+taxonomy_category_label  text     No             No       Yes (default)
+post_content             text     No             No       Yes (default)
+post_date_gmt            uint     Yes (default)  No       Yes (default)
+post_status              literal  Yes            No       No
+post_title               text     No             Yes      Yes (default)
+post_type                literal  Yes            No       Yes
+comment_count            uint     Yes (default)  No       Yes (default)
+taxonomy_tags_id         literal  Yes            No       No
+taxonomy_tags_label      text     No             No       Yes (default)`
+
+= Which post types are indexed by default? How do I modify which post types are indexed? =
+By default, posts and pages are indexed. To modify this, use the `lift_indexed_post_types` filter which is an array of post types to index. 
+
 == Screenshots ==
 
@@ -91 +112 @@
 
 == Changelog ==
+
+= 1.2 =
+* Bug Fix: Fixed bug where some fields would be deleted from AWS after update.
+* Bug Fix: Fixed issue with ALTERNATE_CRON compatibility.
+* Bug Fix: Fixed initialization of queuing all posts after setup.
+* Bug Fix: Fixed post status handling when searching from the wp-admin.
+* Refactor: Added un-install hooks for cleanup after deactivation.
+* Refactor: Performance tweaks.
+* Refactor: Removed references to WP_PLUGIN_DIR for more flexible installations
+* Refactor: Updated storage for queued updates.
+* Refactor: Added ability to disable voce-error-logging integration.
 
 = 1.1 =

lift-search/trunk/sass/admin.css

@@ -7 +7 @@
 /* line 14, admin.scss */
 #banneralert { margin-bottom: 10px; }
+/* line 16, admin.scss */
+#banneralert .clr { clear: both; margin: 0; height: 0; font-size: 0; }
 
-/* line 18, admin.scss */
+/* line 24, admin.scss */
 .lift-colorized { font-family: arial,sans-serif; padding: 12px; border: 1px #8bcce4 solid; background: #b3e2f3; /* Old browsers */ background: -moz-linear-gradient(top, #b3e2f3 59%, white 94%); /* FF3.6+ */ background: -webkit-gradient(linear, left top, left bottom, color-stop(59%, #b3e2f3), color-stop(94%, white)); /* Chrome,Safari4+ */ background: -webkit-linear-gradient(top, #b3e2f3 59%, white 94%); /* Chrome10+,Safari5.1+ */ background: -o-linear-gradient(top, #b3e2f3 59%, white 94%); /* Opera 11.10+ */ background: -ms-linear-gradient(top, #b3e2f3 59%, white 94%); /* IE10+ */ background: linear-gradient(to bottom, #b3e2f3 59%, #ffffff 94%); /* W3C */ filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#b3e2f3',endColorstr='#ffffff',GradientType=0 ); /* IE6-9 */ /* radii */ -moz-border-radius: 3px; -webkit-border-radius: 3px; border-radius: 3px; }
 
-/* line 29, admin.scss */
+/* line 35, admin.scss */
 .lift-btn { border: 1px #416b05 solid; padding: 8px 46px; text-align: center; width: 200px; background: #c0fb6c; /* Old browsers */ background: -moz-linear-gradient(top, #c0fb6c 0%, #99d93c 2%, #609b0d 98%, #aceb53 100%); /* FF3.6+ */ background: -webkit-gradient(linear, left top, left bottom, color-stop(0%, #c0fb6c), color-stop(2%, #99d93c), color-stop(98%, #609b0d), color-stop(100%, #aceb53)); /* Chrome,Safari4+ */ background: -webkit-linear-gradient(top, #c0fb6c 0%, #99d93c 2%, #609b0d 98%, #aceb53 100%); /* Chrome10+,Safari5.1+ */ background: -o-linear-gradient(top, #c0fb6c 0%, #99d93c 2%, #609b0d 98%, #aceb53 100%); /* Opera 11.10+ */ background: -ms-linear-gradient(top, #c0fb6c 0%, #99d93c 2%, #609b0d 98%, #aceb53 100%); /* IE10+ */ background: linear-gradient(to bottom, #c0fb6c 0%, #99d93c 2%, #609b0d 98%, #aceb53 100%); /* W3C */ filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#c0fb6c',endColorstr='#aceb53',GradientType=0 ); /* IE6-9 */ color: #fff; text-shadow: rgba(0, 0, 0, 0.75) 0px 1px 0px; -moz-border-radius: 3px; -webkit-border-radius: 3px; border-radius: 3px; }
 
-/* line 39, admin.scss */
+/* line 45, admin.scss */
 .lift-btn a { color: #fff; }
 
-/* line 40, admin.scss */
+/* line 46, admin.scss */
 td.lift-sync { padding-bottom: .5em; }
 
-/* line 44, admin.scss */
+/* line 50, admin.scss */
 .lift-auto-update-options h4 { margin-top: 0px; margin-bottom: .5em; }
 
-/* line 45, admin.scss */
+/* line 51, admin.scss */
 #lift-submit-row { width: 315px; }
 
-/* line 48, admin.scss */
+/* line 54, admin.scss */
 .lift-admin { /****** SETUP PAGE ******/ /****** STATUS PAGE ******/ }
-/* line 50, admin.scss */
+/* line 56, admin.scss */
 .lift-admin .clr { clear: both; margin: 0; height: 0; font-size: 0; }
-/* line 56, admin.scss */
+/* line 62, admin.scss */
 .lift-admin a { text-decoration: none; }
-/* line 60, admin.scss */
+/* line 66, admin.scss */
 .lift-admin p em { background: #d7e5f1; display: inline-block; margin-left: -58px; margin-right: 13px; font-size: 1.5em; line-height: 42px; height: 42px; width: 42px; border-radius: 21px; font-style: normal; text-align: center; color: #464646; }
-/* line 75, admin.scss */
+/* line 81, admin.scss */
 .lift-admin input[attr=disabled] { background: #999; color: #777; }
-/* line 80, admin.scss */
+/* line 86, admin.scss */
 .lift-admin .indent { padding: 15px 2.7472527473%; border-top: 1px solid #d1d1d1; }
-/* line 84, admin.scss */
+/* line 90, admin.scss */
 .lift-admin .lift-light-grey { color: #999; }
-/* line 88, admin.scss */
+/* line 94, admin.scss */
 .lift-admin .header-img, .lift-admin .header-img img { width: 100%; }
-/* line 92, admin.scss */
+/* line 98, admin.scss */
 .lift-admin h2.lift-logo { display: block; background: url(../img/lift-logo.png) no-repeat 0 8px; padding-left: 44px; }
-/* line 96, admin.scss */
+/* line 102, admin.scss */
 .lift-admin h2.lift-logo em { color: #0e5abd; font: italic 0.8125em Georgia, serif; }
-/* line 101, admin.scss */
+/* line 107, admin.scss */
 .lift-admin #update-ajax-loader { position: absolute; margin: 7px 0 0 -20px; }
-/* line 106, admin.scss */
+/* line 112, admin.scss */
 .lift-admin .success-message { color: green; }
-/* line 109, admin.scss */
+/* line 115, admin.scss */
 .lift-admin .error-message { color: red; }
-/* line 112, admin.scss */
+/* line 118, admin.scss */
 .lift-admin .width-70 { width: 70%; }
-/* line 114, admin.scss */
+/* line 120, admin.scss */
 .lift-admin .width-70 input, .lift-admin .width-70 select { margin-bottom: 10px; }
-/* line 117, admin.scss */
+/* line 123, admin.scss */
 .lift-admin .width-70 .misc-pub-section { padding-top: 0; }
-/* line 121, admin.scss */
+/* line 127, admin.scss */
 .lift-admin .width-30 { width: 30%; }
-/* line 124, admin.scss */
+/* line 130, admin.scss */
 .lift-admin .btn { border: 1px solid #bbb; border-radius: 8px; line-height: 18px; padding: 0 10px; font-size: 14px; text-decoration: none; margin-left: 10px; color: #464646; font-family: 'Helvetica Nueue', Helvetica, Arial, sans-serif; }
-/* line 139, admin.scss */
+/* line 145, admin.scss */
 .lift-admin .ordered-list { padding-left: 58px; }
-/* line 141, admin.scss */
+/* line 147, admin.scss */
 .lift-admin .ordered-list p { line-height: 1em; }
-/* line 144, admin.scss */
+/* line 150, admin.scss */
 .lift-admin .ordered-list .form-table th:first-child { padding-left: 0; }
-/* line 147, admin.scss */
+/* line 153, admin.scss */
 .lift-admin .ordered-list .lift-step-3[disabled="disabled"], .lift-admin .ordered-list .lift-step-4[disabled="disabled"] { color: #ccc; cursor: default; }
-/* line 156, admin.scss */
+/* line 162, admin.scss */
 .lift-admin .dashboard { border: 1px solid #d1d1d1; padding-bottom: 15px; }
-/* line 160, admin.scss */
+/* line 166, admin.scss */
 .lift-admin .dashboard #lift-remote-status { padding: 0 8px; }
-/* line 164, admin.scss */
+/* line 170, admin.scss */
 .lift-admin .dashboard .lift-snapshot { width: 100%; border-bottom: 1px solid #e6e6e6; font-size: 16px; border-spacing: 0; }
-/* line 169, admin.scss */
+/* line 175, admin.scss */
 .lift-admin .dashboard .lift-snapshot hr { background: #999; background: rgba(0, 0, 0, 0.2); margin: 12px 0; height: 1px; overflow: hidden; font-size: 0; border: none; }
-/* line 178, admin.scss */
+/* line 184, admin.scss */
 .lift-admin .dashboard .lift-snapshot h3 { margin: 4px 0 16px 0; }
-/* line 181, admin.scss */
+/* line 187, admin.scss */
 .lift-admin .dashboard .lift-snapshot td { background: #f6f6f6; width: 66%; border-left: 1px solid #d1d1d1; padding: 13px 14px 0 14px; vertical-align: top; }
-/* line 187, admin.scss */
+/* line 193, admin.scss */
 .lift-admin .dashboard .lift-snapshot td.status { vertical-align: middle; width: 20%; background: #99cd67; border-bottom: 7px solid #659b31; border-left: none; padding-left: 13px; }
-/* line 195, admin.scss */
+/* line 201, admin.scss */
 .lift-admin .dashboard .lift-snapshot td.edit { vertical-align: middle; text-align: center; width: 14%; background: #f6f6f6 url(../img/status.png) no-repeat 0 -64px; padding: 0 10px; }
-/* line 203, admin.scss */
-.lift-admin .dashboard .lift-snapshot td.status h3 { font: bold 1.375em/1.18182em "Helvetica Neue", Helvetica, Arial, sans-serif; color: #fff; padding: 0 0 0 47px; text-transform: uppercase; position: relative; margin-bottom: 0; }
-/* line 211, admin.scss */
+/* line 209, admin.scss */
+.lift-admin .dashboard .lift-snapshot td.status h3 { font: bold 1.375em/1.182em "Helvetica Neue", Helvetica, Arial, sans-serif; color: #fff; padding: 0 0 0 47px; text-transform: uppercase; position: relative; margin-bottom: 0; }
+/* line 217, admin.scss */
 .lift-admin .dashboard .lift-snapshot td.status h3:after { position: absolute; content: ''; display: block; background: url(../img/status.png) no-repeat; width: 34px; height: 34px; top: -3px; left: 0; }
-/* line 223, admin.scss */
+/* line 229, admin.scss */
 .lift-admin .dashboard .lift-snapshot td.status p { display: none; text-align: left; margin: 0; padding: 0 0 0 49px; font-weight: normal; font-size: .85em; }
-/* line 230, admin.scss */
+/* line 236, admin.scss */
 .lift-admin .dashboard .lift-snapshot td.status p a { font-size: .75em; text-decoration: none; }
-/* line 234, admin.scss */
+/* line 240, admin.scss */
 .lift-admin .dashboard .lift-snapshot td.status p a:hover { text-decoration: underline; }
-/* line 239, admin.scss */
+/* line 245, admin.scss */
 .lift-admin .dashboard .lift-snapshot td.status ul { padding: 0 3px 0 20px; list-style: square; font-size: .85em; }
-/* line 247, admin.scss */
+/* line 253, admin.scss */
 .lift-admin .dashboard .lift-snapshot td.status.caution { background-color: #fac604; border-color: #d3a700; }
-/* line 251, admin.scss */
+/* line 257, admin.scss */
 .lift-admin .dashboard .lift-snapshot td.status.caution p a { color: #7e6400; }
-/* line 255, admin.scss */
+/* line 261, admin.scss */
 .lift-admin .dashboard .lift-snapshot td.status.caution h3:after { background-position: -44px 0; }
-/* line 259, admin.scss */
+/* line 265, admin.scss */
 .lift-admin .dashboard .lift-snapshot td.status.error { background-color: #c10c0c; border-color: #8f0909; }
-/* line 263, admin.scss */
+/* line 269, admin.scss */
 .lift-admin .dashboard .lift-snapshot td.status.error p a { color: #fff; }
-/* line 267, admin.scss */
+/* line 273, admin.scss */
 .lift-admin .dashboard .lift-snapshot td.status.error h3:after { background-position: -93px 0; }
-/* line 272, admin.scss */
+/* line 278, admin.scss */
 .lift-admin .dashboard .lift-snapshot td.status.caution p, .lift-admin .dashboard .lift-snapshot td.status.error p { display: block; }
-/* line 279, admin.scss */
+/* line 285, admin.scss */
 .lift-admin .dashboard .lift-snapshot .status-message { font-weight: bold; }
-/* line 283, admin.scss */
+/* line 289, admin.scss */
 .lift-admin .dashboard .lift-snapshot input.cron-update { width: 5em; text-align: center; }
-/* line 288, admin.scss */
+/* line 294, admin.scss */
 .lift-admin .dashboard .lift-snapshot table.lift-schedule { width: 110%; float: right; }
-/* line 291, admin.scss */
+/* line 297, admin.scss */
 .lift-admin .dashboard .lift-snapshot table.lift-schedule td { padding: 0px; border: none; text-align: right; }
-/* line 297, admin.scss */
+/* line 303, admin.scss */
 .lift-admin .dashboard .lift-snapshot table.lift-schedule td:first-child { width: 10%; text-align: left; }
-/* line 303, admin.scss */
+/* line 309, admin.scss */
 .lift-admin .dashboard .lift-snapshot .lift-index-now { padding-top: .5em; float: right; }
-/* line 310, admin.scss */
+/* line 316, admin.scss */
 .lift-admin .dashboard .misc-pub-section { border: none; font-size: .75em; margin: 0; padding: 7px 0 0 0; }
-/* line 317, admin.scss */
+/* line 323, admin.scss */
 .lift-admin .dashboard .log-table td { text-align: left; }
-/* line 321, admin.scss */
+/* line 327, admin.scss */
 .lift-admin .dashboard #set-cron-status { text-align: center; position: relative; display: block; margin: 0; float: right; width: 110px; height: 30px; border-radius: 6px; -moz-border-radius: 6px; -webkit-border-radius: 6px; background: #F6F6F6; -webkit-transition: all 0.25s ease-in-out; -moz-transition: all 0.25s ease-in-out; transition: all 0.25s ease-in-out; cursor: pointer; -webkit-box-shadow: inset 1px 1px 10px 1px #999; box-shadow: inset 1px 1px 10px 1px #999; }
-/* line 340, admin.scss */
+/* line 346, admin.scss */
 .lift-admin .dashboard #set-cron-status .slider-button { display: block; width: 60px; height: 30px; line-height: 30px; padding-top: 0; padding-bottom: 0; border-radius: 6px; -moz-border-radius: 6px; -webkit-border-radius: 6px; text-align: center; box-sizing: border-box; -moz-box-sizing: border-box; -webkit-box-sizing: border-box; }
-/* line 355, admin.scss */
+/* line 361, admin.scss */
 .lift-admin .dashboard #set-cron-status .on { margin-left: 49px; }
-/* line 358, admin.scss */
+/* line 364, admin.scss */
 .lift-admin .dashboard #set-cron-status.disabled, .lift-admin .dashboard #set-cron-status.disabled span:hover, .lift-admin .dashboard #set-cron-status.disabled span:focus { cursor: default !important; border-color: #bbb; }
-/* line 362, admin.scss */
+/* line 368, admin.scss */
 .lift-admin .dashboard #set-cron-status.disabled .on, .lift-admin .dashboard #set-cron-status.disabled .on:hover { background: gray; border: 1px solid #999; box-shadow: none; -moz-box-shadow: none; -webkit-box-shadow: none; border-color: #999; }

lift-search/trunk/sass/admin.scss

@@ -14 +14 @@
 #banneralert {
     margin-bottom: 10px;
+    .clr {
+        clear: both;
+        margin: 0;
+        height: 0;
+        font-size: 0;
+    }
 }
 

lift-search/trunk/wp/lift-health.php

@@ -4 +4 @@
 
     class Lift_Health {
-        
-        /**
-         * Combine the remote and local health into one
-         * 
-         * @return array 
-         */
-        public static function get_overall_status() {
-            
-            $local_status = self::get_local_status();
-            $remote_status = self::get_remote_status();
-            
-            $reason = array();
-            
-            if ( $local_status['reason'] ) {
-                $reason[] = $local_status['reason'];
-            }
-            if ( $remote_status['reason'] ) {
-                $reason[] = $remote_status['reason'];
-            }
-
-            $severity = max( $local_status['severity'], $remote_status['severity'] );
-            $errors = ( $local_status['errors'] or $remote_status['errors'] );
-            
-            $remote_status = $remote_status['status'];
-            $local_status = $local_status['status'];
-
-            $results = compact(
-                'severity',
-                'reason',
-                'errors',
-                'remote_status',
-                'local_status'
-            );
-
-            return $results;
-        }
+
+        /**
+         * Combine the remote and local health into one
+         * 
+         * @return array 
+         */
+        public static function get_overall_status() {
+
+            $local_status = self::get_local_status();
+            $remote_status = self::get_remote_status();
+
+            $reason = array( );
+
+            if ( $local_status['reason'] ) {
+                $reason[] = $local_status['reason'];
+            }
+            if ( $remote_status['reason'] ) {
+                $reason[] = $remote_status['reason'];
+            }
+
+            $severity = max( $local_status['severity'], $remote_status['severity'] );
+            $errors = ( $local_status['errors'] or $remote_status['errors'] );
+
+            $remote_status = $remote_status['status'];
+            $local_status = $local_status['status'];
+
+            $results = compact(
+                'severity', 'reason', 'errors', 'remote_status', 'local_status'
+            );
+
+            return $results;
+        }
 
         /**
@@ -51 +47 @@
          */
         public static function get_local_status() {
+            if(!Lift_Search::error_logging_enabled()) {
+                return array('severity' => 0, 'reason' => '', 'errors' => false, 'status' => 0);
+            }
+            
             $intervals = array(
                 60 * 60 => array( 'severity' => 2, 'threshold' => 5 ), // 1 hr
@@ -59 +59 @@
 
             $severity = 0;
-            $reason = '';
-            $errors = false;
+            $reason = '';
+            $errors = false;
 
             foreach ( $intervals as $interval => $data ) {
@@ -67 +67 @@
                 add_filter( 'posts_where', array( __CLASS__, 'filter_posts_where' ) );
                 $q = new WP_Query( array(
-                            'posts_per_page' => -1,
-                            'post_type' => Voce_Error_Logging::POST_TYPE,
-                            'tax_query' => array( array(
-                                    'taxonomy' => Voce_Error_Logging::TAXONOMY,
-                                    'field' => 'slug',
-                                    'terms' => array( 'error', 'lift-search' ),
-                                    'operator' => 'AND'
+                        'posts_per_page' => 1,
+                        'post_type' => Voce_Error_Logging::POST_TYPE,
+                        'tax_query' => array( array(
+                                'taxonomy' => Voce_Error_Logging::TAXONOMY,
+                                'field' => 'slug',
+                                'terms' => array( 'error', 'lift-search' ),
+                                'operator' => 'AND'
                             ) ),
                         ) );
                 remove_filter( 'posts_where', array( __CLASS__, 'filter_posts_where' ) );
 
-                $post_count = $q->post_count;
-                
+                $post_count = $q->found_posts;
+
                 if ( $post_count >= $data['threshold'] ) {
-                    $errors = true;
+                    $errors = true;
                     $severity = $data['severity'];
-                    $reason = sprintf( '%d or more errors in the last %s', $data['threshold'], human_time_diff( time() - $interval ) );
+                    $reason = sprintf( '%d or more errors in the last %s', $data['threshold'], human_time_diff( time() - $interval ) );
                 }
 
@@ -95 +95 @@
 
             $results = array(
-                'errors' => $errors,
+                'errors' => $errors,
                 'severity' => $severity,
-                'reason' => $reason,
+                'reason' => $reason,
                 'status' => $error_counts,
             );
@@ -106 +106 @@
         /**
          * used for local health checks to get recent logs
-         * 
+         * 
          * @global int $lift_health_interval
          * @param string $where
@@ -119 +119 @@
             return $where;
         }
-        
-        /**
-         * use the config API to get the CloudSearch domain/index status
-         * 
-         * @return array 
-         */
-        public static function get_remote_status() {
-            $domain = Cloud_Config_Request::DescribeDomain( Lift_Search::get_search_domain() );
-            
-            if ( ! $domain ) {
-                return array(
-                    'errors' => true,
-                    'reason' => 'Domain has been deleted or the CloudSearch API request failed.',
-                    'severity' => 2,
-                    'status' => array(
-                        'fatal' => true,
-                        'text' => 'Domain has been deleted or the CloudSearch API request failed',
-                    ),
-                );
-            }
-
-            $errors = false;
-            $severity = 0;
-            $reason = '';
-            
-            $text = 'active';
-            
-            $pending = ( ! $domain->Created && ! $domain->Deleted );
-            $deleting = $domain->Deleted;
-            $processing = $domain->Processing;
-            $num_searchable_docs = $domain->NumSearchableDocs;
-            $needs_indexing = $domain->RequiresIndexDocuments;
-            $search_instance_count = $domain->SearchInstanceCount;
-            $search_instance_type = $domain->SearchInstanceType;
-            $search_partition_count = $domain->SearchPartitionCount;
-            
-            if ( $deleting ) {
-                $severity = 2;
-                $reason = 'CloudSearch domain being deleted';
-                $text = 'being deleted';
-            } else if ( $needs_indexing || $processing  ) {
-                if ( 0 == $search_instance_count ) {
-                    $severity = 1;
-                    $reason = 'CloudSearch domain loading';
-                    $text = 'loading';
-                } else if ( $needs_indexing ) {
-                    $severity = 1;
-                    $reason = 'CloudSearch domain needs indexing';
-                    $text = 'needs indexing';
-                } else {
-                    $severity = 1;
-                    $reason = 'CloudSearch domain processing';
-                    $text = 'processing';
-                }
-            } else if ( $pending ) {
-                $severity = 1;
-                $reason = 'CloudSearch domain pending';
-                $text = 'pending';
-            }
-            
-            if (0 != $severity) {
-                $errors = true;
-            }
-            
-            
-            $status = compact(
-                'text',
-                'pending',
-                'deleting',
-                'processing',
-                'num_searchable_docs',
-                'needs_indexing',
-                'search_instance_count',
-                'search_instance_type',
-                'search_partition_count'
-            );
-            
-            $status['api_error'] = false;
-            $status['text'] = $text;
-            
-            $results = array(
-                'errors' => $errors,
+
+        /**
+         * use the config API to get the CloudSearch domain/index status
+         * 
+         * @return array 
+         */
+        public static function get_remote_status() {
+            $domain = Cloud_Config_Request::DescribeDomain( Lift_Search::get_search_domain() );
+
+            if ( !$domain ) {
+                return array(
+                    'errors' => true,
+                    'reason' => 'Domain has been deleted or the CloudSearch API request failed.',
+                    'severity' => 2,
+                    'status' => array(
+                        'fatal' => true,
+                        'text' => 'Domain has been deleted or the CloudSearch API request failed',
+                    ),
+                );
+            }
+
+            $errors = false;
+            $severity = 0;
+            $reason = '';
+
+            $text = 'active';
+
+            $pending = (!$domain->Created && !$domain->Deleted );
+            $deleting = $domain->Deleted;
+            $processing = $domain->Processing;
+            $num_searchable_docs = $domain->NumSearchableDocs;
+            $needs_indexing = $domain->RequiresIndexDocuments;
+            $search_instance_count = $domain->SearchInstanceCount;
+            $search_instance_type = $domain->SearchInstanceType;
+            $search_partition_count = $domain->SearchPartitionCount;
+
+            if ( $deleting ) {
+                $severity = 2;
+                $reason = 'CloudSearch domain being deleted';
+                $text = 'being deleted';
+            } else if ( $needs_indexing || $processing ) {
+                if ( 0 == $search_instance_count ) {
+                    $severity = 1;
+                    $reason = 'CloudSearch domain loading';
+                    $text = 'loading';
+                } else if ( $needs_indexing ) {
+                    $severity = 1;
+                    $reason = 'CloudSearch domain needs indexing';
+                    $text = 'needs indexing';
+                } else {
+                    $severity = 1;
+                    $reason = 'CloudSearch domain processing';
+                    $text = 'processing';
+                }
+            } else if ( $pending ) {
+                $severity = 1;
+                $reason = 'CloudSearch domain pending';
+                $text = 'pending';
+            }
+
+            if ( 0 != $severity ) {
+                $errors = true;
+            }
+
+
+            $status = compact(
+                'text', 'pending', 'deleting', 'processing', 'num_searchable_docs', 'needs_indexing', 'search_instance_count', 'search_instance_type', 'search_partition_count'
+            );
+
+            $status['api_error'] = false;
+            $status['text'] = $text;
+
+            $results = array(
+                'errors' => $errors,
                 'severity' => $severity,
-                'reason' => $reason,
-                'status' => $status,
-            );
-                
-            return $results;
-        }
+                'reason' => $reason,
+                'status' => $status,
+            );
+
+            return $results;
+        }
 
     }

lift-search/trunk/wp/lift-search-form.php

@@ -1 +1 @@
 <?php
-
 // Make sure class name doesn't exist
 if ( !class_exists( 'Lift_Search_Form' ) ) {
@@ -37 +36 @@
         private function __construct() {
             add_filter( 'lift_filters_default_fields', function($defaults) {
-                        $remove = array( 'post_categories', 'post_tags' );
-                        $filtered = array_diff( $defaults, $remove );
-                        return $filtered;
-                    } );
+                    $remove = array( 'post_categories', 'post_tags' );
+                    $filtered = array_diff( $defaults, $remove );
+                    return $filtered;
+                } );
 
             $this->additional_fields();
@@ -73 +72 @@
          */
         public function add_sort_field() {
-            if ( ! $selected = Lift_Search_Form::get_query_var( 'orderby' ) ) {
+            if ( !$selected = Lift_Search_Form::get_query_var( 'orderby' ) ) {
                 $selected = 'relevancy';
             }
             $options = array(
-                'label' => ($selected) ? ucwords($selected) : 'Sort By',
+                'label' => ($selected) ? ucwords( $selected ) : 'Sort By',
                 'value' => array(
                     'Date' => 'date',
@@ -116 +115 @@
             $types = Lift_Search::get_indexed_post_types();
             $selected_types = Lift_Search_Form::get_query_var( 'post_types' );
-            $label = ( ! $selected_types ) ? 'All Types' : '';
-            $selected_labels = array();
-            if ( ! is_array( $selected_types) ) {
+            $label = (!$selected_types ) ? 'All Types' : '';
+            $selected_labels = array( );
+            if ( !is_array( $selected_types ) ) {
                 $selected_types = array( $selected_types );
             }
-            
+
             $values = array(
                 'All Types' => ''
             );
-            
+
             foreach ( $types as $type ) {
                 $num = (isset( $wp_query->query_vars['facets'] ) && isset( $wp_query->query_vars['facets']['post_type'][$type] )) ? sprintf( '(%s)', $wp_query->query_vars['facets']['post_type'][$type] ) : '';
@@ -132 +131 @@
                 $values[sprintf( '%s %s', $type_object->label, $num )] = $type;
             }
-            
-            
+
+
             foreach ( $values as $k => $v ) {
                 if ( in_array( $v, $selected_types ) ) {
@@ -139 +138 @@
                 }
             }
-            
-            if ( ! $label ) {
+
+            if ( !$label ) {
                 $label = join( ' / ', $selected_labels );
             }
@@ -171 +170 @@
                 '30 Days' => $date_end - (86400 * 30)
             );
-            
+
             $selected_label = 'Date';
             foreach ( $values as $k => $v ) {
@@ -179 +178 @@
             }
             $label = ( $date_start ) ? $selected_label : 'All Dates';
-            
+
             $this->add_field( 'date_start', 'select', array(
                 'label' => $label,
                 'value' => $values,
-                'selected' => (int) $date_start,
+                'selected' => ( int ) $date_start,
             ) );
         }
@@ -215 +214 @@
          */
         public function form() {
-            $search_term = (is_search()) ? get_search_query() : "" ;
-            $html = '<form role="search" class="lift-search" id="searchform"><div>';
+            $search_term = (is_search()) ? get_search_query() : "";
+            $html = '<form role="search" class="lift-search" id="searchform" action="'.site_url().'/"><div>';
             $html .= "<input type='text' name='s' id='s' value='$search_term' />";
-            $html .= ' <input type="submit" id="searchsubmit" value="'. esc_attr__('Search') .'" />';
+            $html .= ' <input type="submit" id="searchsubmit" value="' . esc_attr__( 'Search' ) . '" />';
             $html .= $this->form_filters();
             $html .= "</div></form>";
@@ -226 +225 @@
 
         public function loop() {
-            $path = WP_PLUGIN_DIR . '/lift-search/templates/lift-loop.php';
+            $path = dirname(__DIR__) . '/lift-search/templates/lift-loop.php';
             include_once $path;
         }
 
         public function form_filters() {
-            if ( ! is_search() ) {
+            if ( !is_search() ) {
                 return;
             }
-            
+
             $fields = apply_filters( 'lift_filters_form_field_objects', $this->fields );
             $html = '<fieldset class="lift-search-form-filters">';
@@ -263 +262 @@
                     $html .= $field->faux_element( $counter == count( $fields ) );
                 }
-                $counter ++;
+                $counter++;
             }
             $html .= "</ul></div>";
@@ -426 +425 @@
                 return false;
             }
-            
+
             $options = '';
             $has_selection = false;
             $last_class = ( $last ) ? 'last' : '';
-            
+
             foreach ( $this->options['value'] as $k => $v ) {
                 $selected = "";
@@ -440 +439 @@
                     $has_selection = true;
                 }
-                $options .= sprintf( '<li class="lift-list-item %s %s" data-lift_value="%s" ><a href="#">%s</a></li>', $selected, $last, $v, $k ) ;
-            }
-            
+                $options .= sprintf( '<li class="lift-list-item %s %s" data-lift_value="%s" ><a href="#">%s</a></li>', $selected, $last, $v, $k );
+            }
+
             $selected_class = ( $has_selection ) ? 'selected' : '';
-            
-            $html = sprintf('<li class="lift-list-toggler %s" id="lift-list-toggler-%s" data-role="list-toggler"><a href="#" class="%s">%s</a>', $last_class, $this->id, $selected_class, $this->options['label'] );
+
+            $html = sprintf( '<li class="lift-list-toggler %s" id="lift-list-toggler-%s" data-role="list-toggler"><a href="#" class="%s">%s</a>', $last_class, $this->id, $selected_class, $this->options['label'] );
             $html .= "<ul class='lift-select-list lift-hidden' data-lift_bind='$this->id'>";
             $html .= $options;
@@ -494 +493 @@
     public function __construct() {
         parent::__construct(
-                'lift_form_widget', "Lift Search Form", array( 'description' => "Add a Lift search form" )
+            'lift_form_widget', "Lift Search Form", array( 'description' => "Add a Lift search form" )
         );
     }
@@ -506 +505 @@
         extract( $args );
         $title = apply_filters( 'widget_title', empty( $instance['title'] ) ? '' : $instance['title'], $instance, $this->id_base );
-        
+
         echo $before_widget;
         if ( $title )
             echo $before_title . $title . $after_title;
-        
+
         if ( class_exists( 'Lift_Search_Form' ) ) {
             echo Lift_Search_Form::GetInstance()->form();
@@ -516 +515 @@
         echo $after_widget;
     }
-    
+
     function form( $instance ) {
-        $instance = wp_parse_args( (array) $instance, array( 'title' => '') );
+        $instance = wp_parse_args( ( array ) $instance, array( 'title' => '' ) );
         $title = $instance['title'];
-?>
-        <p><label for="<?php echo $this->get_field_id('title'); ?>"><?php _e('Title:'); ?> <input class="widefat" id="<?php echo $this->get_field_id('title'); ?>" name="<?php echo $this->get_field_name('title'); ?>" type="text" value="<?php echo esc_attr($title); ?>" /></label></p>
-<?php
+        ?>
+        <p><label for="<?php echo $this->get_field_id( 'title' ); ?>"><?php _e( 'Title:' ); ?> <input class="widefat" id="<?php echo $this->get_field_id( 'title' ); ?>" name="<?php echo $this->get_field_name( 'title' ); ?>" type="text" value="<?php echo esc_attr( $title ); ?>" /></label></p>
+        <?php
     }
 
     function update( $new_instance, $old_instance ) {
         $instance = $old_instance;
-        $new_instance = wp_parse_args((array) $new_instance, array( 'title' => ''));
-        $instance['title'] = strip_tags($new_instance['title']);
+        $new_instance = wp_parse_args( ( array ) $new_instance, array( 'title' => '' ) );
+        $instance['title'] = strip_tags( $new_instance['title'] );
         return $instance;
     }
@@ -535 +534 @@
 
 add_action( 'widgets_init', function() {
-            register_widget( 'Lift_Form_Widget' );
-        } );
-
+        register_widget( 'Lift_Form_Widget' );
+    } );
+

lift-search/trunk/wp/lift-update-queue.php

@@ -14 +14 @@
 
     const STORAGE_POST_TYPE = 'lift_queued_document';
-
-    public static function get_queue_count() {
-        global $wpdb;
-        
-        if(false === ($queue_count = wp_cache_get('lift_update_queue_count'))) {
-            $queue_count = $wpdb->get_var( $wpdb->prepare( "SELECT COUNT( 1 ) FROM $wpdb->posts
-                WHERE post_type = %s", self::STORAGE_POST_TYPE) );
-            
-            wp_cache_set('lift_update_queue_count', $queue_count);
-        }
-        
-        return $queue_count;
-    }
-    
+    const QUEUE_IDS_OPTION = 'lift_queue_ids';
+
+    /**
+     * Gives the post_id representing the closed/completed queue.
+     * The closed queue is the one that is currently no longer accepting
+     * new changes and is waiting or in the process of being sent in batches
+     *
+     * @return int 
+     */
+    public static function get_closed_queue_id() {
+        return self::get_queue_id( 'closed' );
+    }
+
+    /**
+     * Gives the post_id representing the current active queue that all
+     * new changes are saved to.  
+     * 
+     * @return int 
+     */
+    public static function get_active_queue_id() {
+        return self::get_queue_id( 'active' );
+    }
+
+    /**
+     * Closes the active queue and creates a new active queue to start
+     * storing new updates
+     * 
+     * @return type 
+     */
+    public static function close_active_queue() {
+        $lock_name = 'lift_close_active_queue';
+        
+        $lock_key = md5( uniqid( microtime() . mt_rand(), true ) );
+        if ( !get_transient( $lock_name ) ) {
+            set_transient( $lock_name, $lock_key, 60 );
+        }
+
+        if ( get_transient( $lock_name ) !== $lock_key ) {
+            //another server/request has this lock
+            return;
+        }
+        
+        
+        $active_queue_id = self::get_active_queue_id();
+        $closed_queue_id = self::get_closed_queue_id();
+        
+        update_option( self::QUEUE_IDS_OPTION, array(
+            'active' => $closed_queue_id,
+            'closed' => $active_queue_id
+        ));
+        
+        delete_transient($lock_name);
+    }
+
+    private static function get_queue_id( $type ) {
+        $queue_ids = get_option( self::QUEUE_IDS_OPTION, array( ) );
+
+        $queue_id = isset( $queue_ids[$type] ) ? $queue_ids[$type] : false;
+
+        if ( !$queue_id || !get_post( $queue_id ) ) {
+            //queue post doesn't yet exist, create one
+            $queue_id = wp_insert_post( array(
+                'post_type' => self::STORAGE_POST_TYPE,
+                'post_status' => 'publish',
+                'post_title' => 'lift queue post'
+                ) );
+
+            $queue_ids[$type] = $queue_id;
+
+            update_option( self::QUEUE_IDS_OPTION, $queue_ids );
+        }
+
+        return $queue_id;
+    }
+
     /**
      * Sets a document field to be queued for an update
@@ -52 +113 @@
 
     /**
-     * Gets the instance of the LiftUpdateDocument for the given document.
+     * Gets the instance of the LiftUpdateDocument for the given document from the active
+     * batch.  A new instance is created if there isn't yet one.
      * @param int $document_id
      * @param string $document_type
@@ -58 +120 @@
      */
     public static function get_queued_document_updates( $document_id, $document_type = 'post' ) {
-        $key = $document_type . '_' . $document_id;
+        $key = 'lift_update_' . $document_type . '_' . $document_id;
         if ( isset( self::$document_update_docs[$key] ) ) {
             return self::$document_update_docs[$key];
         }
 
-        if ( $update_post = self::get_document_update_post( $document_id, $document_type ) ) {
-            $post_meta_content = get_post_meta($update_post->ID, 'lift_content', true);
-            $update_data = ( array ) maybe_unserialize( $post_meta_content );
+        if ( is_array( $update_data = get_post_meta( self::get_active_queue_id(), $key ) ) ) {
             $action = isset( $update_data['action'] ) ? $update_data['action'] : 'add';
             $fields = isset( $update_data['fields'] ) ? ( array ) $update_data['fields'] : array( );
@@ -75 +135 @@
         self::$document_update_docs[$key] = $document_update_doc;
         return $document_update_doc;
-    }
-
-    /**
-     * Retrieves the post used to store the queued document update
-     * @param int $document_id
-     * @param string $document_type
-     * @return WP_Post|null 
-     */
-    private static function get_document_update_post( $document_id, $document_type ) {
-        $post_name = $document_type . '-' . $document_id;
-        if ( false === ($post_id = wp_cache_get( 'lift_queue_post_id_' . $post_name ) ) ) {
-            $posts = get_posts( array(
-                'post_type' => self::STORAGE_POST_TYPE,
-                'posts_per_page' => 1,
-                'name' => $post_name,
-                'fields' => 'ids'
-                ) );
-
-            if ( count( $posts ) === 1 ) {
-                $post_id = $posts[0];
-                wp_cache_set( 'lift_queue_post_id_' . $post_name, $post_id );
-                wp_cache_delete('lift_update_queue_count');
-            }
-        }
-
-        return $post_id ? get_post( $post_id ) : false;
     }
 
@@ -127 +161 @@
 
         add_action( 'shutdown', array( __CLASS__, '_save_updates' ) );
-        
+
         Lift_Post_Update_Watcher::init();
         Lift_Post_Meta_Update_Watcher::init();
         Lift_Taxonomy_Update_Watcher::init();
+    }
+
+    public static function query_updates( $args = array( ) ) {
+        global $wpdb;
+
+        $defaults = array(
+            'page' => 1,
+            'per_page' => 10,
+            'queue_ids' => self::get_active_queue_id(),
+        );
+
+        extract( $args = wp_parse_args( $args, $defaults ) );
+
+        $page = is_int( $page ) ? max( $page, 1 ) : 1;
+        $per_page = intval( $per_page );
+
+        $queue_ids = array_map( 'intval', ( array ) $queue_ids );
+
+
+        $limit = 'LIMIT ' . ($page - 1) * $per_page . ', ' . $per_page;
+
+        $query = "SELECT SQL_CALC_FOUND_ROWS meta_id, meta_key, post_id FROM $wpdb->postmeta " .
+            "WHERE post_id in (" . join( ',', $queue_ids ) . ") AND meta_key like 'lift_update_%' " .
+            "ORDER BY meta_id " .
+            $limit;
+
+        $meta_rows = $wpdb->get_results( $query );
+        $found_rows = $wpdb->get_var( "SELECT FOUND_ROWS()" );
+
+        return ( object ) array(
+                'query_args' => $args,
+                'meta_rows' => $meta_rows,
+                'found_rows' => $found_rows,
+                'num_pages' => ceil( $found_rows / $per_page )
+        );
     }
 
@@ -141 +210 @@
                 continue;
             }
-            $new = false;
-            if ( false == ($post = self::get_document_update_post( $change_doc->document_id, $change_doc->document_type ) ) ) {
-                $post = array(
-                        'post_type' => self::STORAGE_POST_TYPE,
-                        'post_name' => $change_doc->document_type . '-' . $change_doc->document_id,
-                        'post_title' => $change_doc->document_type . '-' . $change_doc->document_id,
-                        'post_status' => 'publish',
-                        'post_content' => '',
-                );
-                $new = true;
-            }
-
-            $post_content = serialize( array(
+
+            $key = 'lift_update_' . $change_doc->document_type . '_' . $change_doc->document_id;
+
+            $update_data = array(
                 'document_id' => $change_doc->document_id,
                 'document_type' => $change_doc->document_type,
                 'action' => $change_doc->action,
-                'fields' => $change_doc->fields
-                ) );
-
-
-            if ( ( $post_id = wp_insert_post( $post ) ) && $new ) {
-                wp_cache_set( 'lift_queue_post_id_' . $change_doc->document_type . '_' . $change_doc->document_id, $post_id );
-            }
-            update_post_meta($post_id, 'lift_content', $post_content);
-        }
-    }
-
-}
+                'fields' => $change_doc->fields,
+                'update_date_gmt' => current_time( 'mysql', 1 ),
+                'update_date' => current_time( 'mysql' )
+            );
+            update_post_meta( self::get_active_queue_id(), $key, $update_data );
+        }
+    }
+
+    public static function _deactivation_cleanup() {
+        global $wpdb;
+
+        $batch_post_ids = $wpdb->get_col( $wpdb->prepare( "SELECT ID FROM $wpdb->posts
+            WHERE post_type = %s", self::STORAGE_POST_TYPE ) );
+        foreach ( $batch_post_ids as $post_id ) {
+            wp_delete_post( $post_id, true );
+        }
+    }
+
+}
+
 add_action( 'init', array( 'Lift_Document_Update_Queue', 'init' ), 2 );
 

lift-search/trunk/wp/lift-wp-search.php

@@ -9 +9 @@
  * functionality:
  *
- *  lift_search_facets: Array - Modify the facets set on the Lift Search Query
+ *  lift_search_facets: Array - Modify the facets set on the Lift Search Query
  *
- *  lift_override_post_results: Boolean - If set to be true, a Lift search will be skipped
+ *  lift_override_post_results: Boolean - If set to be true, a Lift search will be skipped
  *  and default WP search is performed
  *
- *  lift_filter_query: Lift_Search_Query - Modify the Lift_Search_Query that was
- *  created from the WP_Query
+ *  lift_filter_query: Lift_Search_Query - Modify the Lift_Search_Query that was
+ *  created from the WP_Query
  *
  */
@@ -23 +23 @@
 
     public static function init() {
-        add_filter( 'posts_request', function( $request, $wp_query ){
-            if( $wp_query->is_search() )
-                return false;
-            return $request;
-        }, 10, 2);
-
-        add_filter( 'posts_results', array(  __CLASS__, 'posts_results'), 10, 2 );
+        add_filter( 'posts_request', function( $request, $wp_query ) {
+                if ( $wp_query->is_search() )
+                    return false;
+                return $request;
+            }, 10, 2 );
+
+        add_filter( 'posts_results', array( __CLASS__, 'posts_results' ), 10, 2 );
         add_filter( 'query_vars', function($query_vars) {
-            return array_merge( $query_vars, array( 'facet', 'date_start', 'date_end', 'post_types' ) );
-        });
+                return array_merge( $query_vars, array( 'facet', 'date_start', 'date_end', 'post_types' ) );
+            } );
     }
 
@@ -40 +40 @@
      * @return object $lift_search_query
      */
-    public static function lift_search_query($wp_query){
+    public static function lift_search_query( $wp_query ) {
 
         $lift_search_query = new Cloud_Search_Query();
@@ -48 +48 @@
         $tax_queries = self::parse_tax_queries( $wp_query->tax_query );
 
-        $parameters = array();
+        $parameters = array( );
 
         // label
@@ -56 +56 @@
         $post_type = $wp_query->get( 'post_types' );
         if ( $post_type && ( 'any' !== $post_type ) ) {
-            $post_type_field_obj = new Lift_Field('post_type', $post_type);
-            $post_type_field = new Lift_Field_Expression(array( $post_type_field_obj ));
+            $post_type_field_obj = new Lift_Field( 'post_type', $post_type );
+            $post_type_field = new Lift_Field_Expression( array( $post_type_field_obj ) );
 
             $parameters[] = self::build_match_expression( $post_type_field );
         }
 
-        $parameters[] = self::get_query_post_status($wp_query);
+        $parameters[] = self::get_query_post_status( $wp_query );
 
         foreach ( array( 'post_category', 'post_tag' ) as $taxonomy ) {
             if ( isset( $tax_queries[$taxonomy] ) ) {
-                $post_taxonomy_field_obj = new Lift_Field($taxonomy, $tax_queries[$taxonomy], false);
-                $post_taxonomy_field = new Lift_Field_Expression(array( $post_type_field_obj ));
+                $post_taxonomy_field_obj = new Lift_Field( $taxonomy, $tax_queries[$taxonomy], false );
+                $post_taxonomy_field = new Lift_Field_Expression( array( $post_type_field_obj ) );
 
                 $parameters[] = self::build_match_expression( $post_taxonomy_field );
@@ -74 +74 @@
 
         $date_start = $wp_query->get( 'date_start' );
-        $date_end   = $wp_query->get( 'date_end' );
+        $date_end = $wp_query->get( 'date_end' );
 
         if ( $date_start || $date_end ) {
@@ -101 +101 @@
 
         $orderby_values = array(
-            'date'      => 'post_date_gmt',
+            'date' => 'post_date_gmt',
             'relevancy' => 'text_relevance',
-            'lift'      => 'weighted_text_relevance'
+            'lift' => 'weighted_text_relevance'
         );
 
         // rank
-        $order   = $wp_query->get( 'order' );
-        $orderby = isset($orderby_values[$wp_query->get('orderby')]) ? $orderby_values[$wp_query->get('orderby')] : $orderby_values['relevancy'];
+        $order = $wp_query->get( 'order' );
+        $orderby = isset( $orderby_values[$wp_query->get( 'orderby' )] ) ? $orderby_values[$wp_query->get( 'orderby' )] : $orderby_values['relevancy'];
 
         if ( $orderby )
@@ -119 +119 @@
     }
 
-    public static function get_query_post_status($wp_query){
-        $ret_status = array();
-        if ( ! empty( $_REQUEST['post_status'] ) ) {
-            $q_status = $_REQUEST['post_status'];
-            if ( ! is_array( $q_status ) )
-                $q_status = array($q_status);
-            $public_states = get_post_stati(array('public' => true));
-            if ( !in_array('any', $q_status) && !in_array('all', $q_status) ){
-                foreach($q_status as $status){
-                    if(in_array($status, $public_states))
-                        $ret_status[] = $status;
+    public static function get_query_post_status( $wp_query ) {
+
+        $q = $wp_query->query_vars;
+        
+        $user_ID = get_current_user_id();
+
+        //mimic wp_query logic around post_type since it isn't performed on an accessible copy
+        $post_type = $q['post_type'];
+        if ( $wp_query->is_tax && empty( $post_type ) ) {
+            $post_type = array( );
+            $taxonomies = wp_list_pluck( $wp_query->tax_query->queries, 'taxonomy' );
+            foreach ( get_post_types( array( 'exclude_from_search' => false ) ) as $pt ) {
+                $object_taxonomies = $pt === 'attachment' ? get_taxonomies_for_attachments() : get_object_taxonomies( $pt );
+                if ( array_intersect( $taxonomies, $object_taxonomies ) )
+                    $post_type[] = $pt;
+            }
+            if ( !$post_type )
+                $post_type = 'any';
+        }
+
+        //direct copy from wp_query 3.5
+        if ( is_array( $post_type ) ) {
+            $post_type_cap = 'multiple_post_type';
+        } else {
+            $post_type_object = get_post_type_object( $post_type );
+            if ( empty( $post_type_object ) )
+                $post_type_cap = $post_type;
+        }
+
+        //direct copy from wp_query 3.5
+        if ( 'any' == $post_type ) {
+            //unused code
+        } elseif ( !empty( $post_type ) && is_array( $post_type ) ) {
+            //unused code
+        } elseif ( !empty( $post_type ) ) {
+            $post_type_object = get_post_type_object( $post_type );
+        } elseif ( $wp_query->is_attachment ) {
+            $post_type_object = get_post_type_object( 'attachment' );
+        } elseif ( $wp_query->is_page ) {
+            $post_type_object = get_post_type_object( 'page' );
+        } else {
+            $post_type_object = get_post_type_object( 'post' );
+        }
+
+        //direct copy from wp_query 3.5
+        if ( !empty( $post_type_object ) ) {
+            $edit_cap = $post_type_object->cap->edit_post;
+            $read_cap = $post_type_object->cap->read_post;
+            $edit_others_cap = $post_type_object->cap->edit_others_posts;
+            $read_private_cap = $post_type_object->cap->read_private_posts;
+        } else {
+            $edit_cap = 'edit_' . $post_type_cap;
+            $read_cap = 'read_' . $post_type_cap;
+            $edit_others_cap = 'edit_others_' . $post_type_cap . 's';
+            $read_private_cap = 'read_private_' . $post_type_cap . 's';
+        }
+
+        if ( !empty( $q['post_status'] ) ) {
+            $statuswheres = array( );
+            $q_status = $q['post_status'];
+            $stati_expression = new Lift_Expression_Set( 'and' );
+
+            if ( !is_array( $q_status ) )
+                $q_status = explode( ',', $q_status );
+            $r_status = array( );
+            $r_stati_expression = new Lift_Expression_Set( );
+            $p_status = array( );
+            $p_stati_expression = new Lift_Expression_Set();
+            $e_status = array( );
+            $e_stati_expression = new Lift_Expression_Set( 'and' );
+
+            if ( in_array( 'any', $q_status ) ) {
+                foreach ( get_post_stati( array( 'exclude_from_search' => true ) ) as $status ) {
+                    $e_stati_expression->addExpression( new Lift_Expression_Field( 'post_status', '-' . $status ) );
+                }
+            } else {
+                foreach ( get_post_stati() as $status ) {
+                    if ( in_array( $status, $q_status ) ) {
+                        if ( 'private' == $status ) {
+                            $p_stati_expression->addExpression( new Lift_Expression_Field( 'post_status', $status ) );
+                        } else {
+                            $r_stati_expression->addExpression( new Lift_Expression_Field( 'post_status', $status ) );
+                        }
+                    }
+                }
+            }
+
+            if ( empty( $q['perm'] ) || 'readable' != $q['perm'] ) {
+                foreach ( $p_stati_expression->sub_expressions as $expression ) {
+                    $r_stati_expression->addExpression( $expression );
+                }
+                unset( $p_stati_expression );
+            }
+
+            if ( isset( $r_stati_expression ) && count( $r_stati_expression ) ) {
+                if ( !empty( $q['perm'] ) && 'editable' == $q['perm'] && !current_user_can( $edit_others_cap ) ) {
+                    $tmp_expression = new Lift_Expression_Set( 'and', array( new Lift_Expression_Field( 'post_author', $user_ID, false ), $r_stati_expression ) );
+                    $stati_expression->addExpression( $tmp_expression );
+                } else {
+                    $stati_expression->addExpression( $r_stati_expression );
+                }
+            }
+
+            if ( !empty( $p_status ) ) {
+                if ( !empty( $q['perm'] ) && 'readable' == $q['perm'] && !current_user_can( $read_private_cap ) ) {
+                    $tmp_expression = new Lift_Expression_Set( 'and', array( new Lift_Expression_Field( 'post_author', $user_ID, false ), $p_stati_expression ) );
+                    $stati_expression->addExpression( $tmp_expression );
+                } else {
+                    $stati_expression->addExpression( $p_stati_expression );
                 }
             }
         } elseif ( !$wp_query->is_singular ) {
+            $stati_expression = new Lift_Expression_Set( );
 
             // Add public states.
-            $public_states = get_post_stati( array('public' => true) );
-            foreach ( (array) $public_states as $state ) {
-                $ret_status[] = $state;
+            $public_states = get_post_stati( array( 'public' => true ) );
+            foreach ( ( array ) $public_states as $state ) {
+                $stati_expression->addExpression( new Lift_Expression_Field( 'post_status', $state ) );
             }
 
             if ( $wp_query->is_admin ) {
                 // Add protected states that should show in the admin all list.
-                $admin_all_states = get_post_stati( array('protected' => true, 'show_in_admin_all_list' => true) );
-                foreach ( (array) $admin_all_states as $state )
-                    $ret_status[] = $state;
-            }
-
-            $ret_status_field_objects = self::build_field_objs( 'post_status', $ret_status );
-
-            $ret_status_field = new Lift_Field_Expression($ret_status_field_objects);
+                $admin_all_states = get_post_stati( array( 'protected' => true, 'show_in_admin_all_list' => true ) );
+                foreach ( ( array ) $admin_all_states as $state )
+                    $stati_expression->addExpression( new Lift_Expression_Field( 'post_status', $state ) );
+            }
 
             if ( is_user_logged_in() ) {
                 // Add private states that are limited to viewing by the author of a post or someone who has caps to read private states.
-                $private_states = get_post_stati( array('private' => true) );
-
-                $post_author_field_object = new Lift_Field('post_author', get_current_user_id(), false);
-
-                foreach ( (array) $private_states as $state ) {
-                    $state_field_object = new Lift_Field('post_status', $state);
-                    $state_field = new Lift_Field_Expression(array( $state_field_object, $post_author_field_object ), 'and');
-
-                    $ret_status_field->field_objs[] = $state_field;
-                }
-            }
-
-            $matched_expression = self::build_match_expression( $ret_status_field );
-        }
-
-        return $matched_expression;
+                $private_states = get_post_stati( array( 'private' => true ) );
+                foreach ( ( array ) $private_states as $state ) {
+                    if ( current_user_can( $read_private_cap ) ) {
+                        $stati_expression->addExpression( new Lift_Expression_Field( 'post_status', $state ) );
+                    } else {
+                        $tmp_expression = new Lift_Expression_Set( 'and', array(
+                                new Lift_Expression_Field( 'post_author', $user_ID, false ),
+                                new Lift_Expression_Field( 'post_status', $state ),
+                                ) );
+                        $stati_expression->addExpression( $tmp_expression );
+                    }
+                }
+            }
+        }
+
+        return (string) $stati_expression;
     }
 
@@ -179 +274 @@
      * @return array $posts
      */
-    public static function posts_results( $posts, $wp_query ){
+    public static function posts_results( $posts, $wp_query ) {
         if ( !apply_filters( 'lift_override_post_results', true ) || !$wp_query->is_search() )
             return $posts;
@@ -188 +283 @@
         $lift_api = Lift_Search::get_search_api();
 
-        $lift_results = $lift_api->sendSearch($lift_query);
-
-        if( !empty($lift_results) && is_object($lift_results) ){
+        $lift_results = $lift_api->sendSearch( $lift_query );
+
+        if ( !empty( $lift_results ) && is_object( $lift_results ) ) {
             // include response post ids in query
-            $hits = array();
+            $hits = array( );
             array_map( function($hit) use (&$hits) {
-                    if(property_exists($hit, 'data') && property_exists($hit->data, 'id') ){
-                        $hits[] = (is_array($hit->data->id)) ? array_shift($hit->data->id) : $hit->data->id;
+                    if ( property_exists( $hit, 'data' ) && property_exists( $hit->data, 'id' ) ) {
+                        $hits[] = (is_array( $hit->data->id )) ? array_shift( $hit->data->id ) : $hit->data->id;
                     }
                 }, $lift_results->hits->hit
@@ -202 +297 @@
             // include facets on query
             if ( isset( $lift_results->facets ) )
-                $wp_query->set( 'facets', self::format_facet_constraints($lift_results->facets) );
+                $wp_query->set( 'facets', self::format_facet_constraints( $lift_results->facets ) );
 
             _prime_post_caches( $hits );
-            $posts = array_values( array_filter( array_map( 'get_post', $hits ), function($val){
-                return (!is_null($val) && !is_wp_error($val) && is_object($val) && $val->post_status == 'publish');
-            }) );
-            $wp_query->post_count = count($posts);
+            $posts = array_values( array_map( 'get_post', $hits ) );
+            $wp_query->post_count = count( $posts );
             $wp_query->found_posts = $lift_results->hits->found;
-            $wp_query->max_num_pages = ceil( $wp_query->found_posts / get_query_var('posts_per_page') );
+            $wp_query->max_num_pages = ceil( $wp_query->found_posts / get_query_var( 'posts_per_page' ) );
             $wp_query->posts = $posts;
-
         }
         return $posts;
@@ -223 +315 @@
      */
     private static function parse_tax_queries( $tax_queries ) {
-        $parsed_tax_queries = array();
+        $parsed_tax_queries = array( );
 
         $defaults = array(
             'taxonomy' => '',
-            'terms' => array(),
+            'terms' => array( ),
             'include_children' => true,
             'field' => 'term_id',
@@ -235 +327 @@
         foreach ( $tax_queries as $tax_query ) {
             // Lift search currently only supports the IN operator for taxonomies, if anything else,
-            if ( ! is_array( $tax_query ) ||
-                !isset($tax_query['operator']) ||
-                $tax_query['operator'] =! 'IN' ||
-                    empty( $tax_query['taxonomy'] ) ){
+            if ( !is_array( $tax_query ) ||
+                !isset( $tax_query['operator'] ) ||
+                $tax_query['operator'] = !'IN' ||
+                empty( $tax_query['taxonomy'] ) ) {
                 continue;
             }
@@ -244 +336 @@
             $tax_query = array_merge( $defaults, $tax_query );
 
-            $tax_query['terms'] = (array) $tax_query['terms'];
+            $tax_query['terms'] = ( array ) $tax_query['terms'];
 
             // if terms ids are provided, we can just add them to the $parsed_tax_queries array,
             // otherwise we have to get each id
-            if ( $tax_query['field'] == 'term_id' ){
+            if ( $tax_query['field'] == 'term_id' ) {
 
                 if ( isset( $parsed_tax_queries[$tax_query['taxonomy']] ) )
-                    $parsed_tax_queries[$tax_query['taxonomy']] = array_merge ( $parsed_tax_queries[$tax_query['taxonomy']], $tax_query['terms'] );
+                    $parsed_tax_queries[$tax_query['taxonomy']] = array_merge( $parsed_tax_queries[$tax_query['taxonomy']], $tax_query['terms'] );
                 else
                     $parsed_tax_queries[$tax_query['taxonomy']] = $tax_query['terms'];
@@ -261 +353 @@
                     }
                 }
-
             } else {
 
-                $terms = array();
+                $terms = array( );
 
                 foreach ( $tax_query['terms'] as $term ) {
@@ -273 +364 @@
                         // if tax query has the include_children argument set to true
                         if ( $tax_query['include_children'] )
-                            $terms = array_merge ( $terms, get_term_children( $term_obj->term_id, $term_obj->taxonomy ) );
+                            $terms = array_merge( $terms, get_term_children( $term_obj->term_id, $term_obj->taxonomy ) );
                     }
                 }
@@ -284 +375 @@
     }
 
+    /**
+     * Helper function to build an array of Lift_Field objects of the same field with multiple values
+     * @param string $field_name
+     * @param array $field_values
+     * @param bool $is_string true if the field is a string
+     * @return Lift_Field 
+     */
     private function build_field_objs( $field_name, $field_values, $is_string = true ) {
 
-        $field_objects = array();
+        $field_objects = array( );
 
         foreach ( $field_values as $field_value ) {
-            $field_objects[] = new Lift_Field($field_name, $field_value, ( $is_string === true ) ? $is_string : false);
+            $field_objects[] = new Lift_Field( $field_name, $field_value, ( $is_string === true ) ? $is_string : false );
         }
 
@@ -302 +400 @@
      * If multiple values, the expression will take the form:  ($operator $field:$value1 ... $field:$valueN)
      *
-     * @return string
+     * @param Lift_Field_Expression $field
+     * @return string 
      */
     private static function build_match_expression( $field ) {
 
-        $expression = array();
+        $expression = array( );
 
         if ( is_a( $field, 'Lift_Field_Expression' ) && is_array( $field->field_objs ) ) {
@@ -318 +417 @@
             foreach ( $field->field_objs as $field_obj ) {
 
-                if (is_a( $field_obj , 'Lift_Field_Expression' ) ) {
+                if ( is_a( $field_obj, 'Lift_Field_Expression' ) ) {
 
                     $expression[] = self::build_match_expression( $field_obj );
-
                 } else {
 
                     if ( $field_obj->is_string ) {
 
-                        $expression[]= $field_obj->field_name . ":'" . addslashes( $field_obj->field_value ) . "'";
-
+                        $expression[] = $field_obj->field_name . ":'" . addslashes( $field_obj->field_value ) . "'";
                     } else {
 
-                        $expression[]= "{$field_obj->field_name}:{$field_obj->field_value}";
+                        $expression[] = "{$field_obj->field_name}:{$field_obj->field_value}";
                     }
                 }
@@ -341 +438 @@
     }
 
-    private static function format_facet_constraints($facets){
-        $formatted_facets = array();
-        $facets = self::object_to_array($facets);
-        if(is_array($facets)) {
-            foreach($facets as $facet_type => $facet_value){
-                $formatted_facets[$facet_type] = array();
-                if(isset($facet_value['constraints'])){
-                    foreach($facet_value['constraints'] as $facet){
-                        if(isset($facet['value']) && isset($facet['count']))
+    private static function format_facet_constraints( $facets ) {
+        $formatted_facets = array( );
+        $facets = self::object_to_array( $facets );
+        if ( is_array( $facets ) ) {
+            foreach ( $facets as $facet_type => $facet_value ) {
+                $formatted_facets[$facet_type] = array( );
+                if ( isset( $facet_value['constraints'] ) ) {
+                    foreach ( $facet_value['constraints'] as $facet ) {
+                        if ( isset( $facet['value'] ) && isset( $facet['count'] ) )
                             $formatted_facets[$facet_type][$facet['value']] = $facet['count'];
                     }
@@ -358 +455 @@
     }
 
-    private static function object_to_array($data){
-        if (is_array($data) || is_object($data)){
-            $result = array();
-            foreach ($data as $key => $value){
-                $result[$key] = self::object_to_array($value);
+    private static function object_to_array( $data ) {
+        if ( is_array( $data ) || is_object( $data ) ) {
+            $result = array( );
+            foreach ( $data as $key => $value ) {
+                $result[$key] = self::object_to_array( $value );
             }
             return $result;
@@ -368 +465 @@
         return $data;
     }
+
 }
 
-class Lift_Field_Expression {
-    public $field_objs;
+abstract class aLift_Expression {
+
+    public function __construct() {
+        //nothing to do here
+    }
+
+    abstract public function __toString();
+}
+
+class Lift_Expression_Set extends aLift_Expression implements Countable {
+
+    public $sub_expressions;
     public $operator;
 
-    function __construct($field_objs, $operator = 'or'){
-        $this->field_objs = $field_objs;
+    public function __construct( $operator = 'or', $sub_expressions = array( ) ) {
+        parent::__construct();
+        $this->sub_expressions = $sub_expressions;
         $this->operator = $operator;
     }
+
+    /**
+     * 
+     * @param aLift_Expression $expression 
+     */
+    public function addExpression( $expression ) {
+        $this->sub_expressions[] = $expression;
+    }
+
+    public function __toString() {
+        return sprintf( '(%s %s)', $this->operator, join( ' ', $this->sub_expressions ) );
+    }
+
+    public function count() {
+        return count( $this->sub_expressions );
+    }
+
 }
 
-
-class Lift_Field {
+class Lift_Expression_Field extends aLift_Expression {
+
     public $field_name;
     public $field_value;
     public $is_string;
 
-    function __construct($field_name, $field_value, $is_string = true){
+    public function __construct( $field_name, $field_value, $is_string = true ) {
+        parent::__construct();
         $this->field_name = $field_name;
         $this->field_value = $field_value;
         $this->is_string = $is_string;
     }
+
+    public function __toString() {
+        if ( $this->is_string ) {
+            return $this->field_name . ":'" . addslashes( $this->field_value ) . "'";
+        } else {
+            return "{$this->field_name}:{$this->field_value}";
+        }
+    }
+
 }
+
+/**
+ * @deprecated 
+ */
+class Lift_Field_Expression {
+
+    public $field_objs;
+    public $operator;
+
+    /**
+     * @param array $field_Array of Lift_Field objects
+     * @param string $operator default 'or'
+     */
+    public function __construct( $field_objs, $operator = 'or' ) {
+        $this->field_objs = $field_objs;
+        $this->operator = $operator;
+    }
+
+    public function __toString() {
+        return '';
+    }
+
+}
+
+/**
+ * @deprecated 
+ */
+class Lift_Field {
+
+    public $field_name;
+    public $field_value;
+    public $is_string;
+
+    function __construct( $field_name, $field_value, $is_string = true ) {
+        $this->field_name = $field_name;
+        $this->field_value = $field_value;
+        $this->is_string = $is_string;
+    }
+
+}

lift-search/trunk/wp/update-watchers/post.php

@@ -4 +4 @@
 
     public static function get_watched_post_types() {
-        return apply_filters( 'lift_watched_post_types', array( 'post', 'page' ) );
+        return apply_filters( 'lift_watched_post_types', Lift_Search::get_indexed_post_types() );
     }
 
@@ -19 +19 @@
                 ), $post_type );
     }
-    
-    public static function check_post_validity($post_status, $post_type) {
-        return ( ! in_array( $post_status,  array( 'open', 'auto-draft' ) ) && in_array( $post_type, Lift_Post_Update_Watcher::get_watched_post_types() ) );
+
+    public static function check_post_validity( $post_status, $post_type ) {
+        return (!in_array( $post_status, array( 'open', 'auto-draft' ) ) && in_array( $post_type, Lift_Post_Update_Watcher::get_watched_post_types() ) );
     }
 
@@ -28 +28 @@
         //catch new posts
         add_filter( 'wp_insert_post_data', function($data, $postarr) {
-                if ( Lift_Post_Update_Watcher::check_post_validity($data['post_status'], $data['post_type']) ) {
+                if ( Lift_Post_Update_Watcher::check_post_validity( $data['post_status'], $data['post_type'] ) ) {
 
                     if ( empty( $postarr['ID'] ) ) {
@@ -35 +35 @@
                         add_action( 'save_post', function($post_id, $post) {
                                 //check to make sure this isn't a revision insert
-                            $_post = $post;
+                                $_post = $post;
                                 if ( in_array( get_post_type( $post_id ), Lift_Post_Update_Watcher::get_watched_post_types() ) ) {
                                     Lift_Post_Update_Watcher::queue_entire_post( $post_id );
@@ -51 +51 @@
                 $post_status = get_post_status( $post_id );
                 $post_type = get_post_type( $post_id );
-                if ( Lift_Post_Update_Watcher::check_post_validity($post_status, $post_type) ) {
-                    if($post_before->post_status == 'auto-draft') {
+                if ( Lift_Post_Update_Watcher::check_post_validity( $post_status, $post_type ) ) {
+                    if ( $post_before->post_status == 'auto-draft' ) {
                         Lift_Post_Update_Watcher::queue_entire_post( $post_id );
                     } else {
@@ -69 +69 @@
                 $post_status = get_post_status( $post_id );
                 $post_type = get_post_type( $post_id );
-                if ( Lift_Post_Update_Watcher::check_post_validity($post_status, $post_type) ) {
+                if ( Lift_Post_Update_Watcher::check_post_validity( $post_status, $post_type ) ) {
                     lift_queue_deletion( $post_id, 'post' );
                 }
@@ -133 +133 @@
 
     public function get_watched_taxonomies( $post_type ) {
-        
+
         $default_taxonomies = array(
-            'post' => array('category', 'post_tag'),
+            'post' => array( 'category', 'post_tag' ),
         );
-        return apply_filters( 'lift_watched_taxonomies', isset($default_taxonomies[$post_type]) ? $default_taxonomies[$post_type] : array(), $post_type );
+        return apply_filters( 'lift_watched_taxonomies', isset( $default_taxonomies[$post_type] ) ? $default_taxonomies[$post_type] : array( ), $post_type );
     }
 
@@ -144 +144 @@
                 $post_type = get_post_type( $post_id );
                 if ( in_array( $taxonomy, Lift_Taxonomy_Update_Watcher::get_watched_taxonomies( $post_type ) ) ) {
-                    if ( $append || array_diff( $old_tt_ids, $tt_ids ) || array_diff($tt_ids, $old_tt_ids) ) {
+                    if ( $append || array_diff( $old_tt_ids, $tt_ids ) || array_diff( $tt_ids, $old_tt_ids ) ) {
                         lift_queue_field_update( $post_id, 'taxonomy_' . $taxonomy, 'post' );
                     }