Changeset 4528


Ignore:
Timestamp:
02/17/14 16:08:15 (10 years ago)
Author:
twagoo
Message:

Added search form to the search page

Location:
vlo/branches/vlo-3.0/vlo-web-app/src/main
Files:
1 added
4 edited

Legend:

Unmodified
Added
Removed
  • vlo/branches/vlo-3.0/vlo-web-app/src/main/java/eu/clarin/cmdi/vlo/pojo/QueryFacetsSelection.java

    r4526 r4528  
    2929public class QueryFacetsSelection implements Serializable {
    3030
    31     private final String queryString;
     31    private String queryString;
    3232    private final Map<String, Collection<String>> selection;
    3333
     
    9191        return queryString;
    9292    }
     93
     94    public void setQuery(String queryString) {
     95        this.queryString = queryString;
     96    }
    9397   
    9498    public void selectValues(String facet, Collection<String> values){
  • vlo/branches/vlo-3.0/vlo-web-app/src/main/java/eu/clarin/cmdi/vlo/wicket/pages/FacetedSearchPage.html

    r4515 r4528  
    9595
    9696            <div class="content">
    97                 <form action="" id="search">
     97                <form wicket:id="search" action="" id="search">
    9898                    <p>
    9999                        <span id="searchcontrols">
    100                             <input id="searchbox" type="text" value="democratie" />
    101                             <input id="searchbutton" type="submit" value="Search"/>
     100                            <input wicket:id="query" id="searchbox" type="text" value="democratie" />
     101                            <input wicket:id="searchSubmit" id="searchbutton" type="submit" value="Search"/>
    102102                        </span>
    103103                    </p>
  • vlo/branches/vlo-3.0/vlo-web-app/src/main/java/eu/clarin/cmdi/vlo/wicket/pages/FacetedSearchPage.java

    r4522 r4528  
    33import eu.clarin.cmdi.vlo.wicket.components.FacetsPanel;
    44import eu.clarin.cmdi.vlo.pojo.QueryFacetsSelection;
     5import eu.clarin.cmdi.vlo.wicket.components.SearchForm;
    56import java.util.Collection;
    67import java.util.Collections;
     
    2930                    }
    3031                });
     32        final Model<QueryFacetsSelection> queryModel = new Model<QueryFacetsSelection>(selection);
    3133
    32         add(new FacetsPanel("facets", new Model<QueryFacetsSelection>(selection)));
     34        add(new FacetsPanel("facets", queryModel));
     35       
     36        add(new SearchForm("search", queryModel));
    3337    }
    3438}
  • vlo/branches/vlo-3.0/vlo-web-app/src/main/resources/log4j.properties

    r4323 r4528  
    1010log4j.logger.org.apache.wicket.RequestCycle=INFO
    1111
     12log4j.logger.eu.clarin.cmdi.vlo=DEBUG
    1213
     14
Note: See TracChangeset for help on using the changeset viewer.