-
Notifications
You must be signed in to change notification settings - Fork 48
[WIP] Search Engine (issue 535) #97
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Open
osarrat
wants to merge
36
commits into
sigmah-dev:master
Choose a base branch
from
halfcurry:aditya
base: master
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
Open
Changes from all commits
Commits
Show all changes
36 commits
Select commit
Hold shift + click to select a range
3916bcd
Added search bar UI
17b6d5f
Worked on SearchResults classes
e052d70
New tab opens but is Singleton
e3a44e5
Work on Search results page title
695f257
Multiple tabs open but bugs exist
5f749b4
Attempt at connecting to Solr Server
883460a
Minor changes to the search classes
34597da
Added an index button to do full import
c08b492
Attempt at presentation of results on screen
cfa0418
Results rendering but views not changing
882cc0e
Fixed Search results view changing issue and cleaned code
8dd81b4
[Issue #535]: Attempt at opening a project on clicking project search…
b533347
[Issue #535]:Contacts, OrgUnits open on clicking results
0fc5440
[Issue 535]: Made search results pretty
049a3ee
[Issue 535]:Added search filtering and resolved first-time connection…
14db114
[Issue #535]:Added icons to differentiate between types of results
9d15b0a
[Issue #535]:Added filtering (using existing permissions of user) for…
d3e1fb3
[Issue #535]: Contacts and OrgUnits permmission filtering and cleanin…
dd095d6
[Issue #535]: Added an auto full-data import indexing job
0604656
[Issue #535]: Modified pom.xml to include global sigmah core url prop…
1fd1e1c
[Issue #535]:Added solr sonfig files
44ef000
[Issue #535]: Added a panel in admin settings for solr settings
bec9e80
[Issue #535]:Added a column to table organization to store and use so…
ae9af1a
[Issue #535]:Multiple failed attempts at querying the database for a …
b235197
[Issue #535]:Added File indexing capability via existing command patt…
9b2bdd4
[Issue #535]:Small error in last commit
1f7d1f3
[Issue #535]:Modified automatic and manual indexing to include files …
035c728
[Issue #535]:Presentation of files in search results
05abe0b
[Issue #535]:Made UI changes and very rudimentary files results filte…
fb2f93e
[Issue #535]:Multiple changes to UIs of search bar, results and admin
39b19a1
[Issue #535]:Added proper errror messages for different cases
6b2ed5f
[Issue #535]:Code cleanup #1
4999b3a
[Issue #535]:Code cleanup #2, added comments
8f9281a
[Issue #535]:Added Global Permission SEARCH for viewing search bar
9df59b2
[Issue #535]:Added a search button image
4e9ea32
[Issue #535]:Final few changes and code cleanup
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,44 @@ | ||
| package org.sigmah.client.search; | ||
|
|
||
| /* | ||
| * #%L | ||
| * Sigmah | ||
| * %% | ||
| * Copyright (C) 2010 - 2016 URD | ||
| * %% | ||
| * This program is free software: you can redistribute it and/or modify | ||
| * it under the terms of the GNU General Public License as | ||
| * published by the Free Software Foundation, either version 3 of the | ||
| * License, or (at your option) any later version. | ||
| * | ||
| * This program is distributed in the hope that it will be useful, | ||
| * but WITHOUT ANY WARRANTY; without even the implied warranty of | ||
| * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the | ||
| * GNU General Public License for more details. | ||
| * | ||
| * You should have received a copy of the GNU General Public | ||
| * License along with this program. If not, see | ||
| * <http://www.gnu.org/licenses/gpl-3.0.html>. | ||
| * #L% | ||
| */ | ||
|
|
||
| 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; | ||
|
|
||
| /** | ||
| * Interface used by the client side for calling search related methods using GWT's | ||
| * async callbacks. {@link SearchServiceAsync} is the associated Async interface | ||
| * | ||
| * @author Aditya Adhikary (aditya15007@iiitd.ac.in) | ||
| * | ||
| */ | ||
| @RemoteServiceRelativePath("search") | ||
| public interface SearchService extends RemoteService { | ||
| ArrayList<SearchResultsDTO> search(String searchStr, String filter); | ||
| Boolean index(); | ||
| Boolean updateCore(String solrCoreUrl); | ||
| } |
43 changes: 43 additions & 0 deletions
43
src/main/java/org/sigmah/client/search/SearchServiceAsync.java
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,43 @@ | ||
| package org.sigmah.client.search; | ||
|
|
||
| /* | ||
| * #%L | ||
| * Sigmah | ||
| * %% | ||
| * Copyright (C) 2010 - 2016 URD | ||
| * %% | ||
| * This program is free software: you can redistribute it and/or modify | ||
| * it under the terms of the GNU General Public License as | ||
| * published by the Free Software Foundation, either version 3 of the | ||
| * License, or (at your option) any later version. | ||
| * | ||
| * This program is distributed in the hope that it will be useful, | ||
| * but WITHOUT ANY WARRANTY; without even the implied warranty of | ||
| * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the | ||
| * GNU General Public License for more details. | ||
| * | ||
| * You should have received a copy of the GNU General Public | ||
| * License along with this program. If not, see | ||
| * <http://www.gnu.org/licenses/gpl-3.0.html>. | ||
| * #L% | ||
| */ | ||
|
|
||
| import java.util.ArrayList; | ||
|
|
||
| import org.sigmah.server.search.SearchServiceImpl; | ||
| import org.sigmah.shared.dto.search.SearchResultsDTO; | ||
|
|
||
| import com.google.gwt.user.client.rpc.AsyncCallback; | ||
|
|
||
| /** | ||
| * Async interface on the client side which is implemented by | ||
| * {@link SearchServiceImpl} on the server side. | ||
| * | ||
| * @author Aditya Adhikary (aditya15007@iiitd.ac.in) | ||
| */ | ||
| public interface SearchServiceAsync { | ||
|
|
||
| public void search(String searchStr, String filter, AsyncCallback<ArrayList<SearchResultsDTO>> callback); | ||
| public void index(AsyncCallback<Boolean> callback); | ||
| public void updateCore(String solrCoreUrl, AsyncCallback<Boolean> callback); | ||
| } |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Please ignore any local changes I have made. The only one which matters is this solr dependency.