Skip to content

Checks request for simplify parameter #284

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
JapnitS wants to merge 1 commit into
base: dev
Choose a base branch
from
Open

Checks request for simplify parameter #284

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
7 changes: 4 additions & 3 deletions api/controllers/shabads.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,6 +34,7 @@ exports.search = async (req, res) => {
let results = parseInt(req.query.results, 10) || 20;
const sinceDate = req.query.updatedsince ? lib.isValidDatetime(req.query.updatedsince) : null;
const liveSearch = req.query.livesearch ? parseInt(req.query.livesearch, 10) : 0;
const simplify = req.query.simplify ? parseInt(req.query.simplify, 10) === 1 : false;

SourceID = SourceID.substr(0, 1);

Expand Down Expand Up @@ -76,7 +77,7 @@ exports.search = async (req, res) => {
searchQuery = searchQuery.replace(/\s+/g, '');

// convert unicode to ascii
searchQuery = anvaad.unicode(searchQuery, true);
searchQuery = anvaad.unicode(searchQuery, true, simplify);

for (let x = 0, len = searchQuery.length; x < len; x += 1) {
let charCode = searchQuery.charCodeAt(x);
Expand Down Expand Up @@ -130,7 +131,7 @@ exports.search = async (req, res) => {
} else if (searchType === 2) {
// Full word (Gurmukhi)
// convert unicode to ascii
searchQuery = anvaad.unicode(searchQuery, true);
searchQuery = anvaad.unicode(searchQuery, true, simplify);

const queryObj = lib.searchOperators.fullWordGurmukhiToQuery(searchQuery);
conditions.push(queryObj.condition);
Expand Down Expand Up @@ -159,7 +160,7 @@ exports.search = async (req, res) => {
} else if (searchType === 6) {
// Main letters
// convert unicode to ascii
searchQuery = anvaad.unicode(searchQuery, true);
searchQuery = anvaad.unicode(searchQuery, true, simplify);
const words = searchQuery.split(' ').join('%');

const queryObj = lib.searchOperators.mainLettersToQuery(words);
Expand Down