Changeset 1078386

Timestamp:

01/29/2015 05:31:54 PM (11 years ago)

Author:

naveenann

Message:

Improved Query Template

Location:

opensearchserver-search/trunk

Files:

• index.php (modified) (1 diff)
• lib/oss_abstract.class.php (modified) (3 diffs)
• lib/oss_api.class.php (modified) (1 diff)
• lib/oss_searchtemplate.class.php (modified) (1 diff)
• opensearchserver_admin.php (modified) (6 diffs)
• opensearchserver_search_functions.php (modified) (1 diff)

opensearchserver-search/trunk/index.php

@@ -169 +169 @@
   delete_option('oss_facets_option_hierarchical');
   delete_option('oss_facets_option_hierarchical_taxonomy');
+  delete_option('oss_query_behaviour');
+  delete_option('oss_query_template');
   
   $taxonomies=get_taxonomies('','names'); 

opensearchserver-search/trunk/lib/oss_abstract.class.php

@@ -131 +131 @@
    * Will fail if more than 16 HTTP redirection
    */
-  protected function queryServer($url, $data = NULL, $connexionTimeout = OssApi::DEFAULT_CONNEXION_TIMEOUT, $timeout = OssApi::DEFAULT_QUERY_TIMEOUT, $method = 'GET') {
+  protected function queryServer($url, $data = NULL, $connexionTimeout = OssApi::DEFAULT_CONNEXION_TIMEOUT, $timeout = OssApi::DEFAULT_QUERY_TIMEOUT, $method = 'GET',$api_version = 1) {
 
     $this->lastQueryString = $url;
@@ -139 +139 @@
     if($method === 'GET') {
       curl_setopt($rcurl, CURLOPT_HTTP_VERSION, '1.0');
+      if($api_version == 2) {
+        curl_setopt($rcurl, CURLOPT_HTTPHEADER, array("Content-type: application/json; charset=utf-8"));
+      }
     }
     curl_setopt($rcurl, CURLOPT_BINARYTRANSFER, TRUE);
@@ -207 +210 @@
   }
   
-  protected function queryServerREST($path, $params = null, $data = null, $connexionTimeout = OssApi::DEFAULT_CONNEXION_TIMEOUT, $timeout = OssApi::DEFAULT_QUERY_TIMEOUT, $method = 'GET') {
-        return $this->queryServer($this->getQueryURL($path, $params), $data, $connexionTimeout, $timeout, $method);
+  protected function queryServerREST($path, $params = null, $data = null, $connexionTimeout = OssApi::DEFAULT_CONNEXION_TIMEOUT, $timeout = OssApi::DEFAULT_QUERY_TIMEOUT, $method = 'GET', $api_version = 1 ) {
+        return $this->queryServer($this->getQueryURL($path, $params), $data, $connexionTimeout, $timeout, $method, $api_version);
   }
 

opensearchserver-search/trunk/lib/oss_api.class.php

@@ -69 +69 @@
   const REST_API_AUTOCOMPLETION = 'services/rest/index/{index_name}/autocompletion/{autocompletion_name}?field={field_name}&rows={rows}';
   const REST_API_AUTOCOMPLETION_BUILD = 'services/rest/index/{index_name}/autocompletion/{autocompletion_name}';
+  const REST_API_SEARCH_TEMPLATE_LIST = 'services/rest/index/{index_name}/search/template';
   
 

opensearchserver-search/trunk/lib/oss_searchtemplate.class.php

@@ -195 +195 @@
     return $return === FALSE ? FALSE : TRUE;
   }
-
+ 
+
+  public function get_search_template_list() {
+    $path_parameters = array(
+        "{index_name}" => $this->index
+    );
+    $path = strtr(OssApi::REST_API_SEARCH_TEMPLATE_LIST, $path_parameters);
+    $return = $this->queryServerREST($path,NULL,NULL, OssApi::DEFAULT_CONNEXION_TIMEOUT, OssApi::DEFAULT_QUERY_TIMEOUT,'GET',2);
+    return json_decode($return)->templates;
+  }
 }
 ?>

opensearchserver-search/trunk/opensearchserver_admin.php

@@ -44 +44 @@
   $autocompletion->createAutocompletion($autocompletion_name, 'autocomplete');
   return TRUE;
+}
+
+
+function get_list_of_search_templates() {
+  $search_template_instance = opensearchserver_getsearchtemplate_instance();
+  return $search_template_instance->get_search_template_list();
 }
 
@@ -718 +724 @@
     update_option('oss_facet', $facets);
     
