Revision 50331
Added by Panagiotis Kanakakis about 6 years ago
modules/uoa-repository-manager-service/trunk/src/main/java/eu/dnetlib/repo/manager/service/utils/Converter.java | ||
---|---|---|
304 | 304 |
|
305 | 305 |
public static List<AggregationDetails> getAggregationHistoryFromJson(JSONObject repositoryObject) throws JSONException { |
306 | 306 |
|
307 |
if( repositoryObject.get("aggregationHistory").toString().equals("[]") || |
|
307 |
/* if( repositoryObject.get("aggregationHistory").toString().equals("[]") ||
|
|
308 | 308 |
repositoryObject.get("aggregationHistory")!= null) |
309 |
return null; |
|
309 |
return null;*/ |
|
310 |
if(repositoryObject.get("aggregationHistory").toString().equals("null")) |
|
311 |
return null; |
|
310 | 312 |
|
311 | 313 |
|
312 | 314 |
JSONArray rs = new JSONArray(repositoryObject.get("aggregationHistory").toString()); |
315 |
|
|
313 | 316 |
List<AggregationDetails> aggregationDetailsList = new ArrayList<>(); |
314 | 317 |
for(int i=0;i<rs.length();i++) |
315 | 318 |
aggregationDetailsList.add(jsonToAggregationDetails(rs.getJSONObject(i))); |
... | ... | |
319 | 322 |
private static AggregationDetails jsonToAggregationDetails(JSONObject aggregationObject) throws JSONException { |
320 | 323 |
|
321 | 324 |
AggregationDetails aggregationDetails = new AggregationDetails(); |
325 |
|
|
322 | 326 |
aggregationDetails.setAggregationStage(aggregationObject.get("aggregationStage").toString()); |
323 | 327 |
//aggregationDetails.setCollectionMode(aggregationObject.get("collectionMode").toString()); |
324 | 328 |
aggregationDetails.setDate(convertStringToDate(aggregationObject.get("date").toString())); |
modules/uoa-repository-manager-service/trunk/src/main/java/eu/dnetlib/repo/manager/service/controllers/ValidatorApiImpl.java | ||
---|---|---|
3 | 3 |
import eu.dnetlib.api.functionality.ValidatorServiceException; |
4 | 4 |
import eu.dnetlib.domain.functionality.validator.StoredJob; |
5 | 5 |
import eu.dnetlib.repo.manager.service.utils.OaiTools; |
6 |
import eu.dnetlib.repo.manager.shared.ValidationServiceException; |
|
7 | 6 |
import gr.uoa.di.driver.util.ServiceLocator; |
8 | 7 |
import eu.dnetlib.domain.functionality.validator.JobForValidation; |
9 | 8 |
import eu.dnetlib.domain.functionality.validator.RuleSet; |
... | ... | |
17 | 16 |
import org.springframework.beans.factory.annotation.Autowired; |
18 | 17 |
import org.springframework.stereotype.Component; |
19 | 18 |
import org.springframework.web.bind.annotation.PathVariable; |
20 |
import sun.rmi.runtime.Log; |
|
21 | 19 |
|
22 | 20 |
import javax.annotation.PostConstruct; |
23 | 21 |
import javax.annotation.Resource; |
modules/uoa-repository-manager-service/trunk/src/main/resources/application-context.xml | ||
---|---|---|
24 | 24 |
<import resource="classpath*:/gr/uoa/di/driver/app/springContext-commons.xml"/> |
25 | 25 |
<import resource="classpath*:/gr/uoa/di/driver/app/springContext-registrator.xml"/> |
26 | 26 |
<import resource="classpath*:/eu/dnetlib/repos/springContext-repos-dms-cached.xml"/>--> |
27 |
|
|
27 | 28 |
<context:property-placeholder location="classpath*:/eu/**/application.properties" /> |
28 | 29 |
<tx:annotation-driven transaction-manager="txManager"/> |
29 | 30 |
|
... | ... | |
79 | 80 |
<property name="dataSource" ref="repomanager.dataSource"/> |
80 | 81 |
</bean> |
81 | 82 |
|
82 |
</beans> |
|
83 |
</beans> |
modules/uoa-repository-manager-service/trunk/pom.xml | ||
---|---|---|
93 | 93 |
</exclusion> |
94 | 94 |
</exclusions> |
95 | 95 |
</dependency> |
96 |
<!-- |
|
96 |
|
|
97 | 97 |
<dependency> |
98 | 98 |
<groupId>eu.dnetlib</groupId> |
99 | 99 |
<artifactId>uoa-utils</artifactId> |
100 | 100 |
<version>[2.0.0-SNAPSHOT, 3.0.0)</version> |
101 | 101 |
</dependency> |
102 |
--> |
|
103 | 102 |
|
104 | 103 |
<dependency> |
105 | 104 |
<groupId>eu.dnetlib</groupId> |
Also available in: Unified diff
Bug fix on converter class for aggregation method