Changeset 920018

Timestamp:

05/23/2014 03:24:44 PM (12 years ago)

Author:

naveenann

Message:

• Fixed the issue with taxonomy

Location:

opensearchserver-search/trunk

Files:

• opensearchserver_admin.php (modified) (6 diffs)
• template/opensearchserver_search.php (modified) (1 diff)

opensearchserver-search/trunk/opensearchserver_admin.php

@@ -93 +93 @@
     if(get_option($check_taxonomy_name)==1) {
         opensearchserver_setField($schema,$schema_xml,'taxonomy_'.$taxonomy,'TextAnalyzer','yes','yes','no','yes','no');
+      opensearchserver_setField($schema,$schema_xml,'taxonomy_'.$taxonomy.'_notAnalyzed',NULL,'no','yes','yes','yes','no');
     }
   }
@@ -145 +146 @@
     if(get_option($check_taxonomy_name)==1) {
         $query_template->setReturnField('search','taxonomy_'.$taxonomy);
+      $query_template->setReturnField('search','taxonomy_'.$taxonomy.'_notAnalyzed');
     }
   }
@@ -352 +354 @@
     foreach ($taxonomies as $taxonomy ) {
       $check_taxonomy_name = 'oss_taxonomy_'.$taxonomy;
+      $taxonomy_data = array();
        if(get_option($check_taxonomy_name)==1) {
           $terms = get_the_terms( $post->ID, $taxonomy);
           if ( $terms && ! is_wp_error( $terms ) ) {
-                $taxonomy_data = array();
                 foreach ( $terms as $term ) {
                   $taxonomy_data[] = $term->name;
@@ -361 +363 @@
           }
            $document->newField('taxonomy_'.$taxonomy, $taxonomy_data);
+           $document->newField('taxonomy_'.$taxonomy.'_notAnalyzed', $taxonomy_data);
        }
     }
@@ -609 +612 @@
     $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;
@@ -1107 +1110 @@
                          <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>
+                         <label for="oss_enable_autoindexation">Enable automatic indexation when content are added, edited or deleted.</label><br>
+                         <span class="help"> If this option is disabled content will only be indexed when button 'Synchronize / Re-index' is pressed </span>
                       </fieldset>
                             </p>

opensearchserver-search/trunk/template/opensearchserver_search.php

@@ -172 +172 @@
           $taxonomy_data = array();
           $taxonomies = $oss_results->getField($i, 'taxonomy_'.$taxonomy_field, false, false, null, true);
-          if($taxonomies) {
-            foreach ($taxonomies as $taxonomy) {
-                $taxonomy_data[] = (string)$taxonomy;
-            }
-          }
-          $categories = implode(', ', $taxonomy_data);
+          if(!is_array($taxonomies)) {
+              $categories = (string)$taxonomies[0];
+          }else {
+            foreach ($taxonomies as $taxonomy) {
+                   $taxonomy_data[] = (string)$taxonomy;
+              }
+            $categories = implode(', ', $taxonomy_data);
+         }
+        
           ?>