Project

General

Profile

« Previous | Next » 

Revision 60332

Replacing projectcode with projectcode_nt #5982 + Adding resultdupid in the query for results landing page

View differences:

modules/uoa-search/trunk/src/main/java/eu/dnetlib/data/search/app/SearchServiceImpl.java
232 232

  
233 233
        String query = rewrite(text);
234 234
        enhanceFieldQueries(fieldQueries);
235
        logger.info("Performing query " + query + "' and fields " + fieldQueries + " and refine " + refinefields);
235
        logger.info("Performing query '" + query + "' and fields " + fieldQueries + " and refine " + refinefields);
236 236

  
237 237
        try {
238 238
            //TODO see parser and maybe delete!
......
434 434
        List<String> searchResults = null;
435 435

  
436 436
        String query = rewrite(text);
437
        logger.info("Performing query " + query + "' and fields " + fieldQueries + " and refine " + refinefields);
437
        logger.info("Performing query '" + query + "' and fields " + fieldQueries + " and refine " + refinefields);
438 438

  
439 439
        try {
440 440
            //TODO see parser and maybe delete!
modules/uoa-search/trunk/src/main/java/eu/dnetlib/data/search/utils/cql/ParameterQueryEnhancer.java
343 343
        addMetadataQueryTerm(null, keywords, queryBuilder);
344 344
        addMetadataQueryTerm("projectacronym", acronym, queryBuilder);
345 345
        addEqualQueryTerm("projecttitle", name, queryBuilder);
346
        addExactQueryTerm("projectcode", grantID, queryBuilder);
346
        addExactQueryTerm("projectcode_nt", grantID, queryBuilder);
347 347
        addExactQueryTerm("projectcallidentifier", callID, queryBuilder);
348 348
    }
349 349

  
modules/uoa-search/trunk/src/main/java/eu/dnetlib/data/search/web/api/SearchApiService.java
1147 1147
        }
1148 1148

  
1149 1149
        if (entity == RequestResponseHandler.Entity.PUBLICATION || entity == RequestResponseHandler.Entity.DATASET
1150
                || entity == RequestResponseHandler.Entity.SOFTWARE || entity == RequestResponseHandler.Entity.OTHER) {
1150
                || entity == RequestResponseHandler.Entity.SOFTWARE || entity == RequestResponseHandler.Entity.OTHER ||
1151
                    entity == RequestResponseHandler.Entity.RESULT) {
1151 1152
            CQLQueryBuilder.appendFieldTerm(queryBuilder, CQLQueryBuilder.Operator.OR, "resultdupid", CQLQueryBuilder.Operator.EXACT, entityId);
1152 1153

  
1153 1154
        } else if (entity == RequestResponseHandler.Entity.ORGANIZATION) {

Also available in: Unified diff