Merge remote-tracking branch 'origin/searcher' into searcher

CMakeLists.txt

@@ -237,6 +237,7 @@ add_executable(ISRMultiWordORTest
         constraintSolver/ISRWord.cpp
         constraintSolver/ISRAnd.cpp
         constraintSolver/ISREndDoc.cpp
+        util/DataStructureLib/tuple.cpp
         indexer/Corpus.cpp
         indexer/Chunk.cpp
         util/stringProcessing.cpp

constraintSolver/tests/ISRMultiWordORTest.cpp

@@ -31,8 +31,8 @@ int main ( )
 	static const char HOST = '=';
 	*/
 
-	ISRWord q1 = ISRWord("moment");
-	ISRWord q2 = ISRWord("life");
+	ISRWord q1 = ISRWord("$trump");
+	ISRWord q2 = ISRWord("$russia");
 
 
 	queries.push_back(q2);

constraintSolver/tests/ISRWordMultiTest.cpp

@@ -27,8 +27,8 @@ int main ( )
 	static const char HOST = '=';
 	*/
 
-	ISRWord q1 = ISRWord("moment");
-	ISRWord q2 = ISRWord("life");
+	ISRWord q1 = ISRWord("$trump");
+	ISRWord q2 = ISRWord("$russia");
 
 
 	queries.push_back(q2);

constraintSolver/tests/ISRWordTests.cpp

@@ -32,7 +32,7 @@ int main ( ) {
 		queries.push_back(queryWord);
 		}
 */
-	ISRWord queryWord( "%night" ) ;
+	ISRWord queryWord( "$trump" ) ;
 	queries.push_back(queryWord);
 	vector<size_t> locations;
 	set<string> urls;

shared/url.h

@@ -122,6 +122,11 @@ public:
 
 
 					CompleteUrl = string(temp_CompleteUrl, strlen(temp_CompleteUrl));
+					//remove question marks
+					size_t found = CompleteUrl.find("?");
+					if(found < CompleteUrl.size( ) )
+						CompleteUrl.erase(found, CompleteUrl.size( ));
+
 					Service = string(temp_Service, strlen(temp_Service));
 					Host = string(temp_Host, strlen(temp_Host));