#39714 andやor検索(ウェブ版error処理)

abvw/js/contentview.js

@@ -747,7 +747,7 @@ CONTENTVIEW.searchHandle = function() {
             //seperate string 
             var myRegexp = /[^\s"]+|"([^"]*)"/gi;
             var myArray = [];
-            var myQuery = 'myRegExpArr[0].test(contentPage[nIndex].pageText)';
+            var myQuery;
             var myRegExpArr = [];
 
             do {
@@ -758,7 +758,19 @@ CONTENTVIEW.searchHandle = function() {
                 }
             } while (match != null);
 
-            myRegExpArr[0] = new RegExp(myArray[0]);
+            if(myArray[0].charAt(0) == "("){
+                if(myArray[0]  == "("){
+                    myRegExpArr[1] = new RegExp(myArray[1]);
+                    myQuery = '( myRegExpArr[1].test(contentPage[nIndex].pageText)';
+                }else{
+                    myRegExpArr[0] = new RegExp(myArray[0].slice(1));
+                    myQuery = '( myRegExpArr[0].test(contentPage[nIndex].pageText)'
+                }
+            }else{
+                myRegExpArr[0] = new RegExp(myArray[0]);
+                myQuery = 'myRegExpArr[0].test(contentPage[nIndex].pageText)';
+            }
+
             for (var i = 1; i < myArray.length; i++){
                 if(myArray[i] == "OR" || myArray[i] == "or"){
                     myRegExpArr[i] = new RegExp(myArray[i]);