+    $oss_write_query = isset($_POST['oss_write_query']) ? $_POST['oss_write_query'] : 1;
+    update_option('oss_query_behaviour', $oss_write_query);
+    $oss_query_template = isset($_POST['oss_query_template']) ? $_POST['oss_query_template'] : NULL;
+    update_option('oss_query_template', $oss_query_template);
     $oss_multi_filter = isset($_POST['oss_multi_filter']) ? $_POST['oss_multi_filter'] : NULL;
     update_option('oss_multi_filter', $oss_multi_filter);
@@ -738 +748 @@
     $oss_advanced_facets = isset($_POST['oss_advanced_facets']) ? $_POST['oss_advanced_facets'] : NULL;
     update_option('oss_advanced_facets', $oss_advanced_facets);
-    $oss_facet_max_display = isset($_POST['oss_facet_max_display']) ? $_POST['oss_facet_max_display'] : NULL;
+      $oss_facet_max_display = isset($_POST['oss_facet_max_display']) ? $_POST['oss_facet_max_display'] : NULL;
     update_option('oss_facet_max_display', $oss_facet_max_display);
     $oss_sort_timestamp = isset($_POST['oss_sort_timestamp']) ? $_POST['oss_sort_timestamp'] : NULL;
@@ -957 +967 @@
                         <form id="query_settings" name="query_settings" method="post"
                             action="">
+                        <strong>Query Behaviour</strong>
+                            <p>
+                                  <input type="radio" id="oss_write_query" 
+                                        value="1" name="oss_write_query"
+                                        <?php 
+                                        $oss_write_query = isset($_POST['oss_write_query']) ? $_POST['oss_write_query'] : 1;
+                                        checked( 1 == $oss_write_query); ?>  />
+                                    <label for="oss_write_query_enable">Write Query</label>
+                                    <input type="radio" id="oss_existing_query_template" 
+                                        value="2" name="oss_write_query"
+                                        <?php checked( 2 == get_option('oss_query_behaviour')); ?>  />
+                                    <label for="oss_existing_query_template_enabled">Use an existing query template</label>
+                              </p>
+
                             <fieldset><legend>Query template</legend>
-                            
+                                         <div id="oss-query-write-template">
                             <p>Enter the template query, or leave empty to use the default one</p>
                             <p> <label for="oss_query">OpenSearchServer query template</label>:<br />
@@ -976 +1000 @@
                                 <p>For allowing search into a new field simply add it to the query, for example <code>OR custom_field_favorite_fruits:($$)^5</code>. <code>^5</code> gives a weight of 5 to this field.
                             </div>
+                      </div>
+                      <div id="oss-query-select-template">
+                          <p>
+                            <strong>Select query template</strong>
+                            <select name="oss_query_template" id="oss_query_template">
+                            <option value="none">Select </option>
+                            <?php
+                            $templates = get_list_of_search_templates();
+                            foreach($templates as $template) {
+                              ?>
+                              <option value="<?php print $template->name;?>"><?php print $template->name.' (Type '.$template->type.')';?></option>
+                              <?php
+                            }
+                            ?>
+                            
+                            </select>
+                          </p>
+                          </div>
                             </fieldset>
                             <fieldset><legend>Facets</legend>
@@ -1516 +1558 @@
     jQuery('#oss_log_enable').click(function(e) { jQuery('#oss_logs_custom').toggle();});
     jQuery('#oss_filter_language_wpml').click(function(e) { jQuery('#oss_filter_language_field').toggle();});
+    jQuery('#oss_write_query').click(function(e) {jQuery('#oss-query-select-template').hide();jQuery('#oss-query-write-template').show();});
+    jQuery('#oss_existing_query_template').click(function(e) {jQuery('#oss-query-write-template').hide();jQuery('#oss-query-select-template').show();});
+    if(jQuery('#oss_existing_query_template').is(":checked")) {jQuery('#oss-query-write-template').hide();jQuery('#oss-query-select-template').show();}
+    else {jQuery('#oss-query-select-template').hide();jQuery('#oss-query-write-template').show();}
 </script>
 <?php

opensearchserver-search/trunk/opensearchserver_search_functions.php

@@ -172 +172 @@
           opensearchserver_add_filter($search, $fieldToFilterOn, ICL_LANGUAGE_CODE);
       }
-      
-      $oss_query = $search->query($query)->template('search');
+      if(get_option('oss_query_behaviour') == 2) {
+        $oss_query = $search->query($query)->template(get_option('oss_query_template'));
+      }else { 
+        $oss_query = $search->query($query)->template('search');
+      }
       if(get_query_var('sort')) {
         if(get_query_var('sort') == '+date') {