Skip to content
Snippets Groups Projects
Commit 9c02e3df authored by jsclose's avatar jsclose
Browse files

changed name of query to searcher

parent acf23581
No related branches found
No related tags found
1 merge request!8Origin/constraint solver
......@@ -157,7 +157,7 @@ add_executable(URLTEST
)
add_executable(search-engine search.cpp query/Query.cpp)
add_executable(search-engine search.cpp query/Searcher.cpp)
add_executable(ISRWord-tests
util/util.cpp
......
......@@ -32,7 +32,6 @@ vector< string > Ranker::rank ( )
vector<DocumentEnding> docEnds;
set<string> urls;
for( auto queryWord = inputQuery.begin(); queryWord < inputQuery.end(); ++queryWord)
{
while ( queryWord->getCurrentLocation ( ) != MAX_Location )
......
......@@ -2,7 +2,7 @@
// Created by Jake Close on 3/7/18.
//
#include "Query.h"
#include "Searcher.h"
#include <iostream>
using namespace std;
......@@ -13,19 +13,30 @@ using namespace std;
*
*/
void QueryParser::search ( )
void Searcher::search ( )
{
if ( strcmp( CompleteQuery, "-quit" ) == 0 )
if (*CompleteQuery == "-quit" ||*CompleteQuery == "-q" )
{
cout << "Thank you for using C++lue search engine" << endl;
exit( 0 );
}
else if ( strcmp( CompleteQuery, "-help" ) == 0 )
else if ( *CompleteQuery == "-help")
{
cout << "Manual" << endl;
return;
}
else
{
queryParser.parse(*CompleteQuery);
container->compile( queryParser );
container->solve( );
}
return;
......
......@@ -2,15 +2,17 @@
// Created by Jake Close on 3/7/18.
//
#include "/query/queryLanguage/QueryParser.h"
#include "/constraintSolver/ISRContainer.h"
#pragma once
using namespace std;
class QueryParser
class Searcher
{
public:
QueryParser ( const char *query_in ) : CompleteQuery( query_in )
Searcher ( string *query_in ) : CompleteQuery( query_in )
{ };
void search ( );
......@@ -18,7 +20,10 @@ public:
void printResults ( );
private:
const char *CompleteQuery;
string *CompleteQuery;
QueryParser queryParser;
ISRContainer* container;
};
......
......@@ -5,7 +5,7 @@
#include <iostream>
#include <stdlib.h>
#include <unistd.h>
#include "query/Query.h"
#include "query/Searcher.h"
using namespace std;
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment