[WIP] Search Engine (issue 535)

pom.xml

@@ -214,7 +214,7 @@
 		<hibernate.dialect>org.hibernate.dialect.PostgreSQLDialect</hibernate.dialect>
 		<hibernate.connection.driver_class>org.postgresql.Driver</hibernate.connection.driver_class>
 		<hibernate.hbm2ddl.auto>update</hibernate.hbm2ddl.auto>
-		<hibernate.show_sql>true</hibernate.show_sql>
+		<hibernate.show_sql>false</hibernate.show_sql>
 		<hibernate.format_sql>true</hibernate.format_sql>
 		<hibernate.connection.url>${sigmah.database.url}</hibernate.connection.url>
 		<hibernate.connection.username>${sigmah.database.user}</hibernate.connection.username>
@@ -551,6 +551,15 @@
 			<artifactId>mail</artifactId>
 			<version>1.4.5</version>
 		</dependency>
+
+		<!-- SolrJ -->
+		<dependency>
+               <artifactId>solr-solrj</artifactId>
+               <groupId>org.apache.solr</groupId>
+               <version>6.5.0</version>
+               <type>jar</type>
+               <scope>compile</scope>
+        </dependency>
 
 		<!-- MISC -->
 		<dependency>
@@ -1039,6 +1048,13 @@
 			<id>sigmah-dev</id>
 			<properties>
 
+				<!-- Overrride properties for your local profile here... -->
+				<sigmah.database.url>jdbc:postgresql://localhost:5432/sigmah</sigmah.database.url>
+				<sigmah.database.user>sigmah</sigmah.database.user>
+				<sigmah.database.password>hamsig</sigmah.database.password>
+				<files.repository.name>/home/sigmah_dev</files.repository.name>
+				<archives.repository.name>/home/sigmah_dev/archives</archives.repository.name>
+
 				<gwt.style>PRETTY</gwt.style>
 
 				<!-- Logger properties. -->
@@ -1047,7 +1063,7 @@
 
 				<!-- Hibernate properties. -->
 
-				<hibernate.show_sql>true</hibernate.show_sql>
+				<hibernate.show_sql>false</hibernate.show_sql>
 
 				<!-- Mailer properties. -->
 

src/main/java/org/sigmah/client/search/SearchService.java

@@ -0,0 +1,13 @@
+package org.sigmah.client.search;
+
+import java.util.ArrayList;
+
+import org.sigmah.shared.dto.search.SearchResultsDTO;
+import com.google.gwt.user.client.rpc.RemoteService;
+import com.google.gwt.user.client.rpc.RemoteServiceRelativePath;
+
+@RemoteServiceRelativePath("search")
+public interface SearchService extends RemoteService {
+	//TODO Add method stubs here
+	ArrayList<SearchResultsDTO> search(String searchStr);
+}

src/main/java/org/sigmah/client/search/SearchServiceAsync.java

@@ -0,0 +1,12 @@
+package org.sigmah.client.search;
+
+import java.util.ArrayList;
+
+import org.sigmah.shared.dto.search.SearchResultsDTO;
+import com.google.gwt.user.client.rpc.AsyncCallback;
+
+
+public interface SearchServiceAsync {
+
+	public void search(String searchStr, AsyncCallback<ArrayList<SearchResultsDTO>> callback);
+}

src/main/java/org/sigmah/client/ui/presenter/SearchResultsPresenter.java

@@ -1,5 +1,7 @@
 package org.sigmah.client.ui.presenter;
 
