Project

General

Profile

« Previous | Next » 

Revision 62020

repository terms functionality

View differences:

Converter.java
31 31

  
32 32
        Repository repository = new Repository();
33 33

  
34
        JSONObject datasource = repositoryObject.getJSONObject("datasource");
34
//        JSONObject datasource = repositoryObject.getJSONObject("datasource");
35
        JSONObject datasource = repositoryObject;
35 36

  
36 37
        //if( datasource.equals(null))
37 38
        //    return null;
......
103 104
            repository.setCountryCode(countryCode);
104 105
        }
105 106

  
107
        repository.setConsentTermsOfUse(convertStringToBoolean(datasource.get("consentTermsOfUse").toString()));
108
        try {
109
            repository.setConsentTermsOfUseDate(convertStringToDate(datasource.get("consentTermsOfUseDate").toString()));
110
        } catch (JSONException e) {
111
            repository.setConsentTermsOfUseDate(null);
112
        }
113
        repository.setFullTextDownload(convertStringToBoolean(datasource.get("fullTextDownload").toString()));
114

  
106 115
        /* identities field  */
107 116

  
108 117
        return repository;
109 118
    }
110 119

  
120
    public static Boolean convertStringToBoolean(String value) {
121
        return value.equals("null") ? null : Boolean.valueOf(value);
122
    }
123

  
111 124
    public static Date convertStringToDate(String date) {
112 125

  
113 126
        if (Objects.equals(date, "null"))
......
169 182
        repositorySnippet.setRegisteredby(repositorySnippetObject.get("registeredby").toString());
170 183
        if (repositorySnippet.getRegisteredby().equals("null"))
171 184
            repositorySnippet.setRegisteredby("");
185

  
186
        repositorySnippet.setConsentTermsOfUse(repositorySnippetObject.get("consenttermsofuse").toString());
187
        repositorySnippet.setFullTextDownload(repositorySnippetObject.get("fulltextdownload").toString());
188
        repositorySnippet.setConsentTermsOfUseDate(convertStringToDate(repositorySnippetObject.get("consenttermsofusedate").toString()));
189

  
172 190
        return repositorySnippet;
173 191

  
174 192
    }
......
296 314
        }
297 315

  
298 316
        repositoryMap.put("subjects", "");
317
        repositoryMap.put("consentTermsOfUse", repository.getConsentTermsOfUse());
318
        repositoryMap.put("fullTextDownload", repository.getFullTextDownload());
319
        repositoryMap.put("consentTermsOfUseDate", convertDateToString(repository.getConsentTermsOfUseDate()));
299 320

  
300 321
        return mapper.writeValueAsString(repositoryMap);
301 322
    }

Also available in: Unified diff