From 156bbb95c00c4d9ffe7bf728297b351919db5d52 Mon Sep 17 00:00:00 2001
From: "panagiotis.kanakakis" <sdi1100079@di.uoa.gr>
Date: Thu, 11 Jan 2018 09:58:24 +0000
Subject: [PATCH] 1. Bug fix on repository convert 2. Update pom with postgres
 dependency

---
 pom.xml                                                    | 7 +++++++
 .../eu/dnetlib/repo/manager/service/utils/Converter.java   | 2 +-
 src/main/resources/application-context.xml                 | 4 ++--
 3 files changed, 10 insertions(+), 3 deletions(-)

diff --git a/pom.xml b/pom.xml
index a0b2f1b..7124889 100644
--- a/pom.xml
+++ b/pom.xml
@@ -223,6 +223,13 @@
             <artifactId>typescript-generator-maven-plugin</artifactId>
             <version>1.29.366</version>
         </dependency>
+        <!-- https://mvnrepository.com/artifact/postgresql/postgresql -->
+        <dependency>
+            <groupId>postgresql</groupId>
+            <artifactId>postgresql</artifactId>
+            <version>9.1-901.jdbc3</version>
+        </dependency>
+
 
 
     </dependencies>
diff --git a/src/main/java/eu/dnetlib/repo/manager/service/utils/Converter.java b/src/main/java/eu/dnetlib/repo/manager/service/utils/Converter.java
index e91e5d2..fad57d2 100644
--- a/src/main/java/eu/dnetlib/repo/manager/service/utils/Converter.java
+++ b/src/main/java/eu/dnetlib/repo/manager/service/utils/Converter.java
@@ -82,7 +82,7 @@ public class Converter {
         repository.setQualityManagementKind(datasource.get("qualitymanagementkind").toString());
         repository.setRegisteredBy(datasource.get("registeredby").toString());
 
-        if(repository.getRegisteredBy() != null)
+        if(Objects.equals(repository.getRegisteredBy(),"null"))
             repository.setRegistered(true);
 
         repository.setReleaseEndDate(convertStringToDate(datasource.get("releaseenddate").toString()));
diff --git a/src/main/resources/application-context.xml b/src/main/resources/application-context.xml
index c70e985..b1dc4c6 100644
--- a/src/main/resources/application-context.xml
+++ b/src/main/resources/application-context.xml
@@ -9,7 +9,7 @@
 	http://www.springframework.org/schema/context/spring-context-4.0.xsd
 	http://www.springframework.org/schema/tx http://www.springframework.org/schema/tx/spring-tx.xsd">
 
-   <!-- <import resource="classpath:META-INF/cxf/cxf.xml"/>
+    <!--<import resource="classpath:META-INF/cxf/cxf.xml"/>
     <import resource="classpath:META-INF/cxf/cxf-extension-jaxws.xml"/>
     <import resource="classpath:META-INF/cxf/cxf-servlet.xml"/>
     <import resource="classpath*:/cxf.xml"/>
@@ -24,7 +24,7 @@
     <import resource="classpath*:/gr/uoa/di/driver/app/springContext-commons.xml"/>
     <import resource="classpath*:/gr/uoa/di/driver/app/springContext-registrator.xml"/>
     <import resource="classpath*:/eu/dnetlib/repos/springContext-repos-dms-cached.xml"/>-->
-    <context:property-placeholder location="classpath*:/eu/**/application.properties" /> 
+    <context:property-placeholder location="classpath*:/eu/**/application.properties" />
     <tx:annotation-driven transaction-manager="txManager"/>
 
     <bean class="eu.dnetlib.repo.manager.service.config.CascadingPropertyLoader" id="propertyLoader">