#40414 【TECSS(Biz) webviewer 1.9】検索キーワードを6個指定できる

abvw/js/contentsearch.js

@@ -1033,6 +1033,7 @@ CONTENTSEARCH.searchEventButtonFunction = function() {
 	var content = $('#main-content').attr('checked');
 	var content = $('#main-content').attr('checked');
 	var tag = $('#main-tag').attr('checked');
 	var tag = $('#main-tag').attr('checked');
 	var body = $('#main-body').attr('checked');
 	var body = $('#main-body').attr('checked');
+	var count = 0;
 
 
 	var offset = 0;
 	var offset = 0;
 	var limit = CONTENTSEARCH.returnNumberDispRecordForList();
 	var limit = CONTENTSEARCH.returnNumberDispRecordForList();
@@ -1041,14 +1042,16 @@ CONTENTSEARCH.searchEventButtonFunction = function() {
 		alert('200字以下のテキストを入力してください');
 		alert('200字以下のテキストを入力してください');
 		return;
 		return;
 	}
 	}
-    if ($('#txtSearch').val() != '') {
+
+    if ($('#txtSearchWs').val() != '') {
+
 		try{
 		try{
+
 			//seperate string 
 			//seperate string 
 			var myRegexp = /[^\s"]+|"([^"]*)"/gi;
 			var myRegexp = /[^\s"]+|"([^"]*)"/gi;
 			var myArray = [];
 			var myArray = [];
 			var myQuery;
 			var myQuery;
 			var myRegExpArr = [];
 			var myRegExpArr = [];
-			var count = 0;
 
 
 			do {
 			do {
 				var match = myRegexp.exec($('#txtSearchWs').val());
 				var match = myRegexp.exec($('#txtSearchWs').val());
@@ -1136,7 +1139,7 @@ CONTENTSEARCH.searchEventButtonFunction = function() {
 			return;        
 			return;        
 		}
 		}
 	}
 	}
-	
+
 	if(count > 5){
 	if(count > 5){
 		alert('語句数は最大5つです');
 		alert('語句数は最大5つです');
 		return;        
 		return;        

abvw/js/header.js

@@ -264,12 +264,12 @@ HEADER.searchHeaderButtonFunction = function(){
 
 
 	var searchDivision;
 	var searchDivision;
     var searchText = $('#searchbox-key').val();
     var searchText = $('#searchbox-key').val();
-    
+
     if(searchText.length > 200){
     if(searchText.length > 200){
 		alert('200字以下のテキストを入力してください');
 		alert('200字以下のテキストを入力してください');
 		return;
 		return;
     }
     }
-    if ($('#txtSearch').val() != '') {
+    if ($('#searchbox-key').val() != '') {
         try{
         try{
             //seperate string 
             //seperate string 
             var myRegexp = /[^\s"]+|"([^"]*)"/gi;
             var myRegexp = /[^\s"]+|"([^"]*)"/gi;