wilderjds
/
ncmpcpp
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

search engine: fix regex searching

Browse Source
master
Andrzej Rybczak 13 years ago
parent ed883e2059
commit 88790185ee
1 changed files with 21 additions and 21 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 42
      src/search_engine.cpp

42
src/search_engine.cpp
Unescape View File

@ -460,16 +460,16 @@ void SearchEngine::Search()
{ {
rx.assign(itsConstraints[0], Config.regex_type); rx.assign(itsConstraints[0], Config.regex_type);
any_found = any_found =
!boost::regex_search(it->getArtist(), rx) boost::regex_search(it->getArtist(), rx)
|| !boost::regex_search(it->getAlbumArtist(), rx) || boost::regex_search(it->getAlbumArtist(), rx)
|| !boost::regex_search(it->getTitle(), rx) || boost::regex_search(it->getTitle(), rx)
|| !boost::regex_search(it->getAlbum(), rx) || boost::regex_search(it->getAlbum(), rx)
|| !boost::regex_search(it->getName(), rx) || boost::regex_search(it->getName(), rx)
|| !boost::regex_search(it->getComposer(), rx) || boost::regex_search(it->getComposer(), rx)
|| !boost::regex_search(it->getPerformer(), rx) || boost::regex_search(it->getPerformer(), rx)
|| !boost::regex_search(it->getGenre(), rx) || boost::regex_search(it->getGenre(), rx)
|| !boost::regex_search(it->getDate(), rx) || boost::regex_search(it->getDate(), rx)
|| !boost::regex_search(it->getComment(), rx); || boost::regex_search(it->getComment(), rx);
} }
catch (boost::bad_expression &) { } catch (boost::bad_expression &) { }
} }
@ -479,7 +479,7 @@ void SearchEngine::Search()
try try
{ {
rx.assign(itsConstraints[1], Config.regex_type); rx.assign(itsConstraints[1], Config.regex_type);
found = !boost::regex_search(it->getArtist(), rx); found = boost::regex_search(it->getArtist(), rx);
} }
catch (boost::bad_expression &) { } catch (boost::bad_expression &) { }
} }
@ -488,7 +488,7 @@ void SearchEngine::Search()
try try
{ {
rx.assign(itsConstraints[2], Config.regex_type); rx.assign(itsConstraints[2], Config.regex_type);
found = !boost::regex_search(it->getAlbumArtist(), rx); found = boost::regex_search(it->getAlbumArtist(), rx);
} }
catch (boost::bad_expression &) { } catch (boost::bad_expression &) { }
} }
@ -497,7 +497,7 @@ void SearchEngine::Search()
try try
{ {
rx.assign(itsConstraints[3], Config.regex_type); rx.assign(itsConstraints[3], Config.regex_type);
found = !boost::regex_search(it->getTitle(), rx); found = boost::regex_search(it->getTitle(), rx);
} }
catch (boost::bad_expression &) { } catch (boost::bad_expression &) { }
} }
@ -506,7 +506,7 @@ void SearchEngine::Search()
try try
{ {
rx.assign(itsConstraints[4], Config.regex_type); rx.assign(itsConstraints[4], Config.regex_type);
found = !boost::regex_search(it->getAlbum(), rx); found = boost::regex_search(it->getAlbum(), rx);
} }
catch (boost::bad_expression &) { } catch (boost::bad_expression &) { }
} }
@ -515,7 +515,7 @@ void SearchEngine::Search()
try try
{ {
rx.assign(itsConstraints[5], Config.regex_type); rx.assign(itsConstraints[5], Config.regex_type);
found = !boost::regex_search(it->getName(), rx); found = boost::regex_search(it->getName(), rx);
} }
catch (boost::bad_expression &) { } catch (boost::bad_expression &) { }
} }
@ -524,7 +524,7 @@ void SearchEngine::Search()
try try
{ {
rx.assign(itsConstraints[6], Config.regex_type); rx.assign(itsConstraints[6], Config.regex_type);
found = !boost::regex_search(it->getComposer(), rx); found = boost::regex_search(it->getComposer(), rx);
} }
catch (boost::bad_expression &) { } catch (boost::bad_expression &) { }
} }
@ -533,16 +533,16 @@ void SearchEngine::Search()
try try
{ {
rx.assign(itsConstraints[7], Config.regex_type); rx.assign(itsConstraints[7], Config.regex_type);
found = !boost::regex_search(it->getPerformer(), rx); found = boost::regex_search(it->getPerformer(), rx);
} }
catch (boost::bad_expression &) { } catch (boost::bad_expression &) { }
} }
if (found && !itsConstraints[8].empty()) if (found && itsConstraints[8].empty())
{ {
try try
{ {
rx.assign(itsConstraints[8], Config.regex_type); rx.assign(itsConstraints[8], Config.regex_type);
found = !boost::regex_search(it->getGenre(), rx); found = boost::regex_search(it->getGenre(), rx);
} }
catch (boost::bad_expression &) { } catch (boost::bad_expression &) { }
} }
@ -551,7 +551,7 @@ void SearchEngine::Search()
try try
{ {
rx.assign(itsConstraints[9], Config.regex_type); rx.assign(itsConstraints[9], Config.regex_type);
found = !boost::regex_search(it->getDate(), rx); found = boost::regex_search(it->getDate(), rx);
} }
catch (boost::bad_expression &) { } catch (boost::bad_expression &) { }
} }
@ -560,7 +560,7 @@ void SearchEngine::Search()
try try
{ {
rx.assign(itsConstraints[10], Config.regex_type); rx.assign(itsConstraints[10], Config.regex_type);
found = !boost::regex_search(it->getComment(), rx); found = boost::regex_search(it->getComment(), rx);
} }
catch (boost::bad_expression &) { } catch (boost::bad_expression &) { }
} }

Write Preview
Loading…
Cancel
Save