Commit b6493031 by Kim Eunchul

#40365 【TECSS(Biz) webviewer 1.9】一覧画面で検索時にエラーを起こすキーワードがある

parent dd53ad0b
...@@ -264,6 +264,7 @@ HEADER.searchHeaderButtonFunction = function(){ ...@@ -264,6 +264,7 @@ HEADER.searchHeaderButtonFunction = function(){
var searchDivision; var searchDivision;
var searchText = $('#searchbox-key').val(); var searchText = $('#searchbox-key').val();
var count = 0;
if(searchText.length > 200){ if(searchText.length > 200){
alert('200字以下のテキストを入力してください'); alert('200字以下のテキストを入力してください');
...@@ -271,13 +272,13 @@ HEADER.searchHeaderButtonFunction = function(){ ...@@ -271,13 +272,13 @@ HEADER.searchHeaderButtonFunction = function(){
} }
if ($('#txtSearchWs').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; var textReg = $('#txtSearchWs');
var textReg = $('#searchbox-key').val();
do { do {
var match = myRegexp.exec(textReg); var match = myRegexp.exec(textReg);
...@@ -286,6 +287,7 @@ HEADER.searchHeaderButtonFunction = function(){ ...@@ -286,6 +287,7 @@ 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);
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]);
...@@ -354,7 +356,6 @@ HEADER.searchHeaderButtonFunction = function(){ ...@@ -354,7 +356,6 @@ HEADER.searchHeaderButtonFunction = function(){
} }
} }
} }
if (eval(myQuery)) { if (eval(myQuery)) {
//is not correct query //is not correct query
} }
...@@ -377,7 +378,7 @@ HEADER.searchHeaderButtonFunction = function(){ ...@@ -377,7 +378,7 @@ HEADER.searchHeaderButtonFunction = function(){
ClientData.searchCond_searchDivision(searchDivision); ClientData.searchCond_searchDivision(searchDivision);
//window.location = COMMON.ScreenIds.ContentSearch; //window.location = COMMON.ScreenIds.ContentSearch;
AVWEB.avwScreenMove(COMMON.ScreenIds.ContentSearch); AVWEB.avwScreenMove(COMMON.ScreenIds.ContentSearch);
return;
} }
} }
if(count > 5){ if(count > 5){
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment