Changeset 4966
- Timestamp:
- 04/14/14 12:22:02 (10 years ago)
- Location:
- vlo/branches/vlo-3.0/vlo-web-app/src
- Files:
-
- 7 edited
Legend:
- Unmodified
- Added
- Removed
-
vlo/branches/vlo-3.0/vlo-web-app/src/main/java/eu/clarin/cmdi/vlo/VloWebAppParameters.java
r4919 r4966 24 24 public class VloWebAppParameters { 25 25 public final static String THEME = "theme"; 26 public final static String DOCUMENT_ID = "docId"; 27 public static final String QUERY = "q"; 28 public static final String FILTER_QUERY = "fq"; 26 29 } -
vlo/branches/vlo-3.0/vlo-web-app/src/main/java/eu/clarin/cmdi/vlo/service/solr/impl/QueryFacetsSelectionParametersConverter.java
r4965 r4966 27 27 import org.apache.wicket.request.mapper.parameter.PageParameters; 28 28 import org.apache.wicket.util.string.StringValue; 29 import static eu.clarin.cmdi.vlo.VloWebAppParameters.*; 29 30 30 31 /** … … 39 40 // Assuming AND. TODO: decode NOT,OR,not empty. Abandon multimap stategy? 40 41 // Get query string from params 41 final String query = params.get( "q").toOptionalString();42 final String query = params.get(QUERY).toOptionalString(); 42 43 43 44 // Get facet selections from params 44 final List<StringValue> facetValues = params.getValues( "fq");45 final List<StringValue> facetValues = params.getValues(FILTER_QUERY); 45 46 46 47 final HashMap<String, FacetSelection> selection = Maps.newHashMapWithExpectedSize(facetValues.size()); … … 71 72 final String query = selection.getQuery(); 72 73 if (query != null) { 73 params.add( "q", query);74 params.add(QUERY, query); 74 75 } 75 76 … … 79 80 //TODO: encode NOT,OR 80 81 for (String value : facetSelection.getValue().getValues()) { 81 params.add( "fq", String.format("%s:%s", facetSelection.getKey(), value));82 params.add(FILTER_QUERY, String.format("%s:%s", facetSelection.getKey(), value)); 82 83 } 83 84 } -
vlo/branches/vlo-3.0/vlo-web-app/src/main/java/eu/clarin/cmdi/vlo/wicket/pages/RecordPage.java
r4913 r4966 18 18 19 19 import eu.clarin.cmdi.vlo.FacetConstants; 20 import eu.clarin.cmdi.vlo.VloWebAppParameters; 20 21 import eu.clarin.cmdi.vlo.pojo.QueryFacetsSelection; 21 22 import eu.clarin.cmdi.vlo.pojo.SearchContext; … … 84 85 selectionModel = Model.of(selection); 85 86 86 final StringValue docId = params.get( "docId");87 final StringValue docId = params.get(VloWebAppParameters.DOCUMENT_ID); 87 88 if (docId.isEmpty()) { 88 89 Session.get().error("No document ID provided"); -
vlo/branches/vlo-3.0/vlo-web-app/src/main/java/eu/clarin/cmdi/vlo/wicket/panels/TopLinksPanel.java
r4930 r4966 168 168 169 169 if (documentModel != null) { 170 params.add( "docId", documentModel.getObject().getFirstValue(FacetConstants.FIELD_ID));170 params.add(VloWebAppParameters.DOCUMENT_ID, documentModel.getObject().getFirstValue(FacetConstants.FIELD_ID)); 171 171 } 172 172 -
vlo/branches/vlo-3.0/vlo-web-app/src/test/java/eu/clarin/cmdi/vlo/service/solr/impl/SolrDocumentQueryFactoryImplTest.java
r4963 r4966 75 75 @Test 76 76 public void testCreateDocumentQueryForDocId() { 77 final SolrQuery query = instance.createDocumentQuery("doc Id");77 final SolrQuery query = instance.createDocumentQuery("documentId"); 78 78 79 79 final String[] filterQueries = query.getFilterQueries(); 80 80 assertEquals(1, filterQueries.length); 81 assertEquals("id:\"doc Id\"", filterQueries[0]);81 assertEquals("id:\"documentId\"", filterQueries[0]); 82 82 83 83 final String fields = query.getFields(); -
vlo/branches/vlo-3.0/vlo-web-app/src/test/java/eu/clarin/cmdi/vlo/service/solr/impl/SolrDocumentServiceImplTest.java
r4963 r4966 61 61 final SolrQuery solrQuery = new SolrQuery("query"); 62 62 final SolrDocument resultDocument = new SolrDocument(); 63 resultDocument.setField("id", "doc Id");63 resultDocument.setField("id", "documentId"); 64 64 final SolrDocumentList resultList = new SolrDocumentList(); 65 65 resultList.add(resultDocument); 66 66 context.checking(new Expectations() { 67 67 { 68 oneOf(queryFactory).createDocumentQuery("doc Id");68 oneOf(queryFactory).createDocumentQuery("documentId"); 69 69 will(returnValue(solrQuery)); 70 70 oneOf(dao).getDocuments(solrQuery); … … 73 73 }); 74 74 75 final SolrDocument result = instance.getDocument("doc Id");75 final SolrDocument result = instance.getDocument("documentId"); 76 76 assertEquals(resultDocument, result); 77 assertEquals("doc Id", result.getFieldValue("id"));77 assertEquals("documentId", result.getFieldValue("id")); 78 78 } 79 79 -
vlo/branches/vlo-3.0/vlo-web-app/src/test/java/eu/clarin/cmdi/vlo/wicket/pages/TestRecordPage.java
r4661 r4966 2 2 3 3 import eu.clarin.cmdi.vlo.FacetConstants; 4 import eu.clarin.cmdi.vlo.VloWebAppParameters; 4 5 import eu.clarin.cmdi.vlo.VloWicketApplication; 5 6 import eu.clarin.cmdi.vlo.config.DefaultVloConfigFactory; … … 72 73 document = new SolrDocument(); 73 74 params = new PageParameters(); 74 params.set( "docId", "docId");75 params.set(VloWebAppParameters.DOCUMENT_ID, "documentId"); 75 76 } 76 77 … … 79 80 mockery.checking(new Expectations() { 80 81 { 81 oneOf(documentService).getDocument("doc Id");82 oneOf(documentService).getDocument("documentId"); 82 83 will(returnValue(document)); 83 84 } … … 92 93 mockery.checking(new Expectations() { 93 94 { 94 oneOf(documentService).getDocument("doc Id");95 oneOf(documentService).getDocument("documentId"); 95 96 will(returnValue(document)); 96 97 } … … 107 108 mockery.checking(new Expectations() { 108 109 { 109 oneOf(documentService).getDocument("doc Id");110 oneOf(documentService).getDocument("documentId"); 110 111 will(returnValue(document)); 111 112 }
Note: See TracChangeset
for help on using the changeset viewer.