Project

General

Profile

« Previous | Next » 

Revision 46467

Added by Katerina Iatropoulou about 7 years ago

Added compatibility criteria for the datasources queries. Change the field of the name to appear in funding_levels name that are not fp7 - related to #2526.

View differences:

RequestResponseHandler.java
20 20 
        private final List<String> PUBLICATION_FIELD_QUERIES = Arrays.asList("oaftype exact result", "resulttypeid exact publication");
21 21 
        private final List<String> DATASET_FIELD_QUERIES = Arrays.asList("oaftype exact result", "resulttypeid exact dataset");
22 22 
        private final List<String> PROJECT_FIELD_QUERIES = Arrays.asList("oaftype exact project");
23 
        private final List<String> DATASOURCE_FIELD_QUERIES = Arrays.asList("oaftype exact datasource");
23 
        private final List<String> DATASOURCE_FIELD_QUERIES = Arrays.asList("oaftype exact datasource", "(datasourcecompatibilityid <> \"UNKNOWN\")");
24 24 
        private final List<String> ORGANIZATION_FIELD_QUERIES = Arrays.asList("oaftype exact organization",
25 25 
                "reldatasourcecompatibilityid exact driver or reldatasourcecompatibilityid exact driver-openaire2.0 or " +
26 26 
                "reldatasourcecompatibilityid exact openaire2.0 or reldatasourcecompatibilityid exact openaire3.0 or " +
......
129 129 
    public final static String PUBLICATION_PREFIX = "(oaftype exact result) and (resulttypeid exact publication)";
130 130 
    public final static String DATASET_PREFIX = "(oaftype exact result) and (resulttypeid exact dataset)";
131 131 
    public final static String PROJECT_PREFIX = "(oaftype exact project)";
132 
    public final static String DATASOURCE_PREFIX = "(oaftype exact datasource)";
132 
    public final static String DATASOURCE_PREFIX = "(oaftype exact datasource) and (datasourcecompatibilityid <> \"UNKNOWN\")";
133 133 
    public final static String ORGANIZATION_PREFIX = "(oaftype exact organization and " +
134 134 
            "(reldatasourcecompatibilityid=driver or reldatasourcecompatibilityid=driver-openaire2.0 or " +
135 135 
            "reldatasourcecompatibilityid=openaire2.0 or reldatasourcecompatibilityid=openaire3.0 or " +

Also available in: Unified diff