From 9c02e3dfb69757728b637b2657d45b5a6db59f2c Mon Sep 17 00:00:00 2001
From: jsclose <jsclose@umich.edu>
Date: Sat, 7 Apr 2018 15:56:56 -0400
Subject: [PATCH] changed name of query to searcher
---
CMakeLists.txt | 2 +-
query/Query.h | 25 -------------------------
query/Ranker/Ranker.cpp | 1 -
query/{Query.cpp => Searcher.cpp} | 19 +++++++++++++++----
query/Searcher.h | 30 ++++++++++++++++++++++++++++++
search.cpp | 2 +-
6 files changed, 47 insertions(+), 32 deletions(-)
delete mode 100644 query/Query.h
rename query/{Query.cpp => Searcher.cpp} (63%)
create mode 100644 query/Searcher.h
diff --git a/CMakeLists.txt b/CMakeLists.txt
index d84f7a9..36c2b8b 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -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
diff --git a/query/Query.h b/query/Query.h
deleted file mode 100644
index 92affcc..0000000
--- a/query/Query.h
+++ /dev/null
@@ -1,25 +0,0 @@
-//
-// Created by Jake Close on 3/7/18.
-//
-
-#pragma once
-
-using namespace std;
-
-class QueryParser
- {
-
-public:
- QueryParser ( const char *query_in ) : CompleteQuery( query_in )
- { };
-
- void search ( );
-
- void printResults ( );
-
-private:
- const char *CompleteQuery;
-
- };
-
-
diff --git a/query/Ranker/Ranker.cpp b/query/Ranker/Ranker.cpp
index a636c05..4a35a52 100644
--- a/query/Ranker/Ranker.cpp
+++ b/query/Ranker/Ranker.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 )
diff --git a/query/Query.cpp b/query/Searcher.cpp
similarity index 63%
rename from query/Query.cpp
rename to query/Searcher.cpp
index 8058931..fef73df 100644
--- a/query/Query.cpp
+++ b/query/Searcher.cpp
@@ -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;
diff --git a/query/Searcher.h b/query/Searcher.h
new file mode 100644
index 0000000..97b87e7
--- /dev/null
+++ b/query/Searcher.h
@@ -0,0 +1,30 @@
+//
+// Created by Jake Close on 3/7/18.
+//
+
+#include "/query/queryLanguage/QueryParser.h"
+#include "/constraintSolver/ISRContainer.h"
+#pragma once
+
+using namespace std;
+
+class Searcher
+ {
+
+public:
+ Searcher ( string *query_in ) : CompleteQuery( query_in )
+ { };
+
+ void search ( );
+
+ void printResults ( );
+
+private:
+ string *CompleteQuery;
+ QueryParser queryParser;
+ ISRContainer* container;
+
+
+ };
+
+
diff --git a/search.cpp b/search.cpp
index 7225e1a..5969461 100644
--- a/search.cpp
+++ b/search.cpp
@@ -5,7 +5,7 @@
#include <iostream>
#include <stdlib.h>
#include <unistd.h>
-#include "query/Query.h"
+#include "query/Searcher.h"
using namespace std;
--
GitLab