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

abvw/js/contentsearch.js

@@ -1094,7 +1094,7 @@ CONTENTSEARCH.searchEventButtonFunction = function() {
 					myQuery += ' )';
 					myQuery += ' )';
 				}else{
 				}else{
 					if(myArray[i - 1] == "OR" || myArray[i - 1] == "or"){
 					if(myArray[i - 1] == "OR" || myArray[i - 1] == "or"){
-						myRegExpArr[i] = new RegExp(myArray[i].slice(-1));
+						myRegExpArr[i] = new RegExp(myArray[i].slice(0, -1));
 						myQuery += ' || true )';
 						myQuery += ' || true )';
 					}else{
 					}else{
 						myRegExpArr[i] = new RegExp(myArray[i].slice(0, -1));
 						myRegExpArr[i] = new RegExp(myArray[i].slice(0, -1));

abvw/js/contentview.js

@@ -793,7 +793,7 @@ CONTENTVIEW.searchHandle = function() {
                         myQuery += ' )';
                         myQuery += ' )';
                     }else{
                     }else{
                         if(myArray[i - 1] == "OR" || myArray[i - 1] == "or"){
                         if(myArray[i - 1] == "OR" || myArray[i - 1] == "or"){
-                            myRegExpArr[i] = new RegExp(myArray[i].slice(-1));
+                            myRegExpArr[i] = new RegExp(myArray[i].slice(0, -1));
                             myQuery += ' || myRegExpArr[' + i + '].test(contentPage[nIndex].pageText) )';
                             myQuery += ' || myRegExpArr[' + i + '].test(contentPage[nIndex].pageText) )';
                         }else{
                         }else{
                             myRegExpArr[i] = new RegExp(myArray[i].slice(0, -1));
                             myRegExpArr[i] = new RegExp(myArray[i].slice(0, -1));
@@ -823,10 +823,10 @@ CONTENTVIEW.searchHandle = function() {
                 }
                 }
             }
             }
 
 
-//        }catch(error){
-//            alert('正しくない検索です');
-//            return;        
-//        }
+        }catch(error){
+           alert('正しくない検索です');
+            return;        
+        }
 
 
         if (sPageNo.length > 0) {
         if (sPageNo.length > 0) {
             //title start
             //title start

abvw/js/header.js

@@ -322,7 +322,7 @@ HEADER.searchHeaderButtonFunction = function(){
 					myQuery += ' )';
 					myQuery += ' )';
 				}else{
 				}else{
 					if(myArray[i - 1] == "OR" || myArray[i - 1] == "or"){
 					if(myArray[i - 1] == "OR" || myArray[i - 1] == "or"){
-						myRegExpArr[i] = new RegExp(myArray[i].slice(-1));
+						myRegExpArr[i] = new RegExp(myArray[i].slice(0, -1));
 						myQuery += ' || true )';
 						myQuery += ' || true )';
 					}else{
 					}else{
 						myRegExpArr[i] = new RegExp(myArray[i].slice(0, -1));
 						myRegExpArr[i] = new RegExp(myArray[i].slice(0, -1));