Project

General

Profile

« Previous | Next » 

Revision 50614

1. New rest api
2. Cors filter on web.xml
3. Remove aai

View differences:

Converter.java
31 31
        
32 32
        repository.setActivationId(datasource.get("activationId").toString());
33 33
        repository.setAggregator(datasource.get("aggregator").toString());
34
        repository.setCertificates(datasource.get("certificates").toString());
35
        repository.setCitationGuidelineUrl(datasource.get("citationguidelineurl").toString());
36
        repository.setCollectedFrom( datasource.get("collectedfrom").toString());
34
//        repository.setCertificates(datasource.get("certificates").toString());
35
//        repository.setCitationGuidelineUrl(datasource.get("citationguidelineurl").toString());
36
//        repository.setCollectedFrom( datasource.get("collectedfrom").toString());
37 37

  
38 38
        repository.setContactEmail(datasource.get("contactemail").toString());
39 39
        if(repository.getContactEmail().equals("null"))
40 40
            repository.setContactEmail("");
41 41

  
42
        repository.setDatabaseAccessRestriction(datasource.get("databaseaccessrestriction").toString());
43
        repository.setDatabaseAccessType(datasource.get("databaseaccesstype").toString());
44
        repository.setDataUploadRestriction(datasource.get("datauploadrestriction").toString());
45
        repository.setDataUploadType(datasource.get("datauploadtype").toString());
42
//        repository.setDatabaseAccessRestriction(datasource.get("databaseaccessrestriction").toString());
43
//        repository.setDatabaseAccessType(datasource.get("databaseaccesstype").toString());
44
//        repository.setDataUploadRestriction(datasource.get("datauploadrestriction").toString());
45
//        repository.setDataUploadType(datasource.get("datauploadtype").toString());
46 46
        repository.setDateOfCollection(convertStringToDate( datasource.get("dateofcollection").toString()));
47 47
        repository.setDateOfValidation(convertStringToDate( datasource.get("dateofvalidation").toString()));
48 48

  
......
69 69

  
70 70
        repository.setLongitude(toDouble(datasource.get("longitude").toString()));
71 71
        //datasource.get("managed");
72
        repository.setMissionStatementUrl(datasource.get("missionstatementurl").toString());
72
//        repository.setMissionStatementUrl(datasource.get("missionstatementurl").toString());
73 73
        repository.setNamespacePrefix(datasource.get("namespaceprefix").toString());
74
        repository.setOdContentTypes(datasource.get("od_contenttypes").toString());
74
//        repository.setOdContentTypes(datasource.get("od_contenttypes").toString());
75 75
        repository.setOfficialName(datasource.get("officialname").toString());
76 76
        if(repository.getOfficialName().equals("null"))
77 77
            repository.setOfficialName("");
78 78

  
79
        repository.setPidSystems(datasource.get("pidsystems").toString());
79
//        repository.setPidSystems(datasource.get("pidsystems").toString());
80 80
        //datasource.get("platform");
81
        repository.setProvenanceActionClass( datasource.get("provenanceaction").toString());
82
        repository.setQualityManagementKind(datasource.get("qualitymanagementkind").toString());
81
//        repository.setProvenanceActionClass( datasource.get("provenanceaction").toString());
82
//        repository.setQualityManagementKind(datasource.get("qualitymanagementkind").toString());
83 83
        repository.setRegisteredBy(datasource.get("registeredby").toString());
84 84

  
85 85
        if(Objects.equals(repository.getRegisteredBy(),"null"))
86 86
            repository.setRegistered(true);
87 87

  
88
        repository.setReleaseEndDate(convertStringToDate(datasource.get("releaseenddate").toString()));
89
        repository.setReleaseStartDate(convertStringToDate(datasource.get("releasestartdate").toString()));
90
        repository.setServiceProvider(Boolean.valueOf(datasource.get("serviceprovider").toString()));
88
//        repository.setReleaseEndDate(convertStringToDate(datasource.get("releaseenddate").toString()));
89
//        repository.setReleaseStartDate(convertStringToDate(datasource.get("releasestartdate").toString()));
90
//        repository.setServiceProvider(Boolean.valueOf(datasource.get("serviceprovider").toString()));
91 91
        //datasource.get("subjects");
92 92
        Double timezone = toDouble(datasource.get("timezone").toString());
93 93
        repository.setTimezone(timezone!=null?timezone:0.0);
94 94
        repository.setTypology(datasource.get("platform").toString());
95
        repository.setVersioning(Boolean.valueOf(datasource.get("versioning").toString()));
95
//        repository.setVersioning(Boolean.valueOf(datasource.get("versioning").toString()));
96 96
        repository.setWebsiteUrl(datasource.get("websiteurl").toString());
97 97
        repository.setDatasourceClass(datasource.get("typology").toString());
98 98

  
......
102 102
        repository.setCountryCode(countryCode);
103 103

  
104 104

  
105
        String collectedFrom = datasource.get("collectedfrom").toString();
105
       /* String collectedFrom = datasource.get("collectedfrom").toString();
106 106
        //TODO check data consistency
107 107
        String type = "UNKNOWN";
108 108
        if (collectedFrom.equalsIgnoreCase("openaire____::opendoar")) {
......
111 111
            type = "re3data";
112 112
        } else if (collectedFrom.equalsIgnoreCase("infrastruct_::openaire")) {
113 113
            type = "journal";
114
        }
114
        }*/
115 115

  
116
        repository.setDatasourceType(type);
116
//        repository.setDatasourceType(type);
117 117

  
118 118

  
119 119
        return repository;

Also available in: Unified diff