+import java.io.IOException;
+
 /*
  * #%L
  * Sigmah
@@ -30,13 +32,16 @@
 import java.util.Map;
 import java.util.Set;
 
+import org.apache.solr.client.solrj.SolrServerException;
 import org.sigmah.client.dispatch.CommandResultHandler;
 import org.sigmah.client.dispatch.monitor.LoadingMask;
 import org.sigmah.client.i18n.I18N;
 import org.sigmah.client.inject.Injector;
 import org.sigmah.client.page.Page;
 import org.sigmah.client.page.PageRequest;
 import org.sigmah.client.page.RequestParameter;
+import org.sigmah.client.search.SearchService;
+import org.sigmah.client.search.SearchServiceAsync;
 import org.sigmah.client.ui.presenter.base.AbstractPagePresenter;
 import org.sigmah.client.ui.presenter.contact.dashboardlist.ContactsListWidget;
 import org.sigmah.client.ui.presenter.project.treegrid.ProjectsListWidget;
@@ -69,6 +74,7 @@
 import com.extjs.gxt.ui.client.event.Listener;
 import com.extjs.gxt.ui.client.store.ListStore;
 import com.extjs.gxt.ui.client.widget.Component;
+import com.google.gwt.core.client.GWT;
 import com.google.gwt.event.dom.client.ClickEvent;
 import com.google.gwt.event.dom.client.ClickHandler;
 import com.google.gwt.user.client.Window;
@@ -97,6 +103,7 @@
 import org.sigmah.shared.conf.PropertyName;
 import org.sigmah.shared.dto.profile.CheckPointDTO;
 import org.sigmah.shared.dto.profile.ExecutionDTO;
+import org.sigmah.shared.dto.search.SearchResultsDTO;
 
 /**
  * Dashboard page presenter.
@@ -137,12 +144,17 @@ public Page getPage() {
 	}
 
 	@Override
-	public void onPageRequest(PageRequest request) {
+	public void onPageRequest(PageRequest request){
 		// TODO Auto-generated method stub
 		//view.initialize() is default
 		String title = (String)request.getData(RequestParameter.TITLE);
 		//Window.alert("Title is " + title );
 		view.initialize(title);
+//		SearchResultsDTO search_res = new SearchResultsDTO();
+//		Map<String, Object> results = search_res.getResult();
+//		for (Map.Entry<String, Object> entry : results.entrySet()){
+//		    Window.alert(entry.getKey() + "/" + entry.getValue());
+//		}
 	}
 
 

src/main/java/org/sigmah/client/ui/presenter/zone/SearchPresenter.java

@@ -1,5 +1,6 @@
 package org.sigmah.client.ui.presenter.zone;
 
+import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.Map;
 
@@ -10,6 +11,8 @@
 import org.sigmah.client.page.Page;
 import org.sigmah.client.page.PageRequest;
 import org.sigmah.client.page.RequestParameter;
+import org.sigmah.client.search.SearchService;
+import org.sigmah.client.search.SearchServiceAsync;
 import org.sigmah.client.ui.presenter.CreateProjectPresenter;
 import org.sigmah.client.ui.presenter.base.AbstractZonePresenter;
 import org.sigmah.client.ui.view.base.ViewInterface;
@@ -22,16 +25,26 @@
 import org.sigmah.client.ui.zone.ZoneRequest;
 import org.sigmah.client.util.ClientUtils;
 import org.sigmah.shared.conf.PropertyName;
+import org.sigmah.shared.dto.search.SearchResultsDTO;
 
 import com.allen_sauer.gwt.log.client.Log;
 import com.extjs.gxt.ui.client.event.Events;
+import com.google.gwt.core.client.GWT;
 import com.google.gwt.event.dom.client.ClickEvent;
 import com.google.gwt.event.dom.client.ClickHandler;
+import com.google.gwt.event.dom.client.KeyCodes;
+import com.google.gwt.event.dom.client.KeyDownEvent;
+import com.google.gwt.event.dom.client.KeyDownHandler;
+import com.google.gwt.event.dom.client.KeyUpEvent;
+import com.google.gwt.event.dom.client.KeyUpHandler;
 import com.google.gwt.user.client.Window;
+import com.google.gwt.user.client.rpc.AsyncCallback;
 import com.google.gwt.user.client.ui.Button;
 import com.google.gwt.user.client.ui.HasHTML;
+import com.google.gwt.user.client.ui.Label;
 import com.google.gwt.user.client.ui.ListBox;
 import com.google.gwt.user.client.ui.Panel;
+import com.google.gwt.user.client.ui.RootPanel;
 import com.google.gwt.user.client.ui.TextBox;
 import com.google.inject.ImplementedBy;
 import com.google.inject.Inject;
@@ -60,20 +73,22 @@
  */
 
 /**
-* Organization banner presenter displaying organization's name and logo.
-* 
-* @author 
-*/
+ * Organization banner presenter displaying organization's name and logo.
+ * 
+ * @author
+ */
 
 @Singleton
 public class SearchPresenter extends AbstractZonePresenter<SearchPresenter.View> {
-
+
+	private final SearchServiceAsync searchService = GWT.create(SearchService.class);
+	private ArrayList<SearchResultsDTO> searchResults = new ArrayList<SearchResultsDTO>();
+
 	@Inject
 	public SearchPresenter(View view, Injector injector) {
 		super(view, injector);
 		// TODO Auto-generated constructor stub
 	}
-
 
 	/**
 	 * View interface.
@@ -82,9 +97,13 @@ public SearchPresenter(View view, Injector injector) {
 	public static interface View extends ViewInterface {
 
 		HasHTML getNameLabel();
+
 		Panel getSearchBarPanel();
+
 		ListBox getSearchOptions();
+
 		TextBox getSearchText();
+
 		Button getSearchButton();
 
 	}
@@ -97,49 +116,106 @@ public Zone getZone() {
 		// TODO Auto-generated method stub
 		return Zone.SEARCH_BANNER;
 	}
-	
+
 	/**
 	 * {@inheritDoc}
 	 */
 	@Override
 	public void onBind() {
-
+
+		view.getSearchButton().addKeyUpHandler( new KeyUpHandler() {
+
+			@Override
+			public void onKeyUp(KeyUpEvent event) {
+				if (event.getNativeKeyCode() == KeyCodes.KEY_ENTER) {
+					String searchText = view.getSearchText().getText();
+					if (searchText.length() > 0) {
+						final PageRequest request = new PageRequest(Page.SEARCH_RESULTS);
+						request.addData(RequestParameter.HEADER, searchText);
+						request.addData(RequestParameter.TITLE, searchText);
+						request.addParameter(RequestParameter.ID, searchText.replaceAll("\\W", ""));
+						request.addParameter(RequestParameter.CONTENT, searchText);
+						request.addParameter(RequestParameter.HEADER, searchText);
+						request.addParameter(RequestParameter.TITLE, searchText);
+						// Log.error("Title set to " +
+						// request.getData(RequestParameter.TITLE));
+						// Window.alert("Title set to " +
+						// request.getData(RequestParameter.TITLE));
+						// Log.error("Header set to " +
+						// request.getData(RequestParameter.HEADER));
+						// Window.alert("Header set to " +
+						// request.getData(RequestParameter.HEADER));
+						search();
+						eventBus.navigateRequest(request);
+					}
+				}
+			}
+
+		});
+
+
 		view.getSearchButton().addClickHandler(new ClickHandler() {
 
 			@Override
 			public void onClick(ClickEvent event) {
-
-				//have to add a request param here so that it opens a tab with a new title
-				//request.addParameter(RequestParameter.HEADER, view.getSearchText());
+
+				// have to add a request param here so that it opens a tab with
+				// a new title
+				// request.addParameter(RequestParameter.HEADER,
+				// view.getSearchText());
 				String searchText = view.getSearchText().getText();
-				if(searchText.length() > 0){
+				if (searchText.length() > 0) {
 					final PageRequest request = new PageRequest(Page.SEARCH_RESULTS);
-					request.addData(RequestParameter.HEADER, searchText );
-					request.addData(RequestParameter.TITLE, searchText );
+					request.addData(RequestParameter.HEADER, searchText);
+					request.addData(RequestParameter.TITLE, searchText);
 					request.addParameter(RequestParameter.ID, searchText.replaceAll("\\W", ""));
-					request.addParameter(RequestParameter.CONTENT, searchText );
-					request.addParameter(RequestParameter.HEADER, searchText );
-					request.addParameter(RequestParameter.TITLE, searchText );
-					//Log.error("Title set to " + request.getData(RequestParameter.TITLE));
-					//Window.alert("Title set to " + request.getData(RequestParameter.TITLE));
-					//Log.error("Header set to " + request.getData(RequestParameter.HEADER));
-					//Window.alert("Header set to " + request.getData(RequestParameter.HEADER));
+					request.addParameter(RequestParameter.CONTENT, searchText);
+					request.addParameter(RequestParameter.HEADER, searchText);
+					request.addParameter(RequestParameter.TITLE, searchText);
+					// Log.error("Title set to " +
+					// request.getData(RequestParameter.TITLE));
+					// Window.alert("Title set to " +
+					// request.getData(RequestParameter.TITLE));
+					// Log.error("Header set to " +
+					// request.getData(RequestParameter.HEADER));
+					// Window.alert("Header set to " +
+					// request.getData(RequestParameter.HEADER));
+					search();
 					eventBus.navigateRequest(request);
-					
+
 				}
 			}
 
 		});
 
 	}
+	private void search() {
+
+		String textToServer = view.getSearchText().getText();
+
+		// Send the input to the server.
+		searchService.search(textToServer, new AsyncCallback<ArrayList<SearchResultsDTO>>() {
+			public void onFailure(Throwable caught) {
+				Window.alert("Failure on the server side!");
+				caught.printStackTrace();
+			}
+
+			public void onSuccess(ArrayList<SearchResultsDTO> result) {
+				searchResults = result;
+				for( SearchResultsDTO doc : searchResults ){
+					Window.alert(doc.getResult().toString());
+				}
+			}
+		});
+	}
 
 	/**
 	 * {@inheritDoc}
 	 */
 	@Override
 	public void onZoneRequest(ZoneRequest zoneRequest) {
 		// TODO Auto-generated method stub
-		
+
 	}
 
 }