#40708 【TECSS(Biz) webviewer/Win 1.9】【仕様確認】同じ検索キーワードで動作が異なるものがある

abvw/js/contentsearch.js

@@ -1059,6 +1059,18 @@ CONTENTSEARCH.searchEventButtonFunction = function() {
 					myArray.push(match[1] ? match[1] : match[0]);
 					myArray.push(match[1] ? match[1] : match[0]);
 				}
 				}
 			} while (match != null);
 			} while (match != null);
+
+			for(var i = 1; i < myArray.length; i++){
+				if(myArray[i] != "OR" && myArray[i] != "or" && myArray[i] != "Or" && myArray[i] != "oR" && myArray[i] != "(" && myArray[i] != ")"){
+					count++;
+				}
+			}
+
+			if(count > 5){
+				alert('語句数は最大5つです');
+				return;        
+			}
+			
 			if(myArray[0].charAt(0) == "("){
 			if(myArray[0].charAt(0) == "("){
 				if(myArray[0]  == "("){
 				if(myArray[0]  == "("){
 					myRegExpArr[1] = new RegExp(myArray[1]);
 					myRegExpArr[1] = new RegExp(myArray[1]);
@@ -1137,11 +1149,6 @@ CONTENTSEARCH.searchEventButtonFunction = function() {
 		}
 		}
 	}
 	}
 
 
-	if(count > 5){
-		alert('語句数は最大5つです');
-		return;        
-	}
-
 	if(CONTENTSEARCH.overClick()){
 	if(CONTENTSEARCH.overClick()){
 		return;
 		return;
 	}
 	}

abvw/js/contentview.js

@@ -757,6 +757,18 @@ CONTENTVIEW.searchHandle = function() {
                     myArray.push(match[1] ? match[1] : match[0]);
                     myArray.push(match[1] ? match[1] : match[0]);
                 }
                 }
             } while (match != null);
             } while (match != null);
+
+			for(var i = 1; i < myArray.length; i++){
+				if(myArray[i] != "OR" && myArray[i] != "or" && myArray[i] != "Or" && myArray[i] != "oR" && myArray[i] != "(" && myArray[i] != ")"){
+					count++;
+				}
+			}
+
+			if(count > 5){
+				alert('語句数は最大5つです');
+				return;        
+			}
+
             if(myArray[0].charAt(0) == "("){
             if(myArray[0].charAt(0) == "("){
                 if(myArray[0]  == "("){
                 if(myArray[0]  == "("){
                     myRegExpArr[1] = new RegExp(myArray[1]);
                     myRegExpArr[1] = new RegExp(myArray[1]);

abvw/js/header.js

@@ -286,7 +286,18 @@ HEADER.searchHeaderButtonFunction = function(){
 				{
 				{
 					myArray.push(match[1] ? match[1] : match[0]);
 					myArray.push(match[1] ? match[1] : match[0]);
 				}
 				}
-			} while (match != null);
+            } while (match != null);
+            
+            for(var i = 1; i < myArray.length; i++){
+				if(myArray[i] != "OR" && myArray[i] != "or" && myArray[i] != "Or" && myArray[i] != "oR" && myArray[i] != "(" && myArray[i] != ")"){
+					count++;
+				}
+			}
+
+			if(count > 5){
+				alert('語句数は最大5つです');
+				return;        
+			}		
 
 
 			if(myArray[0].charAt(0) == "("){
 			if(myArray[0].charAt(0) == "("){
 				if(myArray[0]  == "("){
 				if(myArray[0]  == "("){
@@ -381,10 +392,6 @@ HEADER.searchHeaderButtonFunction = function(){
             return;
             return;
         }
         }
     }
     }
-    if(count > 5){
-        alert('語句数は最大5つです');
-        return;        
-    }
     
     
     if(HEADER.overClick()){
     if(HEADER.overClick()){
 		return;
 		return;