Changeset 919904

Timestamp:

05/23/2014 11:33:31 AM (12 years ago)

Author:

naveenann

Message:

• Fix taxonomy display issue.
• Only Selected content type will be autoindexed.

Location:

opensearchserver-search/trunk

Files:

• index.php (modified) (3 diffs)
• opensearchserver_admin.php (modified) (6 diffs)

opensearchserver-search/trunk/index.php

@@ -160 +160 @@
   delete_option('oss_log_ip');
   delete_option('oss_display_category');
+  delete_option('oss_enable_autoindexation');
   $taxonomies=get_taxonomies('','names'); 
     foreach ($taxonomies as $taxonomy ) {
@@ -183 +184 @@
 add_filter("plugin_action_links_$plugin", 'opensearchserver_settings_link');
 
+function is_content_type_allowed($post_type) {
+    foreach (get_post_types() as $post_type) {
+      $content_type = 'oss_index_types_'.$post_type;
+        if(get_option($content_type) == 1) {
+          return TRUE;
+        }
+    }
+   return FALSE;
+}
 
 function opensearchserver_do_while_posting($post_id,$post) {
@@ -188 +198 @@
     return;
   }
-  if ($post->post_type == 'post' || $post->post_type == 'page'
-    && $post->post_status == 'publish') {
+  if (is_content_type_allowed($post->post_type) && get_option('oss_enable_autoindexation') == 1 && $post->post_status == 'publish') {
     opensearchserver_reindex_site($post->ID,$post->post_type);
   }

opensearchserver-search/trunk/opensearchserver_admin.php

@@ -601 +601 @@
     $oss_display_user = isset($_POST['oss_display_user']) ? $_POST['oss_display_user'] : NULL;
     update_option('oss_display_user', $oss_display_user);
+    $oss_display_category = isset($_POST['oss_display_category']) ? $_POST['oss_display_category'] : NULL; 
+    update_option('oss_display_category', $oss_display_category); 
     $oss_display_type = isset($_POST['oss_display_type']) ? $_POST['oss_display_type'] : NULL;
     update_option('oss_display_type', $oss_display_type);
@@ -607 +609 @@
     $oss_display_use_radio_buttons = isset($_POST['oss_display_use_radio_buttons']) ? $_POST['oss_display_use_radio_buttons'] : NULL;
     update_option('oss_display_use_radio_buttons', $oss_display_use_radio_buttons);
-      $oss_sort_timestamp = isset($_POST['oss_sort_timestamp']) ? $_POST['oss_sort_timestamp'] : NULL;
+    $oss_sort_timestamp = isset($_POST['oss_sort_timestamp']) ? $_POST['oss_sort_timestamp'] : NULL;
     update_option('oss_sort_timestamp', $oss_sort_timestamp);
     $oss_clean_query = isset($_POST['oss_clean_query']) ? $_POST['oss_clean_query'] : NULL;
@@ -617 +619 @@
     $oss_log_ip = isset($_POST['oss_log_ip']) ? $_POST['oss_log_ip'] : NULL;
     update_option('oss_log_ip', $oss_log_ip);
-
     $oss_taxonomy_display = isset($_POST['oss_taxonomy_display']) ? $_POST['oss_taxonomy_display'] : NULL;
     update_option('oss_taxonomy_display', $oss_taxonomy_display);
-    
+
     //some options needs to post changes to OSS
     if(!opensearchserver_is_query_settings_not_automatic() || (isset($_POST['oss_query_settings_post_to_oss']) && $_POST['oss_query_settings_post_to_oss'] == 1)) {
@@ -651 +652 @@
         update_option('oss_taxonomy_'.$taxonomy, $check_taxonomy_name);
     }
+    $oss_enable_autoindexation = isset($_POST['oss_enable_autoindexation']) ? $_POST['oss_enable_autoindexation'] : NULL;
+    update_option('oss_enable_autoindexation', (int)$oss_enable_autoindexation);
     opensearchserver_display_messages('OpenSearchServer Index Settings have been updated.');
   } else {
@@ -1014 +1017 @@
                                     <input type="checkbox" name="oss_display_type" id="oss_display_type" value="1" <?php checked( 1 == get_option('oss_display_type')); ?> />&nbsp;
                                     <label for="oss_display_type">type</label>
-                                   <input type="checkbox" name="oss_display_user" id="oss_display_user" value="1" <?php checked( 1 == get_option('oss_display_user')); ?> />
+                                    <input type="checkbox" name="oss_display_user" id="oss_display_user" value="1" <?php checked( 1 == get_option('oss_display_user')); ?> />
                                     <label for="oss_display_user">user</label>&nbsp;&nbsp;
+                                    <input type="checkbox" name="oss_display_category" id="oss_display_category" value="1" <?php checked( 1 == get_option('oss_display_category')); ?> />
+                                    <label for="oss_display_category">Chosen taxonomy (see list below)</label>
                                      <br/><span class="help">Choose what kind of information should be displayed below each result.</span>
                             </p>
@@ -1099 +1104 @@
                                   ?>
                               </fieldset>
+                      <fieldset>
+                         <legend>Auto Indexation </legend>
+                         <input type="checkbox" name="oss_enable_autoindexation" id="oss_enable_autoindexation" value="1" <?php checked( 1 == get_option('oss_enable_autoindexation')); ?> />
+                         <label for="oss_enable_autoindexation">Enable automatic indexation when content are added, edited or deleted.</label>
+                      </fieldset>
                             </p>