Project

General

Profile

« Previous | Next » 

Revision 49857

adding software id parameter

View differences:

modules/uoa-search/trunk/src/main/java/eu/dnetlib/data/search/utils/cql/ParameterQueryEnhancer.java
299 299
    public static void enhanceQueryWithOpenAIREIds(StringBuilder queryBuilder, HttpServletRequest request) {
300 300
        String[] openairePublicationIDs = request.getParameterValues("openairePublicationID");
301 301
        String[] openaireDatasetIDs = request.getParameterValues("openaireDatasetID");
302
        String[] openaireSoftwareIDs = request.getParameterValues("openaireSoftwareID");
302 303
        String[] openaireAuthorIDs = request.getParameterValues("openaireAuthorID");
303 304
        String[] openaireProviderIDs  = request.getParameterValues("openaireProviderID");
304 305
        String[] openaireProjectIDs  = request.getParameterValues("openaireProjectID");
305 306

  
306 307
        enhanceQueryWithIds("objidentifier", openairePublicationIDs, queryBuilder);
307 308
        enhanceQueryWithIds("objidentifier", openaireDatasetIDs, queryBuilder);
309
        enhanceQueryWithIds("objidentifier", openaireSoftwareIDs, queryBuilder);
308 310
        enhanceQueryWithIds("relpersonid", openaireAuthorIDs, queryBuilder);
309 311
        enhanceQueryWithIds("resulthostingdatasourceid", openaireProviderIDs, queryBuilder);
310 312
        enhanceQueryWithIds("relprojectid", openaireProjectIDs, queryBuilder);
modules/uoa-search/trunk/src/main/java/eu/dnetlib/data/search/web/api/SearchRequestController.java
58 58

  
59 59
    private static final List<String> PUB_PARAMETERS = Arrays.asList("openairePublicationID");
60 60
    private static final List<String> DATA_PARAMETERS = Arrays.asList("openaireDatasetID");
61
    private static final List<String> SOFTWARE_PARAMETERS = Arrays.asList("openaireSoftwareID");
61 62

  
62 63
    private static final List<String> PUB_N_DATASET_MODELS = Arrays.asList("dc", "openaire", "sygma");
63 64
    private static final List<String> PUB_N_DATASET_FORMATS = Arrays.asList("json", "rss", "xml", "csv", "tsv", "html");
......
305 306
        try {
306 307
            writer = response.getWriter();
307 308

  
308
            checkParameters(ListUtils.union(PUB_N_DATA_COMMON_PARAMETERS, DATA_PARAMETERS),request.getParameterMap());
309
            checkParameters(ListUtils.union(PUB_N_DATA_COMMON_PARAMETERS, SOFTWARE_PARAMETERS),request.getParameterMap());
309 310

  
310 311
            int page = readParameter(request, "page", 1);
311 312
            int size = readParameter(request, "size", 10);

Also available in: Unified diff