Skip to content

C
check
Commit dab47119 by Kim Eunchul
Options

#40770【TECSS Web 1.9.2.6】検索調査依頼

parent 5da96037
Showing with 28 additions and 32 deletions
abvw/js/contentsearch.js
...@@ -1049,8 +1049,8 @@ CONTENTSEARCH.searchEventButtonFunction = function() { ...@@ -1049,8 +1049,8 @@ CONTENTSEARCH.searchEventButtonFunction = function() {
var myRegexp = /[^\s"]+|"([^"]*)"/gi; var myRegexp = /[^\s"]+|"([^"]*)"/gi;
var myArray = []; var myArray = [];
var myQuery; var myQuery;
var myRegExpArr = []; //var myRegExpArr = [];
var textReg = $('#txtSearchWs').val(); var textReg = $('#txtSearchWs').val().replaceAll("("," ( ").replaceAll(")"," ) ");
do { do {
var match = myRegexp.exec(textReg); var match = myRegexp.exec(textReg);
...@@ -1070,23 +1070,21 @@ CONTENTSEARCH.searchEventButtonFunction = function() { ...@@ -1070,23 +1070,21 @@ CONTENTSEARCH.searchEventButtonFunction = function() {
alert('語句数は最大5つです'); alert('語句数は最大5つです');
return; 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]);
myQuery = '( true'; myQuery = '(';
}else{ }else{
myRegExpArr[0] = new RegExp(myArray[0].slice(1)); //myRegExpArr[0] = new RegExp(myArray[0].slice(1));
myQuery = '( true'; myQuery = '(';
} }
}else{ }else{
myRegExpArr[0] = new RegExp(myArray[0]); //myRegExpArr[0] = new RegExp(myArray[0]);
myQuery = 'true'; myQuery = 'true';
} }
for (var i = 1; i < myArray.length; i++){ for (var i = 1; i < myArray.length; i++){
if(myArray[i] == "OR" || myArray[i] == "or" || myArray[i] == "Or" || myArray[i] == "oR"){ if(myArray[i] == "OR" || myArray[i] == "or" || myArray[i] == "Or" || myArray[i] == "oR"){
myRegExpArr[i] = new RegExp(myArray[i]); //myRegExpArr[i] = new RegExp(myArray[i]);
}else if(myArray[i].charAt(0) == "(" || myArray[i] == "("){ }else if(myArray[i].charAt(0) == "(" || myArray[i] == "("){
if(myArray[i] == "("){ if(myArray[i] == "("){
if(myArray[i - 1] == "OR" || myArray[i - 1] == "or" || myArray[i - 1] == "Or" || myArray[i - 1] == "oR"){ if(myArray[i - 1] == "OR" || myArray[i - 1] == "or" || myArray[i - 1] == "Or" || myArray[i - 1] == "oR"){
...@@ -1096,10 +1094,10 @@ CONTENTSEARCH.searchEventButtonFunction = function() { ...@@ -1096,10 +1094,10 @@ CONTENTSEARCH.searchEventButtonFunction = function() {
} }
}else{ }else{
if(myArray[i - 1] == "OR" || myArray[i - 1] == "or" || myArray[i - 1] == "Or" || myArray[i - 1] == "oR"){ if(myArray[i - 1] == "OR" || myArray[i - 1] == "or" || myArray[i - 1] == "Or" || myArray[i - 1] == "oR"){
myRegExpArr[i] = new RegExp(myArray[i].slice(1)); //myRegExpArr[i] = new RegExp(myArray[i].slice(1));
myQuery += ' || ( true'; myQuery += ' || ( true';
}else{ }else{
myRegExpArr[i] = new RegExp(myArray[i].slice(1)); //myRegExpArr[i] = new RegExp(myArray[i].slice(1));
myQuery += ' && ( true'; myQuery += ' && ( true';
} }
} }
...@@ -1108,23 +1106,23 @@ CONTENTSEARCH.searchEventButtonFunction = function() { ...@@ -1108,23 +1106,23 @@ CONTENTSEARCH.searchEventButtonFunction = function() {
myQuery += ' )'; myQuery += ' )';
}else{ }else{
if(myArray[i - 1] == "OR" || myArray[i - 1] == "or" || myArray[i - 1] == "Or" || myArray[i - 1] == "oR"){ if(myArray[i - 1] == "OR" || myArray[i - 1] == "or" || myArray[i - 1] == "Or" || myArray[i - 1] == "oR"){
myRegExpArr[i] = new RegExp(myArray[i].slice(0, -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));
myQuery += ' && true )'; myQuery += ' && true )';
} }
} }
}else{ }else{
if(myArray[i - 1] == "OR" || myArray[i - 1] == "or" || myArray[i - 1] == "Or" || myArray[i - 1] == "oR"){ if(myArray[i - 1] == "OR" || myArray[i - 1] == "or" || myArray[i - 1] == "Or" || myArray[i - 1] == "oR"){
myRegExpArr[i] = new RegExp(myArray[i]); //myRegExpArr[i] = new RegExp(myArray[i]);
myQuery += ' || true'; myQuery += ' || true';
}else{ }else{
if(myArray[i - 1] == "("){ if(myArray[i - 1] == "("){
myRegExpArr[i] = new RegExp(myArray[i]); //myRegExpArr[i] = new RegExp(myArray[i]);
myQuery += ' true'; myQuery += ' true';
}else{ }else{
myRegExpArr[i] = new RegExp(myArray[i]); //myRegExpArr[i] = new RegExp(myArray[i]);
myQuery += ' && true'; myQuery += ' && true';
} }
} }
......
abvw/js/contentview.js
...@@ -747,7 +747,7 @@ CONTENTVIEW.searchHandle = function() { ...@@ -747,7 +747,7 @@ CONTENTVIEW.searchHandle = function() {
var myQuery; var myQuery;
var myRegExpArr = []; var myRegExpArr = [];
var count = 0; var count = 0;
var textReg = $('#txtSearch').val().replace(/[.*+?^${}|[\]\\]/g, "\\$&"); var textReg = $('#txtSearch').val().replace(/[.*+?^${}|[\]\\]/g, "\\$&").replace("%", "\\%").replace('　', '"　"').replaceAll("("," ( ").replaceAll(")"," ) ");;
try{ try{
do { do {
......
abvw/js/header.js
...@@ -278,7 +278,7 @@ HEADER.searchHeaderButtonFunction = function(){ ...@@ -278,7 +278,7 @@ HEADER.searchHeaderButtonFunction = function(){
var myArray = []; var myArray = [];
var myQuery; var myQuery;
var myRegExpArr = []; var myRegExpArr = [];
var textReg = $('#searchbox-key').val(); var textReg = $('#searchbox-key').val().replaceAll("("," ( ").replaceAll(")"," ) ");
do { do {
var match = myRegexp.exec(textReg); var match = myRegexp.exec(textReg);
...@@ -298,23 +298,22 @@ HEADER.searchHeaderButtonFunction = function(){ ...@@ -298,23 +298,22 @@ HEADER.searchHeaderButtonFunction = function(){
alert('語句数は最大5つです'); alert('語句数は最大5つです');
return; 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]);
myQuery = '( true'; myQuery = '( true';
}else{ }else{
myRegExpArr[0] = new RegExp(myArray[0].slice(1)); //myRegExpArr[0] = new RegExp(myArray[0].slice(1));
myQuery = '( true'; myQuery = '( true';
} }
}else{ }else{
myRegExpArr[0] = new RegExp(myArray[0]); //myRegExpArr[0] = new RegExp(myArray[0]);
myQuery = 'true'; myQuery = 'true';
} }
for (var i = 1; i < myArray.length; i++){ for (var i = 1; i < myArray.length; i++){
if(myArray[i] == "OR" || myArray[i] == "or" || myArray[i] == "Or" || myArray[i] == "oR"){ if(myArray[i] == "OR" || myArray[i] == "or" || myArray[i] == "Or" || myArray[i] == "oR"){
myRegExpArr[i] = new RegExp(myArray[i]); //myRegExpArr[i] = new RegExp(myArray[i]);
}else if(myArray[i].charAt(0) == "(" || myArray[i] == "("){ }else if(myArray[i].charAt(0) == "(" || myArray[i] == "("){
if(myArray[i] == "("){ if(myArray[i] == "("){
if(myArray[i - 1] == "OR" || myArray[i - 1] == "or" || myArray[i - 1] == "Or" || myArray[i - 1] == "oR"){ if(myArray[i - 1] == "OR" || myArray[i - 1] == "or" || myArray[i - 1] == "Or" || myArray[i - 1] == "oR"){
...@@ -324,10 +323,10 @@ HEADER.searchHeaderButtonFunction = function(){ ...@@ -324,10 +323,10 @@ HEADER.searchHeaderButtonFunction = function(){
} }
}else{ }else{
if(myArray[i - 1] == "OR" || myArray[i - 1] == "or" || myArray[i - 1] == "Or" || myArray[i - 1] == "oR"){ if(myArray[i - 1] == "OR" || myArray[i - 1] == "or" || myArray[i - 1] == "Or" || myArray[i - 1] == "oR"){
myRegExpArr[i] = new RegExp(myArray[i].slice(1)); //myRegExpArr[i] = new RegExp(myArray[i].slice(1));
myQuery += ' || ( true'; myQuery += ' || ( true';
}else{ }else{
myRegExpArr[i] = new RegExp(myArray[i].slice(1)); //myRegExpArr[i] = new RegExp(myArray[i].slice(1));
myQuery += ' && ( true'; myQuery += ' && ( true';
} }
} }
...@@ -336,29 +335,28 @@ HEADER.searchHeaderButtonFunction = function(){ ...@@ -336,29 +335,28 @@ HEADER.searchHeaderButtonFunction = function(){
myQuery += ' )'; myQuery += ' )';
}else{ }else{
if(myArray[i - 1] == "OR" || myArray[i - 1] == "or" || myArray[i - 1] == "Or" || myArray[i - 1] == "oR"){ if(myArray[i - 1] == "OR" || myArray[i - 1] == "or" || myArray[i - 1] == "Or" || myArray[i - 1] == "oR"){
myRegExpArr[i] = new RegExp(myArray[i].slice(0, -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));
myQuery += ' && true )'; myQuery += ' && true )';
} }
} }
}else{ }else{
if(myArray[i - 1] == "OR" || myArray[i - 1] == "or" || myArray[i - 1] == "Or" || myArray[i - 1] == "oR"){ if(myArray[i - 1] == "OR" || myArray[i - 1] == "or" || myArray[i - 1] == "Or" || myArray[i - 1] == "oR"){
myRegExpArr[i] = new RegExp(myArray[i]); //myRegExpArr[i] = new RegExp(myArray[i]);
myQuery += ' || true'; myQuery += ' || true';
}else{ }else{
if(myArray[i - 1] == "("){ if(myArray[i - 1] == "("){
myRegExpArr[i] = new RegExp(myArray[i]); //myRegExpArr[i] = new RegExp(myArray[i]);
myQuery += ' true'; myQuery += ' true';
}else{ }else{
myRegExpArr[i] = new RegExp(myArray[i]); //myRegExpArr[i] = new RegExp(myArray[i]);
myQuery += ' && true'; myQuery += ' && true';
} }
} }
} }
} }
if (eval(myQuery)) { if (eval(myQuery)) {
//is not correct query //is not correct query
} }
......
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