Skip to content

Feature/404 send full text for search #65

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
anusharanganathan wants to merge 2 commits into
base: develop
Choose a base branch
from
Open

Feature/404 send full text for search #65

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
5279832
Modified text sent for autosuggest
anusharanganathan Aug 25, 2021
5dd64ae
Auto suggest on the complete text
anusharanganathan Aug 25, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
42 changes: 34 additions & 8 deletions static/js/jct.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -963,6 +963,29 @@ jct.set_each_default = (type, value) => {
jct.clinputs[type].setChoice(value, doChoose);
}

// ----------------------------------------
// function to strip stop words from auto-suggest text
// ----------------------------------------
jct.strip_stop_words = (original_text, stop_words) => {
let stripped_text = (' ' + original_text).slice(1).toLowerCase();
stop_words.forEach((stop_word) => {
// example pattern "\\bjou[r]?[n]?[a]?[l]\\b"
// This will match jou, jour, journ, journa and journal
let pattern = ""
for (let i = 0; i < stop_word.length; i++) {
if (i < 3) {
pattern = pattern + stop_word[i]
} else {
pattern = pattern + '[' + stop_word[i] + ']?'
}
}
let regex = new RegExp('\\b' + pattern + '\\b');
let matches = stripped_text.match(regex);
if (matches) { stripped_text = stripped_text.replace(matches[0], '').replace(' ', '') };
})
return stripped_text;
}

// ----------------------------------------
// Setup JCT
// This maninly initializes clinput, CL's implementation of select 2
Expand Down Expand Up @@ -1016,12 +1039,15 @@ jct.setup = (manageUrl=true) => {
},
options : function(text, callback) {
let pattern = /[0-9][0-9][0-9][0-9]-[0-9][0-9][0-9][0-9xX]/;
let stripped_text;
if (pattern.test(text)) {
stripped_text = (' ' + text).slice(1);
text = text.toUpperCase();
} else {
text = text.toLowerCase().replace(' of','').replace('the ','');
stripped_text = jct.strip_stop_words(text, ['of', 'the', 'journal'])
text = text.toLowerCase();
}
if (text.length > 1) {
if (stripped_text.length > 1) {
let ourcb = (xhr) => {
let js = JSON.parse(xhr.response);
callback(js.data);
Expand All @@ -1046,8 +1072,6 @@ jct.setup = (manageUrl=true) => {
issnPrefix = "ISSN: ";
}
frag += ' <span class="jct__option_journal_issn">' + issnPrefix + issns + '</span></a> ';

// sgst += '<p class="select_option"><a class="button choose'+ '" which="' + jct.suggesting + '" title="' + t + '" id="' + suggs.data[s].id + '" href="#">' + t + '</a></p>';
return frag;
},
selectedTemplate : function(obj) {
Expand Down Expand Up @@ -1100,8 +1124,9 @@ jct.setup = (manageUrl=true) => {
autocomplete: "off"
},
options : function(text, callback) {
text = text.toLowerCase().replace(' of','').replace('the ','');
if (text.length > 1) {
let stripped_text = jct.strip_stop_words(text, ['of', 'the'])
text = text.toLowerCase();
if (stripped_text.length > 1) {
let ourcb = (xhr) => {
let js = JSON.parse(xhr.response);
callback(js.data);
Expand Down Expand Up @@ -1135,8 +1160,9 @@ jct.setup = (manageUrl=true) => {
autocomplete: "off"
},
options : function(text, callback) {
text = text.toLowerCase().replace(' of','').replace('the ','');
if (text.length > 1) {
let stripped_text = jct.strip_stop_words(text, ['of', 'the', 'university'])
text = text.toLowerCase();
if (stripped_text.length > 1) {
let ourcb = (xhr) => {
let js = JSON.parse(xhr.response);
callback(js.data);
Expand Down
42 changes: 34 additions & 8 deletions static/js/jct_plugin.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1265,6 +1265,29 @@ jct.set_each_default = (type, value) => {
jct.clinputs[type].setChoice(value, doChoose);
}

// ----------------------------------------
// function to strip stop words from auto-suggest text
// ----------------------------------------
jct.strip_stop_words = (original_text, stop_words) => {
let stripped_text = (' ' + original_text).slice(1).toLowerCase();
stop_words.forEach((stop_word) => {
// example pattern "\\bjou[r]?[n]?[a]?[l]\\b"
// This will match jou, jour, journ, journa and journal
let pattern = ""
for (let i = 0; i < stop_word.length; i++) {
if (i < 3) {
pattern = pattern + stop_word[i]
} else {
pattern = pattern + '[' + stop_word[i] + ']?'
}
}
let regex = new RegExp('\\b' + pattern + '\\b');
let matches = stripped_text.match(regex);
if (matches) { stripped_text = stripped_text.replace(matches[0], '').replace(' ', '') };
})
return stripped_text;
}

// ----------------------------------------
// Setup JCT
// This maninly initializes clinput, CL's implementation of select 2
Expand Down Expand Up @@ -1318,12 +1341,15 @@ jct.setup = (manageUrl=true) => {
},
options : function(text, callback) {
let pattern = /[0-9][0-9][0-9][0-9]-[0-9][0-9][0-9][0-9xX]/;
let stripped_text;
if (pattern.test(text)) {
stripped_text = (' ' + text).slice(1);
text = text.toUpperCase();
} else {
text = text.toLowerCase().replace(' of','').replace('the ','');
stripped_text = jct.strip_stop_words(text, ['of', 'the', 'journal'])
text = text.toLowerCase();
}
if (text.length > 1) {
if (stripped_text.length > 1) {
let ourcb = (xhr) => {
let js = JSON.parse(xhr.response);
callback(js.data);
Expand All @@ -1348,8 +1374,6 @@ jct.setup = (manageUrl=true) => {
issnPrefix = "ISSN: ";
}
frag += ' <span class="jct__option_journal_issn">' + issnPrefix + issns + '</span></a> ';

// sgst += '<p class="select_option"><a class="button choose'+ '" which="' + jct.suggesting + '" title="' + t + '" id="' + suggs.data[s].id + '" href="#">' + t + '</a></p>';
return frag;
},
selectedTemplate : function(obj) {
Expand Down Expand Up @@ -1402,8 +1426,9 @@ jct.setup = (manageUrl=true) => {
autocomplete: "off"
},
options : function(text, callback) {
text = text.toLowerCase().replace(' of','').replace('the ','');
if (text.length > 1) {
let stripped_text = jct.strip_stop_words(text, ['of', 'the'])
text = text.toLowerCase();
if (stripped_text.length > 1) {
let ourcb = (xhr) => {
let js = JSON.parse(xhr.response);
callback(js.data);
Expand Down Expand Up @@ -1437,8 +1462,9 @@ jct.setup = (manageUrl=true) => {
autocomplete: "off"
},
options : function(text, callback) {
text = text.toLowerCase().replace(' of','').replace('the ','');
if (text.length > 1) {
let stripped_text = jct.strip_stop_words(text, ['of', 'the', 'university'])
text = text.toLowerCase();
if (stripped_text.length > 1) {
let ourcb = (xhr) => {
let js = JSON.parse(xhr.response);
callback(js.data);
Expand Down