Changeset 1056834

Timestamp:

12/30/2014 11:33:48 AM (11 years ago)

Author:

naveenann

Message:

Custom fields update

Location:

opensearchserver-search/trunk

Files:

• index.php (modified) (2 diffs)
• opensearchserver_admin.php (modified) (11 diffs)
• opensearchserver_search_functions.php (modified) (1 diff)

opensearchserver-search/trunk/index.php

@@ -152 +152 @@
   delete_option('oss_index_from');
   delete_option('oss_index_to');
-  delete_option('oss_custom_field');
   delete_option('oss_enable_translation_wpml');
   delete_option('oss_advanced_query_settings_not_automatic');
@@ -166 +165 @@
           delete_option($check_taxonomy_name);
     }
+  $custom_field_lables = opensearchserver_get_all_custom_fields();
+    foreach($custom_field_lables as $custom_field_label => $key) {
+      $check_custom_field_label = 'oss_custom_field_'.strtolower(str_replace(' ', '_', $custom_field_label));
+      delete_option($check_custom_field_label);
+  }
 }
 

opensearchserver-search/trunk/opensearchserver_admin.php

@@ -29 +29 @@
 function opensearchserver_create_index() {
   $indexName = get_option('oss_indexname');
-  $custom_fields = get_option('oss_custom_field');
   $oss_api = opensearchserver_getapi_instance();
   $index_list = $oss_api->indexList();
@@ -38 +37 @@
 
   $oss_api->createIndex($indexName);
-  opensearchserver_create_schema($custom_fields);
-  opensearchserver_query_template($custom_fields);
+  opensearchserver_create_schema();
+  opensearchserver_query_template();
   opensearchserver_spellcheck_query_template();
   $autocompletion = opensearchserver_getautocomplete_instance();
@@ -60 +59 @@
 */
 
-function opensearchserver_create_schema($custom_fields) {
+function opensearchserver_create_schema() {
   $schema = opensearchserver_getschema_instance();
   $schema_xml = $schema->getSchema();
@@ -133 +132 @@
  * Function to update the query template
 */
-function opensearchserver_query_template($custom_fields) {
+function opensearchserver_query_template() {
   $query_template = opensearchserver_getsearchtemplate_instance();
   $oss_query = stripcslashes(get_option('oss_query'));
@@ -171 +170 @@
     }
   }
-  if (isset($custom_fields) && $custom_fields != null) {
-    $custom_fields_array = explode(',', $custom_fields);
-    foreach ($custom_fields_array as $field) {
-      $field = opensearchserver_clean_field($field);
-      if (strlen($field) > 0) {
-        $query_template->setReturnField('search','custom_'.$field);
-      }
-    }
-  }
 }
 
@@ -246 +236 @@
   $oss_login =  get_option('oss_login');
   $oss_key = get_option('oss_key');
-  $custom_fields = get_option('oss_custom_field');
   $lang = get_option('oss_language', '');
   $table_name_posts =$wpdb->prefix ."posts";
@@ -258 +247 @@
     opensearchserver_delete_document($delete);
     $index = new OSSIndexDocument();
-    opensearchserver_add_documents_to_index($index, $lang, get_post($id), $custom_fields);
+    opensearchserver_add_documents_to_index($index, $lang, get_post($id));
     opensearchserver_checkindex($index);
   } else {
@@ -280 +269 @@
     for ($i = 0; $i < $total_count; $i++) {
       $post = get_post($posts[$i]->ID);
-      opensearchserver_add_documents_to_index($index, $lang, $post, $custom_fields);
+      opensearchserver_add_documents_to_index($index, $lang, $post);
       $index = opensearchserver_checkindex($index, 200, $i, $total_count);
     }
@@ -374 +363 @@
 }
 
-function opensearchserver_add_documents_to_index(OSSIndexDocument $index, $lang, $post, $customFields) {
+function opensearchserver_add_documents_to_index(OSSIndexDocument $index, $lang, $post) {
   $user = opensearchserver_get_user_cache($post->post_author);
   $content = $post->post_content;
@@ -490 +479 @@
    * action "oss_index_document"
    */
-  do_action('oss_index_document', $document, $index, $lang, $post, $customFields);
+  do_action('oss_index_document', $document, $index, $lang, $post);
   
   //free memory
@@ -737 +726 @@
     $oss_filter_language_field_wpml = isset($_POST['oss_filter_language_field_wpml']) ? $_POST['oss_filter_language_field_wpml'] : NULL;
     update_option('oss_filter_language_field_wpml', $oss_filter_language_field_wpml);
-    
-    //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)) {
-        $custom_fields = get_option('oss_custom_field');    
-        opensearchserver_query_template($custom_fields);
-    }
-    
+    //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)) {
+      opensearchserver_query_template();
+    }
     opensearchserver_display_messages('OpenSearchServer Query Settings have been updated.');
 }

opensearchserver-search/trunk/opensearchserver_search_functions.php

@@ -368 +368 @@
 }
 
-function opensearchserver_get_custom_fields() {
-  return explode(",",get_option('oss_custom_field'));
-}
 
 /**