Project

General

Profile

« Previous | Next » 

Revision 58341

ClaimEntity: Add information about the dashboard where the claim was created

Properties:
add properties for the different services
create beans properly
production or beta is decided from the services urls in properties

Migration:
create migration method: CopyFromBetaToProduction for communities

View differences:

SearchUtils.java
29 29
    private static final Logger logger = Logger.getLogger(SearchUtils.class);
30 30
    public static String searchAPIUrl=null;//"http://beta.services.openaire.eu:8480/search/";
31 31

  
32
    private static String crossrefUrl="https://api.crossref.org/works?filter=doi:";
33
    private static String dataciteUrl="https://data.datacite.org/application/rdf+xml/";
34
    private static String dataciteNewAPIUrl="https://api.datacite.org/works/";
35
    private static String orcidUrlPrefix="https://pub.orcid.org/v2.1/";
36
    private static String orcidUrlSuffix="/works";
37
//    private static String contextsAPIUrl="https://dev-openaire.d4science.org/openaire/context";
38
    private static String contextsAPIUrl="http://beta.services.openaire.eu:8080/openaire/context";
39
    private static String contextsAPIUrlProduction="http://services.openaire.eu:8080/openaire/context";
40
    private boolean useApi=true;
32
    private static String crossrefUrl=null;
33
    private static String dataciteUrl=null;
34
    private static String orcidUrlPrefix=null;
35
    private static String orcidUrlSuffix=null;
36
    private static String contextsAPIUrl=null;
41 37
    private ClaimValidation claimValidation = null;
42 38

  
43 39
    public SearchUtils(){
......
93 89

  
94 90
    }
95 91

  
96
    public static String fetchResultXMLFromDatacite(String id) throws Exception{
92
    public String fetchResultXMLFromDatacite(String id) throws Exception{
97 93
            return getRequest(getDataciteUrl(id));
98 94
    }
99
    public static String fetchResultXMLFromOrcid(String id) throws Exception{
95
    public String fetchResultXMLFromOrcid(String id) throws Exception{
100 96

  
101 97
            return getRequest(getOrcidUrl(id));
102 98
    }
103
    public static String fetchContext(String suffix, boolean production) throws Exception{
99
    public String fetchContext(String suffix) throws Exception{
104 100

  
105
        return getRequest(getContextsAPIUrl(production)+suffix);
101
        return getRequest(getContextsAPIUrl()+suffix);
106 102
    }
107 103

  
108 104
     public String getProjectApiUrl(String id)  {
......
128 124

  
129 125
    private static String getDataciteUrl(String id)  {
130 126

  
131
        return dataciteNewAPIUrl+id;
127
        return dataciteUrl+id;
132 128
    }
133 129

  
134 130
    private static String getOrcidUrl(String id)  {
135 131

  
136 132
        return orcidUrlPrefix+id+orcidUrlSuffix;
137 133
    }
138
    private static String getContextsAPIUrl( boolean production)  {
134
    private static String getContextsAPIUrl()  {
139 135

  
140
        return ((production)?contextsAPIUrlProduction:contextsAPIUrl);
136
        return contextsAPIUrl;
141 137
    }
142 138

  
143 139

  
......
251 247
    public void setSearchAPIUrl(String searchAPIUrl) {
252 248
        this.searchAPIUrl = searchAPIUrl;
253 249
    }
250

  
251
    public static void setContextsAPIUrl(String contextsAPIUrl) {
252
        SearchUtils.contextsAPIUrl = contextsAPIUrl;
253
    }
254

  
255
    public static String getCrossrefUrl() {
256
        return crossrefUrl;
257
    }
258

  
259
    public static void setCrossrefUrl(String crossrefUrl) {
260
        SearchUtils.crossrefUrl = crossrefUrl;
261
    }
262

  
263
    public static String getDataciteUrl() {
264
        return dataciteUrl;
265
    }
266

  
267
    public static void setDataciteUrl(String dataciteUrl) {
268
        SearchUtils.dataciteUrl = dataciteUrl;
269
    }
270

  
271
    public static String getOrcidUrlPrefix() {
272
        return orcidUrlPrefix;
273
    }
274

  
275
    public static void setOrcidUrlPrefix(String orcidUrlPrefix) {
276
        SearchUtils.orcidUrlPrefix = orcidUrlPrefix;
277
    }
278

  
279
    public static String getOrcidUrlSuffix() {
280
        return orcidUrlSuffix;
281
    }
282

  
283
    public static void setOrcidUrlSuffix(String orcidUrlSuffix) {
284
        SearchUtils.orcidUrlSuffix = orcidUrlSuffix;
285
    }
254 286
}
255 287

  
256 288

  

Also available in: Unified diff