Fix search engine advanced mode search broken

pydio · Sep 15, 2014 · d6acb44 · d6acb44
1 parent 5449444
commit d6acb44
Show file tree

Hide file tree

Showing 3 changed files with 17 additions and 4 deletions.
diff --git a/core/src/plugins/gui.ajax/res/js/ajaxplorer.js b/core/src/plugins/gui.ajax/res/js/ajaxplorer.js
diff --git a/core/src/plugins/gui.ajax/res/js/ajaxplorer/class.SearchEngine.js b/core/src/plugins/gui.ajax/res/js/ajaxplorer/class.SearchEngine.js
@@ -189,7 +189,7 @@ Class.create("SearchEngine", AjxpPane, {
             '<div class="advanced_search_section_title"><span class="icon-circle"></span> '+MessageHash[498]+'</div>'+
             '<div class="advanced_search_section">'+
             '<span class="c4"><span class="icon-file"></span> '+MessageHash[499]+' </span><input id="ajxp_mime" class="c3" type="text" placeholder="'+MessageHash[500]+'"><span class="c6">'+MessageHash[501]+'</span><span class="c3" id="ajxp_folder"><span class="icon-folder-open"></span>'+MessageHash[502]+'</span>'+
-            '<br><span class="c4"><span class="icon-cloud-download"></span> '+MessageHash[503]+'</span><input  id="ajxp_bytesize_from" type="text" class="c3" placeholder="'+MessageHash[504]+'..."><span class="c6"> '+MessageHash[505]+' </span><input  id="ajxp_modiftime_to" type="text" class="c3" placeholder="'+MessageHash[504]+'..."></div>'+
+            '<br><span class="c4"><span class="icon-cloud-download"></span> '+MessageHash[503]+'</span><input  id="ajxp_bytesize_from" type="text" class="c3" placeholder="'+MessageHash[504]+'..."><span class="c6"> '+MessageHash[505]+' </span><input  id="ajxp_bytesize_to" type="text" class="c3" placeholder="'+MessageHash[504]+'..."></div>'+
             '</div>' +
             '';
         formPanel.down('#search_meta_detailed').insert({top:docPropertyTemplate});
@@ -538,6 +538,12 @@ Class.create("SearchEngine", AjxpPane, {
 			option.toggleClassName('checked');
 		});
         var fName = (optionValue == 'filename'?'basename':'ajxp_meta_'+optionValue);
+        /*
+        var fName;
+        if(optionValue == 'ajxp_document_content') fName = optionValue;
+        else if (optionValue == 'filename') fName = 'basename';
+        else fName = "ajxp_meta_" + optionValue;
+        */
         advancedPanel.insert('<div><span class="c4" style="width: 35%;"><span class="icon-tag"></span> '+optionLabel+'</span><input style="width: 35%;" type="text" class="c3" id="'+fName+'"></div>');
 
         /*

diff --git a/core/src/plugins/index.lucene/class.AjxpLuceneIndexer.php b/core/src/plugins/index.lucene/class.AjxpLuceneIndexer.php
@@ -155,19 +155,26 @@ public function applyAction($actionName, $httpVars, $fileVars)
                 throw new Exception($messages["index.lucene.7"]);
             }
             $textQuery = $httpVars["query"];
-            if($this->getFilteredOption("AUTO_WILDCARD") === true && strlen($textQuery) > 0){
+            if($this->getFilteredOption("AUTO_WILDCARD") === true && strlen($textQuery) > 0 && ctype_alnum($textQuery)){
                 $isQuote = false;
                 if($textQuery[0] == '"' && $textQuery[strlen($textQuery)-1] == '"'){
                     $textQuery = substr($textQuery, 1, -1);
                 }else if($textQuery[strlen($textQuery)-1] != "*" ){
                     $textQuery.="*";
                 }
             }
-            if ((isSet($this->metaFields) || $this->indexContent) && isSet($httpVars["fields"])) {
+            if(strpos($textQuery, ":") !== false){
+                $textQuery = str_replace("ajxp_meta_ajxp_document_content:","body:", $textQuery);
+                $textQuery = $this->filterSearchRangesKeywords($textQuery);
+                $query = "ajxp_scope:shared AND ($textQuery)";
+            }
+            else if ((isSet($this->metaFields) || $this->indexContent) && isSet($httpVars["fields"])) {
                 $sParts = array();
                 foreach (explode(",",$httpVars["fields"]) as $searchField) {
                     if ($searchField == "filename") {
                         $sParts[] = "basename:".$textQuery;
+                    } else if ($searchField == "ajxp_document_content"){
+                        $sParts[] = $textQuery;
                     } else if (in_array($searchField, $this->metaFields)) {
                         $sParts[] = "ajxp_meta_".$searchField.":".$textQuery;
                     } else if ($searchField == "ajxp_document_content") {