#40821 【TECSS Web 1.9.2.6】「or」「(」「半角スペース」で検索した時の結果が統一されていない

abvw/js/contentsearch.js

@@ -1081,6 +1081,9 @@ CONTENTSEARCH.searchEventButtonFunction = function() {
 			}else{
 			}else{
 				//myRegExpArr[0] = new RegExp(myArray[0]);
 				//myRegExpArr[0] = new RegExp(myArray[0]);
 				myQuery = 'true';
 				myQuery = 'true';
+				if(myArray[0] == "OR" || myArray[0] == "or" || myArray[0] == "Or" || myArray[0] == "oR"){
+					myQuery = ' || ';
+				}
 			}
 			}
 			for (var i = 1; i < myArray.length; i++){
 			for (var i = 1; i < myArray.length; i++){
 				if(myArray[i] == "OR" || myArray[i] == "or" || myArray[i] == "Or" || myArray[i] == "oR"){
 				if(myArray[i] == "OR" || myArray[i] == "or" || myArray[i] == "Or" || myArray[i] == "oR"){
@@ -1141,13 +1144,9 @@ CONTENTSEARCH.searchEventButtonFunction = function() {
 			}
 			}
 
 
 		}catch(error){
 		}catch(error){
-			if(searchText.length === 0 || !searchText.trim()){
-				searchText = "invaildsearchtextzeroresultfoundEmpty";
-			}else{
 			searchText = "invaildsearchtextzeroresultfound";
 			searchText = "invaildsearchtextzeroresultfound";
 		}
 		}
 	}
 	}
-	}
 	if(count > 5){
 	if(count > 5){
 		alert('語句数は最大5つです');
 		alert('語句数は最大5つです');
 		return;        
 		return;        

abvw/js/header.js

@@ -309,6 +309,9 @@ HEADER.searchHeaderButtonFunction = function(){
 			}else{
 			}else{
 				//myRegExpArr[0] = new RegExp(myArray[0]);
 				//myRegExpArr[0] = new RegExp(myArray[0]);
                 myQuery = 'true';
                 myQuery = 'true';
+                if(myArray[0] == "OR" || myArray[0] == "or" || myArray[0] == "Or" || myArray[0] == "oR"){
+					myQuery = ' || ';
+				}
 			}
 			}
 			for (var i = 1; i < myArray.length; i++){
 			for (var i = 1; i < myArray.length; i++){
 				if(myArray[i] == "OR" || myArray[i] == "or" || myArray[i] == "Or" || myArray[i] == "oR"){
 				if(myArray[i] == "OR" || myArray[i] == "or" || myArray[i] == "Or" || myArray[i] == "oR"){
@@ -386,12 +389,7 @@ HEADER.searchHeaderButtonFunction = function(){
 				return;        
 				return;        
             }		
             }		
 
 
-            if(searchText.length === 0 || !searchText.trim()){
-                ClientData.searchCond_searchText("invaildsearchtextzeroresultfoundEmpty");
-			}else{
             ClientData.searchCond_searchText("invaildsearchtextzeroresultfound");
             ClientData.searchCond_searchText("invaildsearchtextzeroresultfound");
-			}
-
             ClientData.searchCond_searchDivision(searchDivision);
             ClientData.searchCond_searchDivision(searchDivision);
             ClientData.searchCond_searchText_Dummy(searchText);
             ClientData.searchCond_searchText_Dummy(searchText);
             //window.location = COMMON.ScreenIds.ContentSearch;
             //window.location = COMMON.ScreenIds.ContentSearch;