Changeset 4500
- Timestamp:
- 02/12/14 10:26:30 (10 years ago)
- Location:
- vlo/branches/vlo-3.0/vlo-web-app/src/main/java/eu/clarin/cmdi/vlo
- Files:
-
- 1 added
- 6 edited
Legend:
- Unmodified
- Added
- Removed
-
vlo/branches/vlo-3.0/vlo-web-app/src/main/java/eu/clarin/cmdi/vlo/components/FacetPanel.html
r4499 r4500 27 27 <a href="#" class="expandfacet"><span>expand</span></a> 28 28 <a href="#" class="collapsefacet"><span>collapse</span></a> 29 <h1><a href="#"><wicket:container wicket:id=" selection.facet.name">[TITLE]</wicket:container></a></h1>29 <h1><a href="#"><wicket:container wicket:id="name">[TITLE]</wicket:container></a></h1> 30 30 <a href class="filtertoggle"><span>filter</span></a> 31 31 <form class="filterform"> -
vlo/branches/vlo-3.0/vlo-web-app/src/main/java/eu/clarin/cmdi/vlo/components/FacetPanel.java
r4499 r4500 17 17 package eu.clarin.cmdi.vlo.components; 18 18 19 import eu.clarin.cmdi.vlo.pojo.FacetStatus;19 import org.apache.solr.client.solrj.response.FacetField; 20 20 import org.apache.wicket.markup.html.basic.Label; 21 21 import org.apache.wicket.markup.html.panel.Panel; … … 29 29 public class FacetPanel extends Panel { 30 30 31 public FacetPanel(String id, IModel<Facet Status> model) {31 public FacetPanel(String id, IModel<FacetField> model) { 32 32 super(id, model); 33 setDefaultModel(new CompoundPropertyModel<Facet Status>(model));33 setDefaultModel(new CompoundPropertyModel<FacetField>(model)); 34 34 35 add(new Label(" selection.facet.name"));35 add(new Label("name")); 36 36 } 37 37 -
vlo/branches/vlo-3.0/vlo-web-app/src/main/java/eu/clarin/cmdi/vlo/components/FacetsPanel.java
r4499 r4500 17 17 package eu.clarin.cmdi.vlo.components; 18 18 19 import eu.clarin.cmdi.vlo.pojo.FacetStatus;19 import org.apache.solr.client.solrj.response.FacetField; 20 20 import org.apache.wicket.markup.html.list.ListItem; 21 21 import org.apache.wicket.markup.html.list.ListView; … … 29 29 public class FacetsPanel extends Panel { 30 30 31 public FacetsPanel(String id, ListModel<Facet Status> model) {31 public FacetsPanel(String id, ListModel<FacetField> model) { 32 32 super(id, model); 33 add(new ListView<Facet Status>("facets", model) {33 add(new ListView<FacetField>("facets", model) { 34 34 35 35 @Override 36 protected void populateItem(ListItem<Facet Status> item) {36 protected void populateItem(ListItem<FacetField> item) { 37 37 //TODO: Check whether a value has been selected or not 38 38 item.add(new FacetPanel("facet", item.getModel())); -
vlo/branches/vlo-3.0/vlo-web-app/src/main/java/eu/clarin/cmdi/vlo/pages/FacetedSearchPage.java
r4499 r4500 2 2 3 3 import eu.clarin.cmdi.vlo.components.FacetsPanel; 4 import eu.clarin.cmdi.vlo.pojo.Facet;5 import eu.clarin.cmdi.vlo.pojo.FacetSelection;6 import eu.clarin.cmdi.vlo.pojo.FacetStatus;7 4 import java.util.Arrays; 8 import java.util.Collection; 9 import java.util.Collections; 5 import org.apache.solr.client.solrj.response.FacetField; 10 6 import org.apache.wicket.request.mapper.parameter.PageParameters; 11 7 import org.apache.wicket.markup.html.WebPage; … … 18 14 public FacetedSearchPage(final PageParameters parameters) { 19 15 super(parameters); 20 final FacetSelection languageSelection = new FacetSelection(new Facet("Language"), Collections.singleton("Dutch"));21 final FacetSelection typeSelection = new FacetSelection(new Facet("Resource type"), Collections.<String>emptySet());22 final Collection<FacetSelection> context = Arrays.asList(languageSelection,typeSelection);23 16 24 add(new FacetsPanel("facets", new ListModel<Facet Status>(Arrays.asList(25 new Facet Status(languageSelection, context),26 new Facet Status(typeSelection, context)))));17 add(new FacetsPanel("facets", new ListModel<FacetField>(Arrays.asList( 18 new FacetField("Language"), 19 new FacetField("Resource type"))))); 27 20 } 28 21 } -
vlo/branches/vlo-3.0/vlo-web-app/src/main/java/eu/clarin/cmdi/vlo/service/FacetValuesService.java
r4497 r4500 15 15 * along with this program. If not, see <http://www.gnu.org/licenses/>. 16 16 */ 17 18 17 package eu.clarin.cmdi.vlo.service; 19 18 20 19 import eu.clarin.cmdi.vlo.pojo.Facet; 20 import eu.clarin.cmdi.vlo.pojo.FacetSelection; 21 21 import eu.clarin.cmdi.vlo.pojo.FacetValue; 22 22 import eu.clarin.cmdi.vlo.service.impl.FacetValuesProvider; 23 import java.util.Collection; 23 24 import java.util.List; 24 25 … … 29 30 public interface FacetValuesService { 30 31 31 public List<FacetValue> getValues(Facet facet, String startsWith, FacetValuesProvider.FacetValuesSortProperty sort); 32 public long getValueCount(Facet facet, String startsWith); 32 public List<FacetValue> getValues(Facet facet, Collection<FacetSelection> context, String startsWith, FacetValuesProvider.FacetValuesSortProperty sort); 33 34 public long getValueCount(Facet facet, Collection<FacetSelection> context, String startsWith); 33 35 } -
vlo/branches/vlo-3.0/vlo-web-app/src/main/java/eu/clarin/cmdi/vlo/service/impl/FacetValuesProvider.java
r4497 r4500 19 19 import eu.clarin.cmdi.vlo.service.FacetValuesService; 20 20 import eu.clarin.cmdi.vlo.pojo.Facet; 21 import eu.clarin.cmdi.vlo.pojo.FacetStatus; 21 22 import eu.clarin.cmdi.vlo.pojo.FacetValue; 22 23 import eu.clarin.cmdi.vlo.service.impl.FacetValuesProvider.FacetValuesSortProperty; … … 38 39 } 39 40 private final FacetValuesService fvService; 40 private final Facet facet;41 private final IModel<FacetStatus> status; 41 42 private final String filter; 42 43 43 public FacetValuesProvider(FacetValuesService fvService, Facet facet, String filter) {44 public FacetValuesProvider(FacetValuesService fvService, IModel<FacetStatus> status, String filter) { 44 45 this.fvService = fvService; 45 this. facet = facet;46 this.status = status; 46 47 this.filter = filter; 47 48 } … … 49 50 @Override 50 51 public Iterator<? extends FacetValue> iterator(long first, long count) { 51 return fvService.getValues(facet, filter, FacetValuesSortProperty.NAME).listIterator((int) first); 52 return fvService.getValues( 53 status.getObject().getSelection().getFacet(), 54 status.getObject().getContext(), 55 filter, 56 FacetValuesSortProperty.NAME).listIterator((int) first); 52 57 } 53 58 54 59 @Override 55 60 public long size() { 56 return fvService.getValueCount(facet, filter); 61 return fvService.getValueCount( 62 status.getObject().getSelection().getFacet(), 63 status.getObject().getContext(), 64 filter); 57 65 } 58 66
Note: See TracChangeset
for help on using the changeset viewer.