Changeset 919308

Timestamp:

05/22/2014 11:11:41 AM (12 years ago)

Author:

naveenann

Message:

Working on indexing taxonomies related to a post.

Location:

opensearchserver-search/trunk

Files:

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

opensearchserver-search/trunk/opensearchserver_admin.php

@@ -88 +88 @@
   opensearchserver_setField($schema,$schema_xml,'year_month',NULL,'no','yes','no','no','no');
   //Add taxonomies schema
-  $taxonomies=get_taxonomies('','names');
+  $taxonomies = get_taxonomies('','names');
   foreach ($taxonomies as $taxonomy ) {
     $check_taxonomy_name = 'oss_taxonomy_'.$taxonomy;
     if(get_option($check_taxonomy_name)==1) {
-        opensearchserver_setField($schema,$schema_xml,'taxonomy_'.$taxonomy,NULL,'no','yes','no','yes','no');
+        opensearchserver_setField($schema,$schema_xml,'taxonomy_'.$taxonomy,'TextAnalyzer','yes','yes','no','yes','no');
     }
   }
@@ -140 +140 @@
   $query_template->setReturnField('search','tags');
   $query_template->setReturnField('search','timestamp');
+  $taxonomies = get_taxonomies('','names');
+  foreach ($taxonomies as $taxonomy ) {
+    $check_taxonomy_name = 'oss_taxonomy_'.$taxonomy;
+    if(get_option($check_taxonomy_name)==1) {
+        $query_template->setReturnField('search','taxonomy_'.$taxonomy);
+    }
+  }
   if (isset($custom_fields) && $custom_fields != null) {
     $custom_fields_array = explode(',', $custom_fields);
@@ -602 +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;
-    update_option('oss_clean_query', $oss_clean_query);
-    $oss_clean_query_enable = isset($_POST['oss_clean_query_enable']) ? $_POST['oss_clean_query_enable'] : NULL;
-    update_option('oss_clean_query_enable', $oss_clean_query_enable);
-    $oss_log_enable = isset($_POST['oss_log_enable']) ? $_POST['oss_log_enable'] : NULL;
-    update_option('oss_log_enable', $oss_log_enable);
-    $oss_log_ip = isset($_POST['oss_log_ip']) ? $_POST['oss_log_ip'] : NULL;
-    update_option('oss_log_ip', $oss_log_ip);
+    update_option('oss_clean_query', $oss_clean_query);
+    $oss_clean_query_enable = isset($_POST['oss_clean_query_enable']) ? $_POST['oss_clean_query_enable'] : NULL;
+    update_option('oss_clean_query_enable', $oss_clean_query_enable);
+    $oss_log_enable = isset($_POST['oss_log_enable']) ? $_POST['oss_log_enable'] : NULL;
+    update_option('oss_log_enable', $oss_log_enable);
+    $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
@@ -1016 +1026 @@
                                 <label for="oss_sort_timestamp">Display link to sort results by date</label>
                             </p>
+                             <p>
+                                <label for="oss_taxonomy_display">Taxonomy to be displayed on Result</label>: <select
+                                    name="oss_taxonomy_display"><?php
+                                    $taxonomies=get_taxonomies('','names'); 
+                                     $opt = get_option('oss_taxonomy_display');
+                                      foreach ($taxonomies as $taxonomy ) {
+                                          $selected = '';
+                                        $check_taxonomy_name = 'oss_taxonomy_'.$taxonomy;
+                                          if(get_option($check_taxonomy_name)==1) {
+                                            if($opt == $taxonomy) {
+                                                $selected = 'selected="selected"';
+                                            }
+                                      ?>
+                                    <option value="<?php print $taxonomy;?>" <?php print $selected;?>>
+                                        <?php print $taxonomy;?>
+                                    </option>
+                                    <?php }
+                                    }?>
+                                </select>
+                            </p>
                             </fieldset>
                             

opensearchserver-search/trunk/template/opensearchserver_search.php

@@ -168 +168 @@
           $url = stripslashes($oss_results->getField($i, 'url', false));
           $date = stripslashes($oss_results->getField($i, 'timestamp', false));
-          $categoriesResults = $oss_results->getField($i, 'categories', false, false, null, true);
           $categories = array();
-          foreach($categoriesResults as $cat) {
-            $categories[] = (string)$cat;
-          }
-          $categories = implode(', ', $categories);
-          
+          $taxonomy_field = get_option('oss_taxonomy_display');
+          $taxonomy_data = array();
+          $taxonomies = $oss_results->getField($i, 'taxonomy_'.$taxonomy_field, false, false, null, true);
+          foreach ($taxonomies as $taxonomy) {
+            $taxonomy_data[] = (string)$taxonomy;
+          }
+          $categories = implode(', ', $taxonomy_data);
           ?>