From 2c62f11b326bfe4c6414b62c0c6867e169f2247a Mon Sep 17 00:00:00 2001
From: "michele.artini" <michele.artini@isti.cnr.it>
Date: Thu, 15 Dec 2022 14:40:50 +0100
Subject: [PATCH] search

---
 .../src/main/java/eu/dnetlib/openaire/dsm/DsmService.java     | 3 +--
 .../src/main/resources/templates/resultsDatasources.html      | 2 +-
 .../openaire/dsm/repository/SimpleDsWithApisRepository.java   | 4 ++++
 3 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/apps/dnet-is-application/src/main/java/eu/dnetlib/openaire/dsm/DsmService.java b/apps/dnet-is-application/src/main/java/eu/dnetlib/openaire/dsm/DsmService.java
index ce25c914..468ed568 100644
--- a/apps/dnet-is-application/src/main/java/eu/dnetlib/openaire/dsm/DsmService.java
+++ b/apps/dnet-is-application/src/main/java/eu/dnetlib/openaire/dsm/DsmService.java
@@ -512,8 +512,7 @@ public class DsmService {
 	}
 
 	public List<SimpleDsWithApis> search(final String value) {
-		// TODO Auto-generated method stub
-		return null;
+		return simpleDsWithApisRepository.search(value);
 	}
 
 }
diff --git a/apps/dnet-is-application/src/main/resources/templates/resultsDatasources.html b/apps/dnet-is-application/src/main/resources/templates/resultsDatasources.html
index 56891cd7..020115cc 100644
--- a/apps/dnet-is-application/src/main/resources/templates/resultsDatasources.html
+++ b/apps/dnet-is-application/src/main/resources/templates/resultsDatasources.html
@@ -95,7 +95,7 @@
 		
 		var url = './ajax/dsm/';
 		if ($scope.field) { url += 'searchByField/' + encodeURIComponent($scope.field) + "/0/50"; }
-		else              { url += 'search?' }
+		else              { url += 'search' }
 		url += '?value=' + encodeURIComponent($scope.value) + '&' + $.now();
 		
 		$http.get(url).then(function successCallback(res) {
diff --git a/libs/dnet-is-common/src/main/java/eu/dnetlib/data/openaire/dsm/repository/SimpleDsWithApisRepository.java b/libs/dnet-is-common/src/main/java/eu/dnetlib/data/openaire/dsm/repository/SimpleDsWithApisRepository.java
index d04a924f..19b4c4cc 100644
--- a/libs/dnet-is-common/src/main/java/eu/dnetlib/data/openaire/dsm/repository/SimpleDsWithApisRepository.java
+++ b/libs/dnet-is-common/src/main/java/eu/dnetlib/data/openaire/dsm/repository/SimpleDsWithApisRepository.java
@@ -5,6 +5,7 @@ import java.util.List;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
 import org.springframework.data.jpa.repository.JpaSpecificationExecutor;
 import org.springframework.data.jpa.repository.Query;
+import org.springframework.data.repository.query.Param;
 import org.springframework.stereotype.Repository;
 
 import eu.dnetlib.data.is.common.ReadOnlyRepository;
@@ -15,6 +16,9 @@ import eu.dnetlib.data.openaire.dsm.model.view.SimpleDsWithApis;
 @ConditionalOnProperty(value = "openaire.api.enable.dsm", havingValue = "true")
 public interface SimpleDsWithApisRepository extends ReadOnlyRepository<SimpleDsWithApis, String>, JpaSpecificationExecutor<SimpleDsWithApis> {
 
+	@Query(value = "select * from dsm_datasources_view where id = :value or name ilike %:value%  or other_name ilike %:value%", nativeQuery = true)
+	List<SimpleDsWithApis> search(@Param("value") String value);
+
 	List<SimpleDsWithApis> findByType(String type);
 
 	List<SimpleDsWithApis> findByCollectedFrom(String collectdFrom);