From 716018aa9e60e50a264d3a4152545e2d6d75c8a4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Alejandro=20Pe=C3=B1a=20Carbonell?= <alex@render.es>
Date: Tue, 16 May 2023 14:17:51 +0200
Subject: [PATCH 1/3] Added to search duplicate records in rsc85 and rsc86

---
 .../class.component_input_text.php            |   8 ++
 .../search/class.search_development2.php      | 109 +++++++++++++++---
 2 files changed, 102 insertions(+), 15 deletions(-)

diff --git a/lib/dedalo/component_input_text/class.component_input_text.php b/lib/dedalo/component_input_text/class.component_input_text.php
index b1996ac76a..2de2713936 100644
--- a/lib/dedalo/component_input_text/class.component_input_text.php
+++ b/lib/dedalo/component_input_text/class.component_input_text.php
@@ -669,6 +669,14 @@ public static function resolve_query_object_sql($query_object) {
 				$query_object->q_parsed	= '\'.*"'.$q_clean.'".*\'';
 				$query_object->unaccent = false; // (!) always false
 				break;
+			# DUPLICATED
+			case (strpos($q, '!!')===0 || $q_operator==='!!'):
+				$operator = '=';
+				$query_object->operator 	= $operator;
+				$query_object->unaccent		= false; // (!) always false
+				$query_object->duplicated	= true;
+				$query_object->lang 		= DEDALO_DATA_NOLAN;
+				break;
 			# DEFAULT CONTAIN
 			default:
 				$operator = '~*';
diff --git a/lib/dedalo/search/class.search_development2.php b/lib/dedalo/search/class.search_development2.php
index 4a3912c35a..7ca1cc331c 100644
--- a/lib/dedalo/search/class.search_development2.php
+++ b/lib/dedalo/search/class.search_development2.php
@@ -165,7 +165,7 @@ public function set_up($search_query_object) {
 			$this->allow_sub_select_by_id = $search_query_object->allow_sub_select_by_id;
 		}
 
-		# Set remove_distinct (usseful for thesaurus search)
+		# Set remove_distinct (useful for thesaurus search)
 		if ($count_ar_section_tipo > 1) {
 			$this->remove_distinct = true; # Force true when more than one section is passed
 		}else{
@@ -1041,7 +1041,22 @@ public function parse_search_query_object( $full_count=false ) {
 						$sql_query = $this->build_union_query($sql_query);
 					}
 				// $sql_query = 'SELECT COUNT(section_id) as full_count FROM (' . PHP_EOL . $sql_query . PHP_EOL. ') x';
-					$sql_query = 'SELECT COUNT(*) as full_count FROM (' . PHP_EOL . $sql_query . PHP_EOL. ') x';
+					if(isset($this->search_query_object->duplicated) && $this->search_query_object->duplicated===true){
+						$sql_query = 'SELECT COUNT(*) as full_count';
+						$sql_query .= PHP_EOL . 'FROM ' . $main_from_sql;
+						$sql_query .= PHP_EOL . 'WHERE ( SELECT  count(*)';
+						$sql_query .= PHP_EOL . 'FROM '.$main_from_sql.'_dup';
+						$sql_query .= PHP_EOL . 'WHERE ' . $main_where_sql;
+						if (!empty($sql_filter)) {
+							$sql_query .= $sql_filter;
+						}
+						$sql_query .= PHP_EOL . ') > 1 ';
+						$sql_query .= PHP_EOL . ' AND ' . $main_where_sql;
+					}else{
+						$sql_query = 'SELECT COUNT(*) as full_count FROM (' . PHP_EOL . $sql_query . PHP_EOL. ') x';
+					}
+
+
 				if(SHOW_DEBUG===true) {
 					$sql_query = '-- Only for count' . PHP_EOL . $sql_query;
 				}
@@ -1051,6 +1066,8 @@ public function parse_search_query_object( $full_count=false ) {
 			case (empty($this->search_query_object->order) && empty($this->search_query_object->order_custom)):
 				# Search Without order
 
+				// dump($this->search_query_object, ' this->search_query_object ++ '.to_string());
+
 				// allow window selector
 					if($this->allow_sub_select_by_id===true) {
 
@@ -1059,13 +1076,21 @@ public function parse_search_query_object( $full_count=false ) {
 						// from
 							$sql_query .= PHP_EOL . 'FROM ' . $main_from_sql;
 							// from where
-								$sql_query .= PHP_EOL . 'WHERE '.$this->main_section_tipo_alias.'.id in (';
-								$sql_query .= PHP_EOL . 'SELECT DISTINCT ON('.$this->main_section_tipo_alias.'.section_id,'.$this->main_section_tipo_alias.'.section_tipo) '.$this->main_section_tipo_alias.'.id FROM '.$main_from_sql;
+								$sql_query .= PHP_EOL . 'WHERE ';
+								if(isset($this->search_query_object->duplicated) && $this->search_query_object->duplicated===true){
+									$sql_query .= ' ( SELECT  count(*)';
+									$sql_query .= PHP_EOL . 'FROM '.$main_from_sql.'_dup';
+								}else{
+									$sql_query .= $this->main_section_tipo_alias.'.id in (';
+									$sql_query .= PHP_EOL . 'SELECT DISTINCT ON('.$this->main_section_tipo_alias.'.section_id,'.$this->main_section_tipo_alias.'.section_tipo) '.$this->main_section_tipo_alias.'.id ';
+									$sql_query .= 'FROM '.$main_from_sql;
+								}
+
 								# join virtual tables
 									$sql_query .= $sql_joins;
 								# join filter projects
 									if (!empty($this->filter_join)) {
-									$sql_query .= PHP_EOL . $this->filter_join;
+										$sql_query .= PHP_EOL . $this->filter_join;
 									}
 						// where
 							$sql_query .= PHP_EOL . 'WHERE ' . $main_where_sql;
@@ -1115,10 +1140,12 @@ public function parse_search_query_object( $full_count=false ) {
 								$sql_query .= $limit_query;
 							}
 						// offset
-							$offset_query = '';
-							if ($sql_offset>0) {
-								$offset_query = PHP_EOL . 'OFFSET ' . $sql_offset;
-								$sql_query .= $offset_query;
+							if(!isset($this->search_query_object->duplicated) || $this->search_query_object->duplicated!==true){
+								$offset_query = '';
+								if ($sql_offset>0) {
+									$offset_query = PHP_EOL . 'OFFSET ' . $sql_offset;
+									$sql_query .= $offset_query;
+								}
 							}
 						// having . Not add limit here (!)
 							// if (!empty($sql_filter_having)) {
@@ -1128,14 +1155,28 @@ public function parse_search_query_object( $full_count=false ) {
 							if($this->allow_sub_select_by_id===true) {
 								$sql_query .= PHP_EOL . ') ';
 							}
+						// if sub select is used for duplicates
+							if(isset($this->search_query_object->duplicated) && $this->search_query_object->duplicated===true){
+								$sql_query .= ' > 1 '; // get only the rows with more than 1
+								$sql_query .= PHP_EOL . ' AND ' . $main_where_sql;
+							}
 						// multi section union case
 							if (count($this->ar_section_tipo)>1) {
 								$sql_query = $this->build_union_query($sql_query);
 							}
 						// order/limit general for sub query
 							$sql_query .= PHP_EOL . 'ORDER BY ' . str_replace('mix.', '', $sql_query_order);
+
+							// if sub select is used for duplicates
+							if(isset($this->search_query_object->duplicated) && $this->search_query_object->duplicated===true){
+								$offset_query = '';
+								if ($sql_offset>0) {
+									$offset_query = PHP_EOL . 'OFFSET ' . $sql_offset;
+									$sql_query .= $offset_query;
+								}
+							}
 							if ($sql_limit>0) {
-							$sql_query .= PHP_EOL . 'LIMIT ' . $sql_limit;
+								$sql_query .= PHP_EOL . 'LIMIT ' . $sql_limit;
 							}
 
 				// disallow window selector
@@ -1230,11 +1271,18 @@ public function parse_search_query_object( $full_count=false ) {
 
 				// query_inside
 					$query_inside = '';
-					// select
+					// $sql_query = 'SELECT COUNT(section_id) as full_count FROM (' . PHP_EOL . $sql_query . PHP_EOL. ') x';
+					if(isset($this->search_query_object->duplicated) && $this->search_query_object->duplicated===true){
+						$query_inside .= PHP_EOL . 'WHERE ( SELECT  count(*)';
+						$query_inside .= PHP_EOL . 'FROM '.$main_from_sql.'_dup';
+					}else{
+						// select
 						$query_inside .= 'SELECT ' . $sql_query_select;
 						$query_inside .= ', '.$this->main_section_tipo_alias.'.id'; // avoid ambiguity in pagination of equal values
 					// from
 						$query_inside .= PHP_EOL . 'FROM ' . $main_from_sql;
+					}
+
 						# join virtual tables
 						$query_inside .= $sql_joins;
 					// where
@@ -1262,11 +1310,30 @@ public function parse_search_query_object( $full_count=false ) {
 						if (isset($this->ar_matrix_tables) && count($this->ar_matrix_tables)>1) {
 							$order_query = str_replace('mix.', '', $order_query);
 						}
-						$query_inside .= $order_query;
 				// query wrap
-					$sql_query .= 'SELECT * FROM (';
-					$sql_query .= PHP_EOL . $query_inside. PHP_EOL;
-					$sql_query .= ') main_select';
+					// duplicated with order
+					if(isset($this->search_query_object->duplicated) && $this->search_query_object->duplicated===true){
+						$sql_query = 'SELECT * FROM (' ;
+							$sql_query .= 'SELECT ' . $sql_query_select;
+							$sql_query .= ', '.$this->main_section_tipo_alias.'.id'; // avoid ambiguity in pagination of equal values
+							$sql_query .= PHP_EOL . 'FROM ' . $main_from_sql;
+								$sql_query .= PHP_EOL . $query_inside. PHP_EOL;
+							$sql_query .= PHP_EOL . ') > 1 ';
+							$sql_query .= PHP_EOL . ' AND ' . $main_where_sql;
+							$sql_query .= $order_query;
+							if ($sql_limit>0) {
+								$limit_query = PHP_EOL . 'LIMIT ' . $sql_limit;
+								$sql_query .= $limit_query;
+							}
+						$sql_query .= ') main_select';
+					}else{
+						// without duplicates
+						$query_inside .= $order_query;
+
+						$sql_query .= 'SELECT * FROM (';
+						$sql_query .= PHP_EOL . $query_inside. PHP_EOL;
+						$sql_query .= ') main_select';
+					}
 					// order
 						if(isset($this->sql_query_order_custom)) {
 							$sql_query .= PHP_EOL . $this->sql_query_order_custom;
@@ -2381,6 +2448,13 @@ public function get_sql_where($search_object) {
 		# search_object_unaccent: true, false
 		$search_object_unaccent = isset($search_object->unaccent) ? $search_object->unaccent : false;
 
+		# search_object_duplicated: true, false
+		$search_object_duplicated = isset($search_object->duplicated) ? $search_object->duplicated : false;
+		if($search_object_duplicated=== true){
+			$this->search_query_object->duplicated = true;
+
+		}
+
 		# search operator
 		if (!isset($search_object->operator)) {
 			$search_object->operator = 'OR';
@@ -2430,6 +2504,11 @@ public function get_sql_where($search_object) {
 					$sql_where .= 'f_unaccent(';
 				}
 
+				if($search_object_duplicated===true){
+					$sql_where .= $table_alias . '_dup.datos#>>\'{' . $component_path . '}\'';
+					break;
+				}
+
 				# q
 				// Escape parenthesis inside regex
 				if($search_object_type==='string') {

From fe28822bb839151dcda1048edf903be5f81fd746 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Alejandro=20Pe=C3=B1a=20Carbonell?= <alex@render.es>
Date: Tue, 16 May 2023 14:18:04 +0200
Subject: [PATCH 2/3] Added update to 5.9.6

---
 .../tool_administration/updates/updates.php    | 18 ++++++++++++++++++
 1 file changed, 18 insertions(+)

diff --git a/lib/dedalo/tools/tool_administration/updates/updates.php b/lib/dedalo/tools/tool_administration/updates/updates.php
index 5ae5e59979..0ad35b624a 100644
--- a/lib/dedalo/tools/tool_administration/updates/updates.php
+++ b/lib/dedalo/tools/tool_administration/updates/updates.php
@@ -16,7 +16,25 @@
 	// CREATE INDEX IF NOT EXISTS matrix_rsc85_gin ON matrix USING gin(f_unaccent(datos#>>'{components, rsc85, dato}') gin_trgm_ops);
 
 
+$v=595; #####################################################################################
+$updates->$v = new stdClass();
+
+	# UPDATE TO
+	$updates->$v->version_major 	 = 5;
+	$updates->$v->version_medium 	 = 9;
+	$updates->$v->version_minor 	 = 6;
+
+	# MINIM UPDATE FROM
+	$updates->$v->update_from_major  = 5;
+	$updates->$v->update_from_medium = 8;
+	$updates->$v->update_from_minor  = 2;
 
+	$updates->$v->SQL_update[] 	= PHP_EOL.sanitize_query("
+		CREATE INDEX IF NOT EXISTS rsc85_idx ON matrix ((datos#>>'{components,rsc85,dato,lg-nolan}'));
+		CREATE INDEX IF NOT EXISTS rsc86_idx ON matrix ((datos#>>'{components,rsc86,dato,lg-nolan}'));
+		CREATE INDEX IF NOT EXISTS rsc85_rsc86_idx ON matrix ((datos#>>'{components,rsc85,dato,lg-nolan}'),(datos#>>'{components,rsc86,dato,lg-nolan}'));
+		CREATE INDEX IF NOT EXISTS rsc86_rsc85_idx ON matrix ((datos#>>'{components,rsc86,dato,lg-nolan}'),(datos#>>'{components,rsc85,dato,lg-nolan}'));
+	");
 
 
 $v=582; #####################################################################################

From 1cf2125a4c69e5a98df458ee01328c22a81fe3ee Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Alejandro=20Pe=C3=B1a=20Carbonell?= <alex@render.es>
Date: Tue, 16 May 2023 14:18:43 +0200
Subject: [PATCH 3/3] Updated version to 5.9.6

---
 lib/dedalo/config/version.inc | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/lib/dedalo/config/version.inc b/lib/dedalo/config/version.inc
index 8d35b9e96a..04d4b7be32 100644
--- a/lib/dedalo/config/version.inc
+++ b/lib/dedalo/config/version.inc
@@ -2883,13 +2883,13 @@
 
 
 	# Version
-	$DEDALO_VERSION = '5.9.5';
+	$DEDALO_VERSION = '5.9.6';
 
 	if(defined('DEVELOPMENT_SERVER') && DEVELOPMENT_SERVER===true) {
 		$DEDALO_VERSION .= '.'.time();
 	}
 	define('DEDALO_VERSION'	, $DEDALO_VERSION);
-	define('DEDALO_BUILD'	, '2023-05-02T09:06:17+02:00');
+	define('DEDALO_BUILD'	, '2023-05-16T09:14:17+02:00');