From 1d6f54682059c2905c05c32ed39a94d372b7fa3a Mon Sep 17 00:00:00 2001
From: Mehmood Asghar <mah0001@gmail.com>
Date: Mon, 7 Feb 2022 18:36:48 +0500
Subject: [PATCH 01/79] fix issue with variable location fields not exported
 correctly to DDI/XML

---
 .../catalog-admin/variable-schema.json        | 12 +++--
 application/language/base/ddi_fields_lang.php |  5 +-
 .../language/english/ddi_fields_lang.php      |  5 +-
 application/libraries/DDI_Writer.php          | 38 +++++++++------
 application/models/Variable_model.php         | 46 ++++++++++++++++---
 application/schemas/variable-schema.json      | 12 +++--
 .../views/survey_info/variable_ddi.php        |  2 +-
 7 files changed, 88 insertions(+), 32 deletions(-)

diff --git a/api-documentation/catalog-admin/variable-schema.json b/api-documentation/catalog-admin/variable-schema.json
index 7ef70cedc..7c16ff79e 100644
--- a/api-documentation/catalog-admin/variable-schema.json
+++ b/api-documentation/catalog-admin/variable-schema.json
@@ -39,18 +39,22 @@
 			"description": "indicates whether the variable is a weight",
 			"default": 0
 		},		
-		"var_start_pos": {
+		"loc_start_pos": {
 			"type": "integer",
 			"title": "Variable start position"
 		},
-		"var_end_pos": {
+		"loc_end_pos": {
 			"type": "integer",
 			"title": "Variable end position"
 		},
-		"var_width": {
+		"loc_width": {
 			"type": "integer",
             "title": "Variable width"		
         },
+		"loc_rec_seg_no": {
+			"type": "integer",
+            "title": "Record segment number, deck or card number the variable is located on"
+        },		
 		"var_imputation": {
 			"type": "string",
 			"title": "Imputation"
@@ -204,4 +208,4 @@
 		}
     },
     "required": [ "vid", "file_id", "name","labl" ]
-}
\ No newline at end of file
+}
diff --git a/application/language/base/ddi_fields_lang.php b/application/language/base/ddi_fields_lang.php
index 2c68c8316..b5990c92e 100644
--- a/application/language/base/ddi_fields_lang.php
+++ b/application/language/base/ddi_fields_lang.php
@@ -323,4 +323,7 @@
 $lang['contacts']='Contacts';
 
 $lang['others']='Others';
-$lang['producer']='Producer';
\ No newline at end of file
+$lang['producer']='Producer';
+
+$lang['loc_start_pos']='Start';
+$lang['loc_end_pos']='End';
\ No newline at end of file
diff --git a/application/language/english/ddi_fields_lang.php b/application/language/english/ddi_fields_lang.php
index 54b4aa0f8..f9e5d659d 100644
--- a/application/language/english/ddi_fields_lang.php
+++ b/application/language/english/ddi_fields_lang.php
@@ -322,4 +322,7 @@
 $lang['contacts']='Contacts';
 
 $lang['others']='Others';
-$lang['producer']='Producer';
\ No newline at end of file
+$lang['producer']='Producer';
+
+$lang['loc_start_pos']='Start';
+$lang['loc_end_pos']='End';
\ No newline at end of file
diff --git a/application/libraries/DDI_Writer.php b/application/libraries/DDI_Writer.php
index e3cceeb60..8d314df1f 100644
--- a/application/libraries/DDI_Writer.php
+++ b/application/libraries/DDI_Writer.php
@@ -308,31 +308,39 @@ function get_var_desc_xml($data)
                 'dcml'=>$var['var_dcml'],
                 'intrvl'=>$var['var_intrvl'],
             ],
-            'location._attributes'=>[
-                'StartPos'=>$var['var_start_pos'],
-                'EndPos'=>$var['var_end_pos'],
-                'width'=>$var['var_width'],
-                //'RecSegNo'=>$var[''],
-            ],            
-            'labl'=>$var['labl'],
 
-            'imputation'=>$var['labl'],
-            'security'=>$var['labl'],
-            'embargo'=>$var['labl'],
-            'respUnit'=>$var['labl'],            
+            'varFormat'=>[
+                '_value'=> (string)$var['var_format.value'],
+                '_attributes'=>[
+                    'type'=>$var['var_format.type'],
+                    //'schema'=>$var['var_format.schema'],//not supported
+                    'formatname'=>$var['var_format.name']
+                ]
+            ],
+
+            'location'=>[
+                '_attributes'=>[
+                    'StartPos'=>$var['loc_start_pos'],
+                    'EndPos'=>$var['loc_end_pos'],
+                    'width'=>$var['loc_width'],
+                    'RecSegNo'=>$var['loc_rec_seg_no'],
+                ]
+            ],
+
+            'labl'=>$var['labl'],
+            'imputation'=>$var['var_imputation'],
+            'security'=>$var['var_security'],
+            'respUnit'=>$var['var_respunit'],            
             'qstn.preQTxt'=>$var['var_qstn_preqtxt'],
             'qstn.qstnLit'=>$var['var_qstn_qstnlit'],
             'qstn.postQTxt'=>$var['var_qstn_postqtxt'],
             'qstn.ivuInstr'=>$var['var_qstn_ivulnstr'],
 
             //'valrng'=>$var[''],//repeatable field - not supported
-            'universe'=>$var['var_universe'],  
-
+            'universe'=>$var['var_universe'],
             'sumStat'=> [], //repeatable
             
-
             'catgry'=>[],
-
             'notes'=>$var['var_notes'],
             'txt'=>$var['var_txt'],
             'codInstr'=>$var['var_codinstr'],
diff --git a/application/models/Variable_model.php b/application/models/Variable_model.php
index 50a19c46f..b97b5e883 100644
--- a/application/models/Variable_model.php
+++ b/application/models/Variable_model.php
@@ -31,8 +31,9 @@ function select_single($vid)
         $this->db->where("uid",$vid);
         $variable=$this->db->get("variables")->row_array();
 
-        if(isset($variable['metadata'])){            
+        if(isset($variable['metadata'])){                   
             $variable['metadata']=$this->Dataset_model->decode_metadata($variable['metadata']);
+            $variable=$this->map_variable_fields($variable);
         }
 
         return $variable;
@@ -50,8 +51,9 @@ function select_all($sid)
         $this->db->where("sid",$sid);
         $variables=$this->db->get("variables")->result_array();
 
-        foreach($variables as $key=>$variable){
+        foreach($variables as $key=>$variable){            
             $variables[$key]['metadata']=$this->Dataset_model->decode_metadata($variable['metadata']);
+            $variable=$this->map_variable_fields($variable);
         }
 
         return $variables;
@@ -99,8 +101,9 @@ function chunk_read($sid,$start_uid=0, $limit=100)
         
         $variables=$this->db->get("variables")->result_array();
 
-        foreach($variables as $key=>$variable){
+        foreach($variables as $key=>$variable){            
             $variables[$key]['metadata']=$this->Dataset_model->decode_metadata($variable['metadata']);
+            $variable=$this->map_variable_fields($variable);
         }
 
         return $variables;
@@ -120,8 +123,9 @@ function get_var_by_vid($sid,$vid)
         
         $variable=$this->db->get("variables")->row_array();
 
-        if(isset($variable['metadata'])){            
+        if(isset($variable['metadata'])){                 
             $variable['metadata']=$this->Dataset_model->decode_metadata($variable['metadata']);
+            $variable=$this->map_variable_fields($variable);
         }
 
         return $variable;
@@ -141,8 +145,9 @@ function get_var_by_uid($sid,$uid)
 
         $variable=$this->db->get("variables")->row_array();
 
-        if(isset($variable['metadata'])){
+        if(isset($variable['metadata'])){            
             $variable['metadata']=$this->Dataset_model->decode_metadata($variable['metadata']);
+            $variable=$this->map_variable_fields($variable);
         }
 
         return $variable;
@@ -162,8 +167,9 @@ function get_by_var_id($sid, $file_id=null, $var_id)
 
         $variable=$this->db->get("variables")->row_array();
 
-        if(isset($variable['metadata'])){
+        if(isset($variable['metadata'])){            
             $variable['metadata']=$this->Dataset_model->decode_metadata($variable['metadata']);
+            $variable=$this->map_variable_fields($variable);
         }
 
         return $variable;
@@ -189,6 +195,7 @@ function get_batch_variable_metadata($sid, $file_id=null, $vid_arr=array())
         foreach($variables as $idx=>$variable){
             if(isset($variable['metadata'])){
                 $variables[$idx]['metadata']=$this->Dataset_model->decode_metadata($variable['metadata']);
+                $variables[$idx]=$this->map_variable_fields($variables[$idx]);
             }
         }
 
@@ -369,6 +376,7 @@ public function insert($sid,$options)
 
         //metadata
         if(isset($options['metadata'])){
+            $options=$this->map_variable_fields($options);
             $options['metadata']=$this->Dataset_model->encode_metadata($options['metadata']);
         }
 
@@ -400,6 +408,7 @@ public function update($sid,$uid,$options)
 
         //metadata
         if(isset($options['metadata'])){
+            $options=$this->map_variable_fields($options);
             $options['metadata']=$this->Dataset_model->encode_metadata($options['metadata']);
         }
 
@@ -430,6 +439,7 @@ public function batch_insert($sid,$variables)
             $variables[$key]=array_intersect_key($variable,array_flip($valid_fields));
             $variables[$key]['sid']=$sid;
             if(isset($variable['metadata'])){
+                $variable=$this->map_variable_fields($variable);
                 $variables[$key]['metadata']=$this->Dataset_model->encode_metadata($variable['metadata']);
             }
         }
@@ -565,6 +575,30 @@ function variable_basic_info($sid,$vid)
         $variable=$this->db->get("variables")->row_array();        
         return $variable;
     }
+
+    /**
+     * 
+     * Fix for inconsistent variable schema fields
+     */
+    function map_variable_fields($variable)
+    {
+        $mappings=array(
+            'var_start_pos'=>'loc_start_pos',
+            'var_end_pos'=>'loc_end_pos',
+            'var_width'=>'loc_width',
+            'var_rec_seg_no'=>'loc_rec_seg_no',
+        );
+
+        foreach($variable['metadata'] as $key=>$value){
+            //complex types e.g. repeatable array types
+			if(array_key_exists($key,$mappings)){ 
+				$variable['metadata'][$mappings[$key]]=$value;
+                unset($variable['metadata'][$key]);
+			}
+		}
+
+        return $variable;
+    }
 	
 }
 	
diff --git a/application/schemas/variable-schema.json b/application/schemas/variable-schema.json
index 7ef70cedc..cc34ef167 100644
--- a/application/schemas/variable-schema.json
+++ b/application/schemas/variable-schema.json
@@ -39,18 +39,22 @@
 			"description": "indicates whether the variable is a weight",
 			"default": 0
 		},		
-		"var_start_pos": {
+		"loc_start_pos": {
 			"type": "integer",
 			"title": "Variable start position"
 		},
-		"var_end_pos": {
+		"loc_end_pos": {
 			"type": "integer",
 			"title": "Variable end position"
 		},
-		"var_width": {
+		"loc_width": {
 			"type": "integer",
             "title": "Variable width"		
         },
+		"loc_rec_seg_no": {
+			"type": "integer",
+            "title": "Record segment number, deck or card number the variable is located on"
+        },		
 		"var_imputation": {
 			"type": "string",
 			"title": "Imputation"
@@ -203,5 +207,5 @@
 			"title": "Variable notes"
 		}
     },
-    "required": [ "vid", "file_id", "name","labl" ]
+    "required": [ "vid", "file_id", "name","labl" ]	
 }
\ No newline at end of file
diff --git a/application/views/survey_info/variable_ddi.php b/application/views/survey_info/variable_ddi.php
index e92edc291..b23ba068e 100644
--- a/application/views/survey_info/variable_ddi.php
+++ b/application/views/survey_info/variable_ddi.php
@@ -61,7 +61,7 @@
 
     <!--other stats-->
     <?php
-    $stat_keys=array("var_intrvl","var_dcml","var_loc_start_pos","var_loc_end_pos","loc_width");
+    $stat_keys=array("var_intrvl","var_dcml","loc_start_pos","loc_end_pos","loc_width");
     ?>
         
     <div class="col-md-6">

From 64ecad0146730525af94eda8294e5be75f832e67 Mon Sep 17 00:00:00 2001
From: Mehmood Asghar <mah0001@gmail.com>
Date: Tue, 8 Feb 2022 12:42:30 +0500
Subject: [PATCH 02/79] Add search filter for regions

---
 .../libraries/Catalog_search_mysql.php        | 46 ++++++++++-
 application/models/Facet_model.php            |  2 +-
 application/models/Search_helper_model.php    | 76 +++++++++++++++++++
 .../views/search/active_filter_tokens.php     |  8 ++
 4 files changed, 128 insertions(+), 4 deletions(-)

diff --git a/application/libraries/Catalog_search_mysql.php b/application/libraries/Catalog_search_mysql.php
index f27e1050a..e6c91f07a 100644
--- a/application/libraries/Catalog_search_mysql.php
+++ b/application/libraries/Catalog_search_mysql.php
@@ -21,6 +21,7 @@ class Catalog_search_mysql{
 	var $topics=array();
 	var $tags=array();
 	var $countries=array();
+	var $regions=array();
 	var $from=0;
 	var $to=0;
 	var $repo='';
@@ -107,6 +108,7 @@ public function search($limit=15, $offset=0)
 		$variable=false;//$this->_build_variable_query();
 		$topics=$this->_build_topics_query();
 		$countries=$this->_build_countries_query();
+		$regions=$this->_build_regions_query();
 		$tags=$this->_build_tags_query();
 		$collections=$this->_build_collections_query();
 		$years=$this->_build_years_query();		
@@ -159,7 +161,7 @@ public function search($limit=15, $offset=0)
 		}
 
 		//array of all options
-		$where_list=array($study,$variable,$topics,$countries,$years,$repository,$collections,$dtype,$sid,$countries_iso3,$created,$data_classification,$tags,$type);
+		$where_list=array($study,$variable,$topics,$countries,$years,$repository,$collections,$dtype,$sid,$countries_iso3,$created,$data_classification,$tags,$type,$regions);
 		
 		foreach($this->user_facets as $fc){
 			if (array_key_exists($fc['name'],$this->params)){
@@ -331,6 +333,7 @@ public function search_counts_by_type()
 		$variable=false;//$this->_build_variable_query();
 		$topics=$this->_build_topics_query();
 		$countries=$this->_build_countries_query();
+		$regions=$this->_build_regions_query();
 		$tags=$this->_build_tags_query();
 		$collections=$this->_build_collections_query();
 		$years=$this->_build_years_query();		
@@ -341,7 +344,7 @@ public function search_counts_by_type()
         $countries_iso3=$this->_build_countries_iso3_query();
 		
 		//array of all options
-		$where_list=array($tags,$study,$variable,$topics,$countries,$years,$repository,$collections,$dtype,$data_classification,$sid,$countries_iso3);
+		$where_list=array($tags,$study,$variable,$topics,$countries,$years,$repository,$collections,$dtype,$data_classification,$sid,$countries_iso3,$regions);
 
 		foreach($this->user_facets as $fc){
 			if (array_key_exists($fc['name'],$this->params)){
@@ -739,6 +742,42 @@ protected function _build_countries_query()
 	}
 
 
+	/**
+	*
+	* build where for regions
+	*/
+	protected function _build_regions_query()
+	{
+		$regions=$this->regions;//must always be an array
+
+		if (!is_array($regions)){
+			return FALSE;
+		}
+		
+		if ( !count($regions)>0){
+			return false;
+		}
+
+		foreach($regions as $idx=>$region){
+			if(!is_numeric($region)){
+				unset($regions[$idx]);
+			}
+		}
+		
+		$regions= implode(',',$regions);
+
+		if ($regions!=''){
+			//return sprintf('surveys.id in (select sid from survey_countries where cid in (%s))',$regions);
+
+			return sprintf('surveys.id in (select sid from region_countries
+				inner join survey_countries on region_countries.country_id=survey_countries.cid
+					where region_countries.region_id in (%s))',$regions);
+		}
+		
+		return FALSE;
+	}
+
+
     /**
      *
      * build where countries by iso3 code
@@ -1038,6 +1077,7 @@ public function vsearch($limit = 15, $offset = 0)
 		$variable=$this->_build_variable_query();
 		$topics=$this->_build_topics_query();
 		$countries=$this->_build_countries_query();
+		$regions=$this->_build_regions_query();
 		$years=$this->_build_years_query();
 		$collections=$this->_build_collections_query();
 		$dtype=$this->_build_dtype_query();
@@ -1045,7 +1085,7 @@ public function vsearch($limit = 15, $offset = 0)
 		$repository=$this->_build_repository_query();
 		
 		//array of all options
-		$where_list=array($study,$variable,$topics,$countries,$years,$collections,$dtype,$tags,$repository);
+		$where_list=array($study,$variable,$topics,$countries,$years,$collections,$dtype,$tags,$repository,$regions);
 
         //show only publshed studies
         $where_list[]='published=1';
diff --git a/application/models/Facet_model.php b/application/models/Facet_model.php
index dad62915e..0b1ec16be 100644
--- a/application/models/Facet_model.php
+++ b/application/models/Facet_model.php
@@ -23,7 +23,7 @@ function get_facet_options()
 
 	function get_core_facets_list()
 	{
-		return ['tag','topic','country','year','collection','data_class','dtype','type'];
+		return ['tag','topic','country','year','collection','data_class','dtype','type','region'];
 	}
 	
 	
diff --git a/application/models/Search_helper_model.php b/application/models/Search_helper_model.php
index d874d0bdb..4fccce3dc 100644
--- a/application/models/Search_helper_model.php
+++ b/application/models/Search_helper_model.php
@@ -764,6 +764,31 @@ function get_countries_list($countries)
 		return $output;
 	}
 
+	/**
+	* 
+	* Returns a list of regions
+	*
+	* @countries - array of region integer codes
+	*
+	*/	
+	function get_regions_list($regions=null)
+	{
+		$this->db->select('id,title');
+		
+		if(is_array($regions) && count($regions)>0){
+			$this->db->where_in('id',$regions);
+		}
+		
+		$result=$this->db->get('regions')->result_array();
+		
+		$output=array();
+		foreach($result as $row){
+			$output[$row['id']]=$row['title'];
+		}
+		
+		return $output;
+	}
+
 
 	/**
 	*
@@ -796,5 +821,56 @@ function related_collections($sid_arr)
 		return $output;
 	}
 
+
+	public function get_active_regions($repositoryid=NULL, $study_type=NULL,$filter_values=array())
+	{
+		//parent regions
+		$this->db->select('parent_regions.title as group_name,regions.id,regions.title,regions.weight,count(distinct surveys.id) as found');
+		$this->db->join('regions', 'parent_regions.id= regions.pid','INNER');
+
+		$this->db->join('region_countries', 'region_countries.region_id=regions.id','INNER');
+		$this->db->join('countries', 'countries.countryid=region_countries.country_id','INNER');
+		$this->db->join('survey_countries', 'survey_countries.cid=countries.countryid','INNER');
+		$this->db->join('surveys', 'surveys.id=survey_countries.sid','INNER');		
+
+		$this->db->order_by('parent_regions.id,regions.weight');
+		$this->db->group_by('parent_regions.title, regions.id, regions.title, regions.weight');
+		$this->db->where('surveys.published',1);
+
+		//filter by repository
+		if (trim($repositoryid)!=='' && $repositoryid!='central')
+		{
+			$subquery= sprintf('(surveys.repositoryid= %s OR sr.repositoryid = %s)',
+				$this->db->escape($repositoryid),
+				$this->db->escape($repositoryid));
+
+			$this->db->join('survey_repos sr', 'sr.sid=surveys.id','inner');
+			$this->db->where($subquery,null,false);
+		}
+
+		if($study_type!=NULL){
+			$this->db->where('surveys.type',$study_type);
+			if($filter_values!=NULL){
+				$this->db->or_where_in('regions.id',$filter_values);
+			}			
+		}
+
+		$query=$this->db->get('regions as parent_regions');
+		
+		if (!$query){
+			return FALSE;
+		}
+		
+		$rows=$query->result_array();
+		
+		$regions=array();
+		foreach($rows as $row)
+		{
+			$regions[$row['id']]=$row;
+		}
+		
+		return $regions;
+	}
+	
 	
 }//end class
diff --git a/application/views/search/active_filter_tokens.php b/application/views/search/active_filter_tokens.php
index c035d5611..556663a3b 100644
--- a/application/views/search/active_filter_tokens.php
+++ b/application/views/search/active_filter_tokens.php
@@ -79,6 +79,14 @@ class="badge badge-default badge-secondary wb-badge-close remove-filter type"
         <?php endforeach;?>
     <?php endif;?>
 
+    <?php if (isset($search_options->region) && is_array($search_options->region)):?>
+        <?php foreach($search_options->region as $region):?>
+            <?php if (array_key_exists($region,$regions)):?>
+                <span class="badge badge-default wb-badge-close country remove-filter region" data-type="region[]" data-value="<?php echo $region;?>"><?php echo $regions[$region]['title'];?><i class="fas fa-times"></i></span>
+            <?php endif;?>
+        <?php endforeach;?>
+    <?php endif;?>
+
     <?php if (isset($search_options->dtype) && is_array($search_options->dtype)):?>
         <?php foreach($search_options->dtype as $dtype):?>
             <?php if (array_key_exists($dtype,$data_access_types)):?>

From 673c28a9202eb7c4a46baedb683bceaaecdcdd84 Mon Sep 17 00:00:00 2001
From: Mehmood Asghar <mah0001@gmail.com>
Date: Tue, 8 Feb 2022 12:46:07 +0500
Subject: [PATCH 03/79] update Arabic translations

---
 .../language/arabic/breadcrumbs_lang.php      |  16 +-
 .../language/arabic/catalog_admin_lang.php    | 201 +++++++++--
 .../language/arabic/catalog_search_lang.php   | 284 +++++++++++-----
 .../language/arabic/citations_lang.php        | 126 +++----
 .../language/arabic/collection_lang.php       |  53 +++
 .../language/arabic/configurations_lang.php   |  97 +++---
 .../language/arabic/da_collection_lang.php    |  19 ++
 .../language/arabic/dashboard_lang.php        |  58 ++--
 .../language/arabic/data_enclave_lang.php     |  25 +-
 application/language/arabic/dd_help_lang.php  | 267 +++++++++++++++
 .../language/arabic/dd_projects_lang.php      | 171 ++++++++++
 .../language/arabic/ddi_fields_lang.php       | 311 ++++++++++++++++++
 .../language/arabic/ddibrowser_lang.php       | 185 +++++++----
 .../arabic/direct_access_terms_lang.php       |  56 ++--
 .../language/arabic/ecatalog_admin_lang.php   |  86 ++---
 .../language/arabic/fields_document_lang.php  | 161 +++++++++
 .../language/arabic/fields_image_lang.php     | 169 ++++++++++
 .../language/arabic/fields_scripts_lang.php   | 179 ++++++++++
 .../language/arabic/fields_table_lang.php     | 145 ++++++++
 .../arabic/fields_timeseries_lang.php         | 113 +++++++
 .../arabic/fields_timeseriesdb_lang.php       |  97 ++++++
 .../language/arabic/fields_video_lang.php     |  15 +
 .../arabic/fields_visualization_lang.php      | 160 +++++++++
 application/language/arabic/general_lang.php  | 102 ++++--
 .../language/arabic/harvester_lang.php        |  44 +--
 application/language/arabic/install_lang.php  |  82 +++--
 .../language/arabic/iso19139_fields_lang.php  |  78 +++++
 .../arabic/licensed_access_form_lang.php      | 196 +++++------
 .../language/arabic/licensed_request_lang.php | 125 ++++---
 application/language/arabic/menu_lang.php     |  18 +-
 .../language/arabic/open_data_lang.php        |  17 +
 .../language/arabic/permissions_lang.php      |  23 ++
 .../arabic/public_access_terms_lang.php       |  87 ++---
 .../language/arabic/public_request_lang.php   |  33 +-
 application/language/arabic/reports_lang.php  |  90 +++--
 .../language/arabic/resource_manager_lang.php | 164 ++++-----
 .../language/arabic/rest_controller_lang.php  |  17 +
 .../language/arabic/search_help_lang.php      |  66 ++++
 .../language/arabic/site_menu_lang.php        |  31 ++
 application/language/arabic/sitelogs_lang.php |  17 +-
 .../language/arabic/user_groups_lang.php      |  24 ++
 .../language/arabic/users_additional_lang.php |  54 +--
 application/language/arabic/users_lang.php    |  97 +++---
 .../language/arabic/vocabularies_lang.php     |  14 +-
 44 files changed, 3453 insertions(+), 920 deletions(-)
 create mode 100644 application/language/arabic/collection_lang.php
 create mode 100644 application/language/arabic/da_collection_lang.php
 create mode 100644 application/language/arabic/dd_help_lang.php
 create mode 100644 application/language/arabic/dd_projects_lang.php
 create mode 100644 application/language/arabic/ddi_fields_lang.php
 create mode 100644 application/language/arabic/fields_document_lang.php
 create mode 100644 application/language/arabic/fields_image_lang.php
 create mode 100644 application/language/arabic/fields_scripts_lang.php
 create mode 100644 application/language/arabic/fields_table_lang.php
 create mode 100644 application/language/arabic/fields_timeseries_lang.php
 create mode 100644 application/language/arabic/fields_timeseriesdb_lang.php
 create mode 100644 application/language/arabic/fields_video_lang.php
 create mode 100644 application/language/arabic/fields_visualization_lang.php
 create mode 100644 application/language/arabic/iso19139_fields_lang.php
 create mode 100644 application/language/arabic/open_data_lang.php
 create mode 100644 application/language/arabic/permissions_lang.php
 create mode 100644 application/language/arabic/rest_controller_lang.php
 create mode 100644 application/language/arabic/search_help_lang.php
 create mode 100644 application/language/arabic/site_menu_lang.php
 create mode 100644 application/language/arabic/user_groups_lang.php

diff --git a/application/language/arabic/breadcrumbs_lang.php b/application/language/arabic/breadcrumbs_lang.php
index b15c72de1..7ab4f1408 100644
--- a/application/language/arabic/breadcrumbs_lang.php
+++ b/application/language/arabic/breadcrumbs_lang.php
@@ -1,7 +1,17 @@
 <?php 
 $lang['Home']="الصفحة الرئيسية";
+$lang['edit_study']="تحرير الدراسة";
 $lang['Citations']="اقتباسات";
-
-
-/* End of file breadcrumbs */
+$lang['add_study']="إضافة دراسة جديدة";
+$lang['bulk_import']="تحميل ملفات DDI بالجملة";
+$lang['transfer_study_ownership']="نقل ملكية الدراسة";
+$lang['delete']="حذف";
+$lang['edit']="تحرير";
+$lang['add']="إضافة";
+$lang['manage_studies']="إدارة الدراسات";
+$lang['generate_study_pdf']="توليد/إنشاء ملف PDF للدراسة";
+$lang['add_new_resource']="إضافة مورد جديد";
+
+
+/* End of file breadcrumbs */
 /* Location: ./application/language/arabic/breadcrumbs */
\ No newline at end of file
diff --git a/application/language/arabic/catalog_admin_lang.php b/application/language/arabic/catalog_admin_lang.php
index bd83ba83a..38decdf97 100644
--- a/application/language/arabic/catalog_admin_lang.php
+++ b/application/language/arabic/catalog_admin_lang.php
@@ -1,46 +1,175 @@
 <?php 
-$lang['catalog_maintenance']="صيانة قائمة المسوح";
-$lang['upload_ddi']="DDI تحميل";
-$lang['upload_ddi_hover']="DDI تحميل ملف ";
-$lang['import_ddi']="DDI توريد ملف";
-$lang['import_ddi_hover']="DDI توريد عدة ملفات ";
-$lang['survey_id']="معرف المسح";
+$lang['catalog_maintenance']="إدارة الدراسات";
+$lang['add_study_to_collection']="أضف دراسة الى المجموعة";
+$lang['upload_ddi_hover']="تحميل ملف DDI";
+$lang['import_ddi']="إستيراد بالجملة لملفات DDI";
+$lang['import_ddi_hover']="إستيراد ملفات DDI متعددة";
+$lang['survey_id']="رقم المسح";
 $lang['producer']="المنتج";
-$lang['sponsor']="الممول";
-$lang['repository']="مستودع";
+$lang['sponsor']="الراعي";
+$lang['repository']="مجموعة";
 $lang['ref_no']="رقم المرجع";
 $lang['country']="البلد";
 $lang['primary_investigator']="الباحث الرئيسي";
-$lang['metadata_by']="البيانات الوصفية من طرف";
-$lang['folder']="ملف";
+$lang['metadata_by']="البيانات الوصفية بواسطة";
+$lang['folder']="مجلد";
 $lang['file_manager']="إدارة الملفات";
 $lang['resource_manager']="إدارة الموارد";
-$lang['browse_metadata']="تصفح البيانات الوصفية";
-$lang['share_ddi_w_harvester']="DDI يمكن النفاذ إليها من قبل الحاصد";
-$lang['msg_select_ddi']=" :ddi اختر ملف";
-$lang['ddi_overwrite_exist']="تحيين اذا كان المسح موجود؟";
-$lang['ddi_import_processing']="...الرجاء الانتظار قليلا حتى يتم توريد الملف";
-$lang['batch_import_title']="DDI توريد دفعة من ";
-$lang['import_ddi_no_files_found']=" .لايوجد ملفات DDI في مجلد التوريد [s%], يجب أولا نسخ الملفات المراد توريدها في المجلد الذي تتمكن التطبيقة من النفاذ اليه ";
-$lang['import_ddi_files_found']="s% يوجد ملفات في مجلد التوريد, الرجاء اختيار الملفات المراد توريدها ثم انقر على زر التوريد.";
-$lang['btn_import']="توريد";
-$lang['cancel_import_process']="انقر هنا لالغاء عملية التوريد";
-$lang['import_cancelled']="تم إلغاء التوريد!";
-$lang['import_completed']="تم الإنتهاء من التوريد!";
-$lang['indicator_database']="مؤشر قاعدة البيانات";
-$lang['study_website']="موقع المسح";
-$lang['catalog_home']="الصفحة الرئيسية لقائمة المسوح";
-$lang['ddi_import_success']=" !بنجاح DDI تم توريد  ";
+$lang['browse_metadata']="إستعراض البيانات الوصفية";
+$lang['share_ddi_w_harvester']="مشاركة DDI؟ ";
+$lang['msg_select_ddi']="اختر ملف DDI (.xml)";
+$lang['ddi_overwrite_exist']="إستبدال الدراسة ان وجدت؟";
+$lang['msg_select_rdf']="اختر ملف RDF (.rdf)";
+$lang['ddi_import_processing']="الرجاء الإنتظار أثناء استيراد الملف ...";
+$lang['batch_import_title']="إستيراد ملفات DDI بالجملة";
+$lang['import_ddi_no_files_found']="لم يتم العثور على ملفات DDI في مجلد الاستيراد[s%]. لدراسات الاستيراد المجمعة ، قم بتحميلها باستخدام تحميل الدُفعات أدناه أو استخدم FTP.";
+$lang['import_ddi_files_found']="تم العثور على s% من الملفات في مجلد الاستيراد. حدد الملفات التي تريد استيرادها وانقر فوق الزر &quot;استيراد&quot; للمتابعة.";
+$lang['btn_import']="استيراد";
+$lang['cancel_import_process']="أنقر هنا لإلغاء عملية الاستيراد";
+$lang['import_cancelled']="تم إلغاء الاستيراد!";
+$lang['import_completed']="تم الإنتهاء من الإستيراد!";
+$lang['indicator_database']="قاعدة بيانات المؤشر";
+$lang['study_website']="الموقع الإلكتروني للدراسة";
+$lang['catalog_home']="إدارة الدراسات";
+$lang['ddi_import_success']="تم استيراد DDI بنجاح!";
 $lang['authenty']="الناشر";
 $lang['missing']="مفقود";
-$lang['collection_date']="تاريخ الجمع";
-$lang['click_to_return_to_catalog_page']="انقر هنا للعودة إلى صفحة قائمة المسوح";
+$lang['collection_date']="مواعيد الجمع";
+$lang['click_to_return_to_catalog_page']="انقر هنا للعودة إلى صفحة صيانة الكتالوج.";
 $lang['rdf_export']="تصدير RDF";
-$lang['select_number_of_records_per_page']="عدد السجلات في كل صفحة";
-$lang['study_already_exists']="دراسة موجودة";
-$lang['invalid_ddi_file']="DDI غير صالحة ";
-$lang['nothing_to_process']="لاشيئ للمعالجة ";
-
-
-/* End of file catalog_admin_lang.php */
-/* Location: ./application/language/arabic/catalog_admin_lang.php */
\ No newline at end of file
+$lang['select_number_of_records_per_page']="حدد عدد السجلات لإظهارها في كل صفحة";
+$lang['study_already_exists']="الدراسة موجودة بالفعل. يرجى تحديد خيار الاستبدال لاستبدال الدراسة الحالية";
+$lang['invalid_ddi_file']="ملف DDI غير صالح:";
+$lang['nothing_to_process']="لا شيء للمعالجة ";
+$lang['export_study_citations']="تصدير الاقتباسات إلى تنسيق NADA";
+$lang['msg_select_repository']="حدد المجموعة";
+$lang['repositories']="المجموعات";
+$lang['msg_copy_studies']="انقر على <b> الربط</ b> أو <b> إلغاء الارتباط </ b> لربط الدراسات أو إلغاء ربطها.";
+$lang['copy_studies_to']="نسخ الدراسات إلى";
+$lang['change_repo']="تحويل";
+$lang['repositoryid']="مجموعة";
+$lang['copy_studies']="نسخ الدراسات";
+$lang['transfer_study_ownership']="نقل مالك الدراسة";
+$lang['transfer_ownership']="نقل المالك";
+$lang['msg_studies_to_transfer']="الدراسات التي سيتم نقلها";
+$lang['study_owned']="الدراسة المملوكة";
+$lang['study_linked']="الدراسة المربوطة";
+$lang['is_harvested_study']="الدراسة المحصودة";
+$lang['select_publish_unpublish']="حدد للنشر / إلغاء النشر";
+$lang['publish']="نشر";
+$lang['series']="سلسلة";
+$lang['data_access']="النفاذ للبيانات";
+$lang['overwrite_if_exists']="إستبدل إن وجدت؟";
+$lang['sort_by']="ترتيب النتائج حسب:";
+$lang['surveyid']="رقم المسح";
+$lang['no_related_citations_click_here_to_add']="لا توجد اقتباسات مرفقة بهذا المسح، لإضافة الاقتباسات ذات الصلة ، انقر هنا.";
+$lang['max_upload_limit']="أقصى حجم لملف التحميل:";
+$lang['upload_ddi']="أضف دراسة";
+$lang['clear_filter']="مسح التصفية/الفلتر";
+$lang['countries']="البلدان";
+$lang['titl']="العنوان";
+$lang['study_status']="حالة الدراسة";
+$lang['all']="الكل";
+$lang['published']="منشورة";
+$lang['unpublished']="غير منشورة";
+$lang['tags']="العلامات Tags";
+$lang['click_to_publish_unpublish']="انقر للنشر أو إلغاء النشر";
+$lang['pdf_not_generated']="لم يتم إنشاء ملف PDF";
+$lang['pdf_uptodate']="ملف PDF محدث";
+$lang['pdf_outdated']="ملف PDF قديم";
+$lang['metadata_in_pdf']="البيانات الوصفية في PDF";
+$lang['replace_ddi']="استبدل DDI";
+$lang['delete_study']="حذف الدراسة";
+$lang['generate_pdf']="إنشاء/توليد ملف PDF";
+$lang['upload_rdf']="تحميل RDF";
+$lang['link_resources']="ربط الموارد";
+$lang['export_ddi']="تصدير DDI";
+$lang['export_rdf']="تصدير RDF";
+$lang['admin_notes']="ملاحظات المسؤول";
+$lang['reviewer_notes']="ملاحظات المراجع";
+$lang['study_collections']="عرض في مجموعات أخرى";
+$lang['study_aliases']="الأسماء المستعارة للدراسة";
+$lang['study_warnings']="تحذيرات!";
+$lang['warning_study_has_no_external_resources']="الدراسة ليس لها موارد خارجية مرفقة";
+$lang['warning_study_has_no_microdata']="الدراسة ليس لها بيانات جزئية مرفقة";
+$lang['warning_study_has_no_questionnaire']="الدراسة ليس لديها إستمارات مرفقة";
+$lang['warning_study_has_pending_licensed_requests']="الدراسة لديها طلبات مرخصة في حالة الانتظار";
+$lang['warning_study_not_published']="الدراسة لم تنشر";
+$lang['warning_study_years_not_set']="الدراسة لم يتم تعيين سنوات جمع البيانات لها ";
+$lang['warning_study_has_no_pdf_documentation']="الدراسة لم يتم انشاء توثيق البيانات الوصفية لها في ملف PDF";
+$lang['study_no_questionnaire']="دراسات بدون إستمارات";
+$lang['study_no_datafile']="دراسات بدون بيانات";
+$lang['filter']="فلترة/تصفية";
+$lang['ID']="الرقم/المعرّف";
+$lang['collection']="مجموعة";
+$lang['modified_on']="تعديل بتاريخ";
+$lang['Published']="منشورة";
+$lang['Survey options']="خيارات المسح";
+$lang['Tags']="علامات Tags";
+$lang['Generate PDF']="إنشاء/توليد PDF";
+$lang['Status']="حالة";
+$lang['batch_upload_files']="تحميل ملفات";
+$lang['clear_import_folder']="إمسح ملفات الاستيراد";
+$lang['central_catalog_short_text']="فقرة تصف الكتالوج المركزي";
+$lang['study_exists_in_other_collection']="الدراسة موجودة بالفعل في المجموعة [s%]. لتحديث الدراسة ، يجب عليك التبديل إلى المجموعة وتحميل DDI.";
+$lang['type_admin']="ملاحظات المسؤول";
+$lang['type_reviewer']="ملاحظات المراجع";
+$lang['type_public']="ملاحظات عامة";
+$lang['select_note_type']="حدد نوع الملاحظة";
+$lang['admin_note']="ملاحظة المسؤول";
+$lang['reviewer_note']="ملاحظة المراجع";
+$lang['public_note']="ملاحظة عامة";
+$lang['add_note']="أضف ملاحظة";
+$lang['click_on_icon_to_remove_citation']="انقر فوق الرمز s%  لإزالة الاقتباس";
+$lang['attach_citation']="إرفاق الاقتباس";
+$lang['js_refreshing_page']="جاري تحميل الصفحة ، برجاء الانتظار ...";
+$lang['remove_from_collection']="إزالة";
+$lang['remove_from_collection_description']="إزالة هذه الدراسة من هذه المجموعة.";
+$lang['studies_linked_count']="دراسات مرتبطة من مجموعات أخرى";
+$lang['notes']="ملاحظات";
+$lang['link_study']="ربط";
+$lang['unlink_study']="إزالة الربط";
+$lang['transfer']="نقل";
+$lang['select_the_repository_from_the_list_below']="حدد المجموعة من القائمة أدناه لنقل الملكية إلى مجموعة أخرى.";
+$lang['study_metadata_updated']="تم تحديث البيانات الوصفية للدراسة!";
+$lang['refresh_ddi']="تحديث DDI";
+$lang['batch_refresh_ddi']="تحديث حزمة DDI";
+$lang['ddi_batch_refresh_title']="تحديث حزمة DDI";
+$lang['btn_refresh']="تحديث DDI";
+$lang['refresh_ddi_description']="تحديث DDI تحدث قاعدة البيانات بالبيانات الوصفية من DDI.";
+$lang['total_studies_found']="مجموع الدراسات التي وجدت";
+$lang['mark_as_featured']="العرض كدراسة مميزة؟";
+$lang['msg_study_ownership_has_changed']="تغيرت ملكية الدراسة!";
+$lang['replace_ddi_failed_duplicate_study_found']="يحتوي الكتالوج على دراسة أخرى بنفس المعرف";
+$lang['show_selected_only']="إظهار المحدد فقط";
+$lang['Data available from external repository']="البيانات متاحة من مستودع خارجي";
+$lang['Data not available']="البيانات غير متوفرة";
+$lang['error_no_collection_selected']="لم تقم بتحديد المجموعة!";
+$lang['confirm_publish_records']="تأكيد لنشر الدراسة؟";
+$lang['confirm_publish']="ينشر؟";
+$lang['attach_citations']="إرفاق الإقتباسات";
+$lang['return_to_edit_page']="العودة لتحرير الصفحة";
+$lang['attach_related_data']="إرفاق ذات الصلة";
+$lang['no_related_studies_click_here_to_add']="لا توجد دراسات ذات صلة مرفقة";
+$lang['relationship_type']="نوع العلاقة";
+$lang['draft']="مسودة";
+$lang['confirm_unpublish_records']="هل أنت متأكد أنك تريد إلغاء نشر السجلات؟";
+$lang['confirm_unpublish']="تأكيد إلغاء النشر";
+$lang['idno']="رقم/معرّف الدراسة";
+$lang['search_results_for']="نتائج البحث عن:";
+$lang['tab_overview']="نبذة";
+$lang['tab_manage_files']="ملفات";
+$lang['tab_resources']="موارد";
+$lang['tab_citations']="اقتباسات";
+$lang['tab_data_files']="ملفات البيانات";
+$lang['tab_notes']="ملاحظات";
+$lang['tab_related_data']="دراسات ذات صلة";
+$lang['license']="رخصة";
+$lang['select_license']="إختر الرخصة";
+$lang['select_study_thumbnail']="إختر ملف الصورة (PNG ، JPG ، JPEG ، GIF)";
+$lang['Thumbnal']="الصورة المصغرة";
+$lang['Upload thumbnal']="تحميل الصورة المصغرة";
+
+
+/* End of file catalog_admin */
+/* Location: ./application/language/arabic/catalog_admin */
\ No newline at end of file
diff --git a/application/language/arabic/catalog_search_lang.php b/application/language/arabic/catalog_search_lang.php
index 053567a5f..635dd9ae7 100644
--- a/application/language/arabic/catalog_search_lang.php
+++ b/application/language/arabic/catalog_search_lang.php
@@ -1,114 +1,250 @@
 <?php 
-$lang['title_data_catalog']="قائمة المسوح";
-$lang['data_catalog']="قائمة المسوح";
-$lang['catalog_search_help']="مساعدة للبحث في القائمة";
-$lang['study_information']="معلومات عن المسح";
-$lang['citations']="اقتباس";
-$lang['msg_website_redirect']="تم توجيهك الى الموقع:";
+$lang['title_data_catalog']="فهرس المسوح المركزي";
+$lang['data_catalog']="فهرس البيانات";
+$lang['catalog_search_help']="تعليمات البحث في الفهرس";
+$lang['study_information']="معلومات الدراسة";
+$lang['citations']="إقتباس";
+$lang['msg_website_redirect']="تم توجيهك الى الموقع الالكتروني:";
 $lang['link_export_search']="تصدير نتائج البحث";
 $lang['link_search_help']="مساعدة في البحث";
-$lang['rss_feed']="RSSتدفق   ";
-$lang['filter_by_country']="تصفية حسب البلد";
-$lang['filter_by_topic']="تصفية حسب الموضوع";
+$lang['rss_feed']="تدفق RSS   ";
+$lang['filter_by_dtype']="رخصة";
+$lang['filter_by_type']="نوع البيانات";
+$lang['select_all']="إختر الكل";
+$lang['filter_by_country']="البلدان";
+$lang['filter_by_topic']="المواضيع";
+$lang['filter_by_data_class']="تصنيفات البيانات";
 $lang['link_select_all']="اختيار الكل";
-$lang['link_clear']="الغاء الاختيار";
-$lang['link_toggle']="تبديل الاختيار";
+$lang['link_clear']="إلغاء/مسح الإختيار";
+$lang['link_toggle']="تبديل الإختيار";
 $lang['show_studies_conducted_between']="إظهار الدراسات التي أجريت بين ";
 $lang['and']="و";
-$lang['variable_description_includes']="شمل وصف المتغيرات:";
-$lang['name']="الأسم";
+$lang['variable_description_includes']="وصف المتغير يشمل:";
+$lang['name']="الإسم";
 $lang['label']="التسمية";
 $lang['question']="السؤال";
-$lang['find']="ابحث على";
-$lang['in_study_description']="في وصف البحث";
-$lang['in_variable_description']="في وصف المتغيرات";
+$lang['find']="إبحث ";
+$lang['in_study_description']="في وصف الدراسة";
+$lang['in_variable_description']="في وصف المتغير";
 $lang['sort_results_by']="ترتيب النتائج حسب";
 $lang['year']="السنة";
 $lang['country']="البلد";
-$lang['switch_to_variable_view']="تبديل الى عرض المتغيرات";
+$lang['switch_to_variable_view']="تبديل الى عرض المتغير";
 $lang['compare']="مقارنة";
-$lang['showing_studies']="مسح <b> %d </b>  من   <b> %d-%d </b> عرض        ";
-$lang['found_study']="<b>%d</b>مسح من <b>%d</b>وجود";
-$lang['found_studies']="<b>%d</b>مسوح من <b>%d</b>وجود ";
-$lang['showing_variables']="متغيرات<b>%d</b> من<b>%d-%d</b>عرض      ";
-$lang['showing_pages']="%dمن %s صفحة  ";
-$lang['variables_keywords_found']=" d% تم العثور على كلمات البحث في d% متغير   من أصل";
-$lang['link_browse_metadata']="تصفح البيانات الوصفية";
-$lang['link_browse_metadata_hover']="تصفح البيانات الوصفية";
-$lang['link_access_policy']="سياسة النفاذ";
+$lang['showing_studies']="إظهار <b>%d-%d</b> من<b>%d</b>";
+$lang['found_study']="تم العثور على <b>%d</b> دراسة من أصل <b>%d</b>";
+$lang['found_studies']="تم العثور على <b>% d </b> دراسات من إجمالي <b>% d </b>";
+$lang['found_variable']="تم العثور على <b>% d </b> متغير من أصل <b>% d </b>";
+$lang['found_variables']="تم العثور على <b>% d </b> متغيرات من أصل <b>% d </b>";
+$lang['showing_variables']="إظهار <b>%d-%d </b> من <b>% s </b> المتغيرات";
+$lang['showing_pages']=" الصفحة  d% من s%
+";
+$lang['variables_keywords_found']="تم العثور على كلمة (كلمات) رئيسية في d%  متغير (متغيرات) من d% ";
+$lang['link_browse_metadata']="إستعراض البيانات الوصفية";
+$lang['link_browse_metadata_hover']="إستعراض البيانات الوصفية";
+$lang['link_access_policy']="سياسة النفاذ/الوصول";
 $lang['link_access_policy_hover']="سياسة النفاذ الى البيانات االجزئية";
 $lang['link_data']="بيانات";
-$lang['link_data_direct_hover']="استمارة طلب البيانات الجزئية (نفاذ مباشر)";
-$lang['link_data_public_hover']="استمارة طلب البيانات الجزئية (نفاذ للعموم) ";
-$lang['link_data_licensed_hover']="استمارة طلب البيانات الجزئية (نفاذ مرخص) ";
-$lang['link_data_enclave_hover']="استمارة طلب البيانات الجزئية (في المركز)";
-$lang['link_citations']="وصلة الاقتباس";
+$lang['link_data_direct_hover']="نموذح طلب البيانات الجزئية (نفاذ مباشر)";
+$lang['link_data_public_hover']="نموذج طلب البيانات الجزئية (نفاذ للعموم) ";
+$lang['link_data_licensed_hover']="نموذج طلب البيانات الجزئية (نفاذ مرخص) ";
+$lang['link_data_enclave_hover']="نموذج طلب البيانات الجزئية (في المركز)";
+$lang['link_citations']="الإقتباس";
 $lang['link_citations_hover']="الدراسات ذات الصلة بالاقتباسات";
-$lang['link_reports']="التقارير و المخرجات التحليلية";
-$lang['link_reports_hover']="التقارير و المخرجات التحليلية";
-$lang['link_indicators']="المؤشرات و الجداول (قاعدة البيانات)";
-$lang['link_indicators_hover']="المؤشرات و الجداول (قاعدة البيانات)";
+$lang['link_reports']="التقارير والمخرجات التحليلية";
+$lang['link_reports_hover']="التقارير والمخرجات التحليلية";
+$lang['link_indicators']="أدوات تفاعلية";
+$lang['link_indicators_hover']="أدوات تفاعلية";
 $lang['link_questionnaires']="الاستمارات";
 $lang['link_questionnaires_hover']="الاستمارات";
 $lang['link_technical']="الوثائق التقنية";
 $lang['link_technical_hover']="الوثائق التقنية";
-$lang['link_study_website']="موقع الدراسة";
-$lang['link_study_website_hover']="موقع الدراسة(مع كل الوثائق المتاحة) ";
-$lang['link_ddi']=" (DDI)البيانات الوصفية للمسح";
-$lang['link_ddi_hover']=" DDIالبيانات الوصفية للمسح بصيغة ";
-$lang['switch_to_study_view']="تبديل الى عرض المسوح";
+$lang['link_study_website']="الموقع الإلكترني للدراسة";
+$lang['link_study_website_hover']="الموقع الإلكترني للدراسة (مع كل الوثائق المتاحة) ";
+$lang['link_ddi']=" البيانات الوصفية للدراسة (DDI)";
+$lang['link_ddi_hover']=" البيانات الوصفية للمسح بصيغة DDI ";
+$lang['switch_to_study_view']="تبديل الى عرض الدراسة";
 $lang['compare_hover']="مقارنة المتغيرات";
 $lang['compare_selected_variables']="مقارنة المتغيرات المختارة";
 $lang['mark_for_variable_comparison']="تعيين المتغير للمقارنة";
-$lang['variable_info']="معلومات على المتغيرات";
-$lang['field_survey_title']="اسم المسح";
-$lang['js_searching']="...جاري البحث الرجاء الانتظار";
-$lang['js_loading']="...جاري التحميل الرجاء الانتظار";
+$lang['variable_info']="معلومات المتغير";
+$lang['field_survey_title']="عنوان المسح";
+$lang['js_searching']="جاري البحث الرجاء الانتظار ...";
+$lang['js_loading']="جاري التحميل الرجاء الانتظار ...";
 $lang['js_invalid_year_range_selected']="مجموعة السنوات المختارة غير صالحة.";
-$lang['js_topic_selected']="المواضيع المختارة";
+$lang['js_topic_selected']="الموضوع المختار";
 $lang['js_topics_selected']="المواضيع المختارة";
-$lang['js_country_selected']="البلدان المختارة";
+$lang['js_country_selected']="البلد المختارة";
 $lang['js_countries_selected']="البلدان المختارة";
-$lang['title_compare_variables']="مقارنة المتغيرات المختارة";
+$lang['title_compare_variables']="مقارنة المتغيرات ";
 $lang['click_drag_move']="انقر واسحب للنقل";
-$lang['open_in_new_window']="افتح صفحة جديدة";
-$lang['download_pdf']=" PDFتنزيل";
-$lang['click_to_browse_metadata']="انقر هنا لتصفح البيانات الوصفية";
-$lang['producers']="المنتجين";
-$lang['sponsors']="الممولين";
-$lang['citations_of_publications']="الاستشهادات والمنشورات التي استعملت الدراسة";
-$lang['study_resources']="وثائق الدراسة";
+$lang['open_in_new_window']="افتح في صفحة جديدة";
+$lang['download_pdf']=" تنزيل PDF";
+$lang['download_csv']="تنزيل  ملف CSV";
+$lang['download_json']="تنزيل ملف JSON";
+$lang['click_to_browse_metadata']="انقر هنا لإستعراض البيانات الوصفية";
+$lang['producers']="المنتجون";
+$lang['sponsors']="الممولون";
+$lang['citations_of_publications']="المنشورات ذات الصلة";
 $lang['click_to_view_information']="انقر لعرض المعلومات";
-$lang['view_more_information']="عرض معلومات اكثر";
+$lang['view_more_information']="عرض المزيد من المعلومات";
 $lang['technical_documents']="وثائق تقنية";
 $lang['reports']="تقارير";
-$lang['questionnaires']="استبيانات";
-$lang['other_materials']="مواد اخرى";
+$lang['questionnaires']="إستمارات";
+$lang['other_materials']="مواد أخرى";
 $lang['description']="وصف";
-$lang['abstract']="خلاصة";
+$lang['abstract']="ملخص";
 $lang['table_of_contents']="جدول المحتويات";
 $lang['classification']="تصنيف";
 $lang['compare_hover_text']="مقارنة المتغيرات المختارة";
-$lang['select_number_of_records_per_page']="اختر عدد من السجلات في كل صفحة";
-$lang['source_catalog']=" s%البيانات الوصفية يوفرها";
-$lang['source']="مورد";
-$lang['download_ddi']="DDIتحميل ";
+$lang['select_number_of_records_per_page']="حدد عدد السجلات لإظهارها لكل صفحة";
+$lang['source_catalog']="البيانات الوصفية الموفرة من قبل s%";
+$lang['source']="المصدر";
+$lang['download_ddi']="تنزيل DDI";
 $lang['link_data_remote_hover']="البيانات الجزئية المتاحة من مستودع خارجي
 ";
-$lang['collections']="مجموعة";
-$lang['legend_direct_access']="النفاذ المباشر";
-$lang['legend_data_public']="الملفات للاستخدم العام";
-$lang['legend_data_licensed']="ملف بموجب ترخيص";
+$lang['collections']="مجموعات";
+$lang['legend_data_direct']="الوصول المباشر إلى البيانات";
+$lang['legend_data_public']="ملفات البيانات المؤهلة للإستخدام العام";
+$lang['legend_data_licensed']="ملفات بيانات بموجب ترخيص";
 $lang['legend_data_enclave']="البيانات الجزئية في المركز";
+$lang['legend_data_open']="الوصول المفتوح للبيانات";
 $lang['legend_data_remote']="البيانات المتاحة من خلال مستودع خارجي";
+$lang['legend_data_data_na']="البيانات غير المتوفرة";
+$lang['legend_data_cc40']="رخصة المشاع الإبداعي 4.0";
+$lang['legend_data_research']="بحث البيانات الجزئية";
+$lang['legend_data_research_public']="البيانات الجزئية للبحث العام";
+$lang['legend_data_research_license']="بحث البيانات الجزئية بترخيص";
+$lang['legend_data_research_public_lic']="البيانات الجزئية للأبحاث العامة مع الترخيص";
+$lang['data_class_public']="عام";
+$lang['data_class_official']="رسمي";
+$lang['data_class_confidential']="خصوصي وسري";
+$lang['license']="مرخص";
+$lang['data_class_note_public']="تم تصنيف مجموعة البيانات هذه على أنها عامة بموجب سياسة تصنيف الوصول إلى المعلومات. يمكن للموظفين والمستخدمين الخارجيين الوصول إلى مجموعة البيانات هذه.";
+$lang['data_class_note_official']="تم تصنيف مجموعة البيانات هذه على أنها رسمية بموجب سياسة تصنيف الوصول إلى المعلومات. الوصول إلى البيانات يقتصر على الموظفين فقط.";
+$lang['data_class_note_confidential']="تم تصنيف مجموعة البيانات هذه على أنها سرية بموجب سياسة تصنيف الوصول إلى المعلومات. الوصول إلى البيانات يقتصر على الموظفين فقط.";
 $lang['no_variables_to_compare']="لم تقم بتحديد أية متغيرات للمقارنة. الرجاء العودة وتحديد بعض المتغيرات ثم قم بتشغيل المقارنة مرة أخرى";
-$lang['accesspolicy']="سياسة النفاذ";
-$lang['study_meta_description']="يتم سرد %s التي تنتجها %s في كتالوج %s. البيانات والبيانات الوصفية متاحة من الرابط أعلاه.";
-$lang['meta_description_catalog']="كتالوج البيانات يمكنك من تصفح وبحث وتحميل و دراسة البيانات و البيانات الوصفية .
+$lang['refno']="الرقم المرجعي";
+$lang['accesspolicy']="سياسة النفاذ/الوصول";
+$lang['study_meta_description']="يتم سرد s% التي تنتجها s% في كتالوج s%. البيانات والبيانات الوصفية متاحة من الرابط أعلاه.";
+$lang['meta_description_catalog']="كتالوج البيانات يمكنك من تصفح، بحث وتنزيل البيانات والبيانات الوصفية للدراسة .
 ";
-$lang['new_window']="فتح نافذة جديدة
+$lang['new_window']="فتح في نافذة جديدة
 ";
-
-
-/* End of file catalog_search_lang.php */
-/* Location: ./application/language/arabic/catalog_search_lang.php */
\ No newline at end of file
+$lang['harvested_study_access_complete_metadata']="تم حصاد المعلومات المقدمة في هذه الصفحة من مستودع مساهم: <em>%s</em>
+يمكنك تصفح وتنزيل البيانات الوصفية من هذه الصفحة. لتنزيل المواد ذات الصلة والوصول إلى البيانات، <;a href=&quot;%s&quot> قم بزيارة صفحة المسح في المستودع الأصلي </a>.";
+$lang['data']="بيانات";
+$lang['by']="بواسطة";
+$lang['data_direct_description']="يتم توفير مجموعات البيانات والوثائق ذات الصلة للمستخدمين مجانًا. ليست هناك حاجة لتسجيل الدخول إلى التطبيق.";
+$lang['data_public_description']="الوثائق ذات الصلة متاحة مجانا للمستخدمين. ومع ذلك ، يجب على المستخدمين تسجيل الدخول إلى التطبيق للوصول إلى مجموعات البيانات هذه.";
+$lang['data_licensed_description']="الوثائق ذات الصلة متاحة مجانا للمستخدمين. يتطلب الوصول إلى مجموعات البيانات أن يتقدم المستخدم بطلب للحصول على الموافقة للوصول إلى مجموعات البيانات هذه. يجب على المستخدمين تسجيل الدخول إلى التطبيق وملء نموذج الطلب عند التقدم للحصول على حق الوصول.";
+$lang['data_enclave_description']="الوثائق ذات الصلة متاحة مجانا للمستخدمين. يتطلب الوصول إلى مجموعات البيانات أن يتقدم المستخدم بطلب للحصول على الموافقة للوصول إلى مجموعات البيانات هذه في مكان وبيئة آمنة في المركز.";
+$lang['data_remote_description']="الوثائق ذات الصلة متاحة مجانا للمستخدمين. يتم الاحتفاظ بمجموعات البيانات في كتالوجات في الخارج أو في مؤسسات أخرى.";
+$lang['data_na_description']="الوثائق ذات الصلة متاحة مجانا للمستخدمين. ومع ذلك ، فإن مجموعات البيانات لهذه الدراسات غير متوفرة.";
+$lang['data_open_description']="مجموعات البيانات والوثائق ذات الصلة للمستخدمين يتم توفيرها مجانًا.";
+$lang['filter_by_data']="الوصول للبيانات";
+$lang['legend_na_access']="البيانات غير متوفرة";
+$lang['central_data_catalog']="كتالوج/فهرس البيانات المركزي";
+$lang['data_catalogs']="كتالوج/فهرس البيانات";
+$lang['visit_catalog']="قم بزيارة الكتالوج";
+$lang['catalog_owned_by']="مجموعة";
+$lang['legend_citations']="اقتباسات من المنشورات التي استخدمت الدراسة";
+$lang['catalog_history']="تاريخ/سجل الكتالوج";
+$lang['search_no_results']="<p> <strong> لم يتطابق بحثك مع أي دراسات أجريت في الفهرس. </strong></p>
+<p> الاقتراحات: </ p>
+<ul>
+<li> تأكد من كتابة كل الكلمات بشكل صحيح إملائيًا. </li>
+<li> جرب كلمات مفتاحية مختلفة. </li>
+<li> جرب كلمات مفتاحية أكثر عمومية. </li>
+<li> حاول البحث في حقل وصف المتغير إذا بحثت في حقل وصف الدراسة. </li>
+<ul/>";
+$lang['filter_by_collection']="المجموعات";
+$lang['js_collections_selected']="المجموعات المختارة";
+$lang['js_collection_selected']="المجموعة المختارة";
+$lang['contributing_catalogs']="الكتالوجات المساهمة";
+$lang['study_data_files']="ملفات البيانات";
+$lang['show_all_files']="أعرض جميع الملفات";
+$lang['about_central_catalog']="حول الكتالوج/الفهرس المركزي";
+$lang['view_select_more']="عرض / تحديد المزيد";
+$lang['created_on']="أنشئت بتاريخ";
+$lang['last_modified']="آخر تعديل";
+$lang['page_views']="مشاهدات الصفحة";
+$lang['downloads']="تنزيلات";
+$lang['select_countries']="إختر البلدان";
+$lang['in_alphabatic_order']="بالترتيب الأبجدي";
+$lang['By Income']="حسب الدخل";
+$lang['By Region']="حسب المنطقة";
+$lang['cancel']="إلغاء";
+$lang['apply_filter']="تطبيق الفلتر/التصفية";
+$lang['selected_itesm']="المحدد";
+$lang['clear']="إلغاء/مسح";
+$lang['select_collections']="حدد المجموعات";
+$lang['select_topics']="حدد المواضيع";
+$lang['reset_search']="إعادة البحث";
+$lang['prev']="السابق";
+$lang['next']="التالي";
+$lang['search_by_keyword']="بحث حسب الكلمات المفتاحية";
+$lang['filter_by_year']="السنوات";
+$lang['any']="الكل";
+$lang['views']="المشاهدات";
+$lang['metadata']="البيانات الوصفية";
+$lang['popularity']="شعبية";
+$lang['To compare, select two or more variables']="للمقارنة ، حدد متغيرين أو أكثر";
+$lang['related_materials_tab_info']="الوثائق ذات الصلة: إستمارات، تقارير ، وثائق فنية ، جداول";
+$lang['study_description_tab_info']="البيانات الوصفية للدراسة: نظرة عامة ، ملخص ، العينات ، التمويل ، المعالجة ، سياسة الوصول";
+$lang['related_citations_tab_info']="روابط للمنشورات التي استخدمت البيانات من هذه الدراسة";
+$lang['data_dictionary_tab_info']="وصف ملفات البيانات والمتغيرات";
+$lang['featured_study']="دراسة مميزة";
+$lang['dataset_type_survey']="البيانات الجزئية";
+$lang['dataset_type_table']="جداول";
+$lang['dataset_type_document']="وثائق";
+$lang['dataset_type_geospatial']="البيانات الجغرافية المكانية";
+$lang['dataset_type_image']="صور";
+$lang['variables']="متغيرات";
+$lang['total']="المجموع";
+$lang['data_file']="ملف بيانات";
+$lang['data_files']="ملفات بيانات";
+$lang['cases']="حالات";
+$lang['metadata_in_json']="بيانات وصفية JSON";
+$lang['metadata_in_ddi_xml']="كتاب الترميز DDI (2.5)";
+$lang['tab_document']="وثائق";
+$lang['tab_geospatial']="البيانات الجغرافية المكانية";
+$lang['tab_image']="صور";
+$lang['tab_script']="سكريبتات/برامج نصية";
+$lang['tab_table']="جداول";
+$lang['tab_timeseries']="سلاسل زمنية";
+$lang['tab_visualization']="تصورات مرئية";
+$lang['tab_survey']="بيانات جزئية";
+$lang['tab_video']="فيديوهات";
+$lang['from']="من";
+$lang['to']="إلى";
+$lang['filter_by_tag']="علامات Tags";
+$lang['data_classification']="تصنيف البيانات";
+$lang['select_data_classification']="حدد تصنيف البيانات";
+$lang['Photo']="صورة";
+$lang['geospatial_description']="وصف";
+$lang['timeseries_description']="وصف السلسلة الزمنية";
+$lang['timeseries_db']="مصدر قاعدة البيانات";
+$lang['document_description']="وصف الوثيقة";
+$lang['table_description']="وصف الجدول";
+$lang['image_description']="وصف الصورة";
+$lang['script_description']="وصف المشروع";
+$lang['visualization_description']="وصف التصورات المرئية";
+$lang['microdata_description']="وصف الدراسة";
+$lang['data_dictionary']="وصف البيانات";
+$lang['get_microdata']="الحصول على البيانات الجزئية";
+$lang['related_materials']="تنزيلات";
+$lang['related_citations']="مطبوعات ذات صلة";
+$lang['study_resources']="تنزيل الموارد ذات صلة";
+$lang['study_microdata_resources']="تنزيل البيانات الجزئية";
+$lang['Total variables(s)']="مجموع المتغيرات";
+$lang['download_study_rdf']="قم بتنزيل أوصاف موارد الدراسة (مثل التقارير والاستبيانات والوثائق الفنية) بتنسيق Dublin Core RDF";
+$lang['download_study_ddi']="قم بتنزيل البيانات الوصفية للدراسة بتنسيق DDI (XML)";
+$lang['study_documentation_text']="قم بتنزيل الاستبيانات والوثائق الفنية والتقارير التي تصف عملية المسح والنتائج الرئيسية لهذه الدراسة.";
+$lang['study_description_text']="يقدم القسم وصفًا تفصيليًا للدراسة (أي البيانات الوصفية). تتعلق الموضوعات التي يتم تناولها بمنهجية المسح وطرق أخذ العينات وجمع البيانات والتمويل وتواريخ الجمع والتغطية الجغرافية وسياسة الوصول إلى البيانات من هذه الدراسة. قم بتنزيل البيانات الوصفية بعدد من التنسيقات من رابط تصدير البيانات الوصفية.";
+$lang['data_description_text']="يقدم هذا القسم معلومات مفصلة عن بيانات سجل الوحدة الناتجة عن هذه الدراسة. يتضمن هذا وصفًا تفصيليًا لمحتويات كل ملف بيانات وجميع المتغيرات داخل كل ملف. قد تحتوي المتغيرات على النتائج المسجلة لسؤال مباشر مطروح ، أو مشتقة بطريقة ما. يتم تلخيص عدد المتغيرات وعدد نقاط البيانات (الحالات) لكل متغير.";
+$lang['related_publications_text']="يتم استخدام البيانات من هذه الدراسة في المنشورات التالية:";
+$lang['related_studies']="الدراسات ذات الصلة";
+$lang['variable_group']="مجموعة المتغير";
+/* End of file catalog_search */
+/* Location: ./application/language/arabic/catalog_search */
\ No newline at end of file
diff --git a/application/language/arabic/citations_lang.php b/application/language/arabic/citations_lang.php
index 5a0dc0df5..1f834f82f 100644
--- a/application/language/arabic/citations_lang.php
+++ b/application/language/arabic/citations_lang.php
@@ -3,22 +3,22 @@
 $lang['title']="العنوان";
 $lang['subtitle']="العنوان الفرعي";
 $lang['volume']="مجلد";
-$lang['issue']="مسألة";
+$lang['issue']="إصدار";
 $lang['edition']="طبعة";
-$lang['page_numbers']="صفحة رقم";
-$lang['isbn']="isbn";
-$lang['provide_link_to_document']="تقديم وصلة للوثيقة";
-$lang['related_studies']="المسوح المرتبطة";
-$lang['add_related_studies']="اضافة مسوح مرتبطة";
-$lang['select_studies']="اختر مسوح";
-$lang['add_new_citation']="اضافة اقتباس جديد";
-$lang['edit_citation']="تعديل اقتباس";
+$lang['page_numbers']="أرقام الصفحات";
+$lang['isbn']="رقم ISBN";
+$lang['provide_link_to_document']="تزويد رابط للوثيقة";
+$lang['related_studies']="دراسات ذات صلة";
+$lang['add_related_studies']="أضف الدراسات ذات الصلة";
+$lang['select_studies']="اختر الدراسات";
+$lang['add_new_citation']="أضف إقتباس جديد";
+$lang['edit_citation']="حرر الإقتباس";
 $lang['select_citation_type']="اختر نوع الاقتباس";
-$lang['first_name']="الاسم ";
+$lang['first_name']="الاسم الأول";
 $lang['last_name']="اللقب";
-$lang['middle_initial']="الحرف الأول من الإسم";
+$lang['middle_initial']="أول حرف من اسم الأب";
 $lang['publisher']="الناشر";
-$lang['publication_day_month_year']="نشر (اليوم / الشهر / السنة)";
+$lang['publication_day_month_year']="تاريخ النشر (اليوم / الشهر / السنة)";
 $lang['publication_city']="المدينة";
 $lang['publication_state_country']="البلد / الدولة";
 $lang['citation_type']="نوع";
@@ -26,84 +26,88 @@
 $lang['citation_information']="معلومات عن الاقتباس";
 $lang['Book']="كتاب";
 $lang['Book Section']="فصل من كتاب";
-$lang['Anthology (Author & Editor)']="مختارات (المؤلف,الناشر)";
-$lang['Anthology (Author & Translator)']="مختارات (المؤلف,المترجم)";
-$lang['Journal']="مرجع";
+$lang['Anthology (Author & Editor)']="مختارات (مؤلف ومحرر)";
+$lang['Anthology (Author & Translator)']="مختارات (مؤلف ومترجم)";
+$lang['Journal']="مقال المجلة";
 $lang['Magazine']="مجلة";
 $lang['Newspaper']="صحيفة يومية";
-$lang['Website']="موقع ويب";
-$lang['Website Document']="وثيقةعلى الويب";
+$lang['Website']="الموقع الإلكتروني";
+$lang['Website Document']="وثيقة على الويب";
 $lang['book']="كتاب";
 $lang['book-section']="فصل من كتاب";
-$lang['anthology-editor']="مختارات";
-$lang['Anthology-translator']="مختارات";
+$lang['anthology-editor']="مختارات - محرر";
+$lang['Anthology-translator']="مختارات - مترجم";
 $lang['journal']="مرجع";
 $lang['magazine']="مجلة";
 $lang['newspaper']="صحيفة يومية";
 $lang['website']="موقع ويب";
 $lang['website-doc']="وثيقةعلى الويب";
 $lang['abstract']="ملخص";
-$lang['working-paper']="وثيقة عمل";
-$lang['conference-paper']="مقال نشر فى مؤتمر";
+$lang['working-paper']="ورقة عمل";
+$lang['conference-paper']="ورقة نشرت فى مؤتمر";
 $lang['report']="تقرير";
-$lang['anthology-organization']="مختارات (المنظمة  و الناشر)";
+$lang['anthology-organization']="مختارات (المنظمة والمحرر)";
 $lang['conference_title']="عنوان المؤتمر";
 $lang['thesis']="أطروحة";
 $lang['thesis_type']="نوع الأطروحة (على سبيل المثال دكتوراه)";
-$lang['name_academic_institute']="اسم المدرسة / الجامعة";
-$lang['thesis_prepare_year']="سنةالإعداد ";
+$lang['name_academic_institute']="اسم المؤسسة الأكاديمية";
+$lang['thesis_prepare_year']="سنة الإعداد ";
 $lang['page_to']="الى الصفحة";
-$lang['page_from']="من الصفح";
-$lang['periodical_number']="ISBN/ISSNاو رقم اخر";
+$lang['page_from']="من الصفحة";
+$lang['periodical_number']="ISBN/ISSN أو رقم اخر";
 $lang['article_title']="عنوان المقالة";
-$lang['journal_title']="مرجع";
-$lang['corporate-author']="المؤلف -- الشركة";
-$lang['citation_home']="عودة إلى صفحة الاستشهادات";
+$lang['journal_title']="مجلة";
+$lang['corporate-author']="كاتب مشارك";
+$lang['citation_home']="الصفحة الرئيسية ";
 $lang['country']="البلد";
-$lang['import_citation']="توريد استشهادات";
-$lang['paste_citation_string']="لصق النص الاستشهادات";
-$lang['citation_url']="URL الاستشهادات";
-$lang['citation_import_status']="%sاقتباسات تم استيرادهابنجاح, %s تم تخطيها";
-$lang['citation_import_format']="اختيار صيغة توريد الاقتباس";
+$lang['import_citation']="إستيراد الاقتباسات";
+$lang['paste_citation_string']="لصق نص الاقتباس";
+$lang['citation_url']="عنوان الإقتباس على الويب URL";
+$lang['citation_import_status']="s% اقتباسات تم استيرادهابنجاح, s% تم تخطيها";
+$lang['citation_import_format']="اختيار صيغة الاقتباس المستورد";
 $lang['magazine_title']="عنوان المجلة";
 $lang['newspaper_title']="عنوان الصحيفة  اليومية";
 $lang['website_document_title']="عنوان الوثيقة";
 $lang['website_organization']="اسم المنظمة ";
-$lang['website_access_date']="اخرتاريخ للنفاذ";
+$lang['website_access_date']="آخر تاريخ للنفاذ";
 $lang['icon_note']="ملاحظات ";
-$lang['icon_no_related_study']="لا توجد دراسات ذات صلة";
-$lang['icon_related_study']="توجد دراسات ذات صلة";
-$lang['icon_flag']="رفعت براية
- ";
+$lang['icon_no_related_study']="لا توجد دراسات ذات صلة مرفقة";
+$lang['icon_related_study']="الدراسات المرفقة ذات الصلة ";
+$lang['icon_flag']="وضع علامة ";
 $lang['tobe_checked']="يجب التحقق منه";
-$lang['incomplete']="غير كامل
+$lang['incomplete']="غير مكتمل";
+$lang['ds_unclear']="مجموعة البيانات ذات الصلة غير الواضحة";
+$lang['duplicate']="مكررة
 ";
-$lang['ds_unclear']=" بيانات ذات صلةو لكن غير واضحة
+$lang['back_to_editor']="العودة إلى المحرر
 ";
-$lang['duplicate']="مكررة
-";
-$lang['back_to_editor']="العودة إلى المحرر
-";
-$lang['clear_selection']="العودة إلى محرر
-";
-$lang['flag_entry_as']="اقتباسات رفعت براية
-";
-$lang['published']="الناشر";
+$lang['clear_selection']="إلغاء/مسح الإختيار";
+$lang['flag_entry_as']="علامة الاقتباس (الاقتباسات) باسم";
+$lang['published']="نشرت";
 $lang['option_publish']="انشر";
 $lang['option_do_not_publish']="لا تنشر";
 $lang['publish_citation']="انشر الاقتباسات";
-$lang['doi']="معرف الكائن الرقمي
-";
+$lang['doi']="معرّف الكائن الرقمي (DOI)";
 $lang['notes']=" ملاحظات (مرئية فقط للمسؤول)";
-$lang['show_all_flag_entries']="عرض كل الاقتباسات التي رفعت براية
-
-";
-$lang['show_all_note_entries']="عرض كل الاقتباسات مع ملاحظات
+$lang['show_all_flag_entries']="إظهار كافة الاقتباسات التي تم وضع علامة عليها
 ";
+$lang['show_all_note_entries']="إظهار كافة الاقتباسات مع ملاحظات";
 $lang['icon_user']="اسم المالك";
 $lang['citation_owner']="مالك";
-$lang['created']="انشاء";
-
-
-/* End of file citations_lang.php */
-/* Location: ./application/language/arabic/citations_lang.php */
\ No newline at end of file
+$lang['created']="أنشئت";
+$lang['citation_string_invalid']="تنسيق اقتباس غير متوقع أو غير صحيح";
+$lang['attach_to_survey']="أرفق الاقتباس (الاقتباسات) بالدراسات التالية (استخدم CTRL / SHIFT لتحديد دراسات متعددة)";
+$lang['attach_studies']="إرفاق الدراسات";
+$lang['citations_text']="فهرس المنشورات التي أقتيست بإستخدام مجموعة بيانات مدرجة في هذا الكتالوج. سيؤدي تحديد منشور من القائمة إلى إظهار مجموعة بيانات الدراسة التي تم استخدامها وتوفير رابط للدراسة في الكتالوج.";
+$lang['allowed_file_types']="أنواع الملفات المسموح بها";
+$lang['attach_file']="أرفق ملف";
+$lang['max_upload_limit']="الحد الأقصى للتحميل";
+$lang['export_citations']="تصدير الاقتباسات";
+$lang['export_to_csv']="تصدير إلى CSV";
+$lang['sort']="رتب";
+$lang['published-status-1']="منشور";
+$lang['published-status-0']="مسودة";
+
+
+/* End of file citations */
+/* Location: ./application/language/arabic/citations */
\ No newline at end of file
diff --git a/application/language/arabic/collection_lang.php b/application/language/arabic/collection_lang.php
new file mode 100644
index 000000000..c98678195
--- /dev/null
+++ b/application/language/arabic/collection_lang.php
@@ -0,0 +1,53 @@
+<?php 
+$lang['create_repository']="إنشاء مجموعة جديدة";
+$lang['edit_repository']="تحرير المجموعة";
+$lang['repositories']="مجموعات";
+$lang['repositoryid']="تعريف المجموعة";
+$lang['organization']="المنظمة";
+$lang['country']="البلد";
+$lang['published']="منشور";
+$lang['draft']="مسودة";
+$lang['status']="الحالة";
+$lang['select_repo_type']="حدد نوع المجموعة";
+$lang['thumbnail']="الصورة المصغرة";
+$lang['short_description']="وصف قصير";
+$lang['long_description']="وصف طويل (سيصبح هذا المجموعة عن  صفحة)";
+$lang['manage_repository_users']="إدارة الوصول إلى المجموعة";
+$lang['manage_users']="إدارة المستخدمين";
+$lang['msg_select_active_repo']="انقر فوق المجموعة التي ترغب في إدارتها لجلستك الحالية.";
+$lang['select_active_repository']="حدد مجموعة لإدارتها";
+$lang['msg_no_repo_access']="ليس لديك أذونات للوصول إلى أي كتالوجات.";
+$lang['repositories_management']="إدارة المجموعات";
+$lang['repositories_regional']="المستودعات الإقليمية";
+$lang['repositories_specialized']="المستودعات المتخصصة";
+$lang['callback_error_repositoryid_exists']="اختر اسمًا فريدًا [أحرف وأرقام فقط) لتعريف المجموعة.";
+$lang['callback_error_repositoryid_is_numeric']="اختر اسمًا غير رقمي لتعريف المجموعة.";
+$lang['manage_repo_sections']="مجموعات المجموعات";
+$lang['repository_admins']="ادارة المستخدمين";
+$lang['da_by_collection']="الوصول إلى البيانات عن طريق المجموعة";
+$lang['da_by_collection_description']="يتيح ذلك للمستخدمين تنزيل البيانات من جميع المسوح التي تنتمي إلى هذه المجموعة.";
+$lang['repository_sections']="أقسام المجموعة";
+$lang['repository_sections_management']="مجموعات المجموعات";
+$lang['description']="الوصف";
+$lang['weight']="الوزن";
+$lang['repository_sections_home']="الصفحة الرئيسية";
+$lang['repository_section_edit']="تحرير مجموعة المجموعة";
+$lang['repository_section_add']="إضافة مجموعة المجموعة";
+$lang['save_permissions']="حفظ الأذونات";
+$lang['repository_permissions']="إدارة أذونات المجموعة";
+$lang['collection_history']="تاريخ المجموعة";
+$lang['study_title']="عنوان الدراسة";
+$lang['total_studies_in_collection']="مجموع الدراسات في المجموعة";
+$lang['year']="السنة";
+$lang['changed']="تغير";
+$lang['preview']="معاينة";
+$lang['user']="المستخدم";
+$lang['none']="لا أحد";
+$lang['confirm_collection_status_change']="هل أنت متأكد أنك تريد الاستمرار؟ سيؤدي هذا إلى تغيير حالة جميع الدراسات المتعلقة بهذه المجموعة.";
+$lang['section']="قسم";
+$lang['thumbnail_upload_folder_not_set']="مجلد تحميل الصورة المصغرة غير موجود أو غير قابل للكتابة";
+$lang['thumbnail_upload_failed']="خطأ في تحميل الصورة المصغرة";
+
+
+/* End of file collection */
+/* Location: ./application/language/arabic/collection */
\ No newline at end of file
diff --git a/application/language/arabic/configurations_lang.php b/application/language/arabic/configurations_lang.php
index 9ac6072c0..f270d5fd5 100644
--- a/application/language/arabic/configurations_lang.php
+++ b/application/language/arabic/configurations_lang.php
@@ -1,64 +1,79 @@
 <?php 
-$lang['title_configurations']="تهيئة الموقع";
+$lang['title_configurations']="إعدادات الموقع";
 $lang['general_site_settings']="الإعدادات العامة للموقع ";
-$lang['website_title']="عنوان الموقع";
-$lang['website_url']="عنوان الموقع";
+$lang['website_title']="عنوان/إسم الموقع";
+$lang['website_url']="عنوان الموقع على الويب URL";
 $lang['default_home_page']="الصفحة الرئيسية الافتراضية";
-$lang['webmaster_name']="اسم المسؤول عن الموقع";
-$lang['webmaster_email']="بريد الكتروني مسؤول الموقع";
+$lang['webmaster_name']="إسم مسؤول الموقع";
+$lang['webmaster_email']="البريد الإلكتروني لمسؤول الموقع";
 $lang['language']="اللغة";
-$lang['cache_folder']="مجلد ذاكرة التخزين المؤقت";
-$lang['survey_catalog_settings']="اعداد قائمة المسوح ";
-$lang['catalog_folder']="مجلد قائمة المسوح";
+$lang['cache_folder']="مجلد ذاكرة التخزين المؤقت/الكاش";
+$lang['survey_catalog_settings']="اعدادات كتالوج المسوح ";
+$lang['catalog_folder']="مجلد فهرس المسوح";
 $lang['local_repository_id']="معرف المستودع المحلي";
-$lang['ddi_import_folder']="مجلد توريد ddi";
+$lang['ddi_import_folder']="مجلد استيراد DDI";
 $lang['regional_search']="بحث اقليمي";
 $lang['regional_search_enable']="فعال—سوف تظهر قائمة لاختيار البلد";
 $lang['regional_search_disable']="غير فعال";
-$lang['topic_search']="بحث في المواضيع";
-$lang['year_search']="البحث حسب السنة";
-$lang['website_theme_name']="موضوع الموقع";
+$lang['topic_search']="تصنيف حسب الموضوع";
+$lang['year_search']="تصنيف حسب السنة";
+$lang['website_theme_name']="إسم قالب الموقع/الثييم";
 $lang['data_catalog_page_size']="حجم صفحة بحث قائمة المسوح";
-$lang['site_login']="موقع الدخول";
-$lang['password_protect_website']="الموقع محمي بواسطة كلمة سر";
-$lang['login_timeout_in_min']="مهلة الاتصال (دقيقة)";
-$lang['min_password_length']="الحد الأدنى لطول كلمةالسر";
-$lang['require_all_users_to_login']="يتطلب تسجيل الدخول لمستخدمي الموقع";
-$lang['login_not_required']="لا يتطلب تسجيل اسم الدخول ";
-$lang['mail_settings']="اعدادSMTP  ";
-$lang['select_mail_protocol']="بروتوكول إرسال البريد الإلكتروني";
+$lang['site_login']="تسجيل الدخول للموقع";
+$lang['password_protect_website']="موقع ويب محمي بكلمة مرور";
+$lang['login_timeout_in_min']="مهلة تسجيل الدخول (بالدقائق)";
+$lang['min_password_length']="الحد الأدنى لطول كلمة المرور";
+$lang['require_all_users_to_login']="يتطلب من جميع المستخدمين تسجيل الدخول للوصول إلى الموقع";
+$lang['login_not_required']="تسجيل الدخول غير مطلوب لعرض الموقع";
+$lang['mail_settings']="اعدادات SMTP  ";
+$lang['select_mail_protocol']="بروتوكول لإرسال رسائل البريد الإلكتروني";
 $lang['smtp_host']="اسم المضيف (SMTP)";
 $lang['smtp_port']="رقم منفذ (SMTP (port";
-$lang['smtp_user']="اسم المستخدم";
-$lang['smtp_password']="كلمة السر لمستخدم";
-$lang['smtp_debug']="تصحيح SMTP";
-$lang['use_php_mail']="استخدم البريد الإلكتروني PHP";
+$lang['smtp_user']="اسم صاحب الحساب";
+$lang['smtp_password']="كلمة مرور الحساب";
+$lang['smtp_debug']="تصحيح أخطاء SMTP";
+$lang['use_php_mail']="استخدم بريد PHP المدمج";
 $lang['use_smtp']="استخدم موزع /خادم SMTP";
-$lang['select_vocabulary']="اختيار تصنيف المواضيع";
-$lang['use_html_editor_for_html']="استخدم محرر HTML ";
+$lang['select_vocabulary']="حدد مفردات الموضوع";
+$lang['use_html_editor_for_html']="إستخدام محرر HTML لتحرير HTML؟";
 $lang['use_html_editor']="استخدم محرر HTML ";
-$lang['folder_exists_on_server']="الدليل موجود على الموزع ";
+$lang['folder_exists_on_server']="المجلد موجود على الخادم";
 $lang['path_not_found']="المسار غير موجود";
-$lang['instruction_default_home_page']="أدخل اسم الصفحة على سبيل المثال:استقبال، أو قائمة مسوح";
-$lang['instruction_catalog_root']="DDI هذا الدليل لتخزين الملفات ذات الصلة وملفات  ";
-$lang['instruction_ddi_import_folder']="لاستيراد دفعة واحده من ملفات DDI";
-$lang['instruction_select_vocabulary']="اختر تصنيف الموضوعات المستخدمة";
-$lang['instruction_catalog_records_per_page']="عدد السجلات المعروضه في كل صفحة";
+$lang['instruction_default_home_page']="أدخل اسم الصفحة ، على سبيل المثال كتالوج أو الصفحة الرئيسية أو حول";
+$lang['instruction_catalog_root']="هذا المجلد مخصص لتخزين DDI والملفات ذات الصلة";
+$lang['instruction_ddi_import_folder']="مجلد للبحث عن ملفات DDI ولاستيراد دفعة واحده من ملفات DDI";
+$lang['instruction_select_vocabulary']="حدد المفردات المراد استخدامها لتصنيف المواضيع";
+$lang['instruction_catalog_records_per_page']="عدد السجلات المراد إظهارها في صفحة بحث الفهرس";
 $lang['topic_search_enable']="تفعيل—سوف تظهر قائمة اختيار المواضيع";
 $lang['topic_search_disable']="غير فعال";
 $lang['year_search_enable']="تفعيل—سوف تظهر قائمة اختيار السنوات";
 $lang['year_search_disable']="غير فعال";
-$lang['smtp_debug_enable']="تفعيل -- عرض رسائل التصحيح لحل المشاكل المتعلقة بإرسال البريد الإلكتروني";
+$lang['smtp_debug_enable']="تفعيل - يطبع رسائل التصحيح لاستكشاف مشكلات البريد وإصلاحها";
 $lang['smtp_debug_disable']="غير فعال";
 $lang['website_footer']="تذييل الموقع";
-$lang['repository_identifier']="اسم الأرشيف";
-$lang['news_feed_url']="URL الأخبار والتحديثات";
-$lang['cache_expiry']="انتهاء الوقت المخصص للتخزين المؤقت ";
-$lang['cache_default_expires_msg']="توفير الوقت بالملي ثانية لانتهاء الوقت المخصص للتخزين المؤقت على سبيل المثال 7200 = 2 ساعة
+$lang['repository_identifier']="اسم الأرشيف/المستودع";
+$lang['news_feed_url']="رابط URL الأخبار والتحديثات";
+$lang['cache_expiry']="انتهاء الوقت المخصص للتخزين المؤقت/الكاش ";
+$lang['cache_default_expires_msg']="توفير الوقت بالملي ثانية لانتهاء الوقت المخصص للتخزين المؤقت على سبيل المثال 7200 = 2 ساعة
 ";
 $lang['cache_disabled_msg']="التخزين المؤقت يسرع تحميل الصفحة ولكن يستخدم مساحة إضافية";
 $lang['cache_disabled']="تعطيل التخزين المؤقت";
-
-
-/* End of file configurations_lang.php */
-/* Location: ./application/language/arabic/configurations_lang.php */
\ No newline at end of file
+$lang['select_vocabulary_for_collections']="حدد مفردات المجموعة";
+$lang['collection_search_enable']="تفعيل ";
+$lang['collection_search_disable']="تعطيل";
+$lang['da_search_enable']="تفعيل";
+$lang['da_search_disable']="تعطيل";
+$lang['da_search']="تصفية/فلترة حسب الوصول للبيانات";
+$lang['collection_search']="تصفية/فلترة حسب المجموعة";
+$lang['da_search_weight']="تصفية/فلترة حسب الوصول للبيانات";
+$lang['regional_search_weight']="تصفية/فلترة حسب الإقليم";
+$lang['topic_search_weight']="تصفية/فلترة حسب الموضوع";
+$lang['year_search_weight']="تصفية/فلترة حسب السنة";
+$lang['collection_search_weight']="تصفية/فلترة حسب المجموعة";
+$lang['instruction_weight']="تتحكم الأوزان في ترتيب الفلترة والتصنيف. الفلترة يتم ترتيبها حسب الأوزان تصاعديا. ";
+$lang['edit_email_settings']="لتهيئة البريد الإلكتروني ، راجع ملف <em> config / email.php </em>.";
+$lang['test_email_configurations']="اختبار إعدادات البريد الإلكتروني";
+
+
+/* End of file configurations */
+/* Location: ./application/language/arabic/configurations */
\ No newline at end of file
diff --git a/application/language/arabic/da_collection_lang.php b/application/language/arabic/da_collection_lang.php
new file mode 100644
index 000000000..728c9c8bb
--- /dev/null
+++ b/application/language/arabic/da_collection_lang.php
@@ -0,0 +1,19 @@
+<?php 
+$lang['da_collections']="الصفحة الرئيسية";
+$lang['description']="الوصف";
+$lang['attach_studies']="إرفاق الدراسات";
+$lang['da_collection_edit']="تحرير مجموعة الوصول بالجملة";
+$lang['da_collection_add']="إضافة مجموعة وصول بالجملة";
+$lang['da_collection_create']="إنشاء مجموعة جديدة";
+$lang['attach_studies_to_da_collection']="إرفاق الدراسات للمجموعة";
+$lang['unlink_study']="إزالة الدراسة من المجموعة";
+$lang['link_study']="ربط الدراسة بالمجموعة";
+$lang['studies_linked_count']="دراسات مرفقة";
+$lang['msg_copy_studies']="حدد دراسات للوصول إلى البيانات المجمعة عن طريق النقر فوق الزر &quot;إرفاق&quot; أو &quot;إزالة&quot;.";
+$lang['repository']="مجموعة";
+$lang['show_selected_only']="إظهار المحدد فقط";
+$lang['bulk_da_collections']="مجموعات الوصول إلى البيانات بالجملة";
+
+
+/* End of file da_collection */
+/* Location: ./application/language/arabic/da_collection */
\ No newline at end of file
diff --git a/application/language/arabic/dashboard_lang.php b/application/language/arabic/dashboard_lang.php
index 23278da22..b650ae153 100644
--- a/application/language/arabic/dashboard_lang.php
+++ b/application/language/arabic/dashboard_lang.php
@@ -1,32 +1,48 @@
 <?php 
-$lang['dashboard']="لوحة مراقبة
+$lang['dashboard']="لوحة مراقبة
 ";
 $lang['nada_news_updates']="أخبار وتحديثات NADA";
-$lang['users']="المستخدمين
+$lang['users']="المستخدمين
 ";
-$lang['database_backup']="النسخ الاحتياطي لقاعدة البيانات
+$lang['database_backup']="النسخ الاحتياطي لقاعدة البيانات
 ";
-$lang['cache_files']="ملفات مؤقتة ";
-$lang['report_bug']="خبر عن خلل/ اقترح تحسين
+$lang['cache_files']="ملفات مؤقتة/كاش ";
+$lang['report_bug']="خبر عن خلل/ اقترح تحسين
 ";
-$lang['reporter_name']="اسم";
-$lang['reporter_email']="البريد الإلكتروني
+$lang['reporter_name']="الإسم";
+$lang['reporter_email']="البريد الإلكتروني
 ";
-$lang['subject']="الموضوع
+$lang['subject']="الموضوع
 ";
-$lang['bug_request_description']="يرجى تقديم وصف تفصيلي للخلل اواقتراح تحسين";
+$lang['bug_request_description']="يرجى تقديم وصف تفصيلي للخلل او اقتراح تحسين";
 $lang['submit']="تقديم";
-$lang['user_active']="فعال
+$lang['user_active']="فعال
 ";
-$lang['user_disabled']="غي فعال";
+$lang['user_disabled']="غير فعال";
 $lang['user_inactive']=" غير فعال-- لم يتم تسجيل الدخول";
-$lang['bug_report']="خبر عن خلل/ اقترح تحسين
-";
-$lang['run_database_backup_script']="تشغيل برنامج النسخ الاحتياطي
-";
-$lang['no_cache_files_found']="لم يتم العثور على اي ملفات مؤقتة ";
-$lang['clear_cache_files']="هناك <b>%d</b> ملفات مؤقتة ,<a href=&quot;%s&quot;>اضغط هنا لحذف  هاته الملفات.</a>";
-
-
-/* End of file dashboard_lang.php */
-/* Location: ./application/language/arabic/dashboard_lang.php */
\ No newline at end of file
+$lang['bug_report']="خبر عن خلل/ اقترح تحسين
+";
+$lang['run_database_backup_script']="تشغيل برنامج النسخ الاحتياطي
+";
+$lang['no_cache_files_found']="لم يتم العثور على اي ملفات مؤقتة/كاش ";
+$lang['clear_cache_files']="هناك <b>%d</b> ملفات مؤقتة , <a href=%s> اضغط هنا لحذف  هذه الملفات.</a>";
+$lang['recent_studies']="الدراسات التي تم تحديثها مؤخرًا";
+$lang['logged_in_users']="المستخدمين المسجلين دخول ";
+$lang['anonymous_users']="المستخدمون المجهولون الذين يستعرضون الموقع";
+$lang['Maintenance']="إدارة الدراسات";
+$lang['Administrators']="المسؤولون";
+$lang['History']="تاريخ/سجل";
+$lang['Edit']="تحرير المجموعة";
+$lang['Collection']="مجموعة";
+$lang['collection_contains_n_studies']="تحتوي المجموعة على d% دراسات";
+$lang['catalog_contains_n_studies']="يحتوي الكتالوج على d% دراسات";
+$lang['studies_with_no_data_files']="دراسات بدون ملفات بيانات للإستخدام العام PUF";
+$lang['studies_with_no_questionnaires']="دراسات بدون إستمارات";
+$lang['owned']="مملوكة";
+$lang['linked']="مرتبط";
+$lang['published']="منشورة";
+$lang['unpublished']="غير منشورة";
+
+
+/* End of file dashboard */
+/* Location: ./application/language/arabic/dashboard */
\ No newline at end of file
diff --git a/application/language/arabic/data_enclave_lang.php b/application/language/arabic/data_enclave_lang.php
index 2fd9cb964..e18ca16b3 100644
--- a/application/language/arabic/data_enclave_lang.php
+++ b/application/language/arabic/data_enclave_lang.php
@@ -1,16 +1,15 @@
 <?php 
-$lang['data_enclave_access_request']="طلب النفاذ الى مركز البيانات الوطني
+$lang['data_enclave_access_request']="طلب النفاذ الى مركز البيانات الوطني
 ";
-$lang['data_enclave_description']="<p>أنشئ المركز الوطني للبيانات من قبل الأرشيف الوطني وذلك للسماح للعلماء الذين يستوفون شروطا معينة النفاذ الى البيانات الفردية وفق شروطا معينة وتحت رقابة صارمة. يسمح المركز النفاذ الى البيانات الجزئية في بيئة امنة ، وذلك دون المساس بسرية البيانات.<p>
-<h2>المكان</h2>
-<p>المركز الوطني للبيانات يوجد في[ضع اسم الموقع هنا] <p/>
-<h2>عمليات المركز الوطني للبيانات <h2/> 
-
-<p>كما يمكن للباحثين النفاذ إلى البيانات على مركز البيانات الوطني، حيث يتم تزويدهم بالبيانات ،
- بمعدات الحاسوب والبرمجيات و تحت إشراف الموظفين.<p/>";
-$lang['data_enclave_application_form_link']="انقر هنا لتحميل النموذج للنفاذ إلى مركز البيانات الوطني
+$lang['data_enclave_description']="<p>أنشئ المركز الوطني للبيانات من قبل الأرشيف الوطني وذلك للسماح للباحثيين الذين يستوفون شروطا معينة النفاذ الى البيانات الفردية وفق شروطا معينة وتحت رقابة صارمة. يسمح المركز النفاذ الى البيانات الجزئية في بيئة امنة ، وذلك دون المساس بسرية البيانات.<p>
+<h2>المكان</h2>
+<p>المركز الوطني للبيانات يوجد في [ضع اسم الموقع هنا] <p/>
+<h2>عمليات المركز الوطني للبيانات <h2/> 
+
+<p>كما يمكن للباحثين النفاذ إلى البيانات على مركز البيانات الوطني، حيث يتم تزويدهم بالبيانات ، بمعدات الحاسوب والبرمجيات و تحت إشراف الموظفين.<p/>";
+$lang['data_enclave_application_form_link']="انقر هنا لتحميل النموذج للنفاذ إلى مركز البيانات الوطني
 ";
-
-
-/* End of file data_enclave_lang.php */
-/* Location: ./application/language/arabic/data_enclave_lang.php */
\ No newline at end of file
+
+
+/* End of file data_enclave */
+/* Location: ./application/language/arabic/data_enclave */
\ No newline at end of file
diff --git a/application/language/arabic/dd_help_lang.php b/application/language/arabic/dd_help_lang.php
new file mode 100644
index 000000000..eb749727c
--- /dev/null
+++ b/application/language/arabic/dd_help_lang.php
@@ -0,0 +1,267 @@
+<?php 
+$lang['show_help_tooltip']="إظهار / إخفاء كل المساعدة";
+$lang['show_fields_tooltip']="إظهار كافة الحقول";
+$lang['mandatory_recommended_tooltip']="إظهار الحقول الإلزامية والموصى بها فقط";
+$lang['mandatory_only_tooltip']="إظهار الحقول الإلزامية فقط";
+$lang['save_tooltip']="حفظ وصف الدراسة";
+$lang['titl']="<p> أدخل العنوان الرسمي للمسح. يمكن أن يكون العنوان باللغة الإنجليزية أو بلغة المسح. قم بتضمين السنة (السنوات) المرجعية ، لكن لا تقم بتضمين اختصار المسح أو اسم الدولة كجزء من العنوان. اجعل الحرف الأول من كل كلمة كبيرًا (باستثناء حروف الجر أو حروف العطف الأخرى). للعناوين بالفرنسية والإنجليزية والبرتغالية وما إلى ذلك ، يجب توفير أحرف مشددة. مثال: “Enquête Démographique et de Santé 2008-2009”. </p> ";
+$lang['altTitl']="<p> أدخل اختصار المسح (بما في ذلك الحرف الأول من اسم البلد إذا كان ذلك مناسبًا). يمكن تضمين السنة (السنوات) المرجعية للمسح. مثال: DHS 2008-09. </p> ";
+$lang['serName']="<p> نوع الدراسة أو نوع المسح هو الفئة العامة التي تحدد المسح. حدد خيارًا واحدًا من القائمة المنسدلة. حدد &quot;أخرى&quot; إذا لم يتطابق أي من الخيارات مع المسح الخاص بك. </ p>";
+$lang['serInfo']="<p> قد يتكرر المسح على فترات منتظمة (مثل مسح القوى العاملة السنوي) ، أو يكون جزءًا من برنامج مسح دولي (مثل MICS ، CWIQ ، DHS ، LSMS وغيرها). معلومات السلسلة هي وصف لهذه &quot;المجموعة&quot; من المسوح. سيتم هنا تقديم وصف موجز لخصائص المسح ، بما في ذلك وقت بدئه ، وعدد الجولات التي تم تنفيذها بالفعل ، ومن المسؤول. إذا كان المسح لا ينتمي إلى سلسلة ، فاترك هذا الحقل فارغًا. </ p>";
+$lang['parTitl']="<p> سيتم ترك هذا الحقل فارغًا في معظم الحالات. في البلدان التي بها أكثر من لغة رسمية واحدة ، قد يتم توفير ترجمة للعنوان. </ p>";
+$lang['IDNo']="<pre>
+رقم معرّف مجموعة البيانات هو رقم فريد يُستخدم لتحديد مسح معين. حدد واستخدم مخططًا متسقًا لاستخدامه. يمكن إنشاء مثل هذا المعرف على النحو التالي: الدولة-المنتج-المسح-العام-الإصدار  حيث
+- البلد هو اختصار البلد المكون من 3 أحرف ISO
+- المنتج هو اختصار الوكالة المنتجة
+- المسح هو اختصار المسح
+- السنة هي السنة المرجعية (أو السنة التي بدأ فيها المسح)
+- الإصدار هو رقم إصدار مجموعة البيانات الرقمية (انظر وصف الإصدار أدناه)
+</pre>";
+$lang['version']="<pre>
+<p> يجب أن يحتوي وصف الإصدار على رقم إصدار متبوعًا بوصف الإصدار. أمثلة: </ p>
+<p>
+<ul>
+<li> الإصدار 0.1: البيانات الأولية الأساسية التي تم الحصول عليها من إدخال البيانات (قبل التحرير). </ li>
+<li> الإصدار 1.2: البيانات المعدلة ، الإصدار الثاني ، للاستخدام الداخلي فقط. </li>
+<li> الإصدار 2.1: مجموعة بيانات معدلة ومجهولة للتوزيع العام. </li>
+يجب أن يتبع الوصف المختصر للإصدار التعريف العددي. </li>
+</ul>
+</p>";
+$lang['version_idate']="<p> هذا هو التاريخ بتنسيق ISO (yyyy-mm-dd) للإنتاج الفعلي والنهائي للبيانات. قم بتزويد الشهر والسنة على الأقل. </p>";
+$lang['version_notes']="<p> يجب أن تقدم ملاحظات الإصدار تقريرًا موجزًا عن التغييرات التي تم إجراؤها من خلال عملية الإصدار. يجب أن تشير الملاحظة إلى كيفية اختلاف هذا الإصدار عن الإصدارات الأخرى لمجموعة البيانات نفسها. </ p>";
+$lang['overview_abstract']="<p> يجب أن يقدم الملخص ملخصًا واضحًا لأغراض وأهداف ومحتوى المسح. </p>";
+$lang['instructions_project_submit']="<p> بمجرد اقتناعك بأن المعلومات التي أدخلتها لدراستك صحيحة ، فأنت جاهز لإرسال مشروعك. الرجاء تحديد سياسة وصول مناسبة لتوزيع البيانات ، أو كتالوج يجب نشر البيانات فيه ، أو أي ملاحظات قد تكون لديك بشأن عمليات الحظر ، أو المعلومات الحساسة التي يجب إزالتها قبل التوزيع أو أي ملاحظات أو تعليمات خاصة أخرى تريدها لتقديمها إلى مكتبة البيانات الجزئية. </ p>";
+$lang['instructions_project_contributor_review']="<p> بمجرد اقتناعك بأن المعلومات التي أدخلتها لدراستك صحيحة ، فأنت جاهز لإرسال مشروعك. الرجاء تحديد سياسة وصول مناسبة لتوزيع البيانات ، أو كتالوج يجب نشر البيانات فيه ، أو أي ملاحظات قد تكون لديك بشأن عمليات الحظر ، أو المعلومات الحساسة التي يجب إزالتها قبل التوزيع أو أي ملاحظات أو تعليمات خاصة أخرى تريدها لتقديمها إلى مكتبة البيانات الجزئية. </ p>";
+$lang['instructions_datafiles_usage']="<p> حمّل جميع الملفات التي ترغب في مشاركتها. يتضمن ذلك ملفات البيانات (بأي تنسيق) والاستبيانات وأدوات المسح الأخرى ووصف المنهجية وملفات البرامج وأي تقارير. بمجرد تحميل الملفات ، يرجى استخدام رابط تحرير (الخط الأزرق) أدناه لتحديد نوع الملف أو المستند المناسب لهذا المورد. يجب توفير ملفات البيانات والاستبيان كحد أدنى. </ p>";
+$lang['instructions_citations']="<p> إذا نشرت عملاً يستخدم مجموعة البيانات المودعة ، يمكنك إدخال معلومات الاقتباس الخاصة بها في هذا القسم. ستتم إضافة هذه المراجع إلى صفحة العرض الخاصة بدراستك بمجرد نشرها في كتالوجات مكتبة البيانات الجزئية. </ p>";
+$lang['anlyUnit']="<p> الوحدة (الوحدات) الأساسية للتحليل أو الملاحظة التي تصفها الدراسة: الأفراد ، والأسر / الأسر ، والمجموعات ، والمرافق ، والمؤسسات / المنظمات ، والوحدات الإدارية ، والمواقع المادية ، وما إلى ذلك. </ p>
+<p> أمثلة: </ p>
+<p>
+<ul>
+<li> مسح مستويات المعيشة باستخدام استبيان على مستوى المجتمع سيشتمل على وحدات التحليل التالية: الأفراد والأسر والمجتمعات. </ li>
+<li> يمكن أن يكون للمسح الاقتصادي الشركة والمؤسسة كوحدات تحليل. </ li> </ul>
+</p>";
+$lang['dataKind']="<p> هذا الحقل هو تصنيف واسع للبيانات ويرتبط بمربع منسدل يوفر مفردات مضبوطة. </p>";
+$lang['keyword']="<p> تلخص الكلمات المفتاحية المحتوى أو موضوع المسح. كتصنيفات للموضوعات ، يتم استخدامها لتسهيل الإحالة والبحث في كتالوجات المسح. </p>";
+$lang['scope_notes']="<p> النطاق عبارة عن وصف للموضوعات التي يغطيها المسح. يمكن اعتباره ملخصًا للوحدات التي تم تضمينها في الاستبيان. النطاق لا يتعامل مع التغطية الجغرافية. </p>
+<p> مثال: </ p>
+<p> يشمل نطاق المسح العنقودي متعدد المؤشرات: </ p>
+<ul>
+<li> المنزل: خصائص الأسرة ، وقائمة الأسرة ، والأطفال الأيتام والضعفاء ، والتعليم ، وعمالة الأطفال ، والمياه والصرف الصحي ، والاستخدام المنزلي للناموسيات المعالجة بمبيدات الحشرات ، ومعالجة الملح باليود ، مع وحدات اختيارية لتأديب الأطفال ، وإعاقة الأطفال ، ووفيات الأمهات ، و أمن الحيازة واستمرارية السكن. <li/>
+<li> المرأة: خصائص المرأة ، وفيات الأطفال ، وذوفان الكزاز ، وصحة الأم والوليد ، والزواج ، وتعدد الزوجات ، وختان الإناث ، ومنع الحمل ، والمعرفة بفيروس نقص المناعة البشرية / الإيدز ، مع وحدات اختيارية للاحتياجات غير الملباة ، والعنف المنزلي ، والسلوك الجنسي. < / لي>
+<li> الأطفال: خصائص الأطفال ، وتسجيل المواليد والتعلم المبكر ، وفيتامين أ ، والرضاعة الطبيعية ، والعناية بالمرض ، والملاريا ، والتحصين ، والقياسات البشرية ، مع وحدة اختيارية لنمو الطفل. <li/>
+<ul/>";
+$lang['topcClas']="<p> يسهل تصنيف الموضوع الرجوع إلى عمليات البحث في كتالوجات المسح الإلكتروني. </p> <p> نظرًا لأن مكتبة البيانات الجزئية لم تصوغ قائمة موضوعات قياسية ، إلا أنه قد يتم ترك هذا الحقل فارغًا < p/>";
+$lang['nation']="<p> أدخل اسم البلد ، حتى في الحالات التي لا يغطي فيها المسح البلد بالكامل. في حقل &quot;الاختصار&quot; ، نوصي بإدخال رمز ISO المكون من 3 أحرف للبلد. إذا كانت مجموعة البيانات التي توثقها تغطي أكثر من بلد ، فأدخل الكل في صفوف منفصلة. <p/>";
+$lang['geogCover']="<p> يهدف هذا الحقل إلى وصف التغطية الجغرافية للعينة. ستكون الإدخالات النموذجية &quot;تغطية وطنية&quot; ، &quot;حضرية (أو ريفية) فقط&quot; ، &quot;ولاية ...&quot; ، &quot;عاصمة&quot; ، إلخ. <p/>";
+$lang['country_universe']="<p> نحن مهتمون هنا بعالم المسح(وليس عالم أقسام معينة من الاستبيانات أو المتغيرات) ، أي تحديد السكان المعنيين بالمسح. نادرًا ما يكون الكون هو كل سكان البلاد. على سبيل المثال ، لا تغطي عينات المسوحات المنزلية ، عادة المشردين والبدو والدبلوماسيين وأسر المجتمع. قد تغطي بعض المسوح السكان من فئة عمرية معينة فقط ، أو الذكور فقط (أو الإناث) ، وما إلى ذلك. <p/>";
+$lang['AuthEnty']="<p> الباحث الرئيسي هو المؤسسة (أو في بعض الحالات الفرد (الأفراد)) الذي كان مسؤولاً عن تصميم وتنفيذ المسح (وليس التمويل أو المساعدة الفنية). </p>
+<p> الترتيب الذي يتم سردها به تقديري. يمكن أن تكون أبجدية أو حسب أهمية المساهمة. </p>";
+$lang['AuthEnty_iaffiliation']="التبعية
+";
+$lang['producers']="<p> الاختصار والتبعية والدور. إذا كان أي من الحقول غير قابل للتطبيق ، فيمكن تركها فارغة. يجب أن تكون الاختصارات هي الاختصار الرسمي للمنظمة. </p>
+<p> يجب أن يكون الدور عبارة أو وصفًا قصيرًا وموجزًا للمساعدة المحددة التي تقدمها المنظمة لإنتاج البيانات. </p>
+<p> أمثلة على الأدوار: </ p>
+<ul>
+<li> [المساعدة الفنية في] تصميم الاستبيان </ li>
+<li> [المساعدة الفنية في] منهجية / اختيار العينات </ li>
+<li> [المساعدة الفنية في] جمع البيانات </ li>
+<li> [مساعدة فنية في] معالجة البيانات </ li>
+<li> [المساعدة الفنية في] تحليل البيانات </ li>
+<p> لا تضم الرعاة الماليين هنا. </ p>";
+$lang['fundAg']="<p> ضع قائمة بالمنظمات (الوطنية أو الدولية) التي ساهمت ، نقدًا أو عينيًا ، في تمويل المسح. </p>";
+$lang['othId_p']="<p> يمكن استخدام هذا الحقل الاختياري لتقدير أي أشخاص ومؤسسات أخرى ساهمت بشكل ما في المسح. </p>";
+$lang['sampProc']="<p> ينطبق هذا الحقل فقط على المسوح بالعينة. المعلومات عن إجراءات أخذ العينات أمر بالغ الأهمية (على الرغم من أنها لا تنطبق على التعدادات ومجموعات البيانات الإدارية). يجب أن يتضمن هذا القسم معلومات موجزة تتضمن على الرغم من أنها لا تقتصر على: </ p>
+<ul>
+<li> حجم العينة </ li>
+<li> عملية الاختيار (على سبيل المثال ، الاحتمالية المتناسبة مع الحجم أو العينات الزائدة) </ li>
+<li> التقسيم الطبقي (ضمني وصريح) </li>
+<li> مراحل اختيار العينة) </ li>
+<li> إغفال التصميم في العينة) </ li>
+<li> مستوى التمثيل) </ li>
+<li> استراتيجية للمستجيبين الغائبين / غير موجود / رفض (استبدال أم لا)) </ li>
+<li> نموذج الإطار المستخدم ، وتمرين القائمة الذي تم إجراؤه لتحديثه) </ li>
+<p> من المفيد أيضًا الإشارة هنا إلى المتغيرات الموجودة في ملفات البيانات التي تحدد المستويات المختلفة للطبقات ووحدة العينة الأولية. هذه ضرورية لمستخدمي البيانات الذين يرغبون في حساب تصميم العينة بشكل صحيح في تحليلاتهم وحساباتهم لأخطاء أخذ العينات. </p>
+<p> يقبل هذا القسم تنسيق النص فقط ؛ لا يمكن إدخال الصيغ. في معظم الحالات ، ستتوفر المستندات الفنية التي تصف استراتيجية أخذ العينات بالتفصيل. في مثل هذه الحالات ، قم بتضمين مرجع (العنوان / المؤلف / التاريخ) لهذا المستند ، وتأكد من تحميل المستند في ملفات البيانات وقسم الموارد الأخرى. </p>";
+$lang['deviat']="<p> ينطبق هذا الحقل فقط على المسوح بالعينة. </ p>
+<p> أحيانًا يتطلب واقع المجال انحرافًا عن تصميم العينة (على سبيل المثال بسبب صعوبة الوصول إلى المناطق بسبب مشاكل الطقس وعدم الاستقرار السياسي وما إلى ذلك). إذا انحرف تصميم العينة لأي سبب من الأسباب ، فيجب الإبلاغ عن ذلك هنا. </p>";
+$lang['respRate']="<p> يوفر معدل الاستجابة تلك النسبة المئوية للأسر (أو وحدة عينة أخرى) التي شاركت في المسح بناءً على حجم العينة الأصلي. قد يحدث الإغفال بسبب رفض المشاركة ، أو استحالة تحديد مكان المدعى عليه ، أو غير ذلك. في بعض الأحيان ، قد يتم استبدال منزل بآخر بالتصميم. تحقق من أن المعلومات المقدمة هنا متوافقة مع حجم العينة المشار إليه في حقل &quot;إجراء أخذ العينات&quot; وعدد السجلات الموجودة في مجموعة البيانات (على سبيل المثال ، إذا ذكر تصميم العينة عينة من 5000 أسرة وكانت البيانات الموجودة بها تحتوي على بيانات عن 4500 أسرة ، يجب ألا يكون معدل الاستجابة 100 بالمائة). </ p>
+<p> قدِّم ، إن أمكن ، معدلات الاستجابة حسب الطبقة. إذا كانت المعلومات متوفرة حول أسباب عدم الاستجابة (الرفض / لم يتم العثور على / غير ذلك) ، فقم بتوفير هذه المعلومات أيضًا. </ p>
+<p> يمكن أيضًا استخدام هذا الحقل في بعض الحالات لوصف عدم الاستجابات في تعدادات السكان. </ p>";
+$lang['weight']="ينطبق هذا الحقل فقط على عينات المسوحات أو عينات التعداد.
+<p> قدم هنا قائمة المتغيرات المستخدمة كمعامل ترجيح. إذا كان هناك أكثر من متغير واحد هو متغير ترجيح/وزن ، فقم بوصف كيف تختلف هذه المتغيرات عن بعضها البعض والغرض من كل منها. </p>
+<p> مثال: </ p>
+<p> تم حساب أوزان العينات لكل ملف من ملفات البيانات. </ p>
+</p> تم حساب أوزان العينات لبيانات الأسرة على أنها معكوس احتمال اختيار الأسرة ، محسوبة على مستوى مجال أخذ العينات (حضري / ريفي داخل كل منطقة). تم تعديل أوزان الأسرة لعدم الاستجابة على مستوى المجال ، ثم تم تطبيعها بعامل ثابت بحيث يساوي العدد الإجمالي المرجح للأسر إجمالي عدد الأسر غير المرجح. يُطلق على متغير وزن الأسرة اسم HHWEIGHT ويتم استخدامه مع بيانات HH وبيانات HL. </p>
+<p> استخدمت أوزان العينات لبيانات النساء الأوزان المنزلية غير المعيارية ، وتعديلها لعدم الاستجابة لاستبيان النساء ، ثم تمت معايرتها بعامل ثابت بحيث يساوي العدد الإجمالي المرجح لحالات النساء إجمالي عدد غير مرجح من حالات نسائية. </ p>
+<p> اتبعت أوزان العينات لبيانات الأطفال نفس نهج النساء واستخدمت أوزان الأسرة غير المعيارية ، مع تعديلها لعدم الاستجابة لاستبيان الأطفال ، ثم تم تطبيعها بعامل ثابت بحيث يكون إجمالي العدد المرجح حالات الأطفال تساوي إجمالي عدد غير مرجح لحالات الأطفال. </ p>";
+$lang['collDate']="<p> أدخل التواريخ (الشهر والسنة على الأقل) لبداية جمع البيانات ونهايته. </p>
+<p> في بعض الحالات ، يمكن إجراء جمع البيانات لنفس المسح على شكل موجات. في مثل هذه الحالة ، يجب عليك إدخال تاريخ البداية والنهاية لكل موجة على حدة ، وتحديد كل موجة في حقل &quot;الدورة&quot;. </p>";
+$lang['timePrd']="<p> عادةً ما يُترك هذا الحقل فارغًا. تختلف الفترة الزمنية عن تواريخ الجمع لأنها تمثل الفترة التي تكون فيها البيانات التي تم جمعها قابلة للتطبيق أو ذات صلة. </p>";
+$lang['collMode']="<p> أسلوب جمع البيانات هو الطريقة التي أجريت بها المقابلة أو تم جمع المعلومات بها. هذا المجال هو حقل مفردات مضبوطة. </p>
+<p> استخدم زر القائمة المنسدلة لتحديد خيار واحد. في معظم الحالات ، سيكون الرد &quot;مقابلة وجهاً لوجه&quot;. ولكن بالنسبة لبعض أنواع مجموعات البيانات المحددة ، مثل البيانات المتعلقة بسقوط المطر على سبيل المثال ، ستكون الاستجابة مختلفة. </ p>";
+$lang['collSitu']="<p> تم توفير هذا العنصر لتوثيق أي ملاحظات أو وقائع أو أحداث محددة أثناء جمع البيانات. ضع في اعتبارك ذكر عناصر مثل: </ p>
+<ul>
+<li> هل تم إجراء تدريب للعداد؟ (تفصيل) </li>
+<li> أية أحداث يمكن أن يكون لها تأثير على جودة البيانات؟ </li>
+<li> كم من الوقت استغرقت المقابلة في المتوسط؟ </li>
+<li> هل كانت هناك عملية تفاوض بين الأسر والمجتمع والوكالة المنفذة؟ </li>
+<li> هل يتم تسجيل الأحداث القصصية؟ </li>
+<li> هل ساهمت الفرق الميدانية من خلال توفير معلومات حول المشكلات والأحداث أثناء جمع البيانات؟ </li>
+<li> بأي لغة أجريت المقابلة؟ </li>
+<li> هل تم إجراء مسح تجريبي؟ </li>
+<li> هل اتخذت الإدارة أية إجراءات تصحيحية عند حدوث مشكلات في الميدان؟ </li>
+</ul>
+<p> مثال: <p>
+<p> تم إجراء الاختبار التمهيدي للمسح في الفترة من 15 آب (أغسطس) 2006 إلى 25 آب (أغسطس) 2006 وشمل 14 من المحاورين الذين أصبحوا فيما بعد مشرفين على المسح الرئيسي. </ p>
+<p> يتألف كل فريق من المقابلات من 3-4 من المقابلات (لم يتم استخدام محاورين ذكور بسبب حساسية الموضوع) ، جنبًا إلى جنب مع محرر ميداني ومشرف وسائق. تم استخدام ما مجموعه 52 من المحاورين و 14 مشرفًا و 14 محررًا ميدانيًا. تم جمع البيانات على مدى 6 أسابيع تقريبًا من 2 سبتمبر 2006 حتى 17 أكتوبر 2006. جرت المقابلة يوميًا طوال فترة العمل الميداني ، على الرغم من السماح لفرق المقابلات بأخذ يوم عطلة واحد في الأسبوع. </p>
+<p> بلغ متوسط ​​المقابلات 35 دقيقة لاستبيان الأسرة (باستثناء اختبار الملح) ، و 23 دقيقة لاستبيان النساء ، و 27 دقيقة لاستبيان الأطفال دون سن الخامسة (باستثناء قياس الأنثروبومترية). أجريت المقابلات بشكل أساسي باللغتين الإنجليزية و Mumbo-jumbo ، ولكنها استخدمت أحيانًا الترجمة المحلية إلى الهولندية المزدوجة ، عندما لا يتحدث المستفتى الإنجليزية أو Mumbo-jumbo. </p>
+<p> قدم ستة موظفين من GenCenStat تنسيق العمل الميداني الشامل والإشراف. كان المنسق الميداني العام السيدة دو. </ p>";
+$lang['resInstru']="<p> يتم توفير هذا العنصر لوصف الاستبيان (الاستبيانات) المستخدمة في جمع البيانات. يجب ذكر ما يلي: </ p>
+<ul>
+<li> قائمة الاستبيانات ووصف موجز لكل منها (يجب تقديم جميع الاستبيانات كمصادر خارجية) </ li>
+<li> بأي لغة تم نشر الاستبيانات؟ </li>
+<li> معلومات عن عملية تصميم الاستبيان (بناءً على استبيان سابق ، بناءً على نموذج استبيان قياسي ، ومراجعة من قبل أصحاب المصلحة). إذا تم تجميع وثيقة تحتوي على التعليقات المقدمة من أصحاب المصلحة على مسودة الاستبيان ، أو تقرير معد عن اختبار الاستبيان ، فيجب تقديم إشارة إلى هذه الوثائق هنا ويجب تقديم الوثائق كمصادر خارجية. </li>
+</ul>
+<p> مثال: </ p>
+<p> كانت الاستبيانات الخاصة بالمجموعات العنقودية متعددة المؤشرات (MICS) العامة عبارة عن استبيانات منظمة بناءً على نموذج استبيان MICS3 مع بعض التعديلات والإضافات. تم إجراء استبيان منزلي في كل أسرة ، والذي جمع معلومات عن أفراد الأسرة بما في ذلك الجنس والعمر والعلاقة وحالة اليتم. يتضمن الاستبيان المنزلي خصائص الأسرة ، ودعم الأطفال الأيتام والضعفاء ، والتعليم ، وعمالة الأطفال ، والمياه والصرف الصحي ، والاستخدام المنزلي للناموسيات المعالجة بمبيدات الحشرات ، ومعالجة الملح باليود ، مع وحدات اختيارية لتأديب الأطفال ، وإعاقة الأطفال ، ووفيات الأمهات ، وأمن الأطفال. حيازة ومتانة السكن. </ p>
+<p> بالإضافة إلى استبيان الأسرة ، تم إجراء الاستبيانات في كل أسرة معيشية للنساء اللائي تتراوح أعمارهن بين 15 و 49 عامًا والأطفال دون سن الخامسة. بالنسبة للأطفال ، تم إرسال الاستبيان إلى الأم أو القائمين على رعاية الطفل. </p>
+<p> يتضمن استبيان النساء خصائص المرأة ، ووفيات الأطفال ، وذوفان الكزاز ، وصحة الأم والوليد ، والزواج ، وتعدد الزوجات ، وبتر الأعضاء التناسلية للإناث ، ومنع الحمل ، ومعرفة فيروس نقص المناعة البشرية / الإيدز ، مع وحدات اختيارية للاحتياجات غير الملباة ، والعنف المنزلي ، والسلوك الجنسي . </p>
+<p> يتضمن استبيان الأطفال خصائص الأطفال ، وتسجيل المواليد والتعلم المبكر ، وفيتامين أ ، والرضاعة الطبيعية ، والعناية بالمرض ، والملاريا ، والتحصين ، والقياس البشري ، مع وحدة اختيارية لنمو الطفل. </ p>
+<p> تم تطوير الاستبيانات باللغة الإنجليزية من استبيانات نموذج MICS3 ، وتم ترجمتها إلى Mumbo-jumbo. بعد المراجعة الأولية ، تمت ترجمة الاستبيانات مرة أخرى إلى اللغة الإنجليزية بواسطة مترجم مستقل بدون معرفة مسبقة بالمسح. تمت مراجعة الترجمة الخلفية من إصدار Mumbo-jumbo بشكل مستقل ومقارنتها بالأصل الإنجليزي. تمت مراجعة الاختلافات في الترجمة وحلها بالتعاون مع المترجمين الأصليين. </ p>
+<p> تم تجريب كل من استبيانات اللغة الإنجليزية و Mumbo-jumbo كجزء من الاختبار القبلي للمسح. </ p>
+<p> يتم توفير جميع الاستبيانات والوحدات كمصادر خارجية. </ p>";
+$lang['dataCollector']="<p> يتم توفير هذا العنصر لتسجيل المعلومات المتعلقة بالأشخاص و / أو الوكالات التي تولت مسؤولية جمع البيانات. يتضمن هذا العنصر 3 حقول: الاسم والاختصار والتبعية. في معظم الحالات ، نسجل هنا اسم الوكالة وليس اسم المحاورين. فقط في حالة الدراسات الاستقصائية الصغيرة جدًا ، مع وجود عدد محدود جدًا من المحاورين ، سيتم تضمين اسم الشخص أيضًا. يعد حقل الانتساب اختياريًا وليس مناسبًا في جميع الحالات. </ p>";
+$lang['cleanOps']="<p> يجب أن يحتوي تحرير البيانات على معلومات حول كيفية معالجة البيانات أو التحكم فيها من حيث الاتساق والترابط. لا يتعلق هذا البند بمرحلة إدخال البيانات ولكن فقط بتحرير البيانات سواء أكان يدويًا أم آليًا. </p>
+<ul>
+<li> هل كان السطح الساخن أم أسلوب السطح البارد المستخدم لتعديل البيانات؟ </ li>
+<li> هل تم إجراء التصحيحات تلقائيًا (حسب البرنامج) ، أو عن طريق التحكم المرئي للاستبيان؟ </li>
+<li> ما هي البرامج المستخدمة؟ </li>
+</ul>
+<p> في حالة توفر المواد (مواصفات تحرير البيانات ، تقرير حول تحرير البيانات ، البرامج المستخدمة لتحرير البيانات) ، يجب إدراجها هنا وتحميلها في ملفات البيانات وقسم الموارد الأخرى. </p>
+<p> مثال: </ p>
+<p> تم تعديل البيانات في عدد من المراحل خلال المعالجة ، بما في ذلك: </ p>
+<ol>
+<li> التحرير والترميز المكتبي </ li>
+<li> أثناء إدخال البيانات </ li>
+<li> فحص الهيكل واكتماله </ li>
+<li> التحرير الثانوي </ li>
+<li> فحص هيكلي لملفات بيانات SPSS </li>
+</ol>
+<p> يمكن العثور على الوثائق التفصيلية لتحرير البيانات في مستند &quot;إرشادات معالجة البيانات&quot; المقدم كمورد خارجي. </ p>";
+$lang['method_notes']="<p> استخدم هذا الحقل لتقديم أكبر قدر ممكن من المعلومات حول تصميم إدخال البيانات. يتضمن ذلك تفاصيل مثل: </ p>
+<ul>
+<li> طريقة إدخال البيانات (يدويًا أو عن طريق المسح ، في الميدان / في المناطق / في المقر الرئيسي) </ li>
+<li> هندسة الكمبيوتر (أجهزة الكمبيوتر المحمولة في الميدان ، أجهزة الكمبيوتر المكتبية ، الماسحات الضوئية ، المساعد الرقمي الشخصي ، وغيرها ؛ حدد عدد أجهزة الكمبيوتر المستخدمة) </ li>
+<li> البرامج المستخدمة </ li>
+<li> استخدام (ومعدل) الإدخال المزدوج للبيانات </ li>
+<li> متوسط ​​إنتاجية مشغلي إدخال البيانات ؛ عدد مشغلي إدخال البيانات المشاركين وجدول عملهم </li>
+</ul>
+<p> يمكن أيضًا توفير معلومات حول الجدولة والتحليل هنا. </p>
+<p> يجب إدراج جميع المواد المتاحة (برامج إدخال / جدولة / تحليل ، وتقارير عن إدخال البيانات) هنا وتقديمها كموارد خارجية. </ p>
+<p> مثال: </ p>
+<p> تمت معالجة البيانات في مجموعات ، حيث تتم معالجة كل مجموعة كوحدة كاملة خلال كل مرحلة من مراحل معالجة البيانات. تمر كل مجموعة بالخطوات التالية: </ p>
+<ol>
+<li> استقبال الاستبيان </ li>
+<li> التحرير والترميز المكتبي </ li>
+<li> إدخال البيانات </ li>
+<li> فحص الهيكل واكتماله </ li>
+<li> إدخال التحقق </ li>
+<li> مقارنة بيانات التحقق </ li>
+<li> النسخ الاحتياطي للبيانات الأولية </ li>
+<li> التحرير الثانوي </ li>
+<li> النسخ الاحتياطي للبيانات المعدلة </ li>
+<p> بعد معالجة جميع المجموعات ، يتم تجميع جميع البيانات معًا ثم يتم إكمال الخطوات التالية لجميع ملفات البيانات: </ p>
+<li> تصدير إلى SPSS في 4 ملفات (hh- الأسرة ، hl - أفراد الأسرة ، wm - النساء ، ch- الأطفال دون سن 5) </ li>
+<li> إعادة ترميز المتغيرات اللازمة للتحليل </ li>
+<li> إضافة أوزان العينات </ li>
+<li> حساب خماسي الثروة ودمجها في البيانات </ li>
+<li> فحص هيكلي لملفات SPSS </li>
+<li> جدولة جودة البيانات </ li>
+<li> إنتاج جداول التحليل </ li>
+</ol>
+<p> يمكن العثور على تفاصيل كل خطوة من هذه الخطوات في وثائق معالجة البيانات وإرشادات تحرير البيانات وبرامج معالجة البيانات في CSPro و SPSS وإرشادات الجدولة. </ p>
+<p> تم إدخال البيانات من قبل 12 عامل إدخال بيانات في نوبتين ، تحت إشراف 2 من مشرفين إدخال البيانات ، باستخدام ما مجموعه 7 أجهزة كمبيوتر (6 أجهزة كمبيوتر لإدخال البيانات بالإضافة إلى كمبيوتر واحد للمشرفين). تم إجراء جميع عمليات إدخال البيانات في المكتب الرئيسي لشركة GenCenStat باستخدام الإدخال اليدوي للبيانات. لإدخال البيانات ، تم استخدام الإصدار 2.6.007 من CSPro مع برنامج إدخال بيانات منظم للغاية ، باستخدام نهج يتحكم فيه النظام يتحكم في إدخال كل متغير. تم التحكم في جميع عمليات فحص النطاق والتخطي بواسطة البرنامج ولم يتمكن المشغلون من تجاوزها. كما تم تضمين مجموعة محدودة من فحوصات الاتساق في برنامج إدخال البيانات. بالإضافة إلى ذلك ، تم أيضًا تضمين حساب درجات Z للقياسات البشرية في برامج إدخال البيانات لاستخدامها أثناء التحليل. لم يتم إدخال الردود المفتوحة (إجابات &quot;أخرى&quot;) أو ترميزها ، إلا في حالات نادرة حيث تطابق الرد رمزًا موجودًا في الاستبيان. </p>
+<p> يضمن التحقق من الهيكل والاكتمال إدخال جميع الاستبيانات الخاصة بالمجموعة ، وأنها سليمة من الناحية الهيكلية ، وأن استبيانات النساء والأطفال موجودة لكل امرأة وطفل مؤهل. </p>
+<p> تم إجراء التحقق بنسبة 100٪ من جميع المتغيرات باستخدام التحقق المستقل ، أي الإدخال المزدوج للبيانات ، مع مقارنة منفصلة للبيانات متبوعة بتعديل إحدى مجموعتي البيانات أو كليهما لتصحيح أخطاء المفاتيح بواسطة المشغلين الأصليين الذين قاموا أولاً بإدخال الملفات. </p>
+<p> بعد الانتهاء من جميع عمليات المعالجة في CSPro ، تم نسخ جميع ملفات المجموعات الفردية احتياطيًا قبل ربط البيانات معًا باستخدام الأداة المساعدة لسلسلة الملفات CSPro. </p>
+<p> للجدولة والتحليل تم استخدام الإصدار 10.0 و 14.0 من SPSS. تم استخدام الإصدار 10.0 في الأصل لجميع برامج الجدولة ، باستثناء وفيات الأطفال. إصدار لاحق بعد نقل جميع الملفات إلى SPSS ، تم إعادة ترميز بعض المتغيرات لاستخدامها كخصائص أساسية في جدولة البيانات ، بما في ذلك تصنيف العمر والتعليم والمناطق الجغرافية حسب الحاجة للتحليل. في عملية إعادة ترميز الأعمار والتواريخ ، تم إجراء بعض التضمين العشوائي للتواريخ (ضمن قيود محسوبة) للتعامل مع الأعمار أو التواريخ المفقودة أو &quot;لا أعرف&quot;. بالإضافة إلى ذلك ، تم حساب مؤشر الثروة (الأصول) لأفراد الأسرة باستخدام تحليل المكونات الرئيسية ، استنادًا إلى أصول الأسرة ، وتم تضمين كل من النتيجة والخُمس في مجموعات البيانات لاستخدامها في عمليات الجدولة. </ p>";
+$lang['EstSmpErr']="<p> بالنسبة للمسوح بالعينات ، من الممارسات الجيدة حساب ونشر أخطاء العينات. يستخدم هذا الحقل لتقديم معلومات حول هذه الحسابات. وهذا يشمل: </ p>
+<ul>
+<li> قائمة النسب / المؤشرات التي تم من أجلها حساب أخطاء أخذ العينات. </li>
+<li> التفاصيل المتعلقة بالبرنامج المستخدم لحساب خطأ أخذ العينات ، والإشارة إلى البرامج المستخدمة (يتم توفيرها كموارد خارجية) كبرنامج مستخدم لإجراء العمليات الحسابية. </ li>
+<li> إشارة إلى التقارير أو أي مستند آخر حيث يمكن العثور على النتائج (يتم توفيرها كموارد خارجية). </li>
+</ul>
+<p> مثال: </ p>
+<p> تتأثر التقديرات المأخوذة من استطلاع عينة بنوعين من الأخطاء: 1) أخطاء غير متعلقة بأخذ العينات و 2) أخطاء أخذ العينات. الأخطاء غير المتعلقة بأخذ العينات هي نتائج الأخطاء التي ارتكبت في تنفيذ جمع البيانات ومعالجتها. بُذلت جهود عديدة أثناء تنفيذ المسح العنقودي متعدد المؤشرات للفترة 2005-2006 لتقليل هذا النوع من الخطأ ، ومع ذلك ، من المستحيل تجنب الأخطاء غير المتعلقة بأخذ العينات ويصعب تقييمها إحصائيًا. </ p>
+<p> إذا كانت عينة المستجيبين عينة عشوائية بسيطة ، لكان من الممكن استخدام الصيغ المباشرة لحساب أخطاء أخذ العينات. ومع ذلك ، فإن عينة 2005-2006 MICS هي نتيجة لتصميم طبقي متعدد المراحل ، وبالتالي تحتاج إلى استخدام صيغ أكثر تعقيدًا. تم استخدام وحدة العينات المعقدة SPSS لحساب أخطاء أخذ العينات للمسح العنقودي متعدد المؤشرات 2005-2006. تستخدم هذه الوحدة طريقة تايلور الخطية لتقدير التباين لتقديرات المسح التي تكون من الوسائل أو النسب. تم توثيق هذه الطريقة في ملف SPSS CSDescriptives.pdf الموجود ضمن خيارات التعليمات والخوارزميات في SPSS. </p>
+</p> تم حساب أخطاء أخذ العينات لمجموعة مختارة من الإحصائيات (وكلها نسب بسبب قيود طريقة تايلور الخطية) للعينة الوطنية ، والمناطق الحضرية والريفية ، ولكل من المناطق الخمس. لكل إحصائية ، التقدير ، وخطأه المعياري ، ومعامل الاختلاف (أو الخطأ النسبي - النسبة بين الخطأ القياسي والتقدير) ، وتأثير التصميم ، وتأثير تصميم الجذر التربيعي (DEFT - النسبة بين خطأ معياري باستخدام تصميم العينة المحدد والخطأ القياسي الذي سينتج إذا تم استخدام عينة عشوائية بسيطة) ، بالإضافة إلى فواصل الثقة 95 بالمائة (+/- 2 خطأ قياسي). </ p>
+<p> يتم تقديم تفاصيل أخطاء أخذ العينات في ملحق أخطاء العينات بالتقرير وفي جدول أخطاء أخذ العينات المقدم في الموارد الخارجية. </ p>";
+$lang['dataAppr']="<p> يمكن استخدام هذا القسم للإبلاغ عن أي إجراء آخر تم اتخاذه لتقييم موثوقية البيانات ، أو أي ملاحظات تتعلق بجودة البيانات. يمكن أن يشمل هذا العنصر: </ p>
+<ul>
+<li> بالنسبة للتعداد السكاني ، معلومات عن مسح التعداد اللاحق (يجب تقديم تقرير \ تحميله في ملفات البيانات وقسم الموارد الأخرى والمذكورة هنا). </li>
+<li> لأي مسح / تعداد ، مقارنة مع بيانات من مصدر آخر. </ li>
+<li> إلخ. </ li>
+<p> مثال: </ p>
+<p> تتوفر سلسلة من جداول جودة البيانات والرسوم البيانية لمراجعة جودة البيانات وتشمل ما يلي: </ p>
+<ul>
+<li> التوزيع العمري لسكان الأسرة </ li>
+<li> التوزيع العمري للنساء المؤهلات والنساء المقابلات </ li>
+<li> التوزيع العمري للأطفال المؤهلين والأطفال الذين تمت مقابلة الأم أو القائم بالرعاية من أجلهم </ li>
+<li> التوزيع العمري للأطفال دون سن 5 في مجموعات 3 أشهر </ li>
+<li> نسب العمر والفترة في حدود الأهلية </ li>
+<li> النسبة المئوية للملاحظات مع المعلومات الناقصة عن المتغيرات المحددة </ li>
+<li> وجود الأم في المنزل والشخص الذي تمت مقابلته في الاستبيان الأقل من 5 </li>
+<li> الالتحاق بالمدرسة حسب سن السنة الواحدة </ li>
+<li> نسبة الجنس عند الولادة بين الأطفال الذين ولدوا على قيد الحياة والذين ماتوا حسب عمر المستجيب</ li>
+<li> توزيع النساء حسب الوقت منذ آخر ولادة </ li>
+<li> مخطط مبعثر للوزن حسب الطول والوزن حسب العمر والطول حسب العمر </ li>
+<li> رسم بياني للسكان الذكور والإناث حسب العمر الفردي </ li>
+<li> الهرم السكاني </ li>
+</ul>
+<p> يتم عرض نتائج كل جدول من جداول جودة البيانات هذه في ملحق التقرير النهائي ويتم تقديمها أيضًا في قسم الموارد الخارجية. <p>
+<p> تتمثل القاعدة العامة لعرض البيانات المفقودة في جداول التقرير النهائية في تقديم عمود للبيانات المفقودة إذا كانت النسبة المئوية للحالات التي تحتوي على بيانات مفقودة 1٪ أو أكثر. يتم تضمين الحالات التي تحتوي على بيانات مفقودة حول خصائص الخلفية (مثل التعليم) في الجداول ، ولكن يتم حذف صفوف البيانات المفقودة وتسجيلها في أسفل الجداول في التقرير (ولكن ليس في ناتج SPSS). </ p>";
+$lang['useStmt_contact']="<p> يتكون هذا القسم من أقسام مختلفة: الاسم - التبعية- البريد الإلكتروني - URI. توفر هذه المعلومات جهة الاتصال أو الكيان للحصول على السلطة للوصول إلى البيانات. يُنصح باستخدام جهة اتصال بريد إلكتروني عامة مثل microdata@worldbank.org كلما أمكن ذلك لتجنب تقييد الوصول إلى فرد معين قد تتغير وظائفه بمرور الوقت. <p />";
+$lang['confDec']="<p> إذا لم تكن مجموعة البيانات مجهولة المصدر ، فقد نشير هنا إلى ما يجب توقيع إفادة السرية قبل التمكن من الوصول إلى البيانات. خيار آخر هو تضمين هذه المعلومات في العنصر التالي (شروط الوصول). إذا لم تكن هناك مشكلة تتعلق بالسرية ، فيمكن ترك هذا الحقل فارغًا. </ p>";
+$lang['conditions']="<p> يجب أن تحتوي كل مجموعة بيانات على &quot;سياسة وصول&quot; مرفقة بها. توصي مكتبة البيانات الجزئية بأحد المستويات التالية لإمكانية الوصول إلى البيانات: </ p>
+<ul>
+<li> ملفات الاستخدام العام ، في متناول الجميع. </ li>
+<li> مجموعات البيانات المرخصة ، التي يمكن الوصول إليها بموجب الشروط والمراجعة التالية. </ li>
+<li> البيانات المتاحة من مستودع خارجي </ li>
+</ul>
+<p> صاغ البنك الدولي سياسات معيارية عامة ونماذج وصول لكل نوع من أنواع الوصول هذه. </p> <p> يمكن الاطلاع على شروط استخدام البنك الدولي للبيانات في الكتالوج العام الخارجي <a href = http: //microdata.worldbank.org/index.php/terms-of-use ”target =&quot; _blank ”> هنا </a> ويمكن الاطلاع على شروط استخدام كتالوج الموظفين الداخلي <a href=”http://microdatalib.worldbank.org/index.php/terms“ target=”_blank&quot;> هنا. </a> </p>";
+$lang['citReq']="<p> متطلبات الاقتباس هي الطريقة التي يجب الإشارة إليها بمجموعة البيانات عند الاقتباس في أي منشور. يجب أن يكون لكل مجموعة بيانات متطلب اقتباس. سيضمن ذلك حصول منتج البيانات على الائتمان المناسب ، ويمكن ربط النتائج التحليلية بالإصدار المناسب من مجموعة البيانات. يجب أن تذكر سياسة الوصول صراحة الالتزام بالامتثال لمتطلبات الاقتباس. يجب أن يتضمن الاقتباس الباحث الأساسي على الأقل ، واسم مجموعة البيانات واختصارها ، والسنة المرجعية ، ورقم الإصدار. قم أيضًا بتضمين موقع ويب حيث يتم توفير البيانات أو المعلومات الموجودة على البيانات من قبل مودع البيانات الرسمي. </ p>
+<p> <small> سارة بيرد ، جامعة جورج واشنطن ، كريج ماكنتوش ، جامعة كاليفورنيا سان دييغو ، بيرك أوزلر ، البنك الدولي. صندوق العمل الاجتماعي الثاني في تنزانيا (TASAF II) - تقييم تأثير المجموعات الضعيفة - الجولة الأولى ، مسح الأسرة لعام 2008 ، المرجع. TZA_2008_TASAF-II_v01_M_v01_A_PUF. تم تنزيل مجموعة البيانات من [URL] في [التاريخ] </small> </p>.";
+$lang['disclaimer']="<p> مثال: يقر مستخدم البيانات أن جامع البيانات الأصلي والموزع المعتمد للبيانات ووكالة التمويل ذات الصلة لا يتحملون أي مسؤولية عن استخدام البيانات أو التفسيرات أو الاستنتاجات القائمة على هذه الاستخدامات. </p>";
+$lang['copyright']="<p> ضمِّن هنا بيان حقوق الطبع والنشر في مجموعة البيانات ، مثل: </ p>
+<p> (C) 2007 ، البنك الدولي </ p>";
+$lang['impact_wb_name_help']="<p> اسم رمز تقييم الأثر المقابل للبنك الدولي أو ، إذا لم يكن لتقييم الأثر رمز البنك الدولي المنفصل ، فعندئذٍ يُعرف العنوان / الاسم الذي بموجبه يُعرف تقييم التأثير هذا </ p>";
+$lang['impact_wb_id_help']="<p> رمز تقييم تأثير البنك الدولي المقابل (على سبيل المثال ، P012345). اكتب &quot;N / A&quot; إذا لم يكن لتقييم الأثر هذا رمز WB منفصل) </ p>";
+$lang['impact_wb_lead_help']="<p> WB TTL و / أو المستشار (المستشارون) / الباحث (الباحثون) الرئيسيون </ p>";
+$lang['impact_wb_members_help']="<p> موظفو البنك الدولي أو باحثون / مستشارون آخرون عملوا على تقييم الأثر هذا </ p>";
+$lang['impact_wb_description_help']="<p> اسم رمز تقييم الأثر المقابل للبنك الدولي أو ، إذا لم يكن لتقييم الأثر رمز البنك الدولي المنفصل ، فعندئذٍ يُعرف العنوان / الاسم الذي يُعرف به تقييم التأثير هذا. </ p>";
+$lang['operational_wb_name_help']="<p> اسم عملية البنك الدولي التي يرتبط بها تقييم الأثر هذا < p/>";
+$lang['operational_wb_id_help']="<p> رمز المشروع (على سبيل المثال ، P012345) للعملية ذات الصلة </ p>";
+$lang['operational_wb_summary_help']="<p> قدم ملخصًا / نظرة عامة عن العملية وأهداف تطوير المشروع </ p>";
+$lang['distStmt_contact']="<p> قد يحتاج مستخدمو البيانات إلى مزيد من التوضيح والمعلومات. قد يتضمن هذا القسم الاسم - التبعية - البريد الإلكتروني - URI لشخص واحد أو أكثر من جهات الاتصال. تجنب وضع أسماء الأفراد. يجب أن تكون المعلومات المقدمة هنا صالحة على المدى الطويل. لذلك من الأفضل تحديد الأشخاص الذين يمكن الاتصال بهم من خلال اللقب. الأمر نفسه ينطبق على مجال البريد الإلكتروني. من الناحية المثالية ، يجب توفير عنوان بريد إلكتروني &quot;عام&quot;. من السهل تهيئة خادم بريد بحيث تتم إعادة توجيه جميع الرسائل المرسلة إلى عنوان البريد الإلكتروني العام تلقائيًا إلى بعض أعضاء فريق العمل. </ p>";
+$lang['catalog_to_publish_help']="<p> اختر خارجيًا إذا كنت تنوي مشاركة بياناتك مع الجمهور. اختر داخلي إذا كنت تنوي المشاركة مع موظفي البنك فقط. يتم أيضًا تضمين الدراسات حول الكتالوج الخارجي تلقائيًا في الكتالوج الداخلي </ p>";
+$lang['is_embargoed_help']="<p> إذا لم يتم إصدار هذه الدراسة لموظفي البنك أو للجمهور لفترة من الوقت ، أي وجود حظر على الاصدار والإطلاق، فحدد هذا المربع. يرجى الإشارة في المربع أدناه إلى الفترة الزمنية وشروط الحظر </ p>";
+$lang['disclosure_risk_help']="<p> من المهم حماية هوية وخصوصية المستجيبين الذين قدموا البيانات. إذا كانت ملفات البيانات التي تودعها تحتوي على أي متغيرات تعريفية (على سبيل المثال ، الأسماء وأرقام الهوية الرسمية وإحداثيات نظم المعلومات الجغرافية الدقيقة وما إلى ذلك) أو أي متغيرات تعتبر حساسة بخلاف ذلك في إعداد الدراسة (على سبيل المثال ، العرق ، القبيلة ، الدين ، إلخ) يرجى إدراجها أدناه حتى يمكن منع الوصول إليها. </ p>";
+$lang['notes_to_library_help']="أدخل أي ملاحظات أو تعليمات إضافية هنا.";
+$lang['notes_to_embargoed_help']="<p> تشير إلى شروط الحظر ، على سبيل المثال الفترة الزمنية وأية تعليمات خاصة أخرى. </ p>";
+$lang['cc_help']="<p> أدخل عناوين البريد الإلكتروني للأشخاص الإضافيين الذين ترغب في تلقيهم نسخة موجزة من رسالتك. </ p>";
+$lang['suggested_access_policy_help']="<p> حدد سياسة الوصول المناسبة لبياناتك. لمزيد من التفاصيل انظر: شروط الاستخدام التالية للفهرس الداخلي <a href=&quot;http://microdatalib.worldbank.org/index.php/terms&quot;> http://microdatalib.worldbank.org/index.php/ الشروط </a> وللحصول على الكتالوج الخارجي راجع شروط الاستخدام التالية <a href=&quot;http://microdata.worldbank.org/index.php/terms-of-use&quot;> http: //microdata.worldbank. org / index.php / شروط الاستخدام </a> </p>";
+$lang['study_help']="الرجاء إكمال الحقول في كل قسم من الأقسام أدناه. سيؤدي توفير المعلومات التفصيلية هنا إلى تسريع عملية نشر الدراسة. كما أنه يسهل على مستخدمي البيانات العثور على المعلومات التي يحتاجون إليها وبالتالي يقلل من حاجة المستخدمين إلى الاتصال بمنتج البيانات للتوضيح. ثلاثة حقول فقط إلزامية لعملية التقديم. إذا كان الوقت أو المعلومات المتاحة لا تسمح بإكمال جميع الحقول ، فإننا نطلب على الأقل إكمال الحقول الإلزامية والموصى بها.";
+$lang['create_title']="أدخل العنوان الكامل لمشروعك.";
+$lang['create_short']="أدخل اختصارًا قصيرًا لمشروعك. (على سبيل المثال ، UZB HBS 1998)";
+$lang['create_collab']="قم بتوفير عنوان البريد الإلكتروني لموظفي البنك الآخرين الذين قد يتم تفويضهم بتعديل هذا المشروع.";
+$lang['create_desc']="قدم وصفا مفصلا لمشروعك.";
+$lang['help_subtitle']="قدم عنوان فرعي قصيرة للمسح الخاص بك.";
+$lang['section_identification']=" رقم تعريفي/محدد";
+$lang['section_version']="إصدار";
+$lang['no_files_uploaded']="لم يتم تحميل أي ملفات";
+$lang['no_citations_attached']="لا اقتباسات";
+
+
+/* End of file dd_help */
+/* Location: ./application/language/arabic/dd_help */
\ No newline at end of file
diff --git a/application/language/arabic/dd_projects_lang.php b/application/language/arabic/dd_projects_lang.php
new file mode 100644
index 000000000..d8bc3f6d4
--- /dev/null
+++ b/application/language/arabic/dd_projects_lang.php
@@ -0,0 +1,171 @@
+<?php 
+$lang['my_projects']="مشاريعي";
+$lang['add_new_project']="أضف مشروع إيداع للبيانات جديد";
+$lang['project_deleted']="تم حذف المشروع بنجاح!";
+$lang['new_project']="إنشاء مشروع جديد";
+$lang['created_by']="انشئ من قبل";
+$lang['microdata_datadeposit']="مكتبة البيانات الجزئية - نظام إيداع البيانات";
+$lang['no_project_name_yet']="[لم يتم حفظ معلومات المشروع بعد]";
+$lang['project_info']="معلومات المشروع";
+$lang['study_desc']="وصف الدراسة";
+$lang['data_files']="ملفات البيانات";
+$lang['datafiles']="ملفات البيانات والموارد الأخرى";
+$lang['datafiles_split']="<p style = 'color: # 4071A1؛ margin: 0؛ padding: 0'> ملفات البيانات </ p> وموارد أخرى";
+$lang['other_materials']="مواد اخرى";
+$lang['subtitle']="عنوان فرعي";
+$lang['citation_option']="الاقتباسات (اختياري)";
+$lang['metadata_review']="مراجعة وإرسال";
+$lang['metadata_review2']="مراجعة و <br /> إرسال";
+$lang['mandatory_completed']="تم إكمال جميع الحقول الإلزامية";
+$lang['summary']="ملخص";
+$lang['edit_citations']="تحرير الاقتباس";
+$lang['internal']="داخلي";
+$lang['create_project']="أنشئ مشروعًا";
+$lang['external']="خارجي";
+$lang['confirm_submit']="تأكيد الإرسال";
+$lang['invalid_email']="عنوان البريد الإلكتروني غير صالح!";
+$lang['add_citations']="اقتباس جديد";
+$lang['diagnostic']="التشخيص";
+$lang['outstanding_fields']="%d حقول إلزامية معلقة";
+$lang['no_plupload_support']="لا يحتوي متصفحك على دعم Flash أو Silverlight أو Gears أو BrowserPlus أو HTML5.";
+$lang['project_locked_message']="تم إرسال هذا المشروع في %s. لم يعد من الممكن تحرير المشروع ، ولكن يمكنك عرض معلومات ملخص المشروع وتنزيلها. إذا كنت بحاجة إلى مراجعة أو إضافة المزيد من الملفات إلى تقديمك ، فيمكنك طلب إعادة فتح المشروع.";
+$lang['submit']="أرسل/قدم";
+$lang['request_reopen']="طلب إعادة فتح";
+$lang['catalog_to_publish']="اختر كتالوج للنشر فيه";
+$lang['choose_access_policy']="اختر سياسة وصول مناسبة";
+$lang['notes_to_embargoed']="ملاحظات محظورة";
+$lang['my_projects_title']="مشاريعي";
+$lang['manage_projects']="إدارة المشاريع";
+$lang['disclosure_risk']="مخاطر الإفصاح";
+$lang['key_variables']="المتغيرات الرئيسية";
+$lang['key_variables_help']="صف جميع المتغيرات الرئيسية";
+$lang['sensitive_variables']="المتغيرات الحساسة";
+$lang['sensitive_variables_help']="صف جميع المتغيرات الحساسة";
+$lang['notes_to_library']="ملاحظات للمكتبة";
+$lang['identification']="محدد/رقم تعريفي";
+$lang['abbreviation']="إختصار";
+$lang['study_type']="نوع الدراسة";
+$lang['open_new_window']="انقر هنا لفتح العرض في نافذة جديدة";
+$lang['series_information']="معلومات السلسلة الزمنية";
+$lang['translated_title']="عنوان مترجم";
+$lang['id_number']="رقم/معرّف ID";
+$lang['ddp_id']=" معرّف DDP ";
+$lang['versions']="إصدار";
+$lang['description']="وصف";
+$lang['production_date']="تاريخ الإنتاج";
+$lang['notes']="ملاحظات";
+$lang['no_pending_tasks']="لا توجد مهام معلقة";
+$lang['overview']="نبذة";
+$lang['abstract']="ملخص";
+$lang['kind_of_data']="نوع البيانات";
+$lang['unit_of_analysis']="وحدة التحليل";
+$lang['impact_evaluation_methods']="طرق تقييم الأثر";
+$lang['scope']="المجال/النطاق";
+$lang['description_of_scope']="وصف المجال";
+$lang['topics_classifications']="تصنيفات المواضيع";
+$lang['scope_keywords']="الكلمات الرئيسية للنطاق";
+$lang['confirm_submission']="أنت الآن تقدم مشروعك. لن تتمكن من تعديل الدراسة بعد ذلك. إذا كنت ترغب في تعديل المشروع بعد التقديم ، فسوف تحتاج إلى أن تطلب من المسؤول إعادة فتح المشروع لك. سيتوفر ارتباط لطلب هذا من طريقة عرض &quot;مشاريعي&quot; الخاصة بك في هذا التطبيق.";
+$lang['project_was_requested']="تم تقديم طلب لإعادة فتح هذا المشروع على “%s”. إذا كنت قلقًا بشأن عدم تلقيك ردًا في الوقت المناسب على هذا الطلب ، فيرجى الاتصال بـ microdata@worldbank.org.";
+$lang['reopen_requested']="تم إرسال طلبك لإعادة فتح هذا المشروع إلى مسؤول مكتبة البيانات الجزئية. ستتلقى بريدًا إلكترونيًا من مكتبة البيانات الجزئية بمجرد معالجة طلبك.";
+$lang['coverage']="تغطية";
+$lang['country']="البلد";
+$lang['geographic_coverage']="التغطية الجغرافية";
+$lang['universe']="عالم الدراسة";
+$lang['producers_and_sponsors']="المنتجون والداعمون";
+$lang['primary_investigator']="الباحث الرئيسي";
+$lang['other_producers']="منتجون آخرون";
+$lang['funding']="التمويل";
+$lang['other_acknowledgements']="شكر وتقدير أخرى";
+$lang['project_processed']="تمت معالجة هذا المشروع بواسطة مكتبة البيانات الجزئية. <br />
+لم يعد من الممكن تحرير المشروع أو إعادة فتحه. يمكنك عرض وتنزيل معلومات ملخص المشروع. إذا كان لديك نسخة جديدة من البيانات أو المزيد من الملفات لإضافتها ، يجب أن تفتح مشروعًا جديدًا لإيداعها. يمكنك استخدام وظيفة الاستيراد من المشروع في المشروع المنشأ حديثًا لاستيراد المعلومات / البيانات الوصفية من المشروع القديم إلى المشروع الجديد.";
+$lang['sampling']="العينة";
+$lang['sampling_procedure']="عملية أخذ العينات";
+$lang['deviations_from_sample_design']="الانحرافات عن تصميم العينة";
+$lang['response_rates']="معدلات الاستجابة";
+$lang['weighting']="الأوزان";
+$lang['data_collection']="جمع البيانات";
+$lang['dates_of_data_collection']="تاريخ جمع البيانات";
+$lang['time_periods']="سلاسل زمنية";
+$lang['mode_of_data_collection']="طريقة جمع البيانات";
+$lang['notes_on_data_collection']="ملاحظات حول جمع البيانات";
+$lang['questionnaires']="الاستمارات";
+$lang['data_collectors']="جامعي البيانات";
+$lang['supervision']="الإشراف";
+$lang['data_processing']="معالجة البيانات";
+$lang['data_editing']="تحرير البيانات";
+$lang['other_processing']="معالجات أخرى";
+$lang['data_appraisal']="تقييم البيانات";
+$lang['estimates_of_sampling_error']="تقديرات خطأ العينات";
+$lang['other_forms_of_data_appraisal']="أشكال أخرى من تقييم البيانات";
+$lang['project_saved']="تم حفظ المشروع.";
+$lang['data_access']="الوصول للبيانات";
+$lang['access_authority']="سلطة الوصول";
+$lang['confidentiality']="خصوصية/سرية";
+$lang['access_conditions']="شروط الوصول";
+$lang['citations_requirement']="متطلبات الاقتباس";
+$lang['disclaimer_and_copyright']="إخلاء المسؤولية وحقوق النشر";
+$lang['disclaimers']="إخلاء المسؤولية";
+$lang['copyrights']="حقوق النشر";
+$lang['operational_information']="البنك الدولي - معلومات تشغيلية";
+$lang['operational_wb_name']="اسم مشروع البنك الدولي";
+$lang['operational_wb_id']="رقم مشروع البنك الدولي";
+$lang['operational_wb_net']="شبكة مشروع البنك الدولي";
+$lang['operational_wb_sector']="مجلس قطاع مشروع البنك الدولي";
+$lang['operational_wb_summary']="ملخص مشروع البنك الدولي";
+$lang['operational_wb_objectives']="أهداف تطوير مشروع البنك الدولي";
+$lang['filter']="تصفية/فلترة";
+$lang['save']="حفظ";
+$lang['impact-evaluation']="البنك الدولي - معلومات تقييم الأثر";
+$lang['impact_wb_name']="اسم مشروع تقييم الأثر";
+$lang['impact_wb_id']="رقم/معرّف مشروع تقييم الأثر";
+$lang['impact_wb_area']="تقييم الأثر المجال المواضيعي";
+$lang['impact_wb_lead']="مقيِّم رئيسي (خبراء) تقييم الأثر";
+$lang['impact_wb_members']="أعضاء فريق تقييم الأثر";
+$lang['impact_wb_description']="وصف تقييم الأثر";
+$lang['contacts']="جهات الاتصال";
+$lang['contact_persons']="أشخاص الإتصال";
+$lang['show_help']="كل المساعدة";
+$lang['show_fields']="جميع الحقول";
+$lang['mandatory_recommended']="الحقول الإلزامية والموصى بها";
+$lang['mandatory_only']="الحقول الإلزامية ";
+$lang['save_tooltip']="حفظ";
+$lang['edit_title']="قم بتحرير العنوان الخاص بك من صفحة معلومات المشروع ، حيث أنهما مرتبطان ببعضهما البعض.";
+$lang['confirmation_project_submitted']="[تأكيد] - تم تقديم المشروع";
+$lang['msg_project_submitted']="<p> عزيزي % s ، </p>
+<p> شكرًا لك على إيداع دراستك بعنوان <b>%s </b> في مكتبة البيانات الجزئية. </p>
+<p> يراجع فريق مكتبة البيانات الجزئية المعلومات التي قدمتها. إذا احتجنا إلى أي معلومات أخرى منك ، فسنتصل بك.
+بمجرد اكتمال عملية المراجعة ، سيتم إرسال بريد إلكتروني نهائي إليك لتأكيد قبول الدراسة. </p>
+<p> يتم توفير ملخص لما أرسلته أدناه. يتوفر هذا الملخص أيضًا من رابط الـ URL التالي:%s </p>";
+$lang['project_request_reopen']="طلب إعادة فتح المشروع";
+$lang['intro_projects_exist']="أدخل رسالة تفيد بوجود مشاريع";
+$lang['intro_no_projects']="أدخل رسالة تفيد بعدم وجود مشاريع";
+$lang['project_submitted']="تم تقديم مشروعك. تم إرسال بريد إلكتروني يؤكد هذا إليك. إذا كنت ترغب في عرض ملخص تقديمك ، يمكنك النقر فوق عنوان المشروع للقيام بذلك.";
+$lang['confirm_metadata_import']="سيؤدي هذا إلى استيراد البيانات الوصفية من المشروع المحدد إلى وصف الدراسة الحالية. قد لا يتم التراجع عن هذا الإجراء.";
+$lang['email_to_friend']="بريد الالكتروني";
+$lang['review']="مراجعة";
+$lang['communicate']="تواصل";
+$lang['print_preview']="معاينة قبل الطباعة";
+$lang['provide_email']="يرجى تقديم عنوان بريد إلكتروني صالح لإرسال المشروع الحالي";
+$lang['email_sent_successful']="تم إرسال البريد الإلكتروني بنجاح!";
+$lang['citation_type']="نوع الاقتباس";
+$lang['admin_sent_comments']="من:% s <br/>%s <br/> التعليقات:%s";
+$lang['fail_import']="لم نتمكن من استيراد البيانات الوصفية بنجاح!";
+$lang['success_import']="تم استيراد البيانات الوصفية بنجاح!";
+$lang['embargoed']="محظور";
+$lang['no_files']="لا توجد ملفات لهذا المشروع.";
+$lang['process_tab']="معالجة";
+$lang['files_tab']="الملفات";
+$lang['project_information_tab']="معلومات المشروع";
+$lang['title_project_management']="إيداع البيانات";
+$lang['datadeposit']="إيداع البيانات";
+$lang['study_updated']="تم تحديث وصف دراستك بنجاح!";
+$lang['notify_admin_new_project_submitted']="<p> أرسل المستخدم <b>٪ s </b> مشروعًا بعنوان <b>٪ s </b>. </p>
+<p> يتم توفير ملخص للإرسال أدناه. لإدارة المشروع قم بزيارة :٪ s </p>";
+$lang['notice_project_submitted']="[إعلام] - تم استلام مشروع جديد - تم إرسال[s%] بواسطة [s%]";
+$lang['notice_reopen_request']="[إعلام] - طلب إعادة فتح المشروع -s%";
+$lang['msg_reopen_request']="<p> طلب المستخدم <b>%s </b> إعادة فتح المشروع <b>%s </b>. لإدارة المشروع قم بزيارة: s% </p>
+<p> سبب إعادة فتح المشروع: <b>%s </b> </p>";
+
+
+/* End of file dd_projects */
+/* Location: ./application/language/arabic/dd_projects */
\ No newline at end of file
diff --git a/application/language/arabic/ddi_fields_lang.php b/application/language/arabic/ddi_fields_lang.php
new file mode 100644
index 000000000..bcf305255
--- /dev/null
+++ b/application/language/arabic/ddi_fields_lang.php
@@ -0,0 +1,311 @@
+<?php 
+$lang['identification']="الرقم التعريفي";
+$lang['version']="إصدار";
+$lang['scope']="المجال";
+$lang['coverage']="التغطية";
+$lang['producers_sponsors']="المنتجون والداعمون";
+$lang['sampling']="أخذ العينات";
+$lang['metadata_production']="إنتاج البيانات الوصفية";
+$lang['data_access']="سياسة الوصول";
+$lang['disclaimer_copyright']="إخلاء المسؤولية وحقوق التأليف والنشر";
+$lang['metadata.doc_desc.title']="عنوان الوثيقة";
+$lang['metadata.doc_desc.idno']="رقم وثيقة DDI";
+$lang['metadata.doc_desc.producers']="المنتجون";
+$lang['metadata.doc_desc.producers.name']="الإسم";
+$lang['metadata.doc_desc.producers.abbr']="اختصار";
+$lang['metadata.doc_desc.producers.abbreviation']="اختصار";
+$lang['metadata.doc_desc.producers.affiliation']="التبعية";
+$lang['metadata.doc_desc.producers.role']="الدور";
+$lang['metadata.doc_desc.prod_date']="تاريخ إنتاج البيانات الوصفية";
+$lang['metadata.doc_desc.version_statement.version']="إصدار وثيقة DDI";
+$lang['idno']="رقم/معرّف السمح";
+$lang['metadata.study_desc.title_statement.idno']="رقم/معرّف السمح";
+$lang['metadata.study_desc.title_statement.title']="العنوان";
+$lang['metadata.study_desc.title_statement.sub_title']="العنوان الفرعي";
+$lang['metadata.study_desc.title_statement.alternate_title']="الاختصار";
+$lang['metadata.study_desc.title_statement.translated_title']="عنوان مترجم";
+$lang['metadata.study_desc.authoring_entity']="الباحثون الأساسيون";
+$lang['metadata.study_desc.authoring_entity.name']="الإسم";
+$lang['metadata.study_desc.authoring_entity.affiliation']="التبعية";
+$lang['metadata.study_desc.oth_id']="تعريفات/شكر وتقدير أخرى";
+$lang['metadata.study_desc.oth_id.name']="الإسم";
+$lang['metadata.study_desc.oth_id.role']="الدور";
+$lang['metadata.study_desc.oth_id.affiliation']="التبعية";
+$lang['metadata.study_desc.production_statement']="بيان الإنتاج";
+$lang['metadata.study_desc.production_statement.producers']="المنتجون";
+$lang['metadata.study_desc.production_statement.producers.name']="الإسم";
+$lang['metadata.study_desc.production_statement.producers.abbr']="الاختصار";
+$lang['metadata.study_desc.production_statement.producers.affiliation']="التبعية";
+$lang['metadata.study_desc.production_statement.producers.role']="الدور";
+$lang['metadata.study_desc.production_statement.copyright']="حقوق النشر";
+$lang['metadata.study_desc.production_statement.prod_date']="تاريخ الإنتاج";
+$lang['metadata.study_desc.production_statement.prod_place']="مكان الإنتاج";
+$lang['metadata.study_desc.production_statement.funding_agencies']="وكالة التمويل / الراعي";
+$lang['metadata.study_desc.production_statement.funding_agencies.name']="الإسم";
+$lang['metadata.study_desc.production_statement.funding_agencies.abbr']="الإختصار";
+$lang['metadata.study_desc.production_statement.funding_agencies.abbreviation']="الإختصار";
+$lang['metadata.study_desc.production_statement.funding_agencies.role']="الدور";
+$lang['metadata.study_desc.production_statement.funding_agencies.grant']="رقم المنحة";
+$lang['metadata.study_desc.distribution_statement']="بيان التوزيع";
+$lang['metadata.study_desc.distribution_statement.distributors']="موزع";
+$lang['metadata.study_desc.distribution_statement.distributors.name']="اسم المنظمة";
+$lang['metadata.study_desc.distribution_statement.distributors.abbr']="اختصار";
+$lang['metadata.study_desc.distribution_statement.distributors.affiliation']="التبعية";
+$lang['metadata.study_desc.distribution_statement.contact']="جهات الاتصال";
+$lang['metadata.study_desc.distribution_statement.contact.name']="الإسم";
+$lang['metadata.study_desc.distribution_statement.contact.affiliation']="التبعية";
+$lang['metadata.study_desc.distribution_statement.contact.email']="البريد الإلكتروني";
+$lang['metadata.study_desc.distribution_statement.contact.uri']="رابط الويب URL";
+$lang['metadata.study_desc.distribution_statement.depositor']="المودع";
+$lang['metadata.study_desc.distribution_statement.depositor.name']="الإسم";
+$lang['metadata.study_desc.distribution_statement.depositor.abbr']="الإختصار";
+$lang['metadata.study_desc.distribution_statement.depositor.affiliation']="التبعية";
+$lang['metadata.study_desc.distribution_statement.deposit_date']="تاريخ الإيداع";
+$lang['metadata.study_desc.distribution_statement.distribution_date']="تاريخ التوزيع";
+$lang['metadata.study_desc.series_statement']="بيان السلسلة";
+$lang['metadata.study_desc.series_statement.series_name']="نوع الدراسة";
+$lang['metadata.study_desc.series_statement.series_info']="بيان السلسلة";
+$lang['metadata.study_desc.version_statement']="بيان/تصريح الإصدار";
+$lang['metadata.study_desc.version_statement.version']="وصف الإصدار";
+$lang['metadata.study_desc.version_statement.version_date']="تاريخ الإصدار";
+$lang['metadata.study_desc.version_statement.version_resp']="بيان/تصريح مسؤولية الإصدار";
+$lang['metadata.study_desc.version_statement.version_notes']="ملاحظات الإصدار";
+$lang['metadata.study_desc.bib_citation']="الاقتباس الببليوغرافي";
+$lang['metadata.study_desc.bib_citation_format']="تنسيق الاقتباس الببليوغرافي";
+$lang['metadata.study_desc.holdings']="معلومات المقتنيات";
+$lang['metadata.study_desc.holdings.name']="الإسم";
+$lang['metadata.study_desc.holdings.location']="الموقع";
+$lang['metadata.study_desc.holdings.callno']="رقم الاتصال";
+$lang['metadata.study_desc.holdings.uri']="رابط الويب URL";
+$lang['metadata.study_desc.study_notes']="ملاحظات الدراسة";
+$lang['metadata.study_desc.study_authorization']="تفويض الدراسة";
+$lang['metadata.study_desc.study_authorization.date']="تاريخ التفويض";
+$lang['metadata.study_desc.study_authorization.agency']="وكالة";
+$lang['metadata.study_desc.study_authorization.agency.name']="إسم الوكالة";
+$lang['metadata.study_desc.study_authorization.agency.affiliation']="التبعية";
+$lang['metadata.study_desc.study_authorization.agency.abbr']="الإختصار";
+$lang['metadata.study_desc.study_authorization.authorization_statement']="بيان التفويض";
+$lang['metadata.study_desc.study_info']="مجال الدراسة";
+$lang['metadata.study_desc.study_info.study_budget']="ميزانية الدراسة";
+$lang['metadata.study_desc.study_info.keywords']="كلمات مفتاحية";
+$lang['metadata.study_desc.study_info.keywords.keyword']="كلمة مفتاحية";
+$lang['metadata.study_desc.study_info.keywords.uri']="رابط الويب URI";
+$lang['metadata.study_desc.study_info.keywords.vocab']="مفردات";
+$lang['metadata.study_desc.study_info.topics']="مواضيع";
+$lang['metadata.study_desc.study_info.topics.topic']="موضوع";
+$lang['metadata.study_desc.study_info.topics.vocab']="مفردات";
+$lang['metadata.study_desc.study_info.topics.uri']="رابط الويب URI";
+$lang['metadata.study_desc.study_info.abstract']="ملخص";
+$lang['metadata.study_desc.study_info.time_periods']="فترات زمنية";
+$lang['metadata.study_desc.study_info.time_periods.start']="تاريخ البدء";
+$lang['metadata.study_desc.study_info.time_periods.end']="تاريخ الانتهاء";
+$lang['metadata.study_desc.study_info.time_periods.cycle']="الدورة";
+$lang['metadata.study_desc.study_info.coll_dates']="تواريخ جمع البيانات";
+$lang['metadata.study_desc.study_info.coll_dates.start']="البداية";
+$lang['metadata.study_desc.study_info.coll_dates.end']="النهاية";
+$lang['metadata.study_desc.study_info.coll_dates.cycle']="الدورة";
+$lang['metadata.study_desc.study_info.nation']="البلد";
+$lang['metadata.study_desc.study_info.nation.name']="الإسم";
+$lang['metadata.study_desc.study_info.nation.abbreviation']="رقم البلد";
+$lang['metadata.study_desc.study_info.bbox']="مربع المحيط الجغرافي";
+$lang['metadata.study_desc.study_info.bbox.west']="غرب";
+$lang['metadata.study_desc.study_info.bbox.east']="شرق";
+$lang['metadata.study_desc.study_info.bbox.south']="جنوب";
+$lang['metadata.study_desc.study_info.bbox.north']="شمال";
+$lang['metadata.study_desc.study_info.bound_poly']="مضلع الإحاطة الجغرافي";
+$lang['metadata.study_desc.study_info.bound_poly.lat']="خط العرض";
+$lang['metadata.study_desc.study_info.bound_poly.lon']="خط الطول";
+$lang['metadata.study_desc.study_info.geog_coverage']="التغطية الجغرافية";
+$lang['metadata.study_desc.study_info.geog_coverage_notes']="ملاحظات التغطية الجغرافية";
+$lang['metadata.study_desc.study_info.geog_unit']="الوحدة الجغرافية";
+$lang['metadata.study_desc.study_info.analysis_unit']="وحدة التحليل";
+$lang['metadata.study_desc.study_info.universe']="عالم الدراسة";
+$lang['metadata.study_desc.study_info.data_kind']="نوع البيانات";
+$lang['metadata.study_desc.study_info.notes']="ملاحظات";
+$lang['metadata.study_desc.study_info.quality_statement']="بيان الجودة";
+$lang['metadata.study_desc.study_info.quality_statement.standard_name']="الإسم المعياري";
+$lang['metadata.study_desc.study_info.quality_statement.standard_producer']="المنتج المعياري";
+$lang['metadata.study_desc.study_info.quality_statement.standard_compliance_desc']="وصف الامتثال المعياري";
+$lang['metadata.study_desc.study_info.quality_statement.other_quality_statement']="بيان وإفادة أخرى عن  الجودة ";
+$lang['metadata.study_desc.study_info.study_scope']="مجال المسح";
+$lang['metadata.study_desc.study_info.ex_post_evaluation']="التقييم اللاحق";
+$lang['metadata.study_desc.study_info.ex_post_evaluation.completion_date']="تاريخ الانتهاء من التقييم";
+$lang['metadata.study_desc.study_info.ex_post_evaluation.type']="نوع التقييم";
+$lang['metadata.study_desc.study_info.ex_post_evaluation.evaluator']="المقيّمون";
+$lang['metadata.study_desc.study_info.ex_post_evaluation.evaluator.name']="الإسم";
+$lang['metadata.study_desc.study_info.ex_post_evaluation.evaluator.abbr']="الإختصار";
+$lang['metadata.study_desc.study_info.ex_post_evaluation.evaluator.role']="الدور";
+$lang['metadata.study_desc.study_info.ex_post_evaluation.evaluation_process']="عملية التقييم";
+$lang['metadata.study_desc.study_info.ex_post_evaluation.outcomes']="النتائج";
+$lang['metadata.study_desc.study_development']="تطوير الدراسة";
+$lang['metadata.study_desc.study_development.activity_type']="نوع نشاط التطوير";
+$lang['metadata.study_desc.study_development.activity_description']="وصف نشاط التطوير";
+$lang['metadata.study_desc.study_development.participants']="المشاركون";
+$lang['metadata.study_desc.study_development.participants.name']="إسم المشارك";
+$lang['metadata.study_desc.study_development.participants.affiliation']="التبعية";
+$lang['metadata.study_desc.study_development.participants.role']="الدور";
+$lang['metadata.study_desc.study_development.resource']="موارد نشاط التطوير";
+$lang['metadata.study_desc.study_development.resource.data_source']="مصدر البيانات";
+$lang['metadata.study_desc.study_development.resource.data_source.source']="مصدر";
+$lang['metadata.study_desc.study_development.resource.source_origin']="أصل المصدر";
+$lang['metadata.study_desc.study_development.resource.source_char']="خصائص ملاحظات المصدر";
+$lang['metadata.study_desc.study_development.outcome']="نتائج نشاط التطوير";
+$lang['metadata.study_desc.method']="المنهجية والمعالجة";
+$lang['metadata.study_desc.method.data_collection']="جمع البيانات";
+$lang['metadata.study_desc.method.data_collection.time_method']="طريقة الوقت";
+$lang['metadata.study_desc.method.data_collection.data_collectors']="جامعي البيانات";
+$lang['metadata.study_desc.method.data_collection.data_collectors.name']="الإسم";
+$lang['metadata.study_desc.method.data_collection.data_collectors.abbr']="الإختصار";
+$lang['metadata.study_desc.method.data_collection.data_collectors.abbreviation']="الإختصار";
+$lang['metadata.study_desc.method.data_collection.data_collectors.affiliation']="التبعية";
+$lang['metadata.study_desc.method.data_collection.data_collectors.role']="الدور";
+$lang['metadata.study_desc.method.data_collection.collector_training']="تدريب جامع البيانات";
+$lang['metadata.study_desc.method.data_collection.collector_training.type']="معدل الاستجابة";
+$lang['metadata.study_desc.method.data_collection.collector_training.training']="تدريب جامعي البيانات";
+$lang['metadata.study_desc.method.data_collection.frequency']="تواتر/تردد جمع البيانات";
+$lang['metadata.study_desc.method.data_collection.sampling_procedure']="عملية أخذ العينات";
+$lang['metadata.study_desc.method.data_collection.sample_frame']="إطار العينة";
+$lang['metadata.study_desc.method.data_collection.sample_frame.name']="اسم إطار العينة";
+$lang['metadata.study_desc.method.data_collection.sample_frame.valid_period']="الفترات الصالحة (YYYY / MM / DD)";
+$lang['metadata.study_desc.method.data_collection.sample_frame.valid_period.event']="حدث";
+$lang['metadata.study_desc.method.data_collection.sample_frame.valid_period.date']="تاريخ";
+$lang['metadata.study_desc.method.data_collection.sample_frame.custodian']="وصي";
+$lang['metadata.study_desc.method.data_collection.sample_frame.universe']="عالم الدراسة";
+$lang['metadata.study_desc.method.data_collection.sample_frame.frame_unit']="وحدة الإطار";
+$lang['metadata.study_desc.method.data_collection.sample_frame.frame_unit.is_primary']="أساسي";
+$lang['metadata.study_desc.method.data_collection.sample_frame.frame_unit.unit_type']="نوع الوحدة";
+$lang['metadata.study_desc.method.data_collection.sample_frame.frame_unit.num_of_units']="عدد الوحدات";
+$lang['metadata.study_desc.method.data_collection.sample_frame.reference_period']="فترات مرجعية";
+$lang['metadata.study_desc.method.data_collection.sample_frame.reference_period.event']="حدث";
+$lang['metadata.study_desc.method.data_collection.sample_frame.reference_period.date']="تاريخ";
+$lang['metadata.study_desc.method.data_collection.sample_frame.update_procedure']="عملية التحديث";
+$lang['metadata.study_desc.method.data_collection.sampling_deviation']="الانحرافات عن تصميم العينة";
+$lang['metadata.study_desc.method.data_collection.coll_mode']="طريقة جمع البيانات";
+$lang['metadata.study_desc.method.data_collection.research_instrument']="إستمارات";
+$lang['metadata.study_desc.method.data_collection.instru_development']="تطوير الأداة";
+$lang['metadata.study_desc.method.data_collection.instru_development_type']="نوع تطوير الأداة";
+$lang['metadata.study_desc.method.data_collection.sources']="مصادر";
+$lang['metadata.study_desc.method.data_collection.sources.data_source']="مصدر البيانات";
+$lang['metadata.study_desc.method.data_collection.sources.data_source.source']="مصدر";
+$lang['metadata.study_desc.method.data_collection.sources.source_origin']="أصل المصدر";
+$lang['metadata.study_desc.method.data_collection.sources.source_char']="خصائص ملاحظات المصدر";
+$lang['metadata.study_desc.method.data_collection.sources.source_doc']="وثائق المصدر";
+$lang['metadata.study_desc.method.data_collection.coll_situation']="ملاحظات جمع البيانات";
+$lang['metadata.study_desc.method.data_collection.act_min']="إشراف";
+$lang['metadata.study_desc.method.data_collection.control_operations']="عمليات المراقبة";
+$lang['metadata.study_desc.method.data_collection.weight']="توزين/ترجيح";
+$lang['metadata.study_desc.method.data_collection.cleaning_operations']="تحرير البيانات";
+$lang['metadata.study_desc.method.method_notes']="ملاحظات المنهجية";
+$lang['metadata.study_desc.method.analysis_info']="تقييم البيانات";
+$lang['metadata.study_desc.method.analysis_info.response_rate']="معدل الاستجابة";
+$lang['metadata.study_desc.method.analysis_info.sampling_error_estimates']="تقديرات خطأ أخذ العينات";
+$lang['metadata.study_desc.method.analysis_info.data_appraisal']="تقييم البيانات";
+$lang['metadata.study_desc.method.study_class']="فئة الدراسة";
+$lang['metadata.study_desc.method.data_processing']="معالجة البيانات";
+$lang['metadata.study_desc.method.data_processing_type']="نوع معالجة البيانات";
+$lang['metadata.study_desc.method.coding_instructions']="تعليمات الترميز";
+$lang['metadata.study_desc.method.coding_instructions.related_processes']="العمليات ذات الصلة";
+$lang['metadata.study_desc.method.coding_instructions.type']="نوع تعليمات الترميز";
+$lang['metadata.study_desc.method.coding_instructions.txt']="نص تعليمات الترميز";
+$lang['metadata.study_desc.method.coding_instructions.command']="أمر";
+$lang['metadata.study_desc.method.coding_instructions.command_language']="لغة كود الأمر";
+$lang['metadata.study_desc.data_access']="وصف الوصول الى البيانات والبيانات الوصفية للدراسة";
+$lang['metadata.study_desc.data_access.dataset_availability']="توافر مجموعة البيانات";
+$lang['metadata.study_desc.data_access.dataset_availability.access_place']="موقع جمع البيانات";
+$lang['metadata.study_desc.data_access.dataset_availability.access_place_url']="عنوان رابط الويب  URL لموقع جمع البيانات";
+$lang['metadata.study_desc.data_access.dataset_availability.original_archive']="أرشيف مكان تخزين الدراسة الأصلي";
+$lang['metadata.study_desc.data_access.dataset_availability.status']="حالة التوفر";
+$lang['metadata.study_desc.data_access.dataset_availability.coll_size']="مدى الجمع";
+$lang['metadata.study_desc.data_access.dataset_availability.complete']="اكتمال الدراسة المخزنة";
+$lang['metadata.study_desc.data_access.dataset_availability.file_quantity']="عدد الملفات";
+$lang['metadata.study_desc.data_access.dataset_availability.notes']="ملاحظات";
+$lang['metadata.study_desc.data_access.dataset_use']="توافر مجموعة البيانات";
+$lang['metadata.study_desc.data_access.dataset_use.conf_dec']="خصوصية/سرية";
+$lang['metadata.study_desc.data_access.dataset_use.conf_dec.txt']="نص إعلان السرية";
+$lang['metadata.study_desc.data_access.dataset_use.conf_dec.required']="هل التوقيع على إقرار السرية مطلوب؟";
+$lang['metadata.study_desc.data_access.dataset_use.conf_dec.form_url']="رابط ويب URL نموذج إقرار السرية";
+$lang['metadata.study_desc.data_access.dataset_use.conf_dec.form_id']="رقم النموذج";
+$lang['metadata.study_desc.data_access.dataset_use.spec_perm']="أذونات خاصة";
+$lang['metadata.study_desc.data_access.dataset_use.spec_perm.txt']="وصف أذونات خاصة";
+$lang['metadata.study_desc.data_access.dataset_use.spec_perm.required']="حدد ما إذا كانت الأذونات الخاصة مطلوبة للوصول إلى مورد";
+$lang['metadata.study_desc.data_access.dataset_use.spec_perm.form_url']="رابط ويب URL النموذج";
+$lang['metadata.study_desc.data_access.dataset_use.spec_perm.form_id']="رقم النموذج";
+$lang['metadata.study_desc.data_access.dataset_use.restrictions']="قيود";
+$lang['metadata.study_desc.data_access.dataset_use.contact']="نفوذ الوصول";
+$lang['metadata.study_desc.data_access.dataset_use.contact.name']="الإسم";
+$lang['metadata.study_desc.data_access.dataset_use.contact.affiliation']="التبعية";
+$lang['metadata.study_desc.data_access.dataset_use.contact.uri']="رابط الويب URL";
+$lang['metadata.study_desc.data_access.dataset_use.contact.email']="البريد الإلكتروني";
+$lang['metadata.study_desc.data_access.dataset_use.cit_req']="متطلبات الاقتباس";
+$lang['metadata.study_desc.data_access.dataset_use.deposit_req']="متطلبات الإيداع";
+$lang['metadata.study_desc.data_access.dataset_use.conditions']="شروط الوصول";
+$lang['metadata.study_desc.data_access.dataset_use.disclaimer']="إخلاء المسؤولية";
+$lang['metadata.study_desc.data_access.notes']="ملاحظات";
+$lang['metadata.study_desc.method.data_collection.method_notes']="معالجة أخرى";
+$lang['metadata.study_desc.study_info.method.method_notes']="ملاحظات الطريقة/الوسيلة";
+$lang['metadata.study_desc.study_info.method.data_collection.sources.source_origin']="أصل المصدر";
+$lang['metadata.study_desc.study_info.method.data_collection.sources.data_source']="مصدر البيانات";
+$lang['metadata.study_desc.study_info.method.data_collection.sources.data_source.source']="المصدر";
+$lang['var_vald']="صالح/فعال";
+$lang['var_valid cases']="حالات صالحة او فعالة";
+$lang['var_vald_wgtd']="صالح (مرجح/موزن)";
+$lang['var_intrvl']="النوع";
+$lang['var_invd']="غير صالح/فعال";
+$lang['var_wgt']="متغير الوزن/الترجيح";
+$lang['var_is_wgt']="موزون";
+$lang['var_invd_wgtd']="غير صالح (موزن/مرجح)";
+$lang['var_dcml']="عدد عشري";
+$lang['loc_width']="عرض";
+$lang['var_range']="نطاق/مدى";
+$lang['var_catgry']="فئات";
+$lang['var_txt']="تعريف";
+$lang['var_concept']="مفهوم";
+$lang['var_concept.name']="الإسم";
+$lang['var_concept.vocab']="مفردات";
+$lang['var_universe']="عالم الدراسة";
+$lang['var_imputation']="التضمين";
+$lang['var_security']="أمن وحماية";
+$lang['var_notes']="ملاحظات";
+$lang['weighted']="موزون";
+$lang['var_format']="صيغة";
+$lang['var_mean_wgtd']="الوسط الحسابي (مرجح)";
+$lang['var_stdev_wgtd']="الانحراف المعياري (مرجح)";
+$lang['contin']="متواصل";
+$lang['discrete']="منفصل";
+$lang['numeric']="رقمي";
+$lang['var_min']="الحد الأدنى";
+$lang['var_max']="الحد الأقصى";
+$lang['var_mean']="المتوسط";
+$lang['var_stdev']="الانحراف المعياري";
+$lang['imputation_n_derivation']="الاقتطاع والاشتقاق";
+$lang['var_codinstr']="الاشتقاق";
+$lang['var_resp_unit']="مصدر المعلومات";
+$lang['vocab']="مفردات";
+$lang['name']="الإسم";
+$lang['uri']="رابط الويب URL";
+$lang['abbreviation']="الإختصار";
+$lang['affiliation']="التبعية";
+$lang['email']="البريد الإلكتروني";
+$lang['start']="البداية";
+$lang['end']="النهاية";
+$lang['cycle']="الدورة";
+$lang['role']="الدور";
+$lang['topic']="الموضوع";
+$lang['questions_n_instructions']="أسئلة وتعليمات";
+$lang['warning_figures_indicate_number_of_cases_found']="تحذير: تشير هذه الأرقام إلى عدد الحالات الموجودة في ملف البيانات. لا يمكن تفسيرها على أنها إحصاءات موجزة للسكان المعنيين.";
+$lang['value']="قيمة";
+$lang['category']="فئة";
+$lang['cases']="حالات";
+$lang['var_qstn_qstnlit']="السؤال الحرفي";
+$lang['var_qstn_preqtxt']="السؤال القبلي";
+$lang['var_qstn_postqtxt']="السؤال البعدي";
+$lang['var_qstn_ivuinstr']="تعليمات المقابل";
+$lang['data_file']="ملف البيانات";
+$lang['overview']="نبذة";
+$lang['contacts']="جهات الاتصال";
+$lang['others']="أخرى";
+$lang['producer']="المنتج";
+
+
+/* End of file ddi_fields */
+/* Location: ./application/language/arabic/ddi_fields */
\ No newline at end of file
diff --git a/application/language/arabic/ddibrowser_lang.php b/application/language/arabic/ddibrowser_lang.php
index 463563547..8a56981e4 100644
--- a/application/language/arabic/ddibrowser_lang.php
+++ b/application/language/arabic/ddibrowser_lang.php
@@ -1,53 +1,53 @@
 <?php 
-$lang['title_ddi_browser']="تصفح البيانات الوصفية (DDI)";
-$lang['title_forms']="الاستبيانات";
+$lang['title_ddi_browser']="مستعرض البيانات الوصفية DDI";
+$lang['title_forms']="النماذج";
 $lang['title_technical_documents']="الوثائق الفنية";
 $lang['title_reports']="تقارير";
 $lang['title_statistical_tables']="الجداول الإحصائية";
-$lang['title_other_materials']="الموارد الأخرى";
+$lang['title_other_materials']="مواد أخرى";
 $lang['show_more_info']="عرض المزيد من المعلومات";
 $lang['sampling']="أخذ العينات";
-$lang['questionnaires']="الاستبيانات";
+$lang['questionnaires']="الإستمارات";
 $lang['data_collection']="جمع البيانات";
 $lang['data_processing']="معالجة المعلومات";
-$lang['data_appraisal']="تقييم البانات";
+$lang['data_appraisal']="تقييم البيانات";
 $lang['technical_information']="معلومات فنية";
 $lang['technical_documents']="الوثائق الفنية";
-$lang['tabulation_and_analysis']="التقارير والجداول";
+$lang['tabulation_and_analysis']="الجدولة والتحليل";
 $lang['statistical_tables']="الجداول الإحصائية";
 $lang['reports']="تقارير";
-$lang['datasets']="البيانات";
-$lang['access_policy']="سياسة النفاذ";
+$lang['datasets']="مجموعات البيانات";
+$lang['access_policy']="سياسة النفاذ/الوصول";
 $lang['data_files']="ملفات البيانات";
 $lang['variable_search']="بحث في المتغيرات";
-$lang['other_materials']="المواد الاخرى";
-$lang['export_metadata']="توريد بيانات وصفية";
-$lang['variable_search_match_found']="d% تم العثور على  متغيرات";
+$lang['other_materials']="مواد أخرى";
+$lang['export_metadata']="تصدير البيانات الوصفية";
+$lang['variable_search_match_found']="تم العثور على %d متغير (متغيرات) تطابق معايير البحث الخاصة بك.";
 $lang['name']="الاسم";
-$lang['label']="العنوان";
+$lang['label']="العنوان/التسمية";
 $lang['question']="السؤال";
 $lang['classification']="تصنيف";
 $lang['description']="وصف";
 $lang['overview']="نظرة عامة";
-$lang['variable_information']="معلومات عن المتغير";
-$lang['export_documentation']="تصدير الوثائق ";
-$lang['select_output_format']="اختيار صيغة التصدير";
-$lang['download_instructions']="يتم إنشاء الوثائق في الحال ، وهذاقد يستغرق قليلا من الوقت. الرجاء الانتظار إذا كانت الوثائق لا تظهر مباشرة بعد النقر على زر التوليد";
-$lang['generate']="انتاج ";
-$lang['table_of_contents']="محتويات";
+$lang['variable_information']="معلومات المتغير";
+$lang['export_documentation']="تصدير الوثيقة";
+$lang['select_output_format']="حدد تنسيق/صيغة المخرج";
+$lang['download_instructions']="يتم إنشاء الوثائق بسرعة ويمكن أن تستغرق من بضع ثوانٍ إلى دقيقتين لإكمالها. هذا هو الحال بشكل خاص عند اختيار إنشاء مستند PDF.";
+$lang['generate']="انتاج/توليد ";
+$lang['table_of_contents']="جدول المحتويات";
 $lang['Abstract']="ملخص";
 $lang['Access Authority']="سلطة النفاذ";
 $lang['Access Conditions']="شروط النفاذ";
-$lang['Access Policy']="سياسة النفاذ";
-$lang['Accessibility']="امكانية النفاذ";
-$lang['Browse Metadata']="عرض البيانات";
-$lang['Cases']="تسجيلات";
+$lang['Access Policy']="سياسة النفاذ/الوصول";
+$lang['Accessibility']="امكانية النفاذ/الوصول";
+$lang['Browse Metadata']="عرض البيانات الوصفية";
+$lang['Cases']="تسجيلات/حالات";
 $lang['Categories']="الفئات";
 $lang['Category']="الفئة";
 $lang['Citation Requirements']="شروط الاقتباس";
 $lang['Click to view variable information']="انقر للحصول على معلومات عن المتغير";
 $lang['Confidentiality']="السرية";
-$lang['Contact(s)']="اتصل بنا";
+$lang['Contact(s)']="جهات الاتصال";
 $lang['Content']="محتوى";
 $lang['Continuous']="متواصل";
 $lang['Copyright']="حقوق الطبع والنشر";
@@ -65,12 +65,12 @@
 $lang['Data Processing']="معالجة البيانات";
 $lang['Date of Metadata Production']="تاريخ انتاج البيانات الوصفية";
 $lang['DDI Document ID']="رقم الوثيقة DDI ";
-$lang['DDI Document Version']="نسخة من وثيقةDDI ";
+$lang['DDI Document Version']="إصدار  وثيقة DDI";
 $lang['Decimals']="عشري";
-$lang['Derivation']="استنتاج";
+$lang['Derivation']="استنتاج/اشتقاق";
 $lang['Description']="وصف";
-$lang['Deviations from Sample Design']="الانحراف عن برنامج أخذ العينات";
-$lang['Disclaimer']="تنويه";
+$lang['Deviations from Sample Design']="الانحرافات عن تصميم العينة";
+$lang['Disclaimer']="إخلاء المسؤولية";
 $lang['Discrete']="منفصل";
 $lang['End']="نهاية";
 $lang['Estimates of Sampling Error']="تقدير الأخطاء  فى أخذ العينات";
@@ -78,43 +78,43 @@
 $lang['Format']="صيغة";
 $lang['Funding']="تمويل";
 $lang['Geographic Coverage']="التغطية الجغرافية";
-$lang['ID']="معرف";
-$lang['ID Number']="رقم المعرف";
-$lang['Identification']="تحديد";
+$lang['ID']="معرّف";
+$lang['ID Number']="رقم المعرّف";
+$lang['Identification']="تحديد/تعريف";
 $lang['Imputation']="احتساب البيانات";
-$lang['Interviewer instructions']="تعليمات المستقصي ";
-$lang['Invalid']="باطل";
+$lang['Interviewer instructions']="تعليمات المستقصي/المقابل ";
+$lang['Invalid']="غير صالح";
 $lang['Keys']="مفاتيح";
 $lang['Kind of Data']="نوع البيانات";
-$lang['Label']="العنوان";
+$lang['Label']="العنوان/التسمية";
 $lang['Literal question']="السؤال الحرفي";
 $lang['Maximum']="الحد الأقصى";
 $lang['Metadata Produced By']="البيانات الوصفية انتجت من طرف";
 $lang['Metadata Production']="انتاج البيانات الوصفية";
 $lang['Minimum']="الحد الأدنى";
 $lang['Missing Data']="بيانات مفقودة";
-$lang['Name']="اسم";
+$lang['Name']="الإسم";
 $lang['No variables were found.']="لم يتم العثور على متغيرات";
 $lang['Notes']="ملاحظات";
 $lang['Other Acknowledgements']="شكر وتقديرات اخرى";
 $lang['Other forms of Data Appraisal']="أنواع أخرى من تقييم البيانات";
-$lang['Other Processing']="العلاجات الأخرى";
+$lang['Other Processing']="المعالجات الأخرى";
 $lang['Other Producer(s)']="منتجين اخرين";
 $lang['Overview']="نظرة عامة";
-$lang['Post question']="بعد السؤال";
-$lang['Pre question']="قبل السؤال";
-$lang['Primary Investigator(s)']="الباحث الرئيسي";
+$lang['Post question']="السؤال البعدي";
+$lang['Pre question']="السؤال القبلي";
+$lang['Primary Investigator(s)']="الباحث/الباحثين الرئيسيين";
 $lang['Producer']="المنتج";
-$lang['Producers and Sponsors']="المنتج و الممول";
+$lang['Producers and Sponsors']="المنتج والممول";
 $lang['Production Date']="تاريخ الانتاج";
 $lang['Question']="السؤال";
-$lang['Questionnaires']="الاستبيانات";
-$lang['Questions and instructions']="الأسئلة و التعليمات";
+$lang['Questionnaires']="الإستمارات";
+$lang['Questions and instructions']="الأسئلة والتعليمات";
 $lang['Range']="مجال";
-$lang['Response Rate']="معدل الاجابات";
-$lang['Rights & Disclaimer']="الحقوق والمسؤوليات";
+$lang['Response Rate']="معدل الاستجابة";
+$lang['Rights & Disclaimer']="الحقوق وإخلاء المسؤولية";
 $lang['Sampling']="أخذ العينات";
-$lang['Sampling Procedure']="أسلوب أخذ العينات";
+$lang['Sampling Procedure']="عملية أخذ العينات";
 $lang['Scope']="المجال ";
 $lang['Security']="الأمن";
 $lang['Series Information']="معطيات حول سلسلة المعلومات";
@@ -123,51 +123,100 @@
 $lang['Structure']="تركيبة";
 $lang['Subtitle']="عنوان فرعي";
 $lang['Supervision']="إشراف";
-$lang['Study Type']="نوع المسح";
-$lang['survey(s) out of']="مسح من";
+$lang['Study Type']="نوع الدراسة";
+$lang['survey(s) out of']="مسح (مسوح) من";
 $lang['surveys per page']="عدد المسوح في كل صفحة";
 $lang['Title']="العنوان";
 $lang['Type']="نوع";
 $lang['Units of Analysis']="وحدات التحليل ";
-$lang['Universe']="الكون";
-$lang['Valid cases']="سجلات صالحة";
+$lang['Universe']="الكون/عالم الدراسة";
+$lang['Valid cases']="سجلات/حالات صالحة";
 $lang['Value']="القيمة";
-$lang['Variable(s)']="متغير";
+$lang['Variable(s)']="متغير/متغيرات";
 $lang['Variables']="المتغيرات";
 $lang['variables were found.']="المتغيرات الموجوده";
-$lang['Version']="النسخة";
-$lang['Version Description']="وصف النسخة";
+$lang['Version']="النسخة/الإصدار";
+$lang['Version Description']="وصف النسخة/الإصدار";
 $lang['View']="عرض";
 $lang['View variable info']="عرض معلومات عن المتغير";
-$lang['warning_figures_indicate_number_of_cases_found']="تحذير : هذه لاحصاءات تعطي عدد السجلات الموجودة في ملفات البيانات ، وليس الأرقام الموزونة . لا يمكن   تفسير الأرقام بأنها ممثلة للسكان المعنيين";
+$lang['warning_figures_indicate_number_of_cases_found']="تحذير: تشير هذه الأرقام إلى عدد الحالات الموجودة في ملف البيانات. لا يمكن تفسيرها على أنها إحصاءات موجزة للسكان المعنيين.";
 $lang['Weighting']="التوزين ";
 $lang['Width']="عرض";
-$lang['Topic']="الموضوع
+$lang['Topic']="الموضوع
 ";
-$lang['Vocabulary']="المفردات
+$lang['Vocabulary']="المفردات
 ";
-$lang['URI']="عنوان URI";
+$lang['URI']="عنوان رابط الويب URI";
 $lang['Abbreviation']="الاختصار";
-$lang['Affiliation']="الانتماء";
+$lang['Affiliation']="الانتماء/التبعية";
 $lang['Role']="الدور";
 $lang['Processing Checks']="معالجة المعلومات";
 $lang['Definition']="التعريف";
-$lang['title_analytical']="النواتج التحليلية
+$lang['title_analytical']="النواتج التحليلية
 ";
-$lang['Data Collectors']="جامعي البيانات
+$lang['Data Collectors']="جامعي البيانات
 ";
-$lang['Time Periods']="الفترات الزمنية
+$lang['Time Periods']="الفترات الزمنية
 ";
-$lang['variable_groups']=" مجموعات المتغيرات
+$lang['variable_groups']=" مجموعات المتغيرات
 ";
-$lang['impact_evaluation']="تقييم الأثر
+$lang['impact_evaluation']="تقييم الأثر
 ";
-$lang['related_operations']="العمليات ذات الصلة
+$lang['related_operations']="العمليات ذات الصلة
 ";
-$lang['request_microdata']="طلب البيانات الجزئية
+$lang['request_microdata']="طلب البيانات الجزئية
 ";
-$lang['download_metadata']="XMLالبيانات الوصفية ";
-
-
-/* End of file ddibrowser_lang.php */
-/* Location: ./application/language/arabic/ddibrowser_lang.php */
\ No newline at end of file
+$lang['download_metadata']="البيانات الوصفية على شكل XML";
+$lang['website_title']="عنوان موقع الويب";
+$lang['study_title']="عنوان الدراسة";
+$lang['publisher']="الناشر";
+$lang['website_url']="رابط الويب للموقع URL";
+$lang['study_contains_too_many_variables']="تحتوي الدراسة على أكثر من <strong>%s </strong> المتغيرات ، إذا لم يتمكن النظام من إنشاء ملف PDF ، فحاول استبعاد خيار &quot;وصف قاموس البيانات&quot;.";
+$lang['include_variable_toc']="قائمة المتغير";
+$lang['include_variable_desc']="وصف المتغير";
+$lang['include_external_resources']="موارد خارجية";
+$lang['Report options']="خيارات التقرير:";
+$lang['processing_pdf_report']="إنشاء تقرير PDF ، قد يستغرق بضع دقائق أو أكثر ...";
+$lang['citations']="اقتباسات";
+$lang['review_study']="مراجعة الدراسة";
+$lang['add_note']="أضف ملاحظة";
+$lang['no_reviewer_notes_found']="الدراسة ليس لديها ملاحظات مرفقة من المراجعين . لإضافة ملاحظة جديدة ، استخدم الرابط &quot;إضافة ملاحظة&quot;.";
+$lang['no_resources_attached']="الدراسة ليس لديها موارد خارجية.";
+$lang['no_microdata_attached']="الدراسة ليس لديها بيانات جزئية متاحة.";
+$lang['created_on']="تم إنشاؤها في";
+$lang['last_modified']="آخر تعديل";
+$lang['page_views']="مشاهدات الصفحة";
+$lang['downloads']="تنزيلات";
+$lang['documentation_in_pdf']="التوثيق بصيغة PDF";
+$lang['download_rdf']="تنزيل RDF";
+$lang['reviewer_notes']="ملاحظات المراجعين";
+$lang['js_refreshing_page']="جاري إعادة تحميل الصفحة ، برجاء الانتظار ...";
+$lang['visit_data_catalog_at']="قم بزيارة كتالوج البيانات الخاص بنا على";
+$lang['report_generated_on']="تم إنشاء التقرير في";
+$lang['cover']="غلاف";
+$lang['file_description']="وصف الملف";
+$lang['variable_list']="قائمة المتغيرات";
+$lang['variable_description']="وصف المتغير";
+$lang['external_resources']="موارد خارجية";
+$lang['report_lang']="لغة التقرير";
+$lang['generate_pdf']="إنشاء ملف PDF";
+$lang['Mean']="الوسط الحسابي";
+$lang['Standard deviation']="الانحراف المعياري";
+$lang['search_data_dictionary']="البحث في قاموس البيانات";
+$lang['Total variables(s)']="مجموع المتغيرات";
+$lang['download_study_rdf']="قم بتنزيل أوصاف موارد الدراسة (مثل التقارير والإستمارات والوثائق الفنية) بتنسيق Dublin Core RDF";
+$lang['download_study_ddi']="قم بتنزيل البيانات الوصفية للدراسة بتنسيق DDI (XML)";
+$lang['study_documentation_text']="قم بتنزيل الإستمارات والوثائق الفنية والتقارير التي تصف عملية المسح والنتائج الرئيسية لهذه الدراسة.";
+$lang['study_description_text']="يقدم القسم وصفًا تفصيليًا للدراسة (أي البيانات الوصفية). تتعلق الموضوعات التي يتم تناولها بمنهجية المسح وطرق أخذ العينات وجمع البيانات والتمويل وتواريخ الجمع والتغطية الجغرافية وسياسة الوصول إلى البيانات من هذه الدراسة. قم بتنزيل البيانات الوصفية بعدد من التنسيقات من رابط تصدير البيانات الوصفية.";
+$lang['data_description_text']="يقدم هذا القسم معلومات مفصلة عن بيانات سجل الوحدة الناتجة عن هذه الدراسة. يتضمن هذا وصفًا تفصيليًا لمحتويات كل ملف بيانات وجميع المتغيرات داخل كل ملف. قد تحتوي المتغيرات على النتائج المسجلة لسؤال مباشر مطروح ، أو مشتقة بطريقة ما. يتم تلخيص عدد المتغيرات وعدد نقاط البيانات (الحالات) لكل متغير.";
+$lang['related_publications_text']="يتم استخدام البيانات من هذه الدراسة في المنشورات/المطبوعات التالية:";
+$lang['related_studies']="دراسات ذات صلة";
+$lang['variable_group']="مجموعة المتغيرات";
+$lang['universe']="عالم الدراسة";
+$lang['notes']="ملاحظات";
+$lang['text']="ملاحظات";
+$lang['definition']="تعريف";
+
+
+/* End of file ddibrowser */
+/* Location: ./application/language/arabic/ddibrowser */
\ No newline at end of file
diff --git a/application/language/arabic/direct_access_terms_lang.php b/application/language/arabic/direct_access_terms_lang.php
index 1c2d6da51..17bab0a70 100644
--- a/application/language/arabic/direct_access_terms_lang.php
+++ b/application/language/arabic/direct_access_terms_lang.php
@@ -1,31 +1,31 @@
 <?php 
-$lang['title_terms_and_conditions']="شروط النفاذ";
-$lang['terms_text']=" <ol> 
-  <li>البيانات والمواد الأخرى الموجودة في  أرشيف البيانات الوطنية لن 
-    يتم إعادة توزيعها أو بيعها لغيرهم من الأفراد والمؤسسات ، أو الكائنات 
-    دون موافقة خطية من أرشيف البيانات الوطنية.<li/>
- 
-  <li>      سيتم استخدام هاته البيانات لاغراض البحوث الاحصائية و العلمية فقط. سيتم نشر البيانات التجميعية  فقط  <li/>
-<li>لن يسمح بالمحاولة لاعادة تحديد هوية الافراد المجيبين. لن يسمح باستعمال بيانات الافراد او المؤسسات الذين تم اكتشافهم من دون قصد. اذا تم تحديد هوية فرد او مؤسسة من دون قصد يجب اعلام المركز والارشيف الوطني  فورا
-. <li/> 
-  
-<li>لن يسمح بمحاولة ربط بين مجموعات بيانات التي يوفرها الارشيف الوطني ، او بين بيانات الارشيف و بيانات وطنية اخرى للتعرف على الافراد او المؤسسات 
-</li>
-  <li>يجب على أي كتب او مقالات او اطروحات او تقارير استعملت بيانات تم الحصول من طرف الارشيف الوطني ذكر المصدر. وذلك وفقا للمتطلبات المنصوص عليها في اقتباس كل البيانات  
-<li/> 
-  <li> يجب ارسال كل التقارير والمنشورات و النسخ الالكترونية  التي اعتمدت على بيانات الارشيف الى ارشيف البيانات الوطني  
- <li/> 
-
-  <li> لا يتحمل أرشيف البيانات الوطني أية مسؤولية عن أي استنتاجات او تفسيرات في استخدام بياناته. 
-<li/> 
-<ol/> 
-<p>
-على مستخدم البيانات الامتثال للاتفاق وللشروط المذكورة اعلاه . مع تأكيده على ان يكون استخدام بيانات ارشيف البيانات الوطني لغرض احصائي و ذلك وفقا للمعايير القانونية الدولية التي تهدف الى حماية سرية الاجابات.
-<p/>  
+$lang['title_terms_and_conditions']="الأحكام والشروط";
+$lang['terms_text']=" <ol> 
+  <li>البيانات والمواد الأخرى الموجودة في  أرشيف البيانات الوطنية لن 
+    يتم إعادة توزيعها أو بيعها لغيرهم من الأفراد والمؤسسات ، أو الكائنات 
+    دون موافقة خطية من أرشيف البيانات الوطنية.<li/>
+ 
+  <li>      سيتم استخدام هذه البيانات لاغراض البحوث الاحصائية و العلمية فقط. سيتم نشر البيانات التجميعية  فقط  <li/>
+<li>لن يسمح بالمحاولة لاعادة تحديد هوية الافراد المجيبين. لن يسمح باستعمال بيانات الافراد او المؤسسات الذين تم اكتشافهم من دون قصد. اذا تم تحديد هوية فرد او مؤسسة من دون قصد يجب اعلام المركز والارشيف الوطني  فورا
+. <li/> 
+  
+<li>لن يسمح بمحاولة ربط بين مجموعات بيانات التي يوفرها الارشيف الوطني ، او بين بيانات الارشيف و بيانات وطنية اخرى للتعرف على الافراد او المؤسسات 
+</li>
+  <li>يجب على أي كتب او مقالات او اطروحات او تقارير استعملت بيانات تم الحصول من طرف الارشيف الوطني ذكر المصدر. وذلك وفقا للمتطلبات المنصوص عليها في اقتباس كل البيانات  
+<li/> 
+  <li> يجب ارسال كل التقارير والمنشورات و النسخ الالكترونية  التي اعتمدت على بيانات الارشيف الى ارشيف البيانات الوطني  
+ <li/> 
+
+  <li> لا يتحمل أرشيف البيانات الوطني أية مسؤولية عن أي استنتاجات او تفسيرات في استخدام بياناته. 
+<li/> 
+<ol/> 
+<p>
+على مستخدم البيانات الامتثال للاتفاق وللشروط المذكورة اعلاه . مع تأكيده على ان يكون استخدام بيانات ارشيف البيانات الوطني لغرض احصائي و ذلك وفقا للمعايير القانونية الدولية التي تهدف الى حماية سرية الاجابات.
+<p/>  
 ";
 $lang['form_removed_and_not_available']="تم حذف النموذج ولم يعد متوفر";
-$lang['survey_data_files']="ملفات البيانات";
-
-
-/* End of file direct_access_terms_lang.php */
-/* Location: ./application/language/arabic/direct_access_terms_lang.php */
\ No newline at end of file
+$lang['survey_data_files']="ملفات بيانات المسح";
+
+
+/* End of file direct_access_terms */
+/* Location: ./application/language/arabic/direct_access_terms */
\ No newline at end of file
diff --git a/application/language/arabic/ecatalog_admin_lang.php b/application/language/arabic/ecatalog_admin_lang.php
index 84452f92f..6c9e6c671 100644
--- a/application/language/arabic/ecatalog_admin_lang.php
+++ b/application/language/arabic/ecatalog_admin_lang.php
@@ -1,44 +1,44 @@
-<?php
-$lang['catalog_maintenance'] = "Catalog Maintenance";
-$lang['upload_ddi'] = "Upload DDI";
-$lang['upload_ddi_hover'] = "Upload a DDI file";
-$lang['import_ddi'] = "Import DDI";
-$lang['import_ddi_hover'] = "Import multiple DDI files";
-
-//fields
-$lang['survey_id'] = "Survey ID";
-$lang['producer'] = "Producer";
-$lang['sponsor'] = "Sponsor";
-$lang['repository'] = "Repository";
-$lang['ref_no'] = "Reference No.";
-$lang['country'] = "Country";
-$lang['primary_investigator'] = "Primary Investigator";
-$lang['metadata_by'] = "Metadata By";
-$lang['folder'] = "Folder";
-
-$lang['file_manager'] = "File Manager";
-$lang['resource_manager'] = "Resource Manager";
-$lang['browse_metadata'] = "Browse Metadata";
-$lang['share_ddi_w_harvester'] = "Share DDI with Harvester?";
-
-//upload ddi
-$lang['msg_select_ddi'] = "Select a DDI xml file:";
-$lang['ddi_overwrite_exist'] = "Overwrite if the study already exists?";
-
-//import ddi
-$lang['ddi_import_processing'] = "Please wait while the file is being imported...";
-$lang['batch_import_title'] = "Batch Import DDIs";
-$lang['import_ddi_no_files_found'] = "No DDI files were found in the import folder [%s]. To import files, first copy them to a folder that is accessible to the application.";
-$lang['import_ddi_files_found'] ="%s files were found in the import folder. Select the files you want to import and click on the Import button to proceed.";
-$lang['btn_import'] = "Import";
-$lang['cancel_import_process'] = "Click here to cancel the import process";
-$lang['import_cancelled'] = "Import cancelled!";
-$lang['import_completed'] = "Import completed!";
-
-//links/edit
-$lang['indicator_database'] = "Indicator database";
-$lang['study_website'] = "Study website";
-
-
-/* End of file menu_lang.php */
+<?php
+$lang['catalog_maintenance'] = "Catalog Maintenance";
+$lang['upload_ddi'] = "Upload DDI";
+$lang['upload_ddi_hover'] = "Upload a DDI file";
+$lang['import_ddi'] = "Import DDI";
+$lang['import_ddi_hover'] = "Import multiple DDI files";
+
+//fields
+$lang['survey_id'] = "Survey ID";
+$lang['producer'] = "Producer";
+$lang['sponsor'] = "Sponsor";
+$lang['repository'] = "Repository";
+$lang['ref_no'] = "Reference No.";
+$lang['country'] = "Country";
+$lang['primary_investigator'] = "Primary Investigator";
+$lang['metadata_by'] = "Metadata By";
+$lang['folder'] = "Folder";
+
+$lang['file_manager'] = "File Manager";
+$lang['resource_manager'] = "Resource Manager";
+$lang['browse_metadata'] = "Browse Metadata";
+$lang['share_ddi_w_harvester'] = "Share DDI with Harvester?";
+
+//upload ddi
+$lang['msg_select_ddi'] = "Select a DDI xml file:";
+$lang['ddi_overwrite_exist'] = "Overwrite if the study already exists?";
+
+//import ddi
+$lang['ddi_import_processing'] = "Please wait while the file is being imported...";
+$lang['batch_import_title'] = "Batch Import DDIs";
+$lang['import_ddi_no_files_found'] = "No DDI files were found in the import folder [%s]. To import files, first copy them to a folder that is accessible to the application.";
+$lang['import_ddi_files_found'] ="%s files were found in the import folder. Select the files you want to import and click on the Import button to proceed.";
+$lang['btn_import'] = "Import";
+$lang['cancel_import_process'] = "Click here to cancel the import process";
+$lang['import_cancelled'] = "Import cancelled!";
+$lang['import_completed'] = "Import completed!";
+
+//links/edit
+$lang['indicator_database'] = "Indicator database";
+$lang['study_website'] = "Study website";
+
+
+/* End of file menu_lang.php */
 /* Location: ./system/language/urdu/menu_lang.php */
\ No newline at end of file
diff --git a/application/language/arabic/fields_document_lang.php b/application/language/arabic/fields_document_lang.php
new file mode 100644
index 000000000..d6bcb1748
--- /dev/null
+++ b/application/language/arabic/fields_document_lang.php
@@ -0,0 +1,161 @@
+<?php 
+$lang['identification']="معرّف/محدد";
+$lang['authors']="معلومات التأليف";
+$lang['themes_topics']="المواضيع";
+$lang['lda_topics']="مواضيع LDA";
+$lang['lda_topics_score']="مواضيع LDA";
+$lang['lda_model']="نموذج LDA";
+$lang['copyrights']="إخلاء المسؤولية وحقوق التأليف والنشر";
+$lang['additional']="معلومات إضافية";
+$lang['metadata_production']="إنتاج البيانات الوصفية";
+$lang['series']="سلسلة زمنية";
+$lang['metadata.resources']="تنزيلات";
+$lang['metadata.metadata_information']="وثيقة معلومات البيانات الوصفية";
+$lang['metadata.metadata_information.title']="عنوان الوثيقة";
+$lang['metadata.metadata_information.idno']="رقم معرّف فريد للوثيقة";
+$lang['metadata.metadata_information.producers']="المنتجون";
+$lang['metadata.metadata_information.producers.name']="الإسم";
+$lang['metadata.metadata_information.producers.abbr']="الإختصار";
+$lang['metadata.metadata_information.producers.affiliation']="التبعية";
+$lang['metadata.metadata_information.producers.role']="الدور";
+$lang['metadata.metadata_information.production_date']="تاريخ الإنتاج";
+$lang['metadata.metadata_information.version']="إصدار/نسخة الوثيقة";
+$lang['metadata.document_description']="وصف الوثيقة";
+$lang['metadata.document_description.title_statement.idno']="معرّف المستخدم الفريد ID";
+$lang['metadata.document_description.title_statement.title']="العنوان";
+$lang['metadata.document_description.title_statement.sub_title']="العنوان الفرعي";
+$lang['metadata.document_description.title_statement.alternate_title']="الإختصار";
+$lang['metadata.document_description.title_statement.abbreviated_title']="عنوان مختصر";
+$lang['metadata.document_description.type']="نوع المورد";
+$lang['metadata.document_description.status']="الحالة";
+$lang['metadata.document_description.description']="الوصف";
+$lang['metadata.document_description.toc']="جدول المحتويات";
+$lang['metadata.document_description.toc_structured']="جدول المحتويات";
+$lang['metadata.document_description.toc_structured.id']="المعرّف أو الرقم";
+$lang['metadata.document_description.toc_structured.parent_id']="المعرف الأب";
+$lang['metadata.document_description.toc_structured.name']="العنوان";
+$lang['metadata.document_description.abstract']="الملخص";
+$lang['metadata.document_description.notes']="ملاحظات";
+$lang['metadata.document_description.notes.note']="ملاحظة";
+$lang['metadata.document_description.scope']="المجال";
+$lang['metadata.document_description.ref_country']="بلد المرجع";
+$lang['metadata.document_description.ref_country.name']="إسم البلد";
+$lang['metadata.document_description.ref_country.code']="رقم/كود البلد";
+$lang['metadata.document_description.spatial_coverage']="التغطية المكانية";
+$lang['metadata.document_description.temporal_coverage']="التغطية الزمنية";
+$lang['metadata.document_description.date_created']="تاريخ الإنشاء";
+$lang['metadata.document_description.date_available']="تاريخ التوفير";
+$lang['metadata.document_description.date_modified']="تاريخ آخر تعديل";
+$lang['metadata.document_description.date_published']="تاريخ النشر";
+$lang['metadata.document_description.id_numbers']="أرقام المعرّف";
+$lang['metadata.document_description.id_numbers.type']="النوع";
+$lang['metadata.document_description.id_numbers.value']="رقم المعرف";
+$lang['metadata.document_description.publication_frequency']="تردد النشر";
+$lang['metadata.document_description.languages']="اللغة";
+$lang['metadata.document_description.languages.name']="الإسم";
+$lang['metadata.document_description.languages.code']="الرمز/الكود";
+$lang['metadata.document_description.license']="الرخصة";
+$lang['metadata.document_description.license.name']="إسم الرخصة";
+$lang['metadata.document_description.license.uri']="عنوان الويب URI";
+$lang['metadata.document_description.bibliographic_citation']="الاقتباس الببليوغرافي";
+$lang['metadata.document_description.chapter']="رقم الفصل/الوحدة";
+$lang['metadata.document_description.edition']="طبعة/إصدار";
+$lang['metadata.document_description.institution']="مؤسسة";
+$lang['metadata.document_description.journal']="اسم المجلة";
+$lang['metadata.document_description.volume']="رقم المجلد";
+$lang['metadata.document_description.issue']="رقم الإصدار";
+$lang['metadata.document_description.pages']="أرقام الصفحات";
+$lang['metadata.document_description.series']="اسم السلسلة";
+$lang['metadata.document_description.creator']="المنشئ";
+$lang['metadata.document_description.authors']="المؤلفون";
+$lang['metadata.document_description.authors.first_name']="الإسم الأول";
+$lang['metadata.document_description.authors.initial']="الحرف الأول من إسم الأب";
+$lang['metadata.document_description.authors.last_name']="إسم العائلة/اللقب";
+$lang['metadata.document_description.authors.affiliation']="التبعية";
+$lang['metadata.document_description.editors']="المحررين";
+$lang['metadata.document_description.editors.first_name']="الإسم الأول";
+$lang['metadata.document_description.editors.initial']="الحرف الأول من إسم الأب";
+$lang['metadata.document_description.editors.last_name']="إسم العائلة/اللقب";
+$lang['metadata.document_description.editors.affiliation']="التبعية";
+$lang['metadata.document_description.translators']="المترجمين";
+$lang['metadata.document_description.translators.first_name']="الإسم الأول";
+$lang['metadata.document_description.translators.initial']="الحرف الأول من إسم الأب";
+$lang['metadata.document_description.translators.last_name']="إسم العائلة/اللقب";
+$lang['metadata.document_description.translators.affiliation']="التبعية";
+$lang['metadata.document_description.contributors']="المساهمون";
+$lang['metadata.document_description.contributors.first_name']="الإسم الأول";
+$lang['metadata.document_description.contributors.initial']="الحرف الأول من إسم الأب";
+$lang['metadata.document_description.contributors.last_name']="إسم العائلة/اللقب";
+$lang['metadata.document_description.contributors.affiliation']="التبعية";
+$lang['metadata.document_description.publisher']="الناشر";
+$lang['metadata.document_description.publisher_address']="عنوان الناشر";
+$lang['metadata.document_description.rights']="حقوق";
+$lang['metadata.document_description.copyright']="حقوق النشر";
+$lang['metadata.document_description.usage_terms']="الشروط التي تحكم الاستخدام والاستنساخ";
+$lang['metadata.document_description.security_classification']="مراقبة تصنيف الأمان";
+$lang['metadata.document_description.access_restrictions']="قيود على الوصول";
+$lang['metadata.document_description.sources']="مصادر";
+$lang['metadata.document_description.sources.data_source']="مصادر البيانات";
+$lang['metadata.document_description.sources.source_origin']="أصل المصدر";
+$lang['metadata.document_description.sources.source_char']="خصائص ملاحظات المصدر";
+$lang['metadata.document_description.sources.source_doc']="وثائق المصدر";
+$lang['metadata.document_description.keywords']="كلمات مفتاحية/رئيسية";
+$lang['metadata.document_description.keywords.name']="الإسم";
+$lang['metadata.document_description.keywords.vocabulary']="إسم المفردات";
+$lang['metadata.document_description.keywords.uri']="رابط ويب URL المفردات";
+$lang['metadata.document_description.themes']="المواضيع";
+$lang['metadata.document_description.themes.name']="الإسم";
+$lang['metadata.document_description.themes.vocabulary']="اسم المفردات";
+$lang['metadata.document_description.themes.uri']="رابط ويب URL المفردات";
+$lang['metadata.document_description.topics']="المواضيع";
+$lang['metadata.document_description.topics.id']="معرّف فريد";
+$lang['metadata.document_description.topics.name']="موضوع";
+$lang['metadata.document_description.topics.parent_id']="معرف الموضوع الأصلي";
+$lang['metadata.document_description.topics.vocabulary']="المفردات";
+$lang['metadata.document_description.topics.uri']="رابط ويب URL المفردات";
+$lang['metadata.document_description.disciplines']="قواعد/ضوابط";
+$lang['metadata.document_description.disciplines.name']="عنوان أو إسم القاعدة/الضابط";
+$lang['metadata.document_description.disciplines.vocabulary']="المفردات";
+$lang['metadata.document_description.disciplines.uri']="رابط URI";
+$lang['metadata.document_description.audience']="جمهور";
+$lang['metadata.document_description.location']="الموقع (المواقع)";
+$lang['metadata.document_description.location.name']="الإسم";
+$lang['metadata.document_description.location.uri']="رابط URI";
+$lang['metadata.document_description.mandate']="جمهور";
+$lang['metadata.document_description.pricing']="التسعير";
+$lang['metadata.document_description.relations']="علاقات بالوثيقة";
+$lang['metadata.document_description.relations.name']="الإسم";
+$lang['metadata.document_description.relations.type']="النوع";
+$lang['metadata.document_description.tags']="علامات Tags";
+$lang['metadata.document_description.tags.tag']="علامة Tag";
+$lang['metadata.document_description.lda_topics']="موضوعات LDA";
+$lang['metadata.document_description.lda_topics.model_info']="معلومات النموذج";
+$lang['metadata.document_description.lda_topics.model_info.source']="المصدر";
+$lang['lda_model.author']="المؤلف";
+$lang['lda_model.version']="إصدار/نسخة";
+$lang['lda_model.model_id']="معرف النموذج";
+$lang['lda_model.nb_topics']="عدد المواضيع";
+$lang['lda_model.description']="الوصف";
+$lang['lda_model.corpus']="اسم المجموعة";
+$lang['lda_model.uri']="رابط URI";
+$lang['metadata.document_description.lda_topics.topic_description']="معلومات الموضوع";
+$lang['metadata.document_description.lda_topics.topic_description.topic_id']="معرّف الموضوع";
+$lang['metadata.document_description.lda_topics.topic_description.topic_score']="مجال الموضوع";
+$lang['metadata.document_description.lda_topics.topic_description.topic_label']="تسمية الموضوع";
+$lang['metadata.document_description.lda_topics.topic_description.topic_words']="كلمات الموضوع";
+$lang['metadata.document_description.lda_topics.topic_description.topic_words.word']="كلمة";
+$lang['reproducibility']="قابلية اعادة الإنتاج";
+$lang['metadata.document_description.reproducibility.statement']="قابلية اعادة الإنتاج";
+$lang['metadata.document_description.reproducibility.links']="روابط";
+$lang['metadata.document_description.reproducibility.links.uri']="رابط";
+$lang['metadata.document_description.reproducibility.links.description']="الوصف";
+$lang['metadata.files']="ملفات";
+$lang['metadata.files.file_uri']="ملف";
+$lang['metadata.files.format']="صيغة الملف";
+$lang['metadata.files.note']="ملاحظات";
+$lang['metadata.tags']="علامات Tags";
+$lang['metadata.tags.tag']="علامة Tag";
+
+
+/* End of file fields_document */
+/* Location: ./application/language/arabic/fields_document */
\ No newline at end of file
diff --git a/application/language/arabic/fields_image_lang.php b/application/language/arabic/fields_image_lang.php
new file mode 100644
index 000000000..8600fbc16
--- /dev/null
+++ b/application/language/arabic/fields_image_lang.php
@@ -0,0 +1,169 @@
+<?php 
+$lang['metadata.metadata_information']="معلومات البيانات الوصفية للوثيقة";
+$lang['metadata.metadata_information.title']="عنوان الوثيقة";
+$lang['metadata.metadata_information.idno']="رقم معرف فريد للوثيقة";
+$lang['metadata.metadata_information.producers']="المنتجون";
+$lang['metadata.metadata_information.producers.name']="الإسم";
+$lang['metadata.metadata_information.producers.abbr']="الإختصار";
+$lang['metadata.metadata_information.producers.affiliation']="التبعية";
+$lang['metadata.metadata_information.producers.role']="الدور";
+$lang['metadata.metadata_information.production_date']="تاريخ الإنتاج";
+$lang['metadata.metadata_information.version']="نسخة/إصدار الوثيقة";
+$lang['metadata.image_description']="وصف الصورة";
+$lang['metadata.image_description.iptc.mediafragment']="جزء من الوسائط";
+$lang['metadata.image_description.iptc.mediafragment.uri']="رابط  URI";
+$lang['metadata.image_description.iptc.mediafragment.delimitertype']="نوع المحدد";
+$lang['metadata.image_description.iptc.mediafragment.description']="الوصف";
+$lang['metadata.image_description.iptc.photoVideoMetadataIPTC']="البيانات الوصفية لمعيار IPTC";
+$lang['metadata.image_description.iptc.photoVideoMetadataIPTC.aboutCvTerms']="حول الصورة";
+$lang['metadata.image_description.iptc.photoVideoMetadataIPTC.aboutCvTerms.cvId']="الرقم المعرّف";
+$lang['metadata.image_description.iptc.photoVideoMetadataIPTC.aboutCvTerms.cvTermName']="اسم المصطلح";
+$lang['metadata.image_description.iptc.photoVideoMetadataIPTC.aboutCvTerms.cvTermId']="معرّف المصطلح";
+$lang['metadata.image_description.iptc.photoVideoMetadataIPTC.aboutCvTerms.cvTermRefinedAbout']="مصقول &quot;حول&quot; علاقة السيرة الذاتية";
+$lang['metadata.image_description.iptc.photoVideoMetadataIPTC.additionalModelInfo']="معلومات نموذج إضافية";
+$lang['metadata.image_description.iptc.photoVideoMetadataIPTC.artworkOrObjects']="عمل فني أو كائن في الصورة";
+$lang['metadata.image_description.iptc.photoVideoMetadataIPTC.artworkOrObjects.circaDateCreated']="تاريخ الإنشاء";
+$lang['metadata.image_description.iptc.photoVideoMetadataIPTC.artworkOrObjects.contentDescription']="وصف المحتوى";
+$lang['metadata.image_description.iptc.photoVideoMetadataIPTC.artworkOrObjects.contributionDescription']="وصف المساهمة";
+$lang['metadata.image_description.iptc.photoVideoMetadataIPTC.artworkOrObjects.copyrightNotice']="حقوق التأليف";
+$lang['metadata.image_description.iptc.photoVideoMetadataIPTC.artworkOrObjects.creatorIdentifiers']="معرّف/رقم المنشئ";
+$lang['metadata.image_description.iptc.photoVideoMetadataIPTC.artworkOrObjects.creatorNames']="المنشئ";
+$lang['metadata.image_description.iptc.photoVideoMetadataIPTC.artworkOrObjects.currentCopyrightOwnerIdentifier']="معرّف مالك حقوق الطبع والنشر الحالي";
+$lang['metadata.image_description.iptc.photoVideoMetadataIPTC.artworkOrObjects.currentCopyrightOwnerName']="اسم مالك حقوق الطبع والنشر الحالي";
+$lang['metadata.image_description.iptc.photoVideoMetadataIPTC.artworkOrObjects.currentLicensorIdentifier']="معرف المُرخص الحالي";
+$lang['metadata.image_description.iptc.photoVideoMetadataIPTC.artworkOrObjects.currentLicensorName']="اسم المُرخص الحالي";
+$lang['metadata.image_description.iptc.photoVideoMetadataIPTC.artworkOrObjects.dateCreated']="تاريخ الإنشاء";
+$lang['metadata.image_description.iptc.photoVideoMetadataIPTC.artworkOrObjects.physicalDescription']="الوصف المادي";
+$lang['metadata.image_description.iptc.photoVideoMetadataIPTC.artworkOrObjects.source']="المصدر";
+$lang['metadata.image_description.iptc.photoVideoMetadataIPTC.artworkOrObjects.sourceInventoryNr']="رقم جرد المصدر";
+$lang['metadata.image_description.iptc.photoVideoMetadataIPTC.artworkOrObjects.sourceInventoryUrl']="رابط URL جرد المصدر";
+$lang['metadata.image_description.iptc.photoVideoMetadataIPTC.artworkOrObjects.stylePeriod']="فترة النمط";
+$lang['metadata.image_description.iptc.photoVideoMetadataIPTC.artworkOrObjects.title']="العنوان";
+$lang['metadata.image_description.iptc.photoVideoMetadataIPTC.captionWriter']="كاتب الوصف";
+$lang['metadata.image_description.iptc.photoVideoMetadataIPTC.cityName']="مدينة ";
+$lang['metadata.image_description.iptc.photoVideoMetadataIPTC.copyrightNotice']="ملاحظات حقوق التأليف";
+$lang['metadata.image_description.iptc.photoVideoMetadataIPTC.copyrightOwners']="مالك حقوق النشر";
+$lang['metadata.image_description.iptc.photoVideoMetadataIPTC.copyrightOwners.name']="الإسم";
+$lang['metadata.image_description.iptc.photoVideoMetadataIPTC.copyrightOwners.role']="الدور";
+$lang['metadata.image_description.iptc.photoVideoMetadataIPTC.copyrightOwners.identifiers']="المحدد/المعرّف";
+$lang['metadata.image_description.iptc.photoVideoMetadataIPTC.countryCode']="رمز البلد (قديم)";
+$lang['metadata.image_description.iptc.photoVideoMetadataIPTC.countryName']="البلد";
+$lang['metadata.image_description.iptc.photoVideoMetadataIPTC.creatorContactInfo']="معلومات الاتصال بالمنشئ";
+$lang['metadata.image_description.iptc.photoVideoMetadataIPTC.creatorContactInfo.country']="البلد";
+$lang['metadata.image_description.iptc.photoVideoMetadataIPTC.creatorContactInfo.emailwork']="عناوين البريد الإلكتروني)";
+$lang['metadata.image_description.iptc.photoVideoMetadataIPTC.creatorContactInfo.region']="الولاية / المقاطعة";
+$lang['metadata.image_description.iptc.photoVideoMetadataIPTC.creatorContactInfo.phonework']="أرقام الهواتف";
+$lang['metadata.image_description.iptc.photoVideoMetadataIPTC.creatorContactInfo.weburlwork']="عنوان (عناوين) الويب URL";
+$lang['metadata.image_description.iptc.photoVideoMetadataIPTC.creatorContactInfo.address']="العنوان";
+$lang['metadata.image_description.iptc.photoVideoMetadataIPTC.creatorContactInfo.city']="المدينة";
+$lang['metadata.image_description.iptc.photoVideoMetadataIPTC.creatorContactInfo.postalCode']="رمز بريدي";
+$lang['metadata.image_description.iptc.photoVideoMetadataIPTC.creatorNames']="المنشئ";
+$lang['metadata.image_description.iptc.photoVideoMetadataIPTC.creditLine']="خط ائتمان";
+$lang['metadata.image_description.iptc.photoVideoMetadataIPTC.dateCreated']="تاريخ الإنشاء";
+$lang['metadata.image_description.iptc.photoVideoMetadataIPTC.description']="الوصف";
+$lang['metadata.image_description.iptc.photoVideoMetadataIPTC.digitalImageGuid']="GUID الصورة الرقمية ";
+$lang['metadata.image_description.iptc.photoVideoMetadataIPTC.digitalSourceType']="نوع المصدر الرقمي";
+$lang['metadata.image_description.iptc.photoVideoMetadataIPTC.embdEncRightsExpr']="التعبير عن الحقوق المشفرة";
+$lang['metadata.image_description.iptc.photoVideoMetadataIPTC.embdEncRightsExpr.encRightsExpr']="تعبير الحقوق المشفرة";
+$lang['metadata.image_description.iptc.photoVideoMetadataIPTC.embdEncRightsExpr.rightsExprEncType']="نوع التشفير";
+$lang['metadata.image_description.iptc.photoVideoMetadataIPTC.embdEncRightsExpr.rightsExprLangId']="معرف لغة التعبير عن الحقوق";
+$lang['metadata.image_description.iptc.photoVideoMetadataIPTC.eventName']="حدث";
+$lang['metadata.image_description.iptc.photoVideoMetadataIPTC.genres']="النوع";
+$lang['metadata.image_description.iptc.photoVideoMetadataIPTC.genres.cvId']="معرّف السيرة الذاتية لمصطلح السيرة الذاتية";
+$lang['metadata.image_description.iptc.photoVideoMetadataIPTC.genres.cvTermName']="اسم مصطلح السيرة الذاتية";
+$lang['metadata.image_description.iptc.photoVideoMetadataIPTC.genres.cvTermId']="معرف مصطلح السيرة الذاتية";
+$lang['metadata.image_description.iptc.photoVideoMetadataIPTC.genres.cvTermRefinedAbout']="مصقول &quot;حول&quot; علاقة السيرة الذاتية";
+$lang['metadata.image_description.iptc.photoVideoMetadataIPTC.headline']="عنوان رئيسي";
+$lang['metadata.image_description.iptc.photoVideoMetadataIPTC.imageRating']="تقييم الصورة";
+$lang['metadata.image_description.iptc.photoVideoMetadataIPTC.imageSupplierImageId']="معرف مورد الصورة";
+$lang['metadata.image_description.iptc.photoVideoMetadataIPTC.instructions']="تعليمات";
+$lang['metadata.image_description.iptc.photoVideoMetadataIPTC.intellectualGenre']="النوع الفكري";
+$lang['metadata.image_description.iptc.photoVideoMetadataIPTC.jobid']="رقم/معرّف  الوظيفة";
+$lang['metadata.image_description.iptc.photoVideoMetadataIPTC.jobtitle']="المسمى الوظيفي للمنشئ";
+$lang['metadata.image_description.iptc.photoVideoMetadataIPTC.keywords']="كلمات مفتاحية";
+$lang['metadata.image_description.iptc.photoVideoMetadataIPTC.linkedEncRightsExpr']="تعبير الحقوق المشفر المرتبط";
+$lang['metadata.image_description.iptc.photoVideoMetadataIPTC.linkedEncRightsExpr.linkedRightsExpr']="رابط إلى تعبير الحقوق المشفر";
+$lang['metadata.image_description.iptc.photoVideoMetadataIPTC.linkedEncRightsExpr.rightsExprEncType']="نوع التشفير";
+$lang['metadata.image_description.iptc.photoVideoMetadataIPTC.linkedEncRightsExpr.rightsExprLangId']="معرّف لغة التعبير عن الحقوق";
+$lang['metadata.image_description.iptc.photoVideoMetadataIPTC.locationsShown']="إنشاء الموقع";
+$lang['metadata.image_description.iptc.photoVideoMetadataIPTC.locationsShown.city']="إسم المدينة";
+$lang['metadata.image_description.iptc.photoVideoMetadataIPTC.locationsShown.countryCode']="رمز ISO البلد";
+$lang['metadata.image_description.iptc.photoVideoMetadataIPTC.locationsShown.countryName']="إسم البلد";
+$lang['metadata.image_description.iptc.photoVideoMetadataIPTC.locationsShown.gpsAltitude']="ارتفاع نظام تحديد المواقع العالمي GPS";
+$lang['metadata.image_description.iptc.photoVideoMetadataIPTC.locationsShown.gpsLatitude']="خط العرض GPS";
+$lang['metadata.image_description.iptc.photoVideoMetadataIPTC.locationsShown.gpsLongitude']="خط الطول GPS";
+$lang['metadata.image_description.iptc.photoVideoMetadataIPTC.locationsShown.identifiers']="المعرّف";
+$lang['metadata.image_description.iptc.photoVideoMetadataIPTC.locationsShown.name']="الإسم";
+$lang['metadata.image_description.iptc.photoVideoMetadataIPTC.locationsShown.provinceState']="اسم الولاية / المقاطعة";
+$lang['metadata.image_description.iptc.photoVideoMetadataIPTC.locationsShown.sublocation']="اسم الموقع الفرعي";
+$lang['metadata.image_description.iptc.photoVideoMetadataIPTC.locationsShown.worldRegion']="اسم المنطقة العالمية";
+$lang['metadata.image_description.iptc.photoVideoMetadataIPTC.maxAvailHeight']="أقصى ارتفاع متاح";
+$lang['metadata.image_description.iptc.photoVideoMetadataIPTC.maxAvailWidth']="العرض الأقصى المتاح";
+$lang['metadata.image_description.iptc.photoVideoMetadataIPTC.minorModelAgeDisclosure']="الإفصاح عن سن النموذج الصغرى";
+$lang['metadata.image_description.iptc.photoVideoMetadataIPTC.modelAges']="عمر النموذج";
+$lang['metadata.image_description.iptc.photoVideoMetadataIPTC.modelReleaseDocuments']="معرف إصدار النموذج";
+$lang['metadata.image_description.iptc.photoVideoMetadataIPTC.modelReleaseStatus']="حالة إصدار النموذج";
+$lang['metadata.image_description.iptc.photoVideoMetadataIPTC.modelReleaseStatus.cvId']="معرّف السيرة الذاتية لمصطلح السيرة الذاتية";
+$lang['metadata.image_description.iptc.photoVideoMetadataIPTC.modelReleaseStatus.cvTermName']="اسم مصطلح السيرة الذاتية";
+$lang['metadata.image_description.iptc.photoVideoMetadataIPTC.modelReleaseStatus.cvTermId']="معرف مصطلح السيرة الذاتية";
+$lang['metadata.image_description.iptc.photoVideoMetadataIPTC.modelReleaseStatus.cvTermRefinedAbout']="مصقول &quot;حول&quot; علاقة السيرة الذاتية";
+$lang['metadata.image_description.iptc.photoVideoMetadataIPTC.organisationInImageCodes']="كود التنظيم الوارد في الصورة";
+$lang['metadata.image_description.iptc.photoVideoMetadataIPTC.organisationInImageNames']="اسم المنظمة الوارد في الصورة";
+$lang['metadata.image_description.iptc.photoVideoMetadataIPTC.personInImageNames']="الشخص الظاهر في الصورة";
+$lang['metadata.image_description.iptc.photoVideoMetadataIPTC.personsShown']="الشخص الظاهر في الصورة بالتفاصيل";
+$lang['metadata.image_description.iptc.photoVideoMetadataIPTC.personsShown.name']="الإسم";
+$lang['metadata.image_description.iptc.photoVideoMetadataIPTC.personsShown.description']="الوصف";
+$lang['metadata.image_description.iptc.photoVideoMetadataIPTC.personsShown.identifiers']="المحدد/المعرّف";
+$lang['metadata.image_description.iptc.photoVideoMetadataIPTC.personsShown.characteristics']="خصائص";
+$lang['metadata.image_description.iptc.photoVideoMetadataIPTC.personsShown.characteristics.cvId']="معرّف السيرة الذاتية لمصطلح السيرة الذاتية";
+$lang['metadata.image_description.iptc.photoVideoMetadataIPTC.personsShown.characteristics.cvTermName']="اسم مصطلح السيرة الذاتية";
+$lang['metadata.image_description.iptc.photoVideoMetadataIPTC.personsShown.characteristics.cvTermId']="معرف مصطلح السيرة الذاتية";
+$lang['metadata.image_description.iptc.photoVideoMetadataIPTC.personsShown.characteristics.cvTermRefinedAbout']="مصقول &quot;حول&quot; علاقة السيرة الذاتية";
+$lang['metadata.image_description.iptc.photoVideoMetadataIPTC.productsShown']="المنتج الظاهر في الصورة";
+$lang['metadata.image_description.iptc.photoVideoMetadataIPTC.productsShown.description']="الوصف";
+$lang['metadata.image_description.iptc.photoVideoMetadataIPTC.productsShown.gtin']="GTIN
+";
+$lang['metadata.image_description.iptc.photoVideoMetadataIPTC.productsShown.name']="اسم {تفاصيل المنتج}";
+$lang['metadata.image_description.iptc.photoVideoMetadataIPTC.propertyReleaseDocuments']="معرّف إصدار الملكية";
+$lang['metadata.image_description.iptc.photoVideoMetadataIPTC.propertyReleaseStatus']="حالة الإفراج عن الملكية";
+$lang['metadata.image_description.iptc.photoVideoMetadataIPTC.propertyReleaseStatus.cvId']="CV-Term CV ID
+";
+$lang['metadata.image_description.iptc.photoVideoMetadataIPTC.propertyReleaseStatus.cvTermName']="إسم CV-Term";
+$lang['metadata.image_description.iptc.photoVideoMetadataIPTC.propertyReleaseStatus.cvTermId']="محدد CV-Term";
+$lang['metadata.image_description.iptc.photoVideoMetadataIPTC.propertyReleaseStatus.cvTermRefinedAbout']="مصقول &quot;حول&quot; علاقة السيرة الذاتية";
+$lang['metadata.image_description.iptc.photoVideoMetadataIPTC.provinceStatePhoto']="المقاطعة أو الولاية ";
+$lang['metadata.image_description.iptc.photoVideoMetadataIPTC.registryEntries']="إدخال سجل الصورة";
+$lang['metadata.image_description.iptc.photoVideoMetadataIPTC.registryEntries.role']="الدور";
+$lang['metadata.image_description.iptc.photoVideoMetadataIPTC.registryEntries.assetIdentifier']="معرّف الأصول";
+$lang['metadata.image_description.iptc.photoVideoMetadataIPTC.registryEntries.registryIdentifier']="معرّف التسجيل";
+$lang['metadata.image_description.iptc.photoVideoMetadataIPTC.sceneCodes']="كود المشهد";
+$lang['metadata.image_description.iptc.photoVideoMetadataIPTC.source']="المصدر";
+$lang['metadata.image_description.iptc.photoVideoMetadataIPTC.subjectCodes']="كود الموضوع";
+$lang['metadata.image_description.iptc.photoVideoMetadataIPTC.sublocationName']="موقع فرعي ";
+$lang['metadata.image_description.iptc.photoVideoMetadataIPTC.supplier']="مزود الصورة";
+$lang['metadata.image_description.iptc.photoVideoMetadataIPTC.supplier.name']="الإسم";
+$lang['metadata.image_description.iptc.photoVideoMetadataIPTC.supplier.identifiers']="المعرّف";
+$lang['metadata.image_description.iptc.photoVideoMetadataIPTC.title']="العنوان";
+$lang['metadata.image_description.iptc.photoVideoMetadataIPTC.usageTerms']="شروط استخدام الحقوق";
+$lang['metadata.image_description.iptc.photoVideoMetadataIPTC.webstatementRights']="حقوق بيان الويب";
+$lang['metadata.image_description.files']="ملفات";
+$lang['metadata.image_description.files.format']="صيغة الملف";
+$lang['metadata.image_description.files.note']="ملاحظات";
+$lang['metadata.image_description.files.file_uri']="ملف";
+$lang['metadata.image_description.files.show']="عرض";
+$lang['metadata.image_description.album']="ألبومات";
+$lang['metadata.image_description.album.name']="الإسم";
+$lang['metadata.image_description.album.description']="الوصف";
+$lang['metadata.image_description.album.owner']="المالك";
+$lang['metadata.image_description.album.uri']="رابط URI";
+$lang['files']="ملفات";
+$lang['album']="ألبومات";
+$lang['image_description']="وصف الصورة";
+$lang['metadata_production']="إنتاج البيانات الوصفية";
+$lang['identification']="محدد/معرّف";
+$lang['metadata.image_description.tags']="علامات Tags";
+$lang['metadata.image_description.tags.tag']="علامة Tag";
+
+
+/* End of file fields_image */
+/* Location: ./application/language/arabic/fields_image */
\ No newline at end of file
diff --git a/application/language/arabic/fields_scripts_lang.php b/application/language/arabic/fields_scripts_lang.php
new file mode 100644
index 000000000..45fbebea0
--- /dev/null
+++ b/application/language/arabic/fields_scripts_lang.php
@@ -0,0 +1,179 @@
+<?php 
+$lang['identification']="المحدد/المعرّف";
+$lang['version']="إصدار/نسخة";
+$lang['scope']="مجال";
+$lang['coverage']="التغطية";
+$lang['producers_sponsors']="المنتجون والداعمون";
+$lang['methods']="أساليب/طرق";
+$lang['software']="البرمجيات";
+$lang['scripts']="سكريبتات/برامج نصية";
+$lang['data_access']="النفاذ/الوصول الى البيانات";
+$lang['disclaimer_copyright']="إخلاء المسؤولية وحقوق التأليف والنشر";
+$lang['metadata.doc_desc']="وصف الوثيقة";
+$lang['metadata.doc_desc.title']="عنوان الوثيقة";
+$lang['metadata.doc_desc.idno']="معرّف فريد";
+$lang['metadata.doc_desc.producers']="المنتجون";
+$lang['metadata.doc_desc.producers.name']="الإسم";
+$lang['metadata.doc_desc.producers.abbr']="الإختصار";
+$lang['metadata.doc_desc.producers.affiliation']="التبعية";
+$lang['metadata.doc_desc.producers.role']="الدور";
+$lang['metadata.doc_desc.prod_date']="تاريخ الإنتاج";
+$lang['metadata.doc_desc.version']="إصدار/نسخة الوثيقة";
+$lang['metadata.project_desc']="وصف المشروع";
+$lang['metadata.project_desc.title_statement.idno']="معرّف المستخدم الفريد";
+$lang['metadata.project_desc.title_statement.title']="العنوان";
+$lang['metadata.project_desc.title_statement.sub_title']="العنوان الفرعي";
+$lang['metadata.project_desc.title_statement.alternate_title']="الإختصار";
+$lang['metadata.project_desc.title_statement.translated_title']="عنوان مترجم";
+$lang['metadata.project_desc.production_date']="تاريخ الإنتاج";
+$lang['metadata.project_desc.geographic_units']="المواقع الجغرافية";
+$lang['metadata.project_desc.geographic_units.name']="الموقع";
+$lang['metadata.project_desc.geographic_units.code']="الكود/الرمز";
+$lang['metadata.project_desc.geographic_units.type']="النوع";
+$lang['metadata.project_desc.authoring_entity']="كيان التأليف";
+$lang['metadata.project_desc.authoring_entity.name']="اسم الوكالة";
+$lang['metadata.project_desc.authoring_entity.author_id']="رقم المؤلف";
+$lang['metadata.project_desc.authoring_entity.role']="الدور";
+$lang['metadata.project_desc.authoring_entity.affiliation']="التبعية";
+$lang['metadata.project_desc.authoring_entity.abbreviation']="الإختصار";
+$lang['metadata.project_desc.authoring_entity.email']="البريد الإلكتروني";
+$lang['metadata.project_desc.contributors']="المساهمون";
+$lang['metadata.project_desc.contributors.name']="اسم الوكالة";
+$lang['metadata.project_desc.contributors.role']="الدور";
+$lang['metadata.project_desc.contributors.affiliation']="التبعية";
+$lang['metadata.project_desc.contributors.abbreviation']="الإختصار";
+$lang['metadata.project_desc.contributors.email']="البريد الإلكتروني";
+$lang['metadata.project_desc.contributors.url']="رابط ويب URL";
+$lang['metadata.project_desc.curators']="الأمناء/الأوصياء ";
+$lang['metadata.project_desc.curators.name']="إسم الوكالة";
+$lang['metadata.project_desc.curators.role']="الدور";
+$lang['metadata.project_desc.curators.affiliation']="التبعية";
+$lang['metadata.project_desc.curators.abbreviation']="الإختصار";
+$lang['metadata.project_desc.curators.email']="البريد الإلكتروني";
+$lang['metadata.project_desc.curators.url']="رابط ويب URL";
+$lang['metadata.project_desc.abstract']="ملخص";
+$lang['metadata.project_desc.keywords']="كلمات مفتاحية";
+$lang['metadata.project_desc.keywords.name']="الإسم";
+$lang['metadata.project_desc.keywords.vocabulary']="اسم المفردات";
+$lang['metadata.project_desc.keywords.uri']="رابط ويب المفردات URI";
+$lang['metadata.project_desc.themes']="موضوعات";
+$lang['metadata.project_desc.themes.name']="الإسم";
+$lang['metadata.project_desc.themes.vocabulary']="إسم المفردات";
+$lang['metadata.project_desc.themes.uri']="رابط ويب المفردات URI";
+$lang['metadata.project_desc.topics']="المواضيع";
+$lang['metadata.project_desc.topics.id']="الرقم التعريفي";
+$lang['metadata.project_desc.topics.name']="موضوع";
+$lang['metadata.project_desc.topics.parent_id']="معرف الموضوع الأصلي";
+$lang['metadata.project_desc.topics.vocabulary']="مفردات";
+$lang['metadata.project_desc.topics.uri']="رابط ويب URI المفردات ";
+$lang['metadata.project_desc.disciplines']="السلوك/الضوابط";
+$lang['metadata.project_desc.disciplines.name']="عنوان الانضباط أو الاسم";
+$lang['metadata.project_desc.disciplines.vocabulary']="المفردات";
+$lang['metadata.project_desc.disciplines.uri']="رابط ويب URI";
+$lang['metadata.project_desc.output']="النتيجة";
+$lang['metadata.project_desc.output.type']="النوع";
+$lang['metadata.project_desc.output.title']="العنوان";
+$lang['metadata.project_desc.output.description']="الوصف";
+$lang['metadata.project_desc.output.uri']="رابط ويب URI";
+$lang['metadata.project_desc.output.doi']="معرف الكائن الرقمي DOI";
+$lang['metadata.project_desc.repository_uri']="مستودع الكود الأصلي  ";
+$lang['metadata.project_desc.repository_uri.name']="اسم المستودع";
+$lang['metadata.project_desc.repository_uri.type']="النوع";
+$lang['metadata.project_desc.repository_uri.uri']="رابط ويب URI";
+$lang['metadata.project_desc.project_website']="الموقع الإلكتروني للمشروع";
+$lang['metadata.project_desc.version_statement']="بيان الإصدار/النسخة";
+$lang['metadata.project_desc.version_statement.version']="اللإصدار/النسخة";
+$lang['metadata.project_desc.version_statement.version_date']="تاربخ اإصدار/النسخة";
+$lang['metadata.project_desc.version_statement.version_resp']="بيان مسؤولية الإصدار";
+$lang['metadata.project_desc.version_statement.version_notes']="ملاحظات الإصدار/النسخة";
+$lang['metadata.project_desc.language']="اللغة";
+$lang['metadata.project_desc.language.name']="الإسم";
+$lang['metadata.project_desc.language.code']="الكود/الرمز";
+$lang['metadata.project_desc.methods']="الأساليب أو الخوارزميات المطبقة";
+$lang['metadata.project_desc.methods.name']="إسم الوسيلة";
+$lang['metadata.project_desc.methods.note']="الوصف";
+$lang['metadata.project_desc.software']="البرمجية";
+$lang['metadata.project_desc.software.name']="الإسم";
+$lang['metadata.project_desc.software.version']="الإصدار/النسخة";
+$lang['metadata.project_desc.software.library']="المكتبات أو الحزم المستخدمة";
+$lang['metadata.project_desc.technology_environment']="البيئة التكنولوجية";
+$lang['metadata.project_desc.technology_requirements']="متطلبات تكنولوجية";
+$lang['metadata.project_desc.reproduction_instructions']="تعليمات الاستنساخ";
+$lang['metadata.project_desc.license']="الرخصة";
+$lang['metadata.project_desc.license.name']="الإسم";
+$lang['metadata.project_desc.license.uri']="رابط ويب URI";
+$lang['metadata.project_desc.review_process']="عملية الاستعراض";
+$lang['metadata.project_desc.review_process.submission_date']="تاريخ التقديم";
+$lang['metadata.project_desc.review_process.reviewer']="المراجع";
+$lang['metadata.project_desc.review_process.review_status']="حالة المراجعة";
+$lang['metadata.project_desc.review_process.approval_authority']="سلطة الموافقة";
+$lang['metadata.project_desc.review_process.approval_date']="تاريخ الموافقة";
+$lang['metadata.project_desc.disclaimer']="إخلاء مسؤولية";
+$lang['metadata.project_desc.confidentiality']="خصوصية/سرية";
+$lang['metadata.project_desc.citation_requirement']="متطلبات الاقتباس";
+$lang['metadata.project_desc.datasets']="مجموعات البيانات";
+$lang['metadata.project_desc.datasets.name']="إسم مجموعة البيانات";
+$lang['metadata.project_desc.datasets.idno']="رقم/معرّف مجموعة البيانات";
+$lang['metadata.project_desc.datasets.note']="الوصف";
+$lang['metadata.project_desc.datasets.access_type']="سياسة الوصول إلى البيانات";
+$lang['metadata.project_desc.datasets.uri']="رابط ويب URI";
+$lang['metadata.project_desc.sponsors']="الراعي / وكالة التمويل";
+$lang['metadata.project_desc.sponsors.name']="الإسم";
+$lang['metadata.project_desc.sponsors.abbr']="الإختصار";
+$lang['metadata.project_desc.sponsors.role']="الدور";
+$lang['metadata.project_desc.sponsors.grant_no']="رقم المنحة";
+$lang['metadata.project_desc.acknowledgements']="تعريفات / شكر وتقدير أخرى";
+$lang['metadata.project_desc.acknowledgements.name']="الإسم";
+$lang['metadata.project_desc.acknowledgements.affiliation']="التبعية";
+$lang['metadata.project_desc.acknowledgements.role']="الدور";
+$lang['metadata.project_desc.related_projects']="مشاريع ذات صلة";
+$lang['metadata.project_desc.related_projects.name']="الإسم";
+$lang['metadata.project_desc.related_projects.uri']="رابط ويب URI";
+$lang['metadata.project_desc.related_projects.note']="ملاحظة";
+$lang['metadata.project_desc.contacts']="جهات الإتصال";
+$lang['metadata.project_desc.contacts.name']="الإسم";
+$lang['metadata.project_desc.contacts.affiliation']="التبعية";
+$lang['metadata.project_desc.contacts.uri']="رابط ويب URI";
+$lang['metadata.project_desc.contacts.phone']="رقم الهاتف";
+$lang['metadata.project_desc.scripts']="سكريبتات/برامج نصية";
+$lang['metadata.project_desc.scripts.file_name']="إسم الملف";
+$lang['metadata.project_desc.scripts.zip_package']="أرشيف مضغوط";
+$lang['metadata.project_desc.scripts.title']="العنوان";
+$lang['metadata.project_desc.scripts.authors']="المؤلفون";
+$lang['metadata.project_desc.scripts.authors.name']="اسم الشخص أو المنظمة";
+$lang['metadata.project_desc.scripts.authors.abbr']="الإختصار";
+$lang['metadata.project_desc.scripts.authors.role']="الدور";
+$lang['metadata.project_desc.scripts.date']="التاريخ";
+$lang['metadata.project_desc.scripts.format']="الصيغة/التنسيق";
+$lang['metadata.project_desc.scripts.software']="البرمجية";
+$lang['metadata.project_desc.scripts.description']="الوصف";
+$lang['metadata.project_desc.scripts.methods']="الوسائل";
+$lang['metadata.project_desc.scripts.dependencies']="التبعيات";
+$lang['metadata.project_desc.scripts.instructions']="تعليمات لتشغيل البرنامج النصي/السكريبت";
+$lang['metadata.project_desc.scripts.source_code_repo']="مستودع الكود الأصلي";
+$lang['metadata.project_desc.scripts.notes']="ملاحظات";
+$lang['metadata.project_desc.repository_url']="مستودع الكود الأصلي  ";
+$lang['metadata.project_desc.repository_url.name']="الإسم";
+$lang['metadata.project_desc.repository_url.type']="النوع";
+$lang['metadata.project_desc.repository_url.uri']="رابط ويب URI";
+$lang['metadata.project_desc.data_desc']="وصف البيانات";
+$lang['metadata.project_desc.data_desc.name']="الإسم";
+$lang['metadata.project_desc.data_desc.access_type']="النفاذ/الوصول";
+$lang['metadata.project_desc.data_desc.license']="الرخصة";
+$lang['metadata.project_desc.data_desc.URI']="رابط ويب URI";
+$lang['metadata.project_desc.contact']="الإتصال";
+$lang['metadata.project_desc.contact.affiliation']="التبعية";
+$lang['metadata_production']="إنتاج البيانات الوصفية";
+$lang['language']="اللغة";
+$lang['related_projects']="مشاريع ذات صلة";
+$lang['contacts']="جهات الإتصال";
+$lang['process']="معالجة";
+$lang['metadata.project_desc.process.name']="الإسم";
+$lang['metadata.project_desc.process.date_start']="تاريخ البداية";
+$lang['metadata.project_desc.process.date_end']="تاريخ النهاية";
+$lang['metadata.project_desc.process.description']="الوصف";
+$lang['metadata.project_desc.tags']="علامات Tags";
+
+
+/* End of file fields_scripts */
+/* Location: ./application/language/arabic/fields_scripts */
\ No newline at end of file
diff --git a/application/language/arabic/fields_table_lang.php b/application/language/arabic/fields_table_lang.php
new file mode 100644
index 000000000..7a88cefbb
--- /dev/null
+++ b/application/language/arabic/fields_table_lang.php
@@ -0,0 +1,145 @@
+<?php 
+$lang['identification']="المعرّف/المحدد";
+$lang['version']="الإصدار/النسخة";
+$lang['coverage']="التغطية";
+$lang['disclaimer_copyright']="إخلاء المسؤولية وحقوق التأليف والنشر";
+$lang['additional']="معلومة اضافية";
+$lang['metadata_production']="إنتاج البيانات الوصفية";
+$lang['metadata.table_description.title_statement.title']="العنوان";
+$lang['metadata.table_description.title_statement.sub_title']="العنوان الفرعي";
+$lang['metadata.table_description.title_statement.alternate_title']="العنوان الفرعي";
+$lang['metadata.table_description.title_statement.translated_title']="عنوان مترجم";
+$lang['metadata.table_description.title_statement.idno']="الرقم";
+$lang['metadata.table_description.description']="الوصف";
+$lang['metadata.resources']="تنزيلات";
+$lang['metadata.table_description.id_numbers']="الأرقام المرجعية";
+$lang['metadata.table_description.id_numbers.type']="النوع";
+$lang['metadata.table_description.id_numbers.value']="الرقم المعرّف";
+$lang['metadata.table_description.date_created']="تاريخ الإنشاء";
+$lang['metadata.table_description.date_published']="تاريخ النشر";
+$lang['metadata.table_description.date_modified']="تاريخ آخر تعديل";
+$lang['metadata.table_description.version']="الإصدار/النسخة";
+$lang['metadata.table_description.ref_country']="البلدان";
+$lang['metadata.table_description.ref_country.country']="الإسم";
+$lang['metadata.table_description.ref_country.name']="الإسم";
+$lang['metadata.table_description.ref_country.code']="الكود/الرمز";
+$lang['metadata.table_description.format']="الصيغة/التنسيق";
+$lang['metadata.table_description.filename']="إسم الملف";
+$lang['metadata.table_description.sheetname']="اسم الورقة";
+$lang['metadata.table_description.table_series']="سلسلة";
+$lang['metadata.table_description.table_series.name']="الإسم";
+$lang['metadata.table_description.table_series.maintainer']="المشرف";
+$lang['metadata.table_description.table_series.uri']="رابط ويب URI";
+$lang['metadata.table_description.table_series.description']="الوصف";
+$lang['metadata.table_description.universe']="عالم الدراسة";
+$lang['metadata.table_description.data_sources']="مصادر البيانات";
+$lang['metadata.table_description.data_sources.source']="المصدر";
+$lang['metadata.table_description.time_periods']="فترات زمنية";
+$lang['metadata.table_description.time_periods.from']="سنة البدء";
+$lang['metadata.table_description.time_periods.to']="سنة النهاية";
+$lang['metadata.table_description.authoring_entity']="كيان المؤلف";
+$lang['metadata.table_description.authoring_entity.name']="إسم الوكالة";
+$lang['metadata.table_description.authoring_entity.affiliation']="التبعية";
+$lang['metadata.table_description.authoring_entity.abbreviation']="الإختصار";
+$lang['metadata.table_description.authoring_entity.uri']="رابط ويب URI";
+$lang['metadata.table_description.authoring_entity.role']="الدور";
+$lang['metadata.table_description.contributor']="المساهمون";
+$lang['metadata.table_description.contributor.name']="الإسم";
+$lang['metadata.table_description.contributor.affiliation']="التبعية";
+$lang['metadata.table_description.contributor.abbreviation']="الإختصار";
+$lang['metadata.table_description.contributor.role']="الدور";
+$lang['metadata.table_description.contributor.uri']="رابط ويب URI";
+$lang['metadata.table_description.publisher']="الناشرون";
+$lang['metadata.table_description.publisher.name']="الإسم";
+$lang['metadata.table_description.publisher.affiliation']="التبعية";
+$lang['metadata.table_description.publisher.abbreviation']="الإختصار";
+$lang['metadata.table_description.publisher.role']="الدور";
+$lang['metadata.table_description.publisher.uri']="رابط ويب URI";
+$lang['metadata.table_description.table_columns']="أعمدة الجدول";
+$lang['metadata.table_description.table_columns.var_name']="إسم المتغير";
+$lang['metadata.table_description.table_columns.label']="التسمية";
+$lang['metadata.table_description.table_columns.dataset']="مجموعة البيانات";
+$lang['metadata.table_description.table_rows']="صفوف الجدول";
+$lang['metadata.table_description.table_rows.var_name']="إسم المتغير";
+$lang['metadata.table_description.table_rows.label']="التسمية";
+$lang['metadata.table_description.table_rows.dataset']="مجموعة البيانات";
+$lang['metadata.table_description.statistics']="إحصاءات";
+$lang['metadata.table_description.statistics.value']="القيمة";
+$lang['metadata.table_description.unit_observation']="وحدة المراقبة";
+$lang['metadata.table_description.unit_observation.value']="القيمة";
+$lang['metadata.table_description.universe.value']="عالم الدراسة";
+$lang['metadata.table_description.geographic_granularity']="الدقة الجغرافية";
+$lang['metadata.table_description.languages']="اللغات";
+$lang['metadata.table_description.languages.name']="الإسم";
+$lang['metadata.table_description.languages.code']="الكود/الرمز";
+$lang['metadata.table_description.geographic_units']="الوحدات الجغرافية";
+$lang['metadata.table_description.geographic_units.name']="اسم الموقع";
+$lang['metadata.table_description.geographic_units.code']="كود/رمز الموقع";
+$lang['metadata.table_description.geographic_units.type']="النوع";
+$lang['metadata.table_description.links']="روابط";
+$lang['metadata.table_description.links.uri']="رابط ويب URL";
+$lang['metadata.table_description.links.description']="الوصف";
+$lang['metadata.table_description.publications']="المطبوعات/المنشورات";
+$lang['metadata.table_description.publications.title']="العنوان";
+$lang['metadata.table_description.publications.uri']="رابط ويب URL";
+$lang['metadata.table_description.themes']="الموضوعات";
+$lang['metadata.table_description.themes.name']="الإسم";
+$lang['metadata.table_description.themes.vocabulary']="المفردات";
+$lang['metadata.table_description.themes.uri']="رابط ويب URI";
+$lang['metadata.table_description.keywords']="كلمات مفتاحية/رئيسية";
+$lang['metadata.table_description.keywords.name']="الإسم";
+$lang['metadata.table_description.keywords.vocabulary']="المفردات";
+$lang['metadata.table_description.keywords.uri']="رابط ويب URI";
+$lang['metadata.table_description.topics']="المواضيع";
+$lang['metadata.table_description.topics.id']="معرّف فريد";
+$lang['metadata.table_description.topics.name']="الموضوع";
+$lang['metadata.table_description.topics.parent_id']="معرّف الموضوع الأصلي";
+$lang['metadata.table_description.topics.vocabulary']="المفردات";
+$lang['metadata.table_description.topics.uri']="رابط ويب المفردات URI";
+$lang['metadata.table_description.sub_topics']="مواضيع فرعية";
+$lang['metadata.table_description.rights']="الحقوق";
+$lang['metadata.table_description.license']="الرخصة";
+$lang['metadata.table_description.license.name']="الرخصة";
+$lang['metadata.table_description.license.uri']="رابط ويب URI";
+$lang['metadata.table_description.citation']="الإقتباس";
+$lang['metadata.table_description.notes']="الملاحظات";
+$lang['metadata.table_description.notes.note']="ملاحظة";
+$lang['metadata.table_description.relations']="العلاقات";
+$lang['metadata.table_description.relations.name']="الإسم";
+$lang['metadata.table_description.relations.type']="النوع";
+$lang['metadata.table_description.confidentiality']="الخصوصية/السرية";
+$lang['metadata.table_description.definitions']="تعريفات";
+$lang['metadata.table_description.definitions.name']="المصطلح";
+$lang['metadata.table_description.definitions.definition']="التعريف";
+$lang['metadata.table_description.definitions.uri']="رابط الويب URI";
+$lang['metadata.table_description.classifications']="التصنيفات";
+$lang['metadata.table_description.classifications.name']="إسم التصنيف";
+$lang['metadata.table_description.classifications.version']="الإصدار/النسخة";
+$lang['metadata.table_description.classifications.organization']="المنظمة";
+$lang['metadata.table_description.classifications.uri']="رابط الويب URI";
+$lang['metadata.metadata_information.producers']="المنتجون";
+$lang['metadata.metadata_information.producers.name']="الإسم";
+$lang['metadata.metadata_information.producers.abbr']="الإختصار";
+$lang['metadata.metadata_information.producers.affiliation']="التبعية";
+$lang['metadata.metadata_information.producers.role']="الدور";
+$lang['metadata.metadata_information.production_date']="تاريخ الإنتاج";
+$lang['metadata.metadata_information.version']="الإصدار/النسخة";
+$lang['metadata.metadata_information.idno']="الرقم المرجعي للوثيقة";
+$lang['metadata.table_description.files']="ملف الجدول";
+$lang['metadata.table_description.files.filename']="إسم الملف";
+$lang['metadata.table_description.files.format']="تنسيق/صيغة الملف على سبيل المثال &quot;application / excel&quot; ، &quot;application / pdf&quot;";
+$lang['metadata.table_description.files.location']="رقم الصفحة أو اسم الورقة للجدول";
+$lang['metadata.table_description.files.note']="ملاحظات";
+$lang['metadata.table_description.contacts']="جهات الإتصال";
+$lang['metadata.table_description.contacts.name']="الإسم";
+$lang['metadata.table_description.contacts.role']="الدور";
+$lang['metadata.table_description.contacts.affiliation']="التبعية";
+$lang['metadata.table_description.contacts.email']="البريد الإلكتروني";
+$lang['metadata.table_description.contacts.telephone']="الهاتف";
+$lang['metadata.table_description.contacts.uri']="رابط الويب URI";
+$lang['metadata.tags']="علامات Tags";
+$lang['metadata.tags.tag']="علامة Tag";
+
+
+/* End of file fields_table */
+/* Location: ./application/language/arabic/fields_table */
\ No newline at end of file
diff --git a/application/language/arabic/fields_timeseries_lang.php b/application/language/arabic/fields_timeseries_lang.php
new file mode 100644
index 000000000..fd49fdecc
--- /dev/null
+++ b/application/language/arabic/fields_timeseries_lang.php
@@ -0,0 +1,113 @@
+<?php 
+$lang['metadata_production']="إنتاج البيانات الوصفية";
+$lang['api_documentation']="وثائق واجهات برمجة التطبيقات API";
+$lang['links']="روابط السلسلة الزمنية";
+$lang['geographic_units']="المعلومات الجغرافية";
+$lang['license_rights']="الرخصة";
+$lang['metadata.metadata_creation']="إنشاء البيانات الوصفية";
+$lang['metadata.metadata_creation.producers']="المنتجون";
+$lang['metadata.metadata_creation.producers.name']="الإسم";
+$lang['metadata.metadata_creation.producers.abbr']="الإختصار";
+$lang['metadata.metadata_creation.producers.affiliation']="التبعية";
+$lang['metadata.metadata_creation.producers.role']="الدور";
+$lang['metadata.metadata_creation.prod_date']="تاريخ الإنتاج";
+$lang['metadata.metadata_creation.version']="إصدار/نسخة الوثيقة";
+$lang['metadata.series_description']="وصف سلسلة البيانات الوصفية";
+$lang['metadata.series_description.idno']="معرّف السلسلة الفريد";
+$lang['metadata.series_description.name']="اسم السلسلة الزمنية";
+$lang['metadata.series_description.database_id']="معرف/رقم قاعدة البيانات";
+$lang['metadata.series_description.aliases']="أسماء أخرى";
+$lang['metadata.series_description.aliases.alias']="الاسم المستعار/البديل";
+$lang['metadata.series_description.measurement_unit']="وحدة قياس السلسلة";
+$lang['metadata.series_description.periodicity']="دورية البيانات";
+$lang['metadata.series_description.base_period']="فترة الأساس";
+$lang['metadata.series_description.definition_short']="تعريف قصير";
+$lang['metadata.series_description.definition_long']="تعريف طويل";
+$lang['metadata.series_description.definition_references']="مراجع التعريف";
+$lang['metadata.series_description.definition_references.source']="المصدر";
+$lang['metadata.series_description.definition_references.uri']="رابط الويب URI";
+$lang['metadata.series_description.definition_references.note']="ملاحظة";
+$lang['metadata.series_description.statistical_concept']="المفهوم الإحصائي";
+$lang['metadata.series_description.concepts']="المفاهيم ذات الصلة";
+$lang['metadata.series_description.concepts.name']="الإسم";
+$lang['metadata.series_description.concepts.definition']="التعريف";
+$lang['metadata.series_description.concepts.uri']="رابط الويب URI";
+$lang['metadata.series_description.methodology']="المنهجية";
+$lang['metadata.series_description.imputation']="الافتراضات";
+$lang['metadata.series_description.quality_checks']="طرق مراقبة الجودة";
+$lang['metadata.series_description.quality_note']="ملاحظة حول جودة البيانات";
+$lang['metadata.series_description.series_break']="فواصل في السلسلة";
+$lang['metadata.series_description.limitation']="القيود والاستثناءات";
+$lang['metadata.series_description.themes']="الموضوعات";
+$lang['metadata.series_description.themes.name']="الإسم";
+$lang['metadata.series_description.themes.vocabulary']="إسم المفردات";
+$lang['metadata.series_description.themes.uri']="رابط الويب للمفردات URI";
+$lang['metadata.series_description.topics']="المواضيع";
+$lang['metadata.series_description.topics.id']="معرّف فريد";
+$lang['metadata.series_description.topics.name']="الموضوع";
+$lang['metadata.series_description.topics.parent_id']="معرّف الموضوع الأصلي";
+$lang['metadata.series_description.topics.vocabulary']="المفردات";
+$lang['metadata.series_description.topics.uri']="رابط الويب للمفردات URI";
+$lang['metadata.series_description.disciplines']="قواعد/ضوابط";
+$lang['metadata.series_description.disciplines.name']="عنوان الانضباط أو الاسم";
+$lang['metadata.series_description.disciplines.vocabulary']="المفردات";
+$lang['metadata.series_description.disciplines.uri']="رابط الويب URI";
+$lang['metadata.series_description.relevance']="صلة/علاقة";
+$lang['metadata.series_description.time_periods']="تواريخ السلسلة الزمنية";
+$lang['metadata.series_description.time_periods.start']="البداية";
+$lang['metadata.series_description.time_periods.end']="النهاية";
+$lang['metadata.series_description.geographic_units']="التغطية الجغرافية";
+$lang['metadata.series_description.geographic_units.name']="اسم الموقع";
+$lang['metadata.series_description.geographic_units.code']="كود/رمز الموقع";
+$lang['metadata.series_description.geographic_units.type']="النوع";
+$lang['metadata.series_description.aggregation_method']="طريقة التجميع";
+$lang['metadata.series_description.license']="رخصة الوصول/النفاذ";
+$lang['metadata.series_description.license.name']="الرخصة";
+$lang['metadata.series_description.license.uri']="رابط الرخصة";
+$lang['metadata.series_description.confidentiality']="تصريح/بيان الخصوصية";
+$lang['metadata.series_description.confidentiality_status']="حالة السرية/الخصوصية";
+$lang['metadata.series_description.confidentiality_note']="ملاحظة الخصوصية";
+$lang['metadata.series_description.links']="روابط السلسلة";
+$lang['metadata.series_description.links.type']="نوع الرابط";
+$lang['metadata.series_description.links.description']="الوصف";
+$lang['metadata.series_description.links.url']="الرابط";
+$lang['metadata.series_description.links.uri']="الرابط";
+$lang['metadata.series_description.links.format']="الصيغة/التنسيق";
+$lang['metadata.series_description.series_links']="روابط السلسلة";
+$lang['metadata.series_description.series_links.type']="نوع الرابط";
+$lang['metadata.series_description.series_links.description']="الوصف";
+$lang['metadata.series_description.series_links.url']="الرابط";
+$lang['metadata.series_description.api_documentation']="الوصف";
+$lang['metadata.series_description.api_documentation.description']="الوصف";
+$lang['metadata.series_description.api_documentation.uri']="رابط التوثيق";
+$lang['metadata.series_description.api_documentation.url']="رابط التوثيق";
+$lang['metadata.series_description.sources']="المصادر الأصلية";
+$lang['metadata.series_description.sources.id']="رقم المصدر";
+$lang['metadata.series_description.sources.name']="الإسم";
+$lang['metadata.series_description.sources.organization']="المنظمة";
+$lang['metadata.series_description.sources.type']="النوع";
+$lang['metadata.series_description.sources.note']="ملاحظة";
+$lang['metadata.series_description.source_notes']="ملاحظات من المصادر الأصلية";
+$lang['metadata.series_description.keywords']="كلمات مفتاحية/رئيسية";
+$lang['metadata.series_description.keywords.name']="كلمة مفتاحية";
+$lang['metadata.series_description.keywords.vocabulary']="مفردات";
+$lang['metadata.series_description.keywords.uri']="رابط الويب URI";
+$lang['metadata.series_description.notes']="ملاحظات";
+$lang['metadata.series_description.notes.note']="ملاحظة";
+$lang['metadata.series_description.related_indicators']="مؤشرات ذات علاقة";
+$lang['metadata.series_description.related_indicators.code']="كود/رمز المؤشر";
+$lang['metadata.series_description.related_indicators.label']="إسم المؤشر";
+$lang['metadata.series_description.related_indicators.uri']="رابط الويب URI";
+$lang['metadata.series_description.compliance']="الامتثال للقرار الدولي";
+$lang['metadata.series_description.compliance.standard']="إسم المعيار";
+$lang['metadata.series_description.compliance.organization']="إسم المنظمة";
+$lang['metadata.series_description.compliance.uri']="رابط الويب URI";
+$lang['metadata.series_description.series_groups']="مجموعات السلاسل الزمنية";
+$lang['metadata.series_description.series_groups.name']="الإسم";
+$lang['metadata.series_description.series_groups.version']="الإصدار/النسخة";
+$lang['metadata.series_description.series_groups.uri']="رابط الويب URI";
+$lang['metadata.additional']="بيانات وصفية مخصصة إضافية";
+
+
+/* End of file fields_timeseries */
+/* Location: ./application/language/arabic/fields_timeseries */
\ No newline at end of file
diff --git a/application/language/arabic/fields_timeseriesdb_lang.php b/application/language/arabic/fields_timeseriesdb_lang.php
new file mode 100644
index 000000000..472a57c2f
--- /dev/null
+++ b/application/language/arabic/fields_timeseriesdb_lang.php
@@ -0,0 +1,97 @@
+<?php 
+$lang['metadata.database_description.title_statement.idno']="معرّف قاعدة البيانات";
+$lang['metadata.database_description.title_statement.title']="العنوان";
+$lang['metadata.database_description.title_statement.sub_title']="العنوان الفرعي";
+$lang['metadata.database_description.title_statement.alternate_title']="العنوان البديل";
+$lang['metadata.database_description.title_statement.translated_title']="العنوان المترجم";
+$lang['metadata.database_description.authoring_entity']="شخصية المؤلف";
+$lang['metadata.database_description.authoring_entity.name']="الإسم";
+$lang['metadata.database_description.authoring_entity.role']="الدور";
+$lang['metadata.database_description.authoring_entity.affiliation']="التبعية";
+$lang['metadata.database_description.authoring_entity.abbreviation']="الإختصار";
+$lang['metadata.database_description.abstract']="ملخص";
+$lang['metadata.database_description.url']="رابط الويب URL";
+$lang['metadata.database_description.type']="النوع";
+$lang['metadata.database_description.doi']="معرف الكائن الرقمي DOI";
+$lang['metadata.database_description.date_created']="تاريخ الإنشاء";
+$lang['metadata.database_description.date_published']="تاريخ النشر";
+$lang['metadata.database_description.version']="الإصدار/النسخة";
+$lang['metadata.database_description.version.version']="الإصدار/النسخة";
+$lang['metadata.database_description.version.date']="التاريخ";
+$lang['metadata.database_description.version.responsibility']="المسئولية";
+$lang['metadata.database_description.version.notes']="الملاحظات";
+$lang['metadata.database_description.update_frequency']="معدل/دورية التحديث";
+$lang['metadata.database_description.update_schedule']="برنامج/جدول التحديث";
+$lang['metadata.database_description.update_schedule.update']="برنامج/جدول";
+$lang['metadata.database_description.time_coverage']="الوقت";
+$lang['metadata.database_description.time_coverage_note']="ملاحظة التغطية الزمنية";
+$lang['metadata.database_description.periodicity']="الدورية";
+$lang['metadata.database_description.periodicity.period']="فترة";
+$lang['metadata.database_description.themes']="موضوعات";
+$lang['metadata.database_description.themes.name']="موضوع";
+$lang['metadata.database_description.themes.vocabulary']="مفردات";
+$lang['metadata.database_description.themes.uri']="رابط الويب URI";
+$lang['metadata.database_description.topics']="المواضيع";
+$lang['metadata.database_description.topics.id']="الرقم/المعرّف";
+$lang['metadata.database_description.topics.name']="الإسم";
+$lang['metadata.database_description.topics.parent_id']="الموضوع الأصل";
+$lang['metadata.database_description.topics.vocabulary']="مفردات";
+$lang['metadata.database_description.topics.uri']="رابط الويب URI";
+$lang['metadata.database_description.keywords']="كلمات مفتاحية/رئيسية";
+$lang['metadata.database_description.keywords.name']="الإسم";
+$lang['metadata.database_description.keywords.vocabulary']="مفردات";
+$lang['metadata.database_description.keywords.uri']="رابط الويب URI";
+$lang['metadata.database_description.geographic_units']="التغطية الجغرافية";
+$lang['metadata.database_description.geographic_units.name']="الإسم";
+$lang['metadata.database_description.geographic_units.code']="الكود/الرمز";
+$lang['metadata.database_description.geographic_units.type']="النوع";
+$lang['metadata.database_description.geographic_coverage_note']="ملاحظة التغطية الجغرافية";
+$lang['metadata.database_description.bbox']="صندوق الحدود";
+$lang['metadata.database_description.bbox.west']="الغرب";
+$lang['metadata.database_description.bbox.east']="الشرق";
+$lang['metadata.database_description.bbox.south']="الجنوب";
+$lang['metadata.database_description.bbox.north']="الشمال";
+$lang['metadata.database_description.geographic_granularity']="التقسيمات الجغرافية";
+$lang['metadata.database_description.geographic_area_count']="عدد المناطق الجغرافية";
+$lang['metadata.database_description.sponsors']="الرعاة";
+$lang['metadata.database_description.sponsors.name']="الإسم";
+$lang['metadata.database_description.sponsors.abbreviation']="الإختصار";
+$lang['metadata.database_description.sponsors.role']="الدور";
+$lang['metadata.database_description.sponsors.grant']="المنحة";
+$lang['metadata.database_description.sponsors.uri']="رابط الويب URI";
+$lang['metadata.database_description.acknowledgments']="شكر وتقدير";
+$lang['metadata.database_description.acknowledgments.name']="الإسم";
+$lang['metadata.database_description.acknowledgments.affiliation']="التبعية";
+$lang['metadata.database_description.acknowledgments.role']="الدور";
+$lang['metadata.database_description.acknowledgments.uri']="رابط الويب URI";
+$lang['metadata.database_description.contacts']="جهات الإتصال";
+$lang['metadata.database_description.contacts.name']="الإسم";
+$lang['metadata.database_description.contacts.role']="الدور";
+$lang['metadata.database_description.contacts.affiliation']="التبعية";
+$lang['metadata.database_description.contacts.email']="البريد الإلكتروني";
+$lang['metadata.database_description.contacts.telephone']="الهاتف";
+$lang['metadata.database_description.contacts.uri']="رابط الويب URI";
+$lang['metadata.database_description.links']="روابط";
+$lang['metadata.database_description.links.uri']="رابط الويب URI";
+$lang['metadata.database_description.links.description']="الوصف";
+$lang['metadata.database_description.languages']="اللغات";
+$lang['metadata.database_description.languages.name']="اللغة";
+$lang['metadata.database_description.languages.code']="الكود/الرمز";
+$lang['metadata.database_description.access_options']="خيارات الوصول";
+$lang['metadata.database_description.access_options.type']="النوع";
+$lang['metadata.database_description.access_options.uri']="رابط الويب URI";
+$lang['metadata.database_description.access_options.note']="ملاحظة";
+$lang['metadata.database_description.license']="الرخصة";
+$lang['metadata.database_description.license.type']="النوع";
+$lang['metadata.database_description.license.uri']="رابط الويب URI";
+$lang['metadata.database_description.license.note']="ملاحظة";
+$lang['metadata.database_description.citation']="الإقتباس";
+$lang['metadata.database_description.notes']="ملاحظات";
+$lang['metadata.database_description.notes.note']="ملاحظة";
+$lang['metadata.database_description.disclaimer']="إخلاء المسؤولية";
+$lang['metadata.database_description.copyright']="حقوق النشر";
+$lang['metadata.additional']="بيانات وصفية مخصصة إضافية";
+
+
+/* End of file fields_timeseriesdb */
+/* Location: ./application/language/arabic/fields_timeseriesdb */
\ No newline at end of file
diff --git a/application/language/arabic/fields_video_lang.php b/application/language/arabic/fields_video_lang.php
new file mode 100644
index 000000000..8c29a530d
--- /dev/null
+++ b/application/language/arabic/fields_video_lang.php
@@ -0,0 +1,15 @@
+<?php 
+$lang['metadata.video_description.idno']="رقم/معرّف الفيديو";
+$lang['metadata.video_description.title']="العنوان";
+$lang['metadata.video_description.description']="الوصف";
+$lang['metadata.video_description.video_url']="رابط الفيديو على الويب";
+$lang['files']="ملفات";
+$lang['album']="ألبومات";
+$lang['video_description']="وصف الفيديو";
+$lang['identification']="معرّف/محدد";
+$lang['metadata.tags']="علامات Tags";
+$lang['metadata.tags.tag']="علامة Tag";
+
+
+/* End of file fields_video */
+/* Location: ./application/language/arabic/fields_video */
\ No newline at end of file
diff --git a/application/language/arabic/fields_visualization_lang.php b/application/language/arabic/fields_visualization_lang.php
new file mode 100644
index 000000000..82e519059
--- /dev/null
+++ b/application/language/arabic/fields_visualization_lang.php
@@ -0,0 +1,160 @@
+<?php 
+$lang['metadata.metadata_information']="البيانات الوصفية للوثيقة";
+$lang['metadata.metadata_information.idno']="معرّف فريد";
+$lang['metadata.metadata_information.producers']="المنتجون";
+$lang['metadata.metadata_information.producers.name']="الإسم";
+$lang['metadata.metadata_information.producers.abbr']="الإختصار";
+$lang['metadata.metadata_information.producers.affiliation']="التبعية";
+$lang['metadata.metadata_information.producers.role']="الدور";
+$lang['metadata.metadata_information.production_date']="تاريخ الإنتاج";
+$lang['metadata.metadata_information.version']="إصدار/نسخة الوثيقة";
+$lang['metadata.visualization_description']="الوصف";
+$lang['metadata.visualization_description.title_statement']="الوصف";
+$lang['metadata.visualization_description.title_statement.idno']="الرقم/المعرّف";
+$lang['metadata.visualization_description.title_statement.visualization_number']="رقم التصور المرئي";
+$lang['metadata.visualization_description.title_statement.title']="العنوان";
+$lang['metadata.visualization_description.title_statement.sub_title']="العنوان الفرعي للجدول";
+$lang['metadata.visualization_description.title_statement.alternate_title']="الإختصار";
+$lang['metadata.visualization_description.title_statement.abbreviated_title']="عنوان الإختصار";
+$lang['metadata.visualization_description.title_statement.legend']="أسطوري";
+$lang['metadata.visualization_description.sub_chart_titles']="عناوين الرسم البياني الفرعي";
+$lang['metadata.visualization_description.sub_chart_titles.title']="العنوان";
+$lang['metadata.visualization_description.chart_footnotes']="حواشي الرسم البياني";
+$lang['metadata.visualization_description.chart_footnotes.number']="رقم الحاشية السفلية";
+$lang['metadata.visualization_description.chart_footnotes.text']="نص الحاشية السفلية";
+$lang['metadata.visualization_description.id_numbers']="الأرقام التعريفية";
+$lang['metadata.visualization_description.id_numbers.type']="النوع";
+$lang['metadata.visualization_description.id_numbers.value']="الرقم المعرّف";
+$lang['metadata.visualization_description.visualization_types']="نوع التصور المرئي";
+$lang['metadata.visualization_description.visualization_types.type']="النوع";
+$lang['metadata.visualization_description.visualization_types.note']="ملاحظات";
+$lang['metadata.visualization_description.animated']="تصورات البيانات المتحركة";
+$lang['metadata.visualization_description.description']="الوصف";
+$lang['metadata.visualization_description.narrative']="رواية/قصة";
+$lang['metadata.visualization_description.authoring_entity']="شخصية المؤلف";
+$lang['metadata.visualization_description.authoring_entity.name']="إسم الوكالة";
+$lang['metadata.visualization_description.authoring_entity.affiliation']="التبعية";
+$lang['metadata.visualization_description.authoring_entity.abbreviation']="الإختصار";
+$lang['metadata.visualization_description.authoring_entity.uri']="رابط الويب URI";
+$lang['metadata.visualization_description.contributors']="المساهمون";
+$lang['metadata.visualization_description.contributors.name']="الإسم";
+$lang['metadata.visualization_description.contributors.affiliation']="التبعية";
+$lang['metadata.visualization_description.contributors.abbreviation']="الإختصار";
+$lang['metadata.visualization_description.contributors.role']="الدور";
+$lang['metadata.visualization_description.contributors.uri']="رابط الويب URI";
+$lang['metadata.visualization_description.publisher']="الناشر";
+$lang['metadata.visualization_description.publisher.name']="الإسم";
+$lang['metadata.visualization_description.publisher.affiliation']="التبعية";
+$lang['metadata.visualization_description.publisher.abbreviation']="الإختصار";
+$lang['metadata.visualization_description.publisher.role']="الدور";
+$lang['metadata.visualization_description.publisher.uri']="رابط الويب URI";
+$lang['metadata.visualization_description.acknowledgements']="شكر وتقدير";
+$lang['metadata.visualization_description.acknowledgements.name']="الإسم";
+$lang['metadata.visualization_description.acknowledgements.role']="الدور";
+$lang['metadata.visualization_description.date_created']="تاريخ الإنشاء";
+$lang['metadata.visualization_description.date_published']="تاريخ النشر";
+$lang['metadata.visualization_description.date_modified']="تاريخ آخر تعديل";
+$lang['metadata.visualization_description.version']="إصدار/نسخة";
+$lang['metadata.visualization_description.visualization_series']="مجموعة التصور المرئي";
+$lang['metadata.visualization_description.visualization_series.name']="الإسم";
+$lang['metadata.visualization_description.visualization_series.maintainer']="المشرف";
+$lang['metadata.visualization_description.visualization_series.uri']="رابط الويب URI";
+$lang['metadata.visualization_description.visualization_series.description']="الوصف";
+$lang['metadata.visualization_description.data_sources']="مصادر البيانات";
+$lang['metadata.visualization_description.data_sources.source']="المصدر";
+$lang['metadata.visualization_description.time_periods']="فترات زمنية";
+$lang['metadata.visualization_description.time_periods.from']="تاريخ البدء";
+$lang['metadata.visualization_description.time_periods.to']="تاريخ الإنتهاء";
+$lang['metadata.visualization_description.universe']="عالم الدراسة";
+$lang['metadata.visualization_description.universe.value']="عالم الدراسة";
+$lang['metadata.visualization_description.ref_country']="البلد المرجع";
+$lang['metadata.visualization_description.ref_country.name']="إسم البلد";
+$lang['metadata.visualization_description.ref_country.code']="رمز/كود البلد";
+$lang['metadata.visualization_description.geographic_units']="المواقع الجغرافية";
+$lang['metadata.visualization_description.geographic_units.name']="إسم الموقع";
+$lang['metadata.visualization_description.geographic_units.code']="رمز/كود الموقع";
+$lang['metadata.visualization_description.geographic_units.type']="النوع";
+$lang['metadata.visualization_description.geographic_granularity']="التقسيمات الجغرافية";
+$lang['metadata.visualization_description.languages']="اللغات";
+$lang['metadata.visualization_description.languages.name']="الإسم";
+$lang['metadata.visualization_description.languages.code']="الكود/الرمز";
+$lang['metadata.visualization_description.data_accessibility']="الوصول إلى البيانات";
+$lang['metadata.visualization_description.data']="البيانات";
+$lang['metadata.visualization_description.data.dataset']="مجموعة البيانات";
+$lang['metadata.visualization_description.data.access_type']="الوصول";
+$lang['metadata.visualization_description.data.uri']="رابط الويب URL";
+$lang['metadata.visualization_description.data.note']="ملاحظة";
+$lang['metadata.visualization_description.scripts']="سكريبتات/برامج نصية";
+$lang['metadata.visualization_description.scripts.software_name']="إسم البرمجية";
+$lang['metadata.visualization_description.scripts.software_version']="نسخة/إصدار البرمجية";
+$lang['metadata.visualization_description.scripts.software_library']="مكتبات البرمجيات";
+$lang['metadata.visualization_description.scripts.script_access']="الوصول إلى البرنامج النصي/السكريبت";
+$lang['metadata.visualization_description.scripts.script_uri']="رابط الويب للبرنامج النصي/السكريبت";
+$lang['metadata.visualization_description.embed_uri']="رابط لتضمين التصور المرئي DV";
+$lang['metadata.visualization_description.publications']="منشورات/مطبوعات";
+$lang['metadata.visualization_description.publications.title']="العنوان";
+$lang['metadata.visualization_description.publications.uri']="رابط الويب URL";
+$lang['metadata.visualization_description.keywords']="كلمات مفتاحية/رئيسية";
+$lang['metadata.visualization_description.keywords.name']="الإسم";
+$lang['metadata.visualization_description.keywords.vocabulary']="إسم المفردات";
+$lang['metadata.visualization_description.keywords.uri']="رابط الويب للمفردات";
+$lang['metadata.visualization_description.themes']="موضوعات";
+$lang['metadata.visualization_description.themes.name']="الإسم";
+$lang['metadata.visualization_description.themes.vocabulary']="إسم المفردات";
+$lang['metadata.visualization_description.themes.uri']="رابط الويب للمفردات";
+$lang['metadata.visualization_description.topics']="المواضيع";
+$lang['metadata.visualization_description.topics.id']="معرّف فريد";
+$lang['metadata.visualization_description.topics.name']="الموضوع";
+$lang['metadata.visualization_description.topics.parent_id']="معرّف الموضوع الأصلي";
+$lang['metadata.visualization_description.topics.vocabulary']="المفردات";
+$lang['metadata.visualization_description.topics.uri']="رابط الويب للمفردات";
+$lang['metadata.visualization_description.disciplines']="الضوابط/القواعد";
+$lang['metadata.visualization_description.disciplines.name']="عنوان الانضباط أو الاسم";
+$lang['metadata.visualization_description.disciplines.vocabulary']="المفردات";
+$lang['metadata.visualization_description.disciplines.uri']="رابط الويب URI";
+$lang['metadata.visualization_description.definitions']="التعريفات";
+$lang['metadata.visualization_description.definitions.name']="تعريف";
+$lang['metadata.visualization_description.definitions.definition']="تعريف";
+$lang['metadata.visualization_description.definitions.uri']="رابط الويب URI";
+$lang['metadata.visualization_description.classifications']="التصنيفات";
+$lang['metadata.visualization_description.classifications.name']="إسم التصنيف";
+$lang['metadata.visualization_description.classifications.version']="الإصدار/النسخة";
+$lang['metadata.visualization_description.classifications.organization']="المنظمة";
+$lang['metadata.visualization_description.classifications.uri']="رابط الويب URI";
+$lang['metadata.visualization_description.rights']="الحقوق";
+$lang['metadata.visualization_description.license']="الرخصة";
+$lang['metadata.visualization_description.license.name']="إسم الرخصة";
+$lang['metadata.visualization_description.license.uri']="رابط الويب URI";
+$lang['metadata.visualization_description.citation']="الإقتباس";
+$lang['metadata.visualization_description.disclaimer']="إخلاء المسؤولية";
+$lang['metadata.visualization_description.contacts']="جهات الإتصال";
+$lang['metadata.visualization_description.contacts.name']="الإسم";
+$lang['metadata.visualization_description.contacts.role']="الدور";
+$lang['metadata.visualization_description.contacts.affiliation']="التبعية";
+$lang['metadata.visualization_description.contacts.email']="البريد الإلكتروني";
+$lang['metadata.visualization_description.contacts.telephone']="الهاتف";
+$lang['metadata.visualization_description.contacts.uri']="رابط الويب URI";
+$lang['metadata.visualization_description.notes']="ملاحظات";
+$lang['metadata.visualization_description.notes.note']="ملاحظة";
+$lang['metadata.visualization_description.links']="روابط";
+$lang['metadata.visualization_description.links.uri']="رابط الويب URL";
+$lang['metadata.visualization_description.links.description']="الوصف";
+$lang['metadata.visualization_description.relations']="العلاقات";
+$lang['metadata.visualization_description.relations.name']="الإسم";
+$lang['metadata.visualization_description.relations.type']="النوع";
+$lang['metadata.visualization_description.tags']="علامات Tags";
+$lang['metadata.visualization_description.tags.tag']="علامة/وسم Tag";
+$lang['metadata.files']="ملفات";
+$lang['metadata.files.file_uri']="مسار الملف";
+$lang['metadata.files.format']="صيغة/تنسيق الملف";
+$lang['metadata.files.location']="رقم الصفحة أو اسم الورقة للتصور المرئي";
+$lang['metadata.files.note']="ملاحظات";
+$lang['metadata.additional']="إضافي";
+$lang['metadata.visualization_description.data.series_name']="سلسلة";
+$lang['metadata.visualization_description.data.series_id']="رقم/معرّف السلسلة";
+$lang['metadata.visualization_description.scripts.software_libraries']="مكتبات البرمجيات";
+$lang['files']="ملفات";
+
+
+/* End of file fields_visualization */
+/* Location: ./application/language/arabic/fields_visualization */
\ No newline at end of file
diff --git a/application/language/arabic/general_lang.php b/application/language/arabic/general_lang.php
index ab9e0765b..4a058225f 100644
--- a/application/language/arabic/general_lang.php
+++ b/application/language/arabic/general_lang.php
@@ -1,17 +1,18 @@
 <?php 
 $lang['confirm_delete_records']="هل أنت متأكد من أنك تريد حذف السجلات المحددة؟";
-$lang['form_update_success']="تم تحديث النموذج بنجاح!";
+$lang['form_update_success']="تم حفظ التغييرات!";
 $lang['form_update_fail']="فشل في تحديث قاعدة البيانات";
 $lang['callback_error_url_exists']="ال s% موجود الرجاء اختيار  URL اخر.";
 $lang['page_next']="التالي";
 $lang['page_prev']="السابق";
 $lang['page_first']="الاول";
 $lang['page_last']="الاخر";
+$lang['last']="الاخر";
 $lang['batch_actions']="دفعة اجراءات";
 $lang['apply']="تطبيق";
 $lang['all_fields']="جميع المجالات";
 $lang['title']="العنوان";
-$lang['url']="عنوان الموقع (URL)
+$lang['url']="عنوان الموقع (URL)
 ";
 $lang['link']="الرابط";
 $lang['type']="النوع";
@@ -28,7 +29,7 @@
 $lang['submit']="إرسال";
 $lang['create']="إنشاء";
 $lang['filename']="اسم الملف";
-$lang['permissions']="اذن";
+$lang['permissions']="إذن";
 $lang['search']="بحث";
 $lang['reset']="إعادة تعيين";
 $lang['no_records_found']="لم يتم العثور على سجلات";
@@ -38,56 +39,93 @@
 $lang['update']="تحديث";
 $lang['cancel']="إلغاء";
 $lang['confirm_delete']="تأكيد الحذف";
-$lang['callback_email_exists']="ال s% موجود الرجاء اختيار  بريد الكتروني اخر.";
+$lang['callback_email_exists']="s% قيد الاستخدام بالفعل ، استخدم بريدًا إلكترونيًا مختلفًا.";
 $lang['callback_username_exists']="s%  مستعمل حاليا الرجاء اختيار اسم اخر.";
 $lang['name']="الاسم";
 $lang['size']="الحجم";
 $lang['date']="التاريخ";
 $lang['site_administration']="إدارة الموقع";
 $lang['login']="تسجيل الدخول";
-$lang['register']="استعمل";
+$lang['register']="سجّل";
 $lang['logout']="خروج";
 $lang['profile']="الملف الشخصي";
 $lang['password']="كلمة السر";
-$lang['__select__']="--تحديد القائمة--";
-$lang['error_invalid_parameters']="لقد وقع تقديم معلومات غير صالحة.";
+$lang['__select__']="--إختر--";
+$lang['error_invalid_parameters']="لقد تم تقديم معلومات غير صالحة.";
 $lang['js_no_item_selected']="لم تختر أي عنصر";
 $lang['js_confirm_delete']="هل أنت متأكد أنك تريد حذف العناصر المحددة؟";
-$lang['searching_please_wait']="بحث ، يرجى الانتظار...";
+$lang['searching_please_wait']="جاري البحث ، يرجى الانتظار...";
 $lang['dashboard']="لوحة مراقبة";
-$lang['catalog_maintenance']="صيانة قائمة المسوح";
 $lang['menu']="القائمة";
-$lang['licensed_survey_requests']="طلب النفاذ الى الملفات بموجب ترخيص";
+$lang['licensed_survey_requests']="طلبات النفاذ الى المسح بموجب ترخيص";
 $lang['users']="المستخدمين";
 $lang['citations']="اقتباسات";
 $lang['vocabularies']="المفردات";
-$lang['site_configurations']="تهيئة الموقع";
+$lang['site_configurations']="تهيئة/إعدادت الموقع";
 $lang['reports']="تقارير";
-$lang['nada_administration']="ادارة NADA ";
-$lang['change_password']="تغيير كلمةالسر";
+$lang['nada_administration']="إدارة NADA ";
+$lang['change_password']="تغيير كلمة السر";
 $lang['home_page']="الصفحة الرئيسية";
-$lang['data_catalog']="نشرية/كتالوج البيانات";
-$lang['captcha_provide_answer']="الرجاء حل العملية التالية";
+$lang['data_catalog']="كتالوج البيانات";
+$lang['captcha_provide_answer']="قدم إجابة لسؤال الرياضيات أعلاه";
 $lang['accept']="قبول";
-$lang['download']="تحميل";
-$lang['form_already_saved']="لقد تم حفظ النموذج, و لا يمكن حفضه من جديد.";
-$lang['email_failed']="فشل الإرسال ، يرجى المحاولة مرة أخرى.";
-$lang['js_loading']="تحميل ، يرجى الانتظار...";
+$lang['download']="تنزيل";
+$lang['form_already_saved']="تم حفظ النموذج بالفعل ، ولا يمكن إعادة إرساله.";
+$lang['email_failed']="فشل النظام في إرسال رسالة بريد إلكتروني ، يرجى المحاولة مرة أخرى.";
+$lang['js_loading']="جاري التحميل ، يرجى الانتظار...";
 $lang['file_not_found']="لم يتم العثور على الملف";
 $lang['invalid_id']="قدمت معرف غير صالح";
 $lang['sort_results_by']="رتب النتائج بواسطة";
 $lang['select_number_of_records_per_page']="حدد عدد السجلات للإظهار في كل صفحة";
-$lang['share']="تقاسم مع";
-$lang['share_with_facebook']="تقاسم مع فايسبوك";
-$lang['share_with_twitter']="تقاسم مع تويتر";
-$lang['share_with_delicious']="تقاسم مع ديليشيوس";
-$lang['share_with_linkedin']="تقاسم مع ينكدين";
-$lang['share_with_digg']="تقاسم مع يسو";
-$lang['share_with_buzz']="تقاسم مع جوجل الطنين";
-$lang['share_with_stumpleupon']="تقاسم مع سبورل";
+$lang['share']="شارك مع";
+$lang['share_with_facebook']="شارك مع الفيسبوك";
+$lang['share_with_twitter']="شارك مع تويتر";
+$lang['share_with_delicious']="شارك مع ديليشيوس";
+$lang['share_with_linkedin']="شارك مع لينكدين";
+$lang['share_with_digg']="شارك مع Digg";
+$lang['share_with_buzz']="شارك مع Google Buzz";
+$lang['share_with_stumpleupon']="شارك مع Stumbleupon";
 $lang['study_home']="الصفحة الرئيسية ";
-$lang['captcha_answer_not_matched']="اجابة غير موافقة";
-
-
-/* End of file general_lang.php */
-/* Location: ./application/language/arabic/general_lang.php */
\ No newline at end of file
+$lang['captcha_answer_not_matched']="s% إجابة غير متطابقة.";
+$lang['repositories']="المجموعات";
+$lang['contributing_repositories']="المجموعات المساهمة";
+$lang['home']="الصفحة الرئيسية";
+$lang['regional_catalogs']="كتالوجات إقليمية";
+$lang['specialized_catalogs']="كتالوجات متخصصة";
+$lang['central_data_catalog']="كتالوج البيانات المركزي";
+$lang['created']="أنشئ";
+$lang['visit_catalog']="قم بزيارة الكتالوج";
+$lang['reason_login_data_access']="الرجاء تسجيل الدخول لتنزيل البيانات";
+$lang['public_title']="ملفات الاستخدام العام PUF";
+$lang['licensed_title']="ملفات البيانات المرخصة";
+$lang['direct_title']="ملفات الوصول المباشر";
+$lang['data_na_title']="دراسات بدون بيانات متاحة";
+$lang['remote_title']="البيانات المتاحة من المستودع الخارجي";
+$lang['data_is_available_from_external_repository']="تتوفر بيانات الدراسة من موقع خارجي ، يرجى استخدام الرابط أدناه:";
+$lang['exit_impersonate']="اخرج من وضع الانتحال";
+$lang['content_is_not_published']="لم يتم نشر محتوى الصفحة الحالية بعد ومتاح فقط للمراجعة.";
+$lang['licensed_requests']="الطلبات المرخصة";
+$lang['create_region']="إنشاء منطقة";
+$lang['tab_about']="حول";
+$lang['tab_datasets']="مجموعات البيانات";
+$lang['tab_citations']="الإقتباسات";
+$lang['tab_collections']="المجموعات";
+$lang['collection']="المجموعة";
+$lang['add_country']="أضف بلد جديد";
+$lang['countries']="البلدان";
+$lang['iso']="ISO";
+$lang['edit_country']="تحرير البلد";
+$lang['country_mappings']="تعيينات/مطابقة البلد";
+$lang['latest_additions']="أحدث الإضافات";
+$lang['idno']="IDNO";
+$lang['related_datasets']="مجموعات بيانات ذات صلة";
+$lang['JSON']="JSON";
+$lang['DDI/XML']="DDI/XML
+";
+$lang['page not found']="الصفحة غير موجودة";
+$lang['export_to_csv']="تصدير الى CSV";
+$lang['translate']="ترجمة";
+
+
+/* End of file general */
+/* Location: ./application/language/arabic/general */
\ No newline at end of file
diff --git a/application/language/arabic/harvester_lang.php b/application/language/arabic/harvester_lang.php
index e71bfda6e..7fdda74d5 100644
--- a/application/language/arabic/harvester_lang.php
+++ b/application/language/arabic/harvester_lang.php
@@ -1,23 +1,23 @@
-<?php 
-$lang['create_repository']="إنشاء مستودع جديد
-";
-$lang['edit_repository']="تحرير مستودع
-";
-$lang['harvester_queue']="حصادة قائمة الانتظار
-";
-$lang['repositories']="مستودعات
-";
-$lang['repositoryid']="تحديد المستودع
- ";
-$lang['organization']="تنظيم
-";
-$lang['country']="بلد";
-$lang['scan_interval_in_days']="تفحص الفاصل الزمني (أيام)
-";
-$lang['harvest']="حصاد
-";
-$lang['ddi_harvester']="حاصدة";
-
-
-/* End of file harvester_lang.php */
+<?php 
+$lang['create_repository']="إنشاء مستودع جديد
+";
+$lang['edit_repository']="تحرير مستودع
+";
+$lang['harvester_queue']="حصادة قائمة الانتظار
+";
+$lang['repositories']="مستودعات
+";
+$lang['repositoryid']="تحديد المستودع
+ ";
+$lang['organization']="تنظيم
+";
+$lang['country']="بلد";
+$lang['scan_interval_in_days']="تفحص الفاصل الزمني (أيام)
+";
+$lang['harvest']="حصاد
+";
+$lang['ddi_harvester']="حاصدة";
+
+
+/* End of file harvester_lang.php */
 /* Location: ./application/language/arabic/harvester_lang.php */
\ No newline at end of file
diff --git a/application/language/arabic/install_lang.php b/application/language/arabic/install_lang.php
index 9c18c9739..176984b17 100644
--- a/application/language/arabic/install_lang.php
+++ b/application/language/arabic/install_lang.php
@@ -1,71 +1,67 @@
 <?php 
-$lang['create_admin_account']="إنشاء حساب للمسؤول";
-$lang['database_connection_failed']="فشل الاتصال بقاعدة البيانات. يرجى التحقق من إعدادات قاعدة البيانات";
-$lang['database_creation_failed']="فشل إنشاء قاعدة البيانات.
+$lang['create_admin_account']="إنشاء حساب المسؤول";
+$lang['database_connection_failed']="فشل الاتصال بقاعدة البيانات. تحقق من إعدادات قاعدة البيانات الخاصة بك.";
+$lang['database_creation_failed']="فشل إنشاء قاعدة البيانات.
 ";
 $lang['database_tables_created']=" تم إنشاء قاعدة البيانات والجداول بنجاح";
 $lang['return_to_site']="اضغط هنا للعودة إلى الصفحة الرئيسية";
-$lang['page_not_found']="صفحة غير موجودة
+$lang['page_not_found']="الصفحة غير موجودة
 ";
-$lang['install_completed']=" انتهاءالتثبيت ";
-$lang['install_completed_tasks_summary']="اكتمل تثبيت التطبيق. انظر أدناه لملخص الإجراءات ";
-$lang['task']="فعل
+$lang['install_completed']=" انتهاء التثبيت ";
+$lang['install_completed_tasks_summary']="اكتمل تثبيت التطبيق ، فيما يلي ملخص المهام:";
+$lang['task']="مهمة
 ";
-$lang['status']="حالة
+$lang['status']="حالة
 ";
-$lang['database']="قاعدة البيانات
+$lang['database']="قاعدة البيانات
 ";
-$lang['tables']="الجداول
+$lang['tables']="الجداول
 ";
-$lang['admin_account']="حساب المدير
+$lang['admin_account']="حساب المدير
 ";
-$lang['click_here_to_launch_application']="انقر هنا لتشغيل الموقع!
+$lang['click_here_to_launch_application']="انقر هنا لتشغيل الموقع!
 ";
-$lang['optional']="اختياري
+$lang['optional']="اختياري
 ";
-$lang['required_php_extensions']="ملحقاتPHP المطلوبة
-
+$lang['required_php_extensions']="ملحقاتPHP المطلوبة
+
 ";
-$lang['extensions']="ملحقات
+$lang['extensions']="ملحقات
 ";
-$lang['enabled']="يشغتل
+$lang['enabled']="تمكين/تفعيل
 ";
-$lang['extension_not_enabled']="<b>%s</b> لم يمكن التمديد.افتح الملف php.ini لتمكين التمديد";
-$lang['folder_permissions']="سماح بالقراءة / الكتابة / حذف الملف
+$lang['extension_not_enabled']="<b>%s</b> امتداد غير ممكّن. قم بتحرير ملف php.ini لتمكين التمديد.";
+$lang['folder_permissions']="أذونات قراءة / كتابة / حذف المجلد";
+$lang['folder']="مجلد
 ";
-$lang['folder']="ملف
+$lang['read_write']="القراءة / الكتابة
 ";
-$lang['read_write']="القراءة / الكتابة
+$lang['delete']="حذف
 ";
-$lang['delete']="احذف
-";
-$lang['server_information']="معلومات عن الموزع";
+$lang['server_information']="معلومات الخادم";
 $lang['php_version']="نسخة PHP";
 $lang['db_version']="نسخة DB";
-$lang['connection_success']="اتصال ناجح!
-";
-$lang['web_server']="موزع الويب";
-$lang['database_error_cant_continue']="فشل الاتصال بقاعدة البيانات.  لايمكن أن يستمر التثبيت مالم يتم تصحيح معلمات قاعدة البيانات.
+$lang['connection_success']="اتصال ناجح!
 ";
-$lang['other_php_settings']="معلمات أخرى php.ini
+$lang['web_server']="موزع/خادم الويب";
+$lang['database_error_cant_continue']="فشل اتصال قاعدة البيانات ، لا يمكن للمثبت المتابعة حتى يتم إصلاح إعدادات قاعدة البيانات.";
+$lang['other_php_settings']="إعدادات أخرى php.ini
 ";
-$lang['setting']="المعلمة
+$lang['setting']="ضبط/إعداد
 ";
 $lang['value']="القيمة";
-$lang['recommended']="موصى به
-";
-$lang['disabled']="معطل
+$lang['recommended']="موصى به
 ";
-$lang['install_database']="تثبيت قاعدة البيانات
+$lang['disabled']="معطل
 ";
-$lang['create_user']="إنشاء حساب
+$lang['install_database']="تثبيت قاعدة البيانات
 ";
-$lang['installer_title']="مثبت
-NADA";
-$lang['time_zone_is_required']="انضر كيف يمكن <a target=&quot;_blank&quot; href=&quot;%s&quot;> تعديل <a/> واختيار <a target=&quot;_blank&quot; href=&quot;%s&quot;>التوقيت الصحيح <a/>";
-$lang['not_set']="لم ينشأ
+$lang['create_user']="إنشاء حساب
 ";
-
-
-/* End of file install_lang.php */
-/* Location: ./application/language/arabic/install_lang.php */
\ No newline at end of file
+$lang['installer_title']="مثبت NADA";
+$lang['time_zone_is_required']="انظر كيف يمكن <a target=&quot;_blank&quot; href=&quot;%s&quot;> تعديل <a/> واختيار <a target=&quot;_blank&quot; href=&quot;%s&quot;>التوقيت الصحيح <a/>";
+$lang['not_set']="غير مضبوط";
+
+
+/* End of file install */
+/* Location: ./application/language/arabic/install */
\ No newline at end of file
diff --git a/application/language/arabic/iso19139_fields_lang.php b/application/language/arabic/iso19139_fields_lang.php
new file mode 100644
index 000000000..20e187d89
--- /dev/null
+++ b/application/language/arabic/iso19139_fields_lang.php
@@ -0,0 +1,78 @@
+<?php 
+$lang['identificationInfo']="المعرّف/المحدد";
+$lang['contact']="جهات الإتصال";
+$lang['keywords']="كلمات مفتاحية/رئيسية";
+$lang['metadata.additional']="بيانات وصفية إضافية";
+$lang['spatial_extent']="المدى المكاني";
+$lang['distribution']="توزيع";
+$lang['citation.title']="العنوان";
+$lang['citation.date']="التاريخ";
+$lang['citation.date.date']="التاريخ";
+$lang['citation.date.type']="النوع";
+$lang['citation.edition']="الإصدار";
+$lang['citation.editionDate']="تاريخ الإصدار";
+$lang['citation.otherCitationDetails']="الإقتباس";
+$lang['citation.identifier']="المعرّف";
+$lang['citation.citedResponsibleParty']="الطرف المسؤول";
+$lang['citation.presentationForm']="نموذج العرض";
+$lang['citation.series.name']="اسم السلسلة";
+$lang['citation.series.issueIdentification']="معرّف إصدار السلسلة";
+$lang['abstract']="ملخص";
+$lang['credit']="الائتمان";
+$lang['status']="الحالة";
+$lang['pointOfContact']="نقطة الاتصال";
+$lang['resourceMaintenance']="صيانة الموارد";
+$lang['resourceMaintenance.maintenanceOrUpdateFrequency']="معدل/دورية التحديث";
+$lang['graphicOverview']="نظرة عامة على الرسم البياني";
+$lang['graphicOverview.fileName']="ملف";
+$lang['graphicOverview.fileDescription']="الوصف";
+$lang['graphicOverview.fileType']="نوع الملف";
+$lang['resourceFormats']="تنسيقات الموارد";
+$lang['resourceFormats.name']="الإسم";
+$lang['resourceFormats.specification']="تخصيص";
+$lang['descriptiveKeywords']="كلمات رئيسية وصفية";
+$lang['descriptiveKeywords.type']="النوع";
+$lang['descriptiveKeywords.thesaurusName']="قاموس المرادفات";
+$lang['descriptiveKeywords.keyword']="كلمة رئيسية";
+$lang['spatialRepresentationType']="نوع التمثيل المكاني";
+$lang['language']="اللغة";
+$lang['characterset']="مجموعة الأحرف";
+$lang['topicCategory']="فئة الموضوع";
+$lang['constraints']="القيود";
+$lang['legalConstraints.accessConstraints']="قيود الوصول";
+$lang['legalConstraints.useConstraints']="استخدام القيود";
+$lang['legalConstraints.useLimitation']="استخدام المحددات";
+$lang['distributionInfo']="معلومات التوزيع";
+$lang['distributionFormat']="تنسيق التوزيع";
+$lang['distributionFormat.name']="الإسم";
+$lang['distributionFormat.specification']="تخصيص";
+$lang['distributionFormat.fileDecompressionTechnique']="تقنية تخفيف الضغط";
+$lang['distributor']="موزع";
+$lang['distributor.organisationName']="الإسم";
+$lang['transferOptions']="خيارات النقل";
+$lang['transferOptions.onLine']="الموارد على الانترنت";
+$lang['onLine.linkage']="رابط";
+$lang['onLine.name']="الإسم";
+$lang['onLine.protocol']="بروتوكول";
+$lang['onLine.function']="وظيفة/مهمة";
+$lang['dataQualityInfo']="جودة البيانات";
+$lang['scope']="المجال";
+$lang['lineage.statement']="النسل";
+$lang['description']="إنتاج البيانات الوصفية";
+$lang['metadata.description.fileIdentifier']="معرّف الملف";
+$lang['metadata.description.language']="اللغة";
+$lang['metadata.description.hierarchyLevel']="مستوى التسلسل الهرمي";
+$lang['metadata.description.contact']="جهات الإتصال";
+$lang['metadata.description.dateStamp']="طابع التاريخ";
+$lang['metadata.description.metadataStandardName']="معيار البيانات الوصفية";
+$lang['metadata.description.referenceSystemInfo']="نظام مرجعي";
+$lang['metadata.description.referenceSystemInfo.code']="الكود/الرمز";
+$lang['metadata.description.referenceSystemInfo.codeSpace']="مساحة الرمز";
+$lang['feature_catalogue']="ميزة الكتالوج/الفهرس ";
+$lang['lineage.processStep']="خطوة عملية النسب";
+$lang['lineage.processStep.processor']="المعالج";
+$lang['resourceMaintenance.maintenanceAndUpdateFrequency']="معدل/دورية التحديث";
+
+
+/* End of file iso19139_fields */
+/* Location: ./application/language/arabic/iso19139_fields */
\ No newline at end of file
diff --git a/application/language/arabic/licensed_access_form_lang.php b/application/language/arabic/licensed_access_form_lang.php
index e7ba321a9..ba9c04d0e 100644
--- a/application/language/arabic/licensed_access_form_lang.php
+++ b/application/language/arabic/licensed_access_form_lang.php
@@ -1,116 +1,86 @@
 <?php 
-$lang['Line ministry/public administration']="وزارة/ ادارة عمومية";
-$lang['University']="جامعة";
-$lang['Research centre']="مركز بحوث
-";
-$lang['Private company']="شركة خاصة
-";
-$lang['International organization']="منظمة دولية
-";
-$lang['Non-governmental agency (national)']="منظمة غير حكومية (وطنية)
-";
-$lang['Non-governmental agency (international)']="المنظمة غير الحكومية (دولية)
-";
-$lang['Other']="أخرى
-";
-$lang['application_access_licensed_dataset']="طلب للنفاذ الى البيانات بموجب ترخيص
-";
-$lang['required_fields']="الحقوالتي تحتوي على * فهي إلزامية.
-";
-$lang['info_kept_confidential']=" المعلومات  المدخلة في هذا النموذج يجب ان تعتبر سرية ولا تستخدم إلا لأغراض داخلية";
-$lang['dataset_requested']=" البيانات المطلوبة ";
-$lang['filled_lead_research']="<p>يجب ملء هذا النموذج و تقديمه من طرف الباحث الرئيسي. الباحث الرئيسي هو الشخص الذي بمثابة نقطة الاتصال الرئيسية لجميع الاتصالات التي ينطوي عليها هذا الاتفاق. الحصول على الترخيص
- لن يتم الا في حالة ان الباحث الرسمي هو موظف في وكالة(جامعة، شركة، مركز البحوث ، منظمة وطنية أو دولية، إلخ) لها قانونيا حق الحصول على البيانات. الباحث الرئيسي يتحمل كامل المسؤولية عن الامتثال لجميع شروط هذا الاتفاق من قبل موظفي المنظمة المتلقية.<p/>
-
-
-<p>سيتم النظر في هذا الطلب من قبل لجنة النفاذ الي البيانات، الذين يرجع لهم قرار الموافقة على الطلب ، لرفض الوصول إلى البيانات ، أو لطلب معلومات إضافية من الباحثين. ويمكن أيضا طلب نسخة موقعة من مطلب النفاذ.
- إذا تمت الموافقة عليه، سيتم تقديم البيانات والوثائق المتعلقة بها في CD-ROM/DVD أو من خلال خادم بروتوكول نقل الملفات.<p/>
-
-<p>ويقدم هذا الطلب نيابة عن: <p/>
-";
-$lang['receiving_org']="اسم المؤسسة المستفيدة :
-";
-$lang['rec_org_refers']=" المؤسسة المستفيدة هي الجامعة ،المنظمة ،او الشركة التي يعمل بها الباحث الرئيسي.
-";
-$lang['org_type']="نوع المؤسسة
-";
-$lang['other']="اذا كان غير ذلك ، يرجى تحديد :
-";
-$lang['post_add']="العنوان البريدي
-";
-$lang['telephone']="رقم الهاتف (رمز البلد)
-";
-$lang['fax']="الفاكس (مع رمز البلد)
-";
-$lang['intended_use']="الهدف من وراء استخدام البيانات :
-";
-$lang['provide_short_desc']="يرجى تقديم وصفا موجزا لمشروع البحث (الموضوع ،الأهداف ،المنهجية ،النتائج المتوقعة ، والشركاء).
-";
-$lang['expected_output']="قائمة المنتجات (المطبوعات ، والكتب ، الخ) وسياست نشرهم
-";
-$lang['expected_completion']="الموعد المتوقع لاكتمال مشروع البحث :
-";
-$lang['data_matching']="دمج ملفات
-";
-$lang['merge_dataset']="هل تريد دمج هذه الملفات مع ملفات بيانات أخرى؟
-";
-$lang['other_data_merge']="إذا كان الجواب بنعم ، يرجى تحديد كافة الملفات الأخرى (حدد ماّتاهم ومضمونهم)
-";
-$lang['research_team']="أعضاء فريق البحث (بخلاف الباحث الرئيسي)
-";
-$lang['provide_names']="حدد اسم وعنوان وانتماء جميع أعضاء فريق البحث الآخرين الذين لهم حق النفاذ إلى لبيانات";
-$lang['ident_needed']=" تحديد الملفات والمتغيرات المطلوبة";
-$lang['da_website']=" هذا الموقع يقدم وصفا مفصلا لملفات البيانات والمتغيرات. الباحثون الذين ليس لديهم الحاجة الماسة لكافة الملفات / كافة المتغيرات يمكنهم تحديد مجموعة فرعية من المتغيرات. ونظرا لانخفاض نسبة إعادة تحديد المجيبين ، احتمال تلبية الطلب تكون اعلى";
-$lang['this_request']="هذا الطلب يتعلق بالنفاذ :
-";
-$lang['whole_dataset']="على جميع بيانات الدراسة (جميع السجلات وجميع المتغيرات)
-";
-$lang['subset_data']="مجموعة فرعية من المتغيرات و / أو السجلات الموصوفة ادناه  (لاحظ ان المتغيرات مل متغير التوزين و متغير التعريف تكون دائما ضمن هاته المجموعة ) ";
-$lang['data_access_agreement']="عقد النفاذ إلى البيانات";
-$lang['i_read_and_agree']="لقد اطلعت على الشروط و قبلتها";
-$lang['agreement_text']="<p>ممثل المنظمة المتلقية يوافق على الامتثال للشروط التالية : <p>
-<ol> 
-<li> يقتصر النفاذ إلى البيانات على الباحث الرئيسي و الباحثين من أعضاء فريق البحث المدرج في هذا الطلب..<li/>
- 
-<li>نسخ من هذه البيانات أو أي بيانات اخري تم إنشاؤها على أساس البيانات الأصلية لا يمكن  إتاحتها لأي اشخاص غير تلك المذكورة في هذا الاتفاق، ما لم يأذن رسميا من طرف أرشيف البيانات.<li/>
-
-<li> يتم معالجة البيانات لغرض البحوث الإحصائية. ويتم استخدامهالمجرد الإبلاغ عن المعلومات المجمعة ، وليس من أجل التحقيق في أفراد معينين أو منظمات. لا يحق استعمال البيانات في أي حال من الأحوال لأغراض إداريةأو قانونية..<li/>
- 
-<li> يجب ان يعلن الباحث الرئيسي إذا كان يقصد مطابقة البيانات الجزئية المحدودة مع أي مجموعة بيانات أخرى. ويجب تقديم تفاصيل عن مجموعات البيانات وأسباب المطابقة. كما تخضع البيانات التي انشأت  لقيود، ويجب أن تمتثل لشروط الاتفاق حول البيانات الاصلية. .<li/>
- 
-
-<li>يجب ان يتعهد الباحث الرئيسي بعدم محاولة تحديد هوية أي فرد او اسرة اومؤسسة أو منظمة. إذا اكشاف عن غير قصد ، فسوف لن يقع استخدام لهوية أي شخص أو مؤسسة وسيتم الإبلاغ عن التفاصيل الكاملة للمكلف بالأرشيف. ولن يتم الكشف عن الهوية المكتشفة لأي شخص غير مدرج في اتفاق الوصول إلى البيانات. .<li/>
-
- 
-<li>فعلي الباحث الرئيسي تنفيذ تدابير أمنية لمنع نفاذ اشخاص غير مصرح لهم إلى البيانات الجزئية. لا بد من فسخ البيانات الجزئية عند الانتهاء من هذا البحث ، ما لم يوقع إذن كتابي للاحتفاظ بهم مصحوب بضمان أن البيانات محفوضة بطريقة جيدة.<li/>
-
- 
-<li>أي كتب اومقالات اوأوراق مؤتمرات وأطروحات اورسائل وتقارير ، أو غيرها من المنشورات التي تستخدم البيانات التي تم الحصول عليها من أرشيف البيانات سوف تستشهد بمصدر البيانات وفقا للمتطلبات الاقتباس المنصوص عليها.<li/>
- 
-<li>ثمة يجب البعث بنسخة إلكترونية من جميع التقارير اوالمنشورات التي استعملت البيانات إلى أرشيف البيانات.<li/>
-
-<li>الجامع الأصلي للبيانات ، اوأرشيف البيانات  ، اووكالات التمويل ذات الصلة لا تتحمل أية مسؤولية عن استخدام البيانات أو للتفسيرات أو الاستنتاجات المستخلصة من طرف المستخدم.<li/>
- 
-<li>هذا الاتفاق سيدخل حيز التنفيذ في التاريخ الذي يتم إعطاء الموافقة على النفاذ إلى مجموعة البيانات وتبقى سارية المفعول حتى تاريخ انتهاء المشروع أو تاريخ سابق إذا تم انتهاء المشروع قبل الموعد المحدد.<li/>
- 
-
-<li>إذاطرء اي تغيير في مواصفات المشروع ، اوالترتيبات الأمنية فيجب ان يقدم الباحث الرئيسي تفصيلا في تغيير البحث مع طلب موافقة أرشيف البيانات لهذه التغيرات. عندما يكون هناك تغيير في منظومة العمل فإن هذا يستوجب توقيع مشروع جديد وإنهاء المشروع الأصلي.<li/>
- 
-<li>يجب اخذ انتهاكات الاتفاق على محمل الجد وأخذ إجراءات ضد المسؤولين عن هذاالانتهاك حتي ولو كان ذلك عن غير قصد. سيعتبر عدم الامتثال لتوجيهات أرشيف البيانات خرقا كبيرا للاتفاق ، وياًدي ذلك لإجراءات القانونية. وسوف يعطي أرشيف البيانات اسماء هؤلاء الأفراد اوالمنظمات  لكل شركائه لمنع نفاذهم لاًي بيانات في المستقبل .<li/>
- 
-<lo/> 
-
-";
-$lang['success_request_submitted']="طلبك للنفاذ الى البيانات كامل الشروط . تم إرسال رسالة تأكيد الى بريدك الإلكتروني";
-$lang['track_status_request']="لتتبع حالة طلبك،انقر على الزر";
-$lang['thank_you']="شكرا!
-";
-$lang['confirmation_application_for_licensed_dataset']="[تأكيد] طلب الحصول على البيانات بموجب ترخيص
-";
-$lang['view_all_requests']="عرض جميع الطلبات
+$lang['Line ministry/public administration']="الوزارة التنفيذية / الإدارة العامة";
+$lang['University']="الجامعة";
+$lang['Research centre']="مركز أبحاث
+";
+$lang['Private company']="شركة خاصة
+";
+$lang['International organization']="منظمة دولية
+";
+$lang['Non-governmental agency (national)']="منظمة غير حكومية (وطنية)
+";
+$lang['Non-governmental agency (international)']="منظمة غير حكومية (دولية)
+";
+$lang['Other']="أخرى
+";
+$lang['application_access_licensed_dataset']="طلب للنفاذ الى البيانات بموجب ترخيص
+";
+$lang['required_fields']="الحقول التي تحمل علامة * إلزامية.";
+$lang['info_kept_confidential']="سيتم الحفاظ على سرية المعلومات الواردة في هذه الصفحة وسيتم استخدامها للأغراض الداخلية فقط.";
+$lang['dataset_requested']="مجموعة البيانات المطلوبة:";
+$lang['filled_lead_research']="<p> يجب ملء هذا النموذج وإرساله بواسطة الباحث الرئيسي. يشير الباحث الرئيسي إلى الشخص الذي يعمل كنقطة اتصال رئيسية لجميع الاتصالات التي تتضمن هذه الاتفاقية. لن يتم منح الوصول إلى مجموعات البيانات المرخصة إلا عندما يكون الباحث الرئيسي موظفًا في وكالة استقبال مسجلة قانونًا (جامعة ، شركة ، مركز أبحاث ، منظمة وطنية أو دولية ، إلخ) والتي يُطلب الوصول إلى البيانات نيابة عنها. يتحمل الباحث الرئيسي المسؤولية الكاملة عن الامتثال للكل
+شروط اتفاقية الوصول إلى البيانات هذه من قبل موظفي المؤسسة المستقبلة. </ p>
+
+<p> ستتم مراجعة هذا الطلب من قبل لجنة إصدار البيانات ، والتي قد تقرر الموافقة على الطلب ، أو رفض الوصول إلى البيانات ، أو طلب معلومات إضافية من الباحث الرئيسي. قد يتم أيضًا طلب نسخة موقعة من نموذج الطلب هذا. </p>
+
+<p> يتم تقديم هذا الطلب نيابة عن: </ p>";
+$lang['receiving_org']="اسم المؤسسة المستفيدة :
+";
+$lang['rec_org_refers']="تشير المنظمة المستفيدة أو المستقبلة للبيانات إلى المنظمة / الجامعة / المؤسسة التي توظف الباحث الرئيسي.";
+$lang['org_type']="نوع المؤسسة
+";
+$lang['other']="اذا كان غير ذلك ، يرجى تحديد :
+";
+$lang['post_add']="العنوان البريدي
+";
+$lang['telephone']="رقم الهاتف (رمز البلد)
+";
+$lang['fax']="الفاكس (مع رمز البلد)
+";
+$lang['intended_use']="الهدف من وراء استخدام البيانات :
+";
+$lang['provide_short_desc']="يرجى تقديم وصف موجز لمشروعك البحثي (سؤال المشروع ، الأهداف ، الأساليب ، المخرجات المتوقعة ، الشركاء)";
+$lang['expected_output']="قائمة بالمخرجات المتوقعة وسياسة النشر";
+$lang['expected_completion']="تاريخ الانتهاء المتوقع (DD-MM-YYYY) من مشروع البحث:";
+$lang['data_matching']="مطابقة/دمج  البيانات";
+$lang['merge_dataset']="هل ستحتاج إلى دمج مجموعة البيانات مع بيانات أخرى؟";
+$lang['other_data_merge']="إذا كانت الإجابة بنعم ، حدد جميع مجموعات البيانات الأخرى التي ستحتاج إلى دمجها";
+$lang['research_team']="أعضاء فريق البحث (بخلاف الباحث الرئيسي)";
+$lang['provide_names']="قدم أسماء وعناوين وانتماءات/تبعيات أي أعضاء آخرين في فريق البحث ممن يمكنهم الوصول إلى البيانات المقيدة.";
+$lang['ident_needed']="تحديد ملفات البيانات والمتغيرات المطلوبة";
+$lang['da_website']="يوفر أرشيف البيانات بيانات وصفية مفصلة على موقعه على الويب ، بما في ذلك وصف ملفات البيانات والمتغيرات لكل مجموعة بيانات. قد يشير الباحثون الذين لا يحتاجون إلى الوصول إلى مجموعة البيانات الكاملة إلى أي مجموعة فرعية من المتغيرات أو الحالات التي يهتمون بها. ونظرًا لأن هذا يقلل من مخاطر الكشف ، فإن تزويدنا بهذه المعلومات قد يزيد من احتمالية توفير البيانات.";
+$lang['this_request']="هذا الطلب إذا تم تقديمه للوصول/للنفاذ:";
+$lang['whole_dataset']="مجموعة البيانات الكاملة (كل الملفات ، كل الحالات)";
+$lang['subset_data']="مجموعة فرعية من المتغيرات و / أو الحالات كما هو موضح أدناه (لاحظ أن المتغيرات مثل معاملات ترجيح/توزين العينة ومعرفات السجلات سيتم تضمينها دائمًا في مجموعات فرعية):";
+$lang['data_access_agreement']="اتفاقية الوصول إلى البيانات";
+$lang['i_read_and_agree']="لقد قرأت ووافقت على الشروط";
+$lang['agreement_text']="<p> يوافق ممثل المؤسسة المستلمة على الامتثال للشروط التالية: </ p>
+<ol>
+<li> سيقتصر الوصول إلى البيانات المقيدة على الباحث الرئيسي والأعضاء الآخرين في فريق البحث المدرجين في هذا الطلب. </ li>
+<li> لن يتم نسخ أي من البيانات المقيدة أو أي بيانات تم إنشاؤها على أساس البيانات الأصلية أو إتاحتها لأي شخص آخر غير تلك المذكورة في اتفاقية الوصول إلى البيانات هذه ، ما لم يتم الحصول على تصريح رسمي من أرشيف البيانات. </ li>
+<li> ستتم معالجة البيانات للأغراض الإحصائية والبحثية المحددة فقط. سيتم استخدامها فقط للإبلاغ عن المعلومات المجمعة ، وليس للتحقيق مع أفراد أو منظمات معينة. لن يتم استخدام البيانات بأي شكل من الأشكال لأية أغراض إدارية أو خاصة بالملكية أو لإنفاذ القانون. </li>
+<li> يجب على الباحث الرئيسي تحديد ما إذا كانت نيته مطابقة البيانات الجزئية المقيدة مع أي مجموعة بيانات مصغرة أخرى. في حالة حدوث أي مطابقة ، يجب تقديم تفاصيل مجموعات البيانات المطلوب مطابقتها وأسباب المطابقة. سيتم اعتبار أي مجموعات بيانات تم إنشاؤها نتيجة المطابقة مقيدة ويجب أن تمتثل لشروط اتفاقية الوصول إلى البيانات هذه. </ li>
+
+<li> يتعهد الباحث الرئيسي بعدم القيام بأي محاولة لتحديد أي شخص أو عائلة أو شركة أو مؤسسة . إذا تم هذا الكشف الفريد عن غير قصد ، فلن يتم استخدام هوية أي شخص أو مؤسسة تم اكتشافها وسيتم إبلاغ التفاصيل الكاملة إلى أرشيف البيانات. لن يتم الكشف عن الهوية لأي شخص آخر غير مدرج في اتفاقية الوصول إلى البيانات. </ li>
+<li> سينفذ الباحث الرئيسي إجراءات أمنية لمنع الوصول غير المصرح به إلى البيانات الجزئية المرخصة التي تم الحصول عليها من أرشيف البيانات. يجب إتلاف البيانات الجزئية عند الانتهاء من هذا البحث ، ما لم يحصل أرشيف البيانات على ضمان مُرضٍ بإمكانية تأمين البيانات ويوفر تفويضًا كتابيًا للمؤسسة المستقبلة للاحتفاظ بها. سيتم تأكيد إتلاف البيانات الجزئية كتابيًا بواسطة الباحث الرئيسي لأرشيف البيانات. </ li>
+<li> أي كتب أو مقالات أو أوراق مؤتمرات أو أطروحات أو تقارير أو منشورات أخرى تستخدم البيانات التي تم الحصول عليها من أرشيف البيانات ستشير إلى مصدر البيانات وفقًا لمتطلبات الاقتباس المتوفرة مع مجموعة البيانات. </ li>
+<li> سيتم إرسال نسخة إلكترونية من جميع التقارير والمنشورات بناءً على البيانات المطلوبة إلى أرشيف البيانات. </ li>
+<li> لا يتحمل المُجمع الأصلي للبيانات وأرشيف البيانات ووكالات التمويل ذات الصلة أية مسؤولية عن استخدام البيانات أو التفسيرات أو الاستنتاجات المستندة إلى هذه الاستخدامات. </ li>
+<li> ستدخل هذه الاتفاقية حيز التنفيذ في تاريخ منح الموافقة للوصول إلى مجموعة البيانات المقيدة وتظل سارية المفعول حتى تاريخ اكتمال المشروع أو تاريخ سابق إذا اكتمل المشروع في وقت مبكر. </ li>
+
+<li> إذا كانت هناك أي تغييرات على مواصفات المشروع أو الترتيبات الأمنية أو الموظفين أو المنظمة المفصلة في نموذج الطلب هذا ، فمن مسؤولية الباحث الرئيسي السعي للحصول على موافقة أرشيف البيانات على هذه التغييرات. عندما يكون هناك تغيير في منظمة صاحب العمل للباحث الرئيسي ، فسيتضمن ذلك تقديم طلب جديد وإنهاء المشروع الأصلي. </ li>
+<li> سيتم التعامل مع انتهاكات الاتفاقية على محمل الجد وسيتخذ أرشيف البيانات إجراءات ضد المسؤولين عن الانقضاء إذا كان متعمدًا أو عرضيًا. سيعتبر عدم الامتثال لتوجيهات أرشيف البيانات بمثابة انتهاك كبير للاتفاقية وقد ينطوي على اللجوء إلى الإجراءات القانونية. يحتفظ &quot;أرشيف البيانات&quot; بسجل لأرشيفات بيانات الشركاء ويتبادله مع هؤلاء الأفراد والمؤسسات المسؤولين عن انتهاك شروط &quot;اتفاقية الوصول إلى البيانات&quot; وسيفرض عقوبات على الإفراج عن البيانات المستقبلية إلى هذه الأطراف. </li>
+</ol>";
+$lang['success_request_submitted']="لقد قمت بإرسال طلب الوصول إلى البيانات بنجاح. تم إرسال بريد إلكتروني للتأكيد إلى عنوان بريدك الإلكتروني.";
+$lang['track_status_request']="لتتبع حالة طلبك ، قم بزيارة";
+$lang['thank_you']="شكرا!
+";
+$lang['confirmation_application_for_licensed_dataset']="[تأكيد] طلب الحصول على البيانات بموجب ترخيص
+";
+$lang['view_all_requests']="عرض جميع الطلبات
 ";
 $lang['open_in_new_window']="افتح في نافذة جديدة";
-
-
-/* End of file licensed_access_form_lang.php */
-/* Location: ./application/language/arabic/licensed_access_form_lang.php */
\ No newline at end of file
+
+
+/* End of file licensed_access_form */
+/* Location: ./application/language/arabic/licensed_access_form */
\ No newline at end of file
diff --git a/application/language/arabic/licensed_request_lang.php b/application/language/arabic/licensed_request_lang.php
index b4b5c6ac3..e1e0a7675 100644
--- a/application/language/arabic/licensed_request_lang.php
+++ b/application/language/arabic/licensed_request_lang.php
@@ -1,22 +1,22 @@
 <?php 
-$lang['title_licensed_request']="المطالب المرخصة";
-$lang['edit_licensed_request']="تعديل المطالب المرخصة";
-$lang['request_information']="معلومات عن المطالب";
-$lang['first_name']="الاسم ";
-$lang['last_name']="اللقب";
+$lang['title_licensed_request']="الطلبات المرخصة";
+$lang['edit_licensed_request']="تعديل الطلب المرخص";
+$lang['request_information']="طلب معلومات";
+$lang['first_name']="الإسم الأول";
+$lang['last_name']="إسم العائلة/اللقب";
 $lang['organization']="المنظمة";
 $lang['email']="البريد الالكتروني";
 $lang['dataset_requested']="مجموعة البيانات المطلوبة";
-$lang['receiving_organization_name']="اسم المنظمة المتسلمة";
+$lang['receiving_organization_name']="اسم المنظمة المستلمة/المستفيدة";
 $lang['organization_type']="نوع المنظمة";
 $lang['postal_address']="عنوان البريد";
 $lang['telephone']="الهاتف";
 $lang['fax']="الفاكس";
-$lang['intended_use_of_data']="القصد من استعمال اليانات";
-$lang['list_expected_output']="قائمة المخرجات المتوقعة وسياسة النشر";
-$lang['expected_completion_date']="الموعد المتوقع للانتهاء من مشروع البحث";
-$lang['data_matching']="ربط البيانات";
-$lang['research_team_members']="أعضاء فريق البحث (غير رئيسة فريق البحث)";
+$lang['intended_use_of_data']="القصد/الهدف من استعمال البيانات";
+$lang['list_expected_output']="قائمة بالمخرجات المتوقعة وسياسة النشر";
+$lang['expected_completion_date']="تاريخ الانتهاء المتوقع (DD-MM-YYYY) من مشروع البحث";
+$lang['data_matching']="ربط/دمج البيانات";
+$lang['research_team_members']="أعضاء فريق البحث (بخلاف الباحث الرئيسي)";
 $lang['identification_data_files_and_variables_needed']="تحديد ملفات البيانات والمتغيرات المطلوبة";
 $lang['need_merge_data']=" هل تريد دمج مجموعة البيانات مع بيانات أخرى ?";
 $lang['specify_other_datasets']="إذا كان الجواب نعم الرجاء تحديد كل مجموعات البيانات المراد دمجها ";
@@ -25,19 +25,19 @@
 $lang['request_status']="حالة الطلب";
 $lang['approved']="مصادق عليه";
 $lang['tab_process']="معالجة";
-$lang['select_action']="حدد العمل";
-$lang['approve']="صادق";
+$lang['select_action']="حدد العمل/الفعل";
+$lang['approve']="صادق/وافق";
 $lang['deny']="رفض";
-$lang['request_more_info']="يحتاج معلومات اضافية";
+$lang['request_more_info']="طلب المزيد من المعلومات";
 $lang['cancel_authorization']="الغاء الترخيص";
 $lang['comments']="تعليقات";
-$lang['grant_access_to_files']="منح حق النفاذ إلى ملفات البيانات المرخصة";
+$lang['grant_access_to_files']="منح حق الوصول إلى ملفات البيانات المرخصة";
 $lang['file']="ملف";
 $lang['download_limit']="حد التنزيل";
-$lang['expiry']="انقضاء";
-$lang['change_setting_all']="لتغيير كافة الإعدادات في وقت واحد ،الرجاء ملء كل الخانات ثم انقر علي تطبيق.";
-$lang['multiple_ip']=" استعمل فاصلة لإدخال عدة عناوين IP";
-$lang['restrict_access_by_ip']="تقييد النفاذ إلى البيانات بعناوين  IP";
+$lang['expiry']="انقضاء/إنتهاء";
+$lang['change_setting_all']="لتغيير جميع الإعدادات مرة واحدة ، املأ المربعات وانقر فوق &quot;تطبيق&quot;.";
+$lang['multiple_ip']="استخدم الفاصلة لإدخال عناوين IP متعددة";
+$lang['restrict_access_by_ip']="تقييد الوصول إلى البيانات عن طريق IP";
 $lang['tab_monitor']="مراقب";
 $lang['download_summary']="ملخص التنزيل";
 $lang['downloaded']="تم تنزيلها";
@@ -49,53 +49,84 @@
 $lang['username']="اسم المستخدم";
 $lang['dated']="مؤرخ ب";
 $lang['requested_by']="مطلوبة من طرف";
-$lang['return_request_home']="العودة إلى قائمة الاستعلامات";
-$lang['tab_communicate']="أبلغ";
-$lang['whole_dataset']="جميع الملفات";
+$lang['return_request_home']="العودة إلى قائمة الطلبات";
+$lang['tab_communicate']="أبلغ/أتصل";
+$lang['whole_dataset']="مجموعة بيانات كاملة";
 $lang['comments_visible_to_users']="(سوف تكون التعليقات مرئية للمستخدم)";
 $lang['notify_user_by_email']="إعلام المستخدم عبر البريد الإلكتروني";
 $lang['compose_email']="كتابة رسالة بريد إلكتروني";
-$lang['use_comma_to_seperate_email']="(استخدم فاصلة لإضافة عناوين)";
-$lang['to']="ل";
+$lang['use_comma_to_seperate_email']="(استخدم الفاصلة لإضافة عناوين متعددة)";
+$lang['to']="إلى";
 $lang['cc']="نسخة";
 $lang['subject']="الموضوع";
 $lang['body']="المحتوى";
 $lang['send']="إرسال";
-$lang['title_download_expired']="انتهت صلاحية الارتباط!";
-$lang['msg_download_limit_reached']="لقد وصلت إلى حدك الاقصي للتحميل لهذا الملف.انت محدود  %d  لتحميل الملفات. إذا كنت ترغب في زيادة عدد مرات التحميل، من فضلك اتصل ب %s ";
-$lang['apply']="طبق";
-$lang['not_attached_any_licensed_files']="لم تضف ملفات مرخصة للمسح ، يرجى زيارة صفحة&quot; ملفات مرخصة&quot;  لاضافة";
-$lang['restrict_data_access_by_id']="تقييد الوصول إلى البيانات بعنوان ال IP";
-$lang['change_all_settings']="لتغيير كافة الاعدادات في آن واحد ، املء الفراغات وانقر زر التطبيق";
+$lang['title_download_expired']="انتهت صلاحية رابط التنزيل!";
+$lang['msg_download_limit_reached']="لقد وصلت إلى حد التنزيل الخاص بك لهذا الملف. أنت مقيد بـd% تنزيلات لهذا الملف. إذا كنت ترغب في زيادة عدد مرات التنزيل المسموح بها ، يرجى الكتابة إلى s% لتغيير ذلك.";
+$lang['apply']="تطبيق";
+$lang['not_attached_any_licensed_files']="لم تقم بإرفاق أي ملفات مرخصة للاستطلاع ، قم بزيارة  &quot; ملفات الاستبيان المرخصة & quot؛ صفحة لإعداد الملفات.";
+$lang['restrict_data_access_by_id']="تقييد الوصول إلى البيانات عن طريق IP";
+$lang['change_all_settings']="لتغيير جميع الإعدادات مرة واحدة ، املأ المربعات وانقر فوق &quot;تطبيق&quot;.";
 $lang['use_comma_for_multiple_ip']="افصل بين عناوين IP بفواصل. على سبيل المثال : 123.133.154.1,123.133.154.2";
 $lang['js_updating_please_wait']="تحديث ، يرجى الانتظار...";
 $lang['date_requested']="تاريخ الطلب";
 $lang['survey_title']="عنوان الدراسة";
 $lang['licensed_dataset_request_status']="حالة طلب ملف بموجب ترخيص";
-$lang['dataset_access']="النفاذ إلى البيانات";
+$lang['dataset_access']="النفاذ إلى مجموعة البيانات";
 $lang['notification_licensed_survey_request_received']="[اعلام] -- تلقي طلب ملف بموجب ترخيص";
 $lang['survey_data_files']="ملفات البيانات";
 $lang['dear']="سيدي";
-$lang['request_licensed_reviewed']="مطلبك للنفاذ الى البيانات [<b>%s</b>] نضر فيه. لعرض حالة مطلبك يرجى زيارة الموقع ";
-$lang['user_has_requested_licensed']="الستعمل <b>%s</b> قام بمطلب نفاذ الى ملف بموجب ترخيص <b>%s</b>.
+$lang['request_licensed_reviewed']="طلبك للنفاذ الى مجموعة البيانات [<b>%s</b>] تم مراجعته. لعرض حالة طلبك يرجى زيارة الموقع ";
+$lang['user_has_requested_licensed']="المستخدم <b>%s</b> قام بطلب نفاذ الى ملف بموجب ترخيص <b>%s</b>.
 ";
-$lang['to_view_request_instructions']="للإطلاع على مطلبك ادخل على موقع المشرف على NADA و انقر على &quot;طلب النفاذ الى الملفات بموجب ترخيص&quot;";
-$lang['received_licensed_request']="ال<b>%s</b>  قد تلقي مطلبك للنفاذ الى ملف بموجب ترخيص.سيتم إعلامك عبر البريد الإلكتروني بعد النضر في مطلبك";
-$lang['to_view_request_status']="لعرض حالة طلبك، يرجى زيارة الموقع :
+$lang['to_view_request_instructions']="لعرض الطلب ، قم بتسجيل الدخول إلى إدارة موقع NADA وقم بزيارة صفحة &quot;طلبات المسوح المرخصة&quot;.";
+$lang['received_licensed_request']="ال<b>%s</b>  قد تلقى طلبك للنفاذ الى ملف بموجب ترخيص.سيتم إعلامك عبر البريد الإلكتروني بعد مراجعة طلبك.";
+$lang['to_view_request_status']="لعرض حالة طلبك، يرجى زيارة الموقع :
 ";
-$lang['for_further_information']="لمزيد من المعلومات، يرجى الاتصال بنا على
+$lang['for_further_information']="لمزيد من المعلومات، يرجى الاتصال بنا على
 ";
 $lang['form_not_available']="تمت حذف النموذج و لم يعد متوفر.";
-$lang['view_all_requests']="عرض كافة التطبيقات";
+$lang['view_all_requests']="عرض كافة الطلبات";
 $lang['APPROVED']="مصادق عليه";
 $lang['DENIED']="مرفوض";
-$lang['PENDING']="تحت النضر";
-$lang['MOREINFO']="المطلوبةالمزيد من المعلومات ";
-$lang['CANCELLED']="ألغي
+$lang['PENDING']="قيد الانتظار";
+$lang['MOREINFO']="مطلوب مزيد من المعلومات";
+$lang['CANCELLED']="ألغي
 ";
-$lang['reason_login_licensed_access']="لطلب الحصول على مجموعات البيانات المرخصة، يرجى الدخول إلى الموقع للمتابعة.
-";
-
-
-/* End of file licensed_request_lang.php */
-/* Location: ./application/language/arabic/licensed_request_lang.php */
\ No newline at end of file
+$lang['reason_login_licensed_access']="لطلب الوصول إلى مجموعات البيانات المرخصة ، يرجى تسجيل الدخول إلى موقع الويب للمتابعة.";
+$lang['forward_lic_request']="أرسل/حول الطلب";
+$lang['comments_history']="سجل التعليقات";
+$lang['view_comments_history']="عرض السجل";
+$lang['comment_by']="بواسطة";
+$lang['show_hide']="عرض/إخفاء";
+$lang['comment']="تعليق";
+$lang['communicate_history']="سجل/تاريخ";
+$lang['sent_by']="أرسل بواسطة";
+$lang['forward_history']="سجل/تاريخ";
+$lang['data_restricted_use']="يتم توفير البيانات فقط للغرض الموضح في نموذج الطلب ، لتتمكن من استخدام البيانات لأي غرض آخر، قدم طلب وصول/نفاذ جديد.";
+$lang['data_request_for']="طلب بيانات";
+$lang['request_history']="عرض سجل الطلب";
+$lang['study_notes']="عرض ملاحظات الدراسة";
+$lang['note_type']="النوع";
+$lang['note']="ملاحظة";
+$lang['additional_info']="طلبت معلومات إضافية";
+$lang['request_additional_info_submitted']="شكرا لك على تحديث الطلب. سنعلمك عبر البريد الإلكتروني بمجرد مراجعة طلبك.";
+$lang['email_sent']="تم ارسال رسالتك!";
+$lang['provide_additonal_info_for_your_request']="الرجاء استخدام هذا المربع لتقديم المعلومات الإضافية اللازمة لمعالجة طلب البيانات الخاص بك.";
+$lang['click_on_a_lic_request_to_see_status_or_download_data']="انقر فوق طلب لعرض الحالة أو تنزيل البيانات للطلبات المعتمدة.";
+$lang['make_new_lic_request']="تقديم طلب جديد";
+$lang['no_microdata_files_found']="لم يتم العثور على ملفات البيانات الجزئية!";
+$lang['all_requests']="كل الطلبات";
+$lang['pending']="قيد الانتظار";
+$lang['denied']="مرفوض";
+$lang['cancelled']="ملغى";
+$lang['study_data_files']="ملفات البيانات الجزئية";
+$lang['study_resources']="موارد الدراسة";
+$lang['other_materials']="مواد أخرى";
+$lang['datasets_requested']="تم طلب مجموعة (مجموعات) البيانات";
+$lang['request_title']="عنوان الطلب";
+$lang['download_microdata_and_resources']="تنزيل &quot;البيانات الجزئية&quot; والمواد الأخرى ذات الصلة";
+
+
+/* End of file licensed_request */
+/* Location: ./application/language/arabic/licensed_request */
\ No newline at end of file
diff --git a/application/language/arabic/menu_lang.php b/application/language/arabic/menu_lang.php
index e730a8e99..27e5c9071 100644
--- a/application/language/arabic/menu_lang.php
+++ b/application/language/arabic/menu_lang.php
@@ -4,16 +4,16 @@
 $lang['menu_add_link']=" أضف رابط جديد";
 $lang['menu_home']="القائمة الرئيسية";
 $lang['menus']="القوائم";
-$lang['menu_edit']=" تعديل القائمة";
+$lang['menu_edit']=" تعديل/تحرير القائمة";
 $lang['menu_add']="إنشاء قائمة جديدة";
 $lang['menu_create_link']="أضف رابط جديد";
-$lang['menu_edit_link']="تعديل الرابط";
+$lang['menu_edit_link']="تعديل/تحرير الرابط";
 $lang['menu_reorder']=" إعادة ترتيب القائمة";
-$lang['menu_reorder_instructions']="لتغيير النظام في عناصر القائمة ، انقر على السطر واسحبه إلى الموقع الجديد.";
+$lang['menu_reorder_instructions']="لتغيير ترتيب عناصر القائمة ، انقر فوق الصف واسحبه إلى الموقع الجديد.";
 $lang['batch_actions']="دفعة إجراءات";
 $lang['apply']="تطبيق";
 $lang['all_fields']="كل المجالات";
-$lang['body']="الهيئة";
+$lang['body']="التفاصيل";
 $lang['title']="العنوان";
 $lang['url']="عنوان الموقع(URL)";
 $lang['type']="النوع";
@@ -39,8 +39,8 @@
 $lang['form_update_success']="تم تحديث النموذج بنجاح!";
 $lang['form_update_fail']=" فشل في تحديث قاعدة البيانات";
 $lang['callback_error_url_exists']="ال s% موجود مسبقا. الرجاء اختيار عنوان مختلف.";
-$lang['weight']="ترجيح";
-
-
-/* End of file menu_lang.php */
-/* Location: ./application/language/arabic/menu_lang.php */
\ No newline at end of file
+$lang['weight']="ترجيح/وزن";
+
+
+/* End of file menu */
+/* Location: ./application/language/arabic/menu */
\ No newline at end of file
diff --git a/application/language/arabic/open_data_lang.php b/application/language/arabic/open_data_lang.php
new file mode 100644
index 000000000..4d1e176d0
--- /dev/null
+++ b/application/language/arabic/open_data_lang.php
@@ -0,0 +1,17 @@
+<?php 
+$lang['open_terms_and_conditions']="الأحكام والشروط";
+$lang['open_terms_of_use']="<ul>
+<li> لك مطلق الحرية في نسخ البيانات أو توزيعها أو تكييفها أو عرضها أو تضمينها في منتجات أخرى لأغراض تجارية وغير تجارية دون أي تكلفة وفقًا لقيود معينة ملخصة أدناه.
+<li> يجب عليك تضمين الإسناد للبيانات التي تستخدمها بالطريقة الموضحة في البيانات الوصفية المضمنة في البيانات.
+<li> يجب ألا تدعي أو تشير ضمنًا إلى أن البنك الدولي يؤيد استخدامك للبيانات بواسطة أو استخدام شعار (شعارات) البنك الدولي أو علامته التجارية (علاماته التجارية) بالاقتران مع هذا الاستخدام.
+<li> قد يكون لأطراف أخرى مصالح ملكية في بعض المواد الواردة في موقع البنك الدولي على الويب. على سبيل المثال،
+نحتفظ بقائمة ببعض البيانات المحددة ضمن مجموعات البيانات التي لا يجوز لك إعادة توزيعها أو إعادة استخدامها دون الاتصال أولاً بموفر المحتوى الأصلي ، بالإضافة إلى المعلومات المتعلقة بكيفية الاتصال بموفر المحتوى الأصلي. قبل دمج أي بيانات في منتجات أخرى ، يرجى مراجعة القائمة: <a target=&quot;_blank&quot; href=&quot;http://www.worldbank.org/terms-datasets-restricted&quot;> شروط الاستخدام: البيانات المقيدة </a>
+<li> لا يقدم البنك الدولي أي ضمانات فيما يتعلق بالبيانات وأنت توافق على أن البنك الدولي لن يكون مسؤولاً تجاهك فيما يتعلق باستخدامك للبيانات.
+</ul>
+<p> هذا مجرد ملخص لشروط استخدام مجموعات البيانات المدرجة في كتالوج بيانات البنك الدولي. يرجى قراءة الاتفاقية الفعلية التي تتحكم في استخدامك لمجموعات البيانات ،
+المتاح هنا: <a target=&quot;_blank&quot; href=&quot;http://www.worldbank.org/terms-datasets&quot;> شروط استخدام مجموعات البيانات </a>. انظر أيضا
+<a target=&quot;_blank&quot; href=&quot;http://www.worldbank.org/terms&quot;> أحكام وشروط البنك الدولي </a>. </p>";
+
+
+/* End of file open_data */
+/* Location: ./application/language/arabic/open_data */
\ No newline at end of file
diff --git a/application/language/arabic/permissions_lang.php b/application/language/arabic/permissions_lang.php
new file mode 100644
index 000000000..d195df25c
--- /dev/null
+++ b/application/language/arabic/permissions_lang.php
@@ -0,0 +1,23 @@
+<?php 
+$lang['permission']="إذن/رخصة";
+$lang['permissions']="أذون/رخص";
+$lang['administrator']="مدير/مسؤول الموقع";
+$lang['permissions_list']="قائمة الأذونات/الصلاحيات";
+$lang['edit_permission']="تحرير الصلاحيات/الأذونات";
+$lang['add_permission']="إضافة إذن/صلاحية";
+$lang['urls']="روابط الويب URLs";
+$lang['catalog']="كتالوج";
+$lang['site_admin']="مشرف/مسؤول";
+$lang['vocab']="مفردات";
+$lang['user_admin']="مستخدم";
+$lang['ddibrowser']="مستعرض/متصفح DDI";
+$lang['menu_admin']="القائمة";
+$lang['general_site']="الموقع العام";
+$lang['manage_repo_permissions']="إدارة الوصول إلى المستودع";
+$lang['manage_group_permissions_for']="إدارة أذونات المجموعة لـ";
+$lang['apply_changes']="تطبيق التغييرات";
+$lang['study_access_denied']="تم الرفض. ليس لديك أذونات للوصول إلى هذه الصفحة.";
+
+
+/* End of file permissions */
+/* Location: ./application/language/arabic/permissions */
\ No newline at end of file
diff --git a/application/language/arabic/public_access_terms_lang.php b/application/language/arabic/public_access_terms_lang.php
index 459207d6e..c59eb52fa 100644
--- a/application/language/arabic/public_access_terms_lang.php
+++ b/application/language/arabic/public_access_terms_lang.php
@@ -1,41 +1,52 @@
 <?php 
-$lang['application_for_access_to_public_use_dataset']="طلب النفاذ الى ملف للإستخدام عام
-";
-$lang['fields_marked_mandatory']="الحقول التي تحتوي على * فهي إلزامية";
-$lang['msg_information_confidential']="إن المعلومات الوجودة على هذه الصفحة سرية ولا يجب ان تستخدم إلا لأغراض داخلية";
-$lang['first_name']="اسم
-";
-$lang['last_name']="لقب
+$lang['login_to_access_data']="تسجيل الدخول للوصول إلى البيانات";
+$lang['login_to_access_data_text']="للوصول إلى البيانات الخاصة بهذه الدراسة ، يجب أن يقوم المستخدم بتسجيل الدخول. انقر فوق الروابط أدناه لتسجيل الدخول أو التسجيل للحصول على حساب مجاني.";
+$lang['application_for_access_to_dataset_research']="طلب الوصول إلى مجموعة بيانات البحث";
+$lang['application_for_access_to_public_use_dataset']="طلب الوصول إلى مجموعة بيانات الاستخدام العام";
+$lang['application_for_access_to_dataset_public']="طلب الوصول إلى مجموعة بيانات الاستخدام العام";
+$lang['fields_marked_mandatory']="الحقول التي تحمل علامة * إلزامية.";
+$lang['msg_information_confidential']="سيتم الحفاظ على سرية المعلومات الواردة في هذه الصفحة وسيتم استخدامها للأغراض الداخلية فقط.";
+$lang['first_name']="الإسم الأول";
+$lang['last_name']="إسم العائلة
 ";
 $lang['organization']="المنظمة";
-$lang['email']="البريد الإلكتروني
-";
-$lang['dataset_requested']=" الملف المطلوب
-";
-$lang['intended_use_of_data']=" الهدف من استخدام البيانات
-";
-$lang['describe_your_project']="يرجى تقديم وصفا موجزا لمشروع البحث (الموضوع الأهداف ، المشروع ، الأساليب، الشركاء والمخرجات)
-";
-$lang['i_agree']="أوافق
-";
-$lang['terms_and_conditions']="الشروط";
-$lang['terms_text']="<ol>
-<li>لا يحق إعادة توزيع أو بيع البيانات لأفراد اومؤسسات ، أو المنظمات من غير المرخص لهم دون موافقة خطية من أرشيف البيانات الوطنية.<li/>
- 
-<li>وستستخدم هذه البيانات لأغراض البحوث الإحصائية والعلمية فقط. وسيتم استخدامهالإبلاغ المعلومات المجمعة ، وليس من أجل التحقيق في أفراد معينين أو منظمات.<li/>
-<li>فعلي الباحث الرئيسي تنفيذ تدابير أمنية لمنع نفاذ اشخاص غير مصرح لهم إلى البيانات الجزئية. لا بد من فسخ البيانات الجزئية عند الانتهاء من هذا البحث ، ما لم يوقع إذن كتابي للاحتفاظ بهم مصحوب بضمان أن البيانات محفوضة بطريقة جيدة<li/>
-<li> يجب ان يعلن الباحث الرئيسي إذا كان يقصد مطابقة البيانات الجزئية المحدودة مع أي مجموعة بيانات أخرى. ويجب تقديم تفاصيل عن مجموعات البيانات وأسباب المطابقة. كما تخضع البيانات التي انشأت  لقيود، ويجب أن تمتثل لشروط الاتفاق حول البيانات الاصلية. <li/> 
-<li>أي كتب اومقالات اوأوراق مؤتمرات وأطروحات اورسائل وتقارير ، أو غيرها من المنشورات التي تستخدم البيانات التي تم الحصول عليها من أرشيف البيانات سوف تستشهد بمصدر البيانات وفقا للمتطلبات الاقتباس المنصوص عليها.<li/>
-<li>ثمة يجب البعث بنسخة إلكترونية من جميع التقارير اوالمنشورات التي استعملت البيانات إلى أرشيف البيانات.<li/>
-<li>الجامع الأصلي للبيانات ، اوأرشيف البيانات  ، اووكالات التمويل ذات الصلة لا تتحمل أية مسؤولية عن استخدام البيانات أو للتفسيرات أو الاستنتاجات المستخلصة من طرف المستخدم. <li/>
-<ol>
-
-<p>من خلال استمراركم بعد هذه النقطة في عملية النفاذ الى البيانات، تتعهدون بالامتثال للشروط المذكورة أعلاه و تتعهدون باستخدام البيانات الإحصائية التي تم الحصول عليها وفقا للمعايير القانونية التي تهدف إلى حماية سرية الأفراد.<p/>
-
-";
-$lang['public_use_files']=" ملفات للإستخدام عام
-";
-
-
-/* End of file public_access_terms_lang.php */
-/* Location: ./application/language/arabic/public_access_terms_lang.php */
\ No newline at end of file
+$lang['email']="البريد الإلكتروني
+";
+$lang['dataset_requested']="مجموعة البيانات المطلوبة";
+$lang['intended_use_of_data']=" الهدف من استخدام البيانات
+";
+$lang['describe_your_project']="يرجى تقديم وصف موجز لمشروعك البحثي (سؤال المشروع ، الأهداف ، الأساليب ، المخرجات المتوقعة ، الشركاء)";
+$lang['i_agree']="أوافق
+";
+$lang['terms_and_conditions']="الأحكام والشروط";
+$lang['terms_text_public']="<ol>
+<li> لن يتم إعادة توزيع البيانات والمواد الأخرى التي يوفرها أرشيف البيانات الوطني أو بيعها لأفراد أو مؤسسات أو منظمات أخرى دون موافقة كتابية من أرشيف البيانات الوطني. </li>
+<li> سيتم استخدام البيانات لأغراض البحث الإحصائي والعلمي فقط. سيتم استخدامها فقط للإبلاغ عن المعلومات المجمعة ، وليس للتحقيق مع أفراد أو مؤسسات معينة. </ li>
+<li> لن يتم إجراء أي محاولة لإعادة تعريف المستجيبين ، ولن يتم استخدام هوية أي شخص أو مؤسسة يتم اكتشافها عن غير قصد. سيتم الإبلاغ عن أي اكتشاف من هذا القبيل على الفور إلى أرشيف البيانات الوطني. </ li>
+<li> لن يتم إجراء أي محاولة لإنتاج روابط بين مجموعات البيانات التي يوفرها أرشيف البيانات الوطني ، أو بين البيانات من أرشيف البيانات الوطني ومجموعات البيانات الأخرى التي يمكن أن تحدد الأفراد أو المنظمات. </ li>
+<li> أي كتب أو مقالات أو أوراق مؤتمرات أو أطروحات أو تقارير أو منشورات أخرى تستخدم البيانات التي تم الحصول عليها من أرشيف البيانات الوطني ستشير إلى مصدر البيانات وفقًا لمتطلبات الاقتباس المقدمة مع كل مجموعة بيانات. </ li>
+<li> سيتم إرسال نسخة إلكترونية من جميع التقارير والمنشورات بناءً على البيانات المطلوبة إلى أرشيف البيانات الوطني. </ li>
+<li> لا يتحمل الجامع الأصلي للبيانات وأرشيف البيانات الوطني ووكالات التمويل ذات الصلة أية مسؤولية عن استخدام البيانات أو التفسيرات أو الاستنتاجات القائمة على هذه الاستخدامات. </ li>
+</ol>
+<p> من خلال الاستمرار في تجاوز هذه النقطة إلى عملية استرداد البيانات ، فإنك تشير إلى موافقتك على الامتثال للشروط والأحكام المذكورة أعلاه وتؤكد لك أن استخدام البيانات الإحصائية التي تم الحصول عليها من أرشيف البيانات الوطني سوف يتوافق مع الشروط المقبولة على نطاق واسع معايير الممارسة والقيود القانونية التي تهدف إلى حماية سرية المستجيبين. </ p>";
+$lang['public_use_files']=" ملفات للإستخدام العام PUF
+";
+$lang['surveys_in_collection']="المجموعة [s%] تحتوي على المسوح التالية:";
+$lang['collection_data_files']="ملفات الاستخدام العام حسب المجموعة";
+$lang['collection_requested']="طلبات الوصول إلى المجموعة";
+$lang['public_use_data_access_by_collection_message']="لقد تم منحك حق الوصول إلى جميع دراسات الاستخدام العام في المجموعة. يرجى زيارة كل صفحة دراسة لتنزيل ملفات البيانات والوثائق الأخرى.";
+$lang['public_use_data_access_by_collection']="تنزيل ملفات البيانات";
+$lang['terms_text_research']="<ol>
+<li> لن يتم إعادة توزيع البيانات والمواد الأخرى التي يوفرها أرشيف البيانات الوطني أو بيعها لأفراد أو مؤسسات أو منظمات أخرى دون موافقة كتابية من أرشيف البيانات الوطني. </li>
+<li> سيتم استخدام البيانات لأغراض البحث الإحصائي والعلمي فقط. سيتم استخدامها فقط للإبلاغ عن المعلومات المجمعة ، وليس للتحقيق مع أفراد أو مؤسسات معينة. </ li>
+<li> لن يتم إجراء أي محاولة لإعادة تعريف المستجيبين ، ولن يتم استخدام هوية أي شخص أو مؤسسة يتم اكتشافها عن غير قصد. سيتم الإبلاغ عن أي اكتشاف من هذا القبيل على الفور إلى أرشيف البيانات الوطني. </ li>
+<li> لن يتم إجراء أي محاولة لإنتاج روابط بين مجموعات البيانات التي يوفرها أرشيف البيانات الوطني ، أو بين البيانات من أرشيف البيانات الوطني ومجموعات البيانات الأخرى التي يمكن أن تحدد الأفراد أو المنظمات. </ li>
+<li> أي كتب أو مقالات أو أوراق مؤتمرات أو أطروحات أو تقارير أو منشورات أخرى تستخدم البيانات التي تم الحصول عليها من أرشيف البيانات الوطني ستشير إلى مصدر البيانات وفقًا لمتطلبات الاقتباس المقدمة مع كل مجموعة بيانات. </ li>
+<li> سيتم إرسال نسخة إلكترونية من جميع التقارير والمنشورات بناءً على البيانات المطلوبة إلى أرشيف البيانات الوطني. </ li>
+<li> لا يتحمل الجامع الأصلي للبيانات وأرشيف البيانات الوطني ووكالات التمويل ذات الصلة أية مسؤولية عن استخدام البيانات أو التفسيرات أو الاستنتاجات القائمة على هذه الاستخدامات. </ li>
+</ol>
+<p> من خلال الاستمرار في تجاوز هذه النقطة إلى عملية استرداد البيانات ، فإنك تشير إلى موافقتك على الامتثال للشروط والأحكام المذكورة أعلاه وتؤكد لك أن استخدام البيانات الإحصائية التي تم الحصول عليها من أرشيف البيانات الوطني سوف يتوافق مع الشروط المقبولة على نطاق واسع معايير الممارسة والقيود القانونية التي تهدف إلى حماية سرية المستجيبين. </ p>";
+
+
+/* End of file public_access_terms */
+/* Location: ./application/language/arabic/public_access_terms */
\ No newline at end of file
diff --git a/application/language/arabic/public_request_lang.php b/application/language/arabic/public_request_lang.php
index 35a0ecfe0..3675b5763 100644
--- a/application/language/arabic/public_request_lang.php
+++ b/application/language/arabic/public_request_lang.php
@@ -1,26 +1,25 @@
 <?php 
-$lang['public_request']="مطلب عام";
-$lang['request_date']="تاريخ الطلب
+$lang['public_request']="طلب عام";
+$lang['request_date']="تاريخ الطلب
 ";
-$lang['study_title']="عنوان الدراسة
+$lang['study_title']="عنوان الدراسة
 ";
-$lang['study_id']=" ID الدراسة";
-$lang['email']="البريد الإلكتروني
+$lang['study_id']="رقم/معرّف الدراسة";
+$lang['email']="البريد الإلكتروني
 ";
-$lang['request_id']="ID المطلب";
-$lang['full_name']="الاسم الكامل
+$lang['request_id']="رقم/معرّف  الطلب";
+$lang['full_name']="الاسم الكامل
 ";
-$lang['username']="اسم المستخدم
+$lang['username']="اسم المستخدم
 ";
-$lang['phone']="الهاتف
+$lang['phone']="الهاتف
 ";
-$lang['country']="البلد
+$lang['country']="البلد
 ";
-$lang['intended_data_use']=" الهدف من استخدام البيانات
+$lang['intended_data_use']=" الهدف من استخدام البيانات
 ";
-$lang['reason_login_public_access']="لطلب الحصول على مجموعات البيانات المرخصة، يرجى الدخول إلى الموقع للمتابعة.
-";
-
-
-/* End of file public_request_lang.php */
-/* Location: ./application/language/arabic/public_request_lang.php */
\ No newline at end of file
+$lang['reason_login_public_access']="للوصول إلى ملفات الوصول العام ، يرجى تسجيل الدخول أو التسجيل للمتابعة.";
+
+
+/* End of file public_request */
+/* Location: ./application/language/arabic/public_request */
\ No newline at end of file
diff --git a/application/language/arabic/reports_lang.php b/application/language/arabic/reports_lang.php
index 7bbe7e51b..0554ed707 100644
--- a/application/language/arabic/reports_lang.php
+++ b/application/language/arabic/reports_lang.php
@@ -1,78 +1,76 @@
 <?php 
 $lang['reports']="التقارير";
-$lang['select_reporting_period']="حدد الفترة التي تهمك
-";
+$lang['select_reporting_period']="حدد فترة التقرير";
 $lang['from']="من";
-$lang['to']="الي";
-$lang['select_report']="حدد التقرير
-";
-$lang['top_search_keywords']="الكلمات المفاتيح الاكثر بحثا
-";
-$lang['most_viewed_studies_summary']=" الدراسات الاكثر اطلاع (موجز)
+$lang['to']="إلى";
+$lang['select_report']="حدد/إختر التقرير
 ";
-$lang['most_viewed_studies_detailed']="الدراسات الاكثر اطلاع (التفاصيل)
-";
-$lang['total_hits']="عدد النقرات ، المجموع
+$lang['top_search_keywords']="أهم كلمات البحث";
+$lang['most_viewed_studies_summary']="الدراسات الأكثر مشاهدة (ملخص)";
+$lang['most_viewed_studies_detailed']="الدراسات الأكثر مشاهدة (مفصلة)";
+$lang['total_hits']="مجموع الضربات/النقرات
 ";
 $lang['hits']="النقرات";
-$lang['study_id']=" IDالدراسة";
-$lang['study_title']="عنوان الدراسة
+$lang['study_id']="رقم/معرّف الدراسة";
+$lang['study_title']="عنوان الدراسة
 ";
-$lang['downloads_detailed']=" تحميلات الدراسة
+$lang['downloads_detailed']=" تنزيلات الدراسة
 ";
-$lang['download_as']="حمل الدراسةفي شكل ";
-$lang['excel']="إكسل
+$lang['download_as']="تنزيل التقرير بتنسيق:";
+$lang['excel']="إكسل
 ";
-$lang['username']="اسم المستخدم
+$lang['username']="اسم المستخدم
 ";
-$lang['email']="البريد الإلكتروني
+$lang['email']="البريد الإلكتروني
 ";
-$lang['country']="البلد
+$lang['country']="البلد
 ";
 $lang['ip_address']="العنوان IP";
-$lang['licensed_requests']="استمارات طلب ملفات بموجب ترخيص
-";
-$lang['status']="حالة";
+$lang['licensed_requests']="الطلبات المرخصة";
+$lang['status']="الحالة";
 $lang['requested_on']="طلب في";
-$lang['updated_on']=" تاريخ التحديث";
+$lang['updated_on']=" حٌدث في";
 $lang['updated_by']="قام بالتحديث";
-$lang['comments']="تعليقات
+$lang['comments']="تعليقات
 ";
-$lang['organization']="منظمة
+$lang['organization']="منظمة
 ";
-$lang['study_statistics']=" دراسةإحصائية ";
+$lang['study_statistics']="احصاءات الدراسة";
 $lang['updated']="تحديث";
-$lang['variables']="المتغيرات
-";
-$lang['access_type']="طريقة النفاذ";
-$lang['year']="السنة
+$lang['variables']="المتغيرات
 ";
-$lang['data_files']="ملفات البيانات
+$lang['access_type']="نوع النفاذ/الوصول";
+$lang['year']="السنة
 ";
-$lang['citations']="اقتباسات
+$lang['data_files']="ملفات البيانات
 ";
-$lang['questionnaires']="الاستبيانات
+$lang['citations']="اقتباسات
 ";
-$lang['users_statistics']="إحصاءات حول المستخدم
+$lang['questionnaires']="الإستمارات
 ";
-$lang['group']="المجموعة
+$lang['users_statistics']="إحصاءات حول المستخدم
 ";
-$lang['phone']="الهاتف
+$lang['group']="المجموعة
 ";
-$lang['date_joined']="تاريخ التسجيل
+$lang['phone']="الهاتف
 ";
-$lang['last_online']="آخر إتصال عبر الإنترنت
+$lang['date_joined']="تاريخ الانضمام/التسجيل";
+$lang['last_online']="آخر إتصال عبر الإنترنت
 ";
-$lang['view_complete_site_logs']="لمشاهدة السجلات الكاملة للموقع ، انقر هنا
+$lang['view_complete_site_logs']="لمشاهدة السجلات الكاملة للموقع ، انقر هنا
 ";
-$lang['public_requests']="مطالب
+$lang['public_requests']="طلبات عامة
 ";
-$lang['dated']="مؤرخة
+$lang['dated']="مؤرخة
 ";
-$lang['intended_use']=" هدف الاستخدام
+$lang['intended_use']=" هدف الاستخدام
 ";
 $lang['details']="تفاصيل";
-
-
-/* End of file reports_lang.php */
-/* Location: ./application/language/arabic/reports_lang.php */
\ No newline at end of file
+$lang['missing_data']="ملفات البيانات المفقودة للدراسات";
+$lang['studies_data_access']="ملفات البيانات المفقودة للدراسات";
+$lang['repositoryid']="مستودع";
+$lang['titl']="عنوان الدراسة";
+
+
+/* End of file reports */
+/* Location: ./application/language/arabic/reports */
\ No newline at end of file
diff --git a/application/language/arabic/resource_manager_lang.php b/application/language/arabic/resource_manager_lang.php
index c6f279f41..f48eff355 100644
--- a/application/language/arabic/resource_manager_lang.php
+++ b/application/language/arabic/resource_manager_lang.php
@@ -16,135 +16,135 @@
 $lang['not_linked']="غير مرتبطة";
 $lang['data_files']="ملفات البيانات";
 $lang['other_resources']="الموارد الأخرى";
-$lang['total_files_count']="عدد مجموع الملفات: ";
+$lang['total_files_count']="مجموع عدد الملفات: ";
 $lang['data_selection_apply_to_files']="سوف يتم تطبيق نوع النفاذ الى البيانات على الملفات التالية";
 $lang['links']="روابط";
-$lang['study_no_data_files_assigned']="لم يتم تحديد ملفات البيانات في هذه الدراسة , لتعيين ملفات البيانات استخدام تبويب  %s ";
+$lang['study_no_data_files_assigned']="لم يتم تعيين أي ملفات كـبيانات جزئية لهذه الدراسة.";
 $lang['add_external_resource']="إضافة الموارد الخارجية ";
 $lang['edit_external_resource']="تعديل الموارد الخارجية ";
 $lang['import_external_resources']="استيراد الموارد الخارجية ";
 $lang['error_import_failed']="لم يتم استيراد الملف.";
-$lang['resource_already_exists']="الموارد موجودة بالفعل ، لم يتم الاستيراد : ";
+$lang['resource_already_exists']="المورد موجود بالفعل ، تم تخطي الاستيراد:";
 $lang['n_resources_imported']="d% موارد تم استيرادها.";
 $lang['link_resource_home']="الصفحة الرئيسية للموارد";
-$lang['authors']="الكتّاب";
+$lang['authors']="الكتّاب/المؤلفون";
 $lang['language']="اللغة";
-$lang['format']="الصيغة";
+$lang['format']="الصيغة/التنسيق";
 $lang['country']="البلد";
-$lang['contributors']="المساهمين";
-$lang['publishers']="الناشرين";
+$lang['contributors']="المساهمون";
+$lang['publishers']="الناشرون";
 $lang['description']=" الوصف";
-$lang['abstract']="خلاصة";
+$lang['abstract']="ملخص";
 $lang['table_of_contents']="جدول المحتويات";
 $lang['resource_url_filepath']="عنوان URL أو عنوان نسبي إلى المورد ";
-$lang['resource_type']=" نوع من المورد";
+$lang['resource_type']=" نوع المورد";
 $lang['legend_file_exist']="تم العثور على ملف";
 $lang['legend_file_no_exist']="لم يتم العثور على ملف";
-$lang['link_add_new_resource']="أضف مورد";
-$lang['link_import_rdf']=" rdf استرد ملف ";
-$lang['link_fix_broken']="إقامة روابط";
+$lang['link_add_new_resource']="أضف مورد جديد";
+$lang['link_import_rdf']="استيراد ملف RDF";
+$lang['link_fix_broken']="ربط الموارد";
 $lang['title_import_rdf']="استيراد الموارد الخارجية";
-$lang['select_rdf_file']="(RDF.)حدد الملف ";
-$lang['create_folder_structure']="إنشاء هيكل الدليل";
-$lang['title_fix_broken']="إقامة روابط";
-$lang['instruction_fix_broken']="هذه الأداة سوف تصلح المسارات إلى الموارد الخارجية لمطابقة مسارات الموزع. أولا حمل جميع الملفات المشار إليها في المواردالخارحية الخاصة بك ، ثم انقر فوق &quot;أصلح&quot; لتحديث وصلات هذه الملفات.";
+$lang['select_rdf_file']="حدد ملفًا (.RDF)";
+$lang['create_folder_structure']="إنشاء هيكل المجلد";
+$lang['title_fix_broken']="ربط الموارد";
+$lang['instruction_fix_broken']="ستصحح هذه الأداة مسارات الملفات للموارد الخارجية بحيث تتطابق مع تلك الموجودة على هذا الخادم. قم أولاً بتحميل جميع الملفات المشار إليها في الموارد الخارجية الخاصة بك ، ثم انقر فوق أصلح لتحديث الروابط إلى هذه الملفات.";
 $lang['fix_it']="أصلح";
-$lang['n_resources_fixed']="d% تم تحديث الموارد.ويرد  مفصل الانتاج النصي أدناه :
- ";
-$lang['legend_not_fixed']="لم يصلح";
-$lang['legend_fixed']="اّصلح";
+$lang['n_resources_fixed']="تم تحديث d% من الموارد. ";
+$lang['legend_not_fixed']="لم يتم الإصلاح";
+$lang['legend_fixed']="تم الإصلاح";
 $lang['indicator_database']="قاعدة بيانات المؤشرات";
-$lang['study_website']="موقع الدراسة";
-$lang['home_folder_hover']="مصدر ملف الدراسة";
-$lang['home_folder']="الدليل الرئيسي";
-$lang['folder_view']="عرض الملف";
-$lang['folder_view_hover']="اذهب الى عرض الملف";
-$lang['switch_view']="تغيير العرض";
-$lang['switch_view_hover']="غير كيفية عرض الصفحة";
+$lang['study_website']="الموقع الإلكتروني للدراسة";
+$lang['home_folder_hover']="المجلد الأصلي للدراسة";
+$lang['home_folder']="المجلد الرئيسي";
+$lang['folder_view']="عرض المجلد";
+$lang['folder_view_hover']="قم بالتبديل إلى عرض المجلد";
+$lang['switch_view']="تبديل/تغيير العرض";
+$lang['switch_view_hover']="بدل/غير كيفية عرض الصفحة";
 $lang['upload_files_hover']="تحميل الملفات";
-$lang['switch_view_details']="عرض التفاصيل";
-$lang['Licensed data files']="ملفات البيانات بموجب ترخيص";
-$lang['Direct access']="النفاذ المباشر";
-$lang['Public use files']="الملفات للاستخدم العام";
-$lang['Data accessible only in data enclave']="البيانات المتوفرة علي الموقع فقط";
-$lang['--Data not accessible to users--']="--البيانات الغير متوفرة--";
-$lang['msg_no_data_access_type_assigned']="لا تتوفر اية امكانية للنفاذ الي هذه الدراسة. ولذلك ،لا تتوفر ملفات للتحميل عبر هذا الموقع.";
-$lang['msg_licensed_data_access_type_assigned']="تم اختيار نوع &quot;ملف مرخص&quot; لهذه الدراسة وهذا يعني انه على المستخدمين تسجيل الدخول";
-$lang['msg_direct_data_access_type_assigned']="تم اختيار نوع &quot;نفاذ مباشر&quot; لهذه الدراسة وهذا يعني انه على المستخدمين تسجيل الدخول والحصول على ترخيص لتحميل البيانات من الموقع  ";
-$lang['msg_public_data_access_type_assigned']="تم اختيار نوع &quot; للاستخدام العام لهذه الدراسة وهذا يعني انه على المستخدمين تسجيل الدخول فقط  لتحميل البيانات من الموقع";
-$lang['msg_enclave_data_access_type_assigned']="تم اختيار نوع &quot;النفاذ الى البيانات في مركز لهذه الدراسة وهذا يعني انه لا توجد بيانات متاحة للتحميل على موقع الواب";
-$lang['Document, Administrative [doc/adm]']="وثيقة إدارية [doc/adm]";
-$lang['Document, Analytical [doc/anl]']="وثيقة تحليلات [doc/anl]";
-$lang['Document, Other [doc/oth]']="الوثيقة ، غيرها [doc/oth] 
-";
-$lang['Document, Questionnaire [doc/qst]']="وثيقة ، استبيان  [doc/qst]";
-$lang['Document, Reference [doc/ref]']="وثيقة، مرجع [doc/ref] 
+$lang['switch_view_details']="التبديل إلى عرض التفاصيل";
+$lang['Licensed data files']="ملفات البيانات المرخصة";
+$lang['Direct access']="النفاذ/الوصول المباشر";
+$lang['Public use files']="الملفات للاستخدم العام PUF";
+$lang['Data accessible only in data enclave']="يمكن الوصول إلى البيانات فقط في مركز البيانات";
+$lang['--Data not accessible to users--']="- البيانات غير متاحة للمستخدمين -";
+$lang['msg_no_data_access_type_assigned']="لم يتم تعيين نوع وصول إلى البيانات لهذه الدراسة. هذا يعني أنه لن تتوفر أي بيانات لهذه الدراسة للتنزيل من هذا الموقع.";
+$lang['msg_licensed_data_access_type_assigned']="تم تعيين نوع الملف المرخص لهذه الدراسة. هذا يعني أنه سيُطلب من المستخدمين التسجيل وتسجيل الدخول وكذلك إكمال نموذج طلب الملف المرخص.";
+$lang['msg_direct_data_access_type_assigned']="تم تعيين نوع الوصول المباشر لهذه الدراسة. هذا يعني أن المستخدمين سيكونون قادرين على تنزيل البيانات مباشرة دون الحاجة إلى تسجيلهم على الموقع.";
+$lang['msg_public_data_access_type_assigned']="تم تعيين نوع الاستخدام العام لهذه الدراسة. هذا يعني أنه سيُطلب من المستخدمين التسجيل وتسجيل الدخول إلى موقعك قبل التمكن من تنزيل بياناتك.";
+$lang['msg_enclave_data_access_type_assigned']="تم اختيار نوع &quot;النفاذ الى البيانات في المركز لهذه الدراسة وهذا يعني انه لا توجد بيانات متاحة للتحميل على موقع الويب";
+$lang['Document, Administrative [doc/adm]']="وثيقة، إدارية [doc/adm]";
+$lang['Document, Analytical [doc/anl]']="وثيقة تحليلية [doc/anl]";
+$lang['Document, Other [doc/oth]']="وثيقة، غير ذلك [doc/oth] 
+";
+$lang['Document, Questionnaire [doc/qst]']="وثيقة ، إستمارة [doc/qst]";
+$lang['Document, Reference [doc/ref]']="وثيقة، مرجع [doc/ref] 
 ";
 $lang['Document, Report [doc/rep]']="وثيقة، تقرير [doc/rep]";
-$lang['Document, Technical [doc/tec]']="وثيقة، تقنية [doc/tec] 
+$lang['Document, Technical [doc/tec]']="وثيقة، تقنية [doc/tec] 
 ";
-$lang['Audio [aud]']="الصوت [aud] 
+$lang['Audio [aud]']="الصوت [aud] 
 ";
-$lang['Database [dat]']="قاعدة البيانات [dat] 
+$lang['Database [dat]']="قاعدة بيانات [dat] 
 ";
-$lang['Map [map]']="خريطة [map] 
- 
+$lang['Map [map]']="خريطة [map] 
+ 
 ";
-$lang['Microdata File [dat/micro]']="ملف البيانات الجزئية [dat/micro] 
+$lang['Microdata File [dat/micro]']="ملف البيانات الجزئية [dat/micro] 
 ";
-$lang['Photo [pic]']="الصور [pic] 
+$lang['Photo [pic]']="صورة [pic] 
 ";
 $lang['Program [prg]']="برنامج [prg]";
-$lang['Table [tbl]']="جدول  [tbl] 
+$lang['Table [tbl]']="جدول  [tbl] 
 ";
-$lang['Video [vid]']="الفيديو [vid]";
-$lang['Web Site [web]']="موقع الواب  [web]";
-$lang['Compressed, Generic [application/x-compressed]']="مضغوط ، عام [application/x-compressed] 
- 
+$lang['Video [vid]']="فيديو [vid]";
+$lang['Web Site [web]']="موقع الكتروني[web]";
+$lang['Compressed, Generic [application/x-compressed]']="مضغوط ، عام [application/x-compressed] 
+ 
 ";
-$lang['Compressed, ZIP [application/zip]']="مضغوط ،ZIP [application/zip] 
+$lang['Compressed, ZIP [application/zip]']="مضغوط ،ZIP [application/zip] 
 ";
-$lang['Data, CSPro [application/x-cspro]']="بيانات    CSPro [application/x-cspro]
-
+$lang['Data, CSPro [application/x-cspro]']="بياناتCSPro     [application/x-cspro]
+
     ";
-$lang['Data, dBase [application/dbase]']="بيانات ، dBase [application/dbase] 
+$lang['Data, dBase [application/dbase]']="بيانات ، dBase [application/dbase] 
 ";
-$lang['Data, Microsoft Access [application/msaccess]']="بيانات ، Microsoft Access [application/msaccess]";
+$lang['Data, Microsoft Access [application/msaccess]']="بيانات ، ميكروسوفت اكسس  [application/msaccess]";
 $lang['Data, SAS [application/x-sas]']="بيانات ، SAS [application/x-sas]";
-$lang['Data, SPSS [application/x-spss]']="بيانات ، SPSS [application/x-spss] 
+$lang['Data, SPSS [application/x-spss]']="بيانات ، SPSS [application/x-spss] 
 ";
-$lang['Data, Stata [application/x-stata]']="بيانات ،Stata [application/x-stata] 
+$lang['Data, Stata [application/x-stata]']="بيانات ،Stata [application/x-stata] 
 ";
-$lang['Document, Generic [text]']="وثيقة، عام [text] 
+$lang['Document, Generic [text]']="وثيقة، عام [text] 
 ";
-$lang['Document, HTML [text/html]']="وثيقة، HTML [text/html] 
+$lang['Document, HTML [text/html]']="وثيقة، HTML [text/html] 
 ";
-$lang['Document, Microsoft Excel [application/msexcel]']="وثيقة، Microsoft Excel [application/msexcel] 
+$lang['Document, Microsoft Excel [application/msexcel]']="وثيقة، ميكروسوفت اكسل [application/msexcel] 
 ";
-$lang['Document, Microsoft PowerPoint [application/mspowerpoint]']="وثيقة، Microsoft PowerPoint [application/mspowerpoint] 
+$lang['Document, Microsoft PowerPoint [application/mspowerpoint]']="وثيقة، ميكروسوفت بوربوينت  [application/mspowerpoint] 
 ";
-$lang['Document, Microsoft Word [application/msword]']="وثيقة، Microsoft Word [application/msword] 
+$lang['Document, Microsoft Word [application/msword]']="وثيقة، ميكروسوفت وورد  [application/msword] 
 ";
-$lang['Document, PDF [application/pdf]']="وثيقة، PDF [application/pdf] 
+$lang['Document, PDF [application/pdf]']="وثيقة، PDF [application/pdf] 
 ";
-$lang['Document, Postscript [application/postscript]']="وثيقة، Postscript [application/postscript] 
+$lang['Document, Postscript [application/postscript]']="وثيقة، Postscript [application/postscript] 
 ";
-$lang['Document, Plain [text/plain]']="وثيقة، [text/plain]";
-$lang['Document, WordPerfect [text/wordperfect]']="وثيقة، WordPerfect [text/wordperfect] 
+$lang['Document, Plain [text/plain]']="وثيقة، نص [text/plain]";
+$lang['Document, WordPerfect [text/wordperfect]']="وثيقة، WordPerfect [text/wordperfect] 
 ";
-$lang['Image, GIF [image/gif]']="صور ، GIF [image/gif] 
+$lang['Image, GIF [image/gif]']="صور ، GIF [image/gif] 
 ";
-$lang['Image, JPEG [image/jpeg]']="صور ، JPEG [image/jpeg] 
+$lang['Image, JPEG [image/jpeg]']="صور ، JPEG [image/jpeg] 
 ";
-$lang['Image, PNG [image/png]']=" صور ،PNG [image/png] 
+$lang['Image, PNG [image/png]']=" صور ،PNG [image/png] 
 ";
 $lang['Image, TIFF [image/tiff]']="صور ، TIFF [image/tiff]";
 $lang['status']="حالة";
-$lang['file_delete_success']="تم حذف ملف بنجاح";
+$lang['file_delete_success']="تم حذف الملف بنجاح";
 $lang['additional_info']="معلومات إضافية";
-$lang['remote_data_access_url']="عنوان المستودع الخارجي
-";
-
-
-/* End of file resource_manager_lang.php */
-/* Location: ./application/language/arabic/resource_manager_lang.php */
\ No newline at end of file
+$lang['remote_data_access_url']="قم بتوفير URL إلى مستودع خارجي";
+$lang['upload_external_resources']="تحميل الموارد الخارجية";
+$lang['return_to_study_edit_page']="العودة إلى صفحة تحرير الدراسة";
+
+
+/* End of file resource_manager */
+/* Location: ./application/language/arabic/resource_manager */
\ No newline at end of file
diff --git a/application/language/arabic/rest_controller_lang.php b/application/language/arabic/rest_controller_lang.php
new file mode 100644
index 000000000..5f3941437
--- /dev/null
+++ b/application/language/arabic/rest_controller_lang.php
@@ -0,0 +1,17 @@
+<?php 
+$lang['text_rest_invalid_api_key']="مفتاح واجهة برمجة التطبيقات API غير صالح s%";
+$lang['text_rest_invalid_credentials']="شهادة غير صالحة";
+$lang['text_rest_ip_denied']="IP مرفوض";
+$lang['text_rest_ip_unauthorized']="IP غير مصرح به";
+$lang['text_rest_unauthorized']="غير مصرح";
+$lang['text_rest_ajax_only']="يسمح فقط بطلبات AJAX";
+$lang['text_rest_api_key_unauthorized']="لا يمتلك مفتاح واجهة برمجة التطبيقات API حق الوصول إلى وحدة التحكم المطلوبة";
+$lang['text_rest_api_key_permissions']="لا يمتلك مفتاح API هذا أذونات كافية";
+$lang['text_rest_api_key_time_limit']="وصل مفتاح API هذا إلى الحد الزمني لهذه الوسيلة/الطريقة";
+$lang['text_rest_ip_address_time_limit']="وصل مفتاح API هذا إلى الحد الزمني لهذه الوسيلة/الطريقة";
+$lang['text_rest_unknown_method']="طريقة/وسيلة غير معروفة";
+$lang['text_rest_unsupported']="بروتوكول غير مدعوم";
+
+
+/* End of file rest_controller */
+/* Location: ./application/language/arabic/rest_controller */
\ No newline at end of file
diff --git a/application/language/arabic/search_help_lang.php b/application/language/arabic/search_help_lang.php
new file mode 100644
index 000000000..2f1644a2b
--- /dev/null
+++ b/application/language/arabic/search_help_lang.php
@@ -0,0 +1,66 @@
+<?php 
+$lang['keyword_search_help']="<الجدول cellpadding = & quot؛ 0 & quot؛ تباعد الخلية = & quot؛ 0 & quot؛ class = & quot؛ جدول شبكة جدول & quot؛>
+<tbody>
+<tr>
+<td width = & quot؛ 65 & quot؛> <strong> عامل التشغيل </ strong> </td>
+<td width = & quot؛ 715 & quot؛> <strong> المعنى </ strong> </td>
+</tr>
+<tr>
+<td> <strong> مسافة </ strong> </td>
+<td> بشكل افتراضي ، تشير المسافات بين مصطلحات البحث إلى الكلمة هي
+اختياري. إنه يعني <strong> أو </ strong> </td>
+</tr>
+<tr>
+<td> <strong> + </strong> </td>
+<td> تشير علامة الجمع البادئة إلى <strong> AND </strong> </td>
+</tr>
+<tr>
+<td> <strong> - </strong> </td>
+<td> تشير علامة الطرح الأولية إلى <strong> NOT </strong> </td>
+</tr>
+<tr>
+<td> <strong> () </strong> </td>
+<td> يتم وضع الأقواس (الأقواس) حول التعبيرات الفرعية لإعطاء
+لهم أسبقية أعلى في البحث. </ td>
+</tr>
+<tr>
+<td> <strong> * </strong> </td>
+<td> العلامة النجمية هي عملية القطع. على عكس عوامل التشغيل الأخرى ، يتم إلحاقه بالكلمة (ضع في النهاية) ، أو جزء ، وليس مُضافًا مسبقًا (وضعه في البداية). </ td>
+</tr>
+<tr>
+<td> <strong> & quot؛ & quot؛ </strong> </td>
+<td> علامات الاقتباس المزدوجة في بداية العبارة ونهايتها ، تتطابق فقط مع الصفوف التي تحتوي على العبارة الكاملة ، كما تمت كتابتها. </ td>
+</tr>
+</tbody>
+</table>
+<p> <br>
+<strong> أمثلة: </ strong> </p>
+
+<ul>
+<li> تم إدراج كلمات رئيسية متعددة في حقل مفصول بينها <strong> مسافات </ strong>
+ستؤدي إلى نتائج بحث تحتوي على جميع الدراسات التي تلبي أيًا من
+المعايير المكتوبة. لذلك ستتم معاملة قائمة الكلمات الرئيسية على أنها <strong> أو </ strong>
+بيان . على سبيل المثال: إدراج <strong> الجنس والعمر </ strong> في وصف المتغير سيُظهر جميع الدراسات التي تحتوي على الجنس أو العمر في وصف المتغير. <br>
+<br>
+</li>
+<li> وضع (تقديمًا مسبقًا) علامة <strong> + </strong> على البداية
+من كلمة يعامل البحث على أنه عبارة <strong> AND </strong>. على سبيل المثال: <strong> + الجنس + العمر + الموظف </ strong> ستقصر النتائج على الدراسات التي تحتوي على جميع العناصر ، الجنس والعمر والموظفون فيها. <br>
+<br>
+</li>
+<li> يؤدي وضع علامة <strong> - </strong> على بداية الكلمة (مسبقًا) إلى معاملة البحث على أنه عبارة <strong> NOT. </strong> على سبيل المثال: <strong> + Gender + Age + Employed -كينيا </ strong> ستقصر النتائج على الدراسات التي تحتوي على جميع العناصر الجنس والعمر والموظفون ، لكنها تستبعد النتائج الخاصة بكينيا من النتائج. <br>
+<br>
+</li>
+<li> سيؤدي وضع علامات الاقتباس <strong> & quot؛ & quot؛ </strong> حول مصطلح البحث إلى تقييم المصطلح كمصطلح واحد. على سبيل المثال: لقصر البحث على أوصاف الدراسة التي تحتوي على التسلسل الدقيق للكلمات <em> دراسة صحية </ em> ، يمكنك كتابة <strong> <em> & quot؛ </em> دراسة صحية <em> & quot؛ </em> </strong> بين علامات الاقتباس. بدون علامات الاقتباس ، سيُظهر البحث جميع الدراسات المتعلقة بالصحة أو الدراسة فيها. باستخدام علامتي الاقتباس ، لن يتم عرض سوى الدراسات ذات الصياغة الدقيقة في التسلسل <em> دراسة صحية </ em>. <br>
+<br>
+</li>
+<li> يُسمح باستبدال الأحرف في الكلمات أو العبارات بعلامة النجمة * </ strong> بدل. على سبيل المثال ، قد يؤدي البحث عن الحرارة <strong> * </strong> إلى نتائج التدفئة والتدفئة والتدفئة. <br>
+<br>
+</li>
+<li> البدل <strong>؟ </strong> يمكن أن تستخدم أيضًا في عمليات البحث كبديل للأحرف. على سبيل المثال: البحث عن <strong> توظيف؟ </ strong> سيؤدي إلى نتائج للتوظيف أو التوظيف. <br>
+<br>
+</li>
+</ul>";
+
+
+/* End of file search_help */
+/* Location: ./application/language/arabic/search_help */
\ No newline at end of file
diff --git a/application/language/arabic/site_menu_lang.php b/application/language/arabic/site_menu_lang.php
new file mode 100644
index 000000000..92104cc89
--- /dev/null
+++ b/application/language/arabic/site_menu_lang.php
@@ -0,0 +1,31 @@
+<?php 
+$lang['Dashboard']="لوحة القيادة/التحكم";
+$lang['Studies']="دراسات";
+$lang['Manage studies']="إدارة الدراسات";
+$lang['Licensed requests']="الطلبات المرخصة";
+$lang['Manage collections']="إدارة المجموعات";
+$lang['Citations']="اقتباسات";
+$lang['All citations']="جميع الإقتباسات";
+$lang['Import citations']="استيراد الإقتباسات";
+$lang['Export citations']="تصدير الاقتباسات";
+$lang['Users']="المستخدمين";
+$lang['All users']="جميع المستخدمين";
+$lang['Add user']="أضف مستخدم";
+$lang['Impersonate user']="انتحال شخصية المستخدم";
+$lang['Menu']="القائمة";
+$lang['All pages']="جميع الصفحات";
+$lang['Reports']="التقارير";
+$lang['All reports']="جميع التقارير";
+$lang['Settings']="إعدادات";
+$lang['Countries']="البلدان";
+$lang['Regions']="المناطق";
+$lang['Vocabularies']="المفردات";
+$lang['Central Data Catalog']="كتالوج البيانات المركزي";
+$lang['Bulk data access']="الوصول إلى البيانات بالجملة";
+$lang['Facets']="جوانب";
+$lang['Translate']="ترجمة";
+$lang['Data deposit']="إيداع البيانات";
+
+
+/* End of file site_menu */
+/* Location: ./application/language/arabic/site_menu */
\ No newline at end of file
diff --git a/application/language/arabic/sitelogs_lang.php b/application/language/arabic/sitelogs_lang.php
index 120cba8cb..98675560a 100644
--- a/application/language/arabic/sitelogs_lang.php
+++ b/application/language/arabic/sitelogs_lang.php
@@ -1,19 +1,16 @@
 <?php 
 $lang['site_logs']="سجلات
 ";
-$lang['logtype']="نوع
+$lang['logtype']="النوع
 ";
-$lang['section']="قسم
+$lang['section']="الجزء/القسم
 ";
 $lang['url']="عنوان الموقع (URL)";
-$lang['keywords']="نوع
-";
-$lang['user']="المستخدمين
-";
+$lang['keywords']="كلمات مفتاحية/رئيسية";
+$lang['user']="المستخدم";
 $lang['ip_address']="عنوان IP";
-$lang['logtime']="خلق
-";
+$lang['logtime']="خُلق/أنشىء";
 
 
-/* End of file sitelogs_lang.php */
-/* Location: ./application/language/arabic/sitelogs_lang.php */
\ No newline at end of file
+/* End of file sitelogs */
+/* Location: ./application/language/arabic/sitelogs */
\ No newline at end of file
diff --git a/application/language/arabic/user_groups_lang.php b/application/language/arabic/user_groups_lang.php
new file mode 100644
index 000000000..b1dd35f45
--- /dev/null
+++ b/application/language/arabic/user_groups_lang.php
@@ -0,0 +1,24 @@
+<?php 
+$lang['user_groups_home']="الصفحة الرئيسية";
+$lang['user_by_groups']="بحث المستخدمين حسب المجموعة";
+$lang['user_groups_add_page']="أضف مجموعة مستخدمين";
+$lang['user_groups_edit']="تحرير مجموعة المستخدمين";
+$lang['description']="وصف";
+$lang['group_type']="نوع المجموعة";
+$lang['access_type']="نوع الوصول";
+$lang['repo_access']="الوصول/النفاذ إلى المستودع";
+$lang['user_groups_management']="مجموعات الاعضاء/المستخدمين";
+$lang['access_type_none']="لا يوجد وصول مشرف/مسؤول";
+$lang['access_type_limited']="وصول مشرف محدود";
+$lang['access_type_unlimited']="وصول مشرف غير محدود";
+$lang['group_type_user']="مستخدم - لا يوجد وصول مشرف";
+$lang['group_type_reviewer']="مراجع - لا يوجد وصول مشرف";
+$lang['group_type_admin']="مشرف/مسؤول";
+$lang['user_groups_add']="أضف مجموعة مستخدمين جديدة";
+$lang['add_permission_url']="إنشاء إذن/صلاحية";
+$lang['user_groups']="مجموعات الاعضاء/المستخدمين";
+$lang['manage_permissions']="إدارة الأذونات/الصلاحيات";
+
+
+/* End of file user_groups */
+/* Location: ./application/language/arabic/user_groups */
\ No newline at end of file
diff --git a/application/language/arabic/users_additional_lang.php b/application/language/arabic/users_additional_lang.php
index f2c2e1adb..beb707394 100644
--- a/application/language/arabic/users_additional_lang.php
+++ b/application/language/arabic/users_additional_lang.php
@@ -1,28 +1,28 @@
-<?php 
-$lang['thank_you_for_registering']="شكرا للتسجيل. لاستكمال وتفعيل حسابك ،الرجاء الدخول على العنوان التالي :
-";
-$lang['your_account_details']="تفاصيل حسابك";
-$lang['username']="اسم المستخدم :
-";
-$lang['password']="كلمة السر :
-";
-$lang['do_not_reply']=" الرجاء عدم الرد على هذا البريد الإلكتروني
-";
-$lang['last_name']="لتغيير كلمة السر الخاصة بك ، انقر على الرابط أدناه أو انسخه في متصفح الويب الخاص بك :
-";
-$lang['phone']="إذالم تطلب تغيير كلمة السر الخاصة بك ، تجاهل هذه الرسالة.
-";
-$lang['company']=" الرجاء عدم الرد على هذا البريد الإلكتروني
-";
-$lang['password_reset_msg']="تم تغيير كلمة السر الخاصة بك. للتواصل ،هذه تفاصيل حسابك";
-$lang['account_created_confirmation']="لقد تم إنشاء حسابك.أرسل لك بريد إلكتروني يحتوي علي تعليمات لتفعيل حسابك
-";
-$lang['email_is_sent']=" تم ارسال بريد إلكتروني للعنوان الذي قدمته ، الرجاء تفحصه.
-";
-$lang['new_password_sent']="تم حذف كلمة السر الخاصة بك وكلمة سر جديدةارسلت إليك عبر البريد الإلكتروني. اضغط هنا للتواصل بواسطة كلمة السر الجديدة.";
-$lang['forgot_password_enter_email']="يرجى تقديم عنوان بريد إلكتروني لتلقي تعليمات حذف كلمة السر.
-";
-
-
-/* End of file users_additional_lang.php */
+<?php 
+$lang['thank_you_for_registering']="شكرا للتسجيل. لاستكمال وتفعيل حسابك ،الرجاء الدخول على العنوان التالي :
+";
+$lang['your_account_details']="تفاصيل حسابك";
+$lang['username']="اسم المستخدم :
+";
+$lang['password']="كلمة السر :
+";
+$lang['do_not_reply']=" الرجاء عدم الرد على هذا البريد الإلكتروني
+";
+$lang['last_name']="لتغيير كلمة السر الخاصة بك ، انقر على الرابط أدناه أو انسخه في متصفح الويب الخاص بك :
+";
+$lang['phone']="إذالم تطلب تغيير كلمة السر الخاصة بك ، تجاهل هذه الرسالة.
+";
+$lang['company']=" الرجاء عدم الرد على هذا البريد الإلكتروني
+";
+$lang['password_reset_msg']="تم تغيير كلمة السر الخاصة بك. للتواصل ،هذه تفاصيل حسابك";
+$lang['account_created_confirmation']="لقد تم إنشاء حسابك.أرسل لك بريد إلكتروني يحتوي علي تعليمات لتفعيل حسابك
+";
+$lang['email_is_sent']=" تم ارسال بريد إلكتروني للعنوان الذي قدمته ، الرجاء تفحصه.
+";
+$lang['new_password_sent']="تم حذف كلمة السر الخاصة بك وكلمة سر جديدةارسلت إليك عبر البريد الإلكتروني. اضغط هنا للتواصل بواسطة كلمة السر الجديدة.";
+$lang['forgot_password_enter_email']="يرجى تقديم عنوان بريد إلكتروني لتلقي تعليمات حذف كلمة السر.
+";
+
+
+/* End of file users_additional_lang.php */
 /* Location: ./application/language/arabic/users_additional_lang.php */
\ No newline at end of file
diff --git a/application/language/arabic/users_lang.php b/application/language/arabic/users_lang.php
index 839871adf..6b9c8f454 100644
--- a/application/language/arabic/users_lang.php
+++ b/application/language/arabic/users_lang.php
@@ -3,77 +3,96 @@
 $lang['create_user_account']="إنشاء حساب مستخدم جديد";
 $lang['username']=" اسم المستخدم";
 $lang['email']="عنوان البريد الإلكتروني";
-$lang['first_name']="الاسم";
-$lang['last_name']="اللقب";
+$lang['first_name']="الاسم الأول";
+$lang['last_name']="إسم العائلة";
 $lang['phone']="الهاتف";
-$lang['company']="المؤسسة";
+$lang['company']="المؤسسة/الشركة";
 $lang['password']="كلمة السر";
 $lang['password_confirmation']="تأكيد كلمة السر";
-$lang['edit_user_account']="تعديل حساب المستخدم";
-$lang['leave_password_blank']="اترك كلمة المرور فارغة للحفاظ على كلمة المرور الحالية";
+$lang['edit_user_account']="تعديل/تحرير حساب المستخدم";
+$lang['leave_password_blank']="اترك حقول كلمة المرور فارغة للاحتفاظ بكلمة المرور الحالية";
 $lang['administrator']="المسؤول";
 $lang['user']="المستخدم";
-$lang['user_account_status']="وضع حساب المستخدم";
-$lang['user_active']="نشيط";
+$lang['user_account_status']="حالة حساب المستخدم؟";
+$lang['user_active']="نشيط/فعال";
 $lang['user_blocked']="محظور";
-$lang['select_user_group']="اختر مجموعة مستخدمين";
+$lang['select_user_group']="حدد مجموعة المستخدمين";
 $lang['remember']="تذكر";
 $lang['remember_me']="تذكرني";
-$lang['register']="سجل";
-$lang['forgot_password']="نسيت كلمة المرور?";
+$lang['register']="تسجيل";
+$lang['forgot_password']="نسيت كلمة المرور";
 $lang['user_registration']="تسجيل المستخدم";
-$lang['math_question']="سؤال في الرياضيات";
-$lang['provide_math_question_answer']=" توفير إجابة على السؤال في الرياضيات ";
+$lang['captcha_question']="سؤال";
+$lang['captcha_provide_answer']="اكتب النص في المربع";
+$lang['invalid_captcha']="لم تتطابق إجابة Captcha.";
 $lang['account_created_email_confirmation']="لقد تم إنشاء حسابك. تم ارسال رسالة على  بريدك الإلكتروني تحتوي علي تعليمات لتفعيل حسابك";
 $lang['user_account_activated']="تم تفعيل حسابك بنجاح";
 $lang['user_account_activation']="تفعيل حساب";
-$lang['join_date']="تاريخ التسجيل";
-$lang['last_login']="آخر إتصال";
+$lang['join_date']="تاريخ التسجيل/الإنضمام";
+$lang['last_login']="آخر دخول";
 $lang['group']="مجموعة مستخدمين";
-$lang['status']="حالة";
+$lang['status']="الحالة";
 $lang['survey_title']="عنوان الدراسة";
 $lang['country']="البلد";
-$lang['licensed_survey_requests']="مطالب  النفاذ الى مسوح بموجب ترخيص";
-$lang['edit_profile']="تغيير الملف الشخصي";
+$lang['licensed_survey_requests']="طلبات النفاذ الى المسح بموجب ترخيص";
+$lang['edit_profile']="تعديل الملف الشخصي";
 $lang['old_password']="كلمة السر القديمة";
 $lang['new_password']="كلمة السر الجديدة";
 $lang['confirm_new_password']="تأكيد كلمة السر الجديدة";
 $lang['change']="تغيير";
-$lang['ADMIN']="المشرف";
-$lang['USER']="المستعمل";
+$lang['user_groups']="مجموعات الاعضاء/المستخدمين";
+$lang['ADMIN']="المشرف/المسؤول";
+$lang['USER']="المستخدم";
 $lang['ACTIVE']="فعال";
 $lang['DISABLED']="غير فعال";
 $lang['click_here_to_login']="انقر هنا للدخول";
 $lang['user_account_not_activated']="لم يتم تفعيل الحساب";
-$lang['account_activation_failed']="فشل في تنشيط الحساب";
-$lang['try_reset_password']="إعادة%s  تعيين كلمة السر";
+$lang['account_activation_failed']="فشل في تفعيل الحساب";
+$lang['try_reset_password']="حاول s% لإعادة تعيين كلمة المرور الخاصة بك";
 $lang['password_change_failed']="فشل تغيير كلمة السر";
-$lang['password_change_success']="تم تغيير كلمة السر";
-$lang['login_failed']="فشل الاتصال";
+$lang['password_change_success']="تم تغيير كلمة السر بنجاح";
+$lang['login_failed']="فشل تسجيل الدخول ، اسم المستخدم أو كلمة المرور غير صحيحة.";
 $lang['login']="تسجيل الدخول";
 $lang['profile_updated']="تم تحديث الملف الشخصي";
-$lang['forgot_password_failed']="فشلت عملية  حذف كلمة السر ، حاول مرة أخرى.";
+$lang['forgot_password_failed']="فشل إعادة تعيين كلمة المرور الخاصة بك ، يرجى المحاولة مرة أخرى.";
 $lang['account_activation_successful']="تم تنشيط الحساب بنجاح";
 $lang['activation_email_unsuccessful']="لم يتم إرسال رسالة الى  بريدك الإلكتروني لتنشيط الحساب";
-$lang['notification']="إعلام";
+$lang['notification']="إعلام/إشعار";
 $lang['new_user_registration']="تسجيل مستخدم جديد";
-$lang['new_user_registration_received']="تم سجيل مستخدم جديد. تفاصيل عن المستخدم:";
-$lang['thank_you_for_registration']="شكرا لتسجيلكم علي موقع <em>%s</em> . لاستكمال التسجيل وتنشيط حسابك الرجاء الدخول على العنوان التالي (URL):  ";
-$lang['your_account_details']="هذه تفاصيل حسابك";
-$lang['do_not_reply_to_this_email']="الرجاءعدم الرد على هذه الرسالة";
+$lang['new_user_registration_received']="تم استلام تسجيل مستخدم جديد. تفاصيل المستخدم هي:";
+$lang['thank_you_for_registration']="شكرا لتسجيلكم علي الموقع <em>%s</em> . لاستكمال التسجيل وتنشيط حسابك الرجاء الدخول على العنوان التالي (URL):  ";
+$lang['your_account_details']="تفاصيل حسابك هي";
+$lang['do_not_reply_to_this_email']="الرجاءعدم الرد على هذه الايميل";
 $lang['click_url_to_reset_password']="لإستعادة كلمة المرور ، انقر على الرابط أدناه أو افتح هذا الرابط في نافذة جديدة.";
 $lang['request_password_ignore']="إذا لم تطلب إعادة تعيين كلمة السر ، تجاهل هذه الرسالة.";
 $lang['enter_email_to_reset_password']="الرجاء إدخال عنوان البريد الإلكتروني الخاص بك. وسوف نرسل لك رسالة لإعادة تعيين كلمة السر.";
-$lang['password_is_sent']="تم إعادة تعيين كلمة السر الخاصة بك وكلمة السر الجديدة ارسلت إليك عبر البريد الإلكتروني.";
+$lang['password_is_sent']="تمت إعادة تعيين كلمة المرور الخاصة بك وإرسال كلمة مرور جديدة إلى عنوان بريدك الإلكتروني.";
 $lang['login_with_new_password']="اتقر هنا لتسجيل الدخول باستخدام كلمة السر الجديدة.";
-$lang['message_sent_to_your_email']="أرسلت  لك رسالة علي عنوان بريدك الإلكتروني. يرجى قراءة رسائلك.";
-$lang['password_reset_to']="تم تغيير كلمة السرالخاصة بك الي  <b>%s</b>. للدخول علي الموقع هذه المعطيات الخاصة بك:";
+$lang['message_sent_to_your_email']="تم إرسال رسالة بريد إلكتروني إلى عنوان بريدك الإلكتروني ، يرجى التحقق من صندوق الوارد الخاص بك.";
+$lang['password_reset_to']="تم تغيير كلمة السرالخاصة بك الى  <b>%s</b>. للدخول الى الموقع هذه المعطيات الخاصة بك:";
 $lang['forgot_password_verification']="نسيت كلمة السر -- التحقق";
 $lang['account_activation']="تنشيط الحساب";
-$lang['callback_country_invalid']="يتوجب وضع اسم البلد";
-$lang['openid_url']="ع رض رابط
-";
-
-
-/* End of file users_lang.php */
-/* Location: ./application/language/arabic/users_lang.php */
\ No newline at end of file
+$lang['callback_country_invalid']="حقل البلد مطلوب.";
+$lang['log_in']="دخول";
+$lang['site_login_privacy_terms']="سيتم استخدام المعلومات التي تقدمها بالتسجيل أو تسجيل الدخول إلى الكتالوج الخاص بنا وفقًا لشروط سياسة الخصوصية الخاصة بـ NSO.";
+$lang['impersonate_user']="انتحال صفة مستخدم آخر";
+$lang['impersonate_msg']="حدد الحساب أدناه لانتحال صفة";
+$lang['general_user_accounts']="حسابات المستخدمين العامة (لا يوجد وصول مسؤول)";
+$lang['general_user_accounts_description']="مستخدمو الموقع العام الذين ليس لديهم حق الوصول إلى إدارة الموقع";
+$lang['edit_user_permissions']="تحرير أذونات المستخدم";
+$lang['site_admin_accounts']="مسؤولو الموقع (صلاحيات كاملة)";
+$lang['site_admin_accounts_description']="السيطرة الكاملة على جميع أقسام الموقع";
+$lang['site_admin_limited_accounts']="مسؤولو الموقع (صلاحيات محدودة)";
+$lang['site_admin_limited_accounts_description']="تقييد وصول المستخدم إلى إدارة الموقع وأذونات التحكم لكل مجموعة للمستخدم";
+$lang['user_site_level_permissions']="أذونات على مستوى الموقع";
+$lang['assigned_user_groups']="أدوار المستخدم العالمية";
+$lang['manage_permissions']="إدارة الأذونات/الصلاحيات";
+$lang['permissions_per_collection']="أذونات لكل مجموعة";
+$lang['reset_password']="اعادة ضبط كلمه السر";
+$lang['api_keys']="مفاتيح API";
+$lang['no_api_keys_found']="لم يتم العثور على مفاتيح API.";
+$lang['generate_api_key']="توليد/إنشاء مفتاح API";
+
+
+/* End of file users */
+/* Location: ./application/language/arabic/users */
\ No newline at end of file
diff --git a/application/language/arabic/vocabularies_lang.php b/application/language/arabic/vocabularies_lang.php
index e7cef4448..991b2036d 100644
--- a/application/language/arabic/vocabularies_lang.php
+++ b/application/language/arabic/vocabularies_lang.php
@@ -3,14 +3,14 @@
 $lang['vocabulary']="مفردات";
 $lang['term']="المصطلح";
 $lang['terms']="المصطلحات";
-$lang['edit_vocabulary']="تعديل المفردات";
-$lang['add_vocabulary']="اضافة مفرد";
+$lang['edit_vocabulary']="تعديل/تحرير المفردات";
+$lang['add_vocabulary']="إضافة مفردات";
 $lang['home']="الصفحة الرئيسية";
-$lang['add_term']="اضافة مصطلح";
+$lang['add_term']="إضافة مصطلح";
 $lang['edit_term']="تعديل مصطلح";
 $lang['select_term_parent']="حدد أصل المصطلح";
 $lang['title_terms']="المصطلحات";
-
-
-/* End of file vocabularies_lang.php */
-/* Location: ./application/language/arabic/vocabularies_lang.php */
\ No newline at end of file
+
+
+/* End of file vocabularies */
+/* Location: ./application/language/arabic/vocabularies */
\ No newline at end of file

From d961e84da388eb44ad1c074b82de7f1e486e11d2 Mon Sep 17 00:00:00 2001
From: Mehmood Asghar <mah0001@gmail.com>
Date: Tue, 8 Feb 2022 12:47:03 +0500
Subject: [PATCH 04/79] Enable facets for regions

---
 application/controllers/Catalog.php | 17 +++++++++++++++++
 1 file changed, 17 insertions(+)

diff --git a/application/controllers/Catalog.php b/application/controllers/Catalog.php
index e56e2f2a6..fe0743f1a 100644
--- a/application/controllers/Catalog.php
+++ b/application/controllers/Catalog.php
@@ -111,6 +111,12 @@ private function load_facets_data($active_tab=null)
 			$this->input->get("collection")
 		);
 
+		$this->facets['regions']=$this->Search_helper_model->get_active_regions(
+			$repo_id,
+			$this->active_tab,
+			$this->input->get("region")
+		);
+		
 		$this->facets['da_types']=$this->Search_helper_model->get_active_data_types(
 			$repo_id,
 			$this->active_tab,
@@ -191,6 +197,14 @@ private function load_facets_html()
 			),true);
 		}
 
+		//regions
+		$filters['regions']=$this->load->view('search/facet', 
+			array(
+				'items'=>$this->facets['regions'], 
+				'filter_id'=>'region',
+				'is_enabled'=>$this->is_facet_enabled($this->active_tab,'region')
+			),true);
+
 		//data classifications
 		$filters['data_class']=$this->load->view('search/facet', 
 			array(
@@ -372,6 +386,7 @@ function _search()
 		$search_options->sk				=trim(xss_clean($this->input->get("sk")));
 		$search_options->vf				=xss_clean($this->input->get("vf"));
 		$search_options->country		=xss_clean($this->input->get("country"));
+		$search_options->region			=xss_clean($this->input->get("region"));
 		$search_options->view			=xss_clean($this->input->get("view"));
 		$search_options->image_view		=xss_clean($this->input->get("image_view"));
 		$search_options->topic			=xss_clean($this->input->get("topic"));
@@ -446,6 +461,7 @@ function _search()
 			//'variable_keywords'=>$search_options->vk,
 			'variable_fields'=>$search_options->vf,
 			'countries'=>$search_options->country,
+			'regions'=>$search_options->region,
 			'from'=>$search_options->from,
 			'to'=>$search_options->to,
 			'tags'=>$search_options->tag,
@@ -480,6 +496,7 @@ function _search()
 		$data['search_options']=$search_options;
 		$data['data_access_types']=$this->facets['da_types'];//$this->Form_model->get_form_list();
 		$data['data_classifications']=$this->facets['data_class'];//$this->Data_classification_model->get_list();
+		$data['regions']=$this->facets['regions'];
 		$data['sid']=$search_options->sid;
 
 		//show featured only if no filters or search 

From 9cad7574ac3c0f16ac1ad086167d457484e25872 Mon Sep 17 00:00:00 2001
From: Mehmood Asghar <mah0001@gmail.com>
Date: Thu, 10 Feb 2022 14:40:55 +0500
Subject: [PATCH 05/79] minor

---
 application/controllers/Catalog.php | 13 ++++++++-----
 1 file changed, 8 insertions(+), 5 deletions(-)

diff --git a/application/controllers/Catalog.php b/application/controllers/Catalog.php
index fe0743f1a..63183ad80 100644
--- a/application/controllers/Catalog.php
+++ b/application/controllers/Catalog.php
@@ -111,11 +111,14 @@ private function load_facets_data($active_tab=null)
 			$this->input->get("collection")
 		);
 
-		$this->facets['regions']=$this->Search_helper_model->get_active_regions(
-			$repo_id,
-			$this->active_tab,
-			$this->input->get("region")
-		);
+		$this->facets['regions']=array();
+		if ($this->is_facet_enabled($this->active_tab,'region')){
+			$this->facets['regions']=$this->Search_helper_model->get_active_regions(
+				$repo_id,
+				$this->active_tab,
+				$this->input->get("region")
+			);
+		}
 		
 		$this->facets['da_types']=$this->Search_helper_model->get_active_data_types(
 			$repo_id,

From 282504da860c36980738adbc492291a98bfec954 Mon Sep 17 00:00:00 2001
From: Mehmood Asghar <mah0001@gmail.com>
Date: Thu, 10 Feb 2022 15:25:27 +0500
Subject: [PATCH 06/79] Update document schema with fields annote, booktitle,
 crossref, howpublished, key, organization, url

---
 .../catalog-admin/document-schema.json        | 76 +++++++++++++++----
 application/schemas/document-schema.json      | 76 +++++++++++++++----
 2 files changed, 124 insertions(+), 28 deletions(-)

diff --git a/api-documentation/catalog-admin/document-schema.json b/api-documentation/catalog-admin/document-schema.json
index 7688f13f0..179ac6394 100644
--- a/api-documentation/catalog-admin/document-schema.json
+++ b/api-documentation/catalog-admin/document-schema.json
@@ -518,12 +518,18 @@
         "volume": {
           "type": "string",
           "title": "Volume number",
-          "description":"Volume number"              
+          "description":"Volume number"
         },
         "issue": {
           "type": "string",
           "title": "Issue number",
-          "description":"Issue number"              
+          "description":"Issue number"
+        },
+
+        "number": {
+          "type": "string",
+          "title": "Number",
+          "description":"The number of a journal, magazine, technical report, or of a work in a series. An issue of a journal or magazine is usually identified by its volume and number; the organization that issues a technical report usually gives it a number; and sometimes books are given numbers in a named series."
         },
 
         "pages": {
@@ -536,6 +542,60 @@
           "title": "Series name",
           "description":"The name given to a series or set of books. When citing an entire book, the title field gives its title and the optional series field gives the name of a series in which the book was published."              
         },
+
+        "publisher": {
+          "type": "string",
+          "title": "Publisher",
+          "description":"Entity responsible for making the resource available"              
+        },
+
+        "publisher_address": {
+          "type": "string",
+          "title":"Publisher's address",
+          "description": "For major publishing houses, just the city is given. For small publishers, you can help the reader by giving the complete address."    
+        }, 
+
+        "annote": {
+          "type": "string",
+          "title": "Annotation",
+          "description":"For annotation, element will not be used by standard bibliography styles like the MLA, APA or Chicago, but may be used by others that produce an annotated bibliography."
+        },
+
+        "booktitle": {
+          "type": "string",
+          "title": "Book title",
+          "description":"Title of a book, part of which is being cited"
+        },
+
+        "crossref": {
+          "type": "string",
+          "title": "Book title",
+          "description":"The database key of the entry being cross referenced"
+        },
+
+        "howpublished": {
+          "type": "string",
+          "title": "Store the notice for unusual publications",
+          "description":"The element is used to store the notice for unusual publications. The first word should be capitalized. For example, `WebPage`, or `Distributed at the local tourist office`"
+        },
+
+        "key": {
+          "type": "string",
+          "title": "Key",
+          "description":"A key is a field used for alphabetizing, cross referencing, and creating a label when the `author' information is missing"
+        },
+
+        "organization": {
+          "type": "string",
+          "title": "Organization",
+          "description":"The organization that sponsors a conference or that publishes a manual"
+        },
+
+        "url": {
+          "type": "string",
+          "title": "URL",
+          "description":"URL of the document, preferably a permanent URL"
+        },
         
         "translators": {
           "type": "array",
@@ -642,18 +702,6 @@
 					]
 				},
 
-        "publisher": {
-          "type": "string",
-          "title": "Publisher",
-          "description":"Entity responsible for making the resource available"              
-        },
-
-        "publisher_address": {
-          "type": "string",
-          "title":"Publisher's address",
-          "description": "For major publishing houses, just the city is given. For small publishers, you can help the reader by giving the complete address."    
-        }, 
-
         "rights": {
           "type": "string",
           "title": "Rights",
diff --git a/application/schemas/document-schema.json b/application/schemas/document-schema.json
index 7688f13f0..179ac6394 100644
--- a/application/schemas/document-schema.json
+++ b/application/schemas/document-schema.json
@@ -518,12 +518,18 @@
         "volume": {
           "type": "string",
           "title": "Volume number",
-          "description":"Volume number"              
+          "description":"Volume number"
         },
         "issue": {
           "type": "string",
           "title": "Issue number",
-          "description":"Issue number"              
+          "description":"Issue number"
+        },
+
+        "number": {
+          "type": "string",
+          "title": "Number",
+          "description":"The number of a journal, magazine, technical report, or of a work in a series. An issue of a journal or magazine is usually identified by its volume and number; the organization that issues a technical report usually gives it a number; and sometimes books are given numbers in a named series."
         },
 
         "pages": {
@@ -536,6 +542,60 @@
           "title": "Series name",
           "description":"The name given to a series or set of books. When citing an entire book, the title field gives its title and the optional series field gives the name of a series in which the book was published."              
         },
+
+        "publisher": {
+          "type": "string",
+          "title": "Publisher",
+          "description":"Entity responsible for making the resource available"              
+        },
+
+        "publisher_address": {
+          "type": "string",
+          "title":"Publisher's address",
+          "description": "For major publishing houses, just the city is given. For small publishers, you can help the reader by giving the complete address."    
+        }, 
+
+        "annote": {
+          "type": "string",
+          "title": "Annotation",
+          "description":"For annotation, element will not be used by standard bibliography styles like the MLA, APA or Chicago, but may be used by others that produce an annotated bibliography."
+        },
+
+        "booktitle": {
+          "type": "string",
+          "title": "Book title",
+          "description":"Title of a book, part of which is being cited"
+        },
+
+        "crossref": {
+          "type": "string",
+          "title": "Book title",
+          "description":"The database key of the entry being cross referenced"
+        },
+
+        "howpublished": {
+          "type": "string",
+          "title": "Store the notice for unusual publications",
+          "description":"The element is used to store the notice for unusual publications. The first word should be capitalized. For example, `WebPage`, or `Distributed at the local tourist office`"
+        },
+
+        "key": {
+          "type": "string",
+          "title": "Key",
+          "description":"A key is a field used for alphabetizing, cross referencing, and creating a label when the `author' information is missing"
+        },
+
+        "organization": {
+          "type": "string",
+          "title": "Organization",
+          "description":"The organization that sponsors a conference or that publishes a manual"
+        },
+
+        "url": {
+          "type": "string",
+          "title": "URL",
+          "description":"URL of the document, preferably a permanent URL"
+        },
         
         "translators": {
           "type": "array",
@@ -642,18 +702,6 @@
 					]
 				},
 
-        "publisher": {
-          "type": "string",
-          "title": "Publisher",
-          "description":"Entity responsible for making the resource available"              
-        },
-
-        "publisher_address": {
-          "type": "string",
-          "title":"Publisher's address",
-          "description": "For major publishing houses, just the city is given. For small publishers, you can help the reader by giving the complete address."    
-        }, 
-
         "rights": {
           "type": "string",
           "title": "Rights",

From 3ee9b655f6d8aecd144a6337757044c61bd4fe42 Mon Sep 17 00:00:00 2001
From: Mehmood Asghar <mah0001@gmail.com>
Date: Thu, 10 Feb 2022 16:11:04 +0500
Subject: [PATCH 07/79] Update ddi/microdata schema

---
 .../catalog-admin/ddi-schema.json             | 107 +++++++++++-------
 application/schemas/ddi-schema.json           | 107 +++++++++++-------
 2 files changed, 138 insertions(+), 76 deletions(-)

diff --git a/api-documentation/catalog-admin/ddi-schema.json b/api-documentation/catalog-admin/ddi-schema.json
index d485bff95..57783b4b5 100644
--- a/api-documentation/catalog-admin/ddi-schema.json
+++ b/api-documentation/catalog-admin/ddi-schema.json
@@ -322,6 +322,10 @@
                   "affiliation":{
                     "title":"Affiliation",
                     "type":"string"
+                  },
+                  "uri":{
+                    "title":"URI",
+                    "type":"string"
                   }
                 },
                 "required":[
@@ -348,6 +352,10 @@
                   "email":{
                     "title":"Email",
                     "type":"string"
+                  },
+                  "uri":{
+                    "title":"URI",
+                    "type":"string"
                   }
                 }
               },
@@ -374,6 +382,10 @@
                   "affiliation":{
                     "title":"Affiliation",
                     "type":"string"
+                  },
+                  "uri":{
+                    "title":"URI",
+                    "type":"string"
                   }
                 }
               },
@@ -1287,54 +1299,73 @@
             "study_class":{
               "title":"Class of the Study",
               "description":"Generally used to give the data archive's class or study status number, which indicates the processing status of the study. May also be used as a text field to describe processing status. Example: `DDA Class C`, `Study is available from http://example.com` ",
-              "type":"string",
+              "type":["string","array"],
               "_ddi_xpath":"stdyDscr/method/stdyClas"
             },
+
             "data_processing":{
-              "type":"string",
+              "type":"array",
               "title":"Data Processing",
               "description":"Describes various data processing procedures not captured elsewhere in the documentation, such as topcoding, recoding, suppression, tabulation, etc. The `type` attribute supports better classification of this activity, including the optional use of a controlled vocabulary",
-              "_ddi_xpath":"stdyDscr/method/dataProcessing"
-            },
-            "data_processing_type":{
-              "type":"string",
-              "title":"Data Processing type",
-              "description":"Data procssing type",
-              "_ddi_xpath":"stdyDscr/method/dataProcessing/@type"
+              "_ddi_xpath":"stdyDscr/method/dataProcessing",
+              "items":{
+                "type":"object",
+                "properties":{
+                  "data_processing":{
+                    "title":"Data processing",                    
+                    "type":"string"
+                  },
+                  "source":{
+                    "title":"Source",
+                    "type":"string"
+                  },
+                  "type":{
+                    "title":"Data processing type",
+                    "type":"string"
+                  }
+                },
+                "required":[
+                  "data_processing"
+                ]
+              }
             },
+                        
             "coding_instructions":{
-              "type":"object",
+              "type":"array",
               "title":"Coding Instructions",
               "_ddi_xpath":"stdyDscr/method/codingInstructions",
               "description":"Describe specific coding instructions used in data processing, cleaning, assession, or tabulation.",
-              "properties":{
-                "related_processes":{
-                  "title":"Related processes",
-                  "type":"string",
-                  "_ddi_xpath":"stdyDscr/method/codingInstructions/@relatedProcesses"
-                },
-                "type":{
-                  "title":"Coding instructions type",
-                  "type":"string",
-                  "_ddi_xpath":"stdyDscr/method/codingInstructions/@type"
-                },
-                "txt":{
-                  "title":"Coding instructions text",
-                  "type":"string",
-                  "_ddi_xpath":"stdyDscr/method/codingInstructions/txt"
-                },
-                "command":{
-                  "title":"Command",
-                  "description":"Provide command code for the coding instruction. The formalLanguage attribute identifies the language of the command code.",
-                  "type":"string",
-                  "_ddi_xpath":"stdyDscr/method/codingInstructions/command"
-                },
-                "command_language":{
-                  "title":"Language of the command code",
-                  "description":"Identifies the language of the command code. e.g. `SPSS`, `R`, `STATA` ",
-                  "type":"string",
-                  "_ddi_xpath":"stdyDscr/method/codingInstructions/command/@formalLanguage"
-                }
+              "items":{
+                "type":"object",
+                  "properties":{
+                    "related_processes":{
+                      "title":"Related processes",
+                      "type":"string",
+                      "_ddi_xpath":"stdyDscr/method/codingInstructions/@relatedProcesses"
+                    },
+                    "type":{
+                      "title":"Coding instructions type",
+                      "type":"string",
+                      "_ddi_xpath":"stdyDscr/method/codingInstructions/@type"
+                    },
+                    "txt":{
+                      "title":"Coding instructions text",
+                      "type":"string",
+                      "_ddi_xpath":"stdyDscr/method/codingInstructions/txt"
+                    },
+                    "command":{
+                      "title":"Command",
+                      "description":"Provide command code for the coding instruction. The formalLanguage attribute identifies the language of the command code.",
+                      "type":"string",
+                      "_ddi_xpath":"stdyDscr/method/codingInstructions/command"
+                    },
+                    "command_language":{
+                      "title":"Language of the command code",
+                      "description":"Identifies the language of the command code. e.g. `SPSS`, `R`, `STATA` ",
+                      "type":"string",
+                      "_ddi_xpath":"stdyDscr/method/codingInstructions/command/@formalLanguage"
+                    }
+                  }
               }
             }
           }
diff --git a/application/schemas/ddi-schema.json b/application/schemas/ddi-schema.json
index d485bff95..57783b4b5 100644
--- a/application/schemas/ddi-schema.json
+++ b/application/schemas/ddi-schema.json
@@ -322,6 +322,10 @@
                   "affiliation":{
                     "title":"Affiliation",
                     "type":"string"
+                  },
+                  "uri":{
+                    "title":"URI",
+                    "type":"string"
                   }
                 },
                 "required":[
@@ -348,6 +352,10 @@
                   "email":{
                     "title":"Email",
                     "type":"string"
+                  },
+                  "uri":{
+                    "title":"URI",
+                    "type":"string"
                   }
                 }
               },
@@ -374,6 +382,10 @@
                   "affiliation":{
                     "title":"Affiliation",
                     "type":"string"
+                  },
+                  "uri":{
+                    "title":"URI",
+                    "type":"string"
                   }
                 }
               },
@@ -1287,54 +1299,73 @@
             "study_class":{
               "title":"Class of the Study",
               "description":"Generally used to give the data archive's class or study status number, which indicates the processing status of the study. May also be used as a text field to describe processing status. Example: `DDA Class C`, `Study is available from http://example.com` ",
-              "type":"string",
+              "type":["string","array"],
               "_ddi_xpath":"stdyDscr/method/stdyClas"
             },
+
             "data_processing":{
-              "type":"string",
+              "type":"array",
               "title":"Data Processing",
               "description":"Describes various data processing procedures not captured elsewhere in the documentation, such as topcoding, recoding, suppression, tabulation, etc. The `type` attribute supports better classification of this activity, including the optional use of a controlled vocabulary",
-              "_ddi_xpath":"stdyDscr/method/dataProcessing"
-            },
-            "data_processing_type":{
-              "type":"string",
-              "title":"Data Processing type",
-              "description":"Data procssing type",
-              "_ddi_xpath":"stdyDscr/method/dataProcessing/@type"
+              "_ddi_xpath":"stdyDscr/method/dataProcessing",
+              "items":{
+                "type":"object",
+                "properties":{
+                  "data_processing":{
+                    "title":"Data processing",                    
+                    "type":"string"
+                  },
+                  "source":{
+                    "title":"Source",
+                    "type":"string"
+                  },
+                  "type":{
+                    "title":"Data processing type",
+                    "type":"string"
+                  }
+                },
+                "required":[
+                  "data_processing"
+                ]
+              }
             },
+                        
             "coding_instructions":{
-              "type":"object",
+              "type":"array",
               "title":"Coding Instructions",
               "_ddi_xpath":"stdyDscr/method/codingInstructions",
               "description":"Describe specific coding instructions used in data processing, cleaning, assession, or tabulation.",
-              "properties":{
-                "related_processes":{
-                  "title":"Related processes",
-                  "type":"string",
-                  "_ddi_xpath":"stdyDscr/method/codingInstructions/@relatedProcesses"
-                },
-                "type":{
-                  "title":"Coding instructions type",
-                  "type":"string",
-                  "_ddi_xpath":"stdyDscr/method/codingInstructions/@type"
-                },
-                "txt":{
-                  "title":"Coding instructions text",
-                  "type":"string",
-                  "_ddi_xpath":"stdyDscr/method/codingInstructions/txt"
-                },
-                "command":{
-                  "title":"Command",
-                  "description":"Provide command code for the coding instruction. The formalLanguage attribute identifies the language of the command code.",
-                  "type":"string",
-                  "_ddi_xpath":"stdyDscr/method/codingInstructions/command"
-                },
-                "command_language":{
-                  "title":"Language of the command code",
-                  "description":"Identifies the language of the command code. e.g. `SPSS`, `R`, `STATA` ",
-                  "type":"string",
-                  "_ddi_xpath":"stdyDscr/method/codingInstructions/command/@formalLanguage"
-                }
+              "items":{
+                "type":"object",
+                  "properties":{
+                    "related_processes":{
+                      "title":"Related processes",
+                      "type":"string",
+                      "_ddi_xpath":"stdyDscr/method/codingInstructions/@relatedProcesses"
+                    },
+                    "type":{
+                      "title":"Coding instructions type",
+                      "type":"string",
+                      "_ddi_xpath":"stdyDscr/method/codingInstructions/@type"
+                    },
+                    "txt":{
+                      "title":"Coding instructions text",
+                      "type":"string",
+                      "_ddi_xpath":"stdyDscr/method/codingInstructions/txt"
+                    },
+                    "command":{
+                      "title":"Command",
+                      "description":"Provide command code for the coding instruction. The formalLanguage attribute identifies the language of the command code.",
+                      "type":"string",
+                      "_ddi_xpath":"stdyDscr/method/codingInstructions/command"
+                    },
+                    "command_language":{
+                      "title":"Language of the command code",
+                      "description":"Identifies the language of the command code. e.g. `SPSS`, `R`, `STATA` ",
+                      "type":"string",
+                      "_ddi_xpath":"stdyDscr/method/codingInstructions/command/@formalLanguage"
+                    }
+                  }
               }
             }
           }

From c5007c52ea5c676dd5a466a31b2ef402f95756b8 Mon Sep 17 00:00:00 2001
From: Mehmood Asghar <mah0001@gmail.com>
Date: Thu, 10 Feb 2022 19:04:42 +0500
Subject: [PATCH 08/79] remove field 'issue'

---
 api-documentation/catalog-admin/document-schema.json | 7 +------
 application/schemas/document-schema.json             | 7 +------
 2 files changed, 2 insertions(+), 12 deletions(-)

diff --git a/api-documentation/catalog-admin/document-schema.json b/api-documentation/catalog-admin/document-schema.json
index 179ac6394..20d14dd4d 100644
--- a/api-documentation/catalog-admin/document-schema.json
+++ b/api-documentation/catalog-admin/document-schema.json
@@ -519,12 +519,7 @@
           "type": "string",
           "title": "Volume number",
           "description":"Volume number"
-        },
-        "issue": {
-          "type": "string",
-          "title": "Issue number",
-          "description":"Issue number"
-        },
+        },        
 
         "number": {
           "type": "string",
diff --git a/application/schemas/document-schema.json b/application/schemas/document-schema.json
index 179ac6394..20d14dd4d 100644
--- a/application/schemas/document-schema.json
+++ b/application/schemas/document-schema.json
@@ -519,12 +519,7 @@
           "type": "string",
           "title": "Volume number",
           "description":"Volume number"
-        },
-        "issue": {
-          "type": "string",
-          "title": "Issue number",
-          "description":"Issue number"
-        },
+        },        
 
         "number": {
           "type": "string",

From 77ffa87217c13538dda45256ac7b37676f9db997 Mon Sep 17 00:00:00 2001
From: Mehmood Asghar <mah0001@gmail.com>
Date: Fri, 11 Feb 2022 18:24:50 +0500
Subject: [PATCH 09/79] misc microdata schema updates

---
 .../catalog-admin/ddi-schema.json             | 2545 +++++++++--------
 application/schemas/ddi-schema.json           | 2545 +++++++++--------
 2 files changed, 2558 insertions(+), 2532 deletions(-)

diff --git a/api-documentation/catalog-admin/ddi-schema.json b/api-documentation/catalog-admin/ddi-schema.json
index 57783b4b5..c3dfa6cfb 100644
--- a/api-documentation/catalog-admin/ddi-schema.json
+++ b/api-documentation/catalog-admin/ddi-schema.json
@@ -1,782 +1,781 @@
 {
   "$schema": "http://json-schema.org/draft-07/schema#",
   "$id": "http://ihsn.org/schemas/ddi2-codebook",
-  "version":"0.0",
-  "title":"Survey Microdata Schema Draft",
-  "description":"Schema for Survey data type based on DDI 2.5",
-  "definitions":{
-    "doc_desc":{
-      "type":"object",
-      "title":"Document Description",
-      "description":"Document Description",
-      "_ddi_xpath":"docDscr",
-      "properties":{
-        "title":{
-          "title":"Document title",
-          "description":"Document title",
-          "type":"string",
-          "_ddi_xpath":"docDscr/citation/titlStmt/titl"
+  "version": "0.0",
+  "title": "Survey Microdata Schema Draft",
+  "description": "Schema for Survey data type based on DDI 2.5",
+  "definitions": {
+    "doc_desc": {
+      "type": "object",
+      "title": "Document Description",
+      "description": "Document Description",
+      "_ddi_xpath": "docDscr",
+      "properties": {
+        "title": {
+          "title": "Document title",
+          "description": "Document title",
+          "type": "string",
+          "_ddi_xpath": "docDscr/citation/titlStmt/titl"
         },
-        "idno":{
-          "title":"Unique ID number for the document",
-          "type":"string",
-          "_ddi_xpath":"docDscr/citation/titlStmt/IDNo"
+        "idno": {
+          "title": "Unique ID number for the document",
+          "type": "string",
+          "_ddi_xpath": "docDscr/citation/titlStmt/IDNo"
         },
-        "producers":{
-          "type":"array",
-          "title":"Producers",
-          "description":"List of producers",
-          "_ddi_xpath":"docDscr/citation/prodStmt/producer",
-          "items":{
-            "type":"object",
-            "properties":{
-              "name":{
-                "title":"Name",
-                "description":"Name (required)",
-                "type":"string"
+        "producers": {
+          "type": "array",
+          "title": "Producers",
+          "description": "List of producers",
+          "_ddi_xpath": "docDscr/citation/prodStmt/producer",
+          "items": {
+            "type": "object",
+            "properties": {
+              "name": {
+                "title": "Name",
+                "description": "Name (required)",
+                "type": "string"
               },
-              "abbr":{
-                "title":"Abbreviation",
-                "type":"string"
+              "abbr": {
+                "title": "Abbreviation",
+                "type": "string"
               },
-              "affiliation":{
-                "type":"string",
-                "title":"Affiliation"
+              "affiliation": {
+                "type": "string",
+                "title": "Affiliation"
               },
-              "role":{
-                "title":"Role",
-                "type":"string"
+              "role": {
+                "title": "Role",
+                "type": "string"
               }
             }
           },
-          "required":[
+          "required": [
             "name"
           ]
         },
-        "prod_date":{
-          "title":"Date of Production",
-          "description":"Document production date using format(YYYY-MM-DD)",
-          "type":"string",
-          "_ddi_xpath":"docDscr/citation/prodStmt/prodDate"
+        "prod_date": {
+          "title": "Date of Production",
+          "description": "Document production date using format(YYYY-MM-DD)",
+          "type": "string",
+          "_ddi_xpath": "docDscr/citation/prodStmt/prodDate"
         },
-        "version_statement":{
-          "type":"object",
-          "title":"Version Statement",
-          "description":"Version Statement",
-          "_ddi_xpath":"docDscr/citation/verStmt",
-          "properties":{
-            "version":{
-              "title":"Version",
-              "type":"string",
-              "_ddi_xpath":"docDscr/citation/verStmt/version"
+        "version_statement": {
+          "type": "object",
+          "title": "Version Statement",
+          "description": "Version Statement",
+          "_ddi_xpath": "docDscr/citation/verStmt",
+          "properties": {
+            "version": {
+              "title": "Version",
+              "type": "string",
+              "_ddi_xpath": "docDscr/citation/verStmt/version"
             },
-            "version_date":{
-              "title":"Version Date",
-              "type":"string",
-              "_ddi_xpath":"docDscr/citation/verStmt/version/@date"
+            "version_date": {
+              "title": "Version Date",
+              "type": "string",
+              "_ddi_xpath": "docDscr/citation/verStmt/version/@date"
             },
-            "version_resp":{
-              "title":"Version Responsibility Statement",
-              "description":"The organization or person responsible for the version of the work",
-              "type":"string",
-              "_ddi_xpath":"docDscr/citation/verStmt/verResp"
+            "version_resp": {
+              "title": "Version Responsibility Statement",
+              "description": "The organization or person responsible for the version of the work",
+              "type": "string",
+              "_ddi_xpath": "docDscr/citation/verStmt/verResp"
             },
-            "version_notes":{
-              "title":"Version Notes",
-              "type":"string",
-              "_ddi_xpath":"docDscr/citation/verStmt/notes"
+            "version_notes": {
+              "title": "Version Notes",
+              "type": "string",
+              "_ddi_xpath": "docDscr/citation/verStmt/notes"
             }
           }
         }
       },
-      "additionalProperties":false
+      "additionalProperties": false
     },
-    "study_desc":{
-      "type":"object",
-      "description":"Study Description",
-      "_ddi_xpath":"stdyDscr",
-      "properties":{
-        "title_statement":{
-          "type":"object",
-          "description":"Study title",
-          "_ddi_xpath":"stdyDscr/citation/titlStmt",
-          "properties":{
-            "idno":{
-              "type":"string",
-              "title":"Unique user defined ID",
-              "description":"The ID number of a dataset is a unique number that is used to identify a particular survey. Define and use a consistent scheme to use. Such an ID could be constructed as follows: country-producer-survey-year-version where \n - country is the 3-letter ISO country abbreviation \n - producer is the abbreviation of the producing agency \n - survey is the survey abbreviation \n - year is the reference year (or the year the survey started) \n - version is the number dataset version number (see Version Description below)",
-              "_ddi_xpath":"stdyDscr/citation/titlStmt/IDNo"
+    "study_desc": {
+      "type": "object",
+      "description": "Study Description",
+      "_ddi_xpath": "stdyDscr",
+      "properties": {
+        "title_statement": {
+          "type": "object",
+          "description": "Study title",
+          "_ddi_xpath": "stdyDscr/citation/titlStmt",
+          "properties": {
+            "idno": {
+              "type": "string",
+              "title": "Unique user defined ID",
+              "description": "The ID number of a dataset is a unique number that is used to identify a particular survey. Define and use a consistent scheme to use. Such an ID could be constructed as follows: country-producer-survey-year-version where \n - country is the 3-letter ISO country abbreviation \n - producer is the abbreviation of the producing agency \n - survey is the survey abbreviation \n - year is the reference year (or the year the survey started) \n - version is the number dataset version number (see Version Description below)",
+              "_ddi_xpath": "stdyDscr/citation/titlStmt/IDNo"
             },
-            "identifiers":{
-              "type":"array",
-              "title":"Other identifiers",
-              "description":"Other identifiers",
-              "items":{
-                "type":"object",
-                "properties":{
-                  "type":{
-                    "title":"Identifier type",
-                    "description":"Type of identifier e.g. `doi`, `handle`, `other`",
-                    "type":"string"
+            "identifiers": {
+              "type": "array",
+              "title": "Other identifiers",
+              "description": "Other identifiers",
+              "items": {
+                "type": "object",
+                "properties": {
+                  "type": {
+                    "title": "Identifier type",
+                    "description": "Type of identifier e.g. `doi`, `handle`, `other`",
+                    "type": "string"
                   },
-                  "identifier":{
-                    "title":"Identifier",
-                    "type":"string"
+                  "identifier": {
+                    "title": "Identifier",
+                    "type": "string"
                   }
                 },
-                "required":[
+                "required": [
                   "identifier"
                 ]
               }
             },
-
-            "title":{
-              "type":"string",
-              "title":"Survey title",
-              "description":"The title is the official name of the survey as it is stated on the questionnaire or as it appears in the design documents. The following items should be noted:\n - Include the reference year(s) of the survey in the title. \n - Do not include the abbreviation of the survey name in the title. \n - As the survey title is a proper noun, the first letter of each word should be capitalized (except for prepositions or other conjunctions).\n - Including the country name in the title is optional.",
-              "_ddi_xpath":"stdyDscr/citation/titlStmt/titl"
+            "title": {
+              "type": "string",
+              "title": "Survey title",
+              "description": "The title is the official name of the survey as it is stated on the questionnaire or as it appears in the design documents. The following items should be noted:\n - Include the reference year(s) of the survey in the title. \n - Do not include the abbreviation of the survey name in the title. \n - As the survey title is a proper noun, the first letter of each word should be capitalized (except for prepositions or other conjunctions).\n - Including the country name in the title is optional.",
+              "_ddi_xpath": "stdyDscr/citation/titlStmt/titl"
             },
-            "sub_title":{
-              "type":"string",
-              "title":"Survey subtitle",
-              "description":"A short subtitle for the survey",
-              "_ddi_xpath":"stdyDscr/citation/titlStmt/subTitl"
+            "sub_title": {
+              "type": "string",
+              "title": "Survey subtitle",
+              "description": "A short subtitle for the survey",
+              "_ddi_xpath": "stdyDscr/citation/titlStmt/subTitl"
             },
-            "alternate_title":{
-              "type":"string",
-              "title":"Abbreviation or Acronym",
-              "description":"The abbreviation of a survey is usually the first letter of each word of the titled survey. The survey reference year(s) may be included.",
-              "_ddi_xpath":"stdyDscr/citation/titlStmt/altTitl"
+            "alternate_title": {
+              "type": "string",
+              "title": "Abbreviation or Acronym",
+              "description": "The abbreviation of a survey is usually the first letter of each word of the titled survey. The survey reference year(s) may be included.",
+              "_ddi_xpath": "stdyDscr/citation/titlStmt/altTitl"
             },
-            "translated_title":{
-              "title":"Translated Title",
-              "description":"In countries with more than one official language, a translation of the title may be provided.",
-              "type":"string",
-              "_ddi_xpath":"stdyDscr/citation/titlStmt/parTitl"
+            "translated_title": {
+              "title": "Translated Title",
+              "description": "In countries with more than one official language, a translation of the title may be provided.",
+              "type": "string",
+              "_ddi_xpath": "stdyDscr/citation/titlStmt/parTitl"
             }
           },
-          "required":[
+          "required": [
             "idno",
             "title"
           ]
         },
-        "authoring_entity":{
-          "type":"array",
-          "title":"Authoring entity/Primary investigators",
-          "description":"The person, corporate body, or agency responsible for the work's substantive and intellectual content. Repeat the element for each author, and use 'affiliation' attribute if available. Invert first and last name and use commas.",
-          "_ddi_xpath":"stdyDscr/citation/rspStmt/AuthEnty",
-          "items":{
-            "type":"object",
-            "properties":{
-              "name":{
-                "title":"Agency Name",
-                "type":"string"
+        "authoring_entity": {
+          "type": "array",
+          "title": "Authoring entity/Primary investigators",
+          "description": "The person, corporate body, or agency responsible for the work's substantive and intellectual content. Repeat the element for each author, and use 'affiliation' attribute if available. Invert first and last name and use commas.",
+          "_ddi_xpath": "stdyDscr/citation/rspStmt/AuthEnty",
+          "items": {
+            "type": "object",
+            "properties": {
+              "name": {
+                "title": "Agency Name",
+                "type": "string"
               },
-              "affiliation":{
-                "title":"Affiliation",
-                "type":"string"
+              "affiliation": {
+                "title": "Affiliation",
+                "type": "string"
               }
             },
-            "required":[
+            "required": [
               "name"
             ]
           }
         },
-        "oth_id":{
-          "type":"array",
-          "title":"Other Identifications/Acknowledgments",
-          "description":"Acknowledge any other people and institutions that have in some form contributed to the survey",
-          "_ddi_xpath":"stdyDscr/citation/rspStmt/othId",
-          "items":{
-            "type":"object",
-            "properties":{
-              "name":{
-                "title":"Name",
-                "description":"Person or Agency name",
-                "type":"string"
+        "oth_id": {
+          "type": "array",
+          "title": "Other Identifications/Acknowledgments",
+          "description": "Acknowledge any other people and institutions that have in some form contributed to the survey",
+          "_ddi_xpath": "stdyDscr/citation/rspStmt/othId",
+          "items": {
+            "type": "object",
+            "properties": {
+              "name": {
+                "title": "Name",
+                "description": "Person or Agency name",
+                "type": "string"
               },
-              "role":{
-                "title":"Role",
-                "type":"string"
+              "role": {
+                "title": "Role",
+                "type": "string"
               },
-              "affiliation":{
-                "title":"Affiliation",
-                "type":"string"
+              "affiliation": {
+                "title": "Affiliation",
+                "type": "string"
               }
             },
-            "required":[
+            "required": [
               "name"
             ]
           }
         },
-        "production_statement":{
-          "type":"object",
-          "title":"Production Statement",
-          "description":"Production Statement",
-          "_ddi_xpath":"stdyDscr/citation/prodStmt",
-          "properties":{
-            "producers":{
-              "type":"array",
-              "title":"Producers",
-              "description":"List of producers",
-              "_ddi_xpath":"stdyDscr/citation/prodStmt/producer",
-              "items":{
-                "type":"object",
-                "properties":{
-                  "name":{
-                    "title":"Name",
-                    "description":"Name (required)",
-                    "type":"string"
+        "production_statement": {
+          "type": "object",
+          "title": "Production Statement",
+          "description": "Production Statement",
+          "_ddi_xpath": "stdyDscr/citation/prodStmt",
+          "properties": {
+            "producers": {
+              "type": "array",
+              "title": "Producers",
+              "description": "List of producers",
+              "_ddi_xpath": "stdyDscr/citation/prodStmt/producer",
+              "items": {
+                "type": "object",
+                "properties": {
+                  "name": {
+                    "title": "Name",
+                    "description": "Name (required)",
+                    "type": "string"
                   },
-                  "abbr":{
-                    "title":"Abbreviation",
-                    "type":"string"
+                  "abbr": {
+                    "title": "Abbreviation",
+                    "type": "string"
                   },
-                  "affiliation":{
-                    "type":"string",
-                    "title":"Affiliation"
+                  "affiliation": {
+                    "type": "string",
+                    "title": "Affiliation"
                   },
-                  "role":{
-                    "title":"Role",
-                    "type":"string"
+                  "role": {
+                    "title": "Role",
+                    "type": "string"
                   }
                 }
               },
-              "required":[
+              "required": [
                 "name"
               ]
             },
-            "copyright":{
-              "title":"Copyright",
-              "type":"string",
-              "_ddi_xpath":"stdyDscr/citation/prodStmt/copyright"
+            "copyright": {
+              "title": "Copyright",
+              "type": "string",
+              "_ddi_xpath": "stdyDscr/citation/prodStmt/copyright"
             },
-            "prod_date":{
-              "title":"Production Date",
-              "description":"Date when the marked-up document/marked-up document source/data collection/other material(s) were produced (not distributed or archived). The ISO standard for dates (YYYY-MM-DD) is recommended for use with the date attribute. Production date for data collection (2.1.3.3) maps to Dublin Core Date element.",
-              "type":"string",
-              "_ddi_xpath":"stdyDscr/citation/prodStmt/prodDate"
+            "prod_date": {
+              "title": "Production Date",
+              "description": "Date when the marked-up document/marked-up document source/data collection/other material(s) were produced (not distributed or archived). The ISO standard for dates (YYYY-MM-DD) is recommended for use with the date attribute. Production date for data collection (2.1.3.3) maps to Dublin Core Date element.",
+              "type": "string",
+              "_ddi_xpath": "stdyDscr/citation/prodStmt/prodDate"
             },
-            "prod_place":{
-              "title":"Production Place",
-              "description":"Address of the archive or organization that produced the work",
-              "type":"string",
-              "_ddi_xpath":"stdyDscr/citation/prodStmt/prodPlac"
+            "prod_place": {
+              "title": "Production Place",
+              "description": "Address of the archive or organization that produced the work",
+              "type": "string",
+              "_ddi_xpath": "stdyDscr/citation/prodStmt/prodPlac"
             },
-            "funding_agencies":{
-              "type":"array",
-              "title":"Funding Agency/Sponsor",
-              "description":"The source(s) of funds for production of the work. If different funding agencies sponsored different stages of the production process, use the 'role' attribute to distinguish them.",
-              "_ddi_xpath":"stdyDscr/citation/prodStmt/fundAg",
-              "items":{
-                "type":"object",
-                "properties":{
-                  "name":{
-                    "title":"Funding Agency/Sponsor",
-                    "type":"string"
+            "funding_agencies": {
+              "type": "array",
+              "title": "Funding Agency/Sponsor",
+              "description": "The source(s) of funds for production of the work. If different funding agencies sponsored different stages of the production process, use the 'role' attribute to distinguish them.",
+              "_ddi_xpath": "stdyDscr/citation/prodStmt/fundAg",
+              "items": {
+                "type": "object",
+                "properties": {
+                  "name": {
+                    "title": "Funding Agency/Sponsor",
+                    "type": "string"
                   },
-                  "abbr":{
-                    "title":"Abbreviation",
-                    "type":"string"
+                  "abbr": {
+                    "title": "Abbreviation",
+                    "type": "string"
                   },
-                  "grant":{
-                    "title":"Grant Number",
-                    "type":"string",
-                    "_ddi_xpath":"stdyDscr/citation/prodStmt/grantNo"
+                  "grant": {
+                    "title": "Grant Number",
+                    "type": "string",
+                    "_ddi_xpath": "stdyDscr/citation/prodStmt/grantNo"
                   },
-                  "role":{
-                    "title":"Role",
-                    "type":"string"
+                  "role": {
+                    "title": "Role",
+                    "type": "string"
                   }
                 },
-                "required":[
+                "required": [
                   "name"
                 ]
               }
-            }            
+            }
           }
         },
-        "distribution_statement":{
-          "type":"object",
-          "title":"Distribution Statement",
-          "description":"Distribution Statement",
-          "_ddi_xpath":"stdyDscr/citation/distStmt",
-          "properties":{
-            "distributors":{
-              "type":"array",
-              "title":"Distributor",
-              "description":"The organization designated by the author or producer to generate copies of the particular work including any necessary editions or revisions. Names and addresses may be specified and other archives may be co-distributors. A URI attribute is included to provide an URN or URL to the ordering service or download facility on a Web site.",
-              "_ddi_xpath":"stdyDscr/citation/distStmt/distrbtr",
-              "items":{
-                "type":"object",
-                "properties":{
-                  "name":{
-                    "title":"Organization name",
-                    "description":"Organization name",
-                    "type":"string"
+        "distribution_statement": {
+          "type": "object",
+          "title": "Distribution Statement",
+          "description": "Distribution Statement",
+          "_ddi_xpath": "stdyDscr/citation/distStmt",
+          "properties": {
+            "distributors": {
+              "type": "array",
+              "title": "Distributor",
+              "description": "The organization designated by the author or producer to generate copies of the particular work including any necessary editions or revisions. Names and addresses may be specified and other archives may be co-distributors. A URI attribute is included to provide an URN or URL to the ordering service or download facility on a Web site.",
+              "_ddi_xpath": "stdyDscr/citation/distStmt/distrbtr",
+              "items": {
+                "type": "object",
+                "properties": {
+                  "name": {
+                    "title": "Organization name",
+                    "description": "Organization name",
+                    "type": "string"
                   },
-                  "abbr":{
-                    "title":"Abbreviation",
-                    "type":"string"
+                  "abbr": {
+                    "title": "Abbreviation",
+                    "type": "string"
                   },
-                  "affiliation":{
-                    "title":"Affiliation",
-                    "type":"string"
+                  "affiliation": {
+                    "title": "Affiliation",
+                    "type": "string"
                   },
-                  "uri":{
-                    "title":"URI",
-                    "type":"string"
+                  "uri": {
+                    "title": "URI",
+                    "type": "string"
                   }
                 },
-                "required":[
+                "required": [
                   "name"
                 ]
               }
             },
-            "contact":{
-              "type":"array",
-              "title":"Contact",
-              "description":"Contact",
-              "_ddi_xpath":"stdyDscr/citation/distStmt/contact",
-              "items":{
-                "type":"object",
-                "properties":{
-                  "name":{
-                    "title":"Name",
-                    "type":"string"
+            "contact": {
+              "type": "array",
+              "title": "Contact",
+              "description": "Contact",
+              "_ddi_xpath": "stdyDscr/citation/distStmt/contact",
+              "items": {
+                "type": "object",
+                "properties": {
+                  "name": {
+                    "title": "Name",
+                    "type": "string"
                   },
-                  "affiliation":{
-                    "title":"Affiliation",
-                    "type":"string"
+                  "affiliation": {
+                    "title": "Affiliation",
+                    "type": "string"
                   },
-                  "email":{
-                    "title":"Email",
-                    "type":"string"
+                  "email": {
+                    "title": "Email",
+                    "type": "string"
                   },
-                  "uri":{
-                    "title":"URI",
-                    "type":"string"
+                  "uri": {
+                    "title": "URI",
+                    "type": "string"
                   }
                 }
               },
-              "required":[
+              "required": [
                 "name"
               ]
             },
-            "depositor":{
-              "type":"array",
-              "title":"Depositor",
-              "description":"Depositor",
-              "_ddi_xpath":"stdyDscr/citation/distStmt/depositr",
-              "items":{
-                "type":"object",
-                "properties":{
-                  "name":{
-                    "title":"Name",
-                    "type":"string"
+            "depositor": {
+              "type": "array",
+              "title": "Depositor",
+              "description": "Depositor",
+              "_ddi_xpath": "stdyDscr/citation/distStmt/depositr",
+              "items": {
+                "type": "object",
+                "properties": {
+                  "name": {
+                    "title": "Name",
+                    "type": "string"
                   },
-                  "abbr":{
-                    "title":"Abbreviation",
-                    "type":"string"
+                  "abbr": {
+                    "title": "Abbreviation",
+                    "type": "string"
                   },
-                  "affiliation":{
-                    "title":"Affiliation",
-                    "type":"string"
+                  "affiliation": {
+                    "title": "Affiliation",
+                    "type": "string"
                   },
-                  "uri":{
-                    "title":"URI",
-                    "type":"string"
+                  "uri": {
+                    "title": "URI",
+                    "type": "string"
                   }
                 }
               },
-              "required":[
+              "required": [
                 "name"
               ]
             },
-            "deposit_date":{
-              "title":"Date of Deposit",
-              "type":"string",
-              "_ddi_xpath":"stdyDscr/citation/distStmt/depDate"
+            "deposit_date": {
+              "title": "Date of Deposit",
+              "type": "string",
+              "_ddi_xpath": "stdyDscr/citation/distStmt/depDate"
             },
-            "distribution_date":{
-              "title":"Date of Distribution",
-              "type":"string",
-              "_ddi_xpath":"stdyDscr/citation/distStmt/distDate"
+            "distribution_date": {
+              "title": "Date of Distribution",
+              "type": "string",
+              "_ddi_xpath": "stdyDscr/citation/distStmt/distDate"
             }
           }
         },
-        "series_statement":{
-          "type":"object",
-          "title":"Series Statement",
-          "description":"Series Statement",
-          "_ddi_xpath":"stdyDscr/citation/serStmt",
-          "properties":{
-            "series_name":{
-              "title":"Series Name",
-              "description":"The name of the series to which the work belongs.",
-              "type":"string",
-              "_ddi_xpath":"stdyDscr/citation/serStmt/serName"
+        "series_statement": {
+          "type": "object",
+          "title": "Series Statement",
+          "description": "Series Statement",
+          "_ddi_xpath": "stdyDscr/citation/serStmt",
+          "properties": {
+            "series_name": {
+              "title": "Series Name",
+              "description": "The name of the series to which the work belongs.",
+              "type": "string",
+              "_ddi_xpath": "stdyDscr/citation/serStmt/serName"
             },
-            "series_info":{
-              "title":"Series Information",
-              "description":"A survey may be repeated at regular intervals (such as an annual labour force survey), or be part of an international survey program (such as the MICS, CWIQ, DHS, LSMS and others). The Series information is a description of this `collection` of surveys. A brief description of the characteristics of the survey, including when it started, how many rounds were already implemented, and who is in charge would be provided here.",
-              "type":"string",
-              "_ddi_xpath":"stdyDscr/citation/serStmt/serInfo"
+            "series_info": {
+              "title": "Series Information",
+              "description": "A survey may be repeated at regular intervals (such as an annual labour force survey), or be part of an international survey program (such as the MICS, CWIQ, DHS, LSMS and others). The Series information is a description of this `collection` of surveys. A brief description of the characteristics of the survey, including when it started, how many rounds were already implemented, and who is in charge would be provided here.",
+              "type": "string",
+              "_ddi_xpath": "stdyDscr/citation/serStmt/serInfo"
             }
           }
         },
-        "version_statement":{
-          "type":"object",
-          "title":"Version Statement",
-          "description":"Version Statement",
-          "_ddi_xpath":"stdyDscr/citation/verStmt",
-          "properties":{
-            "version":{
-              "title":"Version",
-              "type":"string",
-              "_ddi_xpath":"stdyDscr/citation/verStmt/version"
+        "version_statement": {
+          "type": "object",
+          "title": "Version Statement",
+          "description": "Version Statement",
+          "_ddi_xpath": "stdyDscr/citation/verStmt",
+          "properties": {
+            "version": {
+              "title": "Version",
+              "type": "string",
+              "_ddi_xpath": "stdyDscr/citation/verStmt/version"
             },
-            "version_date":{
-              "title":"Version Date",
-              "type":"string",
-              "_ddi_xpath":"stdyDscr/citation/verStmt/version/@date"
+            "version_date": {
+              "title": "Version Date",
+              "type": "string",
+              "_ddi_xpath": "stdyDscr/citation/verStmt/version/@date"
             },
-            "version_resp":{
-              "title":"Version Responsibility Statement",
-              "description":"The organization or person responsible for the version of the work",
-              "type":"string",
-              "_ddi_xpath":"stdyDscr/citation/verStmt/verResp"
+            "version_resp": {
+              "title": "Version Responsibility Statement",
+              "description": "The organization or person responsible for the version of the work",
+              "type": "string",
+              "_ddi_xpath": "stdyDscr/citation/verStmt/verResp"
             },
-            "version_notes":{
-              "title":"Version Notes",
-              "type":"string",
-              "_ddi_xpath":"stdyDscr/citation/verStmt/notes"
+            "version_notes": {
+              "title": "Version Notes",
+              "type": "string",
+              "_ddi_xpath": "stdyDscr/citation/verStmt/notes"
             }
           }
         },
-        "bib_citation":{
-          "type":"string",
-          "title":"Bibliographic Citation",
-          "description":"Complete bibliographic reference containing all of the standard elements of a citation that can be used to cite the work. The `'bib_citation_format'` field is provided to enable specification of the particular citation style used, e.g., APA, MLA, Chicago, etc.",
-          "_ddi_xpath":"stdyDscr/citation/biblCit"
+        "bib_citation": {
+          "type": "string",
+          "title": "Bibliographic Citation",
+          "description": "Complete bibliographic reference containing all of the standard elements of a citation that can be used to cite the work. The `'bib_citation_format'` field is provided to enable specification of the particular citation style used, e.g., APA, MLA, Chicago, etc.",
+          "_ddi_xpath": "stdyDscr/citation/biblCit"
         },
-        "bib_citation_format":{
-          "type":"string",
-          "title":"Bibliographic Citation Format",
-          "description":"Specification of the particular citation style used, e.g., `APA`, `MLA`, `Chicago`, etc.",
-          "_ddi_xpath":"stdyDscr/citation/biblCit/@format"
+        "bib_citation_format": {
+          "type": "string",
+          "title": "Bibliographic Citation Format",
+          "description": "Specification of the particular citation style used, e.g., `APA`, `MLA`, `Chicago`, etc.",
+          "_ddi_xpath": "stdyDscr/citation/biblCit/@format"
         },
-        "holdings":{
-          "type":"array",
-          "title":"Holdings Information",
-          "description":"Information concerning either the physical or electronic holdings of the cited work. Attributes include: location--The physical location where a copy is held; callno--The call number for a work at the location specified; and URI--A URN or URL for accessing the electronic copy of the cited work.",
-          "_ddi_xpath":"stdyDscr/citation/holdings",
-          "items":{
-            "type":"object",
-            "properties":{
-              "name":{
-                "title":"Name",
-                "type":"string"
+        "holdings": {
+          "type": "array",
+          "title": "Holdings Information",
+          "description": "Information concerning either the physical or electronic holdings of the cited work. Attributes include: location--The physical location where a copy is held; callno--The call number for a work at the location specified; and URI--A URN or URL for accessing the electronic copy of the cited work.",
+          "_ddi_xpath": "stdyDscr/citation/holdings",
+          "items": {
+            "type": "object",
+            "properties": {
+              "name": {
+                "title": "Name",
+                "type": "string"
               },
-              "location":{
-                "title":"Location",
-                "type":"string"
+              "location": {
+                "title": "Location",
+                "type": "string"
               },
-              "callno":{
-                "title":"Callno",
-                "type":"string"
+              "callno": {
+                "title": "Callno",
+                "type": "string"
               },
-              "uri":{
-                "title":"URI",
-                "type":"string"
+              "uri": {
+                "title": "URI",
+                "type": "string"
               }
             }
           },
-          "required":[
+          "required": [
             "name"
           ]
         },
-        "study_notes":{
-          "title":"Study notes",
-          "type":"string",
-          "_ddi_xpath":"stdyDscr/citation/notes"
+        "study_notes": {
+          "title": "Study notes",
+          "type": "string",
+          "_ddi_xpath": "stdyDscr/citation/notes"
         },
-        "study_authorization":{
-          "type":"object",
-          "title":"Study Authorization",
-          "_ddi_xpath":"stdyDscr/studyAuthorization",
-          "description":"Provides structured information on the agency that authorized the study, the date of authorization, and an authorization statement",
-          "properties":{
-            "date":{
-              "title":"Authorization Date",
-              "type":"string",
-              "_ddi_xpath":"stdyDscr/studyAuthorization/@date"
+        "study_authorization": {
+          "type": "object",
+          "title": "Study Authorization",
+          "_ddi_xpath": "stdyDscr/studyAuthorization",
+          "description": "Provides structured information on the agency that authorized the study, the date of authorization, and an authorization statement",
+          "properties": {
+            "date": {
+              "title": "Authorization Date",
+              "type": "string",
+              "_ddi_xpath": "stdyDscr/studyAuthorization/@date"
             },
-            "agency":{
-              "type":"array",
-              "title":"Authorizing Agency",
-              "description":"The source(s) of funds for production of the work. If different funding agencies sponsored different stages of the production process, use the 'role' attribute to distinguish them.",
-              "_ddi_xpath":"stdyDscr/studyAuthorization/authorizingAgency",
-              "items":{
-                "type":"object",
-                "properties":{
-                  "name":{
-                    "title":"Funding Agency/Sponsor",
-                    "type":"string"
+            "agency": {
+              "type": "array",
+              "title": "Authorizing Agency",
+              "description": "The source(s) of funds for production of the work. If different funding agencies sponsored different stages of the production process, use the 'role' attribute to distinguish them.",
+              "_ddi_xpath": "stdyDscr/studyAuthorization/authorizingAgency",
+              "items": {
+                "type": "object",
+                "properties": {
+                  "name": {
+                    "title": "Funding Agency/Sponsor",
+                    "type": "string"
                   },
-                  "affiliation":{
-                    "title":"Affiliation",
-                    "type":"string"
+                  "affiliation": {
+                    "title": "Affiliation",
+                    "type": "string"
                   },
-                  "abbr":{
-                    "title":"Abbreviation",
-                    "type":"string"
+                  "abbr": {
+                    "title": "Abbreviation",
+                    "type": "string"
                   }
                 },
-                "required":[
+                "required": [
                   "name"
                 ]
               }
             },
-            "authorization_statement":{
-              "title":"Authorization Statement",
-              "description":"Authorization Statement",
-              "_ddi_xpath":"stdyDscr/studyAuthorization/authorizationStatement",
-              "type":"string"
+            "authorization_statement": {
+              "title": "Authorization Statement",
+              "description": "Authorization Statement",
+              "_ddi_xpath": "stdyDscr/studyAuthorization/authorizationStatement",
+              "type": "string"
             }
           }
         },
-        "study_info":{
-          "type":"object",
-          "title":"Study Scope",
-          "description":"This section contains information about the data collection's scope across several dimensions, including substantive content, geography, and time.",
-          "_ddi_xpath":"stdyDscr/stdyInfo",
-          "properties":{
-            "study_budget":{
-              "title":"Study Budget",
-              "description":"Provide a clear summary of the pDescribe the budget of the project in as much detail as needed. Use XHTML structure elements to identify discrete pieces of information in a way that facilitates direct transfer of information on the study budget between DDI 2 and DDI 3 structures.urposes, objectives and content of the survey",
-              "type":"string",
-              "_ddi_xpath":"stdyDscr/stdyInfo/studyBudget"
+        "study_info": {
+          "type": "object",
+          "title": "Study Scope",
+          "description": "This section contains information about the data collection's scope across several dimensions, including substantive content, geography, and time.",
+          "_ddi_xpath": "stdyDscr/stdyInfo",
+          "properties": {
+            "study_budget": {
+              "title": "Study Budget",
+              "description": "Provide a clear summary of the pDescribe the budget of the project in as much detail as needed. Use XHTML structure elements to identify discrete pieces of information in a way that facilitates direct transfer of information on the study budget between DDI 2 and DDI 3 structures.urposes, objectives and content of the survey",
+              "type": "string",
+              "_ddi_xpath": "stdyDscr/stdyInfo/studyBudget"
             },
-            "keywords":{
-              "type":"array",
-              "description":"Keywords",
-              "_ddi_xpath":"stdyDscr/stdyInfo/subject/keywords",
-              "items":{
-                "type":"object",
-                "properties":{
-                  "keyword":{
-                    "title":"Keyword",
-                    "type":"string"
+            "keywords": {
+              "type": "array",
+              "description": "Keywords",
+              "_ddi_xpath": "stdyDscr/stdyInfo/subject/keywords",
+              "items": {
+                "type": "object",
+                "properties": {
+                  "keyword": {
+                    "title": "Keyword",
+                    "type": "string"
                   },
-                  "vocab":{
-                    "title":"Vocabulary",
-                    "type":"string"
+                  "vocab": {
+                    "title": "Vocabulary",
+                    "type": "string"
                   },
-                  "uri":{
-                    "title":"uri",
-                    "type":"string"
-                  }                  
+                  "uri": {
+                    "title": "uri",
+                    "type": "string"
+                  }
                 }
               }
             },
-            "topics":{
-              "type":"array",
-              "title":"Topic Classification",
-              "description":"Topic Classification",
-              "_ddi_xpath":"stdyDscr/stdyInfo/subject/topcClas",
-              "items":{
-                "type":"object",
-                "properties":{
-                  "topic":{
-                    "title":"Topic",
-                    "type":"string"
+            "topics": {
+              "type": "array",
+              "title": "Topic Classification",
+              "description": "Topic Classification",
+              "_ddi_xpath": "stdyDscr/stdyInfo/subject/topcClas",
+              "items": {
+                "type": "object",
+                "properties": {
+                  "topic": {
+                    "title": "Topic",
+                    "type": "string"
                   },
-                  "vocab":{
-                    "title":"Vocab",
-                    "type":"string"
+                  "vocab": {
+                    "title": "Vocab",
+                    "type": "string"
                   },
-                  "uri":{
-                    "title":"URI",
-                    "type":"string"
+                  "uri": {
+                    "title": "URI",
+                    "type": "string"
                   }
                 },
-                "required":[
+                "required": [
                   "topic"
                 ]
               }
             },
-            "abstract":{
-              "title":"Abstract",
-              "description":"Provide a clear summary of the purposes, objectives and content of the survey",
-              "type":"string",
-              "_ddi_xpath":"stdyDscr/stdyInfo/abstract"
+            "abstract": {
+              "title": "Abstract",
+              "description": "Provide a clear summary of the purposes, objectives and content of the survey",
+              "type": "string",
+              "_ddi_xpath": "stdyDscr/stdyInfo/abstract"
             },
-            "time_periods":{
-              "type":"array",
-              "title":"Time periods (YYYY/MM/DD)",
-              "description":"This field will usually be left empty. Time period differs from the dates of collection as they represent the period for which the data collected are applicable or relevant.",
-              "_ddi_xpath":"stdyDscr/stdyInfo/sumDscr/timePrd",
-              "items":{
-                "type":"object",
-                "properties":{
-                  "start":{
-                    "title":"Start date",
-                    "description":"Start date",
-                    "type":"string"
+            "time_periods": {
+              "type": "array",
+              "title": "Time periods (YYYY/MM/DD)",
+              "description": "This field will usually be left empty. Time period differs from the dates of collection as they represent the period for which the data collected are applicable or relevant.",
+              "_ddi_xpath": "stdyDscr/stdyInfo/sumDscr/timePrd",
+              "items": {
+                "type": "object",
+                "properties": {
+                  "start": {
+                    "title": "Start date",
+                    "description": "Start date",
+                    "type": "string"
                   },
-                  "end":{
-                    "title":"End date",
-                    "description":"End date",
-                    "type":"string"
+                  "end": {
+                    "title": "End date",
+                    "description": "End date",
+                    "type": "string"
                   },
-                  "cycle":{
-                    "title":"Cycle",
-                    "description":"Cycle",
-                    "type":"string"
+                  "cycle": {
+                    "title": "Cycle",
+                    "description": "Cycle",
+                    "type": "string"
                   }
                 },
-                "required":[
+                "required": [
                   "start"
                 ]
               }
             },
-            "coll_dates":{
-              "type":"array",
-              "title":"Dates of Data Collection (YYYY/MM/DD)",
-              "description":"Enter the dates (at least month and year) of the start and end of the data collection. In some cases, data collection for a same survey can be conducted in waves. In such case, you should enter the start and end date of each wave separately, and identify each wave in the 'cycle' field.",
-              "_ddi_xpath":"stdyDscr/stdyInfo/sumDscr/collDate",
-              "items":{
-                "type":"object",
-                "properties":{
-                  "start":{
-                    "title":"Start date",
-                    "description":"Start date",
-                    "type":"string"
+            "coll_dates": {
+              "type": "array",
+              "title": "Dates of Data Collection (YYYY/MM/DD)",
+              "description": "Enter the dates (at least month and year) of the start and end of the data collection. In some cases, data collection for a same survey can be conducted in waves. In such case, you should enter the start and end date of each wave separately, and identify each wave in the 'cycle' field.",
+              "_ddi_xpath": "stdyDscr/stdyInfo/sumDscr/collDate",
+              "items": {
+                "type": "object",
+                "properties": {
+                  "start": {
+                    "title": "Start date",
+                    "description": "Start date",
+                    "type": "string"
                   },
-                  "end":{
-                    "title":"End date",
-                    "description":"End date",
-                    "type":"string"
+                  "end": {
+                    "title": "End date",
+                    "description": "End date",
+                    "type": "string"
                   },
-                  "cycle":{
-                    "title":"Cycle",
-                    "description":"Cycle",
-                    "type":"string"
+                  "cycle": {
+                    "title": "Cycle",
+                    "description": "Cycle",
+                    "type": "string"
                   }
                 },
-                "required":[
+                "required": [
                   "start"
                 ]
               }
             },
-            "nation":{
-              "title":"Country",
-              "description":"Indicates the country or countries covered in the file. Field `abbreviation` may be used to list common abbreviations; use of ISO country codes is recommended. Maps to Dublin Core Coverage element. Inclusion of this element is recommended.",
-              "_ddi_xpath":"stdyDscr/stdyInfo/sumDscr/nation",
-              "type":"array",
-              "items":{
-                "type":"object",
-                "properties":{
-                  "name":{
-                    "title":"Name",
-                    "description":"Country name",
-                    "type":"string"
+            "nation": {
+              "title": "Country",
+              "description": "Indicates the country or countries covered in the file. Field `abbreviation` may be used to list common abbreviations; use of ISO country codes is recommended. Maps to Dublin Core Coverage element. Inclusion of this element is recommended.",
+              "_ddi_xpath": "stdyDscr/stdyInfo/sumDscr/nation",
+              "type": "array",
+              "items": {
+                "type": "object",
+                "properties": {
+                  "name": {
+                    "title": "Name",
+                    "description": "Country name",
+                    "type": "string"
                   },
-                  "abbreviation":{
-                    "title":"Country code",
-                    "description":"Country ISO code",
-                    "type":"string"
+                  "abbreviation": {
+                    "title": "Country code",
+                    "description": "Country ISO code",
+                    "type": "string"
                   }
                 },
-                "required":[
+                "required": [
                   "name"
                 ]
               }
             },
-            "bbox":{
-              "title":"Geographic bounding box",
-              "type":"array",
-              "_ddi_xpath":"stdyDscr/sumDscr/geoBndBox",
-              "items":{
-                "type":"object",
-                "properties":{
-                  "west":{
-                    "title":"West",
-                    "type":"string"
+            "bbox": {
+              "title": "Geographic bounding box",
+              "type": "array",
+              "_ddi_xpath": "stdyDscr/sumDscr/geoBndBox",
+              "items": {
+                "type": "object",
+                "properties": {
+                  "west": {
+                    "title": "West",
+                    "type": "string"
                   },
-                  "east":{
-                    "title":"East",
-                    "type":"string"
+                  "east": {
+                    "title": "East",
+                    "type": "string"
                   },
-                  "south":{
-                    "title":"South",
-                    "type":"string"
+                  "south": {
+                    "title": "South",
+                    "type": "string"
                   },
-                  "north":{
-                    "title":"North",
-                    "type":"string"
+                  "north": {
+                    "title": "North",
+                    "type": "string"
                   }
                 }
               }
             },
-            "bound_poly":{
-              "title":"Geographic Bounding Polygon",
-              "description":"This field allows the creation of multiple polygons to describe in a more detailed manner the geographic area covered by the dataset. It should only be used to define the outer boundaries of a covered area. For example, in the United States, such polygons can be created to define boundaries for Hawaii, Alaska, and the continental United States, but not interior boundaries for the contiguous states. This field is used to refine a coordinate-based search, not to actually map an area. \nIf the boundPoly element is used, then geoBndBox MUST be present, and all points enclosed by the boundPoly MUST be contained within the geoBndBox. Elements westBL, eastBL, southBL, and northBL of the geoBndBox should each be represented in at least one point of the boundPoly description.",
-              "type":"array",
-              "_ddi_xpath":"stdyDscr/sumDscr/boundPoly",
-              "items":{
-                "type":"object",
-                "properties":{
-                  "lat":{
-                    "title":"Latitude",
-                    "description":"Latitude (y coordinate) of a point. Valid range expressed in decimal degrees is as follows: -90,0 to 90,0 degrees (latitude)",
-                    "type":"string"
+            "bound_poly": {
+              "title": "Geographic Bounding Polygon",
+              "description": "This field allows the creation of multiple polygons to describe in a more detailed manner the geographic area covered by the dataset. It should only be used to define the outer boundaries of a covered area. For example, in the United States, such polygons can be created to define boundaries for Hawaii, Alaska, and the continental United States, but not interior boundaries for the contiguous states. This field is used to refine a coordinate-based search, not to actually map an area. \nIf the boundPoly element is used, then geoBndBox MUST be present, and all points enclosed by the boundPoly MUST be contained within the geoBndBox. Elements westBL, eastBL, southBL, and northBL of the geoBndBox should each be represented in at least one point of the boundPoly description.",
+              "type": "array",
+              "_ddi_xpath": "stdyDscr/sumDscr/boundPoly",
+              "items": {
+                "type": "object",
+                "properties": {
+                  "lat": {
+                    "title": "Latitude",
+                    "description": "Latitude (y coordinate) of a point. Valid range expressed in decimal degrees is as follows: -90,0 to 90,0 degrees (latitude)",
+                    "type": "string"
                   },
-                  "lon":{
-                    "title":"longitude",
-                    "description":"Longitude (x coordinate) of a point. Valid range expressed in decimal degrees is as follows: -180,0 to 180,0 degrees (longitude)",
-                    "type":"string"
+                  "lon": {
+                    "title": "longitude",
+                    "description": "Longitude (x coordinate) of a point. Valid range expressed in decimal degrees is as follows: -180,0 to 180,0 degrees (longitude)",
+                    "type": "string"
                   }
                 }
               }
             },
-            "geog_coverage":{
-              "description":" Information on the geographic coverage of the data. Includes the total geographic scope of the data, and any additional levels of geographic coding provided in the variables. Maps to Dublin Core Coverage element. Inclusion of this element in the codebook is recommended.",
-              "title":"Geographic Coverage",
-              "type":"string",
-              "_ddi_xpath":"stdyDscr/stdyInfo/sumDscr/geogCover"
+            "geog_coverage": {
+              "description": " Information on the geographic coverage of the data. Includes the total geographic scope of the data, and any additional levels of geographic coding provided in the variables. Maps to Dublin Core Coverage element. Inclusion of this element in the codebook is recommended.",
+              "title": "Geographic Coverage",
+              "type": "string",
+              "_ddi_xpath": "stdyDscr/stdyInfo/sumDscr/geogCover"
             },
-            "geog_coverage_notes":{
-              "description":"Geographic coverage notes",
-              "title":"Geographic Coverage notes",
-              "type":"string",
-              "_ddi_xpath":"stdyDscr/sumDscr/geogCover/txt"
+            "geog_coverage_notes": {
+              "description": "Geographic coverage notes",
+              "title": "Geographic Coverage notes",
+              "type": "string",
+              "_ddi_xpath": "stdyDscr/sumDscr/geogCover/txt"
             },
-            "geog_unit":{
-              "title":"Geographic Unit",
-              "description":"Lowest level of geographic aggregation covered by the data",
-              "type":"string",
-              "_ddi_xpath":"stdyDscr/stdyInfo/sumDscr/geogUnit"
+            "geog_unit": {
+              "title": "Geographic Unit",
+              "description": "Lowest level of geographic aggregation covered by the data",
+              "type": "string",
+              "_ddi_xpath": "stdyDscr/stdyInfo/sumDscr/geogUnit"
             },
-            "analysis_unit":{
-              "title":"Unit of Analysis",
-              "description":"Basic unit(s) of analysis or observation that the study describes: individuals, families/households, groups, facilities, institutions/organizations, administrative units, physical locations, etc.",
-              "type":"string",
-              "_ddi_xpath":"stdyDscr/stdyInfo/sumDscr/anlyUnit"
+            "analysis_unit": {
+              "title": "Unit of Analysis",
+              "description": "Basic unit(s) of analysis or observation that the study describes: individuals, families/households, groups, facilities, institutions/organizations, administrative units, physical locations, etc.",
+              "type": "string",
+              "_ddi_xpath": "stdyDscr/stdyInfo/sumDscr/anlyUnit"
             },
-            "universe":{
-              "title":"Universe",
-              "description":"We are interested here in the survey universe (not the universe of particular sections of the questionnaires or variables), i.e. in the identification of the population of interest in the survey. The universe will rarely be the entire population of the country. Sample household surveys, for example, usually do not cover homeless, nomads, diplomats, community households. Some surveys may cover only the population of a particular age group, or only male (or female), etc.",
-              "type":"string",
-              "_ddi_xpath":"stdyDscr/stdyInfo/sumDscr/universe"
+            "universe": {
+              "title": "Universe",
+              "description": "We are interested here in the survey universe (not the universe of particular sections of the questionnaires or variables), i.e. in the identification of the population of interest in the survey. The universe will rarely be the entire population of the country. Sample household surveys, for example, usually do not cover homeless, nomads, diplomats, community households. Some surveys may cover only the population of a particular age group, or only male (or female), etc.",
+              "type": "string",
+              "_ddi_xpath": "stdyDscr/stdyInfo/sumDscr/universe"
             },
-            "data_kind":{
-              "title":"Kind of Data",
-              "description":"Broad classification of the data",
-              "type":"string",
-              "_ddi_xpath":"stdyDscr/stdyInfo/sumDscr/dataKind",
-              "enum_":[
+            "data_kind": {
+              "title": "Kind of Data",
+              "description": "Broad classification of the data",
+              "type": "string",
+              "_ddi_xpath": "stdyDscr/stdyInfo/sumDscr/dataKind",
+              "enum_": [
                 "Sample survey data[ssd]",
                 "Census/enumeration data[cen]",
                 "Administrative records data[adm]",
@@ -785,383 +784,408 @@
                 "Observation data/ratings[obs]"
               ]
             },
-            "notes":{
-              "title":"Study notes",
-              "description":"Study notes",
-              "type":"string",
-              "_ddi_xpath":"stdyDscr/stdyInfo/notes"
+            "notes": {
+              "title": "Study notes",
+              "description": "Study notes",
+              "type": "string",
+              "_ddi_xpath": "stdyDscr/stdyInfo/notes"
             },
-            "quality_statement":{
-              "title":"Quality Statement",
-              "description":"This structure consists of two parts, standardsCompliance and otherQualityStatements. In standardsCompliance list all specific standards complied with during the execution of this study. Note the standard name and producer and how the study complied with the standard. Enter any additional quality statements in otherQualityStatements.",
-              "type":"object",
-              "_ddi_xpath":"stdyDscr/stdyInfo/qualityStatement",
-              "_comments":"TODO: not clear if this should be repeatable.",
-              "properties":{
-                "standard_name":{
-                  "title":"Standard name",
-                  "type":"string",
-                  "_ddi_xpath":"stdyDscr/stdyInfo/qualityStatement/standardsCompliance/standard/standardName"
-                },
-                "standard_producer":{
-                  "title":"Standard producer",
-                  "type":"string",
-                  "_ddi_xpath":"stdyDscr/stdyInfo/qualityStatement/standardsCompliance/standard/producer"
+            "quality_statement": {
+              "title": "Quality Statement",
+              "description": "The quality statement provides elements to describe compliance with quality standards in the form of a statement and an itemized list of standards complied with, and an element to provide other quality statement.",
+              "type": "object",
+              "_ddi_xpath": "stdyDscr/stdyInfo/qualityStatement",
+              "_comments": "TODO: not clear if this should be repeatable.",
+              "properties": {
+                "compliance_description": {
+                  "title": "Standard compliance description",
+                  "type": "string",
+                  "_ddi_xpath": "stdyDscr/stdyInfo/qualityStatement/standardsCompliance/complianceDescription"
                 },
-                "standard_compliance_desc":{
-                  "title":"Standard compliance description",
-                  "type":"string",
-                  "_ddi_xpath":"stdyDscr/stdyInfo/qualityStatement/standardsCompliance/complianceDescription"
+                "standards": {
+                  "type": "array",
+                  "title": "Standards",
+                  "description": "Standards",
+                  "_ddi_xpath": "stdyDscr/stdyInfo/qualityStatement/standardsCompliance/standard",
+                  "items": {
+                    "type": "object",
+                    "properties": {
+                      "name": {
+                        "title": "Name",
+                        "type": "string"
+                      },
+                      "producer": {
+                        "title": "Producer",
+                        "type": "string"
+                      }
+                    }
+                  },
+                  "required": [
+                    "name"
+                  ]
                 },
-                "other_quality_statement":{
-                  "title":"Other quality statement",
-                  "type":"string",
-                  "_ddi_xpath":"stdyDscr/stdyInfo/qualityStatement/otherQualityStatement"
+                "other_quality_statement": {
+                  "title": "Other quality statement",
+                  "type": "string",
+                  "_ddi_xpath": "stdyDscr/stdyInfo/qualityStatement/otherQualityStatement"
                 }
               }
-            },            
-            "ex_post_evaluation":{
-              "title":"Ex-Post Evaluation",
-              "description":"This structure consists of two parts, standardsCompliance and otherQualityStatements. In standardsCompliance list all specific standards complied with during the execution of this study. Note the standard name and producer and how the study complied with the standard. Enter any additional quality statements in otherQualityStatements.",
-              "type":"object",
-              "_ddi_xpath":"stdyDscr/stdyInfo/exPostEvaluation",
-              "_comments":"TODO: not clear if this should be repeatable.",
-              "properties":{
-                "completion_date":{
-                  "title":"Evaluation completion date",
-                  "type":"string",
-                  "_ddi_xpath":"stdyDscr/stdyInfo/exPostEvaluation/@completionDate"
+            },
+            "ex_post_evaluation": {
+              "title": "Ex-Post Evaluation",
+              "description": "This structure consists of two parts, standardsCompliance and otherQualityStatements. In standardsCompliance list all specific standards complied with during the execution of this study. Note the standard name and producer and how the study complied with the standard. Enter any additional quality statements in otherQualityStatements.",
+              "type": "object",
+              "_ddi_xpath": "stdyDscr/stdyInfo/exPostEvaluation",
+              "_comments": "TODO: not clear if this should be repeatable.",
+              "properties": {
+                "completion_date": {
+                  "title": "Evaluation completion date",
+                  "type": "string",
+                  "_ddi_xpath": "stdyDscr/stdyInfo/exPostEvaluation/@completionDate"
                 },
-                "type":{
-                  "title":"Evaluation type",
-                  "type":"string",
-                  "_ddi_xpath":"stdyDscr/stdyInfo/@type"
+                "type": {
+                  "title": "Evaluation type",
+                  "type": "string",
+                  "_ddi_xpath": "stdyDscr/stdyInfo/@type"
                 },
-                "evaluator":{
-                  "type":"array",
-                  "title":"Evaluators",
-                  "description":"Evaluators",
-                  "_ddi_xpath":"stdyDscr/stdyInfo/exPostEvaluation/evaluator",
-                  "items":{
-                    "type":"object",
-                    "properties":{
-                      "name":{
-                        "title":"Funding Agency/Sponsor",
-                        "type":"string"
+                "evaluator": {
+                  "type": "array",
+                  "title": "Evaluators",
+                  "description": "Evaluators",
+                  "_ddi_xpath": "stdyDscr/stdyInfo/exPostEvaluation/evaluator",
+                  "items": {
+                    "type": "object",
+                    "properties": {
+                      "name": {
+                        "title": "Funding Agency/Sponsor",
+                        "type": "string"
+                      },
+                      "affiliation": {
+                        "title": "Affiliation",
+                        "type": "string"
                       },
-                      "affiliation":{
-                        "title":"Affiliation",
-                        "type":"string"
+                      "abbr": {
+                        "title": "Abbreviation",
+                        "type": "string"
                       },
-                      "abbr":{
-                        "title":"Abbreviation",
-                        "type":"string"
-                      },                      
-                      "role":{
-                        "title":"Role",
-                        "type":"string"
+                      "role": {
+                        "title": "Role",
+                        "type": "string"
                       }
                     },
-                    "required":[
+                    "required": [
                       "name"
                     ]
                   }
                 },
-                "evaluation_process":{
-                  "title":"Evaluation process",
-                  "type":"string",
-                  "_ddi_xpath":"stdyDscr/stdyInfo/exPostEvaluation/evaluationProcess"
+                "evaluation_process": {
+                  "title": "Evaluation process",
+                  "type": "string",
+                  "_ddi_xpath": "stdyDscr/stdyInfo/exPostEvaluation/evaluationProcess"
                 },
-                "outcomes":{
-                  "title":"Outcomes",
-                  "type":"string",
-                  "_ddi_xpath":"stdyDscr/stdyInfo/exPostEvaluation/outcomes"
+                "outcomes": {
+                  "title": "Outcomes",
+                  "type": "string",
+                  "_ddi_xpath": "stdyDscr/stdyInfo/exPostEvaluation/outcomes"
                 }
               }
             }
           },
-          "required":[
+          "required": [
             "nation"
           ]
         },
-        "study_development":{
-          "title":"Study Development",
-          "description":"Describe the process of study development as a series of development activities. These activities can be typed using a controlled vocabulary. Describe the activity, listing participants with their role and affiliation, resources used (sources of information), and the outcome of the development activity.",
-          "type":"object",
-          "_ddi_xpath":"stdyDscr/studyDevelopment",
-          "properties":{
-            "activity_type":{
-              "title":"Development activity type",
-              "type":"string",
-              "_ddi_xpath":"stdyDscr/studyDevelopment/developmentActivity/@type"
-            },
-            "activity_description":{
-              "title":"Development activity description",
-              "type":"string",
-              "_ddi_xpath":"stdyDscr/studyDevelopment/developmentActivity/description"
-            },
-            "participants":{
-              "type":"array",
-              "title":"Participants",
-              "description":"Participants",
-              "_ddi_xpath":"stdyDscr/studyDevelopment/developmentActivity/participant",
-              "items":{
-                "type":"object",
-                "properties":{
-                  "name":{
-                    "title":"Participant name",
-                    "type":"string"
+        "study_development": {
+          "title": "Study Development",
+          "description": "Describe the process of study development as a series of development activities. These activities can be typed using a controlled vocabulary. Describe the activity, listing participants with their role and affiliation, resources used (sources of information), and the outcome of the development activity.",
+          "type": "object",
+          "_ddi_xpath": "stdyDscr/studyDevelopment",
+          "properties": {
+            "development_activity": {
+              "type": "array",
+              "title": "Development activity",
+              "_ddi_xpath": "stdyDscr/studyDevelopment/developmentActivity",
+              "items": {
+                "type": "object",
+                "properties": {
+                  "activity_type": {
+                    "title": "Development activity type",
+                    "type": "string",
+                    "_ddi_xpath": "stdyDscr/studyDevelopment/developmentActivity/@type"
                   },
-                  "affiliation":{
-                    "title":"Affiliation",
-                    "type":"string"
+                  "activity_description": {
+                    "title": "Development activity description",
+                    "type": "string",
+                    "_ddi_xpath": "stdyDscr/studyDevelopment/developmentActivity/description"
                   },
-                  "role":{
-                    "title":"Role",
-                    "type":"string"
-                  }
-                },
-                "required":[
-                  "name"
-                ]
-              }
-            },
-            "resource":{
-              "type":"object",
-              "title":"Development activity resource",
-              "description":"Development activity resource",
-              "_ddi_xpath":"stdyDscr/studyDevelopment/developmentActivity/resource",
-              "properties":{
-                "data_source":{
-                  "title":"Data source",
-                  "_ddi_xpath":"stdyDscr/studyDevelopment/developmentActivity/resource/dataSrc",
-                  "type":"array",
-                  "items":{
-                    "type":"object",
-                    "properties":{
-                      "source":{
-                        "title":"Source",
-                        "type":"string"
-                      }
+                  "participants": {
+                    "type": "array",
+                    "title": "Participants",
+                    "description": "Participants",
+                    "_ddi_xpath": "stdyDscr/studyDevelopment/developmentActivity/participant",
+                    "items": {
+                      "type": "object",
+                      "properties": {
+                        "name": {
+                          "title": "Participant name",
+                          "type": "string"
+                        },
+                        "affiliation": {
+                          "title": "Affiliation",
+                          "type": "string"
+                        },
+                        "role": {
+                          "title": "Role",
+                          "type": "string"
+                        }
+                      },
+                      "required": [
+                        "name"
+                      ]
                     }
+                  },
+                  "resources": {
+                    "type": "array",
+                    "title": "Development activity resources",
+                    "description": "Development activity resources",
+                    "_ddi_xpath": "stdyDscr/studyDevelopment/developmentActivity/resource",
+                    "items":{
+                      "type":"object",
+                      "properties":{
+                        "name": {
+                          "type": "string",
+                          "title": "Resource name",
+                          "description": "Name of the resource"
+                        },
+                        "origin": {
+                          "type": "string",
+                          "title": "Origin of resource",
+                          "description": "For historical materials, information about the origin(s) of the sources and the rules followed in establishing the sources should be specified. May not be relevant to survey data. ",
+                          "_ddi_xpath": "stdyDscr/studyDevelopment/developmentActivity/resource/srcOrig"
+                        },
+                        "characteristics": {
+                          "type": "string",
+                          "title": "Characteristics of resource",
+                          "description": "Assessment of characteristics and quality of source material. May not be relevant to survey data.",
+                          "_ddi_xpath": "stdyDscr/studyDevelopment/developmentActivity/resource/srcChar"
+                        }
+                      }
+                    }                    
+                  },
+                  "outcome": {
+                    "title": "Development Activity Outcome",
+                    "description": "Development Activity Outcome",
+                    "type": "string",
+                    "_ddi_xpath": "stdyDscr/studyDevelopment/developmentActivity/outcome"
                   }
-                },
-                "source_origin":{
-                  "type":"string",
-                  "title":"Origin of Source",
-                  "description":"For historical materials, information about the origin(s) of the sources and the rules followed in establishing the sources should be specified. May not be relevant to survey data. ",
-                  "_ddi_xpath":"stdyDscr/studyDevelopment/developmentActivity/resource/srcOrig"
-                },
-                "source_char":{
-                  "type":"string",
-                  "title":"Characteristics of Source Noted",
-                  "description":"Assessment of characteristics and quality of source material. May not be relevant to survey data.",
-                  "_ddi_xpath":"stdyDscr/studyDevelopment/developmentActivity/resource/srcChar"
                 }
               }
-            },
-            "outcome":{
-              "title":"Development Activity Outcome",
-              "description":"Development Activity Outcome",
-              "type":"string",
-              "_ddi_xpath":"stdyDscr/studyDevelopment/developmentActivity/outcome"
             }
           }
         },
-        "method":{
-          "type":"object",
-          "title":"Methodology and Processing",
-          "description":"Methodology and processing",
-          "_ddi_xpath":"stdyDscr/method",
-          "properties":{
-            "data_collection":{
-              "type":"object",
-              "title":"Data Collection",
-              "_ddi_xpath":"stdyDscr/method/dataColl",
-              "description":"Information about the methodology employed in a data collection",
-              "properties":{
-                "time_method":{
-                  "title":"Time Method",
-                  "description":"The time method or time dimension of the data collection. Examples: `panel survey`, `h>cross-section`, `trend study`, `time-series`",
-                  "type":"string",
-                  "_ddi_xpath":"stdyDscr/method/dataColl/timeMeth"
+        "method": {
+          "type": "object",
+          "title": "Methodology and Processing",
+          "description": "Methodology and processing",
+          "_ddi_xpath": "stdyDscr/method",
+          "properties": {
+            "data_collection": {
+              "type": "object",
+              "title": "Data Collection",
+              "_ddi_xpath": "stdyDscr/method/dataColl",
+              "description": "Information about the methodology employed in a data collection",
+              "properties": {
+                "time_method": {
+                  "title": "Time Method",
+                  "description": "The time method or time dimension of the data collection. Examples: `panel survey`, `h>cross-section`, `trend study`, `time-series`",
+                  "type": "string",
+                  "_ddi_xpath": "stdyDscr/method/dataColl/timeMeth"
                 },
-                "data_collectors":{
-                  "title":"Data Collectors",
-                  "description":"The persons and/or agencies that took charge of the data collection. This element includes 3 fields: Name, Abbreviation and the Affiliation. In most cases, we will record here the name of the agency, not the name of interviewers. Only in the case of very small-scale surveys, with a very limited number of interviewers, the name of person will be included as well. The field Affiliation is optional and not relevant in all cases.",
-                  "_ddi_xpath":"stdyDscr/method/dataColl/dataCollector",
-                  "type":"array",
-                  "items":{
-                    "type":"object",
-                    "properties":{
-                      "name":{
-                        "title":"Name",
-                        "type":"string"
+                "data_collectors": {
+                  "title": "Data Collectors",
+                  "description": "The persons and/or agencies that took charge of the data collection. This element includes 3 fields: Name, Abbreviation and the Affiliation. In most cases, we will record here the name of the agency, not the name of interviewers. Only in the case of very small-scale surveys, with a very limited number of interviewers, the name of person will be included as well. The field Affiliation is optional and not relevant in all cases.",
+                  "_ddi_xpath": "stdyDscr/method/dataColl/dataCollector",
+                  "type": "array",
+                  "items": {
+                    "type": "object",
+                    "properties": {
+                      "name": {
+                        "title": "Name",
+                        "type": "string"
                       },
-                      "affiliation":{
-                        "title":"Affiliation",
-                        "type":"string"
+                      "affiliation": {
+                        "title": "Affiliation",
+                        "type": "string"
                       },
-                      "abbr":{
-                        "title":"Abbreviation",
-                        "type":"string"
-                      },                      
-                      "role":{
-                        "title":"Role",
-                        "type":"string"
+                      "abbr": {
+                        "title": "Abbreviation",
+                        "type": "string"
+                      },
+                      "role": {
+                        "title": "Role",
+                        "type": "string"
                       }
                     }
                   }
                 },
-                "collector_training":{
-                  "title":"Collector training",
-                  "description":"Describes the training provided to data collectors including interviewer training, process testing, compliance with standards etc. This is repeatable for language and to capture different aspects of the training process. The type attribute allows specification of the type of training being described.",
-                  "type":"object",
-                  "properties":{
-                    "type":{
-                      "title":"Training type",
-                      "description":"The percentage of sample members who provided information",
-                      "type":"string",
-                      "_ddi_xpath":"stdyDscr/method/dataColl/collectorTraining/@type"
-                    },
-                    "training":{
-                      "title":"Training",
-                      "description":"Training provided to data collectors",
-                      "type":"string",
-                      "_ddi_xpath":"stdyDscr/method/dataColl/collectorTraining"
+                "collector_training": {
+                  "title": "Collector training",
+                  "description": "Describes the training provided to data collectors including interviewer training, process testing, compliance with standards etc. This is repeatable for language and to capture different aspects of the training process. The type attribute allows specification of the type of training being described.",
+                  "type": "array",
+                  "items":{
+                    "type":"object",
+                    "properties": {
+                      "type": {
+                        "title": "Training type",
+                        "description": "The percentage of sample members who provided information",
+                        "type": "string",
+                        "_ddi_xpath": "stdyDscr/method/dataColl/collectorTraining/@type"
+                      },
+                      "training": {
+                        "title": "Training",
+                        "description": "Training provided to data collectors",
+                        "type": "string",
+                        "_ddi_xpath": "stdyDscr/method/dataColl/collectorTraining"
+                      }
                     }
                   }
                 },
-                "frequency":{
-                  "title":"Frequency of Data Collection",
-                  "description":"For data collected at more than one point in time, the frequency with which the data were collected. Examples `monthly`, `quarterly`, `yearly`",
-                  "type":"string",
-                  "_ddi_xpath":"stdyDscr/method/dataColl/frequenc"
+                "frequency": {
+                  "title": "Frequency of Data Collection",
+                  "description": "For data collected at more than one point in time, the frequency with which the data were collected. Examples `monthly`, `quarterly`, `yearly`",
+                  "type": "string",
+                  "_ddi_xpath": "stdyDscr/method/dataColl/frequenc"
                 },
-                "sampling_procedure":{
-                  "title":"Sampling Procedure",
-                  "description":"The type of sample and sample design used to select the survey respondents to represent the population. \nThis field only applies to sample surveys. Information on sampling procedure is crucial (although not applicable for censuses and administrative datasets). Examples `National multistage area probability sample`, `Simple random sample`, `Quota sample`",
-                  "type":"string",
-                  "_ddi_xpath":"stdyDscr/method/dataColl/sampProc"
+                "sampling_procedure": {
+                  "title": "Sampling Procedure",
+                  "description": "The type of sample and sample design used to select the survey respondents to represent the population. \nThis field only applies to sample surveys. Information on sampling procedure is crucial (although not applicable for censuses and administrative datasets). Examples `National multistage area probability sample`, `Simple random sample`, `Quota sample`",
+                  "type": "string",
+                  "_ddi_xpath": "stdyDscr/method/dataColl/sampProc"
                 },
-                "sample_frame":{
-                  "title":"Sample Frame",
-                  "description":"Sample frame describes the sampling frame used for identifying the population from which the sample was taken. For example, a telephone book may be a sample frame for a phone survey. In addition to the name, label and text describing the sample frame, this structure lists who maintains the sample frame, the period for which it is valid, a use statement, the universe covered, the type of unit contained in the frame as well as the number of units available, the reference period of the frame and procedures used to update the frame.",
-                  "type":"object",
-                  "_ddi_xpath":"stdyDscr/method/dataColl/sampleFrame",
-                  "properties":{
-                    "name":{
-                      "title":"Sample frame name",
-                      "description":"Sample frame name",
-                      "type":"string",
-                      "_ddi_xpath":"stdyDscr/method/dataColl/sampleFrame/sampleFrameName"
+                "sample_frame": {
+                  "title": "Sample Frame",
+                  "description": "Sample frame describes the sampling frame used for identifying the population from which the sample was taken. For example, a telephone book may be a sample frame for a phone survey. In addition to the name, label and text describing the sample frame, this structure lists who maintains the sample frame, the period for which it is valid, a use statement, the universe covered, the type of unit contained in the frame as well as the number of units available, the reference period of the frame and procedures used to update the frame.",
+                  "type": "object",
+                  "_ddi_xpath": "stdyDscr/method/dataColl/sampleFrame",
+                  "properties": {
+                    "name": {
+                      "title": "Sample frame name",
+                      "description": "Sample frame name",
+                      "type": "string",
+                      "_ddi_xpath": "stdyDscr/method/dataColl/sampleFrame/sampleFrameName"
                     },
-                    "valid_period":{
-                      "type":"array",
-                      "title":"Valid periods (YYYY/MM/DD)",
-                      "description":"Defines a time period for the validity of the sampling frame. Enter dates in YYYY-MM-DD format.",
-                      "_ddi_xpath":"stdyDscr/method/dataColl/sampleFrame/validPeriod",
-                      "items":{
-                        "type":"object",
-                        "properties":{
-                          "event":{
-                            "title":"Event",
-                            "description":"Event e.g. start, end",
-                            "type":"string"
+                    "valid_period": {
+                      "type": "array",
+                      "title": "Valid periods (YYYY/MM/DD)",
+                      "description": "Defines a time period for the validity of the sampling frame. Enter dates in YYYY-MM-DD format.",
+                      "_ddi_xpath": "stdyDscr/method/dataColl/sampleFrame/validPeriod",
+                      "items": {
+                        "type": "object",
+                        "properties": {
+                          "event": {
+                            "title": "Event",
+                            "description": "Event e.g. start, end",
+                            "type": "string"
                           },
-                          "date":{
-                            "title":"Date",
-                            "description":"Date",
-                            "type":"string"
+                          "date": {
+                            "title": "Date",
+                            "description": "Date",
+                            "type": "string"
                           }
                         },
-                        "required":[
+                        "required": [
                           "date"
                         ]
                       }
                     },
-                    "custodian":{
-                      "title":"Custodian",
-                      "description":"Custodian identifies the agency or individual who is responsible for creating or maintaining the sample frame.",
-                      "type":"string",
-                      "_ddi_xpath":"stdyDscr/method/dataColl/sampleFrame/custodian"
+                    "custodian": {
+                      "title": "Custodian",
+                      "description": "Custodian identifies the agency or individual who is responsible for creating or maintaining the sample frame.",
+                      "type": "string",
+                      "_ddi_xpath": "stdyDscr/method/dataColl/sampleFrame/custodian"
                     },
-                    "universe":{
-                      "title":"Universe",
-                      "description":"The group of persons or other elements that are the object of research and to which any analytic results refer.",
-                      "type":"string",
-                      "_ddi_xpath":"stdyDscr/method/dataColl/sampleFrame/universe"
+                    "universe": {
+                      "title": "Universe",
+                      "description": "The group of persons or other elements that are the object of research and to which any analytic results refer.",
+                      "type": "string",
+                      "_ddi_xpath": "stdyDscr/method/dataColl/sampleFrame/universe"
                     },
-                    "frame_unit":{
-                      "type":"object",
-                      "title":"Frame unit",
-                      "_ddi_xpath":"stdyDscr/method/dataColl/sampleFrame/frameUnit",
-                      "description":"Provides information about the sampling frame unit. The attribute `isPrimary` is boolean, indicating whether the unit is primary or not.",
-                      "properties":{
-                        "is_primary":{
-                          "title":"Is Primary",
-                          "description":"Is a primary unit?",
-                          "type":["boolean","string"],
-                          "_ddi_xpath":"stdyDscr/method/dataColl/sampleFrame/frameUnit/@isPrimary"
+                    "frame_unit": {
+                      "type": "object",
+                      "title": "Frame unit",
+                      "_ddi_xpath": "stdyDscr/method/dataColl/sampleFrame/frameUnit",
+                      "description": "Provides information about the sampling frame unit. The attribute `isPrimary` is boolean, indicating whether the unit is primary or not.",
+                      "properties": {
+                        "is_primary": {
+                          "title": "Is Primary",
+                          "description": "Is a primary unit?",
+                          "type": [
+                            "boolean",
+                            "string"
+                          ],
+                          "_ddi_xpath": "stdyDscr/method/dataColl/sampleFrame/frameUnit/@isPrimary"
                         },
-                        "unit_type":{
-                          "title":"Unit Type",
-                          "description":"Describes the type of sampling frame unit. The field `num_of_units` provides the number of units in the sampling frame.",
-                          "type":"string",
-                          "_ddi_xpath":"stdyDscr/method/dataColl/sampleFrame/frameUnit/unitType"
+                        "unit_type": {
+                          "title": "Unit Type",
+                          "description": "Describes the type of sampling frame unit. The field `num_of_units` provides the number of units in the sampling frame.",
+                          "type": "string",
+                          "_ddi_xpath": "stdyDscr/method/dataColl/sampleFrame/frameUnit/unitType"
                         },
-                        "num_of_units":{
-                          "title":"Number of units",
-                          "description":"Number of units in the sampling frame",
-                          "type":"string",
-                          "_ddi_xpath":"stdyDscr/method/dataColl/sampleFrame/frameUnit/@numberOfUnits"
+                        "num_of_units": {
+                          "title": "Number of units",
+                          "description": "Number of units in the sampling frame",
+                          "type": "string",
+                          "_ddi_xpath": "stdyDscr/method/dataColl/sampleFrame/frameUnit/@numberOfUnits"
                         }
                       }
                     },
-                    "reference_period":{
-                      "type":"array",
-                      "title":"Reference periods (YYYY/MM/DD)",
-                      "description":"Indicates the period of time in which the sampling frame was actually used for the study in question. Use ISO 8601 date/time formats to enter the relevant date(s).",
-                      "_ddi_xpath":"stdyDscr/method/dataColl/sampleFrame/referencePeriod",
-                      "items":{
-                        "type":"object",
-                        "properties":{
-                          "event":{
-                            "title":"Event",
-                            "description":"Event e.g. start, end",
-                            "type":"string"
+                    "reference_period": {
+                      "type": "array",
+                      "title": "Reference periods (YYYY/MM/DD)",
+                      "description": "Indicates the period of time in which the sampling frame was actually used for the study in question. Use ISO 8601 date/time formats to enter the relevant date(s).",
+                      "_ddi_xpath": "stdyDscr/method/dataColl/sampleFrame/referencePeriod",
+                      "items": {
+                        "type": "object",
+                        "properties": {
+                          "event": {
+                            "title": "Event",
+                            "description": "Event e.g. start, end",
+                            "type": "string"
                           },
-                          "date":{
-                            "title":"Date",
-                            "description":"Date",
-                            "type":"string"
+                          "date": {
+                            "title": "Date",
+                            "description": "Date",
+                            "type": "string"
                           }
                         },
-                        "required":[
+                        "required": [
                           "date"
                         ]
                       }
                     },
-                    "update_procedure":{
-                      "title":"Update procedure",
-                      "description":"Description of how and with what frequency the sample frame is updated.",
-                      "type":"string",
-                      "_ddi_xpath":"stdyDscr/method/dataColl/sampleFrame/updateProcedure"
+                    "update_procedure": {
+                      "title": "Update procedure",
+                      "description": "Description of how and with what frequency the sample frame is updated.",
+                      "type": "string",
+                      "_ddi_xpath": "stdyDscr/method/dataColl/sampleFrame/updateProcedure"
                     }
                   }
                 },
-                "sampling_deviation":{
-                  "title":"Deviations from the Sample Design",
-                  "description":"This field only applies to sample surveys.\nSometimes the reality of the field requires a deviation from the sampling design (for example due to difficulty to access to zones due to weather problems, political instability, etc). If for any reason, the sample design has deviated, this should be reported here. ",
-                  "type":"string",
-                  "_ddi_xpath":"stdyDscr/method/dataColl/deviat"
+                "sampling_deviation": {
+                  "title": "Deviations from the Sample Design",
+                  "description": "This field only applies to sample surveys.\nSometimes the reality of the field requires a deviation from the sampling design (for example due to difficulty to access to zones due to weather problems, political instability, etc). If for any reason, the sample design has deviated, this should be reported here. ",
+                  "type": "string",
+                  "_ddi_xpath": "stdyDscr/method/dataColl/deviat"
                 },
-                "coll_mode":{
-                  "title":"Mode of data collection",
-                  "type":["string","array"],
-                  "description":"The mode of data collection is the manner in which the interview was conducted or information was gathered.  In most cases, the response will be 'face to face interview'. But for some specific kinds of datasets, such as for example data on rain fall, the response will be different.",
-                  "_ddi_xpath":"stdyDscr/method/dataColl/collMode",
-                  "enum_":[
+                "coll_mode": {
+                  "title": "Mode of data collection",
+                  "type": [
+                    "string",
+                    "array"
+                  ],
+                  "description": "The mode of data collection is the manner in which the interview was conducted or information was gathered.  In most cases, the response will be 'face to face interview'. But for some specific kinds of datasets, such as for example data on rain fall, the response will be different.",
+                  "_ddi_xpath": "stdyDscr/method/dataColl/collMode",
+                  "enum_": [
                     "Computer Assisted Personal Interview[capi]",
                     "Computer Assisted Telephone Interview[cati]",
                     "Face-to-Face[f2f]",
@@ -1173,463 +1197,452 @@
                     "type": "string"
                   }
                 },
-                "research_instrument":{
-                  "title":"Type of Research Instrument",
-                  "description":"The type of data collection instrument used. \n`Structured` indicates an instrument in which all respondents are asked the same questions/tests, possibly with precoded answers. If a small portion of such a questionnaire includes open-ended questions, provide appropriate comments. \n`Semi-structured` indicates that the research instrument contains mainly open-ended questions. \n`Unstructured` indicates that in-depth interviews were conducted.",
-                  "type":"string",
-                  "_ddi_xpath":"stdyDscr/method/dataColl/resInstru"
+                "research_instrument": {
+                  "title": "Type of Research Instrument",
+                  "description": "The type of data collection instrument used. \n`Structured` indicates an instrument in which all respondents are asked the same questions/tests, possibly with precoded answers. If a small portion of such a questionnaire includes open-ended questions, provide appropriate comments. \n`Semi-structured` indicates that the research instrument contains mainly open-ended questions. \n`Unstructured` indicates that in-depth interviews were conducted.",
+                  "type": "string",
+                  "_ddi_xpath": "stdyDscr/method/dataColl/resInstru"
                 },
-                "instru_development":{
-                  "title":"Instrument development",
-                  "description":"Describe any development work on the data collection instrument. Type attribute allows for the optional use of a defined development type with or without use of a controlled vocabulary.",
-                  "type":"string",
-                  "_ddi_xpath":"stdyDscr/method/dataColl/instrumentDevelopment"
+                "instru_development": {
+                  "title": "Instrument development",
+                  "description": "Describe any development work on the data collection instrument. Type attribute allows for the optional use of a defined development type with or without use of a controlled vocabulary.",
+                  "type": "string",
+                  "_ddi_xpath": "stdyDscr/method/dataColl/instrumentDevelopment"
                 },
-                "instru_development_type":{
-                  "title":"Instrument development type",
-                  "description":"Instrument development type",
-                  "type":"string",
-                  "_ddi_xpath":"stdyDscr/method/dataColl/instrumentDevelopment/@type"
+                "instru_development_type": {
+                  "title": "Instrument development type",
+                  "description": "Instrument development type",
+                  "type": "string",
+                  "_ddi_xpath": "stdyDscr/method/dataColl/instrumentDevelopment/@type"
                 },
-                "sources":{
-                  "type":"object",
-                  "title":"Sources",
-                  "description":"Description of sources used for the data collection. The element is nestable so that the sources statement might encompass a series of discrete source statements, each of which could contain the facts about an individual source. This element maps to Dublin Core Source element.",
-                  "_ddi_xpath":"stdyDscr/method/dataColl/sources",
-                  "properties":{
-                    "data_source":{
-                      "title":"Data source",
-                      "_ddi_xpath":"stdyDscr/studyDevelopment/developmentActivity/resource/dataSrc",
-                      "type":"array",
-                      "items":{
-                        "type":"object",
-                        "properties":{
-                          "source":{
-                            "title":"Source",
-                            "type":"string"
-                          }
-                        }
-                      }
-                    },
-                    "source_origin":{
-                      "type":"string",
-                      "title":"Origin of Source",
-                      "description":"For historical materials, information about the origin(s) of the sources and the rules followed in establishing the sources should be specified. May not be relevant to survey data. ",
-                      "_ddi_xpath":"stdyDscr/method/dataColl/sources/srcOrig"
+                "sources": {
+                  "type": "array",
+                  "title": "Sources",
+                  "description": "Description of sources used for the data collection. The element is nestable so that the sources statement might encompass a series of discrete source statements, each of which could contain the facts about an individual source. This element maps to Dublin Core Source element.",
+                  "_ddi_xpath": "stdyDscr/method/dataColl/sources",
+                  "items":{
+                    "type":"object",
+                  "properties": {
+                    "name": {
+                      "type": "string",
+                      "title": "Source name",
+                      "description": "Name of the source"
                     },
-                    "source_char":{
-                      "type":"string",
-                      "title":"Characteristics of Source Noted",
-                      "description":"Assessment of characteristics and quality of source material. May not be relevant to survey data.",
-                      "_ddi_xpath":"stdyDscr/method/dataColl/sources/srcChar"
+                    "origin": {
+                      "type": "string",
+                      "title": "Origin of Source",
+                      "description": "For historical materials, information about the origin(s) of the sources and the rules followed in establishing the sources should be specified. May not be relevant to survey data. ",
+                      "_ddi_xpath": "stdyDscr/method/dataColl/sources/srcOrig"
                     },
-                    "source_doc":{
-                      "type":"string",
-                      "title":"Source documentation",
-                      "description":"Documentation and Access to Sources",
-                      "_ddi_xpath":"stdyDscr/method/dataColl/sources/srcDocu"
-                    }
+                    "characteristics": {
+                      "type": "string",
+                      "title": "Characteristics of Source Noted",
+                      "description": "Assessment of characteristics and quality of source material. May not be relevant to survey data.",
+                      "_ddi_xpath": "stdyDscr/method/dataColl/sources/srcChar"
+                    }                    
                   }
+                }
                 },
-                "coll_situation":{
-                  "title":"Characteristics of Data Collection Situation - Notes on data collection",
-                  "__comment":"used for notes on data collection",
-                  "description":"Description of noteworthy aspects of the data collection situation. Includes information on factors such as cooperativeness of respondents, duration of interviews, number of call-backs, etc.",
-                  "type":"string",
-                  "_ddi_xpath":"stdyDscr/method/dataColl/collSitu"
+                "coll_situation": {
+                  "title": "Characteristics of Data Collection Situation - Notes on data collection",
+                  "__comment": "used for notes on data collection",
+                  "description": "Description of noteworthy aspects of the data collection situation. Includes information on factors such as cooperativeness of respondents, duration of interviews, number of call-backs, etc.",
+                  "type": "string",
+                  "_ddi_xpath": "stdyDscr/method/dataColl/collSitu"
                 },
-                "act_min":{
-                  "title":"Supervision",
-                  "description":"Summary of actions taken to minimize data loss. Includes information on actions such as follow-up visits, supervisory checks, historical matching, estimation, etc.",
-                  "type":"string",
-                  "_ddi_xpath":"stdyDscr/method/dataColl/actMin"
+                "act_min": {
+                  "title": "Supervision",
+                  "description": "Summary of actions taken to minimize data loss. Includes information on actions such as follow-up visits, supervisory checks, historical matching, estimation, etc.",
+                  "type": "string",
+                  "_ddi_xpath": "stdyDscr/method/dataColl/actMin"
                 },
-                "control_operations":{
-                  "title":"Control Operations",
-                  "description":" Methods to facilitate data control performed by the primary investigator or by the data archive. Specify any special programs used for such operations.",
-                  "type":"string",
-                  "_ddi_xpath":"stdyDscr/method/dataColl/ConOps"
+                "control_operations": {
+                  "title": "Control Operations",
+                  "description": " Methods to facilitate data control performed by the primary investigator or by the data archive. Specify any special programs used for such operations.",
+                  "type": "string",
+                  "_ddi_xpath": "stdyDscr/method/dataColl/ConOps"
                 },
-                "weight":{
-                  "title":"Weighting",
-                  "description":"The use of sampling procedures may make it necessary to apply weights to produce accurate statistical results. Describe here the criteria for using weights in analysis of a collection. If a weighting formula or coefficient was developed, provide this formula, define its elements, and indicate how the formula is applied to data.",
-                  "type":"string",
-                  "_ddi_xpath":"stdyDscr/method/dataColl/weight"
+                "weight": {
+                  "title": "Weighting",
+                  "description": "The use of sampling procedures may make it necessary to apply weights to produce accurate statistical results. Describe here the criteria for using weights in analysis of a collection. If a weighting formula or coefficient was developed, provide this formula, define its elements, and indicate how the formula is applied to data.",
+                  "type": "string",
+                  "_ddi_xpath": "stdyDscr/method/dataColl/weight"
                 },
-                "cleaning_operations":{
-                  "title":"Cleaning Operations",
-                  "description":"Methods used to `clean` the data collection, e.g., consistency checking, wildcode checking, etc.",
-                  "type":"string",
-                  "_ddi_xpath":"stdyDscr/method/dataColl/cleanOps"
+                "cleaning_operations": {
+                  "title": "Cleaning Operations",
+                  "description": "Methods used to `clean` the data collection, e.g., consistency checking, wildcode checking, etc.",
+                  "type": "string",
+                  "_ddi_xpath": "stdyDscr/method/dataColl/cleanOps"
                 }
               }
             },
-            "method_notes":{
-              "title":"Methodology notes",
-              "description":"Methodology notes",
-              "type":"string",
-              "_ddi_xpath":"stdyDscr/method/notes"
+            "method_notes": {
+              "title": "Methodology notes",
+              "description": "Methodology notes",
+              "type": "string",
+              "_ddi_xpath": "stdyDscr/method/notes"
             },
-            "analysis_info":{
-              "type":"object",
-              "title":"Data Appraisal",
-              "_ddi_xpath":"stdyDscr/method/anlyInfo",
-              "description":"Information about Data Appraisal",
-              "properties":{
-                "response_rate":{
-                  "title":"Response Rate",
-                  "description":"The percentage of sample members who provided information",
-                  "type":"string",
-                  "_ddi_xpath":"stdyDscr/method/anlyInfo/respRate"
+            "analysis_info": {
+              "type": "object",
+              "title": "Data Appraisal",
+              "_ddi_xpath": "stdyDscr/method/anlyInfo",
+              "description": "Information about Data Appraisal",
+              "properties": {
+                "response_rate": {
+                  "title": "Response Rate",
+                  "description": "The percentage of sample members who provided information",
+                  "type": "string",
+                  "_ddi_xpath": "stdyDscr/method/anlyInfo/respRate"
                 },
-                "sampling_error_estimates":{
-                  "title":"Estimates of Sampling Error",
-                  "description":"Measure of how precisely one can estimate a population value from a given sample",
-                  "type":"string",
-                  "_ddi_xpath":"stdyDscr/method/anlyInfo/EstSmpErr"
+                "sampling_error_estimates": {
+                  "title": "Estimates of Sampling Error",
+                  "description": "Measure of how precisely one can estimate a population value from a given sample",
+                  "type": "string",
+                  "_ddi_xpath": "stdyDscr/method/anlyInfo/EstSmpErr"
                 },
-                "data_appraisal":{
-                  "title":"Data Appraisal",
-                  "description":"Other issues pertaining to data appraisal. Describe here issues such as response variance, nonresponse rate and testing for bias, interviewer and response bias, confidence levels, question bias, etc.",
-                  "type":"string",
-                  "_ddi_xpath":"stdyDscr/method/anlyInfo/dataAppr"
+                "data_appraisal": {
+                  "title": "Data Appraisal",
+                  "description": "Other issues pertaining to data appraisal. Describe here issues such as response variance, nonresponse rate and testing for bias, interviewer and response bias, confidence levels, question bias, etc.",
+                  "type": "string",
+                  "_ddi_xpath": "stdyDscr/method/anlyInfo/dataAppr"
                 }
               }
             },
-            "study_class":{
-              "title":"Class of the Study",
-              "description":"Generally used to give the data archive's class or study status number, which indicates the processing status of the study. May also be used as a text field to describe processing status. Example: `DDA Class C`, `Study is available from http://example.com` ",
-              "type":["string","array"],
-              "_ddi_xpath":"stdyDscr/method/stdyClas"
+            "study_class": {
+              "title": "Class of the Study",
+              "description": "Generally used to give the data archive's class or study status number, which indicates the processing status of the study. May also be used as a text field to describe processing status. Example: `DDA Class C`, `Study is available from http://example.com` ",
+              "type": [
+                "string",
+                "array"
+              ],
+              "_ddi_xpath": "stdyDscr/method/stdyClas"
             },
-
-            "data_processing":{
-              "type":"array",
-              "title":"Data Processing",
-              "description":"Describes various data processing procedures not captured elsewhere in the documentation, such as topcoding, recoding, suppression, tabulation, etc. The `type` attribute supports better classification of this activity, including the optional use of a controlled vocabulary",
-              "_ddi_xpath":"stdyDscr/method/dataProcessing",
-              "items":{
-                "type":"object",
-                "properties":{
-                  "data_processing":{
-                    "title":"Data processing",                    
-                    "type":"string"
+            "data_processing": {
+              "type": "array",
+              "title": "Data Processing",
+              "description": "Describes various data processing procedures not captured elsewhere in the documentation, such as topcoding, recoding, suppression, tabulation, etc. The `type` attribute supports better classification of this activity, including the optional use of a controlled vocabulary",
+              "_ddi_xpath": "stdyDscr/method/dataProcessing",
+              "items": {
+                "type": "object",
+                "properties": {
+                  "data_processing": {
+                    "title": "Data processing",
+                    "type": "string"
                   },
-                  "source":{
-                    "title":"Source",
-                    "type":"string"
+                  "source": {
+                    "title": "Source",
+                    "type": "string"
                   },
-                  "type":{
-                    "title":"Data processing type",
-                    "type":"string"
+                  "type": {
+                    "title": "Data processing type",
+                    "type": "string"
                   }
                 },
-                "required":[
+                "required": [
                   "data_processing"
                 ]
               }
             },
-                        
-            "coding_instructions":{
-              "type":"array",
-              "title":"Coding Instructions",
-              "_ddi_xpath":"stdyDscr/method/codingInstructions",
-              "description":"Describe specific coding instructions used in data processing, cleaning, assession, or tabulation.",
-              "items":{
-                "type":"object",
-                  "properties":{
-                    "related_processes":{
-                      "title":"Related processes",
-                      "type":"string",
-                      "_ddi_xpath":"stdyDscr/method/codingInstructions/@relatedProcesses"
-                    },
-                    "type":{
-                      "title":"Coding instructions type",
-                      "type":"string",
-                      "_ddi_xpath":"stdyDscr/method/codingInstructions/@type"
-                    },
-                    "txt":{
-                      "title":"Coding instructions text",
-                      "type":"string",
-                      "_ddi_xpath":"stdyDscr/method/codingInstructions/txt"
-                    },
-                    "command":{
-                      "title":"Command",
-                      "description":"Provide command code for the coding instruction. The formalLanguage attribute identifies the language of the command code.",
-                      "type":"string",
-                      "_ddi_xpath":"stdyDscr/method/codingInstructions/command"
-                    },
-                    "command_language":{
-                      "title":"Language of the command code",
-                      "description":"Identifies the language of the command code. e.g. `SPSS`, `R`, `STATA` ",
-                      "type":"string",
-                      "_ddi_xpath":"stdyDscr/method/codingInstructions/command/@formalLanguage"
-                    }
+            "coding_instructions": {
+              "type": "array",
+              "title": "Coding Instructions",
+              "_ddi_xpath": "stdyDscr/method/codingInstructions",
+              "description": "Describe specific coding instructions used in data processing, cleaning, assession, or tabulation.",
+              "items": {
+                "type": "object",
+                "properties": {
+                  "related_processes": {
+                    "title": "Related processes",
+                    "type": "string",
+                    "_ddi_xpath": "stdyDscr/method/codingInstructions/@relatedProcesses"
+                  },
+                  "type": {
+                    "title": "Coding instructions type",
+                    "type": "string",
+                    "_ddi_xpath": "stdyDscr/method/codingInstructions/@type"
+                  },
+                  "txt": {
+                    "title": "Coding instructions text",
+                    "type": "string",
+                    "_ddi_xpath": "stdyDscr/method/codingInstructions/txt"
+                  },
+                  "command": {
+                    "title": "Command",
+                    "description": "Provide command code for the coding instruction. The formalLanguage attribute identifies the language of the command code.",
+                    "type": "string",
+                    "_ddi_xpath": "stdyDscr/method/codingInstructions/command"
+                  },
+                  "command_language": {
+                    "title": "Language of the command code",
+                    "description": "Identifies the language of the command code. e.g. `SPSS`, `R`, `STATA` ",
+                    "type": "string",
+                    "_ddi_xpath": "stdyDscr/method/codingInstructions/command/@formalLanguage"
                   }
+                }
               }
             }
           }
         },
-        "data_access":{
-          "type":"object",
-          "description":"Data Access",
-          "_ddi_xpath":"stdyDscr/dataAccs/setAvail/dataAccs",
-          "properties":{
-            "dataset_availability":{
-              "type":"object",
-              "title":"Data Set Availability",
-              "description":"Information on availability and storage of the collection",
-              "properties":{
-                "access_place":{
-                  "title":"Location of Data Collection",
-                  "description":"Location where the data collection is currently stored. Use the URL field `access_place_url` to provide a URN or URL for the storage site or the actual address from which the data may be downloaded",
-                  "type":"string",
-                  "_ddi_xpath":"stdyDscr/dataAccs/setAvail/accsPlac"
+        "data_access": {
+          "type": "object",
+          "description": "Data Access",
+          "_ddi_xpath": "stdyDscr/dataAccs/setAvail/dataAccs",
+          "properties": {
+            "dataset_availability": {
+              "type": "object",
+              "title": "Data Set Availability",
+              "description": "Information on availability and storage of the collection",
+              "properties": {
+                "access_place": {
+                  "title": "Location of Data Collection",
+                  "description": "Location where the data collection is currently stored. Use the URL field `access_place_url` to provide a URN or URL for the storage site or the actual address from which the data may be downloaded",
+                  "type": "string",
+                  "_ddi_xpath": "stdyDscr/dataAccs/setAvail/accsPlac"
                 },
-                "access_place_url":{
-                  "title":"URL for Location of Data Collection",
-                  "description":"Location where the data collection is currently stored. Provide a URN or URL for the storage site or the actual address from which the data may be downloaded",
-                  "type":"string",
-                  "_ddi_xpath":"stdyDscr/dataAccs/setAvail/accsPlac/@URI"
+                "access_place_url": {
+                  "title": "URL for Location of Data Collection",
+                  "description": "Location where the data collection is currently stored. Provide a URN or URL for the storage site or the actual address from which the data may be downloaded",
+                  "type": "string",
+                  "_ddi_xpath": "stdyDscr/dataAccs/setAvail/accsPlac/@URI"
                 },
-                "original_archive":{
-                  "title":"Archive where study is originally stored",
-                  "description":"Archive from which the data collection was obtained; the originating archive",
-                  "type":"string",
-                  "_ddi_xpath":"stdyDscr/dataAccs/setAvail/origArch"
+                "original_archive": {
+                  "title": "Archive where study is originally stored",
+                  "description": "Archive from which the data collection was obtained; the originating archive",
+                  "type": "string",
+                  "_ddi_xpath": "stdyDscr/dataAccs/setAvail/origArch"
                 },
-                "status":{
-                  "title":"Availability Status",
-                  "description":"Statement of collection availability. An archive may need to indicate that a collection is unavailable because it is embargoed for a period of time, because it has been superseded, because a new edition is imminent, etc.",
-                  "type":"string",
-                  "_ddi_xpath":"stdyDscr/dataAccs/setAvail/avlStatus"
+                "status": {
+                  "title": "Availability Status",
+                  "description": "Statement of collection availability. An archive may need to indicate that a collection is unavailable because it is embargoed for a period of time, because it has been superseded, because a new edition is imminent, etc.",
+                  "type": "string",
+                  "_ddi_xpath": "stdyDscr/dataAccs/setAvail/avlStatus"
                 },
-                "coll_size":{
-                  "title":"Extent of Collection",
-                  "description":"Summarizes the number of physical files that exist in a collection, recording the number of files that contain data and noting whether the collection contains machine-readable documentation and/or other supplementary files and information such as data dictionaries, data definition statements, or data collection instruments.",
-                  "type":"string",
-                  "_ddi_xpath":"stdyDscr/dataAccs/setAvail/collSize"
+                "coll_size": {
+                  "title": "Extent of Collection",
+                  "description": "Summarizes the number of physical files that exist in a collection, recording the number of files that contain data and noting whether the collection contains machine-readable documentation and/or other supplementary files and information such as data dictionaries, data definition statements, or data collection instruments.",
+                  "type": "string",
+                  "_ddi_xpath": "stdyDscr/dataAccs/setAvail/collSize"
                 },
-                "complete":{
-                  "title":"Completeness of Study Stored",
-                  "description":"This item indicates the relationship of the data collected to the amount of data coded and stored in the data collection. Information as to why certain items of collected information were not included in the data file stored by the archive should be provided",
-                  "type":"string",
-                  "_ddi_xpath":"stdyDscr/dataAccs/setAvail/complete"
+                "complete": {
+                  "title": "Completeness of Study Stored",
+                  "description": "This item indicates the relationship of the data collected to the amount of data coded and stored in the data collection. Information as to why certain items of collected information were not included in the data file stored by the archive should be provided",
+                  "type": "string",
+                  "_ddi_xpath": "stdyDscr/dataAccs/setAvail/complete"
                 },
-                "file_quantity":{
-                  "title":"Number of Files",
-                  "description":"Total number of physical files associated with a collection",
-                  "type":"string",
-                  "_ddi_xpath":"stdyDscr/dataAccs/setAvail/fileQnty"
+                "file_quantity": {
+                  "title": "Number of Files",
+                  "description": "Total number of physical files associated with a collection",
+                  "type": "string",
+                  "_ddi_xpath": "stdyDscr/dataAccs/setAvail/fileQnty"
                 },
-                "notes":{
-                  "title":"Notes",
-                  "description":"Notes and comments",
-                  "type":"string",
-                  "_ddi_xpath":"stdyDscr/dataAccs/setAvail/notes"
+                "notes": {
+                  "title": "Notes",
+                  "description": "Notes and comments",
+                  "type": "string",
+                  "_ddi_xpath": "stdyDscr/dataAccs/setAvail/notes"
                 }
               }
             },
-            "dataset_use":{
-              "type":"object",
-              "title":"Data Set Availability",
-              "description":" Information on terms of use for the data collection",
-              "_ddi_xpath":"stdyDscr/dataAccs/useStmt",
-              "properties":{
-                "conf_dec":{
-                  "type":"array",
-                  "title":"Confidentiality Declaration",
-                  "description":" This element is used to determine if signing of a confidentiality declaration is needed to access a resource.",
-                  "items":{
+            "dataset_use": {
+              "type": "object",
+              "title": "Data Set Availability",
+              "description": " Information on terms of use for the data collection",
+              "_ddi_xpath": "stdyDscr/dataAccs/useStmt",
+              "properties": {
+                "conf_dec": {
+                  "type": "array",
+                  "title": "Confidentiality Declaration",
+                  "description": " This element is used to determine if signing of a confidentiality declaration is needed to access a resource.",
+                  "items": {
                     "type": "object",
-                    "properties":{
-                      "txt":{
-                        "type":"string",
-                        "title":"Confidentiality declaration text",
-                        "description":"Confidentiality declaration text",
-                        "_ddi_xpath":"stdyDscr/dataAccs/useStmt/confDec"
+                    "properties": {
+                      "txt": {
+                        "type": "string",
+                        "title": "Confidentiality declaration text",
+                        "description": "Confidentiality declaration text",
+                        "_ddi_xpath": "stdyDscr/dataAccs/useStmt/confDec"
                       },
-                      "required":{
-                        "type":"string",
-                        "title":"Is signing of a confidentiality declaration required?",
-                        "description":"Is signing of a confidentiality declaration required",
-                        "_ddi_xpath":"stdyDscr/dataAccs/useStmt/confDec/@required"
+                      "required": {
+                        "type": "string",
+                        "title": "Is signing of a confidentiality declaration required?",
+                        "description": "Is signing of a confidentiality declaration required",
+                        "_ddi_xpath": "stdyDscr/dataAccs/useStmt/confDec/@required"
                       },
-                      "form_url":{
-                        "type":"string",
-                        "title":"Confidentiality declaration form URL",
-                        "description":"Provide a URN or URL for online access to a confidentiality declaration form.",
-                        "_ddi_xpath":"stdyDscr/dataAccs/useStmt/confDec/@URI"
+                      "form_url": {
+                        "type": "string",
+                        "title": "Confidentiality declaration form URL",
+                        "description": "Provide a URN or URL for online access to a confidentiality declaration form.",
+                        "_ddi_xpath": "stdyDscr/dataAccs/useStmt/confDec/@URI"
                       },
-                      "form_id":{
-                        "type":"string",
-                        "title":"Form ID",
-                        "description":"Indicates the number or ID of the form that the user must fill out",
-                        "_ddi_xpath":"stdyDscr/dataAccs/useStmt/confDec/@formNo"
+                      "form_id": {
+                        "type": "string",
+                        "title": "Form ID",
+                        "description": "Indicates the number or ID of the form that the user must fill out",
+                        "_ddi_xpath": "stdyDscr/dataAccs/useStmt/confDec/@formNo"
                       }
                     }
                   }
                 },
-                "spec_perm":{
-                  "type":"array",
-                  "title":"Special Permissions",
-                  "description":"Determine if any special permissions are required to access a resource",
-                  "_ddi_xpath":"stdyDscr/dataAccs/useStmt/specPerm",
-                  "items":{
+                "spec_perm": {
+                  "type": "array",
+                  "title": "Special Permissions",
+                  "description": "Determine if any special permissions are required to access a resource",
+                  "_ddi_xpath": "stdyDscr/dataAccs/useStmt/specPerm",
+                  "items": {
                     "type": "object",
-                    "properties":{
-                      "txt":{
-                        "type":"string",
-                        "title":"Special permissions description",
-                        "description":"Confidentiality declaration text"
+                    "properties": {
+                      "txt": {
+                        "type": "string",
+                        "title": "Special permissions description",
+                        "description": "Confidentiality declaration text"
                       },
-                      "required":{
-                        "type":"string",
-                        "title":"Indicate if special permissions are required to access a resource",
-                        "description":"Indicate if special permissions are required to access a resource"
+                      "required": {
+                        "type": "string",
+                        "title": "Indicate if special permissions are required to access a resource",
+                        "description": "Indicate if special permissions are required to access a resource"
                       },
-                      "form_url":{
-                        "type":"string",
-                        "title":"Form URL",
-                        "description":"Link to the form URL"
+                      "form_url": {
+                        "type": "string",
+                        "title": "Form URL",
+                        "description": "Link to the form URL"
                       },
-                      "form_id":{
-                        "type":"string",
-                        "title":"Form ID",
-                        "description":"Indicates the number or ID of the form that the user must fill out"
+                      "form_id": {
+                        "type": "string",
+                        "title": "Form ID",
+                        "description": "Indicates the number or ID of the form that the user must fill out"
                       }
                     }
                   }
                 },
-                "restrictions":{
-                  "title":"Restrictions",
-                  "description":"Any restrictions on access to or use of the collection such as privacy certification or distribution restrictions should be indicated here. These can be restrictions applied by the author, producer, or disseminator of the data collection. If the data are restricted to only a certain class of user, specify which type.",
-                  "type":"string",
-                  "_ddi_xpath":"stdyDscr/dataAccs/useStmt/restrctn"
+                "restrictions": {
+                  "title": "Restrictions",
+                  "description": "Any restrictions on access to or use of the collection such as privacy certification or distribution restrictions should be indicated here. These can be restrictions applied by the author, producer, or disseminator of the data collection. If the data are restricted to only a certain class of user, specify which type.",
+                  "type": "string",
+                  "_ddi_xpath": "stdyDscr/dataAccs/useStmt/restrctn"
                 },
-                "contact":{
-                  "type":"array",
-                  "title":"Contact",
-                  "description":"Contact",
-                  "_ddi_xpath":"stdyDscr/dataAccs/useStmt/contact",
-                  "items":{
-                    "type":"object",
-                    "properties":{
-                      "name":{
-                        "title":"Name",
-                        "type":"string"
+                "contact": {
+                  "type": "array",
+                  "title": "Contact",
+                  "description": "Contact",
+                  "_ddi_xpath": "stdyDscr/dataAccs/useStmt/contact",
+                  "items": {
+                    "type": "object",
+                    "properties": {
+                      "name": {
+                        "title": "Name",
+                        "type": "string"
                       },
-                      "affiliation":{
-                        "title":"Affiliation",
-                        "type":"string"
+                      "affiliation": {
+                        "title": "Affiliation",
+                        "type": "string"
                       },
-                      "uri":{
-                        "title":"URI",
-                        "type":"string"
+                      "uri": {
+                        "title": "URI",
+                        "type": "string"
                       },
-                      "email":{
-                        "title":"Email",
-                        "type":"string"
+                      "email": {
+                        "title": "Email",
+                        "type": "string"
                       }
                     }
                   },
-                  "required":[
+                  "required": [
                     "name"
                   ]
                 },
-                "cit_req":{
-                  "title":"Citation requirement",
-                  "description":"Text of requirement that a data collection should be cited properly in articles or other publications that are based on analysis of the data.",
-                  "type":"string",
-                  "_ddi_xpath":"stdyDscr/dataAccs/useStmt/citReq"
+                "cit_req": {
+                  "title": "Citation requirement",
+                  "description": "Text of requirement that a data collection should be cited properly in articles or other publications that are based on analysis of the data.",
+                  "type": "string",
+                  "_ddi_xpath": "stdyDscr/dataAccs/useStmt/citReq"
                 },
-                "deposit_req":{
-                  "title":"Deposit requirement",
-                  "description":"Information regarding user responsibility for informing archives of their use of data through providing citations to the published work or providing copies of the manuscripts.",
-                  "type":"string",
-                  "_ddi_xpath":"stdyDscr/dataAccs/useStmt/deposReq"
+                "deposit_req": {
+                  "title": "Deposit requirement",
+                  "description": "Information regarding user responsibility for informing archives of their use of data through providing citations to the published work or providing copies of the manuscripts.",
+                  "type": "string",
+                  "_ddi_xpath": "stdyDscr/dataAccs/useStmt/deposReq"
                 },
-                "conditions":{
-                  "title":"Conditions",
-                  "description":"Indicates any additional information that will assist the user in understanding the access and use conditions of the data collection.",
-                  "type":"string",
-                  "_ddi_xpath":"stdyDscr/dataAccs/useStmt/conditions"
+                "conditions": {
+                  "title": "Conditions",
+                  "description": "Indicates any additional information that will assist the user in understanding the access and use conditions of the data collection.",
+                  "type": "string",
+                  "_ddi_xpath": "stdyDscr/dataAccs/useStmt/conditions"
                 },
-                "disclaimer":{
-                  "title":"Disclaimer",
-                  "description":"Information regarding responsibility for uses of the data collection",
-                  "type":"string",
-                  "_ddi_xpath":"stdyDscr/dataAccs/useStmt/disclaimer"
+                "disclaimer": {
+                  "title": "Disclaimer",
+                  "description": "Information regarding responsibility for uses of the data collection",
+                  "type": "string",
+                  "_ddi_xpath": "stdyDscr/dataAccs/useStmt/disclaimer"
                 }
               }
             },
-            "notes":{
-              "title":"Notes",
-              "description":"Notes and comments",
-              "type":"string",
-              "_ddi_xpath":"stdyDscr/dataAccs/setAvail/notes"
+            "notes": {
+              "title": "Notes",
+              "description": "Notes and comments",
+              "type": "string",
+              "_ddi_xpath": "stdyDscr/dataAccs/setAvail/notes"
             }
           }
         }
       },
-      "required":[
+      "required": [
         "title_statement",
         "study_info"
       ],
-      "additionalProperties":false
+      "additionalProperties": false
     }
   },
-  "type":"object",
-  "properties":{
-    "doc_desc":{
-      "$ref":"#/definitions/doc_desc"
+  "type": "object",
+  "properties": {
+    "doc_desc": {
+      "$ref": "#/definitions/doc_desc"
     },
-    "study_desc":{
-      "$ref":"#/definitions/study_desc"
+    "study_desc": {
+      "$ref": "#/definitions/study_desc"
     },
-    "data_files":{
-      "type":"array",
-      "description":"Data files",
-      "items":{
-        "$ref":"datafile-schema.json"
+    "data_files": {
+      "type": "array",
+      "description": "Data files",
+      "items": {
+        "$ref": "datafile-schema.json"
       }
     },
-    "variables":{
-      "type":"array",
-      "description":"Variables",
-      "items":{
-        "$ref":"variable-schema.json"
+    "variables": {
+      "type": "array",
+      "description": "Variables",
+      "items": {
+        "$ref": "variable-schema.json"
       }
     },
-    "variable_groups":{
-      "type":"array",
-      "description":"Variable group",
-      "title":"Variable groups",
-      "items":{
-        "type":"object",
-        "properties":{
-          "vgid":{
-            "title":"Variable Group ID",
-            "description":"Unique ID for the variable group e.g. VG1",
-            "type":"string",
+    "variable_groups": {
+      "type": "array",
+      "description": "Variable group",
+      "title": "Variable groups",
+      "items": {
+        "type": "object",
+        "properties": {
+          "vgid": {
+            "title": "Variable Group ID",
+            "description": "Unique ID for the variable group e.g. VG1",
+            "type": "string",
             "maxLength": 45
           },
-          "variables":{
-            "title":"Variables",
-            "description":"List of variables for the group seperated by space e.g. V1 V2 V3",
-            "type":"string",
+          "variables": {
+            "title": "Variables",
+            "description": "List of variables for the group seperated by space e.g. V1 V2 V3",
+            "type": "string",
             "maxLength": 5000
           },
-          "variable_groups":{
-            "title":"Variable groups",
-            "description":"List of sub-groups e.g. VG2 VG3 VG4",
-            "type":"string",
+          "variable_groups": {
+            "title": "Variable groups",
+            "description": "List of sub-groups e.g. VG2 VG3 VG4",
+            "type": "string",
             "maxLength": 1000
           },
-          "group_type":{
-            "title":"Type",
-            "type":"string",
-            "enum":[
+          "group_type": {
+            "title": "Type",
+            "type": "string",
+            "enum": [
               "subject",
               "section",
               "multiResp",
@@ -1647,37 +1660,37 @@
             ],
             "maxLength": 45
           },
-          "label":{
-            "title":"Label",
-            "type":"string",
+          "label": {
+            "title": "Label",
+            "type": "string",
             "maxLength": 255
           },
-          "universe":{
-            "title":"Universe",
-            "type":"string",
+          "universe": {
+            "title": "Universe",
+            "type": "string",
             "maxLength": 255
           },
-          "notes":{
-            "title":"Notes",
-            "type":"string",
+          "notes": {
+            "title": "Notes",
+            "type": "string",
             "maxLength": 500
           },
-          "txt":{
-            "title":"Text",
-            "type":"string",
+          "txt": {
+            "title": "Text",
+            "type": "string",
             "maxLength": 500
           },
-          "definition":{
-            "title":"Definition",
-            "type":"string",
+          "definition": {
+            "title": "Definition",
+            "type": "string",
             "maxLength": 500
           }
         },
-        "required":[
+        "required": [
           "vgid"
         ]
       },
-      "additionalProperties":false
+      "additionalProperties": false
     }
   }
 }
\ No newline at end of file
diff --git a/application/schemas/ddi-schema.json b/application/schemas/ddi-schema.json
index 57783b4b5..c3dfa6cfb 100644
--- a/application/schemas/ddi-schema.json
+++ b/application/schemas/ddi-schema.json
@@ -1,782 +1,781 @@
 {
   "$schema": "http://json-schema.org/draft-07/schema#",
   "$id": "http://ihsn.org/schemas/ddi2-codebook",
-  "version":"0.0",
-  "title":"Survey Microdata Schema Draft",
-  "description":"Schema for Survey data type based on DDI 2.5",
-  "definitions":{
-    "doc_desc":{
-      "type":"object",
-      "title":"Document Description",
-      "description":"Document Description",
-      "_ddi_xpath":"docDscr",
-      "properties":{
-        "title":{
-          "title":"Document title",
-          "description":"Document title",
-          "type":"string",
-          "_ddi_xpath":"docDscr/citation/titlStmt/titl"
+  "version": "0.0",
+  "title": "Survey Microdata Schema Draft",
+  "description": "Schema for Survey data type based on DDI 2.5",
+  "definitions": {
+    "doc_desc": {
+      "type": "object",
+      "title": "Document Description",
+      "description": "Document Description",
+      "_ddi_xpath": "docDscr",
+      "properties": {
+        "title": {
+          "title": "Document title",
+          "description": "Document title",
+          "type": "string",
+          "_ddi_xpath": "docDscr/citation/titlStmt/titl"
         },
-        "idno":{
-          "title":"Unique ID number for the document",
-          "type":"string",
-          "_ddi_xpath":"docDscr/citation/titlStmt/IDNo"
+        "idno": {
+          "title": "Unique ID number for the document",
+          "type": "string",
+          "_ddi_xpath": "docDscr/citation/titlStmt/IDNo"
         },
-        "producers":{
-          "type":"array",
-          "title":"Producers",
-          "description":"List of producers",
-          "_ddi_xpath":"docDscr/citation/prodStmt/producer",
-          "items":{
-            "type":"object",
-            "properties":{
-              "name":{
-                "title":"Name",
-                "description":"Name (required)",
-                "type":"string"
+        "producers": {
+          "type": "array",
+          "title": "Producers",
+          "description": "List of producers",
+          "_ddi_xpath": "docDscr/citation/prodStmt/producer",
+          "items": {
+            "type": "object",
+            "properties": {
+              "name": {
+                "title": "Name",
+                "description": "Name (required)",
+                "type": "string"
               },
-              "abbr":{
-                "title":"Abbreviation",
-                "type":"string"
+              "abbr": {
+                "title": "Abbreviation",
+                "type": "string"
               },
-              "affiliation":{
-                "type":"string",
-                "title":"Affiliation"
+              "affiliation": {
+                "type": "string",
+                "title": "Affiliation"
               },
-              "role":{
-                "title":"Role",
-                "type":"string"
+              "role": {
+                "title": "Role",
+                "type": "string"
               }
             }
           },
-          "required":[
+          "required": [
             "name"
           ]
         },
-        "prod_date":{
-          "title":"Date of Production",
-          "description":"Document production date using format(YYYY-MM-DD)",
-          "type":"string",
-          "_ddi_xpath":"docDscr/citation/prodStmt/prodDate"
+        "prod_date": {
+          "title": "Date of Production",
+          "description": "Document production date using format(YYYY-MM-DD)",
+          "type": "string",
+          "_ddi_xpath": "docDscr/citation/prodStmt/prodDate"
         },
-        "version_statement":{
-          "type":"object",
-          "title":"Version Statement",
-          "description":"Version Statement",
-          "_ddi_xpath":"docDscr/citation/verStmt",
-          "properties":{
-            "version":{
-              "title":"Version",
-              "type":"string",
-              "_ddi_xpath":"docDscr/citation/verStmt/version"
+        "version_statement": {
+          "type": "object",
+          "title": "Version Statement",
+          "description": "Version Statement",
+          "_ddi_xpath": "docDscr/citation/verStmt",
+          "properties": {
+            "version": {
+              "title": "Version",
+              "type": "string",
+              "_ddi_xpath": "docDscr/citation/verStmt/version"
             },
-            "version_date":{
-              "title":"Version Date",
-              "type":"string",
-              "_ddi_xpath":"docDscr/citation/verStmt/version/@date"
+            "version_date": {
+              "title": "Version Date",
+              "type": "string",
+              "_ddi_xpath": "docDscr/citation/verStmt/version/@date"
             },
-            "version_resp":{
-              "title":"Version Responsibility Statement",
-              "description":"The organization or person responsible for the version of the work",
-              "type":"string",
-              "_ddi_xpath":"docDscr/citation/verStmt/verResp"
+            "version_resp": {
+              "title": "Version Responsibility Statement",
+              "description": "The organization or person responsible for the version of the work",
+              "type": "string",
+              "_ddi_xpath": "docDscr/citation/verStmt/verResp"
             },
-            "version_notes":{
-              "title":"Version Notes",
-              "type":"string",
-              "_ddi_xpath":"docDscr/citation/verStmt/notes"
+            "version_notes": {
+              "title": "Version Notes",
+              "type": "string",
+              "_ddi_xpath": "docDscr/citation/verStmt/notes"
             }
           }
         }
       },
-      "additionalProperties":false
+      "additionalProperties": false
     },
-    "study_desc":{
-      "type":"object",
-      "description":"Study Description",
-      "_ddi_xpath":"stdyDscr",
-      "properties":{
-        "title_statement":{
-          "type":"object",
-          "description":"Study title",
-          "_ddi_xpath":"stdyDscr/citation/titlStmt",
-          "properties":{
-            "idno":{
-              "type":"string",
-              "title":"Unique user defined ID",
-              "description":"The ID number of a dataset is a unique number that is used to identify a particular survey. Define and use a consistent scheme to use. Such an ID could be constructed as follows: country-producer-survey-year-version where \n - country is the 3-letter ISO country abbreviation \n - producer is the abbreviation of the producing agency \n - survey is the survey abbreviation \n - year is the reference year (or the year the survey started) \n - version is the number dataset version number (see Version Description below)",
-              "_ddi_xpath":"stdyDscr/citation/titlStmt/IDNo"
+    "study_desc": {
+      "type": "object",
+      "description": "Study Description",
+      "_ddi_xpath": "stdyDscr",
+      "properties": {
+        "title_statement": {
+          "type": "object",
+          "description": "Study title",
+          "_ddi_xpath": "stdyDscr/citation/titlStmt",
+          "properties": {
+            "idno": {
+              "type": "string",
+              "title": "Unique user defined ID",
+              "description": "The ID number of a dataset is a unique number that is used to identify a particular survey. Define and use a consistent scheme to use. Such an ID could be constructed as follows: country-producer-survey-year-version where \n - country is the 3-letter ISO country abbreviation \n - producer is the abbreviation of the producing agency \n - survey is the survey abbreviation \n - year is the reference year (or the year the survey started) \n - version is the number dataset version number (see Version Description below)",
+              "_ddi_xpath": "stdyDscr/citation/titlStmt/IDNo"
             },
-            "identifiers":{
-              "type":"array",
-              "title":"Other identifiers",
-              "description":"Other identifiers",
-              "items":{
-                "type":"object",
-                "properties":{
-                  "type":{
-                    "title":"Identifier type",
-                    "description":"Type of identifier e.g. `doi`, `handle`, `other`",
-                    "type":"string"
+            "identifiers": {
+              "type": "array",
+              "title": "Other identifiers",
+              "description": "Other identifiers",
+              "items": {
+                "type": "object",
+                "properties": {
+                  "type": {
+                    "title": "Identifier type",
+                    "description": "Type of identifier e.g. `doi`, `handle`, `other`",
+                    "type": "string"
                   },
-                  "identifier":{
-                    "title":"Identifier",
-                    "type":"string"
+                  "identifier": {
+                    "title": "Identifier",
+                    "type": "string"
                   }
                 },
-                "required":[
+                "required": [
                   "identifier"
                 ]
               }
             },
-
-            "title":{
-              "type":"string",
-              "title":"Survey title",
-              "description":"The title is the official name of the survey as it is stated on the questionnaire or as it appears in the design documents. The following items should be noted:\n - Include the reference year(s) of the survey in the title. \n - Do not include the abbreviation of the survey name in the title. \n - As the survey title is a proper noun, the first letter of each word should be capitalized (except for prepositions or other conjunctions).\n - Including the country name in the title is optional.",
-              "_ddi_xpath":"stdyDscr/citation/titlStmt/titl"
+            "title": {
+              "type": "string",
+              "title": "Survey title",
+              "description": "The title is the official name of the survey as it is stated on the questionnaire or as it appears in the design documents. The following items should be noted:\n - Include the reference year(s) of the survey in the title. \n - Do not include the abbreviation of the survey name in the title. \n - As the survey title is a proper noun, the first letter of each word should be capitalized (except for prepositions or other conjunctions).\n - Including the country name in the title is optional.",
+              "_ddi_xpath": "stdyDscr/citation/titlStmt/titl"
             },
-            "sub_title":{
-              "type":"string",
-              "title":"Survey subtitle",
-              "description":"A short subtitle for the survey",
-              "_ddi_xpath":"stdyDscr/citation/titlStmt/subTitl"
+            "sub_title": {
+              "type": "string",
+              "title": "Survey subtitle",
+              "description": "A short subtitle for the survey",
+              "_ddi_xpath": "stdyDscr/citation/titlStmt/subTitl"
             },
-            "alternate_title":{
-              "type":"string",
-              "title":"Abbreviation or Acronym",
-              "description":"The abbreviation of a survey is usually the first letter of each word of the titled survey. The survey reference year(s) may be included.",
-              "_ddi_xpath":"stdyDscr/citation/titlStmt/altTitl"
+            "alternate_title": {
+              "type": "string",
+              "title": "Abbreviation or Acronym",
+              "description": "The abbreviation of a survey is usually the first letter of each word of the titled survey. The survey reference year(s) may be included.",
+              "_ddi_xpath": "stdyDscr/citation/titlStmt/altTitl"
             },
-            "translated_title":{
-              "title":"Translated Title",
-              "description":"In countries with more than one official language, a translation of the title may be provided.",
-              "type":"string",
-              "_ddi_xpath":"stdyDscr/citation/titlStmt/parTitl"
+            "translated_title": {
+              "title": "Translated Title",
+              "description": "In countries with more than one official language, a translation of the title may be provided.",
+              "type": "string",
+              "_ddi_xpath": "stdyDscr/citation/titlStmt/parTitl"
             }
           },
-          "required":[
+          "required": [
             "idno",
             "title"
           ]
         },
-        "authoring_entity":{
-          "type":"array",
-          "title":"Authoring entity/Primary investigators",
-          "description":"The person, corporate body, or agency responsible for the work's substantive and intellectual content. Repeat the element for each author, and use 'affiliation' attribute if available. Invert first and last name and use commas.",
-          "_ddi_xpath":"stdyDscr/citation/rspStmt/AuthEnty",
-          "items":{
-            "type":"object",
-            "properties":{
-              "name":{
-                "title":"Agency Name",
-                "type":"string"
+        "authoring_entity": {
+          "type": "array",
+          "title": "Authoring entity/Primary investigators",
+          "description": "The person, corporate body, or agency responsible for the work's substantive and intellectual content. Repeat the element for each author, and use 'affiliation' attribute if available. Invert first and last name and use commas.",
+          "_ddi_xpath": "stdyDscr/citation/rspStmt/AuthEnty",
+          "items": {
+            "type": "object",
+            "properties": {
+              "name": {
+                "title": "Agency Name",
+                "type": "string"
               },
-              "affiliation":{
-                "title":"Affiliation",
-                "type":"string"
+              "affiliation": {
+                "title": "Affiliation",
+                "type": "string"
               }
             },
-            "required":[
+            "required": [
               "name"
             ]
           }
         },
-        "oth_id":{
-          "type":"array",
-          "title":"Other Identifications/Acknowledgments",
-          "description":"Acknowledge any other people and institutions that have in some form contributed to the survey",
-          "_ddi_xpath":"stdyDscr/citation/rspStmt/othId",
-          "items":{
-            "type":"object",
-            "properties":{
-              "name":{
-                "title":"Name",
-                "description":"Person or Agency name",
-                "type":"string"
+        "oth_id": {
+          "type": "array",
+          "title": "Other Identifications/Acknowledgments",
+          "description": "Acknowledge any other people and institutions that have in some form contributed to the survey",
+          "_ddi_xpath": "stdyDscr/citation/rspStmt/othId",
+          "items": {
+            "type": "object",
+            "properties": {
+              "name": {
+                "title": "Name",
+                "description": "Person or Agency name",
+                "type": "string"
               },
-              "role":{
-                "title":"Role",
-                "type":"string"
+              "role": {
+                "title": "Role",
+                "type": "string"
               },
-              "affiliation":{
-                "title":"Affiliation",
-                "type":"string"
+              "affiliation": {
+                "title": "Affiliation",
+                "type": "string"
               }
             },
-            "required":[
+            "required": [
               "name"
             ]
           }
         },
-        "production_statement":{
-          "type":"object",
-          "title":"Production Statement",
-          "description":"Production Statement",
-          "_ddi_xpath":"stdyDscr/citation/prodStmt",
-          "properties":{
-            "producers":{
-              "type":"array",
-              "title":"Producers",
-              "description":"List of producers",
-              "_ddi_xpath":"stdyDscr/citation/prodStmt/producer",
-              "items":{
-                "type":"object",
-                "properties":{
-                  "name":{
-                    "title":"Name",
-                    "description":"Name (required)",
-                    "type":"string"
+        "production_statement": {
+          "type": "object",
+          "title": "Production Statement",
+          "description": "Production Statement",
+          "_ddi_xpath": "stdyDscr/citation/prodStmt",
+          "properties": {
+            "producers": {
+              "type": "array",
+              "title": "Producers",
+              "description": "List of producers",
+              "_ddi_xpath": "stdyDscr/citation/prodStmt/producer",
+              "items": {
+                "type": "object",
+                "properties": {
+                  "name": {
+                    "title": "Name",
+                    "description": "Name (required)",
+                    "type": "string"
                   },
-                  "abbr":{
-                    "title":"Abbreviation",
-                    "type":"string"
+                  "abbr": {
+                    "title": "Abbreviation",
+                    "type": "string"
                   },
-                  "affiliation":{
-                    "type":"string",
-                    "title":"Affiliation"
+                  "affiliation": {
+                    "type": "string",
+                    "title": "Affiliation"
                   },
-                  "role":{
-                    "title":"Role",
-                    "type":"string"
+                  "role": {
+                    "title": "Role",
+                    "type": "string"
                   }
                 }
               },
-              "required":[
+              "required": [
                 "name"
               ]
             },
-            "copyright":{
-              "title":"Copyright",
-              "type":"string",
-              "_ddi_xpath":"stdyDscr/citation/prodStmt/copyright"
+            "copyright": {
+              "title": "Copyright",
+              "type": "string",
+              "_ddi_xpath": "stdyDscr/citation/prodStmt/copyright"
             },
-            "prod_date":{
-              "title":"Production Date",
-              "description":"Date when the marked-up document/marked-up document source/data collection/other material(s) were produced (not distributed or archived). The ISO standard for dates (YYYY-MM-DD) is recommended for use with the date attribute. Production date for data collection (2.1.3.3) maps to Dublin Core Date element.",
-              "type":"string",
-              "_ddi_xpath":"stdyDscr/citation/prodStmt/prodDate"
+            "prod_date": {
+              "title": "Production Date",
+              "description": "Date when the marked-up document/marked-up document source/data collection/other material(s) were produced (not distributed or archived). The ISO standard for dates (YYYY-MM-DD) is recommended for use with the date attribute. Production date for data collection (2.1.3.3) maps to Dublin Core Date element.",
+              "type": "string",
+              "_ddi_xpath": "stdyDscr/citation/prodStmt/prodDate"
             },
-            "prod_place":{
-              "title":"Production Place",
-              "description":"Address of the archive or organization that produced the work",
-              "type":"string",
-              "_ddi_xpath":"stdyDscr/citation/prodStmt/prodPlac"
+            "prod_place": {
+              "title": "Production Place",
+              "description": "Address of the archive or organization that produced the work",
+              "type": "string",
+              "_ddi_xpath": "stdyDscr/citation/prodStmt/prodPlac"
             },
-            "funding_agencies":{
-              "type":"array",
-              "title":"Funding Agency/Sponsor",
-              "description":"The source(s) of funds for production of the work. If different funding agencies sponsored different stages of the production process, use the 'role' attribute to distinguish them.",
-              "_ddi_xpath":"stdyDscr/citation/prodStmt/fundAg",
-              "items":{
-                "type":"object",
-                "properties":{
-                  "name":{
-                    "title":"Funding Agency/Sponsor",
-                    "type":"string"
+            "funding_agencies": {
+              "type": "array",
+              "title": "Funding Agency/Sponsor",
+              "description": "The source(s) of funds for production of the work. If different funding agencies sponsored different stages of the production process, use the 'role' attribute to distinguish them.",
+              "_ddi_xpath": "stdyDscr/citation/prodStmt/fundAg",
+              "items": {
+                "type": "object",
+                "properties": {
+                  "name": {
+                    "title": "Funding Agency/Sponsor",
+                    "type": "string"
                   },
-                  "abbr":{
-                    "title":"Abbreviation",
-                    "type":"string"
+                  "abbr": {
+                    "title": "Abbreviation",
+                    "type": "string"
                   },
-                  "grant":{
-                    "title":"Grant Number",
-                    "type":"string",
-                    "_ddi_xpath":"stdyDscr/citation/prodStmt/grantNo"
+                  "grant": {
+                    "title": "Grant Number",
+                    "type": "string",
+                    "_ddi_xpath": "stdyDscr/citation/prodStmt/grantNo"
                   },
-                  "role":{
-                    "title":"Role",
-                    "type":"string"
+                  "role": {
+                    "title": "Role",
+                    "type": "string"
                   }
                 },
-                "required":[
+                "required": [
                   "name"
                 ]
               }
-            }            
+            }
           }
         },
-        "distribution_statement":{
-          "type":"object",
-          "title":"Distribution Statement",
-          "description":"Distribution Statement",
-          "_ddi_xpath":"stdyDscr/citation/distStmt",
-          "properties":{
-            "distributors":{
-              "type":"array",
-              "title":"Distributor",
-              "description":"The organization designated by the author or producer to generate copies of the particular work including any necessary editions or revisions. Names and addresses may be specified and other archives may be co-distributors. A URI attribute is included to provide an URN or URL to the ordering service or download facility on a Web site.",
-              "_ddi_xpath":"stdyDscr/citation/distStmt/distrbtr",
-              "items":{
-                "type":"object",
-                "properties":{
-                  "name":{
-                    "title":"Organization name",
-                    "description":"Organization name",
-                    "type":"string"
+        "distribution_statement": {
+          "type": "object",
+          "title": "Distribution Statement",
+          "description": "Distribution Statement",
+          "_ddi_xpath": "stdyDscr/citation/distStmt",
+          "properties": {
+            "distributors": {
+              "type": "array",
+              "title": "Distributor",
+              "description": "The organization designated by the author or producer to generate copies of the particular work including any necessary editions or revisions. Names and addresses may be specified and other archives may be co-distributors. A URI attribute is included to provide an URN or URL to the ordering service or download facility on a Web site.",
+              "_ddi_xpath": "stdyDscr/citation/distStmt/distrbtr",
+              "items": {
+                "type": "object",
+                "properties": {
+                  "name": {
+                    "title": "Organization name",
+                    "description": "Organization name",
+                    "type": "string"
                   },
-                  "abbr":{
-                    "title":"Abbreviation",
-                    "type":"string"
+                  "abbr": {
+                    "title": "Abbreviation",
+                    "type": "string"
                   },
-                  "affiliation":{
-                    "title":"Affiliation",
-                    "type":"string"
+                  "affiliation": {
+                    "title": "Affiliation",
+                    "type": "string"
                   },
-                  "uri":{
-                    "title":"URI",
-                    "type":"string"
+                  "uri": {
+                    "title": "URI",
+                    "type": "string"
                   }
                 },
-                "required":[
+                "required": [
                   "name"
                 ]
               }
             },
-            "contact":{
-              "type":"array",
-              "title":"Contact",
-              "description":"Contact",
-              "_ddi_xpath":"stdyDscr/citation/distStmt/contact",
-              "items":{
-                "type":"object",
-                "properties":{
-                  "name":{
-                    "title":"Name",
-                    "type":"string"
+            "contact": {
+              "type": "array",
+              "title": "Contact",
+              "description": "Contact",
+              "_ddi_xpath": "stdyDscr/citation/distStmt/contact",
+              "items": {
+                "type": "object",
+                "properties": {
+                  "name": {
+                    "title": "Name",
+                    "type": "string"
                   },
-                  "affiliation":{
-                    "title":"Affiliation",
-                    "type":"string"
+                  "affiliation": {
+                    "title": "Affiliation",
+                    "type": "string"
                   },
-                  "email":{
-                    "title":"Email",
-                    "type":"string"
+                  "email": {
+                    "title": "Email",
+                    "type": "string"
                   },
-                  "uri":{
-                    "title":"URI",
-                    "type":"string"
+                  "uri": {
+                    "title": "URI",
+                    "type": "string"
                   }
                 }
               },
-              "required":[
+              "required": [
                 "name"
               ]
             },
-            "depositor":{
-              "type":"array",
-              "title":"Depositor",
-              "description":"Depositor",
-              "_ddi_xpath":"stdyDscr/citation/distStmt/depositr",
-              "items":{
-                "type":"object",
-                "properties":{
-                  "name":{
-                    "title":"Name",
-                    "type":"string"
+            "depositor": {
+              "type": "array",
+              "title": "Depositor",
+              "description": "Depositor",
+              "_ddi_xpath": "stdyDscr/citation/distStmt/depositr",
+              "items": {
+                "type": "object",
+                "properties": {
+                  "name": {
+                    "title": "Name",
+                    "type": "string"
                   },
-                  "abbr":{
-                    "title":"Abbreviation",
-                    "type":"string"
+                  "abbr": {
+                    "title": "Abbreviation",
+                    "type": "string"
                   },
-                  "affiliation":{
-                    "title":"Affiliation",
-                    "type":"string"
+                  "affiliation": {
+                    "title": "Affiliation",
+                    "type": "string"
                   },
-                  "uri":{
-                    "title":"URI",
-                    "type":"string"
+                  "uri": {
+                    "title": "URI",
+                    "type": "string"
                   }
                 }
               },
-              "required":[
+              "required": [
                 "name"
               ]
             },
-            "deposit_date":{
-              "title":"Date of Deposit",
-              "type":"string",
-              "_ddi_xpath":"stdyDscr/citation/distStmt/depDate"
+            "deposit_date": {
+              "title": "Date of Deposit",
+              "type": "string",
+              "_ddi_xpath": "stdyDscr/citation/distStmt/depDate"
             },
-            "distribution_date":{
-              "title":"Date of Distribution",
-              "type":"string",
-              "_ddi_xpath":"stdyDscr/citation/distStmt/distDate"
+            "distribution_date": {
+              "title": "Date of Distribution",
+              "type": "string",
+              "_ddi_xpath": "stdyDscr/citation/distStmt/distDate"
             }
           }
         },
-        "series_statement":{
-          "type":"object",
-          "title":"Series Statement",
-          "description":"Series Statement",
-          "_ddi_xpath":"stdyDscr/citation/serStmt",
-          "properties":{
-            "series_name":{
-              "title":"Series Name",
-              "description":"The name of the series to which the work belongs.",
-              "type":"string",
-              "_ddi_xpath":"stdyDscr/citation/serStmt/serName"
+        "series_statement": {
+          "type": "object",
+          "title": "Series Statement",
+          "description": "Series Statement",
+          "_ddi_xpath": "stdyDscr/citation/serStmt",
+          "properties": {
+            "series_name": {
+              "title": "Series Name",
+              "description": "The name of the series to which the work belongs.",
+              "type": "string",
+              "_ddi_xpath": "stdyDscr/citation/serStmt/serName"
             },
-            "series_info":{
-              "title":"Series Information",
-              "description":"A survey may be repeated at regular intervals (such as an annual labour force survey), or be part of an international survey program (such as the MICS, CWIQ, DHS, LSMS and others). The Series information is a description of this `collection` of surveys. A brief description of the characteristics of the survey, including when it started, how many rounds were already implemented, and who is in charge would be provided here.",
-              "type":"string",
-              "_ddi_xpath":"stdyDscr/citation/serStmt/serInfo"
+            "series_info": {
+              "title": "Series Information",
+              "description": "A survey may be repeated at regular intervals (such as an annual labour force survey), or be part of an international survey program (such as the MICS, CWIQ, DHS, LSMS and others). The Series information is a description of this `collection` of surveys. A brief description of the characteristics of the survey, including when it started, how many rounds were already implemented, and who is in charge would be provided here.",
+              "type": "string",
+              "_ddi_xpath": "stdyDscr/citation/serStmt/serInfo"
             }
           }
         },
-        "version_statement":{
-          "type":"object",
-          "title":"Version Statement",
-          "description":"Version Statement",
-          "_ddi_xpath":"stdyDscr/citation/verStmt",
-          "properties":{
-            "version":{
-              "title":"Version",
-              "type":"string",
-              "_ddi_xpath":"stdyDscr/citation/verStmt/version"
+        "version_statement": {
+          "type": "object",
+          "title": "Version Statement",
+          "description": "Version Statement",
+          "_ddi_xpath": "stdyDscr/citation/verStmt",
+          "properties": {
+            "version": {
+              "title": "Version",
+              "type": "string",
+              "_ddi_xpath": "stdyDscr/citation/verStmt/version"
             },
-            "version_date":{
-              "title":"Version Date",
-              "type":"string",
-              "_ddi_xpath":"stdyDscr/citation/verStmt/version/@date"
+            "version_date": {
+              "title": "Version Date",
+              "type": "string",
+              "_ddi_xpath": "stdyDscr/citation/verStmt/version/@date"
             },
-            "version_resp":{
-              "title":"Version Responsibility Statement",
-              "description":"The organization or person responsible for the version of the work",
-              "type":"string",
-              "_ddi_xpath":"stdyDscr/citation/verStmt/verResp"
+            "version_resp": {
+              "title": "Version Responsibility Statement",
+              "description": "The organization or person responsible for the version of the work",
+              "type": "string",
+              "_ddi_xpath": "stdyDscr/citation/verStmt/verResp"
             },
-            "version_notes":{
-              "title":"Version Notes",
-              "type":"string",
-              "_ddi_xpath":"stdyDscr/citation/verStmt/notes"
+            "version_notes": {
+              "title": "Version Notes",
+              "type": "string",
+              "_ddi_xpath": "stdyDscr/citation/verStmt/notes"
             }
           }
         },
-        "bib_citation":{
-          "type":"string",
-          "title":"Bibliographic Citation",
-          "description":"Complete bibliographic reference containing all of the standard elements of a citation that can be used to cite the work. The `'bib_citation_format'` field is provided to enable specification of the particular citation style used, e.g., APA, MLA, Chicago, etc.",
-          "_ddi_xpath":"stdyDscr/citation/biblCit"
+        "bib_citation": {
+          "type": "string",
+          "title": "Bibliographic Citation",
+          "description": "Complete bibliographic reference containing all of the standard elements of a citation that can be used to cite the work. The `'bib_citation_format'` field is provided to enable specification of the particular citation style used, e.g., APA, MLA, Chicago, etc.",
+          "_ddi_xpath": "stdyDscr/citation/biblCit"
         },
-        "bib_citation_format":{
-          "type":"string",
-          "title":"Bibliographic Citation Format",
-          "description":"Specification of the particular citation style used, e.g., `APA`, `MLA`, `Chicago`, etc.",
-          "_ddi_xpath":"stdyDscr/citation/biblCit/@format"
+        "bib_citation_format": {
+          "type": "string",
+          "title": "Bibliographic Citation Format",
+          "description": "Specification of the particular citation style used, e.g., `APA`, `MLA`, `Chicago`, etc.",
+          "_ddi_xpath": "stdyDscr/citation/biblCit/@format"
         },
-        "holdings":{
-          "type":"array",
-          "title":"Holdings Information",
-          "description":"Information concerning either the physical or electronic holdings of the cited work. Attributes include: location--The physical location where a copy is held; callno--The call number for a work at the location specified; and URI--A URN or URL for accessing the electronic copy of the cited work.",
-          "_ddi_xpath":"stdyDscr/citation/holdings",
-          "items":{
-            "type":"object",
-            "properties":{
-              "name":{
-                "title":"Name",
-                "type":"string"
+        "holdings": {
+          "type": "array",
+          "title": "Holdings Information",
+          "description": "Information concerning either the physical or electronic holdings of the cited work. Attributes include: location--The physical location where a copy is held; callno--The call number for a work at the location specified; and URI--A URN or URL for accessing the electronic copy of the cited work.",
+          "_ddi_xpath": "stdyDscr/citation/holdings",
+          "items": {
+            "type": "object",
+            "properties": {
+              "name": {
+                "title": "Name",
+                "type": "string"
               },
-              "location":{
-                "title":"Location",
-                "type":"string"
+              "location": {
+                "title": "Location",
+                "type": "string"
               },
-              "callno":{
-                "title":"Callno",
-                "type":"string"
+              "callno": {
+                "title": "Callno",
+                "type": "string"
               },
-              "uri":{
-                "title":"URI",
-                "type":"string"
+              "uri": {
+                "title": "URI",
+                "type": "string"
               }
             }
           },
-          "required":[
+          "required": [
             "name"
           ]
         },
-        "study_notes":{
-          "title":"Study notes",
-          "type":"string",
-          "_ddi_xpath":"stdyDscr/citation/notes"
+        "study_notes": {
+          "title": "Study notes",
+          "type": "string",
+          "_ddi_xpath": "stdyDscr/citation/notes"
         },
-        "study_authorization":{
-          "type":"object",
-          "title":"Study Authorization",
-          "_ddi_xpath":"stdyDscr/studyAuthorization",
-          "description":"Provides structured information on the agency that authorized the study, the date of authorization, and an authorization statement",
-          "properties":{
-            "date":{
-              "title":"Authorization Date",
-              "type":"string",
-              "_ddi_xpath":"stdyDscr/studyAuthorization/@date"
+        "study_authorization": {
+          "type": "object",
+          "title": "Study Authorization",
+          "_ddi_xpath": "stdyDscr/studyAuthorization",
+          "description": "Provides structured information on the agency that authorized the study, the date of authorization, and an authorization statement",
+          "properties": {
+            "date": {
+              "title": "Authorization Date",
+              "type": "string",
+              "_ddi_xpath": "stdyDscr/studyAuthorization/@date"
             },
-            "agency":{
-              "type":"array",
-              "title":"Authorizing Agency",
-              "description":"The source(s) of funds for production of the work. If different funding agencies sponsored different stages of the production process, use the 'role' attribute to distinguish them.",
-              "_ddi_xpath":"stdyDscr/studyAuthorization/authorizingAgency",
-              "items":{
-                "type":"object",
-                "properties":{
-                  "name":{
-                    "title":"Funding Agency/Sponsor",
-                    "type":"string"
+            "agency": {
+              "type": "array",
+              "title": "Authorizing Agency",
+              "description": "The source(s) of funds for production of the work. If different funding agencies sponsored different stages of the production process, use the 'role' attribute to distinguish them.",
+              "_ddi_xpath": "stdyDscr/studyAuthorization/authorizingAgency",
+              "items": {
+                "type": "object",
+                "properties": {
+                  "name": {
+                    "title": "Funding Agency/Sponsor",
+                    "type": "string"
                   },
-                  "affiliation":{
-                    "title":"Affiliation",
-                    "type":"string"
+                  "affiliation": {
+                    "title": "Affiliation",
+                    "type": "string"
                   },
-                  "abbr":{
-                    "title":"Abbreviation",
-                    "type":"string"
+                  "abbr": {
+                    "title": "Abbreviation",
+                    "type": "string"
                   }
                 },
-                "required":[
+                "required": [
                   "name"
                 ]
               }
             },
-            "authorization_statement":{
-              "title":"Authorization Statement",
-              "description":"Authorization Statement",
-              "_ddi_xpath":"stdyDscr/studyAuthorization/authorizationStatement",
-              "type":"string"
+            "authorization_statement": {
+              "title": "Authorization Statement",
+              "description": "Authorization Statement",
+              "_ddi_xpath": "stdyDscr/studyAuthorization/authorizationStatement",
+              "type": "string"
             }
           }
         },
-        "study_info":{
-          "type":"object",
-          "title":"Study Scope",
-          "description":"This section contains information about the data collection's scope across several dimensions, including substantive content, geography, and time.",
-          "_ddi_xpath":"stdyDscr/stdyInfo",
-          "properties":{
-            "study_budget":{
-              "title":"Study Budget",
-              "description":"Provide a clear summary of the pDescribe the budget of the project in as much detail as needed. Use XHTML structure elements to identify discrete pieces of information in a way that facilitates direct transfer of information on the study budget between DDI 2 and DDI 3 structures.urposes, objectives and content of the survey",
-              "type":"string",
-              "_ddi_xpath":"stdyDscr/stdyInfo/studyBudget"
+        "study_info": {
+          "type": "object",
+          "title": "Study Scope",
+          "description": "This section contains information about the data collection's scope across several dimensions, including substantive content, geography, and time.",
+          "_ddi_xpath": "stdyDscr/stdyInfo",
+          "properties": {
+            "study_budget": {
+              "title": "Study Budget",
+              "description": "Provide a clear summary of the pDescribe the budget of the project in as much detail as needed. Use XHTML structure elements to identify discrete pieces of information in a way that facilitates direct transfer of information on the study budget between DDI 2 and DDI 3 structures.urposes, objectives and content of the survey",
+              "type": "string",
+              "_ddi_xpath": "stdyDscr/stdyInfo/studyBudget"
             },
-            "keywords":{
-              "type":"array",
-              "description":"Keywords",
-              "_ddi_xpath":"stdyDscr/stdyInfo/subject/keywords",
-              "items":{
-                "type":"object",
-                "properties":{
-                  "keyword":{
-                    "title":"Keyword",
-                    "type":"string"
+            "keywords": {
+              "type": "array",
+              "description": "Keywords",
+              "_ddi_xpath": "stdyDscr/stdyInfo/subject/keywords",
+              "items": {
+                "type": "object",
+                "properties": {
+                  "keyword": {
+                    "title": "Keyword",
+                    "type": "string"
                   },
-                  "vocab":{
-                    "title":"Vocabulary",
-                    "type":"string"
+                  "vocab": {
+                    "title": "Vocabulary",
+                    "type": "string"
                   },
-                  "uri":{
-                    "title":"uri",
-                    "type":"string"
-                  }                  
+                  "uri": {
+                    "title": "uri",
+                    "type": "string"
+                  }
                 }
               }
             },
-            "topics":{
-              "type":"array",
-              "title":"Topic Classification",
-              "description":"Topic Classification",
-              "_ddi_xpath":"stdyDscr/stdyInfo/subject/topcClas",
-              "items":{
-                "type":"object",
-                "properties":{
-                  "topic":{
-                    "title":"Topic",
-                    "type":"string"
+            "topics": {
+              "type": "array",
+              "title": "Topic Classification",
+              "description": "Topic Classification",
+              "_ddi_xpath": "stdyDscr/stdyInfo/subject/topcClas",
+              "items": {
+                "type": "object",
+                "properties": {
+                  "topic": {
+                    "title": "Topic",
+                    "type": "string"
                   },
-                  "vocab":{
-                    "title":"Vocab",
-                    "type":"string"
+                  "vocab": {
+                    "title": "Vocab",
+                    "type": "string"
                   },
-                  "uri":{
-                    "title":"URI",
-                    "type":"string"
+                  "uri": {
+                    "title": "URI",
+                    "type": "string"
                   }
                 },
-                "required":[
+                "required": [
                   "topic"
                 ]
               }
             },
-            "abstract":{
-              "title":"Abstract",
-              "description":"Provide a clear summary of the purposes, objectives and content of the survey",
-              "type":"string",
-              "_ddi_xpath":"stdyDscr/stdyInfo/abstract"
+            "abstract": {
+              "title": "Abstract",
+              "description": "Provide a clear summary of the purposes, objectives and content of the survey",
+              "type": "string",
+              "_ddi_xpath": "stdyDscr/stdyInfo/abstract"
             },
-            "time_periods":{
-              "type":"array",
-              "title":"Time periods (YYYY/MM/DD)",
-              "description":"This field will usually be left empty. Time period differs from the dates of collection as they represent the period for which the data collected are applicable or relevant.",
-              "_ddi_xpath":"stdyDscr/stdyInfo/sumDscr/timePrd",
-              "items":{
-                "type":"object",
-                "properties":{
-                  "start":{
-                    "title":"Start date",
-                    "description":"Start date",
-                    "type":"string"
+            "time_periods": {
+              "type": "array",
+              "title": "Time periods (YYYY/MM/DD)",
+              "description": "This field will usually be left empty. Time period differs from the dates of collection as they represent the period for which the data collected are applicable or relevant.",
+              "_ddi_xpath": "stdyDscr/stdyInfo/sumDscr/timePrd",
+              "items": {
+                "type": "object",
+                "properties": {
+                  "start": {
+                    "title": "Start date",
+                    "description": "Start date",
+                    "type": "string"
                   },
-                  "end":{
-                    "title":"End date",
-                    "description":"End date",
-                    "type":"string"
+                  "end": {
+                    "title": "End date",
+                    "description": "End date",
+                    "type": "string"
                   },
-                  "cycle":{
-                    "title":"Cycle",
-                    "description":"Cycle",
-                    "type":"string"
+                  "cycle": {
+                    "title": "Cycle",
+                    "description": "Cycle",
+                    "type": "string"
                   }
                 },
-                "required":[
+                "required": [
                   "start"
                 ]
               }
             },
-            "coll_dates":{
-              "type":"array",
-              "title":"Dates of Data Collection (YYYY/MM/DD)",
-              "description":"Enter the dates (at least month and year) of the start and end of the data collection. In some cases, data collection for a same survey can be conducted in waves. In such case, you should enter the start and end date of each wave separately, and identify each wave in the 'cycle' field.",
-              "_ddi_xpath":"stdyDscr/stdyInfo/sumDscr/collDate",
-              "items":{
-                "type":"object",
-                "properties":{
-                  "start":{
-                    "title":"Start date",
-                    "description":"Start date",
-                    "type":"string"
+            "coll_dates": {
+              "type": "array",
+              "title": "Dates of Data Collection (YYYY/MM/DD)",
+              "description": "Enter the dates (at least month and year) of the start and end of the data collection. In some cases, data collection for a same survey can be conducted in waves. In such case, you should enter the start and end date of each wave separately, and identify each wave in the 'cycle' field.",
+              "_ddi_xpath": "stdyDscr/stdyInfo/sumDscr/collDate",
+              "items": {
+                "type": "object",
+                "properties": {
+                  "start": {
+                    "title": "Start date",
+                    "description": "Start date",
+                    "type": "string"
                   },
-                  "end":{
-                    "title":"End date",
-                    "description":"End date",
-                    "type":"string"
+                  "end": {
+                    "title": "End date",
+                    "description": "End date",
+                    "type": "string"
                   },
-                  "cycle":{
-                    "title":"Cycle",
-                    "description":"Cycle",
-                    "type":"string"
+                  "cycle": {
+                    "title": "Cycle",
+                    "description": "Cycle",
+                    "type": "string"
                   }
                 },
-                "required":[
+                "required": [
                   "start"
                 ]
               }
             },
-            "nation":{
-              "title":"Country",
-              "description":"Indicates the country or countries covered in the file. Field `abbreviation` may be used to list common abbreviations; use of ISO country codes is recommended. Maps to Dublin Core Coverage element. Inclusion of this element is recommended.",
-              "_ddi_xpath":"stdyDscr/stdyInfo/sumDscr/nation",
-              "type":"array",
-              "items":{
-                "type":"object",
-                "properties":{
-                  "name":{
-                    "title":"Name",
-                    "description":"Country name",
-                    "type":"string"
+            "nation": {
+              "title": "Country",
+              "description": "Indicates the country or countries covered in the file. Field `abbreviation` may be used to list common abbreviations; use of ISO country codes is recommended. Maps to Dublin Core Coverage element. Inclusion of this element is recommended.",
+              "_ddi_xpath": "stdyDscr/stdyInfo/sumDscr/nation",
+              "type": "array",
+              "items": {
+                "type": "object",
+                "properties": {
+                  "name": {
+                    "title": "Name",
+                    "description": "Country name",
+                    "type": "string"
                   },
-                  "abbreviation":{
-                    "title":"Country code",
-                    "description":"Country ISO code",
-                    "type":"string"
+                  "abbreviation": {
+                    "title": "Country code",
+                    "description": "Country ISO code",
+                    "type": "string"
                   }
                 },
-                "required":[
+                "required": [
                   "name"
                 ]
               }
             },
-            "bbox":{
-              "title":"Geographic bounding box",
-              "type":"array",
-              "_ddi_xpath":"stdyDscr/sumDscr/geoBndBox",
-              "items":{
-                "type":"object",
-                "properties":{
-                  "west":{
-                    "title":"West",
-                    "type":"string"
+            "bbox": {
+              "title": "Geographic bounding box",
+              "type": "array",
+              "_ddi_xpath": "stdyDscr/sumDscr/geoBndBox",
+              "items": {
+                "type": "object",
+                "properties": {
+                  "west": {
+                    "title": "West",
+                    "type": "string"
                   },
-                  "east":{
-                    "title":"East",
-                    "type":"string"
+                  "east": {
+                    "title": "East",
+                    "type": "string"
                   },
-                  "south":{
-                    "title":"South",
-                    "type":"string"
+                  "south": {
+                    "title": "South",
+                    "type": "string"
                   },
-                  "north":{
-                    "title":"North",
-                    "type":"string"
+                  "north": {
+                    "title": "North",
+                    "type": "string"
                   }
                 }
               }
             },
-            "bound_poly":{
-              "title":"Geographic Bounding Polygon",
-              "description":"This field allows the creation of multiple polygons to describe in a more detailed manner the geographic area covered by the dataset. It should only be used to define the outer boundaries of a covered area. For example, in the United States, such polygons can be created to define boundaries for Hawaii, Alaska, and the continental United States, but not interior boundaries for the contiguous states. This field is used to refine a coordinate-based search, not to actually map an area. \nIf the boundPoly element is used, then geoBndBox MUST be present, and all points enclosed by the boundPoly MUST be contained within the geoBndBox. Elements westBL, eastBL, southBL, and northBL of the geoBndBox should each be represented in at least one point of the boundPoly description.",
-              "type":"array",
-              "_ddi_xpath":"stdyDscr/sumDscr/boundPoly",
-              "items":{
-                "type":"object",
-                "properties":{
-                  "lat":{
-                    "title":"Latitude",
-                    "description":"Latitude (y coordinate) of a point. Valid range expressed in decimal degrees is as follows: -90,0 to 90,0 degrees (latitude)",
-                    "type":"string"
+            "bound_poly": {
+              "title": "Geographic Bounding Polygon",
+              "description": "This field allows the creation of multiple polygons to describe in a more detailed manner the geographic area covered by the dataset. It should only be used to define the outer boundaries of a covered area. For example, in the United States, such polygons can be created to define boundaries for Hawaii, Alaska, and the continental United States, but not interior boundaries for the contiguous states. This field is used to refine a coordinate-based search, not to actually map an area. \nIf the boundPoly element is used, then geoBndBox MUST be present, and all points enclosed by the boundPoly MUST be contained within the geoBndBox. Elements westBL, eastBL, southBL, and northBL of the geoBndBox should each be represented in at least one point of the boundPoly description.",
+              "type": "array",
+              "_ddi_xpath": "stdyDscr/sumDscr/boundPoly",
+              "items": {
+                "type": "object",
+                "properties": {
+                  "lat": {
+                    "title": "Latitude",
+                    "description": "Latitude (y coordinate) of a point. Valid range expressed in decimal degrees is as follows: -90,0 to 90,0 degrees (latitude)",
+                    "type": "string"
                   },
-                  "lon":{
-                    "title":"longitude",
-                    "description":"Longitude (x coordinate) of a point. Valid range expressed in decimal degrees is as follows: -180,0 to 180,0 degrees (longitude)",
-                    "type":"string"
+                  "lon": {
+                    "title": "longitude",
+                    "description": "Longitude (x coordinate) of a point. Valid range expressed in decimal degrees is as follows: -180,0 to 180,0 degrees (longitude)",
+                    "type": "string"
                   }
                 }
               }
             },
-            "geog_coverage":{
-              "description":" Information on the geographic coverage of the data. Includes the total geographic scope of the data, and any additional levels of geographic coding provided in the variables. Maps to Dublin Core Coverage element. Inclusion of this element in the codebook is recommended.",
-              "title":"Geographic Coverage",
-              "type":"string",
-              "_ddi_xpath":"stdyDscr/stdyInfo/sumDscr/geogCover"
+            "geog_coverage": {
+              "description": " Information on the geographic coverage of the data. Includes the total geographic scope of the data, and any additional levels of geographic coding provided in the variables. Maps to Dublin Core Coverage element. Inclusion of this element in the codebook is recommended.",
+              "title": "Geographic Coverage",
+              "type": "string",
+              "_ddi_xpath": "stdyDscr/stdyInfo/sumDscr/geogCover"
             },
-            "geog_coverage_notes":{
-              "description":"Geographic coverage notes",
-              "title":"Geographic Coverage notes",
-              "type":"string",
-              "_ddi_xpath":"stdyDscr/sumDscr/geogCover/txt"
+            "geog_coverage_notes": {
+              "description": "Geographic coverage notes",
+              "title": "Geographic Coverage notes",
+              "type": "string",
+              "_ddi_xpath": "stdyDscr/sumDscr/geogCover/txt"
             },
-            "geog_unit":{
-              "title":"Geographic Unit",
-              "description":"Lowest level of geographic aggregation covered by the data",
-              "type":"string",
-              "_ddi_xpath":"stdyDscr/stdyInfo/sumDscr/geogUnit"
+            "geog_unit": {
+              "title": "Geographic Unit",
+              "description": "Lowest level of geographic aggregation covered by the data",
+              "type": "string",
+              "_ddi_xpath": "stdyDscr/stdyInfo/sumDscr/geogUnit"
             },
-            "analysis_unit":{
-              "title":"Unit of Analysis",
-              "description":"Basic unit(s) of analysis or observation that the study describes: individuals, families/households, groups, facilities, institutions/organizations, administrative units, physical locations, etc.",
-              "type":"string",
-              "_ddi_xpath":"stdyDscr/stdyInfo/sumDscr/anlyUnit"
+            "analysis_unit": {
+              "title": "Unit of Analysis",
+              "description": "Basic unit(s) of analysis or observation that the study describes: individuals, families/households, groups, facilities, institutions/organizations, administrative units, physical locations, etc.",
+              "type": "string",
+              "_ddi_xpath": "stdyDscr/stdyInfo/sumDscr/anlyUnit"
             },
-            "universe":{
-              "title":"Universe",
-              "description":"We are interested here in the survey universe (not the universe of particular sections of the questionnaires or variables), i.e. in the identification of the population of interest in the survey. The universe will rarely be the entire population of the country. Sample household surveys, for example, usually do not cover homeless, nomads, diplomats, community households. Some surveys may cover only the population of a particular age group, or only male (or female), etc.",
-              "type":"string",
-              "_ddi_xpath":"stdyDscr/stdyInfo/sumDscr/universe"
+            "universe": {
+              "title": "Universe",
+              "description": "We are interested here in the survey universe (not the universe of particular sections of the questionnaires or variables), i.e. in the identification of the population of interest in the survey. The universe will rarely be the entire population of the country. Sample household surveys, for example, usually do not cover homeless, nomads, diplomats, community households. Some surveys may cover only the population of a particular age group, or only male (or female), etc.",
+              "type": "string",
+              "_ddi_xpath": "stdyDscr/stdyInfo/sumDscr/universe"
             },
-            "data_kind":{
-              "title":"Kind of Data",
-              "description":"Broad classification of the data",
-              "type":"string",
-              "_ddi_xpath":"stdyDscr/stdyInfo/sumDscr/dataKind",
-              "enum_":[
+            "data_kind": {
+              "title": "Kind of Data",
+              "description": "Broad classification of the data",
+              "type": "string",
+              "_ddi_xpath": "stdyDscr/stdyInfo/sumDscr/dataKind",
+              "enum_": [
                 "Sample survey data[ssd]",
                 "Census/enumeration data[cen]",
                 "Administrative records data[adm]",
@@ -785,383 +784,408 @@
                 "Observation data/ratings[obs]"
               ]
             },
-            "notes":{
-              "title":"Study notes",
-              "description":"Study notes",
-              "type":"string",
-              "_ddi_xpath":"stdyDscr/stdyInfo/notes"
+            "notes": {
+              "title": "Study notes",
+              "description": "Study notes",
+              "type": "string",
+              "_ddi_xpath": "stdyDscr/stdyInfo/notes"
             },
-            "quality_statement":{
-              "title":"Quality Statement",
-              "description":"This structure consists of two parts, standardsCompliance and otherQualityStatements. In standardsCompliance list all specific standards complied with during the execution of this study. Note the standard name and producer and how the study complied with the standard. Enter any additional quality statements in otherQualityStatements.",
-              "type":"object",
-              "_ddi_xpath":"stdyDscr/stdyInfo/qualityStatement",
-              "_comments":"TODO: not clear if this should be repeatable.",
-              "properties":{
-                "standard_name":{
-                  "title":"Standard name",
-                  "type":"string",
-                  "_ddi_xpath":"stdyDscr/stdyInfo/qualityStatement/standardsCompliance/standard/standardName"
-                },
-                "standard_producer":{
-                  "title":"Standard producer",
-                  "type":"string",
-                  "_ddi_xpath":"stdyDscr/stdyInfo/qualityStatement/standardsCompliance/standard/producer"
+            "quality_statement": {
+              "title": "Quality Statement",
+              "description": "The quality statement provides elements to describe compliance with quality standards in the form of a statement and an itemized list of standards complied with, and an element to provide other quality statement.",
+              "type": "object",
+              "_ddi_xpath": "stdyDscr/stdyInfo/qualityStatement",
+              "_comments": "TODO: not clear if this should be repeatable.",
+              "properties": {
+                "compliance_description": {
+                  "title": "Standard compliance description",
+                  "type": "string",
+                  "_ddi_xpath": "stdyDscr/stdyInfo/qualityStatement/standardsCompliance/complianceDescription"
                 },
-                "standard_compliance_desc":{
-                  "title":"Standard compliance description",
-                  "type":"string",
-                  "_ddi_xpath":"stdyDscr/stdyInfo/qualityStatement/standardsCompliance/complianceDescription"
+                "standards": {
+                  "type": "array",
+                  "title": "Standards",
+                  "description": "Standards",
+                  "_ddi_xpath": "stdyDscr/stdyInfo/qualityStatement/standardsCompliance/standard",
+                  "items": {
+                    "type": "object",
+                    "properties": {
+                      "name": {
+                        "title": "Name",
+                        "type": "string"
+                      },
+                      "producer": {
+                        "title": "Producer",
+                        "type": "string"
+                      }
+                    }
+                  },
+                  "required": [
+                    "name"
+                  ]
                 },
-                "other_quality_statement":{
-                  "title":"Other quality statement",
-                  "type":"string",
-                  "_ddi_xpath":"stdyDscr/stdyInfo/qualityStatement/otherQualityStatement"
+                "other_quality_statement": {
+                  "title": "Other quality statement",
+                  "type": "string",
+                  "_ddi_xpath": "stdyDscr/stdyInfo/qualityStatement/otherQualityStatement"
                 }
               }
-            },            
-            "ex_post_evaluation":{
-              "title":"Ex-Post Evaluation",
-              "description":"This structure consists of two parts, standardsCompliance and otherQualityStatements. In standardsCompliance list all specific standards complied with during the execution of this study. Note the standard name and producer and how the study complied with the standard. Enter any additional quality statements in otherQualityStatements.",
-              "type":"object",
-              "_ddi_xpath":"stdyDscr/stdyInfo/exPostEvaluation",
-              "_comments":"TODO: not clear if this should be repeatable.",
-              "properties":{
-                "completion_date":{
-                  "title":"Evaluation completion date",
-                  "type":"string",
-                  "_ddi_xpath":"stdyDscr/stdyInfo/exPostEvaluation/@completionDate"
+            },
+            "ex_post_evaluation": {
+              "title": "Ex-Post Evaluation",
+              "description": "This structure consists of two parts, standardsCompliance and otherQualityStatements. In standardsCompliance list all specific standards complied with during the execution of this study. Note the standard name and producer and how the study complied with the standard. Enter any additional quality statements in otherQualityStatements.",
+              "type": "object",
+              "_ddi_xpath": "stdyDscr/stdyInfo/exPostEvaluation",
+              "_comments": "TODO: not clear if this should be repeatable.",
+              "properties": {
+                "completion_date": {
+                  "title": "Evaluation completion date",
+                  "type": "string",
+                  "_ddi_xpath": "stdyDscr/stdyInfo/exPostEvaluation/@completionDate"
                 },
-                "type":{
-                  "title":"Evaluation type",
-                  "type":"string",
-                  "_ddi_xpath":"stdyDscr/stdyInfo/@type"
+                "type": {
+                  "title": "Evaluation type",
+                  "type": "string",
+                  "_ddi_xpath": "stdyDscr/stdyInfo/@type"
                 },
-                "evaluator":{
-                  "type":"array",
-                  "title":"Evaluators",
-                  "description":"Evaluators",
-                  "_ddi_xpath":"stdyDscr/stdyInfo/exPostEvaluation/evaluator",
-                  "items":{
-                    "type":"object",
-                    "properties":{
-                      "name":{
-                        "title":"Funding Agency/Sponsor",
-                        "type":"string"
+                "evaluator": {
+                  "type": "array",
+                  "title": "Evaluators",
+                  "description": "Evaluators",
+                  "_ddi_xpath": "stdyDscr/stdyInfo/exPostEvaluation/evaluator",
+                  "items": {
+                    "type": "object",
+                    "properties": {
+                      "name": {
+                        "title": "Funding Agency/Sponsor",
+                        "type": "string"
+                      },
+                      "affiliation": {
+                        "title": "Affiliation",
+                        "type": "string"
                       },
-                      "affiliation":{
-                        "title":"Affiliation",
-                        "type":"string"
+                      "abbr": {
+                        "title": "Abbreviation",
+                        "type": "string"
                       },
-                      "abbr":{
-                        "title":"Abbreviation",
-                        "type":"string"
-                      },                      
-                      "role":{
-                        "title":"Role",
-                        "type":"string"
+                      "role": {
+                        "title": "Role",
+                        "type": "string"
                       }
                     },
-                    "required":[
+                    "required": [
                       "name"
                     ]
                   }
                 },
-                "evaluation_process":{
-                  "title":"Evaluation process",
-                  "type":"string",
-                  "_ddi_xpath":"stdyDscr/stdyInfo/exPostEvaluation/evaluationProcess"
+                "evaluation_process": {
+                  "title": "Evaluation process",
+                  "type": "string",
+                  "_ddi_xpath": "stdyDscr/stdyInfo/exPostEvaluation/evaluationProcess"
                 },
-                "outcomes":{
-                  "title":"Outcomes",
-                  "type":"string",
-                  "_ddi_xpath":"stdyDscr/stdyInfo/exPostEvaluation/outcomes"
+                "outcomes": {
+                  "title": "Outcomes",
+                  "type": "string",
+                  "_ddi_xpath": "stdyDscr/stdyInfo/exPostEvaluation/outcomes"
                 }
               }
             }
           },
-          "required":[
+          "required": [
             "nation"
           ]
         },
-        "study_development":{
-          "title":"Study Development",
-          "description":"Describe the process of study development as a series of development activities. These activities can be typed using a controlled vocabulary. Describe the activity, listing participants with their role and affiliation, resources used (sources of information), and the outcome of the development activity.",
-          "type":"object",
-          "_ddi_xpath":"stdyDscr/studyDevelopment",
-          "properties":{
-            "activity_type":{
-              "title":"Development activity type",
-              "type":"string",
-              "_ddi_xpath":"stdyDscr/studyDevelopment/developmentActivity/@type"
-            },
-            "activity_description":{
-              "title":"Development activity description",
-              "type":"string",
-              "_ddi_xpath":"stdyDscr/studyDevelopment/developmentActivity/description"
-            },
-            "participants":{
-              "type":"array",
-              "title":"Participants",
-              "description":"Participants",
-              "_ddi_xpath":"stdyDscr/studyDevelopment/developmentActivity/participant",
-              "items":{
-                "type":"object",
-                "properties":{
-                  "name":{
-                    "title":"Participant name",
-                    "type":"string"
+        "study_development": {
+          "title": "Study Development",
+          "description": "Describe the process of study development as a series of development activities. These activities can be typed using a controlled vocabulary. Describe the activity, listing participants with their role and affiliation, resources used (sources of information), and the outcome of the development activity.",
+          "type": "object",
+          "_ddi_xpath": "stdyDscr/studyDevelopment",
+          "properties": {
+            "development_activity": {
+              "type": "array",
+              "title": "Development activity",
+              "_ddi_xpath": "stdyDscr/studyDevelopment/developmentActivity",
+              "items": {
+                "type": "object",
+                "properties": {
+                  "activity_type": {
+                    "title": "Development activity type",
+                    "type": "string",
+                    "_ddi_xpath": "stdyDscr/studyDevelopment/developmentActivity/@type"
                   },
-                  "affiliation":{
-                    "title":"Affiliation",
-                    "type":"string"
+                  "activity_description": {
+                    "title": "Development activity description",
+                    "type": "string",
+                    "_ddi_xpath": "stdyDscr/studyDevelopment/developmentActivity/description"
                   },
-                  "role":{
-                    "title":"Role",
-                    "type":"string"
-                  }
-                },
-                "required":[
-                  "name"
-                ]
-              }
-            },
-            "resource":{
-              "type":"object",
-              "title":"Development activity resource",
-              "description":"Development activity resource",
-              "_ddi_xpath":"stdyDscr/studyDevelopment/developmentActivity/resource",
-              "properties":{
-                "data_source":{
-                  "title":"Data source",
-                  "_ddi_xpath":"stdyDscr/studyDevelopment/developmentActivity/resource/dataSrc",
-                  "type":"array",
-                  "items":{
-                    "type":"object",
-                    "properties":{
-                      "source":{
-                        "title":"Source",
-                        "type":"string"
-                      }
+                  "participants": {
+                    "type": "array",
+                    "title": "Participants",
+                    "description": "Participants",
+                    "_ddi_xpath": "stdyDscr/studyDevelopment/developmentActivity/participant",
+                    "items": {
+                      "type": "object",
+                      "properties": {
+                        "name": {
+                          "title": "Participant name",
+                          "type": "string"
+                        },
+                        "affiliation": {
+                          "title": "Affiliation",
+                          "type": "string"
+                        },
+                        "role": {
+                          "title": "Role",
+                          "type": "string"
+                        }
+                      },
+                      "required": [
+                        "name"
+                      ]
                     }
+                  },
+                  "resources": {
+                    "type": "array",
+                    "title": "Development activity resources",
+                    "description": "Development activity resources",
+                    "_ddi_xpath": "stdyDscr/studyDevelopment/developmentActivity/resource",
+                    "items":{
+                      "type":"object",
+                      "properties":{
+                        "name": {
+                          "type": "string",
+                          "title": "Resource name",
+                          "description": "Name of the resource"
+                        },
+                        "origin": {
+                          "type": "string",
+                          "title": "Origin of resource",
+                          "description": "For historical materials, information about the origin(s) of the sources and the rules followed in establishing the sources should be specified. May not be relevant to survey data. ",
+                          "_ddi_xpath": "stdyDscr/studyDevelopment/developmentActivity/resource/srcOrig"
+                        },
+                        "characteristics": {
+                          "type": "string",
+                          "title": "Characteristics of resource",
+                          "description": "Assessment of characteristics and quality of source material. May not be relevant to survey data.",
+                          "_ddi_xpath": "stdyDscr/studyDevelopment/developmentActivity/resource/srcChar"
+                        }
+                      }
+                    }                    
+                  },
+                  "outcome": {
+                    "title": "Development Activity Outcome",
+                    "description": "Development Activity Outcome",
+                    "type": "string",
+                    "_ddi_xpath": "stdyDscr/studyDevelopment/developmentActivity/outcome"
                   }
-                },
-                "source_origin":{
-                  "type":"string",
-                  "title":"Origin of Source",
-                  "description":"For historical materials, information about the origin(s) of the sources and the rules followed in establishing the sources should be specified. May not be relevant to survey data. ",
-                  "_ddi_xpath":"stdyDscr/studyDevelopment/developmentActivity/resource/srcOrig"
-                },
-                "source_char":{
-                  "type":"string",
-                  "title":"Characteristics of Source Noted",
-                  "description":"Assessment of characteristics and quality of source material. May not be relevant to survey data.",
-                  "_ddi_xpath":"stdyDscr/studyDevelopment/developmentActivity/resource/srcChar"
                 }
               }
-            },
-            "outcome":{
-              "title":"Development Activity Outcome",
-              "description":"Development Activity Outcome",
-              "type":"string",
-              "_ddi_xpath":"stdyDscr/studyDevelopment/developmentActivity/outcome"
             }
           }
         },
-        "method":{
-          "type":"object",
-          "title":"Methodology and Processing",
-          "description":"Methodology and processing",
-          "_ddi_xpath":"stdyDscr/method",
-          "properties":{
-            "data_collection":{
-              "type":"object",
-              "title":"Data Collection",
-              "_ddi_xpath":"stdyDscr/method/dataColl",
-              "description":"Information about the methodology employed in a data collection",
-              "properties":{
-                "time_method":{
-                  "title":"Time Method",
-                  "description":"The time method or time dimension of the data collection. Examples: `panel survey`, `h>cross-section`, `trend study`, `time-series`",
-                  "type":"string",
-                  "_ddi_xpath":"stdyDscr/method/dataColl/timeMeth"
+        "method": {
+          "type": "object",
+          "title": "Methodology and Processing",
+          "description": "Methodology and processing",
+          "_ddi_xpath": "stdyDscr/method",
+          "properties": {
+            "data_collection": {
+              "type": "object",
+              "title": "Data Collection",
+              "_ddi_xpath": "stdyDscr/method/dataColl",
+              "description": "Information about the methodology employed in a data collection",
+              "properties": {
+                "time_method": {
+                  "title": "Time Method",
+                  "description": "The time method or time dimension of the data collection. Examples: `panel survey`, `h>cross-section`, `trend study`, `time-series`",
+                  "type": "string",
+                  "_ddi_xpath": "stdyDscr/method/dataColl/timeMeth"
                 },
-                "data_collectors":{
-                  "title":"Data Collectors",
-                  "description":"The persons and/or agencies that took charge of the data collection. This element includes 3 fields: Name, Abbreviation and the Affiliation. In most cases, we will record here the name of the agency, not the name of interviewers. Only in the case of very small-scale surveys, with a very limited number of interviewers, the name of person will be included as well. The field Affiliation is optional and not relevant in all cases.",
-                  "_ddi_xpath":"stdyDscr/method/dataColl/dataCollector",
-                  "type":"array",
-                  "items":{
-                    "type":"object",
-                    "properties":{
-                      "name":{
-                        "title":"Name",
-                        "type":"string"
+                "data_collectors": {
+                  "title": "Data Collectors",
+                  "description": "The persons and/or agencies that took charge of the data collection. This element includes 3 fields: Name, Abbreviation and the Affiliation. In most cases, we will record here the name of the agency, not the name of interviewers. Only in the case of very small-scale surveys, with a very limited number of interviewers, the name of person will be included as well. The field Affiliation is optional and not relevant in all cases.",
+                  "_ddi_xpath": "stdyDscr/method/dataColl/dataCollector",
+                  "type": "array",
+                  "items": {
+                    "type": "object",
+                    "properties": {
+                      "name": {
+                        "title": "Name",
+                        "type": "string"
                       },
-                      "affiliation":{
-                        "title":"Affiliation",
-                        "type":"string"
+                      "affiliation": {
+                        "title": "Affiliation",
+                        "type": "string"
                       },
-                      "abbr":{
-                        "title":"Abbreviation",
-                        "type":"string"
-                      },                      
-                      "role":{
-                        "title":"Role",
-                        "type":"string"
+                      "abbr": {
+                        "title": "Abbreviation",
+                        "type": "string"
+                      },
+                      "role": {
+                        "title": "Role",
+                        "type": "string"
                       }
                     }
                   }
                 },
-                "collector_training":{
-                  "title":"Collector training",
-                  "description":"Describes the training provided to data collectors including interviewer training, process testing, compliance with standards etc. This is repeatable for language and to capture different aspects of the training process. The type attribute allows specification of the type of training being described.",
-                  "type":"object",
-                  "properties":{
-                    "type":{
-                      "title":"Training type",
-                      "description":"The percentage of sample members who provided information",
-                      "type":"string",
-                      "_ddi_xpath":"stdyDscr/method/dataColl/collectorTraining/@type"
-                    },
-                    "training":{
-                      "title":"Training",
-                      "description":"Training provided to data collectors",
-                      "type":"string",
-                      "_ddi_xpath":"stdyDscr/method/dataColl/collectorTraining"
+                "collector_training": {
+                  "title": "Collector training",
+                  "description": "Describes the training provided to data collectors including interviewer training, process testing, compliance with standards etc. This is repeatable for language and to capture different aspects of the training process. The type attribute allows specification of the type of training being described.",
+                  "type": "array",
+                  "items":{
+                    "type":"object",
+                    "properties": {
+                      "type": {
+                        "title": "Training type",
+                        "description": "The percentage of sample members who provided information",
+                        "type": "string",
+                        "_ddi_xpath": "stdyDscr/method/dataColl/collectorTraining/@type"
+                      },
+                      "training": {
+                        "title": "Training",
+                        "description": "Training provided to data collectors",
+                        "type": "string",
+                        "_ddi_xpath": "stdyDscr/method/dataColl/collectorTraining"
+                      }
                     }
                   }
                 },
-                "frequency":{
-                  "title":"Frequency of Data Collection",
-                  "description":"For data collected at more than one point in time, the frequency with which the data were collected. Examples `monthly`, `quarterly`, `yearly`",
-                  "type":"string",
-                  "_ddi_xpath":"stdyDscr/method/dataColl/frequenc"
+                "frequency": {
+                  "title": "Frequency of Data Collection",
+                  "description": "For data collected at more than one point in time, the frequency with which the data were collected. Examples `monthly`, `quarterly`, `yearly`",
+                  "type": "string",
+                  "_ddi_xpath": "stdyDscr/method/dataColl/frequenc"
                 },
-                "sampling_procedure":{
-                  "title":"Sampling Procedure",
-                  "description":"The type of sample and sample design used to select the survey respondents to represent the population. \nThis field only applies to sample surveys. Information on sampling procedure is crucial (although not applicable for censuses and administrative datasets). Examples `National multistage area probability sample`, `Simple random sample`, `Quota sample`",
-                  "type":"string",
-                  "_ddi_xpath":"stdyDscr/method/dataColl/sampProc"
+                "sampling_procedure": {
+                  "title": "Sampling Procedure",
+                  "description": "The type of sample and sample design used to select the survey respondents to represent the population. \nThis field only applies to sample surveys. Information on sampling procedure is crucial (although not applicable for censuses and administrative datasets). Examples `National multistage area probability sample`, `Simple random sample`, `Quota sample`",
+                  "type": "string",
+                  "_ddi_xpath": "stdyDscr/method/dataColl/sampProc"
                 },
-                "sample_frame":{
-                  "title":"Sample Frame",
-                  "description":"Sample frame describes the sampling frame used for identifying the population from which the sample was taken. For example, a telephone book may be a sample frame for a phone survey. In addition to the name, label and text describing the sample frame, this structure lists who maintains the sample frame, the period for which it is valid, a use statement, the universe covered, the type of unit contained in the frame as well as the number of units available, the reference period of the frame and procedures used to update the frame.",
-                  "type":"object",
-                  "_ddi_xpath":"stdyDscr/method/dataColl/sampleFrame",
-                  "properties":{
-                    "name":{
-                      "title":"Sample frame name",
-                      "description":"Sample frame name",
-                      "type":"string",
-                      "_ddi_xpath":"stdyDscr/method/dataColl/sampleFrame/sampleFrameName"
+                "sample_frame": {
+                  "title": "Sample Frame",
+                  "description": "Sample frame describes the sampling frame used for identifying the population from which the sample was taken. For example, a telephone book may be a sample frame for a phone survey. In addition to the name, label and text describing the sample frame, this structure lists who maintains the sample frame, the period for which it is valid, a use statement, the universe covered, the type of unit contained in the frame as well as the number of units available, the reference period of the frame and procedures used to update the frame.",
+                  "type": "object",
+                  "_ddi_xpath": "stdyDscr/method/dataColl/sampleFrame",
+                  "properties": {
+                    "name": {
+                      "title": "Sample frame name",
+                      "description": "Sample frame name",
+                      "type": "string",
+                      "_ddi_xpath": "stdyDscr/method/dataColl/sampleFrame/sampleFrameName"
                     },
-                    "valid_period":{
-                      "type":"array",
-                      "title":"Valid periods (YYYY/MM/DD)",
-                      "description":"Defines a time period for the validity of the sampling frame. Enter dates in YYYY-MM-DD format.",
-                      "_ddi_xpath":"stdyDscr/method/dataColl/sampleFrame/validPeriod",
-                      "items":{
-                        "type":"object",
-                        "properties":{
-                          "event":{
-                            "title":"Event",
-                            "description":"Event e.g. start, end",
-                            "type":"string"
+                    "valid_period": {
+                      "type": "array",
+                      "title": "Valid periods (YYYY/MM/DD)",
+                      "description": "Defines a time period for the validity of the sampling frame. Enter dates in YYYY-MM-DD format.",
+                      "_ddi_xpath": "stdyDscr/method/dataColl/sampleFrame/validPeriod",
+                      "items": {
+                        "type": "object",
+                        "properties": {
+                          "event": {
+                            "title": "Event",
+                            "description": "Event e.g. start, end",
+                            "type": "string"
                           },
-                          "date":{
-                            "title":"Date",
-                            "description":"Date",
-                            "type":"string"
+                          "date": {
+                            "title": "Date",
+                            "description": "Date",
+                            "type": "string"
                           }
                         },
-                        "required":[
+                        "required": [
                           "date"
                         ]
                       }
                     },
-                    "custodian":{
-                      "title":"Custodian",
-                      "description":"Custodian identifies the agency or individual who is responsible for creating or maintaining the sample frame.",
-                      "type":"string",
-                      "_ddi_xpath":"stdyDscr/method/dataColl/sampleFrame/custodian"
+                    "custodian": {
+                      "title": "Custodian",
+                      "description": "Custodian identifies the agency or individual who is responsible for creating or maintaining the sample frame.",
+                      "type": "string",
+                      "_ddi_xpath": "stdyDscr/method/dataColl/sampleFrame/custodian"
                     },
-                    "universe":{
-                      "title":"Universe",
-                      "description":"The group of persons or other elements that are the object of research and to which any analytic results refer.",
-                      "type":"string",
-                      "_ddi_xpath":"stdyDscr/method/dataColl/sampleFrame/universe"
+                    "universe": {
+                      "title": "Universe",
+                      "description": "The group of persons or other elements that are the object of research and to which any analytic results refer.",
+                      "type": "string",
+                      "_ddi_xpath": "stdyDscr/method/dataColl/sampleFrame/universe"
                     },
-                    "frame_unit":{
-                      "type":"object",
-                      "title":"Frame unit",
-                      "_ddi_xpath":"stdyDscr/method/dataColl/sampleFrame/frameUnit",
-                      "description":"Provides information about the sampling frame unit. The attribute `isPrimary` is boolean, indicating whether the unit is primary or not.",
-                      "properties":{
-                        "is_primary":{
-                          "title":"Is Primary",
-                          "description":"Is a primary unit?",
-                          "type":["boolean","string"],
-                          "_ddi_xpath":"stdyDscr/method/dataColl/sampleFrame/frameUnit/@isPrimary"
+                    "frame_unit": {
+                      "type": "object",
+                      "title": "Frame unit",
+                      "_ddi_xpath": "stdyDscr/method/dataColl/sampleFrame/frameUnit",
+                      "description": "Provides information about the sampling frame unit. The attribute `isPrimary` is boolean, indicating whether the unit is primary or not.",
+                      "properties": {
+                        "is_primary": {
+                          "title": "Is Primary",
+                          "description": "Is a primary unit?",
+                          "type": [
+                            "boolean",
+                            "string"
+                          ],
+                          "_ddi_xpath": "stdyDscr/method/dataColl/sampleFrame/frameUnit/@isPrimary"
                         },
-                        "unit_type":{
-                          "title":"Unit Type",
-                          "description":"Describes the type of sampling frame unit. The field `num_of_units` provides the number of units in the sampling frame.",
-                          "type":"string",
-                          "_ddi_xpath":"stdyDscr/method/dataColl/sampleFrame/frameUnit/unitType"
+                        "unit_type": {
+                          "title": "Unit Type",
+                          "description": "Describes the type of sampling frame unit. The field `num_of_units` provides the number of units in the sampling frame.",
+                          "type": "string",
+                          "_ddi_xpath": "stdyDscr/method/dataColl/sampleFrame/frameUnit/unitType"
                         },
-                        "num_of_units":{
-                          "title":"Number of units",
-                          "description":"Number of units in the sampling frame",
-                          "type":"string",
-                          "_ddi_xpath":"stdyDscr/method/dataColl/sampleFrame/frameUnit/@numberOfUnits"
+                        "num_of_units": {
+                          "title": "Number of units",
+                          "description": "Number of units in the sampling frame",
+                          "type": "string",
+                          "_ddi_xpath": "stdyDscr/method/dataColl/sampleFrame/frameUnit/@numberOfUnits"
                         }
                       }
                     },
-                    "reference_period":{
-                      "type":"array",
-                      "title":"Reference periods (YYYY/MM/DD)",
-                      "description":"Indicates the period of time in which the sampling frame was actually used for the study in question. Use ISO 8601 date/time formats to enter the relevant date(s).",
-                      "_ddi_xpath":"stdyDscr/method/dataColl/sampleFrame/referencePeriod",
-                      "items":{
-                        "type":"object",
-                        "properties":{
-                          "event":{
-                            "title":"Event",
-                            "description":"Event e.g. start, end",
-                            "type":"string"
+                    "reference_period": {
+                      "type": "array",
+                      "title": "Reference periods (YYYY/MM/DD)",
+                      "description": "Indicates the period of time in which the sampling frame was actually used for the study in question. Use ISO 8601 date/time formats to enter the relevant date(s).",
+                      "_ddi_xpath": "stdyDscr/method/dataColl/sampleFrame/referencePeriod",
+                      "items": {
+                        "type": "object",
+                        "properties": {
+                          "event": {
+                            "title": "Event",
+                            "description": "Event e.g. start, end",
+                            "type": "string"
                           },
-                          "date":{
-                            "title":"Date",
-                            "description":"Date",
-                            "type":"string"
+                          "date": {
+                            "title": "Date",
+                            "description": "Date",
+                            "type": "string"
                           }
                         },
-                        "required":[
+                        "required": [
                           "date"
                         ]
                       }
                     },
-                    "update_procedure":{
-                      "title":"Update procedure",
-                      "description":"Description of how and with what frequency the sample frame is updated.",
-                      "type":"string",
-                      "_ddi_xpath":"stdyDscr/method/dataColl/sampleFrame/updateProcedure"
+                    "update_procedure": {
+                      "title": "Update procedure",
+                      "description": "Description of how and with what frequency the sample frame is updated.",
+                      "type": "string",
+                      "_ddi_xpath": "stdyDscr/method/dataColl/sampleFrame/updateProcedure"
                     }
                   }
                 },
-                "sampling_deviation":{
-                  "title":"Deviations from the Sample Design",
-                  "description":"This field only applies to sample surveys.\nSometimes the reality of the field requires a deviation from the sampling design (for example due to difficulty to access to zones due to weather problems, political instability, etc). If for any reason, the sample design has deviated, this should be reported here. ",
-                  "type":"string",
-                  "_ddi_xpath":"stdyDscr/method/dataColl/deviat"
+                "sampling_deviation": {
+                  "title": "Deviations from the Sample Design",
+                  "description": "This field only applies to sample surveys.\nSometimes the reality of the field requires a deviation from the sampling design (for example due to difficulty to access to zones due to weather problems, political instability, etc). If for any reason, the sample design has deviated, this should be reported here. ",
+                  "type": "string",
+                  "_ddi_xpath": "stdyDscr/method/dataColl/deviat"
                 },
-                "coll_mode":{
-                  "title":"Mode of data collection",
-                  "type":["string","array"],
-                  "description":"The mode of data collection is the manner in which the interview was conducted or information was gathered.  In most cases, the response will be 'face to face interview'. But for some specific kinds of datasets, such as for example data on rain fall, the response will be different.",
-                  "_ddi_xpath":"stdyDscr/method/dataColl/collMode",
-                  "enum_":[
+                "coll_mode": {
+                  "title": "Mode of data collection",
+                  "type": [
+                    "string",
+                    "array"
+                  ],
+                  "description": "The mode of data collection is the manner in which the interview was conducted or information was gathered.  In most cases, the response will be 'face to face interview'. But for some specific kinds of datasets, such as for example data on rain fall, the response will be different.",
+                  "_ddi_xpath": "stdyDscr/method/dataColl/collMode",
+                  "enum_": [
                     "Computer Assisted Personal Interview[capi]",
                     "Computer Assisted Telephone Interview[cati]",
                     "Face-to-Face[f2f]",
@@ -1173,463 +1197,452 @@
                     "type": "string"
                   }
                 },
-                "research_instrument":{
-                  "title":"Type of Research Instrument",
-                  "description":"The type of data collection instrument used. \n`Structured` indicates an instrument in which all respondents are asked the same questions/tests, possibly with precoded answers. If a small portion of such a questionnaire includes open-ended questions, provide appropriate comments. \n`Semi-structured` indicates that the research instrument contains mainly open-ended questions. \n`Unstructured` indicates that in-depth interviews were conducted.",
-                  "type":"string",
-                  "_ddi_xpath":"stdyDscr/method/dataColl/resInstru"
+                "research_instrument": {
+                  "title": "Type of Research Instrument",
+                  "description": "The type of data collection instrument used. \n`Structured` indicates an instrument in which all respondents are asked the same questions/tests, possibly with precoded answers. If a small portion of such a questionnaire includes open-ended questions, provide appropriate comments. \n`Semi-structured` indicates that the research instrument contains mainly open-ended questions. \n`Unstructured` indicates that in-depth interviews were conducted.",
+                  "type": "string",
+                  "_ddi_xpath": "stdyDscr/method/dataColl/resInstru"
                 },
-                "instru_development":{
-                  "title":"Instrument development",
-                  "description":"Describe any development work on the data collection instrument. Type attribute allows for the optional use of a defined development type with or without use of a controlled vocabulary.",
-                  "type":"string",
-                  "_ddi_xpath":"stdyDscr/method/dataColl/instrumentDevelopment"
+                "instru_development": {
+                  "title": "Instrument development",
+                  "description": "Describe any development work on the data collection instrument. Type attribute allows for the optional use of a defined development type with or without use of a controlled vocabulary.",
+                  "type": "string",
+                  "_ddi_xpath": "stdyDscr/method/dataColl/instrumentDevelopment"
                 },
-                "instru_development_type":{
-                  "title":"Instrument development type",
-                  "description":"Instrument development type",
-                  "type":"string",
-                  "_ddi_xpath":"stdyDscr/method/dataColl/instrumentDevelopment/@type"
+                "instru_development_type": {
+                  "title": "Instrument development type",
+                  "description": "Instrument development type",
+                  "type": "string",
+                  "_ddi_xpath": "stdyDscr/method/dataColl/instrumentDevelopment/@type"
                 },
-                "sources":{
-                  "type":"object",
-                  "title":"Sources",
-                  "description":"Description of sources used for the data collection. The element is nestable so that the sources statement might encompass a series of discrete source statements, each of which could contain the facts about an individual source. This element maps to Dublin Core Source element.",
-                  "_ddi_xpath":"stdyDscr/method/dataColl/sources",
-                  "properties":{
-                    "data_source":{
-                      "title":"Data source",
-                      "_ddi_xpath":"stdyDscr/studyDevelopment/developmentActivity/resource/dataSrc",
-                      "type":"array",
-                      "items":{
-                        "type":"object",
-                        "properties":{
-                          "source":{
-                            "title":"Source",
-                            "type":"string"
-                          }
-                        }
-                      }
-                    },
-                    "source_origin":{
-                      "type":"string",
-                      "title":"Origin of Source",
-                      "description":"For historical materials, information about the origin(s) of the sources and the rules followed in establishing the sources should be specified. May not be relevant to survey data. ",
-                      "_ddi_xpath":"stdyDscr/method/dataColl/sources/srcOrig"
+                "sources": {
+                  "type": "array",
+                  "title": "Sources",
+                  "description": "Description of sources used for the data collection. The element is nestable so that the sources statement might encompass a series of discrete source statements, each of which could contain the facts about an individual source. This element maps to Dublin Core Source element.",
+                  "_ddi_xpath": "stdyDscr/method/dataColl/sources",
+                  "items":{
+                    "type":"object",
+                  "properties": {
+                    "name": {
+                      "type": "string",
+                      "title": "Source name",
+                      "description": "Name of the source"
                     },
-                    "source_char":{
-                      "type":"string",
-                      "title":"Characteristics of Source Noted",
-                      "description":"Assessment of characteristics and quality of source material. May not be relevant to survey data.",
-                      "_ddi_xpath":"stdyDscr/method/dataColl/sources/srcChar"
+                    "origin": {
+                      "type": "string",
+                      "title": "Origin of Source",
+                      "description": "For historical materials, information about the origin(s) of the sources and the rules followed in establishing the sources should be specified. May not be relevant to survey data. ",
+                      "_ddi_xpath": "stdyDscr/method/dataColl/sources/srcOrig"
                     },
-                    "source_doc":{
-                      "type":"string",
-                      "title":"Source documentation",
-                      "description":"Documentation and Access to Sources",
-                      "_ddi_xpath":"stdyDscr/method/dataColl/sources/srcDocu"
-                    }
+                    "characteristics": {
+                      "type": "string",
+                      "title": "Characteristics of Source Noted",
+                      "description": "Assessment of characteristics and quality of source material. May not be relevant to survey data.",
+                      "_ddi_xpath": "stdyDscr/method/dataColl/sources/srcChar"
+                    }                    
                   }
+                }
                 },
-                "coll_situation":{
-                  "title":"Characteristics of Data Collection Situation - Notes on data collection",
-                  "__comment":"used for notes on data collection",
-                  "description":"Description of noteworthy aspects of the data collection situation. Includes information on factors such as cooperativeness of respondents, duration of interviews, number of call-backs, etc.",
-                  "type":"string",
-                  "_ddi_xpath":"stdyDscr/method/dataColl/collSitu"
+                "coll_situation": {
+                  "title": "Characteristics of Data Collection Situation - Notes on data collection",
+                  "__comment": "used for notes on data collection",
+                  "description": "Description of noteworthy aspects of the data collection situation. Includes information on factors such as cooperativeness of respondents, duration of interviews, number of call-backs, etc.",
+                  "type": "string",
+                  "_ddi_xpath": "stdyDscr/method/dataColl/collSitu"
                 },
-                "act_min":{
-                  "title":"Supervision",
-                  "description":"Summary of actions taken to minimize data loss. Includes information on actions such as follow-up visits, supervisory checks, historical matching, estimation, etc.",
-                  "type":"string",
-                  "_ddi_xpath":"stdyDscr/method/dataColl/actMin"
+                "act_min": {
+                  "title": "Supervision",
+                  "description": "Summary of actions taken to minimize data loss. Includes information on actions such as follow-up visits, supervisory checks, historical matching, estimation, etc.",
+                  "type": "string",
+                  "_ddi_xpath": "stdyDscr/method/dataColl/actMin"
                 },
-                "control_operations":{
-                  "title":"Control Operations",
-                  "description":" Methods to facilitate data control performed by the primary investigator or by the data archive. Specify any special programs used for such operations.",
-                  "type":"string",
-                  "_ddi_xpath":"stdyDscr/method/dataColl/ConOps"
+                "control_operations": {
+                  "title": "Control Operations",
+                  "description": " Methods to facilitate data control performed by the primary investigator or by the data archive. Specify any special programs used for such operations.",
+                  "type": "string",
+                  "_ddi_xpath": "stdyDscr/method/dataColl/ConOps"
                 },
-                "weight":{
-                  "title":"Weighting",
-                  "description":"The use of sampling procedures may make it necessary to apply weights to produce accurate statistical results. Describe here the criteria for using weights in analysis of a collection. If a weighting formula or coefficient was developed, provide this formula, define its elements, and indicate how the formula is applied to data.",
-                  "type":"string",
-                  "_ddi_xpath":"stdyDscr/method/dataColl/weight"
+                "weight": {
+                  "title": "Weighting",
+                  "description": "The use of sampling procedures may make it necessary to apply weights to produce accurate statistical results. Describe here the criteria for using weights in analysis of a collection. If a weighting formula or coefficient was developed, provide this formula, define its elements, and indicate how the formula is applied to data.",
+                  "type": "string",
+                  "_ddi_xpath": "stdyDscr/method/dataColl/weight"
                 },
-                "cleaning_operations":{
-                  "title":"Cleaning Operations",
-                  "description":"Methods used to `clean` the data collection, e.g., consistency checking, wildcode checking, etc.",
-                  "type":"string",
-                  "_ddi_xpath":"stdyDscr/method/dataColl/cleanOps"
+                "cleaning_operations": {
+                  "title": "Cleaning Operations",
+                  "description": "Methods used to `clean` the data collection, e.g., consistency checking, wildcode checking, etc.",
+                  "type": "string",
+                  "_ddi_xpath": "stdyDscr/method/dataColl/cleanOps"
                 }
               }
             },
-            "method_notes":{
-              "title":"Methodology notes",
-              "description":"Methodology notes",
-              "type":"string",
-              "_ddi_xpath":"stdyDscr/method/notes"
+            "method_notes": {
+              "title": "Methodology notes",
+              "description": "Methodology notes",
+              "type": "string",
+              "_ddi_xpath": "stdyDscr/method/notes"
             },
-            "analysis_info":{
-              "type":"object",
-              "title":"Data Appraisal",
-              "_ddi_xpath":"stdyDscr/method/anlyInfo",
-              "description":"Information about Data Appraisal",
-              "properties":{
-                "response_rate":{
-                  "title":"Response Rate",
-                  "description":"The percentage of sample members who provided information",
-                  "type":"string",
-                  "_ddi_xpath":"stdyDscr/method/anlyInfo/respRate"
+            "analysis_info": {
+              "type": "object",
+              "title": "Data Appraisal",
+              "_ddi_xpath": "stdyDscr/method/anlyInfo",
+              "description": "Information about Data Appraisal",
+              "properties": {
+                "response_rate": {
+                  "title": "Response Rate",
+                  "description": "The percentage of sample members who provided information",
+                  "type": "string",
+                  "_ddi_xpath": "stdyDscr/method/anlyInfo/respRate"
                 },
-                "sampling_error_estimates":{
-                  "title":"Estimates of Sampling Error",
-                  "description":"Measure of how precisely one can estimate a population value from a given sample",
-                  "type":"string",
-                  "_ddi_xpath":"stdyDscr/method/anlyInfo/EstSmpErr"
+                "sampling_error_estimates": {
+                  "title": "Estimates of Sampling Error",
+                  "description": "Measure of how precisely one can estimate a population value from a given sample",
+                  "type": "string",
+                  "_ddi_xpath": "stdyDscr/method/anlyInfo/EstSmpErr"
                 },
-                "data_appraisal":{
-                  "title":"Data Appraisal",
-                  "description":"Other issues pertaining to data appraisal. Describe here issues such as response variance, nonresponse rate and testing for bias, interviewer and response bias, confidence levels, question bias, etc.",
-                  "type":"string",
-                  "_ddi_xpath":"stdyDscr/method/anlyInfo/dataAppr"
+                "data_appraisal": {
+                  "title": "Data Appraisal",
+                  "description": "Other issues pertaining to data appraisal. Describe here issues such as response variance, nonresponse rate and testing for bias, interviewer and response bias, confidence levels, question bias, etc.",
+                  "type": "string",
+                  "_ddi_xpath": "stdyDscr/method/anlyInfo/dataAppr"
                 }
               }
             },
-            "study_class":{
-              "title":"Class of the Study",
-              "description":"Generally used to give the data archive's class or study status number, which indicates the processing status of the study. May also be used as a text field to describe processing status. Example: `DDA Class C`, `Study is available from http://example.com` ",
-              "type":["string","array"],
-              "_ddi_xpath":"stdyDscr/method/stdyClas"
+            "study_class": {
+              "title": "Class of the Study",
+              "description": "Generally used to give the data archive's class or study status number, which indicates the processing status of the study. May also be used as a text field to describe processing status. Example: `DDA Class C`, `Study is available from http://example.com` ",
+              "type": [
+                "string",
+                "array"
+              ],
+              "_ddi_xpath": "stdyDscr/method/stdyClas"
             },
-
-            "data_processing":{
-              "type":"array",
-              "title":"Data Processing",
-              "description":"Describes various data processing procedures not captured elsewhere in the documentation, such as topcoding, recoding, suppression, tabulation, etc. The `type` attribute supports better classification of this activity, including the optional use of a controlled vocabulary",
-              "_ddi_xpath":"stdyDscr/method/dataProcessing",
-              "items":{
-                "type":"object",
-                "properties":{
-                  "data_processing":{
-                    "title":"Data processing",                    
-                    "type":"string"
+            "data_processing": {
+              "type": "array",
+              "title": "Data Processing",
+              "description": "Describes various data processing procedures not captured elsewhere in the documentation, such as topcoding, recoding, suppression, tabulation, etc. The `type` attribute supports better classification of this activity, including the optional use of a controlled vocabulary",
+              "_ddi_xpath": "stdyDscr/method/dataProcessing",
+              "items": {
+                "type": "object",
+                "properties": {
+                  "data_processing": {
+                    "title": "Data processing",
+                    "type": "string"
                   },
-                  "source":{
-                    "title":"Source",
-                    "type":"string"
+                  "source": {
+                    "title": "Source",
+                    "type": "string"
                   },
-                  "type":{
-                    "title":"Data processing type",
-                    "type":"string"
+                  "type": {
+                    "title": "Data processing type",
+                    "type": "string"
                   }
                 },
-                "required":[
+                "required": [
                   "data_processing"
                 ]
               }
             },
-                        
-            "coding_instructions":{
-              "type":"array",
-              "title":"Coding Instructions",
-              "_ddi_xpath":"stdyDscr/method/codingInstructions",
-              "description":"Describe specific coding instructions used in data processing, cleaning, assession, or tabulation.",
-              "items":{
-                "type":"object",
-                  "properties":{
-                    "related_processes":{
-                      "title":"Related processes",
-                      "type":"string",
-                      "_ddi_xpath":"stdyDscr/method/codingInstructions/@relatedProcesses"
-                    },
-                    "type":{
-                      "title":"Coding instructions type",
-                      "type":"string",
-                      "_ddi_xpath":"stdyDscr/method/codingInstructions/@type"
-                    },
-                    "txt":{
-                      "title":"Coding instructions text",
-                      "type":"string",
-                      "_ddi_xpath":"stdyDscr/method/codingInstructions/txt"
-                    },
-                    "command":{
-                      "title":"Command",
-                      "description":"Provide command code for the coding instruction. The formalLanguage attribute identifies the language of the command code.",
-                      "type":"string",
-                      "_ddi_xpath":"stdyDscr/method/codingInstructions/command"
-                    },
-                    "command_language":{
-                      "title":"Language of the command code",
-                      "description":"Identifies the language of the command code. e.g. `SPSS`, `R`, `STATA` ",
-                      "type":"string",
-                      "_ddi_xpath":"stdyDscr/method/codingInstructions/command/@formalLanguage"
-                    }
+            "coding_instructions": {
+              "type": "array",
+              "title": "Coding Instructions",
+              "_ddi_xpath": "stdyDscr/method/codingInstructions",
+              "description": "Describe specific coding instructions used in data processing, cleaning, assession, or tabulation.",
+              "items": {
+                "type": "object",
+                "properties": {
+                  "related_processes": {
+                    "title": "Related processes",
+                    "type": "string",
+                    "_ddi_xpath": "stdyDscr/method/codingInstructions/@relatedProcesses"
+                  },
+                  "type": {
+                    "title": "Coding instructions type",
+                    "type": "string",
+                    "_ddi_xpath": "stdyDscr/method/codingInstructions/@type"
+                  },
+                  "txt": {
+                    "title": "Coding instructions text",
+                    "type": "string",
+                    "_ddi_xpath": "stdyDscr/method/codingInstructions/txt"
+                  },
+                  "command": {
+                    "title": "Command",
+                    "description": "Provide command code for the coding instruction. The formalLanguage attribute identifies the language of the command code.",
+                    "type": "string",
+                    "_ddi_xpath": "stdyDscr/method/codingInstructions/command"
+                  },
+                  "command_language": {
+                    "title": "Language of the command code",
+                    "description": "Identifies the language of the command code. e.g. `SPSS`, `R`, `STATA` ",
+                    "type": "string",
+                    "_ddi_xpath": "stdyDscr/method/codingInstructions/command/@formalLanguage"
                   }
+                }
               }
             }
           }
         },
-        "data_access":{
-          "type":"object",
-          "description":"Data Access",
-          "_ddi_xpath":"stdyDscr/dataAccs/setAvail/dataAccs",
-          "properties":{
-            "dataset_availability":{
-              "type":"object",
-              "title":"Data Set Availability",
-              "description":"Information on availability and storage of the collection",
-              "properties":{
-                "access_place":{
-                  "title":"Location of Data Collection",
-                  "description":"Location where the data collection is currently stored. Use the URL field `access_place_url` to provide a URN or URL for the storage site or the actual address from which the data may be downloaded",
-                  "type":"string",
-                  "_ddi_xpath":"stdyDscr/dataAccs/setAvail/accsPlac"
+        "data_access": {
+          "type": "object",
+          "description": "Data Access",
+          "_ddi_xpath": "stdyDscr/dataAccs/setAvail/dataAccs",
+          "properties": {
+            "dataset_availability": {
+              "type": "object",
+              "title": "Data Set Availability",
+              "description": "Information on availability and storage of the collection",
+              "properties": {
+                "access_place": {
+                  "title": "Location of Data Collection",
+                  "description": "Location where the data collection is currently stored. Use the URL field `access_place_url` to provide a URN or URL for the storage site or the actual address from which the data may be downloaded",
+                  "type": "string",
+                  "_ddi_xpath": "stdyDscr/dataAccs/setAvail/accsPlac"
                 },
-                "access_place_url":{
-                  "title":"URL for Location of Data Collection",
-                  "description":"Location where the data collection is currently stored. Provide a URN or URL for the storage site or the actual address from which the data may be downloaded",
-                  "type":"string",
-                  "_ddi_xpath":"stdyDscr/dataAccs/setAvail/accsPlac/@URI"
+                "access_place_url": {
+                  "title": "URL for Location of Data Collection",
+                  "description": "Location where the data collection is currently stored. Provide a URN or URL for the storage site or the actual address from which the data may be downloaded",
+                  "type": "string",
+                  "_ddi_xpath": "stdyDscr/dataAccs/setAvail/accsPlac/@URI"
                 },
-                "original_archive":{
-                  "title":"Archive where study is originally stored",
-                  "description":"Archive from which the data collection was obtained; the originating archive",
-                  "type":"string",
-                  "_ddi_xpath":"stdyDscr/dataAccs/setAvail/origArch"
+                "original_archive": {
+                  "title": "Archive where study is originally stored",
+                  "description": "Archive from which the data collection was obtained; the originating archive",
+                  "type": "string",
+                  "_ddi_xpath": "stdyDscr/dataAccs/setAvail/origArch"
                 },
-                "status":{
-                  "title":"Availability Status",
-                  "description":"Statement of collection availability. An archive may need to indicate that a collection is unavailable because it is embargoed for a period of time, because it has been superseded, because a new edition is imminent, etc.",
-                  "type":"string",
-                  "_ddi_xpath":"stdyDscr/dataAccs/setAvail/avlStatus"
+                "status": {
+                  "title": "Availability Status",
+                  "description": "Statement of collection availability. An archive may need to indicate that a collection is unavailable because it is embargoed for a period of time, because it has been superseded, because a new edition is imminent, etc.",
+                  "type": "string",
+                  "_ddi_xpath": "stdyDscr/dataAccs/setAvail/avlStatus"
                 },
-                "coll_size":{
-                  "title":"Extent of Collection",
-                  "description":"Summarizes the number of physical files that exist in a collection, recording the number of files that contain data and noting whether the collection contains machine-readable documentation and/or other supplementary files and information such as data dictionaries, data definition statements, or data collection instruments.",
-                  "type":"string",
-                  "_ddi_xpath":"stdyDscr/dataAccs/setAvail/collSize"
+                "coll_size": {
+                  "title": "Extent of Collection",
+                  "description": "Summarizes the number of physical files that exist in a collection, recording the number of files that contain data and noting whether the collection contains machine-readable documentation and/or other supplementary files and information such as data dictionaries, data definition statements, or data collection instruments.",
+                  "type": "string",
+                  "_ddi_xpath": "stdyDscr/dataAccs/setAvail/collSize"
                 },
-                "complete":{
-                  "title":"Completeness of Study Stored",
-                  "description":"This item indicates the relationship of the data collected to the amount of data coded and stored in the data collection. Information as to why certain items of collected information were not included in the data file stored by the archive should be provided",
-                  "type":"string",
-                  "_ddi_xpath":"stdyDscr/dataAccs/setAvail/complete"
+                "complete": {
+                  "title": "Completeness of Study Stored",
+                  "description": "This item indicates the relationship of the data collected to the amount of data coded and stored in the data collection. Information as to why certain items of collected information were not included in the data file stored by the archive should be provided",
+                  "type": "string",
+                  "_ddi_xpath": "stdyDscr/dataAccs/setAvail/complete"
                 },
-                "file_quantity":{
-                  "title":"Number of Files",
-                  "description":"Total number of physical files associated with a collection",
-                  "type":"string",
-                  "_ddi_xpath":"stdyDscr/dataAccs/setAvail/fileQnty"
+                "file_quantity": {
+                  "title": "Number of Files",
+                  "description": "Total number of physical files associated with a collection",
+                  "type": "string",
+                  "_ddi_xpath": "stdyDscr/dataAccs/setAvail/fileQnty"
                 },
-                "notes":{
-                  "title":"Notes",
-                  "description":"Notes and comments",
-                  "type":"string",
-                  "_ddi_xpath":"stdyDscr/dataAccs/setAvail/notes"
+                "notes": {
+                  "title": "Notes",
+                  "description": "Notes and comments",
+                  "type": "string",
+                  "_ddi_xpath": "stdyDscr/dataAccs/setAvail/notes"
                 }
               }
             },
-            "dataset_use":{
-              "type":"object",
-              "title":"Data Set Availability",
-              "description":" Information on terms of use for the data collection",
-              "_ddi_xpath":"stdyDscr/dataAccs/useStmt",
-              "properties":{
-                "conf_dec":{
-                  "type":"array",
-                  "title":"Confidentiality Declaration",
-                  "description":" This element is used to determine if signing of a confidentiality declaration is needed to access a resource.",
-                  "items":{
+            "dataset_use": {
+              "type": "object",
+              "title": "Data Set Availability",
+              "description": " Information on terms of use for the data collection",
+              "_ddi_xpath": "stdyDscr/dataAccs/useStmt",
+              "properties": {
+                "conf_dec": {
+                  "type": "array",
+                  "title": "Confidentiality Declaration",
+                  "description": " This element is used to determine if signing of a confidentiality declaration is needed to access a resource.",
+                  "items": {
                     "type": "object",
-                    "properties":{
-                      "txt":{
-                        "type":"string",
-                        "title":"Confidentiality declaration text",
-                        "description":"Confidentiality declaration text",
-                        "_ddi_xpath":"stdyDscr/dataAccs/useStmt/confDec"
+                    "properties": {
+                      "txt": {
+                        "type": "string",
+                        "title": "Confidentiality declaration text",
+                        "description": "Confidentiality declaration text",
+                        "_ddi_xpath": "stdyDscr/dataAccs/useStmt/confDec"
                       },
-                      "required":{
-                        "type":"string",
-                        "title":"Is signing of a confidentiality declaration required?",
-                        "description":"Is signing of a confidentiality declaration required",
-                        "_ddi_xpath":"stdyDscr/dataAccs/useStmt/confDec/@required"
+                      "required": {
+                        "type": "string",
+                        "title": "Is signing of a confidentiality declaration required?",
+                        "description": "Is signing of a confidentiality declaration required",
+                        "_ddi_xpath": "stdyDscr/dataAccs/useStmt/confDec/@required"
                       },
-                      "form_url":{
-                        "type":"string",
-                        "title":"Confidentiality declaration form URL",
-                        "description":"Provide a URN or URL for online access to a confidentiality declaration form.",
-                        "_ddi_xpath":"stdyDscr/dataAccs/useStmt/confDec/@URI"
+                      "form_url": {
+                        "type": "string",
+                        "title": "Confidentiality declaration form URL",
+                        "description": "Provide a URN or URL for online access to a confidentiality declaration form.",
+                        "_ddi_xpath": "stdyDscr/dataAccs/useStmt/confDec/@URI"
                       },
-                      "form_id":{
-                        "type":"string",
-                        "title":"Form ID",
-                        "description":"Indicates the number or ID of the form that the user must fill out",
-                        "_ddi_xpath":"stdyDscr/dataAccs/useStmt/confDec/@formNo"
+                      "form_id": {
+                        "type": "string",
+                        "title": "Form ID",
+                        "description": "Indicates the number or ID of the form that the user must fill out",
+                        "_ddi_xpath": "stdyDscr/dataAccs/useStmt/confDec/@formNo"
                       }
                     }
                   }
                 },
-                "spec_perm":{
-                  "type":"array",
-                  "title":"Special Permissions",
-                  "description":"Determine if any special permissions are required to access a resource",
-                  "_ddi_xpath":"stdyDscr/dataAccs/useStmt/specPerm",
-                  "items":{
+                "spec_perm": {
+                  "type": "array",
+                  "title": "Special Permissions",
+                  "description": "Determine if any special permissions are required to access a resource",
+                  "_ddi_xpath": "stdyDscr/dataAccs/useStmt/specPerm",
+                  "items": {
                     "type": "object",
-                    "properties":{
-                      "txt":{
-                        "type":"string",
-                        "title":"Special permissions description",
-                        "description":"Confidentiality declaration text"
+                    "properties": {
+                      "txt": {
+                        "type": "string",
+                        "title": "Special permissions description",
+                        "description": "Confidentiality declaration text"
                       },
-                      "required":{
-                        "type":"string",
-                        "title":"Indicate if special permissions are required to access a resource",
-                        "description":"Indicate if special permissions are required to access a resource"
+                      "required": {
+                        "type": "string",
+                        "title": "Indicate if special permissions are required to access a resource",
+                        "description": "Indicate if special permissions are required to access a resource"
                       },
-                      "form_url":{
-                        "type":"string",
-                        "title":"Form URL",
-                        "description":"Link to the form URL"
+                      "form_url": {
+                        "type": "string",
+                        "title": "Form URL",
+                        "description": "Link to the form URL"
                       },
-                      "form_id":{
-                        "type":"string",
-                        "title":"Form ID",
-                        "description":"Indicates the number or ID of the form that the user must fill out"
+                      "form_id": {
+                        "type": "string",
+                        "title": "Form ID",
+                        "description": "Indicates the number or ID of the form that the user must fill out"
                       }
                     }
                   }
                 },
-                "restrictions":{
-                  "title":"Restrictions",
-                  "description":"Any restrictions on access to or use of the collection such as privacy certification or distribution restrictions should be indicated here. These can be restrictions applied by the author, producer, or disseminator of the data collection. If the data are restricted to only a certain class of user, specify which type.",
-                  "type":"string",
-                  "_ddi_xpath":"stdyDscr/dataAccs/useStmt/restrctn"
+                "restrictions": {
+                  "title": "Restrictions",
+                  "description": "Any restrictions on access to or use of the collection such as privacy certification or distribution restrictions should be indicated here. These can be restrictions applied by the author, producer, or disseminator of the data collection. If the data are restricted to only a certain class of user, specify which type.",
+                  "type": "string",
+                  "_ddi_xpath": "stdyDscr/dataAccs/useStmt/restrctn"
                 },
-                "contact":{
-                  "type":"array",
-                  "title":"Contact",
-                  "description":"Contact",
-                  "_ddi_xpath":"stdyDscr/dataAccs/useStmt/contact",
-                  "items":{
-                    "type":"object",
-                    "properties":{
-                      "name":{
-                        "title":"Name",
-                        "type":"string"
+                "contact": {
+                  "type": "array",
+                  "title": "Contact",
+                  "description": "Contact",
+                  "_ddi_xpath": "stdyDscr/dataAccs/useStmt/contact",
+                  "items": {
+                    "type": "object",
+                    "properties": {
+                      "name": {
+                        "title": "Name",
+                        "type": "string"
                       },
-                      "affiliation":{
-                        "title":"Affiliation",
-                        "type":"string"
+                      "affiliation": {
+                        "title": "Affiliation",
+                        "type": "string"
                       },
-                      "uri":{
-                        "title":"URI",
-                        "type":"string"
+                      "uri": {
+                        "title": "URI",
+                        "type": "string"
                       },
-                      "email":{
-                        "title":"Email",
-                        "type":"string"
+                      "email": {
+                        "title": "Email",
+                        "type": "string"
                       }
                     }
                   },
-                  "required":[
+                  "required": [
                     "name"
                   ]
                 },
-                "cit_req":{
-                  "title":"Citation requirement",
-                  "description":"Text of requirement that a data collection should be cited properly in articles or other publications that are based on analysis of the data.",
-                  "type":"string",
-                  "_ddi_xpath":"stdyDscr/dataAccs/useStmt/citReq"
+                "cit_req": {
+                  "title": "Citation requirement",
+                  "description": "Text of requirement that a data collection should be cited properly in articles or other publications that are based on analysis of the data.",
+                  "type": "string",
+                  "_ddi_xpath": "stdyDscr/dataAccs/useStmt/citReq"
                 },
-                "deposit_req":{
-                  "title":"Deposit requirement",
-                  "description":"Information regarding user responsibility for informing archives of their use of data through providing citations to the published work or providing copies of the manuscripts.",
-                  "type":"string",
-                  "_ddi_xpath":"stdyDscr/dataAccs/useStmt/deposReq"
+                "deposit_req": {
+                  "title": "Deposit requirement",
+                  "description": "Information regarding user responsibility for informing archives of their use of data through providing citations to the published work or providing copies of the manuscripts.",
+                  "type": "string",
+                  "_ddi_xpath": "stdyDscr/dataAccs/useStmt/deposReq"
                 },
-                "conditions":{
-                  "title":"Conditions",
-                  "description":"Indicates any additional information that will assist the user in understanding the access and use conditions of the data collection.",
-                  "type":"string",
-                  "_ddi_xpath":"stdyDscr/dataAccs/useStmt/conditions"
+                "conditions": {
+                  "title": "Conditions",
+                  "description": "Indicates any additional information that will assist the user in understanding the access and use conditions of the data collection.",
+                  "type": "string",
+                  "_ddi_xpath": "stdyDscr/dataAccs/useStmt/conditions"
                 },
-                "disclaimer":{
-                  "title":"Disclaimer",
-                  "description":"Information regarding responsibility for uses of the data collection",
-                  "type":"string",
-                  "_ddi_xpath":"stdyDscr/dataAccs/useStmt/disclaimer"
+                "disclaimer": {
+                  "title": "Disclaimer",
+                  "description": "Information regarding responsibility for uses of the data collection",
+                  "type": "string",
+                  "_ddi_xpath": "stdyDscr/dataAccs/useStmt/disclaimer"
                 }
               }
             },
-            "notes":{
-              "title":"Notes",
-              "description":"Notes and comments",
-              "type":"string",
-              "_ddi_xpath":"stdyDscr/dataAccs/setAvail/notes"
+            "notes": {
+              "title": "Notes",
+              "description": "Notes and comments",
+              "type": "string",
+              "_ddi_xpath": "stdyDscr/dataAccs/setAvail/notes"
             }
           }
         }
       },
-      "required":[
+      "required": [
         "title_statement",
         "study_info"
       ],
-      "additionalProperties":false
+      "additionalProperties": false
     }
   },
-  "type":"object",
-  "properties":{
-    "doc_desc":{
-      "$ref":"#/definitions/doc_desc"
+  "type": "object",
+  "properties": {
+    "doc_desc": {
+      "$ref": "#/definitions/doc_desc"
     },
-    "study_desc":{
-      "$ref":"#/definitions/study_desc"
+    "study_desc": {
+      "$ref": "#/definitions/study_desc"
     },
-    "data_files":{
-      "type":"array",
-      "description":"Data files",
-      "items":{
-        "$ref":"datafile-schema.json"
+    "data_files": {
+      "type": "array",
+      "description": "Data files",
+      "items": {
+        "$ref": "datafile-schema.json"
       }
     },
-    "variables":{
-      "type":"array",
-      "description":"Variables",
-      "items":{
-        "$ref":"variable-schema.json"
+    "variables": {
+      "type": "array",
+      "description": "Variables",
+      "items": {
+        "$ref": "variable-schema.json"
       }
     },
-    "variable_groups":{
-      "type":"array",
-      "description":"Variable group",
-      "title":"Variable groups",
-      "items":{
-        "type":"object",
-        "properties":{
-          "vgid":{
-            "title":"Variable Group ID",
-            "description":"Unique ID for the variable group e.g. VG1",
-            "type":"string",
+    "variable_groups": {
+      "type": "array",
+      "description": "Variable group",
+      "title": "Variable groups",
+      "items": {
+        "type": "object",
+        "properties": {
+          "vgid": {
+            "title": "Variable Group ID",
+            "description": "Unique ID for the variable group e.g. VG1",
+            "type": "string",
             "maxLength": 45
           },
-          "variables":{
-            "title":"Variables",
-            "description":"List of variables for the group seperated by space e.g. V1 V2 V3",
-            "type":"string",
+          "variables": {
+            "title": "Variables",
+            "description": "List of variables for the group seperated by space e.g. V1 V2 V3",
+            "type": "string",
             "maxLength": 5000
           },
-          "variable_groups":{
-            "title":"Variable groups",
-            "description":"List of sub-groups e.g. VG2 VG3 VG4",
-            "type":"string",
+          "variable_groups": {
+            "title": "Variable groups",
+            "description": "List of sub-groups e.g. VG2 VG3 VG4",
+            "type": "string",
             "maxLength": 1000
           },
-          "group_type":{
-            "title":"Type",
-            "type":"string",
-            "enum":[
+          "group_type": {
+            "title": "Type",
+            "type": "string",
+            "enum": [
               "subject",
               "section",
               "multiResp",
@@ -1647,37 +1660,37 @@
             ],
             "maxLength": 45
           },
-          "label":{
-            "title":"Label",
-            "type":"string",
+          "label": {
+            "title": "Label",
+            "type": "string",
             "maxLength": 255
           },
-          "universe":{
-            "title":"Universe",
-            "type":"string",
+          "universe": {
+            "title": "Universe",
+            "type": "string",
             "maxLength": 255
           },
-          "notes":{
-            "title":"Notes",
-            "type":"string",
+          "notes": {
+            "title": "Notes",
+            "type": "string",
             "maxLength": 500
           },
-          "txt":{
-            "title":"Text",
-            "type":"string",
+          "txt": {
+            "title": "Text",
+            "type": "string",
             "maxLength": 500
           },
-          "definition":{
-            "title":"Definition",
-            "type":"string",
+          "definition": {
+            "title": "Definition",
+            "type": "string",
             "maxLength": 500
           }
         },
-        "required":[
+        "required": [
           "vgid"
         ]
       },
-      "additionalProperties":false
+      "additionalProperties": false
     }
   }
 }
\ No newline at end of file

From dab1ccb81bbef7a6ce2527469950b6170b3d17d1 Mon Sep 17 00:00:00 2001
From: Mehmood Asghar <mah0001@gmail.com>
Date: Tue, 15 Feb 2022 13:40:08 +0500
Subject: [PATCH 10/79] misc schema updates

---
 .../catalog-admin/datafile-schema.json        |   5 +
 .../catalog-admin/ddi-schema.json             |  18 ++-
 .../catalog-admin/geospatial-schema.json      |   3 +-
 api-documentation/catalog-admin/swagger.yaml  |   2 +-
 .../catalog-admin/table-schema.json           |  73 +++++++++++-
 .../catalog-admin/timeseries-db-schema.json   |   5 +
 .../catalog-admin/timeseries-schema.json      |  11 +-
 .../catalog-admin/variable-schema.json        |  56 +++++++++-
 .../schemas/iptc-phovidmdshared-schema.json   | 105 +++++++++---------
 .../schemas/iptc-pmd-schema.json              |  55 +++++++++
 application/models/Variable_model.php         |  38 +++++--
 application/schemas/datafile-schema.json      |   5 +
 application/schemas/ddi-schema.json           |  18 ++-
 application/schemas/geospatial-schema.json    |   3 +-
 .../schemas/iptc-phovidmdshared-schema.json   | 105 +++++++++---------
 application/schemas/iptc-pmd-schema.json      |  55 +++++++++
 application/schemas/table-schema.json         |  73 +++++++++++-
 application/schemas/timeseries-db-schema.json |   5 +
 application/schemas/timeseries-schema.json    |  11 +-
 application/schemas/variable-schema.json      |  52 ++++++++-
 20 files changed, 540 insertions(+), 158 deletions(-)

diff --git a/api-documentation/catalog-admin/datafile-schema.json b/api-documentation/catalog-admin/datafile-schema.json
index 6e1b7e1e4..a74e542ac 100644
--- a/api-documentation/catalog-admin/datafile-schema.json
+++ b/api-documentation/catalog-admin/datafile-schema.json
@@ -12,6 +12,11 @@
 			"type": "string",
 			"title" : "File name"
 		},
+		"file_type": {
+			"type": "string",
+			"title" : "File type",
+			"description": "Types of data files include raw data (ASCII, EBCDIC, etc.) and software-dependent files such as SAS datasets, SPSS export files, etc."
+		},
 		"description": {
 			"type": "string",
 			"title": "File description"
diff --git a/api-documentation/catalog-admin/ddi-schema.json b/api-documentation/catalog-admin/ddi-schema.json
index c3dfa6cfb..4fc2d3e02 100644
--- a/api-documentation/catalog-admin/ddi-schema.json
+++ b/api-documentation/catalog-admin/ddi-schema.json
@@ -1325,21 +1325,17 @@
               "items": {
                 "type": "object",
                 "properties": {
-                  "data_processing": {
-                    "title": "Data processing",
-                    "type": "string"
-                  },
-                  "source": {
-                    "title": "Source",
-                    "type": "string"
-                  },
                   "type": {
                     "title": "Data processing type",
                     "type": "string"
+                  },
+                  "description": {
+                    "title": "Data processing description",
+                    "type": "string"
                   }
                 },
                 "required": [
-                  "data_processing"
+                  "description"
                 ]
               }
             },
@@ -1372,8 +1368,8 @@
                     "type": "string",
                     "_ddi_xpath": "stdyDscr/method/codingInstructions/command"
                   },
-                  "command_language": {
-                    "title": "Language of the command code",
+                  "formal_language": {
+                    "title": "Identify the language of the command code",
                     "description": "Identifies the language of the command code. e.g. `SPSS`, `R`, `STATA` ",
                     "type": "string",
                     "_ddi_xpath": "stdyDscr/method/codingInstructions/command/@formalLanguage"
diff --git a/api-documentation/catalog-admin/geospatial-schema.json b/api-documentation/catalog-admin/geospatial-schema.json
index 0a045dbe6..67d68df1a 100644
--- a/api-documentation/catalog-admin/geospatial-schema.json
+++ b/api-documentation/catalog-admin/geospatial-schema.json
@@ -2030,7 +2030,8 @@
 		},		
 		"additional": {
 			"title": "Additional metadata",
-			"description": "Any additional metadata"
+			"description": "Any additional metadata",
+			"type":"object"
 		}
 	},
 	"required": [
diff --git a/api-documentation/catalog-admin/swagger.yaml b/api-documentation/catalog-admin/swagger.yaml
index ec2ee1398..7c769cb2d 100644
--- a/api-documentation/catalog-admin/swagger.yaml
+++ b/api-documentation/catalog-admin/swagger.yaml
@@ -37,8 +37,8 @@ x-tagGroups:
       - Collections
       - Datasets
       - External resources 
-      - Survey
       - Scripts
+      - Survey      
       - Timeseries
       - Geospatial
       - Images
diff --git a/api-documentation/catalog-admin/table-schema.json b/api-documentation/catalog-admin/table-schema.json
index 983a7517a..f7d52e318 100644
--- a/api-documentation/catalog-admin/table-schema.json
+++ b/api-documentation/catalog-admin/table-schema.json
@@ -454,9 +454,30 @@
           "items": {
             "type": "object",
             "properties": {
-              "source": {
-                "title": "Source",
+              "name": {
+                "title": "Name",
+                "type": "string",
+                "description": "The name (title) of the data source. For example, a table data may be extracted from the `Population Census 2020`."
+              },
+              "abbreviation": {
+                "title": "Abbreviation",
+                "description":"The abbreviation (acronym) of the data source.",
+                "type": "string"
+              },              
+              "source_id": {
+                "title": "Source ID",
+                "description":"A unique identifier for the source, such as a Digital Object Identifier (DOI).",
                 "type": "string"
+              },
+              "note": {
+                "title": "Note",
+                "type": "string",
+                "description":"A note that describes how the source was used, possibly mentioning issues in the use of the source."
+              },
+              "uri": {
+                "title": "URI",
+                "type": "string",
+                "description":"A link (URL) to the source dataset."
               }
             }
           }
@@ -621,9 +642,36 @@
         "themes":{
           "type":"array",
           "description":"Themes",
-          "allOf": [ 
-            {"$ref":"#/definitions/keyword"}
-          ]
+          "items": {
+            "type": "object",
+            "properties": {
+              "id": {
+                "title": "Unique Identifier",
+                "type": "string"
+              },
+              "name": {
+                "title": "Name",
+                "type": "string"
+              },
+              "parent_id": {
+                "title": "Parent Identifier",
+                "type": "string"
+              },
+              "vocabulary": {
+                "title": "Vocabulary",
+                "description": "Name of the controlled vocabulary",
+                "type": "string"
+              },
+              "uri": {
+                "title": "Vocabulary URI",
+                "description": "Link to the controlled vocabulary web page, if the theme is from a taxonomy.",
+                "type": "string"
+              }
+            },
+            "required": [
+              "name"
+            ]
+          }
         },
         "topics": {
           "type": "array",
@@ -669,10 +717,19 @@
           "items": {
             "type": "object",
             "properties": {
+              "id": {
+                "title": "Unique Identifier",
+                "type": "string"
+              },
               "name": {
                 "title": "Discipline title or name",
                 "type": "string"
               },
+              "parent_id": {
+                "title": "Parent discipline Identifier",
+                "description":"Parent discipline ID",
+                "type": "string"
+              },
               "vocabulary": {
                 "title": "Vocabulary",
                 "description": "Vocabulary",
@@ -786,6 +843,12 @@
           "title":"Confidentiality"
         },
 
+        "sdc": {
+          "type": "string",
+          "title":"Statistical disclosure control",
+          "description":"Information on statistical disclosure control measures applied to the table. This can include cell suppression, or other techniques. Specialized packages have been developed for this purpose, like [*sdcTable: Methods for Statistical Disclosure Control in Tabular Data*](https://cran.r-project.org/web/packages/sdcTable/index.html) and https://cran.r-project.org/web/packages/sdcTable/sdcTable.pdf \nThe information provided here should be such that it does not provide intruders with useful information for reverse-engineering the protection measures applied to the table."
+        },
+
         "contacts": {
           "type": "array",
           "title": "Contacts",
diff --git a/api-documentation/catalog-admin/timeseries-db-schema.json b/api-documentation/catalog-admin/timeseries-db-schema.json
index e7ac76a92..c9c9116f1 100644
--- a/api-documentation/catalog-admin/timeseries-db-schema.json
+++ b/api-documentation/catalog-admin/timeseries-db-schema.json
@@ -498,6 +498,11 @@
 					]
 				},
 
+				"acknowledgement_statement": {
+					"title": "An overall statement of acknowledgment, which can be used as an alternative (or supplement) to the itemized list provided in `acknowledgments`.",
+					"type": "string"
+				},
+
 				"contacts": {
 					"type": "array",
 					"title": "Contacts",
diff --git a/api-documentation/catalog-admin/timeseries-schema.json b/api-documentation/catalog-admin/timeseries-schema.json
index f620472c3..baac06983 100644
--- a/api-documentation/catalog-admin/timeseries-schema.json
+++ b/api-documentation/catalog-admin/timeseries-schema.json
@@ -794,10 +794,10 @@
 					  "additionalProperties": false
 					}
 				  },
-				"word_vectors":{
+				"embeddings":{
 					"type": "array",
-					"title": "Word vectors",
-					"description": "Word vectors",
+					"title": "Word embeddings",
+          			"description": "Word embeddings",
 					"items": {
 					  "type": "object",
 					  "properties": {
@@ -834,6 +834,11 @@
 								"type": "string",
 								"title": "Name"
 							},
+							"description": {
+								"type": "string",
+								"title": "Description",
+								"description":"A brief description of the series group."
+							},
 							"version": {
 								"type": "string",
 								"title": "Version"
diff --git a/api-documentation/catalog-admin/variable-schema.json b/api-documentation/catalog-admin/variable-schema.json
index 7c16ff79e..9d887e678 100644
--- a/api-documentation/catalog-admin/variable-schema.json
+++ b/api-documentation/catalog-admin/variable-schema.json
@@ -57,8 +57,16 @@
         },		
 		"var_imputation": {
 			"type": "string",
-			"title": "Imputation"
+			"title": "Imputation",
+			"description": "According to the Statistical Terminology glossary maintained by the National Science Foundation, this is `the process by which one estimates missing values for items that a survey respondent failed to provide,` and if applicable in this context, it refers to the type of procedure used. "
 		},
+
+		"var_derivation": {
+			"type": "string",
+			"title": "Derivation",
+			"description": "Used only in the case of a derived variable, this element provides both a description of how the derivation was performed and the command used to generate the derived variable, as well as a specification of the other variables in the study used to generate the derivation. The `var` attribute provides the ID values of the other variables in the study used to generate this derived variable."
+		},
+
 		"var_security": {
 			"type": "string",
 			"title": "Security"
@@ -80,6 +88,19 @@
 			"type": "string",
 			"title": "Post-question text"
 		},
+
+		"var_forward": {
+			"type": "string",
+			"title": "Forward skip",
+			"description":"Contains a reference to IDs of possible following questions. This can be used to document forward skip instructions."
+		},
+
+		"var_backward": {
+			"type": "string",
+			"title": "Backward skip",
+			"description":"Contains a reference to IDs of possible preceding questions. This can be used to document backward skip instructions."
+		},
+
 		"var_qstn_ivulnstr": {
 			"type": "string",
 			"title": "Interviewer instructions"
@@ -155,6 +176,31 @@
 				}
 			}
 		},
+
+		"var_std_catgry": {
+			"type": "object",
+			"title": "Standard categories",
+			"description":"Standard category codes used in the variable, like industry codes, employment codes, or social class codes. The attribute `date` is provided to indicate the version of the code in place at the time of the study. The attribute `URI` is provided to indicate a URN or URL that can be used to obtain an electronic list of the category codes.",
+			"properties":{
+				"name": {
+					"title": "Standard classification name",
+					"type": "string"
+				  },
+				  "source": {
+					"title": "Source",
+					"type": "string"
+				  },
+				  "date": {
+					"title": "Date",
+					"type": "string"
+				  },
+				  "uri": {
+					"title": "URI",
+					"type": "string"
+				  }
+			}
+		},
+
 		"var_codinstr": {
 			"type": "string",
 			"title": "Recoding and derivation"
@@ -196,9 +242,9 @@
                 "type": "string",
                 "title": "Name"
               },
-              "value": {
+              "note": {
                 "type": "string",
-                "title": "Value"
+                "title": "Note"
               }
             }
           },
@@ -207,5 +253,5 @@
 			"title": "Variable notes"
 		}
     },
-    "required": [ "vid", "file_id", "name","labl" ]
-}
+    "required": [ "vid", "file_id", "name","labl" ]	
+}
\ No newline at end of file
diff --git a/api-documentation/schemas/iptc-phovidmdshared-schema.json b/api-documentation/schemas/iptc-phovidmdshared-schema.json
index 065fd2733..52014c8a1 100644
--- a/api-documentation/schemas/iptc-phovidmdshared-schema.json
+++ b/api-documentation/schemas/iptc-phovidmdshared-schema.json
@@ -49,25 +49,28 @@
 		"ArtworkOrObject": {
 			"type": "object",
 			"properties": {
-				"circaDateCreated": {
-					"title": "Circa Date Created {Artwork or Object detail}",
-					"description": "Approximate date or range of dates associated with the creation and production of an artwork or object or its components.",
-					"type": "string"
+				"title": {
+					"$ref": "#/definitions/AltLang",
+					"description": "A reference for the artwork or object in the image.",
+					"title": "Title {Artwork or Object detail}"
 				},
 				"contentDescription": {
 					"$ref": "#/definitions/AltLang",
 					"description": "A textual description of the content depicted in the artwork or object.",
 					"title": "Content Description {Artwork or Object detail}"
 				},
-				"contributionDescription": {
+				"physicalDescription": {
 					"$ref": "#/definitions/AltLang",
-					"description": "A textual description about a contribution made to an artwork or an object.",
-					"title": "Contribution Description {Artwork or Object detail}"
+					"description": "A textual description of the physical characteristics of the artwork or object, without reference to the content depicted.",
+					"title": "Physical Description {Artwork or Object detail}"
 				},
-				"copyrightNotice": {
-					"$ref": "#/definitions/AltLang",
-					"description": "Contains any necessary copyright notice for claiming the intellectual property for artwork or an object in the image and should identify the current owner of the copyright of this  work with associated intellectual property rights.",
-					"title": "Copyright Notice {Artwork or Object detail}"
+				"creatorNames": {
+					"title": "Creator {Artwork or Object detail}",
+					"description": "Contains the name of the artist who has created artwork or an object in the  image. In cases where the artist could or should not be identified the name of a company or organisation may be appropriate.",
+					"type": "array",
+					"items": {
+						"type": "string"
+					}
 				},
 				"creatorIdentifiers": {
 					"title": "Creator ID {Artwork or Object detail}",
@@ -77,46 +80,29 @@
 						"type": "string"
 					}
 				},
-				"creatorNames": {
-					"title": "Creator {Artwork or Object detail}",
-					"description": "Contains the name of the artist who has created artwork or an object in the  image. In cases where the artist could or should not be identified the name of a company or organisation may be appropriate.",
+				"contributionDescription": {
+					"$ref": "#/definitions/AltLang",
+					"description": "A textual description about a contribution made to an artwork or an object.",
+					"title": "Contribution Description {Artwork or Object detail}"
+				},
+				"stylePeriod": {
+					"title": "Style Period {Artwork or Object detail}",
+					"description": "The style, historical or artistic period, movement, group, or school whose characteristics are represented in the artwork or object.",
 					"type": "array",
 					"items": {
 						"type": "string"
 					}
 				},
-				"currentCopyrightOwnerIdentifier": {
-					"title": "Current Copyright Owner ID {Artwork or Object detail}",
-					"description": "Globally unique identifier for the current owner of the copyright of the artwork or object.",
-					"type": "string",
-					"format": "uri"
-				},
-				"currentCopyrightOwnerName": {
-					"title": "Current Copyright Owner Name {Artwork or Object detail}",
-					"description": "Name of the current owner of the copyright of the artwork or object.",
-					"type": "string"
-				},
-				"currentLicensorIdentifier": {
-					"title": "Current Licensor ID {Artwork or Object detail}",
-					"description": "Globally unique identifier for the current licensor of the artwork or object.",
-					"type": "string",
-					"format": "uri"
-				},
-				"currentLicensorName": {
-					"title": "Current Licensor Name {Artwork or Object detail}",
-					"description": "Name of the current licensor of the artwork or object.",
-					"type": "string"
-				},
 				"dateCreated": {
 					"title": "Date Created {Artwork or Object detail}",
 					"description": "Designates the date and optionally the time the artwork or object in the image was created. This relates to artwork or objects with associated intellectual property rights.",
 					"type": "string",
 					"format": "date-time"
 				},
-				"physicalDescription": {
-					"$ref": "#/definitions/AltLang",
-					"description": "A textual description of the physical characteristics of the artwork or object, without reference to the content depicted.",
-					"title": "Physical Description {Artwork or Object detail}"
+				"circaDateCreated": {
+					"title": "Circa Date Created {Artwork or Object detail}",
+					"description": "Approximate date or range of dates associated with the creation and production of an artwork or object or its components.",
+					"type": "string"
 				},
 				"source": {
 					"title": "Source {Artwork or Object detail}",
@@ -134,19 +120,38 @@
 					"type": "string",
 					"format": "uri"
 				},
-				"stylePeriod": {
-					"title": "Style Period {Artwork or Object detail}",
-					"description": "The style, historical or artistic period, movement, group, or school whose characteristics are represented in the artwork or object.",
-					"type": "array",
-					"items": {
-						"type": "string"
-					}
+				"currentCopyrightOwnerName": {
+					"title": "Current Copyright Owner Name {Artwork or Object detail}",
+					"description": "Name of the current owner of the copyright of the artwork or object.",
+					"type": "string"
+				},				
+				"currentCopyrightOwnerIdentifier": {
+					"title": "Current Copyright Owner ID {Artwork or Object detail}",
+					"description": "Globally unique identifier for the current owner of the copyright of the artwork or object.",
+					"type": "string",
+					"format": "uri"
 				},
-				"title": {
+
+				"copyrightNotice": {
 					"$ref": "#/definitions/AltLang",
-					"description": "A reference for the artwork or object in the image.",
-					"title": "Title {Artwork or Object detail}"
+					"description": "Contains any necessary copyright notice for claiming the intellectual property for artwork or an object in the image and should identify the current owner of the copyright of this  work with associated intellectual property rights.",
+					"title": "Copyright Notice {Artwork or Object detail}"
+				},
+
+
+				"currentLicensorName": {
+					"title": "Current Licensor Name {Artwork or Object detail}",
+					"description": "Name of the current licensor of the artwork or object.",
+					"type": "string"
+				},
+
+				"currentLicensorIdentifier": {
+					"title": "Current Licensor ID {Artwork or Object detail}",
+					"description": "Globally unique identifier for the current licensor of the artwork or object.",
+					"type": "string",
+					"format": "uri"
 				}
+
 			},
 			"additionalProperties": false
 		},
diff --git a/api-documentation/schemas/iptc-pmd-schema.json b/api-documentation/schemas/iptc-pmd-schema.json
index 698869241..279badf4c 100644
--- a/api-documentation/schemas/iptc-pmd-schema.json
+++ b/api-documentation/schemas/iptc-pmd-schema.json
@@ -74,6 +74,33 @@
 						"type": "string"
 					}
 				},
+
+				"sceneCodesLabelled": {
+					"title": "Scene Codes",
+					"description": "Describes the scene of a photo content. Specifies one ore more terms from the IPTC \"Scene-NewsCodes\". Each Scene is represented as a string of 6 digits in an unordered list.",
+					"type": "array",
+					"items": {
+						"type": "object",
+						"properties":{
+							"code": {
+								"title": "Scene Code",
+								"description": "Scene code as a string of 6 digits",
+								"type": "string"
+							},
+							"label": {
+								"title": "Scene Label",
+								"description": "Label",
+								"type": "string"
+							},
+							"description": {
+								"title": "Scene Description",
+								"description": "Description of the scene",
+								"type": "string"
+							}
+						}
+					}
+				},
+
 				"subjectCodes": {
 					"title": "Subject Code",
 					"description": "Specifies one or more Subjects from the IPTC Subject-NewsCodes taxonomy to categorise the image. Each Subject is represented as a string of 8 digits in an unordered list.",
@@ -82,6 +109,34 @@
 						"type": "string"
 					}
 				},
+
+
+				"subjectCodesLabelled": {
+					"title": "Subject Codes",
+					"description": "Specifies one or more Subjects from the IPTC Subject-NewsCodes taxonomy to categorise the image. Each Subject is represented as a string of 8 digits in an unordered list.",
+					"type": "array",
+					"items": {
+						"type": "object",
+						"properties":{
+							"code": {
+								"title": "Subject Code",
+								"description": "Subject code as a string of 8 digits",
+								"type": "string"
+							},
+							"label": {
+								"title": "Subject Label",
+								"description": "Label",
+								"type": "string"
+							},
+							"description": {
+								"title": "Subject Description",
+								"description": "Description of the scene",
+								"type": "string"
+							}
+						}
+					}
+				},
+
 				"creatorNames": {
 					"title": "Creator",
 					"description": "Contains the name of the photographer, but in cases where the photographer should not be identified the name of a company or organisation may be appropriate.",
diff --git a/application/models/Variable_model.php b/application/models/Variable_model.php
index b97b5e883..164cacb52 100644
--- a/application/models/Variable_model.php
+++ b/application/models/Variable_model.php
@@ -103,7 +103,7 @@ function chunk_read($sid,$start_uid=0, $limit=100)
 
         foreach($variables as $key=>$variable){            
             $variables[$key]['metadata']=$this->Dataset_model->decode_metadata($variable['metadata']);
-            $variable=$this->map_variable_fields($variable);
+            $variables[$key]=$this->map_variable_fields($variables[$key]);
         }
 
         return $variables;
@@ -381,7 +381,9 @@ public function insert($sid,$options)
         }
 
         $this->db->insert("variables",$options);
-        return $this->db->insert_id();
+        $insert_id=$this->db->insert_id();
+        $this->update_survey_timestamp($sid);
+        return $insert_id;
     }
 
     public function update($sid,$uid,$options)
@@ -415,9 +417,24 @@ public function update($sid,$uid,$options)
         $this->db->where('sid',$sid);
         $this->db->where('uid',$uid);
         $this->db->update("variables",$options);
+        $this->update_survey_timestamp($sid);
         return $uid;
     }
 
+    private function update_survey_timestamp($sid,$changed=null)
+    {
+        if(!$changed){
+            $changed=date("U");
+        }
+
+        $options=array(
+            'changed'=>$changed
+        );
+
+        $this->db->where("id",$sid);
+        $this->db->update('surveys',$options);
+    }    
+
 
     public function batch_insert($sid,$variables)
     {
@@ -445,6 +462,7 @@ public function batch_insert($sid,$variables)
         }
 
         $this->db->insert_batch('variables', $variables);
+        $this->update_survey_timestamp($sid);
     }
 
 
@@ -589,13 +607,15 @@ function map_variable_fields($variable)
             'var_rec_seg_no'=>'loc_rec_seg_no',
         );
 
-        foreach($variable['metadata'] as $key=>$value){
-            //complex types e.g. repeatable array types
-			if(array_key_exists($key,$mappings)){ 
-				$variable['metadata'][$mappings[$key]]=$value;
-                unset($variable['metadata'][$key]);
-			}
-		}
+        if (isset($variable['metadata'])){
+            foreach($variable['metadata'] as $key=>$value){
+                //complex types e.g. repeatable array types
+                if(array_key_exists($key,$mappings)){ 
+                    $variable['metadata'][$mappings[$key]]=$value;
+                    unset($variable['metadata'][$key]);
+                }
+            }
+        }
 
         return $variable;
     }
diff --git a/application/schemas/datafile-schema.json b/application/schemas/datafile-schema.json
index 6e1b7e1e4..a74e542ac 100644
--- a/application/schemas/datafile-schema.json
+++ b/application/schemas/datafile-schema.json
@@ -12,6 +12,11 @@
 			"type": "string",
 			"title" : "File name"
 		},
+		"file_type": {
+			"type": "string",
+			"title" : "File type",
+			"description": "Types of data files include raw data (ASCII, EBCDIC, etc.) and software-dependent files such as SAS datasets, SPSS export files, etc."
+		},
 		"description": {
 			"type": "string",
 			"title": "File description"
diff --git a/application/schemas/ddi-schema.json b/application/schemas/ddi-schema.json
index c3dfa6cfb..4fc2d3e02 100644
--- a/application/schemas/ddi-schema.json
+++ b/application/schemas/ddi-schema.json
@@ -1325,21 +1325,17 @@
               "items": {
                 "type": "object",
                 "properties": {
-                  "data_processing": {
-                    "title": "Data processing",
-                    "type": "string"
-                  },
-                  "source": {
-                    "title": "Source",
-                    "type": "string"
-                  },
                   "type": {
                     "title": "Data processing type",
                     "type": "string"
+                  },
+                  "description": {
+                    "title": "Data processing description",
+                    "type": "string"
                   }
                 },
                 "required": [
-                  "data_processing"
+                  "description"
                 ]
               }
             },
@@ -1372,8 +1368,8 @@
                     "type": "string",
                     "_ddi_xpath": "stdyDscr/method/codingInstructions/command"
                   },
-                  "command_language": {
-                    "title": "Language of the command code",
+                  "formal_language": {
+                    "title": "Identify the language of the command code",
                     "description": "Identifies the language of the command code. e.g. `SPSS`, `R`, `STATA` ",
                     "type": "string",
                     "_ddi_xpath": "stdyDscr/method/codingInstructions/command/@formalLanguage"
diff --git a/application/schemas/geospatial-schema.json b/application/schemas/geospatial-schema.json
index 0a045dbe6..67d68df1a 100644
--- a/application/schemas/geospatial-schema.json
+++ b/application/schemas/geospatial-schema.json
@@ -2030,7 +2030,8 @@
 		},		
 		"additional": {
 			"title": "Additional metadata",
-			"description": "Any additional metadata"
+			"description": "Any additional metadata",
+			"type":"object"
 		}
 	},
 	"required": [
diff --git a/application/schemas/iptc-phovidmdshared-schema.json b/application/schemas/iptc-phovidmdshared-schema.json
index 065fd2733..52014c8a1 100644
--- a/application/schemas/iptc-phovidmdshared-schema.json
+++ b/application/schemas/iptc-phovidmdshared-schema.json
@@ -49,25 +49,28 @@
 		"ArtworkOrObject": {
 			"type": "object",
 			"properties": {
-				"circaDateCreated": {
-					"title": "Circa Date Created {Artwork or Object detail}",
-					"description": "Approximate date or range of dates associated with the creation and production of an artwork or object or its components.",
-					"type": "string"
+				"title": {
+					"$ref": "#/definitions/AltLang",
+					"description": "A reference for the artwork or object in the image.",
+					"title": "Title {Artwork or Object detail}"
 				},
 				"contentDescription": {
 					"$ref": "#/definitions/AltLang",
 					"description": "A textual description of the content depicted in the artwork or object.",
 					"title": "Content Description {Artwork or Object detail}"
 				},
-				"contributionDescription": {
+				"physicalDescription": {
 					"$ref": "#/definitions/AltLang",
-					"description": "A textual description about a contribution made to an artwork or an object.",
-					"title": "Contribution Description {Artwork or Object detail}"
+					"description": "A textual description of the physical characteristics of the artwork or object, without reference to the content depicted.",
+					"title": "Physical Description {Artwork or Object detail}"
 				},
-				"copyrightNotice": {
-					"$ref": "#/definitions/AltLang",
-					"description": "Contains any necessary copyright notice for claiming the intellectual property for artwork or an object in the image and should identify the current owner of the copyright of this  work with associated intellectual property rights.",
-					"title": "Copyright Notice {Artwork or Object detail}"
+				"creatorNames": {
+					"title": "Creator {Artwork or Object detail}",
+					"description": "Contains the name of the artist who has created artwork or an object in the  image. In cases where the artist could or should not be identified the name of a company or organisation may be appropriate.",
+					"type": "array",
+					"items": {
+						"type": "string"
+					}
 				},
 				"creatorIdentifiers": {
 					"title": "Creator ID {Artwork or Object detail}",
@@ -77,46 +80,29 @@
 						"type": "string"
 					}
 				},
-				"creatorNames": {
-					"title": "Creator {Artwork or Object detail}",
-					"description": "Contains the name of the artist who has created artwork or an object in the  image. In cases where the artist could or should not be identified the name of a company or organisation may be appropriate.",
+				"contributionDescription": {
+					"$ref": "#/definitions/AltLang",
+					"description": "A textual description about a contribution made to an artwork or an object.",
+					"title": "Contribution Description {Artwork or Object detail}"
+				},
+				"stylePeriod": {
+					"title": "Style Period {Artwork or Object detail}",
+					"description": "The style, historical or artistic period, movement, group, or school whose characteristics are represented in the artwork or object.",
 					"type": "array",
 					"items": {
 						"type": "string"
 					}
 				},
-				"currentCopyrightOwnerIdentifier": {
-					"title": "Current Copyright Owner ID {Artwork or Object detail}",
-					"description": "Globally unique identifier for the current owner of the copyright of the artwork or object.",
-					"type": "string",
-					"format": "uri"
-				},
-				"currentCopyrightOwnerName": {
-					"title": "Current Copyright Owner Name {Artwork or Object detail}",
-					"description": "Name of the current owner of the copyright of the artwork or object.",
-					"type": "string"
-				},
-				"currentLicensorIdentifier": {
-					"title": "Current Licensor ID {Artwork or Object detail}",
-					"description": "Globally unique identifier for the current licensor of the artwork or object.",
-					"type": "string",
-					"format": "uri"
-				},
-				"currentLicensorName": {
-					"title": "Current Licensor Name {Artwork or Object detail}",
-					"description": "Name of the current licensor of the artwork or object.",
-					"type": "string"
-				},
 				"dateCreated": {
 					"title": "Date Created {Artwork or Object detail}",
 					"description": "Designates the date and optionally the time the artwork or object in the image was created. This relates to artwork or objects with associated intellectual property rights.",
 					"type": "string",
 					"format": "date-time"
 				},
-				"physicalDescription": {
-					"$ref": "#/definitions/AltLang",
-					"description": "A textual description of the physical characteristics of the artwork or object, without reference to the content depicted.",
-					"title": "Physical Description {Artwork or Object detail}"
+				"circaDateCreated": {
+					"title": "Circa Date Created {Artwork or Object detail}",
+					"description": "Approximate date or range of dates associated with the creation and production of an artwork or object or its components.",
+					"type": "string"
 				},
 				"source": {
 					"title": "Source {Artwork or Object detail}",
@@ -134,19 +120,38 @@
 					"type": "string",
 					"format": "uri"
 				},
-				"stylePeriod": {
-					"title": "Style Period {Artwork or Object detail}",
-					"description": "The style, historical or artistic period, movement, group, or school whose characteristics are represented in the artwork or object.",
-					"type": "array",
-					"items": {
-						"type": "string"
-					}
+				"currentCopyrightOwnerName": {
+					"title": "Current Copyright Owner Name {Artwork or Object detail}",
+					"description": "Name of the current owner of the copyright of the artwork or object.",
+					"type": "string"
+				},				
+				"currentCopyrightOwnerIdentifier": {
+					"title": "Current Copyright Owner ID {Artwork or Object detail}",
+					"description": "Globally unique identifier for the current owner of the copyright of the artwork or object.",
+					"type": "string",
+					"format": "uri"
 				},
-				"title": {
+
+				"copyrightNotice": {
 					"$ref": "#/definitions/AltLang",
-					"description": "A reference for the artwork or object in the image.",
-					"title": "Title {Artwork or Object detail}"
+					"description": "Contains any necessary copyright notice for claiming the intellectual property for artwork or an object in the image and should identify the current owner of the copyright of this  work with associated intellectual property rights.",
+					"title": "Copyright Notice {Artwork or Object detail}"
+				},
+
+
+				"currentLicensorName": {
+					"title": "Current Licensor Name {Artwork or Object detail}",
+					"description": "Name of the current licensor of the artwork or object.",
+					"type": "string"
+				},
+
+				"currentLicensorIdentifier": {
+					"title": "Current Licensor ID {Artwork or Object detail}",
+					"description": "Globally unique identifier for the current licensor of the artwork or object.",
+					"type": "string",
+					"format": "uri"
 				}
+
 			},
 			"additionalProperties": false
 		},
diff --git a/application/schemas/iptc-pmd-schema.json b/application/schemas/iptc-pmd-schema.json
index 698869241..279badf4c 100644
--- a/application/schemas/iptc-pmd-schema.json
+++ b/application/schemas/iptc-pmd-schema.json
@@ -74,6 +74,33 @@
 						"type": "string"
 					}
 				},
+
+				"sceneCodesLabelled": {
+					"title": "Scene Codes",
+					"description": "Describes the scene of a photo content. Specifies one ore more terms from the IPTC \"Scene-NewsCodes\". Each Scene is represented as a string of 6 digits in an unordered list.",
+					"type": "array",
+					"items": {
+						"type": "object",
+						"properties":{
+							"code": {
+								"title": "Scene Code",
+								"description": "Scene code as a string of 6 digits",
+								"type": "string"
+							},
+							"label": {
+								"title": "Scene Label",
+								"description": "Label",
+								"type": "string"
+							},
+							"description": {
+								"title": "Scene Description",
+								"description": "Description of the scene",
+								"type": "string"
+							}
+						}
+					}
+				},
+
 				"subjectCodes": {
 					"title": "Subject Code",
 					"description": "Specifies one or more Subjects from the IPTC Subject-NewsCodes taxonomy to categorise the image. Each Subject is represented as a string of 8 digits in an unordered list.",
@@ -82,6 +109,34 @@
 						"type": "string"
 					}
 				},
+
+
+				"subjectCodesLabelled": {
+					"title": "Subject Codes",
+					"description": "Specifies one or more Subjects from the IPTC Subject-NewsCodes taxonomy to categorise the image. Each Subject is represented as a string of 8 digits in an unordered list.",
+					"type": "array",
+					"items": {
+						"type": "object",
+						"properties":{
+							"code": {
+								"title": "Subject Code",
+								"description": "Subject code as a string of 8 digits",
+								"type": "string"
+							},
+							"label": {
+								"title": "Subject Label",
+								"description": "Label",
+								"type": "string"
+							},
+							"description": {
+								"title": "Subject Description",
+								"description": "Description of the scene",
+								"type": "string"
+							}
+						}
+					}
+				},
+
 				"creatorNames": {
 					"title": "Creator",
 					"description": "Contains the name of the photographer, but in cases where the photographer should not be identified the name of a company or organisation may be appropriate.",
diff --git a/application/schemas/table-schema.json b/application/schemas/table-schema.json
index 983a7517a..f7d52e318 100644
--- a/application/schemas/table-schema.json
+++ b/application/schemas/table-schema.json
@@ -454,9 +454,30 @@
           "items": {
             "type": "object",
             "properties": {
-              "source": {
-                "title": "Source",
+              "name": {
+                "title": "Name",
+                "type": "string",
+                "description": "The name (title) of the data source. For example, a table data may be extracted from the `Population Census 2020`."
+              },
+              "abbreviation": {
+                "title": "Abbreviation",
+                "description":"The abbreviation (acronym) of the data source.",
+                "type": "string"
+              },              
+              "source_id": {
+                "title": "Source ID",
+                "description":"A unique identifier for the source, such as a Digital Object Identifier (DOI).",
                 "type": "string"
+              },
+              "note": {
+                "title": "Note",
+                "type": "string",
+                "description":"A note that describes how the source was used, possibly mentioning issues in the use of the source."
+              },
+              "uri": {
+                "title": "URI",
+                "type": "string",
+                "description":"A link (URL) to the source dataset."
               }
             }
           }
@@ -621,9 +642,36 @@
         "themes":{
           "type":"array",
           "description":"Themes",
-          "allOf": [ 
-            {"$ref":"#/definitions/keyword"}
-          ]
+          "items": {
+            "type": "object",
+            "properties": {
+              "id": {
+                "title": "Unique Identifier",
+                "type": "string"
+              },
+              "name": {
+                "title": "Name",
+                "type": "string"
+              },
+              "parent_id": {
+                "title": "Parent Identifier",
+                "type": "string"
+              },
+              "vocabulary": {
+                "title": "Vocabulary",
+                "description": "Name of the controlled vocabulary",
+                "type": "string"
+              },
+              "uri": {
+                "title": "Vocabulary URI",
+                "description": "Link to the controlled vocabulary web page, if the theme is from a taxonomy.",
+                "type": "string"
+              }
+            },
+            "required": [
+              "name"
+            ]
+          }
         },
         "topics": {
           "type": "array",
@@ -669,10 +717,19 @@
           "items": {
             "type": "object",
             "properties": {
+              "id": {
+                "title": "Unique Identifier",
+                "type": "string"
+              },
               "name": {
                 "title": "Discipline title or name",
                 "type": "string"
               },
+              "parent_id": {
+                "title": "Parent discipline Identifier",
+                "description":"Parent discipline ID",
+                "type": "string"
+              },
               "vocabulary": {
                 "title": "Vocabulary",
                 "description": "Vocabulary",
@@ -786,6 +843,12 @@
           "title":"Confidentiality"
         },
 
+        "sdc": {
+          "type": "string",
+          "title":"Statistical disclosure control",
+          "description":"Information on statistical disclosure control measures applied to the table. This can include cell suppression, or other techniques. Specialized packages have been developed for this purpose, like [*sdcTable: Methods for Statistical Disclosure Control in Tabular Data*](https://cran.r-project.org/web/packages/sdcTable/index.html) and https://cran.r-project.org/web/packages/sdcTable/sdcTable.pdf \nThe information provided here should be such that it does not provide intruders with useful information for reverse-engineering the protection measures applied to the table."
+        },
+
         "contacts": {
           "type": "array",
           "title": "Contacts",
diff --git a/application/schemas/timeseries-db-schema.json b/application/schemas/timeseries-db-schema.json
index e7ac76a92..c9c9116f1 100644
--- a/application/schemas/timeseries-db-schema.json
+++ b/application/schemas/timeseries-db-schema.json
@@ -498,6 +498,11 @@
 					]
 				},
 
+				"acknowledgement_statement": {
+					"title": "An overall statement of acknowledgment, which can be used as an alternative (or supplement) to the itemized list provided in `acknowledgments`.",
+					"type": "string"
+				},
+
 				"contacts": {
 					"type": "array",
 					"title": "Contacts",
diff --git a/application/schemas/timeseries-schema.json b/application/schemas/timeseries-schema.json
index 3c0fc41e2..763a9d330 100644
--- a/application/schemas/timeseries-schema.json
+++ b/application/schemas/timeseries-schema.json
@@ -794,10 +794,10 @@
 						"additionalProperties": false
 					  }
 					},
-				  "word_vectors":{
+				  "embeddings":{
 					  "type": "array",
-					  "title": "Word vectors",
-					  "description": "Word vectors",
+					  "title": "Word embeddings",
+						"description": "Word embeddings",
 					  "items": {
 						"type": "object",
 						"properties": {
@@ -834,6 +834,11 @@
 								  "type": "string",
 								  "title": "Name"
 							  },
+							  "description": {
+								  "type": "string",
+								  "title": "Description",
+								  "description":"A brief description of the series group."
+							  },
 							  "version": {
 								  "type": "string",
 								  "title": "Version"
diff --git a/application/schemas/variable-schema.json b/application/schemas/variable-schema.json
index cc34ef167..9d887e678 100644
--- a/application/schemas/variable-schema.json
+++ b/application/schemas/variable-schema.json
@@ -57,8 +57,16 @@
         },		
 		"var_imputation": {
 			"type": "string",
-			"title": "Imputation"
+			"title": "Imputation",
+			"description": "According to the Statistical Terminology glossary maintained by the National Science Foundation, this is `the process by which one estimates missing values for items that a survey respondent failed to provide,` and if applicable in this context, it refers to the type of procedure used. "
 		},
+
+		"var_derivation": {
+			"type": "string",
+			"title": "Derivation",
+			"description": "Used only in the case of a derived variable, this element provides both a description of how the derivation was performed and the command used to generate the derived variable, as well as a specification of the other variables in the study used to generate the derivation. The `var` attribute provides the ID values of the other variables in the study used to generate this derived variable."
+		},
+
 		"var_security": {
 			"type": "string",
 			"title": "Security"
@@ -80,6 +88,19 @@
 			"type": "string",
 			"title": "Post-question text"
 		},
+
+		"var_forward": {
+			"type": "string",
+			"title": "Forward skip",
+			"description":"Contains a reference to IDs of possible following questions. This can be used to document forward skip instructions."
+		},
+
+		"var_backward": {
+			"type": "string",
+			"title": "Backward skip",
+			"description":"Contains a reference to IDs of possible preceding questions. This can be used to document backward skip instructions."
+		},
+
 		"var_qstn_ivulnstr": {
 			"type": "string",
 			"title": "Interviewer instructions"
@@ -155,6 +176,31 @@
 				}
 			}
 		},
+
+		"var_std_catgry": {
+			"type": "object",
+			"title": "Standard categories",
+			"description":"Standard category codes used in the variable, like industry codes, employment codes, or social class codes. The attribute `date` is provided to indicate the version of the code in place at the time of the study. The attribute `URI` is provided to indicate a URN or URL that can be used to obtain an electronic list of the category codes.",
+			"properties":{
+				"name": {
+					"title": "Standard classification name",
+					"type": "string"
+				  },
+				  "source": {
+					"title": "Source",
+					"type": "string"
+				  },
+				  "date": {
+					"title": "Date",
+					"type": "string"
+				  },
+				  "uri": {
+					"title": "URI",
+					"type": "string"
+				  }
+			}
+		},
+
 		"var_codinstr": {
 			"type": "string",
 			"title": "Recoding and derivation"
@@ -196,9 +242,9 @@
                 "type": "string",
                 "title": "Name"
               },
-              "value": {
+              "note": {
                 "type": "string",
-                "title": "Value"
+                "title": "Note"
               }
             }
           },

From 559a93021b0425f93eca9eb3f85682afb37109bc Mon Sep 17 00:00:00 2001
From: Mehmood Asghar <mah0001@gmail.com>
Date: Tue, 15 Feb 2022 13:53:43 +0500
Subject: [PATCH 11/79] add support for whitelisting users to access data by
 collections

---
 application/config/data_access.php            |   2 +-
 application/controllers/Study.php             |  10 +-
 .../admin/Dataaccess_whitelist.php            |  58 ++++++++
 .../controllers/api/Dataaccess_whitelist.php  | 132 ++++++++++++++++++
 .../models/Data_access_whitelist_model.php    | 126 +++++++++++++++++
 application/models/Survey_resource_model.php  |  38 +++--
 .../views/dataaccess_whitelist/index.php      |  63 +++++++++
 install/schema.mysql.sql                      |   9 ++
 install/schema.sqlsrv.sql                     |  10 ++
 9 files changed, 437 insertions(+), 11 deletions(-)
 create mode 100644 application/controllers/admin/Dataaccess_whitelist.php
 create mode 100644 application/controllers/api/Dataaccess_whitelist.php
 create mode 100644 application/models/Data_access_whitelist_model.php
 create mode 100644 application/views/dataaccess_whitelist/index.php

diff --git a/application/config/data_access.php b/application/config/data_access.php
index 9f1671335..b55c7d9ea 100644
--- a/application/config/data_access.php
+++ b/application/config/data_access.php
@@ -42,7 +42,7 @@
 */
 $config['data_access_options'] = array(
     'public'=> array(
-        'cc40', 'open', 'direct','public','licensed','remote', 'data_na'
+        'cc40', 'open', 'direct','public','licensed','remote', 'data_na','data_enclave'
     ),
     'official'=> array(
         'research_license','data_na'
diff --git a/application/controllers/Study.php b/application/controllers/Study.php
index 10ceabe17..7a18b4305 100644
--- a/application/controllers/Study.php
+++ b/application/controllers/Study.php
@@ -301,7 +301,7 @@ public function related_datasets($sid)
 
 	
 	public function get_microdata($sid)
-	{		
+	{
 		$this->load->model("Form_model");		
 
 		$form_obj=$this->Form_model->get_form_by_survey($sid);
@@ -329,6 +329,14 @@ public function get_microdata($sid)
 			$content="Data Access Not Available";
 		}
 
+		$user=$this->ion_auth->current_user();		
+		$this->load->model("Data_access_whitelist_model");
+		$user_whitelisted=$this->Data_access_whitelist_model->has_access($user->id,$sid);
+
+		if($user_whitelisted){
+			$content=$this->Data_access_whitelist_model->get_data_files($sid);
+		}
+
 		$this->render_page($sid, $content,'get_microdata');
 	}
 
diff --git a/application/controllers/admin/Dataaccess_whitelist.php b/application/controllers/admin/Dataaccess_whitelist.php
new file mode 100644
index 000000000..d1b4a1804
--- /dev/null
+++ b/application/controllers/admin/Dataaccess_whitelist.php
@@ -0,0 +1,58 @@
+<?php
+class Dataaccess_whitelist extends MY_Controller {
+
+    public function __construct()
+    {
+        parent::__construct();
+
+		$this->template->set_template('admin5');
+		$this->load->model("Data_access_whitelist_model");
+        $this->load->model("Repository_model");
+		$this->load->helper(array ('querystring_helper','url', 'form') );
+        $this->load->library( array('acl_manager','form_validation','pagination') );
+
+        $this->lang->load('general');
+        //$this->output->enable_profiler(TRUE);        
+    }
+
+    function index()
+    {
+        $this->acl_manager->has_access_or_die('citation', 'view');
+        $options['rows']=$this->Data_access_whitelist_model->select_all();
+        $options['collections']=$this->Repository_model->list_all();
+
+        $content=$this->load->view('dataaccess_whitelist/index', $options,true);
+		$this->template->write('title', t('Data access whitelist'),true);
+		$this->template->write('content', $content,true);
+	  	$this->template->render();
+	}
+
+
+    function create()
+    {
+        $user_id=$this->Data_access_whitelist_model->get_user_id($this->input->post("email"));
+        $repository_id=$this->input->post("repository_id");
+
+        if(!$repository_id || !$user_id){
+            $this->session->set_flashdata('error', t('Invalid values for `collection_name` or `email`'));
+    		redirect("admin/dataaccess_whitelist","refresh");        
+        }
+
+        $result=$this->Data_access_whitelist_model->insert($repository_id,$user_id);
+        
+        $this->session->set_flashdata('message', t('form_update_success'));
+		redirect("admin/dataaccess_whitelist","refresh");        
+    }
+
+
+    function delete($id)
+    {
+        $this->Data_access_whitelist_model->delete_by_id($id);
+        $this->session->set_flashdata('message', t('form_update_success'));
+		redirect("admin/dataaccess_whitelist","refresh");
+    }
+
+
+}
+/* End of file Dataaccess_whitelist.php */
+/* Location: ./controllers/admin/Dataaccess_whitelist.php */
diff --git a/application/controllers/api/Dataaccess_whitelist.php b/application/controllers/api/Dataaccess_whitelist.php
new file mode 100644
index 000000000..e71d09a28
--- /dev/null
+++ b/application/controllers/api/Dataaccess_whitelist.php
@@ -0,0 +1,132 @@
+<?php
+
+use GuzzleHttp\Client;
+use GuzzleHttp\HandlerStack;
+use GuzzleHttp\Middleware;
+
+require(APPPATH.'/libraries/MY_REST_Controller.php');
+
+
+class Dataaccess_whitelist extends MY_REST_Controller
+{
+	public function __construct()
+	{
+		parent::__construct();
+		$this->load->helper("date");
+		$this->load->model('Dataset_model');
+		$this->load->model("Survey_resource_model");
+		$this->load->model("Data_access_whitelist_model");
+		$this->is_admin_or_die();
+	}
+
+	//override authentication to support both session authentication + api keys
+	function _auth_override_check()
+	{
+		if ($this->session->userdata('user_id')){
+			return true;
+		}
+
+		parent::_auth_override_check();
+	}
+	
+
+	/**
+	 * 
+	 * List
+	 * 
+	 **/
+	function index_get()
+	{
+		try{
+			$result=$this->Data_access_whitelist_model->select_all();
+
+			$response=array(
+				'status'=>'success',
+				'result'=>$result
+			);
+
+			$this->set_response($response, REST_Controller::HTTP_OK);
+		}
+		catch(Exception $e){
+			$this->set_response($e->getMessage(), REST_Controller::HTTP_BAD_REQUEST);
+		}	
+	}
+
+
+	/**
+     * 
+     * 
+     * Create
+     * 
+     * 
+     */
+    function index_post()
+	{
+		try{
+            $options=$this->raw_json_input();
+
+			$collection_name=isset($options['collection_name']) ? $options['collection_name'] :null;
+			$email=isset($options['email']) ? $options['email'] : null;
+
+			$repository_id=$this->Data_access_whitelist_model->get_repo_id($collection_name);
+			$user_id=$this->Data_access_whitelist_model->get_user_id($email);
+
+			if(!$repository_id || !$user_id){
+				throw new Exception("Invalid values for `collection_name` or `email`");
+			}
+			
+            $result=$this->Data_access_whitelist_model->insert($repository_id,$user_id);
+
+            $output=array(
+                'status'=>'success',
+                'result'=>$result
+            );
+            $this->set_response($output, REST_Controller::HTTP_OK);			
+        }
+        catch(Exception $e){
+            $error_output=array(
+                'status'=>'failed',
+                'message'=>$e->getMessage()
+            );
+            $this->set_response($error_output, REST_Controller::HTTP_BAD_REQUEST);			
+        }
+	}
+
+	
+	function index_delete()
+	{
+		try{
+			
+			$options=$this->raw_json_input();
+
+			$collection_name=isset($options['collection_name']) ? $options['collection_name'] :null;
+			$email=isset($options['email']) ? $options['email'] : null;
+
+			$repository_id=$this->Data_access_whitelist_model->get_repo_id($collection_name);
+			$user_id=$this->Data_access_whitelist_model->get_user_id($email);
+
+			if(!$repository_id || !$user_id){
+				throw new Exception("Invalid values for `collection_name` or `email`");
+			}
+		
+			$result=$this->Data_access_whitelist_model->delete($repository_id,$user_id);
+
+			$response=array(
+				'status'=>'success',
+				'message'=>'DELETED',
+				'result'=>$result
+			);
+
+			$this->set_response($response, REST_Controller::HTTP_OK);
+		}
+		catch(Exception $e){
+			$error_output=array(
+				'status'=>'failed',
+				'message'=>$e->getMessage()
+			);
+			$this->set_response($error_output, REST_Controller::HTTP_BAD_REQUEST);
+		}
+	}
+
+	
+}
diff --git a/application/models/Data_access_whitelist_model.php b/application/models/Data_access_whitelist_model.php
new file mode 100644
index 000000000..feef90d0b
--- /dev/null
+++ b/application/models/Data_access_whitelist_model.php
@@ -0,0 +1,126 @@
+<?php
+class Data_access_whitelist_model extends CI_Model {
+ 
+    public function __construct()
+    {
+        parent::__construct();
+		//$this->output->enable_profiler(TRUE);
+		$this->load->model("Repository_model");
+    }
+
+
+	function select_all()
+	{
+		$this->db->select("data_access_whitelist.id,repositories.id as collection_id,repositories.repositoryid as collection_name, users.id as user_id,users.email, users.username");
+		$this->db->join('repositories', 'repositories.id= data_access_whitelist.repository_id');
+		$this->db->join('users', 'users.id= data_access_whitelist.user_id');
+		$result=$this->db->get('data_access_whitelist')->result_array();
+
+		return $result;
+	}
+	
+	function has_access($userid,$sid)
+	{
+		//get repository id from study
+		$this->db->select("repositoryid");
+		$this->db->where("id",$sid);
+		$study=$this->db->get("surveys")->row_array();
+
+		if(!$study){
+			return false;
+		}
+
+		$repoid=$study['repositoryid'];
+		$repository_uid=$this->Repository_model->get_repositoryid_uid($repoid);
+
+		//check 
+		$this->db->select("*");
+		$this->db->where("user_id",$userid);
+		$this->db->where("repository_id",$repository_uid);
+		$result=$this->db->get("data_access_whitelist")->row_array();
+
+		if(!$result){
+			return false;
+		}
+
+		return true;
+	}
+	
+
+	function get_data_files($sid)
+	{
+		$this->load->model('Survey_resource_model');
+		$result['resources_microdata']=$this->Survey_resource_model->get_microdata_resources($sid);
+		$result['sid']=$sid;
+		$result['storage_path']=$this->Dataset_model->get_storage_fullpath($sid);
+		return $this->load->view('catalog_search/survey_summary_microdata', $result,TRUE);
+	}
+
+
+	function insert($repository_id, $user_id)
+	{	
+		if ($this->row_exists($repository_id,$user_id)){
+			throw new Exception("User is already whitelisted");
+		}
+		
+		$data=array(
+			'user_id'=>$user_id,
+			'repository_id'=>$repository_id
+		);
+		
+		$result=$this->db->insert('data_access_whitelist', $data);
+
+		if ($result===false){
+			throw new MY_Exception($this->db->_error_message());
+		}
+		
+		return $this->db->insert_id();
+	}
+
+	function row_exists($repository_id,$user_id)
+	{
+		$this->db->select("*");
+		$this->db->where('repository_id', $repository_id); 
+		$result=$this->db->get("data_access_whitelist")->result_array(); 
+
+		if ($result)
+		{
+			return true;
+		}
+
+		return false;
+	}
+
+
+	function delete($repository_id,$user_id)
+	{
+		$this->db->where('repository_id', $repository_id); 
+		$this->db->where('user_id', $user_id); 
+		return $this->db->delete('data_access_whitelist');
+	}
+
+	function delete_by_id($id)
+	{
+		$this->db->where('id', $id); 
+		return $this->db->delete('data_access_whitelist');
+	}
+
+	
+	function get_repo_id($collection_name){
+		return $this->Repository_model->get_repositoryid_uid($collection_name);
+	}
+
+	function get_user_id($email)
+	{
+		$this->db->select("id");
+		$this->db->where("email",$email);
+		$result=$this->db->get("users")->row_array();
+
+		if ($result){
+			return $result['id'];
+		}
+
+		return false;
+	}
+
+}
diff --git a/application/models/Survey_resource_model.php b/application/models/Survey_resource_model.php
index 162e7a0fa..d8141ae7f 100644
--- a/application/models/Survey_resource_model.php
+++ b/application/models/Survey_resource_model.php
@@ -804,14 +804,7 @@ function get_user_download_access_info($user_id,$survey_id,$resource_obj)
 					}
 				}
 			
-				return array(
-					'access'=>false,
-					'is_microdata'=>true,
-					'license'=>$data_access_type,
-					'access_request'=>$req,
-					'error'=>'expired'
-				);
-
+				return false;
 				break;
 
 			case 'public':
@@ -842,6 +835,31 @@ function get_user_download_access_info($user_id,$survey_id,$resource_obj)
 	}
 
 
+	function whitelist_download($user_id,$survey_id,$resource)
+	{
+		$this->load->model("Data_access_whitelist_model");
+		$user_whitelisted=$this->Data_access_whitelist_model->has_access($user_id,$survey_id);
+
+		if(!$user_whitelisted){
+			return false;
+		}
+
+		$resource_path=$this->get_resource_download_path($resource['resource_id']);
+
+		if (!file_exists($resource_path)){
+			throw new Exception ('RESOURCE_FILE_NOT_FOUND');
+		}
+
+		$is_microdata=$this->is_microdata_resource($resource);
+		
+		$this->load->helper('download');
+		log_message('info','Downloading file <em>'.$resource_path.'</em>');
+		$this->db_logger->write_log('download',basename($resource_path),($is_microdata ? 'microdata': 'resource'),$survey_id);
+		$this->db_logger->increment_study_download_count($survey_id);
+		force_download2($resource_path);
+	}
+	
+
 	function download($user,$survey_id,$resource_id)
 	{
 		//get resource
@@ -852,7 +870,9 @@ function download($user,$survey_id,$resource_id)
 		}
 
 		$user_id=isset($user->id) ? $user->id : false;
-
+		
+		$this->whitelist_download($user_id,$survey_id,$resource);
+		
 		$download_req=$this->get_user_download_access_info($user_id,$survey_id,$resource);
 
 		if (!$download_req){
diff --git a/application/views/dataaccess_whitelist/index.php b/application/views/dataaccess_whitelist/index.php
new file mode 100644
index 000000000..947fb718c
--- /dev/null
+++ b/application/views/dataaccess_whitelist/index.php
@@ -0,0 +1,63 @@
+<div class="container-fluid menu-index-page">
+
+<?php $message=$this->session->flashdata('message');?>
+<?php echo ($message!="") ? '<div class="alert alert-success">'.$message.'</div>' : '';?>
+
+<?php $error=$this->session->flashdata('error');?>
+<?php echo ($error!="") ? '<div class="alert alert-danger">'.$error.'</div>' : '';?>
+
+
+<h3 class="page-title mt-5 mb-5"><?php echo t('Whitelist data access');?></h3>
+
+
+
+	<?php echo form_open_multipart(site_url('admin/dataaccess_whitelist/create'), array('class'=>'form mt-4') ); ?>
+	<div class="form-row align-items-center">
+		<div class="col-md-3">
+			<div class="form-group" >
+				<label for="username"><?php echo t('Email'); ?><span class="required">*</span></label>
+				<input class="form-control"  name="email" type="text" id="email"  value="<?php echo get_form_value('email', isset($email) ? $email : ''); ?>"/>			
+			</div>
+		</div>		
+		<div class="col-md-3">
+			<div class="form-group">
+				<label for="collection">Collection</label>
+				<select class="form-control" name="repository_id">
+					<option value="0">Select</option>
+					<?php foreach($collections as $collection):?>
+						<option value="<?php echo $collection['id'];?>"><?php echo $collection['title'];?> (<?php echo $collection['repositoryid'];?>)</option>
+					<?php endforeach;?>
+				</select>
+			</div>			
+		</div>
+		<div class="col-md-1">
+		<button type="submit" class="btn btn-primary mt-3">Whitelist</button>
+		</div>
+	</div>
+	<?php echo form_close();?>
+
+<?php if ($rows): ?>
+    <!-- grid -->
+    <table class="table table-striped table-sm table-border-bottom" width="100%" cellspacing="0" cellpadding="0">
+    	<tr class="header">
+			<th>Email</th>
+			<th>Collection</th>
+			<th><?php echo t('actions');?></th>
+        </tr>
+	<?php $tr_class=""; ?>
+	<?php foreach($rows as $row): ?>
+		<?php if($tr_class=="") {$tr_class="alternate";} else{ $tr_class=""; } ?>
+    	<tr class="<?php echo $tr_class; ?>">        	
+            <td><?php echo $row['email'];?></td>
+            <td><?php echo $row['collection_name'];?></td>
+			<td>
+                <a href="<?php echo current_url();?>/delete/<?php echo $row['id'];?>"><?php echo t('delete');?></a>
+            </td>
+        </tr>
+    <?php endforeach;?>
+    </table>
+
+<?php else: ?>
+	<?php echo t('no_records_found'); ?>
+<?php endif;?>
+</div>
\ No newline at end of file
diff --git a/install/schema.mysql.sql b/install/schema.mysql.sql
index af7c39648..801a1fb1d 100644
--- a/install/schema.mysql.sql
+++ b/install/schema.mysql.sql
@@ -1486,3 +1486,12 @@ CREATE TABLE `survey_facets` (
   `term_id` int(11) DEFAULT NULL,
   PRIMARY KEY (`id`)
 ) AUTO_INCREMENT=1 DEFAULT CHARSET=utf8;
+
+
+
+CREATE TABLE `data_access_whitelist` (
+  `id` int NOT NULL AUTO_INCREMENT,
+  `user_id` int DEFAULT NULL,
+  `repository_id` int DEFAULT NULL,
+  PRIMARY KEY (`id`)
+) AUTO_INCREMENT=1;
diff --git a/install/schema.sqlsrv.sql b/install/schema.sqlsrv.sql
index 496db2c46..33232c835 100644
--- a/install/schema.sqlsrv.sql
+++ b/install/schema.sqlsrv.sql
@@ -1519,3 +1519,13 @@ CREATE TABLE user_roles (
 
 insert into user_roles (user_id, role_id) 
 	select user_id, group_id from users_groups;
+
+
+
+
+CREATE TABLE data_access_whitelist (
+  id int NOT NULL identity(1,1),
+  user_id int DEFAULT NULL,
+  repository_id int DEFAULT NULL,
+  PRIMARY KEY (id)
+);
\ No newline at end of file

From 6c694e98fd25307109247e211aaec92facf484ea Mon Sep 17 00:00:00 2001
From: Mehmood Asghar <mah0001@gmail.com>
Date: Fri, 18 Feb 2022 20:22:02 +0500
Subject: [PATCH 12/79] misc schema updates

---
 .../catalog-admin/document-schema.json        |   29 +-
 .../catalog-admin/image-schema.json           |   26 +-
 .../catalog-admin/script-schema.json          |  142 +-
 .../catalog-admin/table-schema.json           |  407 ++--
 .../catalog-admin/timeseries-db-schema.json   |   64 +-
 .../catalog-admin/timeseries-schema.json      |  825 ++++----
 .../catalog-admin/video-schema.json           |  408 +++-
 application/schemas/document-schema.json      |   29 +-
 application/schemas/image-schema.json         |   26 +-
 application/schemas/table-schema.json         |  407 ++--
 application/schemas/timeseries-db-schema.json |   64 +-
 application/schemas/timeseries-schema.json    | 1793 +++++++++--------
 application/schemas/video-schema.json         |   24 +-
 13 files changed, 2361 insertions(+), 1883 deletions(-)

diff --git a/api-documentation/catalog-admin/document-schema.json b/api-documentation/catalog-admin/document-schema.json
index 20d14dd4d..b85794a16 100644
--- a/api-documentation/catalog-admin/document-schema.json
+++ b/api-documentation/catalog-admin/document-schema.json
@@ -118,17 +118,15 @@
             "idno": {
               "type": "string",
               "title": "Unique user defined ID",
-              "description": "The ID number of a dataset is a unique number that is used to identify a particular survey. Define and use a consistent scheme to use. Such an ID could be constructed as follows: country-producer-survey-year-version where \n - country is the 3-letter ISO country abbreviation \n - producer is the abbreviation of the producing agency \n - survey is the survey abbreviation \n - year is the reference year (or the year the survey started) \n - version is the number dataset version number (see Version Description below)"
+              "description": "The ID number of a dataset is a unique number that is used to identify a document."
             },
             "title": {
               "type": "string",
-              "title": "Survey title",
-              "description": "The title is the official name of the survey as it is stated on the questionnaire or as it appears in the design documents. The following items should be noted:\n - Include the reference year(s) of the survey in the title. \n - Do not include the abbreviation of the survey name in the title. \n - As the survey title is a proper noun, the first letter of each word should be capitalized (except for prepositions or other conjunctions).\n - Including the country name in the title is optional."
+              "title": "Title"              
             },
             "sub_title": {
               "type": "string",
-              "title": "Survey subtitle",
-              "description": "A short subtitle for the survey"
+              "title": "Subtitle"
             },
             "alternate_title": {
               "type": "string",
@@ -246,27 +244,28 @@
           "description": "Date on which document was published."    
         },
 
-        "id_numbers": {
+        "identifiers": {
           "type": "array",
-          "title": "Identifier numbers",
-          "description": "Numbers e.g. ISSN, ISBN, DOI, etc.",
+          "title": "Other identifiers",
+          "description": "Other identifiers",
           "items": {
             "type": "object",
             "properties": {
               "type": {
-                "title": "Type",
-                "description":"ID number type such as  ISSN, ISBN, DOI"
+                "title": "Identifier type",
+                "description": "Type of identifier e.g. `doi`, `handle`, `other`",
+                "type": "string"
               },
-              "value": {
-                "title": "ID number",
-                "type": "string"               
+              "identifier": {
+                "title": "Identifier",
+                "type": "string"
               }
             },
             "required": [
-              "type","value"
+              "identifier"
             ]
           }
-        },  
+        }, 
 
         "type": {
           "type": "string",
diff --git a/api-documentation/catalog-admin/image-schema.json b/api-documentation/catalog-admin/image-schema.json
index 2433a3d91..de8188bf2 100644
--- a/api-documentation/catalog-admin/image-schema.json
+++ b/api-documentation/catalog-admin/image-schema.json
@@ -188,18 +188,18 @@
 					]
 				}
 			}
+		},
+		"provenance":{
+			"type":"array",
+			"description":"Provenance",
+			"items":{
+			  "$ref":"provenance-schema.json"
+			}
+		  },
+		"additional": {
+			"type": "object",
+			"description": "Additional metadata",
+			"properties": {}
 		}
-	},
-	"provenance":{
-		"type":"array",
-		"description":"Provenance",
-		"items":{
-		  "$ref":"provenance-schema.json"
-		}
-	  },
-	"additional": {
-		"type": "object",
-		"description": "Additional metadata",
-		"properties": {}
-	}
+	}	
 }
\ No newline at end of file
diff --git a/api-documentation/catalog-admin/script-schema.json b/api-documentation/catalog-admin/script-schema.json
index 0a87296ee..b73cac6cf 100644
--- a/api-documentation/catalog-admin/script-schema.json
+++ b/api-documentation/catalog-admin/script-schema.json
@@ -96,6 +96,28 @@
               "title": "Unique user defined ID",
               "description": "The ID number of a research project is a unique number that is used to identify a particular project. Define and use a consistent scheme to use."
             },
+            "identifiers": {
+              "type": "array",
+              "title": "Other identifiers",
+              "description": "Other identifiers",
+              "items": {
+                "type": "object",
+                "properties": {
+                  "type": {
+                    "title": "Identifier type",
+                    "description": "Type of identifier e.g. `doi`, `handle`, `other`",
+                    "type": "string"
+                  },
+                  "identifier": {
+                    "title": "Identifier",
+                    "type": "string"
+                  }
+                },
+                "required": [
+                  "identifier"
+                ]
+              }
+            },
             "title": {
               "type": "string",
               "title": "Project title",
@@ -275,19 +297,22 @@
           }
         },
         "errata": {
-          "type": "object",
+          "type": "array",
           "title": "Errata",
           "description": "List of corrected errors in data, scripts or output",
-          "properties": {
-            "erratum_date": {
-              "title": "Date of erratum",
-              "description": "Date when the erratum was reported or published",
-              "type": "string"
-            },
-            "erratum_description": {
-              "title": "Description of the erratum",
-              "description": "A description of the erratum, with information on which data, scripts, or output were impacted",
-              "type": "string"
+          "items": {
+            "type": "object",
+            "properties": {
+              "date": {
+                "title": "Date of erratum",
+                "description": "Date when the erratum was reported or published",
+                "type": "string"
+              },
+              "description": {
+                "title": "Description of the erratum",
+                "description": "A description of the erratum, with information on which data, scripts, or output were impacted",
+                "type": "string"
+              }
             }
           }
         },
@@ -538,6 +563,18 @@
           "description": "Acknowledgement statement",
           "type": "string"
         },
+        "disclaimer": {
+          "title": "Disclaimer",
+          "type": "string"
+        },
+        "confidentiality": {
+          "title": "Confidentiality",
+          "type": "string"
+        },
+        "citation_requirement": {
+          "type": "string",
+          "description": "Citation requirement (can include a specific recommended citation)"
+        },
         "related_projects": {
           "type": "array",
           "title": "Related research projects",
@@ -747,6 +784,10 @@
             }
           }
         },
+        "copyright": {
+          "title": "Copyright",
+          "type": "string"
+        },
         "technology_environment": {
           "title": "Technology environment",
           "description": "Notes about the technology environment used by the authors to implement the project",
@@ -808,7 +849,7 @@
             },
             "additionalProperties": false
           },
-          "required": [ 
+          "required": [
             "name"
           ]
         },
@@ -996,52 +1037,41 @@
           "required": [
             "name"
           ]
-        },
-        "provenance":{
-          "type":"array",
-          "description":"Provenance",
-          "items":{
-            "$ref":"provenance-schema.json"
-          }
-          },
-        "tags": {
-          "type": "array",
-          "title": "Tags (user-defined)",
-          "description": "Tags",
-          "items": {
-            "type": "object",
-            "properties": {
-              "tag": {
-                "title": "Tag",
-                "type": "string"
-              },
-              "tag_group": {
-                "title": "Tag group",
-                "type": "string"
-              }
-            }
+        }        
+      }      
+    },
+    "provenance": {
+      "type": "array",
+      "description": "Provenance",
+      "items": {
+        "$ref": "provenance-schema.json"
+      }
+    },
+    "tags": {
+      "type": "array",
+      "title": "Tags (user-defined)",
+      "description": "Tags",
+      "items": {
+        "type": "object",
+        "properties": {
+          "tag": {
+            "title": "Tag",
+            "type": "string"
           },
-          "required": [
-            "tag"
-          ]
-        },
-        "copyright": {
-          "title": "Copyright",
-          "type": "string"
-        },
-        "disclaimer": {
-          "title": "Disclaimer",
-          "type": "string"
-        },
-        "confidentiality": {
-          "title": "Confidentiality",
-          "type": "string"
-        },
-        "citation_requirement": {
-          "type": "string",
-          "description": "Citation requirement (can include a specific recommended citation)"
+          "tag_group": {
+            "title": "Tag group",
+            "type": "string"
+          }
         }
-      }
+      },
+      "required": [
+        "tag"
+      ]
+    },
+    "additional": {
+      "type": "object",
+      "description": "Additional metadata",
+      "properties": {}
     }
   }
 }
\ No newline at end of file
diff --git a/api-documentation/catalog-admin/table-schema.json b/api-documentation/catalog-admin/table-schema.json
index f7d52e318..b1c7ad573 100644
--- a/api-documentation/catalog-admin/table-schema.json
+++ b/api-documentation/catalog-admin/table-schema.json
@@ -3,29 +3,29 @@
   "$schema": "http://json-schema.org/draft-07/schema#",
   "description": "Draft Schema for Table data type",
   "type": "object",
-  "definitions":{
-    "authoring_entity":{
-      "type":"array",
-      "title":"Authoring entity/Primary investigators",
-      "description":"The person, corporate body, or agency responsible for the work's substantive and intellectual content. Repeat the element for each author, and use 'affiliation' attribute if available. Invert first and last name and use commas.",
-      "items":{
-        "type":"object",
-        "properties":{
-          "name":{
-            "title":"Agency Name",
-            "type":"string"
+  "definitions": {
+    "authoring_entity": {
+      "type": "array",
+      "title": "Authoring entity/Primary investigators",
+      "description": "The person, corporate body, or agency responsible for the work's substantive and intellectual content. Repeat the element for each author, and use 'affiliation' attribute if available. Invert first and last name and use commas.",
+      "items": {
+        "type": "object",
+        "properties": {
+          "name": {
+            "title": "Agency Name",
+            "type": "string"
           },
-          "affiliation":{
-            "title":"Affiliation",
-            "type":"string"
+          "affiliation": {
+            "title": "Affiliation",
+            "type": "string"
           },
-          "abbreviation":{
-            "title":"Abbreviation",
-            "type":"string"
+          "abbreviation": {
+            "title": "Abbreviation",
+            "type": "string"
           },
-          "uri":{
-            "title":"URI",
-            "type":"string"
+          "uri": {
+            "title": "URI",
+            "type": "string"
           },
           "author_id": {
             "type": "array",
@@ -46,90 +46,89 @@
             }
           }
         },
-        "required":[
+        "required": [
           "name"
         ]
       }
     },
-    "contributor":{
-      "type":"array",
-      "items":{
-        "type":"object",
-        "properties":{
-          "name":{
-            "title":"Name",
-            "type":"string"
+    "contributor": {
+      "type": "array",
+      "items": {
+        "type": "object",
+        "properties": {
+          "name": {
+            "title": "Name",
+            "type": "string"
           },
-          "affiliation":{
-            "title":"Affiliation",
-            "type":"string"
+          "affiliation": {
+            "title": "Affiliation",
+            "type": "string"
           },
-          "abbreviation":{
-            "title":"Abbreviation",
-            "type":"string"
+          "abbreviation": {
+            "title": "Abbreviation",
+            "type": "string"
           },
-          "role":{
-            "title":"Role",
-            "type":"string"
+          "role": {
+            "title": "Role",
+            "type": "string"
           },
-          "uri":{
-            "title":"URI",
-            "type":"string"
+          "uri": {
+            "title": "URI",
+            "type": "string"
           }
         },
-        "required":[
+        "required": [
           "name"
         ]
       }
     },
-    "keyword":{
-      "type":"array",
-      "items":{
-        "type":"object",
-        "properties":{
-          "name":{
-            "title":"Name",
-            "type":"string"
+    "keyword": {
+      "type": "array",
+      "items": {
+        "type": "object",
+        "properties": {
+          "name": {
+            "title": "Name",
+            "type": "string"
           },
-          "vocabulary":{
-            "title":"Vocabulary name",
-            "type":"string"
+          "vocabulary": {
+            "title": "Vocabulary name",
+            "type": "string"
           },
-          "uri":{
-            "title":"Vocabulary URI",
-            "type":"string"
+          "uri": {
+            "title": "Vocabulary URI",
+            "type": "string"
           }
         }
       }
     }
   },
-  "properties": {    
-
+  "properties": {
     "repositoryid": {
       "type": "string",
       "title": "Collection ID that owns the document",
       "description": "Abbreviation for the collection that owns the document"
     },
-
     "published": {
       "type": "integer",
       "title": "Status",
       "description": "Status  - 0=draft, 1=published",
       "default": 0
     },
-    
     "overwrite": {
       "type": "string",
-      "description": "Overwrite document if already exists?",            
-      "enum":["yes","no"],
+      "description": "Overwrite document if already exists?",
+      "enum": [
+        "yes",
+        "no"
+      ],
       "default": "no"
     },
-
-    "metadata_information": {      
+    "metadata_information": {
       "type": "object",
       "title": "Document metadata information",
       "description": "Document description",
-      "properties": {        
+      "properties": {
         "idno": {
           "title": "Unique ID number for the document",
           "type": "string"
@@ -181,8 +180,7 @@
       "type": "object",
       "title": "Table Description",
       "description": "Table Description",
-      "properties": {  
-
+      "properties": {
         "title_statement": {
           "type": "object",
           "description": "Title statement",
@@ -212,10 +210,9 @@
               "title": "Abbreviation or Acronym",
               "description": "Any form of the title used as a substitute or alternative to the formal title of the resource."
             },
-            "abbreviated_title": {
-              "title": "Abbreviated Title",
-              "description": "Title as abbreviated for indexing or identification.",
-              "type": "string"              
+            "translated_title": {
+              "title": "Translated title",
+              "type": "string"
             }
           },
           "required": [
@@ -223,99 +220,98 @@
             "title"
           ]
         },
-
-        "id_numbers": {
-          "type": "object",
-          "title": "Identifier numbers",
-          "description": "Numbers e.g. ISSN, ISBN, DOI, etc.",          
-          "properties": {
-            "type": {
-              "title": "Type",
-              "description":"ID number type such as  ISSN, ISBN, DOI",
-              "type": "string"
+        "identifiers": {
+          "type": "array",
+          "title": "Other identifiers",
+          "description": "Other identifiers",
+          "items": {
+            "type": "object",
+            "properties": {
+              "type": {
+                "title": "Identifier type",
+                "description": "Type of identifier e.g. `doi`, `handle`, `other`",
+                "type": "string"
+              },
+              "identifier": {
+                "title": "Identifier",
+                "type": "string"
+              }
             },
-            "value": {
-              "title": "ID number",
-              "type": "string"              
-            }
-          },
-          "required": [
-            "type","value"
-          ]
-        },        
-        
+            "required": [
+              "identifier"
+            ]
+          }
+        },
         "authoring_entity": {
           "title": "Authoring entity",
-          "$ref":"#/definitions/authoring_entity",
+          "$ref": "#/definitions/authoring_entity",
           "description": "Authoring entity"
         },
         "contributors": {
           "title": "Contributors",
-          "$ref":"#/definitions/contributor",
+          "$ref": "#/definitions/contributor",
           "description": "Contributors"
         },
-        "publisher":{
-          "type":"array",
-          "title":"Publisher",
-          "description":"Publisher",
-          "items":{
-            "type":"object",
-            "properties":{
-              "name":{
-                "title":"Name",
-                "type":"string"
-              },
-              "affiliation":{
-                "title":"Affiliation",
-                "type":"string"
-              },
-              "abbreviation":{
-                "title":"Abbreviation",
-                "type":"string"
-              },
-              "role":{
-                "title":"Role",
-                "type":"string"
-              },
-              "uri":{
-                "title":"URI",
-                "type":"string"
+        "publisher": {
+          "type": "array",
+          "title": "Publisher",
+          "description": "Publisher",
+          "items": {
+            "type": "object",
+            "properties": {
+              "name": {
+                "title": "Name",
+                "type": "string"
+              },
+              "affiliation": {
+                "title": "Affiliation",
+                "type": "string"
+              },
+              "abbreviation": {
+                "title": "Abbreviation",
+                "type": "string"
+              },
+              "role": {
+                "title": "Role",
+                "type": "string"
+              },
+              "uri": {
+                "title": "URI",
+                "type": "string"
               }
             },
-            "required":[
+            "required": [
               "name"
             ]
           }
         },
         "date_created": {
           "type": "string",
-          "title":"Date created",
+          "title": "Date created",
           "description": "Date created"
         },
         "date_published": {
           "type": "string",
-          "title":"Date published"
+          "title": "Date published"
         },
         "date_modified": {
           "type": "string",
-          "title":"Date last modified",
-          "description": "Date on which the resource was changed."    
+          "title": "Date last modified",
+          "description": "Date on which the resource was changed."
         },
-
         "version": {
           "title": "Version",
-          "type": "string"        
+          "type": "string"
         },
         "description": {
           "title": "Description",
           "type": "string",
-          "description":"Description"
+          "description": "Description"
         },
-
         "table_columns": {
           "type": "array",
           "title": "Table column names",
-          "description": "List of table column names", 
+          "description": "List of table column names",
           "items": {
             "type": "object",
             "properties": {
@@ -327,7 +323,7 @@
                 "title": "Variable name",
                 "description": "Variable name",
                 "type": "string"
-              },              
+              },
               "dataset": {
                 "title": "Dataset",
                 "type": "string",
@@ -339,11 +335,10 @@
             ]
           }
         },
-
         "table_rows": {
           "type": "array",
           "title": "Table row level data",
-          "description": "Table row level data",  
+          "description": "Table row level data",
           "items": {
             "type": "object",
             "properties": {
@@ -355,7 +350,7 @@
                 "title": "Variable name",
                 "description": "Variable name",
                 "type": "string"
-              },              
+              },
               "dataset": {
                 "title": "Dataset",
                 "type": "string",
@@ -367,7 +362,6 @@
             ]
           }
         },
-
         "table_footnotes": {
           "type": "array",
           "title": "Chart footnotes",
@@ -377,7 +371,7 @@
             "properties": {
               "number": {
                 "title": "Footnote number",
-                "description":"Footnote number",
+                "description": "Footnote number",
                 "type": "string"
               },
               "text": {
@@ -388,13 +382,12 @@
             "required": [
               "text"
             ]
-          } 
+          }
         },
-
         "table_series": {
           "type": "array",
           "title": "Table series",
-          "description": "Table series", 
+          "description": "Table series",
           "items": {
             "type": "object",
             "properties": {
@@ -421,10 +414,9 @@
             ]
           }
         },
-
         "statistics": {
           "type": "array",
-          "title": "Statistics",          
+          "title": "Statistics",
           "items": {
             "type": "object",
             "properties": {
@@ -437,7 +429,7 @@
         },
         "unit_observation": {
           "type": "array",
-          "title": "Unit observation",          
+          "title": "Unit observation",
           "items": {
             "type": "object",
             "properties": {
@@ -450,7 +442,7 @@
         },
         "data_sources": {
           "type": "array",
-          "title": "Data sources",          
+          "title": "Data sources",
           "items": {
             "type": "object",
             "properties": {
@@ -461,29 +453,27 @@
               },
               "abbreviation": {
                 "title": "Abbreviation",
-                "description":"The abbreviation (acronym) of the data source.",
+                "description": "The abbreviation (acronym) of the data source.",
                 "type": "string"
-              },              
+              },
               "source_id": {
                 "title": "Source ID",
-                "description":"A unique identifier for the source, such as a Digital Object Identifier (DOI).",
+                "description": "A unique identifier for the source, such as a Digital Object Identifier (DOI).",
                 "type": "string"
               },
               "note": {
                 "title": "Note",
                 "type": "string",
-                "description":"A note that describes how the source was used, possibly mentioning issues in the use of the source."
+                "description": "A note that describes how the source was used, possibly mentioning issues in the use of the source."
               },
               "uri": {
                 "title": "URI",
                 "type": "string",
-                "description":"A link (URL) to the source dataset."
+                "description": "A link (URL) to the source dataset."
               }
             }
           }
         },
-        
-        
         "time_periods": {
           "type": "array",
           "title": "Time periods",
@@ -506,11 +496,10 @@
               "from"
             ]
           }
-        },   
-        
+        },
         "universe": {
           "type": "array",
-          "title": "Universe",          
+          "title": "Universe",
           "items": {
             "type": "object",
             "properties": {
@@ -521,10 +510,9 @@
             }
           }
         },
-
         "ref_country": {
           "type": "array",
-          "title": "Reference country",          
+          "title": "Reference country",
           "items": {
             "type": "object",
             "properties": {
@@ -539,7 +527,6 @@
             }
           }
         },
-
         "geographic_units": {
           "title": "Geographic locations",
           "description": "List of geographic units (regions, countries, states, provinces, etc.) for which data are available in the database.",
@@ -561,19 +548,43 @@
                 "title": "Type",
                 "description": "Type of geographic unit e.g. country, state, region, province etc",
                 "type": "string"
-              }          
+              }
             },
             "required": [
               "name"
             ]
           }
-        }, 
+        },
         "geographic_granularity": {
           "description": "Granularity of geographic coverage. examples `national`, `regional`, `provincial`",
           "type": "string",
-          "title":"Geographic granularity"
+          "title": "Geographic granularity"
+        },
+        "bbox": {
+          "title": "Geographic bounding box",
+          "type": "array",
+          "items": {
+            "type": "object",
+            "properties": {
+              "west": {
+                "title": "West",
+                "type": "string"
+              },
+              "east": {
+                "title": "East",
+                "type": "string"
+              },
+              "south": {
+                "title": "South",
+                "type": "string"
+              },
+              "north": {
+                "title": "North",
+                "type": "string"
+              }
+            }
+          }
         },
-        
         "languages": {
           "type": "array",
           "description": "languages",
@@ -596,10 +607,9 @@
             "name"
           ]
         },
-
         "links": {
           "type": "array",
-          "title": "Links",          
+          "title": "Links",
           "items": {
             "type": "object",
             "properties": {
@@ -614,10 +624,9 @@
             }
           }
         },
-
         "publications": {
           "type": "array",
-          "title": "Publications",          
+          "title": "Publications",
           "items": {
             "type": "object",
             "properties": {
@@ -632,16 +641,18 @@
             }
           }
         },
-        "keywords":{
-          "allOf": [ 
-            {"$ref":"#/definitions/keyword"}
+        "keywords": {
+          "allOf": [
+            {
+              "$ref": "#/definitions/keyword"
+            }
           ],
-          "title":"Keywords",
-          "description":"Keywords"
+          "title": "Keywords",
+          "description": "Keywords"
         },
-        "themes":{
-          "type":"array",
-          "description":"Themes",
+        "themes": {
+          "type": "array",
+          "description": "Themes",
           "items": {
             "type": "object",
             "properties": {
@@ -690,7 +701,7 @@
               },
               "parent_id": {
                 "title": "Parent topic Identifier",
-                "description":"For subtopics, provide the ID of the parent topic",
+                "description": "For subtopics, provide the ID of the parent topic",
                 "type": "string"
               },
               "vocabulary": {
@@ -705,11 +716,11 @@
               }
             },
             "required": [
-              "id","name"
+              "id",
+              "name"
             ]
           }
         },
-
         "disciplines": {
           "type": "array",
           "title": "Disciplines",
@@ -727,7 +738,7 @@
               },
               "parent_id": {
                 "title": "Parent discipline Identifier",
-                "description":"Parent discipline ID",
+                "description": "Parent discipline ID",
                 "type": "string"
               },
               "vocabulary": {
@@ -746,7 +757,6 @@
             ]
           }
         },
-
         "definitions": {
           "type": "array",
           "title": "Definitions",
@@ -774,7 +784,6 @@
             ]
           }
         },
-
         "classifications": {
           "type": "array",
           "title": "Classifications",
@@ -807,16 +816,13 @@
             ]
           }
         },
-
-
         "rights": {
           "type": "string",
           "title": "Rights"
         },
-
         "license": {
           "type": "array",
-          "title": "License",          
+          "title": "License",
           "items": {
             "type": "object",
             "properties": {
@@ -831,24 +837,20 @@
             }
           }
         },
-
         "citation": {
           "type": "string",
-          "title":"Citation",
-          "description": "A bibliographic reference for the resource."    
+          "title": "Citation",
+          "description": "A bibliographic reference for the resource."
         },
-
         "confidentiality": {
           "type": "string",
-          "title":"Confidentiality"
+          "title": "Confidentiality"
         },
-
         "sdc": {
           "type": "string",
-          "title":"Statistical disclosure control",
-          "description":"Information on statistical disclosure control measures applied to the table. This can include cell suppression, or other techniques. Specialized packages have been developed for this purpose, like [*sdcTable: Methods for Statistical Disclosure Control in Tabular Data*](https://cran.r-project.org/web/packages/sdcTable/index.html) and https://cran.r-project.org/web/packages/sdcTable/sdcTable.pdf \nThe information provided here should be such that it does not provide intruders with useful information for reverse-engineering the protection measures applied to the table."
+          "title": "Statistical disclosure control",
+          "description": "Information on statistical disclosure control measures applied to the table. This can include cell suppression, or other techniques. Specialized packages have been developed for this purpose, like [*sdcTable: Methods for Statistical Disclosure Control in Tabular Data*](https://cran.r-project.org/web/packages/sdcTable/index.html) and https://cran.r-project.org/web/packages/sdcTable/sdcTable.pdf \nThe information provided here should be such that it does not provide intruders with useful information for reverse-engineering the protection measures applied to the table."
         },
-
         "contacts": {
           "type": "array",
           "title": "Contacts",
@@ -886,10 +888,9 @@
             "name"
           ]
         },
-
         "notes": {
           "type": "array",
-          "title": "Notes",          
+          "title": "Notes",
           "items": {
             "type": "object",
             "properties": {
@@ -900,7 +901,6 @@
             }
           }
         },
-                
         "relations": {
           "type": "array",
           "title": "Relations",
@@ -915,7 +915,7 @@
               "type": {
                 "title": "Type",
                 "type": "string",
-                "enum":[
+                "enum": [
                   "isPartOf",
                   "hasPart",
                   "isVersionOf",
@@ -934,19 +934,17 @@
           "required": [
             "name"
           ]
-        }        
-        
+        }
       },
       "additionalProperties": false
     },
-
-    "provenance":{
-      "type":"array",
-      "description":"Provenance",
-      "items":{
-        "$ref":"provenance-schema.json"
+    "provenance": {
+      "type": "array",
+      "description": "Provenance",
+      "items": {
+        "$ref": "provenance-schema.json"
       }
-      },
+    },
     "tags": {
       "type": "array",
       "title": "Tags",
@@ -968,11 +966,10 @@
         "tag"
       ]
     },
-
     "additional": {
       "type": "object",
       "description": "Additional metadata",
       "properties": {}
     }
   }
-}
+}
\ No newline at end of file
diff --git a/api-documentation/catalog-admin/timeseries-db-schema.json b/api-documentation/catalog-admin/timeseries-db-schema.json
index c9c9116f1..b8e30c18b 100644
--- a/api-documentation/catalog-admin/timeseries-db-schema.json
+++ b/api-documentation/catalog-admin/timeseries-db-schema.json
@@ -5,21 +5,21 @@
 	"description": "Schema for timeseries database",
 	"type": "object",
 	"properties": {
-
 		"published": {
 			"type": "integer",
 			"title": "Status",
 			"description": "0=draft, 1=published",
 			"default": 0
 		},
-
 		"overwrite": {
 			"type": "string",
 			"description": "Overwrite database if already exists?",
-			"enum": ["yes", "no"],
+			"enum": [
+				"yes",
+				"no"
+			],
 			"default": "no"
 		},
-
 		"metadata_information": {
 			"type": "object",
 			"title": "Document metadata information",
@@ -79,16 +79,36 @@
 			"title": "Database Description",
 			"description": "Database Description",
 			"properties": {
-
 				"title_statement": {
 					"type": "object",
 					"description": "Study title",
-
 					"properties": {
 						"idno": {
 							"type": "string",
 							"title": "Unique user defined ID",
-							"description": "The ID number of a dataset is a unique number that is used to identify a particular survey. Define and use a consistent scheme to use. Such an ID could be constructed as follows: country-producer-survey-year-version where \n - country is the 3-letter ISO country abbreviation \n - producer is the abbreviation of the producing agency \n - survey is the survey abbreviation \n - year is the reference year (or the year the survey started) \n - version is the number dataset version number (see Version Description below)"
+							"description": "The ID number of a database is a unique number that is used to identify a particular database."
+						},
+						"identifiers": {
+							"type": "array",
+							"title": "Other identifiers",
+							"description": "Other identifiers",
+							"items": {
+								"type": "object",
+								"properties": {
+									"type": {
+										"title": "Identifier type",
+										"description": "Type of identifier e.g. `doi`, `handle`, `other`",
+										"type": "string"
+									},
+									"identifier": {
+										"title": "Identifier",
+										"type": "string"
+									}
+								},
+								"required": [
+									"identifier"
+								]
+							}
 						},
 						"title": {
 							"type": "string",
@@ -99,13 +119,11 @@
 							"type": "string",
 							"title": "Survey subtitle",
 							"description": "A short subtitle for the survey"
-
 						},
 						"alternate_title": {
 							"type": "string",
 							"title": "Abbreviation or Acronym",
 							"description": "The abbreviation of a survey is usually the first letter of each word of the titled survey. The survey reference year(s) may be included."
-
 						},
 						"translated_title": {
 							"title": "Translated Title",
@@ -118,7 +136,6 @@
 						"title"
 					]
 				},
-
 				"authoring_entity": {
 					"type": "array",
 					"title": "Authoring entity",
@@ -130,12 +147,7 @@
 								"title": "Agency Name",
 								"type": "string",
 								"description": "Name of the person, corporate body, or agency responsible for the work's substantive and intellectual content. If a person, invert first and last name and use commas."
-							},
-							"role": {
-								"title": "Role",
-								"type": "string",
-								"description": "Title of the person (if any) responsible for the work's substantive and intellectual content."
-							},
+							},							
 							"affiliation": {
 								"title": "Affiliation",
 								"type": "string"
@@ -147,6 +159,10 @@
 							"email": {
 								"title": "Email",
 								"description": "Email"
+							},
+							"uri": {
+								"title": "URI",
+								"type": "string"
 							}
 						},
 						"required": [
@@ -210,7 +226,8 @@
 							}
 						},
 						"required": [
-							"version", "date"
+							"version",
+							"date"
 						]
 					}
 				},
@@ -331,7 +348,8 @@
 							}
 						},
 						"required": [
-							"id", "name"
+							"id",
+							"name"
 						]
 					}
 				},
@@ -418,18 +436,15 @@
 						}
 					}
 				},
-
 				"geographic_granularity": {
 					"title": "Geographic granularity",
 					"description": "Granularity of geographic coverage e.g. `national`, `regional`, `provincial`",
 					"type": "string"
 				},
-
 				"geographic_area_count": {
 					"description": "Number of geographic areas",
 					"type": "string"
 				},
-
 				"sponsors": {
 					"type": "array",
 					"title": "Sponsor/Funding Agency",
@@ -467,7 +482,6 @@
 						"name"
 					]
 				},
-
 				"acknowledgments": {
 					"type": "array",
 					"title": "Other Acknowledgments",
@@ -497,12 +511,10 @@
 						"name"
 					]
 				},
-
 				"acknowledgement_statement": {
 					"title": "An overall statement of acknowledgment, which can be used as an alternative (or supplement) to the itemized list provided in `acknowledgments`.",
 					"type": "string"
 				},
-
 				"contacts": {
 					"type": "array",
 					"title": "Contacts",
@@ -540,7 +552,6 @@
 						"name"
 					]
 				},
-
 				"links": {
 					"type": "array",
 					"title": "Related links",
@@ -562,7 +573,6 @@
 						"uri"
 					]
 				},
-
 				"languages": {
 					"type": "array",
 					"description": "Supported languages",
@@ -655,7 +665,6 @@
 						}
 					}
 				},
-
 				"disclaimer": {
 					"title": "Disclaimer",
 					"type": "string"
@@ -670,7 +679,6 @@
 			],
 			"additionalProperties": false
 		},
-
 		"additional": {
 			"type": "object",
 			"title": "Additional custom metadata",
diff --git a/api-documentation/catalog-admin/timeseries-schema.json b/api-documentation/catalog-admin/timeseries-schema.json
index baac06983..2a7e2cf30 100644
--- a/api-documentation/catalog-admin/timeseries-schema.json
+++ b/api-documentation/catalog-admin/timeseries-schema.json
@@ -1,104 +1,101 @@
 {
-  "$id": "http://ihsn.org/schemas/timeseries",
-  "$schema": "http://json-schema.org/draft-07/schema#",
-  "title": "Timeseries Schema",
-  "description": "Schema for timeseries data type",
-  "type": "object",
-  "properties": {
-    
-    "repositoryid": {
-      "type": "string",
-      "title": "Collection ID that owns the series",
-      "description": "Collection that owns the series"
-    },
-
-    "access_policy": {
-      "type": "string",
-      "title": "Data access policy",
-      "description": "Data access policy for attached microdata resources",
-      "enum": [
-        "direct",
-        "open",
-        "public",
-        "licensed",
-        "remote",
-        "na"
-      ],
-      "default": "na"
-    },
-    
-    "data_remote_url": {
-      "type": "string",
-      "title": "Data website URL",
-      "description": "Link to the website where the data is available, this is only needed if `access_policy` is set to `remote`."
-    },
-    "published": {
-      "type": "integer",
-      "title": "Status",
-      "description": "Status of the study - 0=draft, 1=published",
-      "default": 0
-    },
-    "overwrite": {
-      "type": "string",
-      "description": "Overwrite database if already exists?",            
-      "enum":["yes","no"],
-      "default": "no"
-    },
-
-    "metadata_creation": {      
-      "type": "object",
-      "title": "Metadata creation",
-      "description": "Information on who generated the documentation",
-      "properties": {        
-        
-        "producers": {
-          "type": "array",
-          "title": "Producers",
-          "description": "List of producers",
-          "items": {
-            "type": "object",
-            "properties": {
-              "name": {
-                "title": "Name",
-                "description": "Name (required)",
-                "type": "string"
-              },
-              "abbr": {
-                "title": "Abbreviation",
-                "type": "string"
-              },
-              "affiliation": {
-                "type": "string",
-                "title": "Affiliation"
-              },
-              "role": {
-                "title": "Role",
-                "type": "string"
-              }
-            }
-          },
-          "required": [
-            "name"
-          ]
-        },
-        "prod_date": {
-          "title": "Date of Production",
-          "description": "Document production date using format(YYYY-MM-DD)",
-          "type": "string"
-        },
-        "version": {
-          "title": "Document version",
-          "description": "Identify and describe the current version of the document",
-          "type": "string"
-        }
-      },
-      "additionalProperties": false
-    },
-         
-      "series_description":{         
-        "description" :"Series information",
-        "type": "object",
-			"properties": {				
+	"$id": "http://ihsn.org/schemas/timeseries",
+	"$schema": "http://json-schema.org/draft-07/schema#",
+	"title": "Timeseries Schema",
+	"description": "Schema for timeseries data type",
+	"type": "object",
+	"properties": {
+		"repositoryid": {
+			"type": "string",
+			"title": "Collection ID that owns the series",
+			"description": "Collection that owns the series"
+		},
+		"access_policy": {
+			"type": "string",
+			"title": "Data access policy",
+			"description": "Data access policy for attached microdata resources",
+			"enum": [
+				"direct",
+				"open",
+				"public",
+				"licensed",
+				"remote",
+				"na"
+			],
+			"default": "na"
+		},
+		"data_remote_url": {
+			"type": "string",
+			"title": "Data website URL",
+			"description": "Link to the website where the data is available, this is only needed if `access_policy` is set to `remote`."
+		},
+		"published": {
+			"type": "integer",
+			"title": "Status",
+			"description": "Status of the study - 0=draft, 1=published",
+			"default": 0
+		},
+		"overwrite": {
+			"type": "string",
+			"description": "Overwrite database if already exists?",
+			"enum": [
+				"yes",
+				"no"
+			],
+			"default": "no"
+		},
+		"metadata_creation": {
+			"type": "object",
+			"title": "Metadata creation",
+			"description": "Information on who generated the documentation",
+			"properties": {
+				"producers": {
+					"type": "array",
+					"title": "Producers",
+					"description": "List of producers",
+					"items": {
+						"type": "object",
+						"properties": {
+							"name": {
+								"title": "Name",
+								"description": "Name (required)",
+								"type": "string"
+							},
+							"abbr": {
+								"title": "Abbreviation",
+								"type": "string"
+							},
+							"affiliation": {
+								"type": "string",
+								"title": "Affiliation"
+							},
+							"role": {
+								"title": "Role",
+								"type": "string"
+							}
+						}
+					},
+					"required": [
+						"name"
+					]
+				},
+				"prod_date": {
+					"title": "Date of Production",
+					"description": "Document production date using format(YYYY-MM-DD)",
+					"type": "string"
+				},
+				"version": {
+					"title": "Document version",
+					"description": "Identify and describe the current version of the document",
+					"type": "string"
+				}
+			},
+			"additionalProperties": false
+		},
+		"series_description": {
+			"description": "Series information",
+			"type": "object",
+			"properties": {
 				"idno": {
 					"type": "string",
 					"title": "Series unique ID",
@@ -162,6 +159,26 @@
 					"type": "string",
 					"title": "Series unit of measure"
 				},
+				"dimensions": {
+					"type": "array",
+					"title": "Dimensions",
+					"items": {
+						"type": "object",
+						"properties": {
+							"label": {
+								"title": "Label",
+								"type": "string"
+							},
+							"description": {
+								"title": "Description",
+								"type": "string"
+							}
+						},
+						"required": [
+							"label"
+						]
+					}
+				},
 				"periodicity": {
 					"type": "string",
 					"title": "Periodicity of data"
@@ -205,12 +222,10 @@
 						]
 					}
 				},
-
 				"statistical_concept": {
 					"type": "string",
 					"title": "Statistical concept"
 				},
-
 				"concepts": {
 					"type": "array",
 					"title": "Related concepts",
@@ -228,10 +243,10 @@
 								"type": "string"
 							},
 							"uri": {
-                "title": "URI",
-                "description": "Website link",
-                "type": "string"
-              }
+								"title": "URI",
+								"description": "Website link",
+								"type": "string"
+							}
 						},
 						"required": [
 							"name"
@@ -266,99 +281,94 @@
 					"type": "string",
 					"title": "Breaks in series"
 				},
-				
 				"limitation": {
 					"type": "string",
 					"title": "Limitations  and exceptions"
-				},				
-
-				"themes":{
-					"type":"array",
-					"title":"Themes",
-					"items":{
-						"type":"object",
-						"properties":{
-							"name":{
-								"title":"Name",
-								"type":"string"
-							},
-							"vocabulary":{
-								"title":"Vocabulary name",
-								"type":"string"
-							},
-							"uri":{
-								"title":"Vocabulary URI",
-								"type":"string"
+				},
+				"themes": {
+					"type": "array",
+					"title": "Themes",
+					"items": {
+						"type": "object",
+						"properties": {
+							"name": {
+								"title": "Name",
+								"type": "string"
+							},
+							"vocabulary": {
+								"title": "Vocabulary name",
+								"type": "string"
+							},
+							"uri": {
+								"title": "Vocabulary URI",
+								"type": "string"
 							}
 						}
 					}
 				},
-        "topics": {
-          "type": "array",
-          "title": "Topics",
-          "description": "Topics covered by the table (ideally, the list of topics will be a controlled vocabulary)",
-          "items": {
-            "type": "object",
-            "properties": {
-              "id": {
-                "title": "Unique Identifier",
-                "type": "string"
-              },
-              "name": {
-                "title": "Topic",
-                "type": "string"
-              },
-              "parent_id": {
-                "title": "Parent topic Identifier",
-                "description":"For subtopics, provide the ID of the parent topic",
-                "type": "string"
-              },
-              "vocabulary": {
-                "title": "Vocabulary",
-                "description": "Name of the controlled vocabulary, if the topic is from a taxonomy.",
-                "type": "string"
-              },
-              "uri": {
-                "title": "Vocabulary URI",
-                "description": "Link to the controlled vocabulary web page, if the topic is from a taxonomy.",
-                "type": "string"
-              }
-            },
-            "required": [
-              "name"
-            ]
-          }
-        },
-
-        "disciplines": {
-          "type": "array",
-          "title": "Disciplines",
-          "description": "Disciplines e.g. `Social sciences, economics`, `Natural sciences, biology`",
-          "items": {
-            "type": "object",
-            "properties": {
-              "name": {
-                "title": "Discipline title or name",
-                "type": "string"
-              },
-              "vocabulary": {
-                "title": "Vocabulary",
-                "description": "Vocabulary",
-                "type": "string"
-              },
-              "uri": {
-                "title": "URI",
-                "description": "Website link",
-                "type": "string"
-              }
-            },
-            "required": [
-              "name"
-            ]
-          }
-        },
-
-
+				"topics": {
+					"type": "array",
+					"title": "Topics",
+					"description": "Topics covered by the table (ideally, the list of topics will be a controlled vocabulary)",
+					"items": {
+						"type": "object",
+						"properties": {
+							"id": {
+								"title": "Unique Identifier",
+								"type": "string"
+							},
+							"name": {
+								"title": "Topic",
+								"type": "string"
+							},
+							"parent_id": {
+								"title": "Parent topic Identifier",
+								"description": "For subtopics, provide the ID of the parent topic",
+								"type": "string"
+							},
+							"vocabulary": {
+								"title": "Vocabulary",
+								"description": "Name of the controlled vocabulary, if the topic is from a taxonomy.",
+								"type": "string"
+							},
+							"uri": {
+								"title": "Vocabulary URI",
+								"description": "Link to the controlled vocabulary web page, if the topic is from a taxonomy.",
+								"type": "string"
+							}
+						},
+						"required": [
+							"name"
+						]
+					}
+				},
+				"disciplines": {
+					"type": "array",
+					"title": "Disciplines",
+					"description": "Disciplines e.g. `Social sciences, economics`, `Natural sciences, biology`",
+					"items": {
+						"type": "object",
+						"properties": {
+							"name": {
+								"title": "Discipline title or name",
+								"type": "string"
+							},
+							"vocabulary": {
+								"title": "Vocabulary",
+								"description": "Vocabulary",
+								"type": "string"
+							},
+							"uri": {
+								"title": "URI",
+								"description": "Website link",
+								"type": "string"
+							}
+						},
+						"required": [
+							"name"
+						]
+					}
+				},
 				"relevance": {
 					"type": "string",
 					"title": "Relavance"
@@ -408,6 +418,31 @@
 						]
 					}
 				},
+				"bbox": {
+					"title": "Geographic bounding box",
+					"type": "array",
+					"items": {
+						"type": "object",
+						"properties": {
+							"west": {
+								"title": "West",
+								"type": "string"
+							},
+							"east": {
+								"title": "East",
+								"type": "string"
+							},
+							"south": {
+								"title": "South",
+								"type": "string"
+							},
+							"north": {
+								"title": "North",
+								"type": "string"
+							}
+						}
+					}
+				},
 				"aggregation_method": {
 					"type": "string",
 					"title": "Aggregation method"
@@ -480,48 +515,81 @@
 						}
 					}
 				},
-				"sources":{
-					"type":"array",
-					"title":"Sources",
-					"description":"Sources",
+				"authoring_entity": {
+					"type": "array",
+					"title": "Authoring entity",
+					"description": "The person, corporate body, or agency responsible for the work's substantive and intellectual content. Repeat the element for each author, and use 'affiliation' attribute if available. Invert first and last name and use commas.",
 					"items": {
-					  "type": "object",
-					  "properties": {
-						"id": {
-						  "title": "Source ID",
-						  "type": "string"
-						},
-						"name": {
-						  "title": "Name",
-						  "description": "Source name",
-						  "type": "string"
-						},
-						"organization": {
-						  "title": "Organization",                
-						  "type": "string"
+						"type": "object",
+						"properties": {
+							"name": {
+								"title": "Agency Name",
+								"type": "string",
+								"description": "Name of the person, corporate body, or agency responsible for the work's substantive and intellectual content. If a person, invert first and last name and use commas."
+							},
+							"affiliation": {
+								"title": "Affiliation",
+								"type": "string"
+							},
+							"abbreviation": {
+								"title": "Abbreviation",
+								"description": "Abbreviation"
+							},
+							"email": {
+								"title": "Email",
+								"description": "Email"
+							},
+							"uri": {
+								"title": "URI",
+								"type": "string"
+							}
 						},
-						"type": {
-							"title": "Source type",                
-							"type": "string"
+						"required": [
+							"name"
+						]
+					}
+				},
+				"sources": {
+					"type": "array",
+					"title": "Sources",
+					"description": "Sources",
+					"items": {
+						"type": "object",
+						"properties": {
+							"id": {
+								"title": "Source ID",
+								"type": "string"
+							},
+							"name": {
+								"title": "Name",
+								"description": "Source name",
+								"type": "string"
+							},
+							"organization": {
+								"title": "Organization",
+								"type": "string"
+							},
+							"type": {
+								"title": "Source type",
+								"type": "string"
+							},
+							"note": {
+								"title": "Note",
+								"type": "string"
+							}
 						},
-						"note": {
-							"title": "Note",                
-							"type": "string"
-						}
-					  },
-					  "required": [
-						"name"
-					  ]
+						"required": [
+							"name"
+						]
 					}
-				  },
-
+				},
 				"sources_note": {
 					"type": "string",
 					"title": "Notes form original sources"
 				},
 				"keywords": {
 					"type": "array",
-					"description": "Keywords",					
+					"description": "Keywords",
 					"items": {
 						"type": "object",
 						"properties": {
@@ -545,7 +613,7 @@
 				},
 				"acronyms": {
 					"type": "array",
-					"description": "Acronyms",					
+					"description": "Acronyms",
 					"items": {
 						"type": "object",
 						"properties": {
@@ -563,7 +631,8 @@
 							}
 						},
 						"required": [
-							"acronym", "expansion"
+							"acronym",
+							"expansion"
 						]
 					}
 				},
@@ -699,130 +768,137 @@
 					"title": "LDA topics",
 					"description": "LDA topics",
 					"items": {
-					  "type": "object",
-					  "properties": {
-						"model_info": {
-						  "type": "array",
-						  "title": "Model information",
-						  "items": {
-							"type": "object",
-							"properties": {
-							  "source": {
-								"title": "Source",
-								"type": "string"
-							  },
-							  "author": {
-								"title": "Author",
-								"type": "string"
-							  },
-							  "version": {
-								"title": "Version",
-								"type": "string"
-							  },
-							  "model_id": {
-								"title": "Model Identifier",
-								"type": "string"
-							  },
-							  "nb_topics": {
-								"title": "Number of topics",
-								"type": "number"
-							  },
-							  "description": {
-								"title": "Description",
-								"type": "string"
-							  },
-							  "corpus": {
-								"title": "Corpus name",
-								"type": "string"
-							  },
-							  "uri": {
-								"title": "URI",
-								"type": "string"
-							  }
-							}
-						  },
-						  "required": [
-							"model_id"
-						  ]
-						},              
-						"topic_description": {
-						  "type": "array",
-						  "title": "Topic information",
-						  "items": {
-							"type": "object",
-							"properties": {
-							  "topic_id": {
-								"title": "Topic identifier",
-								"type": ["integer", "string"]
-							  },
-							  "topic_score": {
-								"title": "Topic score",
-								"type": ["number", "string"]
-							  },
-							  "topic_label": {
-								"title": "Topic label",
-								"type": "string"
-							  },
-							  "topic_words": {
+						"type": "object",
+						"properties": {
+							"model_info": {
+								"type": "array",
+								"title": "Model information",
+								"items": {
+									"type": "object",
+									"properties": {
+										"source": {
+											"title": "Source",
+											"type": "string"
+										},
+										"author": {
+											"title": "Author",
+											"type": "string"
+										},
+										"version": {
+											"title": "Version",
+											"type": "string"
+										},
+										"model_id": {
+											"title": "Model Identifier",
+											"type": "string"
+										},
+										"nb_topics": {
+											"title": "Number of topics",
+											"type": "number"
+										},
+										"description": {
+											"title": "Description",
+											"type": "string"
+										},
+										"corpus": {
+											"title": "Corpus name",
+											"type": "string"
+										},
+										"uri": {
+											"title": "URI",
+											"type": "string"
+										}
+									}
+								},
+								"required": [
+									"model_id"
+								]
+							},
+							"topic_description": {
 								"type": "array",
-								"title": "Topic words",
-								"description": "Words",
+								"title": "Topic information",
 								"items": {
-								  "type": "object",
-								  "properties": {
-									"word": {
-									  "title": "Word",
-									  "type": "string"
-									},
-									"word_weight": {
-									  "title": "Word weight",
-									  "type": "number"
+									"type": "object",
+									"properties": {
+										"topic_id": {
+											"title": "Topic identifier",
+											"type": [
+												"integer",
+												"string"
+											]
+										},
+										"topic_score": {
+											"title": "Topic score",
+											"type": [
+												"number",
+												"string"
+											]
+										},
+										"topic_label": {
+											"title": "Topic label",
+											"type": "string"
+										},
+										"topic_words": {
+											"type": "array",
+											"title": "Topic words",
+											"description": "Words",
+											"items": {
+												"type": "object",
+												"properties": {
+													"word": {
+														"title": "Word",
+														"type": "string"
+													},
+													"word_weight": {
+														"title": "Word weight",
+														"type": "number"
+													}
+												}
+											},
+											"required": [
+												"word"
+											]
+										}
 									}
-								  }
 								},
 								"required": [
-								  "word"
+									"topic_id"
 								]
-							  }
 							}
-						  },
-						  "required": [
-							"topic_id"
-						  ]
-						}						
-					  },
-					  "additionalProperties": false
+						},
+						"additionalProperties": false
 					}
-				  },
-				"embeddings":{
+				},
+				"embeddings": {
 					"type": "array",
 					"title": "Word embeddings",
-          			"description": "Word embeddings",
+					"description": "Word embeddings",
 					"items": {
-					  "type": "object",
-					  "properties": {
-						"id": {
-						  "title": "Vector Model ID",
-						  "type": "string"
-						},
-						"description": {
-						  "title": "Vector Model Description",
-						  "type": "string"
-						},
-						"date": {
-						  "title": "Date (YYYY-MM-DD)",
-						  "type": "string"
-						},
-						"vector": {
-						  "title": "Vector",
-						  "type": "object"
+						"type": "object",
+						"properties": {
+							"id": {
+								"title": "Vector Model ID",
+								"type": "string"
+							},
+							"description": {
+								"title": "Vector Model Description",
+								"type": "string"
+							},
+							"date": {
+								"title": "Date (YYYY-MM-DD)",
+								"type": "string"
+							},
+							"vector": {
+								"title": "Vector",
+								"type": "object"
+							}
 						}
-					  }
 					},
 					"required": [
-					  "id","vector"
+						"id",
+						"vector"
 					]
-				  },
+				},
 				"series_groups": {
 					"type": "array",
 					"title": "Series groups",
@@ -837,7 +913,7 @@
 							"description": {
 								"type": "string",
 								"title": "Description",
-								"description":"A brief description of the series group."
+								"description": "A brief description of the series group."
 							},
 							"version": {
 								"type": "string",
@@ -858,44 +934,43 @@
 				"idno",
 				"name"
 			]
-        
-      },
-	  "provenance":{
-		"type":"array",
-		"description":"Provenance",
-		"items":{
-		  "$ref":"provenance-schema.json"
-		}
-	  },
-	  "tags": {
-		"type": "array",
-		"title": "Tags (user-defined)",
-		"description": "Tags",
-		"items": {
-		  "type": "object",
-		  "properties": {
-			"tag": {
-			  "title": "Tag",
-			  "type": "string"
-			},
-			"tag_group": {
-			  "title": "Tag group",
-			  "type": "string"
+		},
+		"provenance": {
+			"type": "array",
+			"description": "Provenance",
+			"items": {
+				"$ref": "provenance-schema.json"
 			}
-		  }
 		},
-		"required": [
-		  "tag"
-		]
-	  },
-      "additional": {
-        "type": "object",
-        "title":"Additional custom metadata",
-        "description": "Any other custom metadata not covered by the schema",
-        "properties": {}
-      }
-    },    
-    "required": [
-      "series_description"
-    ]
-  }
\ No newline at end of file
+		"tags": {
+			"type": "array",
+			"title": "Tags (user-defined)",
+			"description": "Tags",
+			"items": {
+				"type": "object",
+				"properties": {
+					"tag": {
+						"title": "Tag",
+						"type": "string"
+					},
+					"tag_group": {
+						"title": "Tag group",
+						"type": "string"
+					}
+				}
+			},
+			"required": [
+				"tag"
+			]
+		},
+		"additional": {
+			"type": "object",
+			"title": "Additional custom metadata",
+			"description": "Any other custom metadata not covered by the schema",
+			"properties": {}
+		}
+	},
+	"required": [
+		"series_description"
+	]
+}
\ No newline at end of file
diff --git a/api-documentation/catalog-admin/video-schema.json b/api-documentation/catalog-admin/video-schema.json
index 6690084f7..b7c37cd25 100644
--- a/api-documentation/catalog-admin/video-schema.json
+++ b/api-documentation/catalog-admin/video-schema.json
@@ -87,7 +87,29 @@
         "idno": {
           "type": "string",
           "title": "Unique video identifier"
-        },        
+        },
+        "identifiers": {
+          "type": "array",
+          "title": "Other identifiers",
+          "description": "Other identifiers",
+          "items": {
+            "type": "object",
+            "properties": {
+              "type": {
+                "title": "Identifier type",
+                "description": "Type of identifier e.g. `doi`, `handle`, `other`",
+                "type": "string"
+              },
+              "identifier": {
+                "title": "Identifier",
+                "type": "string"
+              }
+            },
+            "required": [
+              "identifier"
+            ]
+          }
+        },
         "title": {
           "type": "string",
           "description": "Title"
@@ -104,33 +126,60 @@
           "type": "string",
           "description": "Genre"
         },
-        "keywords": {
-          "type": "string",
-          "description": "Keywords"
-        },
-
-        "topics":{
+        "keywords":{
           "type":"array",
-          "title":"Topic Classification",
-          "description":"Topic Classification",
           "items":{
             "type":"object",
             "properties":{
-              "topic":{
-                "title":"Topic",
+              "name":{
+                "title":"Name",
                 "type":"string"
               },
-              "vocab":{
-                "title":"Vocab",
+              "vocabulary":{
+                "title":"Vocabulary name",
                 "type":"string"
               },
               "uri":{
-                "title":"URI",
+                "title":"Vocabulary URI",
                 "type":"string"
               }
+            }
+          }
+        },
+
+        "topics": {
+          "type": "array",
+          "title": "Topics",
+          "description": "Topics covered by the table (ideally, the list of topics will be a controlled vocabulary)",
+          "items": {
+            "type": "object",
+            "properties": {
+              "id": {
+                "title": "Unique Identifier",
+                "type": "string"
+              },
+              "name": {
+                "title": "Topic",
+                "type": "string"
+              },
+              "parent_id": {
+                "title": "Parent topic Identifier",
+                "description":"For subtopics, provide the ID of the parent topic",
+                "type": "string"
+              },
+              "vocabulary": {
+                "title": "Vocabulary",
+                "description": "Name of the controlled vocabulary, if the topic is from a taxonomy.",
+                "type": "string"
+              },
+              "uri": {
+                "title": "Vocabulary URI",
+                "description": "Link to the controlled vocabulary web page, if the topic is from a taxonomy.",
+                "type": "string"
+              }
             },
-            "required":[
-              "topic"
+            "required": [
+              "name"
             ]
           }
         },
@@ -160,34 +209,40 @@
           "description": "Primary entity described in the video"
         },
 
-        "video_provider": {
-          "type": "string",
-          "description": "Video provider e.g.  youtube, vimeo, facebook"
-        },
-
-        "video_url": {
+        "date_created": {
           "type": "string",
-          "description": "Video URL"
+          "description": "Date of creation (YYYY-MM-DD)"
         },
-
-        "embed_url": {
+        "date_published": {
           "type": "string",
-          "description": "Video embed URL"
+          "description": "Date published (YYYY-MM-DD)"
         },
-        "encoding_format": {
+        "version": {
           "type": "string",
-          "title":"Encoding format",
-          "description": "Media type using a MIME format"
+          "description": "Version"
         },
-        "duration": {
+        "status": {
           "type": "string",
-          "title":"Duration",
-          "description": "The duration of the video in ISO 8601 date time format - `hh:mm:ss`"
+          "title":"Creative work status",
+          "description": "Status of a creative work in terms of its stage in lifecycle. e.g. `incomplete`, `draft`, `published`, `obsolete`"
         },
 
-        "content_location": {
-          "type": "string",
-          "description": "Location depicted or described in the video"
+        "country": {
+          "type": "array",
+          "title": "Countries",
+          "items": {
+            "type": "object",
+            "properties": {
+              "name": {
+                "title": "Country name",
+                "type": "string"
+              },
+              "code": {
+                "title": "Country code",
+                "type": "string"
+              }
+            }
+          }
         },
 
         "spatial_coverage": {
@@ -205,39 +260,213 @@
           "description": "Period that the content applies to using ISO 8601 date time format"
         },
 
+        "recorded_at": {
+          "type": "string",
+          "description": "Location where video was recorded"
+        },
+
         "audience": {
           "type": "string",
           "description": "Intended audience"
         },
-        
-        "country": {
-          "type": "string",
-          "description": "Country"
+
+        "bbox": {
+          "title": "Geographic bounding box",
+          "type": "array",
+          "items": {
+            "type": "object",
+            "properties": {
+              "west": {
+                "title": "West",
+                "type": "string"
+              },
+              "east": {
+                "title": "East",
+                "type": "string"
+              },
+              "south": {
+                "title": "South",
+                "type": "string"
+              },
+              "north": {
+                "title": "North",
+                "type": "string"
+              }
+            }
+          }
         },
+                
         "language": {
+          "type": "array",
+          "description": "languages",
+          "items": {
+            "type": "object",
+            "properties": {
+              "name": {
+                "title": "Name",
+                "description": "Language name",
+                "type": "string"
+              },
+              "code": {
+                "title": "code",
+                "Descripton": "Language code",
+                "type": "string"
+              }
+            }
+          },
+          "required": [
+            "name"
+          ]
+        },
+
+        "creator": {
           "type": "string",
-          "description": "Language"
+          "description": "Creator"
         },
-        "author": {
+
+        "production_company": {
           "type": "string",
-          "description": "Author"
+          "description": "Production company"
         },
+
         "publisher": {
           "type": "string",
           "description": "Publisher"
         },
-        "contributor": {
+
+        "repository": {
           "type": "string",
-          "description": "Contributor"
+          "title": "Repository"
+        },
+
+        "contributors": {
+          "type": "array",
+          "items": {
+            "type": "object",
+            "properties": {
+              "name": {
+                "title": "Name",
+                "type": "string"
+              },
+              "affiliation": {
+                "title": "Affiliation",
+                "type": "string"
+              },
+              "abbreviation": {
+                "title": "Abbreviation",
+                "type": "string"
+              },
+              "role": {
+                "title": "Role",
+                "type": "string"
+              },
+              "uri": {
+                "title": "URI",
+                "type": "string"
+              }
+            },
+            "required": [
+              "name"
+            ]
+          }
         },
         "funder": {
+          "type": "array",
+          "title": "Funding Agency/Sponsor",
+          "items": {
+            "type": "object",
+            "properties": {
+              "name": {
+                "title": "Funding Agency/Sponsor",
+                "type": "string"
+              },
+              "abbr": {
+                "title": "Abbreviation",
+                "type": "string"
+              },
+              "grant": {
+                "title": "Grant Number",
+                "type": "string"
+              },
+              "role": {
+                "title": "Role",
+                "type": "string"
+              }
+            },
+            "required": [
+              "name"
+            ]
+          }
+        },
+        
+        "translators": {
+          "type": "array",
+          "title": "Translators",
+          "description": "Translators",
+          "items": {
+            "type": "object",
+            "properties": {
+              "first_name": {
+                "title": "First name",
+                "type": "string"
+              },
+              "initial": {
+                "title": "Initial",
+                "type": "string"
+              },
+              "last_name": {
+                "title": "Last name",
+                "type": "string"
+              },              
+              "affiliation": {
+                "title": "Affiliation",
+                "type": "string"
+              }
+            }
+          },
+          "required": [
+            "first_name"
+          ]
+        },
+
+        "is_based_on": {
+          "type": "string",
+          "title":"A resource from which this work is derived",
+          "description": "A resource from which this work is derived or from which it is a modification or adaption"
+        },
+        "is_part_of": {
+          "type": "string",
+          "title":"Indicate an item that this item is part of"
+        },
+
+        "relations": {
           "type": "string",
-          "description": "Funder"
+          "title":"Defines, as a free text field, the relation between the video being documented and other resources. This is a Dublin Core element."
         },
-        "translator": {
+
+        "video_provider": {
+          "type": "string",
+          "description": "Video provider e.g.  youtube, vimeo, facebook"
+        },
+
+        "video_url": {
+          "type": "string",
+          "description": "Video URL"
+        },
+
+        "embed_url": {
           "type": "string",
-          "title": "Translator",
-          "description": "Organization or person who adapts a creative work to different languages"
+          "description": "Video embed URL"
+        },
+        "encoding_format": {
+          "type": "string",
+          "title":"Encoding format",
+          "description": "Media type using a MIME format"
+        },
+        "duration": {
+          "type": "string",
+          "title":"Duration",
+          "description": "The duration of the video in ISO 8601 date time format - `hh:mm:ss`"
         },
         "rights": {
           "type": "string",
@@ -261,34 +490,73 @@
           "description": "Year during which claimed copyright for the video was first asserted"
         },
 
-
-
-        "date_created": {
+        "credit_text": {
           "type": "string",
-          "description": "Date of creation (YYYY-MM-DD)"
+          "title": "Credits",
+          "description": "This element that can be used to credit the person(s) and/or organization(s) associated with a published video. It corresponds to the `creditText` element of VideoObject."
         },
-        "date_published": {
-          "type": "string",
-          "description": "Date published (YYYY-MM-DD)"
-        },
-        "version": {
+
+        "citation": {
           "type": "string",
-          "description": "Version"
+          "title": "Citation",
+          "description": "This element provides a required or recommended citation of the audio file."
         },
-        "status": {
-          "type": "string",
-          "title":"Creative work status",
-          "description": "Status of a creative work in terms of its stage in lifecycle. e.g. `incomplete`, `draft`, `published`, `obsolete`"
+
+        "transcript": {
+          "type": "array",
+          "title": "Transcript",
+          "items": {
+            "type": "object",
+            "properties": {
+              "language": {
+                "title": "Language",
+                "type": "string"
+              },
+              "text": {
+                "title": "Text",
+                "type": "string"
+              }              
+            }
+          },
+          "required": [
+            "text"
+          ]
         },
-        "is_based_on": {
-          "type": "string",
-          "title":"A resource from which this work is derived",
-          "description": "A resource from which this work is derived or from which it is a modification or adaption"
+
+        "media": {
+          "type": "array",
+          "title": "Media",
+          "items": {
+            "type": "string"
+          }          
         },
-        "is_part_of": {
-          "type": "string",
-          "title":"Indicate an item that this item is part of"
-        }
+        
+        "album": {
+					"type": "array",
+					"title": "Album",
+					"items": {
+						"type": "object",
+						"properties": {
+							"name": {
+								"title": "Name of album",
+								"type": "string"
+							},
+							"description": {
+								"title": "Description",
+								"type": "string"
+							},
+							"owner": {
+								"title": "Owner",
+								"type": "string"
+							},
+							"uri": {
+								"title": "URI",
+								"type": "string"
+							}
+						}
+					}
+				}
+
         
       },
       "required": [
diff --git a/application/schemas/document-schema.json b/application/schemas/document-schema.json
index 20d14dd4d..b85794a16 100644
--- a/application/schemas/document-schema.json
+++ b/application/schemas/document-schema.json
@@ -118,17 +118,15 @@
             "idno": {
               "type": "string",
               "title": "Unique user defined ID",
-              "description": "The ID number of a dataset is a unique number that is used to identify a particular survey. Define and use a consistent scheme to use. Such an ID could be constructed as follows: country-producer-survey-year-version where \n - country is the 3-letter ISO country abbreviation \n - producer is the abbreviation of the producing agency \n - survey is the survey abbreviation \n - year is the reference year (or the year the survey started) \n - version is the number dataset version number (see Version Description below)"
+              "description": "The ID number of a dataset is a unique number that is used to identify a document."
             },
             "title": {
               "type": "string",
-              "title": "Survey title",
-              "description": "The title is the official name of the survey as it is stated on the questionnaire or as it appears in the design documents. The following items should be noted:\n - Include the reference year(s) of the survey in the title. \n - Do not include the abbreviation of the survey name in the title. \n - As the survey title is a proper noun, the first letter of each word should be capitalized (except for prepositions or other conjunctions).\n - Including the country name in the title is optional."
+              "title": "Title"              
             },
             "sub_title": {
               "type": "string",
-              "title": "Survey subtitle",
-              "description": "A short subtitle for the survey"
+              "title": "Subtitle"
             },
             "alternate_title": {
               "type": "string",
@@ -246,27 +244,28 @@
           "description": "Date on which document was published."    
         },
 
-        "id_numbers": {
+        "identifiers": {
           "type": "array",
-          "title": "Identifier numbers",
-          "description": "Numbers e.g. ISSN, ISBN, DOI, etc.",
+          "title": "Other identifiers",
+          "description": "Other identifiers",
           "items": {
             "type": "object",
             "properties": {
               "type": {
-                "title": "Type",
-                "description":"ID number type such as  ISSN, ISBN, DOI"
+                "title": "Identifier type",
+                "description": "Type of identifier e.g. `doi`, `handle`, `other`",
+                "type": "string"
               },
-              "value": {
-                "title": "ID number",
-                "type": "string"               
+              "identifier": {
+                "title": "Identifier",
+                "type": "string"
               }
             },
             "required": [
-              "type","value"
+              "identifier"
             ]
           }
-        },  
+        }, 
 
         "type": {
           "type": "string",
diff --git a/application/schemas/image-schema.json b/application/schemas/image-schema.json
index 2433a3d91..de8188bf2 100644
--- a/application/schemas/image-schema.json
+++ b/application/schemas/image-schema.json
@@ -188,18 +188,18 @@
 					]
 				}
 			}
+		},
+		"provenance":{
+			"type":"array",
+			"description":"Provenance",
+			"items":{
+			  "$ref":"provenance-schema.json"
+			}
+		  },
+		"additional": {
+			"type": "object",
+			"description": "Additional metadata",
+			"properties": {}
 		}
-	},
-	"provenance":{
-		"type":"array",
-		"description":"Provenance",
-		"items":{
-		  "$ref":"provenance-schema.json"
-		}
-	  },
-	"additional": {
-		"type": "object",
-		"description": "Additional metadata",
-		"properties": {}
-	}
+	}	
 }
\ No newline at end of file
diff --git a/application/schemas/table-schema.json b/application/schemas/table-schema.json
index f7d52e318..b1c7ad573 100644
--- a/application/schemas/table-schema.json
+++ b/application/schemas/table-schema.json
@@ -3,29 +3,29 @@
   "$schema": "http://json-schema.org/draft-07/schema#",
   "description": "Draft Schema for Table data type",
   "type": "object",
-  "definitions":{
-    "authoring_entity":{
-      "type":"array",
-      "title":"Authoring entity/Primary investigators",
-      "description":"The person, corporate body, or agency responsible for the work's substantive and intellectual content. Repeat the element for each author, and use 'affiliation' attribute if available. Invert first and last name and use commas.",
-      "items":{
-        "type":"object",
-        "properties":{
-          "name":{
-            "title":"Agency Name",
-            "type":"string"
+  "definitions": {
+    "authoring_entity": {
+      "type": "array",
+      "title": "Authoring entity/Primary investigators",
+      "description": "The person, corporate body, or agency responsible for the work's substantive and intellectual content. Repeat the element for each author, and use 'affiliation' attribute if available. Invert first and last name and use commas.",
+      "items": {
+        "type": "object",
+        "properties": {
+          "name": {
+            "title": "Agency Name",
+            "type": "string"
           },
-          "affiliation":{
-            "title":"Affiliation",
-            "type":"string"
+          "affiliation": {
+            "title": "Affiliation",
+            "type": "string"
           },
-          "abbreviation":{
-            "title":"Abbreviation",
-            "type":"string"
+          "abbreviation": {
+            "title": "Abbreviation",
+            "type": "string"
           },
-          "uri":{
-            "title":"URI",
-            "type":"string"
+          "uri": {
+            "title": "URI",
+            "type": "string"
           },
           "author_id": {
             "type": "array",
@@ -46,90 +46,89 @@
             }
           }
         },
-        "required":[
+        "required": [
           "name"
         ]
       }
     },
-    "contributor":{
-      "type":"array",
-      "items":{
-        "type":"object",
-        "properties":{
-          "name":{
-            "title":"Name",
-            "type":"string"
+    "contributor": {
+      "type": "array",
+      "items": {
+        "type": "object",
+        "properties": {
+          "name": {
+            "title": "Name",
+            "type": "string"
           },
-          "affiliation":{
-            "title":"Affiliation",
-            "type":"string"
+          "affiliation": {
+            "title": "Affiliation",
+            "type": "string"
           },
-          "abbreviation":{
-            "title":"Abbreviation",
-            "type":"string"
+          "abbreviation": {
+            "title": "Abbreviation",
+            "type": "string"
           },
-          "role":{
-            "title":"Role",
-            "type":"string"
+          "role": {
+            "title": "Role",
+            "type": "string"
           },
-          "uri":{
-            "title":"URI",
-            "type":"string"
+          "uri": {
+            "title": "URI",
+            "type": "string"
           }
         },
-        "required":[
+        "required": [
           "name"
         ]
       }
     },
-    "keyword":{
-      "type":"array",
-      "items":{
-        "type":"object",
-        "properties":{
-          "name":{
-            "title":"Name",
-            "type":"string"
+    "keyword": {
+      "type": "array",
+      "items": {
+        "type": "object",
+        "properties": {
+          "name": {
+            "title": "Name",
+            "type": "string"
           },
-          "vocabulary":{
-            "title":"Vocabulary name",
-            "type":"string"
+          "vocabulary": {
+            "title": "Vocabulary name",
+            "type": "string"
           },
-          "uri":{
-            "title":"Vocabulary URI",
-            "type":"string"
+          "uri": {
+            "title": "Vocabulary URI",
+            "type": "string"
           }
         }
       }
     }
   },
-  "properties": {    
-
+  "properties": {
     "repositoryid": {
       "type": "string",
       "title": "Collection ID that owns the document",
       "description": "Abbreviation for the collection that owns the document"
     },
-
     "published": {
       "type": "integer",
       "title": "Status",
       "description": "Status  - 0=draft, 1=published",
       "default": 0
     },
-    
     "overwrite": {
       "type": "string",
-      "description": "Overwrite document if already exists?",            
-      "enum":["yes","no"],
+      "description": "Overwrite document if already exists?",
+      "enum": [
+        "yes",
+        "no"
+      ],
       "default": "no"
     },
-
-    "metadata_information": {      
+    "metadata_information": {
       "type": "object",
       "title": "Document metadata information",
       "description": "Document description",
-      "properties": {        
+      "properties": {
         "idno": {
           "title": "Unique ID number for the document",
           "type": "string"
@@ -181,8 +180,7 @@
       "type": "object",
       "title": "Table Description",
       "description": "Table Description",
-      "properties": {  
-
+      "properties": {
         "title_statement": {
           "type": "object",
           "description": "Title statement",
@@ -212,10 +210,9 @@
               "title": "Abbreviation or Acronym",
               "description": "Any form of the title used as a substitute or alternative to the formal title of the resource."
             },
-            "abbreviated_title": {
-              "title": "Abbreviated Title",
-              "description": "Title as abbreviated for indexing or identification.",
-              "type": "string"              
+            "translated_title": {
+              "title": "Translated title",
+              "type": "string"
             }
           },
           "required": [
@@ -223,99 +220,98 @@
             "title"
           ]
         },
-
-        "id_numbers": {
-          "type": "object",
-          "title": "Identifier numbers",
-          "description": "Numbers e.g. ISSN, ISBN, DOI, etc.",          
-          "properties": {
-            "type": {
-              "title": "Type",
-              "description":"ID number type such as  ISSN, ISBN, DOI",
-              "type": "string"
+        "identifiers": {
+          "type": "array",
+          "title": "Other identifiers",
+          "description": "Other identifiers",
+          "items": {
+            "type": "object",
+            "properties": {
+              "type": {
+                "title": "Identifier type",
+                "description": "Type of identifier e.g. `doi`, `handle`, `other`",
+                "type": "string"
+              },
+              "identifier": {
+                "title": "Identifier",
+                "type": "string"
+              }
             },
-            "value": {
-              "title": "ID number",
-              "type": "string"              
-            }
-          },
-          "required": [
-            "type","value"
-          ]
-        },        
-        
+            "required": [
+              "identifier"
+            ]
+          }
+        },
         "authoring_entity": {
           "title": "Authoring entity",
-          "$ref":"#/definitions/authoring_entity",
+          "$ref": "#/definitions/authoring_entity",
           "description": "Authoring entity"
         },
         "contributors": {
           "title": "Contributors",
-          "$ref":"#/definitions/contributor",
+          "$ref": "#/definitions/contributor",
           "description": "Contributors"
         },
-        "publisher":{
-          "type":"array",
-          "title":"Publisher",
-          "description":"Publisher",
-          "items":{
-            "type":"object",
-            "properties":{
-              "name":{
-                "title":"Name",
-                "type":"string"
-              },
-              "affiliation":{
-                "title":"Affiliation",
-                "type":"string"
-              },
-              "abbreviation":{
-                "title":"Abbreviation",
-                "type":"string"
-              },
-              "role":{
-                "title":"Role",
-                "type":"string"
-              },
-              "uri":{
-                "title":"URI",
-                "type":"string"
+        "publisher": {
+          "type": "array",
+          "title": "Publisher",
+          "description": "Publisher",
+          "items": {
+            "type": "object",
+            "properties": {
+              "name": {
+                "title": "Name",
+                "type": "string"
+              },
+              "affiliation": {
+                "title": "Affiliation",
+                "type": "string"
+              },
+              "abbreviation": {
+                "title": "Abbreviation",
+                "type": "string"
+              },
+              "role": {
+                "title": "Role",
+                "type": "string"
+              },
+              "uri": {
+                "title": "URI",
+                "type": "string"
               }
             },
-            "required":[
+            "required": [
               "name"
             ]
           }
         },
         "date_created": {
           "type": "string",
-          "title":"Date created",
+          "title": "Date created",
           "description": "Date created"
         },
         "date_published": {
           "type": "string",
-          "title":"Date published"
+          "title": "Date published"
         },
         "date_modified": {
           "type": "string",
-          "title":"Date last modified",
-          "description": "Date on which the resource was changed."    
+          "title": "Date last modified",
+          "description": "Date on which the resource was changed."
         },
-
         "version": {
           "title": "Version",
-          "type": "string"        
+          "type": "string"
         },
         "description": {
           "title": "Description",
           "type": "string",
-          "description":"Description"
+          "description": "Description"
         },
-
         "table_columns": {
           "type": "array",
           "title": "Table column names",
-          "description": "List of table column names", 
+          "description": "List of table column names",
           "items": {
             "type": "object",
             "properties": {
@@ -327,7 +323,7 @@
                 "title": "Variable name",
                 "description": "Variable name",
                 "type": "string"
-              },              
+              },
               "dataset": {
                 "title": "Dataset",
                 "type": "string",
@@ -339,11 +335,10 @@
             ]
           }
         },
-
         "table_rows": {
           "type": "array",
           "title": "Table row level data",
-          "description": "Table row level data",  
+          "description": "Table row level data",
           "items": {
             "type": "object",
             "properties": {
@@ -355,7 +350,7 @@
                 "title": "Variable name",
                 "description": "Variable name",
                 "type": "string"
-              },              
+              },
               "dataset": {
                 "title": "Dataset",
                 "type": "string",
@@ -367,7 +362,6 @@
             ]
           }
         },
-
         "table_footnotes": {
           "type": "array",
           "title": "Chart footnotes",
@@ -377,7 +371,7 @@
             "properties": {
               "number": {
                 "title": "Footnote number",
-                "description":"Footnote number",
+                "description": "Footnote number",
                 "type": "string"
               },
               "text": {
@@ -388,13 +382,12 @@
             "required": [
               "text"
             ]
-          } 
+          }
         },
-
         "table_series": {
           "type": "array",
           "title": "Table series",
-          "description": "Table series", 
+          "description": "Table series",
           "items": {
             "type": "object",
             "properties": {
@@ -421,10 +414,9 @@
             ]
           }
         },
-
         "statistics": {
           "type": "array",
-          "title": "Statistics",          
+          "title": "Statistics",
           "items": {
             "type": "object",
             "properties": {
@@ -437,7 +429,7 @@
         },
         "unit_observation": {
           "type": "array",
-          "title": "Unit observation",          
+          "title": "Unit observation",
           "items": {
             "type": "object",
             "properties": {
@@ -450,7 +442,7 @@
         },
         "data_sources": {
           "type": "array",
-          "title": "Data sources",          
+          "title": "Data sources",
           "items": {
             "type": "object",
             "properties": {
@@ -461,29 +453,27 @@
               },
               "abbreviation": {
                 "title": "Abbreviation",
-                "description":"The abbreviation (acronym) of the data source.",
+                "description": "The abbreviation (acronym) of the data source.",
                 "type": "string"
-              },              
+              },
               "source_id": {
                 "title": "Source ID",
-                "description":"A unique identifier for the source, such as a Digital Object Identifier (DOI).",
+                "description": "A unique identifier for the source, such as a Digital Object Identifier (DOI).",
                 "type": "string"
               },
               "note": {
                 "title": "Note",
                 "type": "string",
-                "description":"A note that describes how the source was used, possibly mentioning issues in the use of the source."
+                "description": "A note that describes how the source was used, possibly mentioning issues in the use of the source."
               },
               "uri": {
                 "title": "URI",
                 "type": "string",
-                "description":"A link (URL) to the source dataset."
+                "description": "A link (URL) to the source dataset."
               }
             }
           }
         },
-        
-        
         "time_periods": {
           "type": "array",
           "title": "Time periods",
@@ -506,11 +496,10 @@
               "from"
             ]
           }
-        },   
-        
+        },
         "universe": {
           "type": "array",
-          "title": "Universe",          
+          "title": "Universe",
           "items": {
             "type": "object",
             "properties": {
@@ -521,10 +510,9 @@
             }
           }
         },
-
         "ref_country": {
           "type": "array",
-          "title": "Reference country",          
+          "title": "Reference country",
           "items": {
             "type": "object",
             "properties": {
@@ -539,7 +527,6 @@
             }
           }
         },
-
         "geographic_units": {
           "title": "Geographic locations",
           "description": "List of geographic units (regions, countries, states, provinces, etc.) for which data are available in the database.",
@@ -561,19 +548,43 @@
                 "title": "Type",
                 "description": "Type of geographic unit e.g. country, state, region, province etc",
                 "type": "string"
-              }          
+              }
             },
             "required": [
               "name"
             ]
           }
-        }, 
+        },
         "geographic_granularity": {
           "description": "Granularity of geographic coverage. examples `national`, `regional`, `provincial`",
           "type": "string",
-          "title":"Geographic granularity"
+          "title": "Geographic granularity"
+        },
+        "bbox": {
+          "title": "Geographic bounding box",
+          "type": "array",
+          "items": {
+            "type": "object",
+            "properties": {
+              "west": {
+                "title": "West",
+                "type": "string"
+              },
+              "east": {
+                "title": "East",
+                "type": "string"
+              },
+              "south": {
+                "title": "South",
+                "type": "string"
+              },
+              "north": {
+                "title": "North",
+                "type": "string"
+              }
+            }
+          }
         },
-        
         "languages": {
           "type": "array",
           "description": "languages",
@@ -596,10 +607,9 @@
             "name"
           ]
         },
-
         "links": {
           "type": "array",
-          "title": "Links",          
+          "title": "Links",
           "items": {
             "type": "object",
             "properties": {
@@ -614,10 +624,9 @@
             }
           }
         },
-
         "publications": {
           "type": "array",
-          "title": "Publications",          
+          "title": "Publications",
           "items": {
             "type": "object",
             "properties": {
@@ -632,16 +641,18 @@
             }
           }
         },
-        "keywords":{
-          "allOf": [ 
-            {"$ref":"#/definitions/keyword"}
+        "keywords": {
+          "allOf": [
+            {
+              "$ref": "#/definitions/keyword"
+            }
           ],
-          "title":"Keywords",
-          "description":"Keywords"
+          "title": "Keywords",
+          "description": "Keywords"
         },
-        "themes":{
-          "type":"array",
-          "description":"Themes",
+        "themes": {
+          "type": "array",
+          "description": "Themes",
           "items": {
             "type": "object",
             "properties": {
@@ -690,7 +701,7 @@
               },
               "parent_id": {
                 "title": "Parent topic Identifier",
-                "description":"For subtopics, provide the ID of the parent topic",
+                "description": "For subtopics, provide the ID of the parent topic",
                 "type": "string"
               },
               "vocabulary": {
@@ -705,11 +716,11 @@
               }
             },
             "required": [
-              "id","name"
+              "id",
+              "name"
             ]
           }
         },
-
         "disciplines": {
           "type": "array",
           "title": "Disciplines",
@@ -727,7 +738,7 @@
               },
               "parent_id": {
                 "title": "Parent discipline Identifier",
-                "description":"Parent discipline ID",
+                "description": "Parent discipline ID",
                 "type": "string"
               },
               "vocabulary": {
@@ -746,7 +757,6 @@
             ]
           }
         },
-
         "definitions": {
           "type": "array",
           "title": "Definitions",
@@ -774,7 +784,6 @@
             ]
           }
         },
-
         "classifications": {
           "type": "array",
           "title": "Classifications",
@@ -807,16 +816,13 @@
             ]
           }
         },
-
-
         "rights": {
           "type": "string",
           "title": "Rights"
         },
-
         "license": {
           "type": "array",
-          "title": "License",          
+          "title": "License",
           "items": {
             "type": "object",
             "properties": {
@@ -831,24 +837,20 @@
             }
           }
         },
-
         "citation": {
           "type": "string",
-          "title":"Citation",
-          "description": "A bibliographic reference for the resource."    
+          "title": "Citation",
+          "description": "A bibliographic reference for the resource."
         },
-
         "confidentiality": {
           "type": "string",
-          "title":"Confidentiality"
+          "title": "Confidentiality"
         },
-
         "sdc": {
           "type": "string",
-          "title":"Statistical disclosure control",
-          "description":"Information on statistical disclosure control measures applied to the table. This can include cell suppression, or other techniques. Specialized packages have been developed for this purpose, like [*sdcTable: Methods for Statistical Disclosure Control in Tabular Data*](https://cran.r-project.org/web/packages/sdcTable/index.html) and https://cran.r-project.org/web/packages/sdcTable/sdcTable.pdf \nThe information provided here should be such that it does not provide intruders with useful information for reverse-engineering the protection measures applied to the table."
+          "title": "Statistical disclosure control",
+          "description": "Information on statistical disclosure control measures applied to the table. This can include cell suppression, or other techniques. Specialized packages have been developed for this purpose, like [*sdcTable: Methods for Statistical Disclosure Control in Tabular Data*](https://cran.r-project.org/web/packages/sdcTable/index.html) and https://cran.r-project.org/web/packages/sdcTable/sdcTable.pdf \nThe information provided here should be such that it does not provide intruders with useful information for reverse-engineering the protection measures applied to the table."
         },
-
         "contacts": {
           "type": "array",
           "title": "Contacts",
@@ -886,10 +888,9 @@
             "name"
           ]
         },
-
         "notes": {
           "type": "array",
-          "title": "Notes",          
+          "title": "Notes",
           "items": {
             "type": "object",
             "properties": {
@@ -900,7 +901,6 @@
             }
           }
         },
-                
         "relations": {
           "type": "array",
           "title": "Relations",
@@ -915,7 +915,7 @@
               "type": {
                 "title": "Type",
                 "type": "string",
-                "enum":[
+                "enum": [
                   "isPartOf",
                   "hasPart",
                   "isVersionOf",
@@ -934,19 +934,17 @@
           "required": [
             "name"
           ]
-        }        
-        
+        }
       },
       "additionalProperties": false
     },
-
-    "provenance":{
-      "type":"array",
-      "description":"Provenance",
-      "items":{
-        "$ref":"provenance-schema.json"
+    "provenance": {
+      "type": "array",
+      "description": "Provenance",
+      "items": {
+        "$ref": "provenance-schema.json"
       }
-      },
+    },
     "tags": {
       "type": "array",
       "title": "Tags",
@@ -968,11 +966,10 @@
         "tag"
       ]
     },
-
     "additional": {
       "type": "object",
       "description": "Additional metadata",
       "properties": {}
     }
   }
-}
+}
\ No newline at end of file
diff --git a/application/schemas/timeseries-db-schema.json b/application/schemas/timeseries-db-schema.json
index c9c9116f1..b8e30c18b 100644
--- a/application/schemas/timeseries-db-schema.json
+++ b/application/schemas/timeseries-db-schema.json
@@ -5,21 +5,21 @@
 	"description": "Schema for timeseries database",
 	"type": "object",
 	"properties": {
-
 		"published": {
 			"type": "integer",
 			"title": "Status",
 			"description": "0=draft, 1=published",
 			"default": 0
 		},
-
 		"overwrite": {
 			"type": "string",
 			"description": "Overwrite database if already exists?",
-			"enum": ["yes", "no"],
+			"enum": [
+				"yes",
+				"no"
+			],
 			"default": "no"
 		},
-
 		"metadata_information": {
 			"type": "object",
 			"title": "Document metadata information",
@@ -79,16 +79,36 @@
 			"title": "Database Description",
 			"description": "Database Description",
 			"properties": {
-
 				"title_statement": {
 					"type": "object",
 					"description": "Study title",
-
 					"properties": {
 						"idno": {
 							"type": "string",
 							"title": "Unique user defined ID",
-							"description": "The ID number of a dataset is a unique number that is used to identify a particular survey. Define and use a consistent scheme to use. Such an ID could be constructed as follows: country-producer-survey-year-version where \n - country is the 3-letter ISO country abbreviation \n - producer is the abbreviation of the producing agency \n - survey is the survey abbreviation \n - year is the reference year (or the year the survey started) \n - version is the number dataset version number (see Version Description below)"
+							"description": "The ID number of a database is a unique number that is used to identify a particular database."
+						},
+						"identifiers": {
+							"type": "array",
+							"title": "Other identifiers",
+							"description": "Other identifiers",
+							"items": {
+								"type": "object",
+								"properties": {
+									"type": {
+										"title": "Identifier type",
+										"description": "Type of identifier e.g. `doi`, `handle`, `other`",
+										"type": "string"
+									},
+									"identifier": {
+										"title": "Identifier",
+										"type": "string"
+									}
+								},
+								"required": [
+									"identifier"
+								]
+							}
 						},
 						"title": {
 							"type": "string",
@@ -99,13 +119,11 @@
 							"type": "string",
 							"title": "Survey subtitle",
 							"description": "A short subtitle for the survey"
-
 						},
 						"alternate_title": {
 							"type": "string",
 							"title": "Abbreviation or Acronym",
 							"description": "The abbreviation of a survey is usually the first letter of each word of the titled survey. The survey reference year(s) may be included."
-
 						},
 						"translated_title": {
 							"title": "Translated Title",
@@ -118,7 +136,6 @@
 						"title"
 					]
 				},
-
 				"authoring_entity": {
 					"type": "array",
 					"title": "Authoring entity",
@@ -130,12 +147,7 @@
 								"title": "Agency Name",
 								"type": "string",
 								"description": "Name of the person, corporate body, or agency responsible for the work's substantive and intellectual content. If a person, invert first and last name and use commas."
-							},
-							"role": {
-								"title": "Role",
-								"type": "string",
-								"description": "Title of the person (if any) responsible for the work's substantive and intellectual content."
-							},
+							},							
 							"affiliation": {
 								"title": "Affiliation",
 								"type": "string"
@@ -147,6 +159,10 @@
 							"email": {
 								"title": "Email",
 								"description": "Email"
+							},
+							"uri": {
+								"title": "URI",
+								"type": "string"
 							}
 						},
 						"required": [
@@ -210,7 +226,8 @@
 							}
 						},
 						"required": [
-							"version", "date"
+							"version",
+							"date"
 						]
 					}
 				},
@@ -331,7 +348,8 @@
 							}
 						},
 						"required": [
-							"id", "name"
+							"id",
+							"name"
 						]
 					}
 				},
@@ -418,18 +436,15 @@
 						}
 					}
 				},
-
 				"geographic_granularity": {
 					"title": "Geographic granularity",
 					"description": "Granularity of geographic coverage e.g. `national`, `regional`, `provincial`",
 					"type": "string"
 				},
-
 				"geographic_area_count": {
 					"description": "Number of geographic areas",
 					"type": "string"
 				},
-
 				"sponsors": {
 					"type": "array",
 					"title": "Sponsor/Funding Agency",
@@ -467,7 +482,6 @@
 						"name"
 					]
 				},
-
 				"acknowledgments": {
 					"type": "array",
 					"title": "Other Acknowledgments",
@@ -497,12 +511,10 @@
 						"name"
 					]
 				},
-
 				"acknowledgement_statement": {
 					"title": "An overall statement of acknowledgment, which can be used as an alternative (or supplement) to the itemized list provided in `acknowledgments`.",
 					"type": "string"
 				},
-
 				"contacts": {
 					"type": "array",
 					"title": "Contacts",
@@ -540,7 +552,6 @@
 						"name"
 					]
 				},
-
 				"links": {
 					"type": "array",
 					"title": "Related links",
@@ -562,7 +573,6 @@
 						"uri"
 					]
 				},
-
 				"languages": {
 					"type": "array",
 					"description": "Supported languages",
@@ -655,7 +665,6 @@
 						}
 					}
 				},
-
 				"disclaimer": {
 					"title": "Disclaimer",
 					"type": "string"
@@ -670,7 +679,6 @@
 			],
 			"additionalProperties": false
 		},
-
 		"additional": {
 			"type": "object",
 			"title": "Additional custom metadata",
diff --git a/application/schemas/timeseries-schema.json b/application/schemas/timeseries-schema.json
index 763a9d330..2a7e2cf30 100644
--- a/application/schemas/timeseries-schema.json
+++ b/application/schemas/timeseries-schema.json
@@ -5,897 +5,972 @@
 	"description": "Schema for timeseries data type",
 	"type": "object",
 	"properties": {
-	  
-	  "repositoryid": {
-		"type": "string",
-		"title": "Collection ID that owns the series",
-		"description": "Collection that owns the series"
-	  },
-  
-	  "access_policy": {
-		"type": "string",
-		"title": "Data access policy",
-		"description": "Data access policy for attached microdata resources",
-		"enum": [
-		  "direct",
-		  "open",
-		  "public",
-		  "licensed",
-		  "remote",
-		  "na"
-		],
-		"default": "na"
-	  },
-	  
-	  "data_remote_url": {
-		"type": "string",
-		"title": "Data website URL",
-		"description": "Link to the website where the data is available, this is only needed if `access_policy` is set to `remote`."
-	  },
-	  "published": {
-		"type": "integer",
-		"title": "Status",
-		"description": "Status of the study - 0=draft, 1=published",
-		"default": 0
-	  },
-	  "overwrite": {
-		"type": "string",
-		"description": "Overwrite database if already exists?",            
-		"enum":["yes","no"],
-		"default": "no"
-	  },
-  
-	  "metadata_creation": {      
-		"type": "object",
-		"title": "Metadata creation",
-		"description": "Information on who generated the documentation",
-		"properties": {        
-		  
-		  "producers": {
-			"type": "array",
-			"title": "Producers",
-			"description": "List of producers",
-			"items": {
-			  "type": "object",
-			  "properties": {
-				"name": {
-				  "title": "Name",
-				  "description": "Name (required)",
-				  "type": "string"
-				},
-				"abbr": {
-				  "title": "Abbreviation",
-				  "type": "string"
+		"repositoryid": {
+			"type": "string",
+			"title": "Collection ID that owns the series",
+			"description": "Collection that owns the series"
+		},
+		"access_policy": {
+			"type": "string",
+			"title": "Data access policy",
+			"description": "Data access policy for attached microdata resources",
+			"enum": [
+				"direct",
+				"open",
+				"public",
+				"licensed",
+				"remote",
+				"na"
+			],
+			"default": "na"
+		},
+		"data_remote_url": {
+			"type": "string",
+			"title": "Data website URL",
+			"description": "Link to the website where the data is available, this is only needed if `access_policy` is set to `remote`."
+		},
+		"published": {
+			"type": "integer",
+			"title": "Status",
+			"description": "Status of the study - 0=draft, 1=published",
+			"default": 0
+		},
+		"overwrite": {
+			"type": "string",
+			"description": "Overwrite database if already exists?",
+			"enum": [
+				"yes",
+				"no"
+			],
+			"default": "no"
+		},
+		"metadata_creation": {
+			"type": "object",
+			"title": "Metadata creation",
+			"description": "Information on who generated the documentation",
+			"properties": {
+				"producers": {
+					"type": "array",
+					"title": "Producers",
+					"description": "List of producers",
+					"items": {
+						"type": "object",
+						"properties": {
+							"name": {
+								"title": "Name",
+								"description": "Name (required)",
+								"type": "string"
+							},
+							"abbr": {
+								"title": "Abbreviation",
+								"type": "string"
+							},
+							"affiliation": {
+								"type": "string",
+								"title": "Affiliation"
+							},
+							"role": {
+								"title": "Role",
+								"type": "string"
+							}
+						}
+					},
+					"required": [
+						"name"
+					]
 				},
-				"affiliation": {
-				  "type": "string",
-				  "title": "Affiliation"
+				"prod_date": {
+					"title": "Date of Production",
+					"description": "Document production date using format(YYYY-MM-DD)",
+					"type": "string"
 				},
-				"role": {
-				  "title": "Role",
-				  "type": "string"
+				"version": {
+					"title": "Document version",
+					"description": "Identify and describe the current version of the document",
+					"type": "string"
 				}
-			  }
 			},
-			"required": [
-			  "name"
-			]
-		  },
-		  "prod_date": {
-			"title": "Date of Production",
-			"description": "Document production date using format(YYYY-MM-DD)",
-			"type": "string"
-		  },
-		  "version": {
-			"title": "Document version",
-			"description": "Identify and describe the current version of the document",
-			"type": "string"
-		  }
+			"additionalProperties": false
 		},
-		"additionalProperties": false
-	  },
-		   
-		"series_description":{         
-		  "description" :"Series information",
-		  "type": "object",
-			  "properties": {				
-				  "idno": {
-					  "type": "string",
-					  "title": "Series unique ID",
-					  "description": "Unique series ID"
-				  },
-				  "name": {
-					  "type": "string",
-					  "title": "Series Name"
-				  },
-				  "database_id": {
-					  "type": "string",
-					  "title": "Database ID",
-					  "description": "Series database ID"
-				  },
-				  "aliases": {
-					  "type": "array",
-					  "title": "Series other names",
-					  "items": {
-						  "type": "object",
-						  "properties": {
-							  "alias": {
-								  "title": "Alias",
-								  "type": "string"
-							  }
-						  }
-					  }
-				  },
-				  "alternate_identifiers": {
-					  "type": "array",
-					  "title": "Alternate identifiers",
-					  "items": {
-						  "type": "object",
-						  "properties": {
-							  "identifier": {
-								  "title": "Identifier",
-								  "type": "string"
-							  },
-							  "name": {
-								  "title": "Identifier name",
-								  "type": "string"
-							  },
-							  "database": {
-								  "title": "Database",
-								  "type": "string"
-							  },
-							  "uri": {
-								  "title": "URI",
-								  "type": "string"
-							  },
-							  "notes": {
-								  "title": "Notes",
-								  "type": "string"
-							  }
-						  },
-						  "required": [
-							  "identifier"
-						  ]
-					  }
-				  },
-				  "measurement_unit": {
-					  "type": "string",
-					  "title": "Series unit of measure"
-				  },
-				  "periodicity": {
-					  "type": "string",
-					  "title": "Periodicity of data"
-				  },
-				  "base_period": {
-					  "type": "string",
-					  "title": "Base period"
-				  },
-				  "definition_short": {
-					  "type": "string",
-					  "title": "Definition short"
-				  },
-				  "definition_long": {
-					  "type": "string",
-					  "title": "Definition long"
-				  },
-				  "definition_references": {
-					  "type": "array",
-					  "title": "Definition references",
-					  "description": "URL to standard definition of the indicator (international or national standard)",
-					  "items": {
-						  "type": "object",
-						  "properties": {
-							  "source": {
-								  "title": "Source",
-								  "type": "string"
-							  },
-							  "uri": {
-								  "title": "URI",
-								  "description": "URI",
-								  "type": "string"
-							  },
-							  "note": {
-								  "title": "Note",
-								  "description": "Note",
-								  "type": "string"
-							  }
-						  },
-						  "required": [
-							  "uri"
-						  ]
-					  }
-				  },
-  
-				  "statistical_concept": {
-					  "type": "string",
-					  "title": "Statistical concept"
-				  },
-  
-				  "concepts": {
-					  "type": "array",
-					  "title": "Related concepts",
-					  "description": "Related concepts",
-					  "items": {
-						  "type": "object",
-						  "properties": {
-							  "name": {
-								  "title": "Name",
-								  "type": "string"
-							  },
-							  "definition": {
-								  "title": "Definition",
-								  "description": "Definition",
-								  "type": "string"
-							  },
-							  "uri": {
-				  "title": "URI",
-				  "description": "Website link",
-				  "type": "string"
-				}
-						  },
-						  "required": [
-							  "name"
-						  ]
-					  }
-				  },
-				  "methodology": {
-					  "type": "string",
-					  "title": "Methodology"
-				  },
-				  "imputation": {
-					  "type": "string",
-					  "title": "Imputations"
-				  },
-				  "missing": {
-					  "type": "string",
-					  "title": "Treatment of missing values"
-				  },
-				  "quality_checks": {
-					  "type": "string",
-					  "title": "Quality control methods"
-				  },
-				  "quality_note": {
-					  "type": "string",
-					  "title": "Note on data quality"
-				  },
-				  "sources_discrepancies": {
-					  "type": "string",
-					  "title": "Discrepency sources"
-				  },
-				  "series_break": {
-					  "type": "string",
-					  "title": "Breaks in series"
-				  },
-				  
-				  "limitation": {
-					  "type": "string",
-					  "title": "Limitations  and exceptions"
-				  },				
-  
-				  "themes":{
-					  "type":"array",
-					  "title":"Themes",
-					  "items":{
-						  "type":"object",
-						  "properties":{
-							  "name":{
-								  "title":"Name",
-								  "type":"string"
-							  },
-							  "vocabulary":{
-								  "title":"Vocabulary name",
-								  "type":"string"
-							  },
-							  "uri":{
-								  "title":"Vocabulary URI",
-								  "type":"string"
-							  }
-						  }
-					  }
-				  },
-		  "topics": {
-			"type": "array",
-			"title": "Topics",
-			"description": "Topics covered by the table (ideally, the list of topics will be a controlled vocabulary)",
-			"items": {
-			  "type": "object",
-			  "properties": {
-				"id": {
-				  "title": "Unique Identifier",
-				  "type": "string"
+		"series_description": {
+			"description": "Series information",
+			"type": "object",
+			"properties": {
+				"idno": {
+					"type": "string",
+					"title": "Series unique ID",
+					"description": "Unique series ID"
 				},
 				"name": {
-				  "title": "Topic",
-				  "type": "string"
-				},
-				"parent_id": {
-				  "title": "Parent topic Identifier",
-				  "description":"For subtopics, provide the ID of the parent topic",
-				  "type": "string"
-				},
-				"vocabulary": {
-				  "title": "Vocabulary",
-				  "description": "Name of the controlled vocabulary, if the topic is from a taxonomy.",
-				  "type": "string"
-				},
-				"uri": {
-				  "title": "Vocabulary URI",
-				  "description": "Link to the controlled vocabulary web page, if the topic is from a taxonomy.",
-				  "type": "string"
-				}
-			  },
-			  "required": [
-				"name"
-			  ]
-			}
-		  },
-  
-		  "disciplines": {
-			"type": "array",
-			"title": "Disciplines",
-			"description": "Disciplines e.g. `Social sciences, economics`, `Natural sciences, biology`",
-			"items": {
-			  "type": "object",
-			  "properties": {
-				"name": {
-				  "title": "Discipline title or name",
-				  "type": "string"
-				},
-				"vocabulary": {
-				  "title": "Vocabulary",
-				  "description": "Vocabulary",
-				  "type": "string"
-				},
-				"uri": {
-				  "title": "URI",
-				  "description": "Website link",
-				  "type": "string"
-				}
-			  },
-			  "required": [
-				"name"
-			  ]
-			}
-		  },
-  
-  
-				  "relevance": {
-					  "type": "string",
-					  "title": "Relavance"
-				  },
-				  "time_periods": {
-					  "type": "array",
-					  "title": "Series dates",
-					  "items": {
-						  "type": "object",
-						  "properties": {
-							  "start": {
-								  "type": "string",
-								  "title": "Start"
-							  },
-							  "end": {
-								  "type": "string",
-								  "title": "End"
-							  }
-						  }
-					  }
-				  },
-				  "geographic_units": {
-					  "title": "Geographic locations",
-					  "description": "List of geographic units (regions, countries, states, provinces, etc.) for which data are available in the database.",
-					  "type": "array",
-					  "items": {
-						  "type": "object",
-						  "properties": {
-							  "name": {
-								  "title": "Location name",
-								  "description": "Name of the geographic unit e.g. 'World', 'Africa', 'Afghanistan'",
-								  "type": "string"
-							  },
-							  "code": {
-								  "title": "Location code",
-								  "description": "Code of the geographic unit (for countries, preferred = ISO3 code)",
-								  "type": "string"
-							  },
-							  "type": {
-								  "title": "Type",
-								  "description": "Type of geographic unit e.g. country, state, region, province etc",
-								  "type": "string"
-							  }
-						  },
-						  "required": [
-							  "name"
-						  ]
-					  }
-				  },
-				  "aggregation_method": {
-					  "type": "string",
-					  "title": "Aggregation method"
-				  },
-				  "disaggregation": {
-					  "type": "string",
-					  "title": "Dissaggregation"
-				  },
-				  "license": {
-					  "type": "object",
-					  "title": "Access licence",
-					  "properties": {
-						  "name": {
-							  "type": "string",
-							  "title": "Name"
-						  },
-						  "uri": {
-							  "type": "string",
-							  "title": "URI"
-						  }
-					  }
-				  },
-				  "confidentiality": {
-					  "type": "string",
-					  "title": "Confidentiality statement",
-					  "description": "Confidentiality statement"
-				  },
-				  "confidentiality_status": {
-					  "type": "string",
-					  "title": "Confidentiality status"
-				  },
-				  "confidentiality_note": {
-					  "type": "string",
-					  "title": "Confidentiality note"
-				  },
-				  "links": {
-					  "type": "array",
-					  "title": "Series links",
-					  "description": "Links to API calls, websites, etc.",
-					  "items": {
-						  "type": "object",
-						  "properties": {
-							  "type": {
-								  "type": "string",
-								  "title": "Link type",
-								  "description": "Link types - API, website, etc."
-							  },
-							  "description": {
-								  "type": "string",
-								  "title": "Description"
-							  },
-							  "uri": {
-								  "type": "string",
-								  "title": "URI"
-							  }
-						  }
-					  }
-				  },
-				  "api_documentation": {
-					  "type": "object",
-					  "description": "API Documentation",
-					  "properties": {
-						  "description": {
-							  "title": "Description",
-							  "type": "string"
-						  },
-						  "uri": {
-							  "title": "URI",
-							  "type": "string"
-						  }
-					  }
-				  },
-				  "sources":{
-					  "type":"array",
-					  "title":"Sources",
-					  "description":"Sources",
-					  "items": {
+					"type": "string",
+					"title": "Series Name"
+				},
+				"database_id": {
+					"type": "string",
+					"title": "Database ID",
+					"description": "Series database ID"
+				},
+				"aliases": {
+					"type": "array",
+					"title": "Series other names",
+					"items": {
 						"type": "object",
 						"properties": {
-						  "id": {
-							"title": "Source ID",
-							"type": "string"
-						  },
-						  "name": {
-							"title": "Name",
-							"description": "Source name",
+							"alias": {
+								"title": "Alias",
+								"type": "string"
+							}
+						}
+					}
+				},
+				"alternate_identifiers": {
+					"type": "array",
+					"title": "Alternate identifiers",
+					"items": {
+						"type": "object",
+						"properties": {
+							"identifier": {
+								"title": "Identifier",
+								"type": "string"
+							},
+							"name": {
+								"title": "Identifier name",
+								"type": "string"
+							},
+							"database": {
+								"title": "Database",
+								"type": "string"
+							},
+							"uri": {
+								"title": "URI",
+								"type": "string"
+							},
+							"notes": {
+								"title": "Notes",
+								"type": "string"
+							}
+						},
+						"required": [
+							"identifier"
+						]
+					}
+				},
+				"measurement_unit": {
+					"type": "string",
+					"title": "Series unit of measure"
+				},
+				"dimensions": {
+					"type": "array",
+					"title": "Dimensions",
+					"items": {
+						"type": "object",
+						"properties": {
+							"label": {
+								"title": "Label",
+								"type": "string"
+							},
+							"description": {
+								"title": "Description",
+								"type": "string"
+							}
+						},
+						"required": [
+							"label"
+						]
+					}
+				},
+				"periodicity": {
+					"type": "string",
+					"title": "Periodicity of data"
+				},
+				"base_period": {
+					"type": "string",
+					"title": "Base period"
+				},
+				"definition_short": {
+					"type": "string",
+					"title": "Definition short"
+				},
+				"definition_long": {
+					"type": "string",
+					"title": "Definition long"
+				},
+				"definition_references": {
+					"type": "array",
+					"title": "Definition references",
+					"description": "URL to standard definition of the indicator (international or national standard)",
+					"items": {
+						"type": "object",
+						"properties": {
+							"source": {
+								"title": "Source",
+								"type": "string"
+							},
+							"uri": {
+								"title": "URI",
+								"description": "URI",
+								"type": "string"
+							},
+							"note": {
+								"title": "Note",
+								"description": "Note",
+								"type": "string"
+							}
+						},
+						"required": [
+							"uri"
+						]
+					}
+				},
+				"statistical_concept": {
+					"type": "string",
+					"title": "Statistical concept"
+				},
+				"concepts": {
+					"type": "array",
+					"title": "Related concepts",
+					"description": "Related concepts",
+					"items": {
+						"type": "object",
+						"properties": {
+							"name": {
+								"title": "Name",
+								"type": "string"
+							},
+							"definition": {
+								"title": "Definition",
+								"description": "Definition",
+								"type": "string"
+							},
+							"uri": {
+								"title": "URI",
+								"description": "Website link",
+								"type": "string"
+							}
+						},
+						"required": [
+							"name"
+						]
+					}
+				},
+				"methodology": {
+					"type": "string",
+					"title": "Methodology"
+				},
+				"imputation": {
+					"type": "string",
+					"title": "Imputations"
+				},
+				"missing": {
+					"type": "string",
+					"title": "Treatment of missing values"
+				},
+				"quality_checks": {
+					"type": "string",
+					"title": "Quality control methods"
+				},
+				"quality_note": {
+					"type": "string",
+					"title": "Note on data quality"
+				},
+				"sources_discrepancies": {
+					"type": "string",
+					"title": "Discrepency sources"
+				},
+				"series_break": {
+					"type": "string",
+					"title": "Breaks in series"
+				},
+				"limitation": {
+					"type": "string",
+					"title": "Limitations  and exceptions"
+				},
+				"themes": {
+					"type": "array",
+					"title": "Themes",
+					"items": {
+						"type": "object",
+						"properties": {
+							"name": {
+								"title": "Name",
+								"type": "string"
+							},
+							"vocabulary": {
+								"title": "Vocabulary name",
+								"type": "string"
+							},
+							"uri": {
+								"title": "Vocabulary URI",
+								"type": "string"
+							}
+						}
+					}
+				},
+				"topics": {
+					"type": "array",
+					"title": "Topics",
+					"description": "Topics covered by the table (ideally, the list of topics will be a controlled vocabulary)",
+					"items": {
+						"type": "object",
+						"properties": {
+							"id": {
+								"title": "Unique Identifier",
+								"type": "string"
+							},
+							"name": {
+								"title": "Topic",
+								"type": "string"
+							},
+							"parent_id": {
+								"title": "Parent topic Identifier",
+								"description": "For subtopics, provide the ID of the parent topic",
+								"type": "string"
+							},
+							"vocabulary": {
+								"title": "Vocabulary",
+								"description": "Name of the controlled vocabulary, if the topic is from a taxonomy.",
+								"type": "string"
+							},
+							"uri": {
+								"title": "Vocabulary URI",
+								"description": "Link to the controlled vocabulary web page, if the topic is from a taxonomy.",
+								"type": "string"
+							}
+						},
+						"required": [
+							"name"
+						]
+					}
+				},
+				"disciplines": {
+					"type": "array",
+					"title": "Disciplines",
+					"description": "Disciplines e.g. `Social sciences, economics`, `Natural sciences, biology`",
+					"items": {
+						"type": "object",
+						"properties": {
+							"name": {
+								"title": "Discipline title or name",
+								"type": "string"
+							},
+							"vocabulary": {
+								"title": "Vocabulary",
+								"description": "Vocabulary",
+								"type": "string"
+							},
+							"uri": {
+								"title": "URI",
+								"description": "Website link",
+								"type": "string"
+							}
+						},
+						"required": [
+							"name"
+						]
+					}
+				},
+				"relevance": {
+					"type": "string",
+					"title": "Relavance"
+				},
+				"time_periods": {
+					"type": "array",
+					"title": "Series dates",
+					"items": {
+						"type": "object",
+						"properties": {
+							"start": {
+								"type": "string",
+								"title": "Start"
+							},
+							"end": {
+								"type": "string",
+								"title": "End"
+							}
+						}
+					}
+				},
+				"geographic_units": {
+					"title": "Geographic locations",
+					"description": "List of geographic units (regions, countries, states, provinces, etc.) for which data are available in the database.",
+					"type": "array",
+					"items": {
+						"type": "object",
+						"properties": {
+							"name": {
+								"title": "Location name",
+								"description": "Name of the geographic unit e.g. 'World', 'Africa', 'Afghanistan'",
+								"type": "string"
+							},
+							"code": {
+								"title": "Location code",
+								"description": "Code of the geographic unit (for countries, preferred = ISO3 code)",
+								"type": "string"
+							},
+							"type": {
+								"title": "Type",
+								"description": "Type of geographic unit e.g. country, state, region, province etc",
+								"type": "string"
+							}
+						},
+						"required": [
+							"name"
+						]
+					}
+				},
+				"bbox": {
+					"title": "Geographic bounding box",
+					"type": "array",
+					"items": {
+						"type": "object",
+						"properties": {
+							"west": {
+								"title": "West",
+								"type": "string"
+							},
+							"east": {
+								"title": "East",
+								"type": "string"
+							},
+							"south": {
+								"title": "South",
+								"type": "string"
+							},
+							"north": {
+								"title": "North",
+								"type": "string"
+							}
+						}
+					}
+				},
+				"aggregation_method": {
+					"type": "string",
+					"title": "Aggregation method"
+				},
+				"disaggregation": {
+					"type": "string",
+					"title": "Dissaggregation"
+				},
+				"license": {
+					"type": "object",
+					"title": "Access licence",
+					"properties": {
+						"name": {
+							"type": "string",
+							"title": "Name"
+						},
+						"uri": {
+							"type": "string",
+							"title": "URI"
+						}
+					}
+				},
+				"confidentiality": {
+					"type": "string",
+					"title": "Confidentiality statement",
+					"description": "Confidentiality statement"
+				},
+				"confidentiality_status": {
+					"type": "string",
+					"title": "Confidentiality status"
+				},
+				"confidentiality_note": {
+					"type": "string",
+					"title": "Confidentiality note"
+				},
+				"links": {
+					"type": "array",
+					"title": "Series links",
+					"description": "Links to API calls, websites, etc.",
+					"items": {
+						"type": "object",
+						"properties": {
+							"type": {
+								"type": "string",
+								"title": "Link type",
+								"description": "Link types - API, website, etc."
+							},
+							"description": {
+								"type": "string",
+								"title": "Description"
+							},
+							"uri": {
+								"type": "string",
+								"title": "URI"
+							}
+						}
+					}
+				},
+				"api_documentation": {
+					"type": "object",
+					"description": "API Documentation",
+					"properties": {
+						"description": {
+							"title": "Description",
 							"type": "string"
-						  },
-						  "organization": {
-							"title": "Organization",                
+						},
+						"uri": {
+							"title": "URI",
 							"type": "string"
-						  },
-						  "type": {
-							  "title": "Source type",                
-							  "type": "string"
-						  },
-						  "note": {
-							  "title": "Note",                
-							  "type": "string"
-						  }
+						}
+					}
+				},
+				"authoring_entity": {
+					"type": "array",
+					"title": "Authoring entity",
+					"description": "The person, corporate body, or agency responsible for the work's substantive and intellectual content. Repeat the element for each author, and use 'affiliation' attribute if available. Invert first and last name and use commas.",
+					"items": {
+						"type": "object",
+						"properties": {
+							"name": {
+								"title": "Agency Name",
+								"type": "string",
+								"description": "Name of the person, corporate body, or agency responsible for the work's substantive and intellectual content. If a person, invert first and last name and use commas."
+							},
+							"affiliation": {
+								"title": "Affiliation",
+								"type": "string"
+							},
+							"abbreviation": {
+								"title": "Abbreviation",
+								"description": "Abbreviation"
+							},
+							"email": {
+								"title": "Email",
+								"description": "Email"
+							},
+							"uri": {
+								"title": "URI",
+								"type": "string"
+							}
+						},
+						"required": [
+							"name"
+						]
+					}
+				},
+				"sources": {
+					"type": "array",
+					"title": "Sources",
+					"description": "Sources",
+					"items": {
+						"type": "object",
+						"properties": {
+							"id": {
+								"title": "Source ID",
+								"type": "string"
+							},
+							"name": {
+								"title": "Name",
+								"description": "Source name",
+								"type": "string"
+							},
+							"organization": {
+								"title": "Organization",
+								"type": "string"
+							},
+							"type": {
+								"title": "Source type",
+								"type": "string"
+							},
+							"note": {
+								"title": "Note",
+								"type": "string"
+							}
+						},
+						"required": [
+							"name"
+						]
+					}
+				},
+				"sources_note": {
+					"type": "string",
+					"title": "Notes form original sources"
+				},
+				"keywords": {
+					"type": "array",
+					"description": "Keywords",
+					"items": {
+						"type": "object",
+						"properties": {
+							"name": {
+								"title": "Keyword",
+								"type": "string"
+							},
+							"vocabulary": {
+								"title": "Vocabulary",
+								"type": "string"
+							},
+							"uri": {
+								"title": "URI",
+								"type": "string"
+							}
 						},
 						"required": [
-						  "name"
+							"name"
 						]
-					  }
+					}
+				},
+				"acronyms": {
+					"type": "array",
+					"description": "Acronyms",
+					"items": {
+						"type": "object",
+						"properties": {
+							"acronym": {
+								"title": "Acronym or abbreviation",
+								"type": "string"
+							},
+							"expansion": {
+								"title": "Expansion of the acronym or abbreviation",
+								"type": "string"
+							},
+							"occurrence": {
+								"title": "Occurrence of the acronym in the document",
+								"type": "number"
+							}
+						},
+						"required": [
+							"acronym",
+							"expansion"
+						]
+					}
+				},
+				"notes": {
+					"title": "Notes",
+					"description": "Notes",
+					"type": "array",
+					"items": {
+						"type": "object",
+						"properties": {
+							"note": {
+								"title": "Note",
+								"type": "string"
+							}
+						}
+					}
+				},
+				"related_indicators": {
+					"type": "array",
+					"description": "Related indicators",
+					"items": {
+						"type": "object",
+						"properties": {
+							"code": {
+								"title": "Indicator code",
+								"type": "string"
+							},
+							"label": {
+								"title": "Indicator name",
+								"type": "string"
+							},
+							"uri": {
+								"title": "URI",
+								"type": "string"
+							}
+						}
 					},
-  
-				  "sources_note": {
-					  "type": "string",
-					  "title": "Notes form original sources"
-				  },
-				  "keywords": {
-					  "type": "array",
-					  "description": "Keywords",					
-					  "items": {
-						  "type": "object",
-						  "properties": {
-							  "name": {
-								  "title": "Keyword",
-								  "type": "string"
-							  },
-							  "vocabulary": {
-								  "title": "Vocabulary",
-								  "type": "string"
-							  },
-							  "uri": {
-								  "title": "URI",
-								  "type": "string"
-							  }
-						  },
-						  "required": [
-							  "name"
-						  ]
-					  }
-				  },
-				  "acronyms": {
-					  "type": "array",
-					  "description": "Acronyms",					
-					  "items": {
-						  "type": "object",
-						  "properties": {
-							  "acronym": {
-								  "title": "Acronym or abbreviation",
-								  "type": "string"
-							  },
-							  "expansion": {
-								  "title": "Expansion of the acronym or abbreviation",
-								  "type": "string"
-							  },
-							  "occurrence": {
-								  "title": "Occurrence of the acronym in the document",
-								  "type": "number"
-							  }
-						  },
-						  "required": [
-							  "acronym", "expansion"
-						  ]
-					  }
-				  },
-				  "notes": {
-					  "title": "Notes",
-					  "description": "Notes",
-					  "type": "array",
-					  "items": {
-						  "type": "object",
-						  "properties": {
-							  "note": {
-								  "title": "Note",
-								  "type": "string"
-							  }
-						  }
-					  }
-				  },
-				  "related_indicators": {
-					  "type": "array",
-					  "description": "Related indicators",
-					  "items": {
-						  "type": "object",
-						  "properties": {
-							  "code": {
-								  "title": "Indicator code",
-								  "type": "string"
-							  },
-							  "label": {
-								  "title": "Indicator name",
-								  "type": "string"
-							  },
-							  "uri": {
-								  "title": "URI",
-								  "type": "string"
-							  }
-						  }
-					  },
-					  "required": [
-						  "code"
-					  ]
-				  },
-				  "compliance": {
-					  "type": "array",
-					  "title": "Compliance with international resolution",
-					  "description": "Compliance with international resolution",
-					  "items": {
-						  "type": "object",
-						  "properties": {
-							  "standard": {
-								  "type": "string",
-								  "title": "Standard name"
-							  },
-							  "organization": {
-								  "type": "string",
-								  "title": "Organization name"
-							  },
-							  "uri": {
-								  "type": "string",
-								  "title": "URI"
-							  }
-						  },
-						  "required": [
-							  "standard"
-						  ]
-					  }
-				  },
-				  "framework": {
-					  "type": "array",
-					  "title": "Framework",
-					  "items": {
-						  "type": "object",
-						  "properties": {
-							  "name": {
-								  "type": "string",
-								  "title": "Name"
-							  },
-							  "description": {
-								  "type": "string",
-								  "title": "Description"
-							  },
-							  "goal_id": {
-								  "type": "string",
-								  "title": "Goal ID"
-							  },
-							  "goal_name": {
-								  "type": "string",
-								  "title": "Goal name"
-							  },
-							  "goal_description": {
-								  "type": "string",
-								  "title": "Goal description"
-							  },
-							  "target_id": {
-								  "type": "string",
-								  "title": "target ID"
-							  },
-							  "target_name": {
-								  "type": "string",
-								  "title": "Target name"
-							  },
-							  "target_description": {
-								  "type": "string",
-								  "title": "Target description"
-							  },
-							  "indicator_id": {
-								  "type": "string",
-								  "title": "Indicator ID"
-							  },
-							  "indicator_name": {
-								  "type": "string",
-								  "title": "Indicator name"
-							  },
-							  "indicator_description": {
-								  "type": "string",
-								  "title": "Indicator description"
-							  },
-							  "uri": {
-								  "type": "string",
-								  "title": "URI"
-							  },
-							  "notes": {
-								  "type": "string",
-								  "title": "Description"
-							  }
-						  },
-						  "required": [
-							  "name"
-						  ]
-					  }
-				  },
-				  "lda_topics": {
-					  "type": "array",
-					  "title": "LDA topics",
-					  "description": "LDA topics",
-					  "items": {
+					"required": [
+						"code"
+					]
+				},
+				"compliance": {
+					"type": "array",
+					"title": "Compliance with international resolution",
+					"description": "Compliance with international resolution",
+					"items": {
 						"type": "object",
 						"properties": {
-						  "model_info": {
-							"type": "array",
-							"title": "Model information",
-							"items": {
-							  "type": "object",
-							  "properties": {
-								"source": {
-								  "title": "Source",
-								  "type": "string"
-								},
-								"author": {
-								  "title": "Author",
-								  "type": "string"
-								},
-								"version": {
-								  "title": "Version",
-								  "type": "string"
-								},
-								"model_id": {
-								  "title": "Model Identifier",
-								  "type": "string"
-								},
-								"nb_topics": {
-								  "title": "Number of topics",
-								  "type": "number"
-								},
-								"description": {
-								  "title": "Description",
-								  "type": "string"
-								},
-								"corpus": {
-								  "title": "Corpus name",
-								  "type": "string"
-								},
-								"uri": {
-								  "title": "URI",
-								  "type": "string"
-								}
-							  }
-							},
-							"required": [
-							  "model_id"
-							]
-						  },              
-						  "topic_description": {
-							"type": "array",
-							"title": "Topic information",
-							"items": {
-							  "type": "object",
-							  "properties": {
-								"topic_id": {
-								  "title": "Topic identifier",
-								  "type": ["integer", "string"]
-								},
-								"topic_score": {
-								  "title": "Topic score",
-								  "type": ["number", "string"]
-								},
-								"topic_label": {
-								  "title": "Topic label",
-								  "type": "string"
+							"standard": {
+								"type": "string",
+								"title": "Standard name"
+							},
+							"organization": {
+								"type": "string",
+								"title": "Organization name"
+							},
+							"uri": {
+								"type": "string",
+								"title": "URI"
+							}
+						},
+						"required": [
+							"standard"
+						]
+					}
+				},
+				"framework": {
+					"type": "array",
+					"title": "Framework",
+					"items": {
+						"type": "object",
+						"properties": {
+							"name": {
+								"type": "string",
+								"title": "Name"
+							},
+							"description": {
+								"type": "string",
+								"title": "Description"
+							},
+							"goal_id": {
+								"type": "string",
+								"title": "Goal ID"
+							},
+							"goal_name": {
+								"type": "string",
+								"title": "Goal name"
+							},
+							"goal_description": {
+								"type": "string",
+								"title": "Goal description"
+							},
+							"target_id": {
+								"type": "string",
+								"title": "target ID"
+							},
+							"target_name": {
+								"type": "string",
+								"title": "Target name"
+							},
+							"target_description": {
+								"type": "string",
+								"title": "Target description"
+							},
+							"indicator_id": {
+								"type": "string",
+								"title": "Indicator ID"
+							},
+							"indicator_name": {
+								"type": "string",
+								"title": "Indicator name"
+							},
+							"indicator_description": {
+								"type": "string",
+								"title": "Indicator description"
+							},
+							"uri": {
+								"type": "string",
+								"title": "URI"
+							},
+							"notes": {
+								"type": "string",
+								"title": "Description"
+							}
+						},
+						"required": [
+							"name"
+						]
+					}
+				},
+				"lda_topics": {
+					"type": "array",
+					"title": "LDA topics",
+					"description": "LDA topics",
+					"items": {
+						"type": "object",
+						"properties": {
+							"model_info": {
+								"type": "array",
+								"title": "Model information",
+								"items": {
+									"type": "object",
+									"properties": {
+										"source": {
+											"title": "Source",
+											"type": "string"
+										},
+										"author": {
+											"title": "Author",
+											"type": "string"
+										},
+										"version": {
+											"title": "Version",
+											"type": "string"
+										},
+										"model_id": {
+											"title": "Model Identifier",
+											"type": "string"
+										},
+										"nb_topics": {
+											"title": "Number of topics",
+											"type": "number"
+										},
+										"description": {
+											"title": "Description",
+											"type": "string"
+										},
+										"corpus": {
+											"title": "Corpus name",
+											"type": "string"
+										},
+										"uri": {
+											"title": "URI",
+											"type": "string"
+										}
+									}
 								},
-								"topic_words": {
-								  "type": "array",
-								  "title": "Topic words",
-								  "description": "Words",
-								  "items": {
+								"required": [
+									"model_id"
+								]
+							},
+							"topic_description": {
+								"type": "array",
+								"title": "Topic information",
+								"items": {
 									"type": "object",
 									"properties": {
-									  "word": {
-										"title": "Word",
-										"type": "string"
-									  },
-									  "word_weight": {
-										"title": "Word weight",
-										"type": "number"
-									  }
+										"topic_id": {
+											"title": "Topic identifier",
+											"type": [
+												"integer",
+												"string"
+											]
+										},
+										"topic_score": {
+											"title": "Topic score",
+											"type": [
+												"number",
+												"string"
+											]
+										},
+										"topic_label": {
+											"title": "Topic label",
+											"type": "string"
+										},
+										"topic_words": {
+											"type": "array",
+											"title": "Topic words",
+											"description": "Words",
+											"items": {
+												"type": "object",
+												"properties": {
+													"word": {
+														"title": "Word",
+														"type": "string"
+													},
+													"word_weight": {
+														"title": "Word weight",
+														"type": "number"
+													}
+												}
+											},
+											"required": [
+												"word"
+											]
+										}
 									}
-								  },
-								  "required": [
-									"word"
-								  ]
-								}
-							  }
-							},
-							"required": [
-							  "topic_id"
-							]
-						  }						
+								},
+								"required": [
+									"topic_id"
+								]
+							}
 						},
 						"additionalProperties": false
-					  }
+					}
+				},
+				"embeddings": {
+					"type": "array",
+					"title": "Word embeddings",
+					"description": "Word embeddings",
+					"items": {
+						"type": "object",
+						"properties": {
+							"id": {
+								"title": "Vector Model ID",
+								"type": "string"
+							},
+							"description": {
+								"title": "Vector Model Description",
+								"type": "string"
+							},
+							"date": {
+								"title": "Date (YYYY-MM-DD)",
+								"type": "string"
+							},
+							"vector": {
+								"title": "Vector",
+								"type": "object"
+							}
+						}
 					},
-				  "embeddings":{
-					  "type": "array",
-					  "title": "Word embeddings",
-						"description": "Word embeddings",
-					  "items": {
+					"required": [
+						"id",
+						"vector"
+					]
+				},
+				"series_groups": {
+					"type": "array",
+					"title": "Series groups",
+					"description": "Series included in groups",
+					"items": {
 						"type": "object",
 						"properties": {
-						  "id": {
-							"title": "Vector Model ID",
-							"type": "string"
-						  },
-						  "description": {
-							"title": "Vector Model Description",
-							"type": "string"
-						  },
-						  "date": {
-							"title": "Date (YYYY-MM-DD)",
-							"type": "string"
-						  },
-						  "vector": {
-							"title": "Vector",
-							"type": "object"
-						  }
+							"name": {
+								"type": "string",
+								"title": "Name"
+							},
+							"description": {
+								"type": "string",
+								"title": "Description",
+								"description": "A brief description of the series group."
+							},
+							"version": {
+								"type": "string",
+								"title": "Version"
+							},
+							"uri": {
+								"type": "string",
+								"title": "URI"
+							}
 						}
-					  },
-					  "required": [
-						"id","vector"
-					  ]
 					},
-				  "series_groups": {
-					  "type": "array",
-					  "title": "Series groups",
-					  "description": "Series included in groups",
-					  "items": {
-						  "type": "object",
-						  "properties": {
-							  "name": {
-								  "type": "string",
-								  "title": "Name"
-							  },
-							  "description": {
-								  "type": "string",
-								  "title": "Description",
-								  "description":"A brief description of the series group."
-							  },
-							  "version": {
-								  "type": "string",
-								  "title": "Version"
-							  },
-							  "uri": {
-								  "type": "string",
-								  "title": "URI"
-							  }
-						  }
-					  },
-					  "required": [
-						  "name"
-					  ]
-				  }
-			  },
-			  "required": [
-				  "idno",
-				  "name"
-			  ]
-		  
+					"required": [
+						"name"
+					]
+				}
+			},
+			"required": [
+				"idno",
+				"name"
+			]
 		},
-		"provenance":{
-		  "type":"array",
-		  "description":"Provenance",
-		  "items":{
-			"$ref":"provenance-schema.json"
-		  }
+		"provenance": {
+			"type": "array",
+			"description": "Provenance",
+			"items": {
+				"$ref": "provenance-schema.json"
+			}
 		},
 		"tags": {
-		  "type": "array",
-		  "title": "Tags (user-defined)",
-		  "description": "Tags",
-		  "items": {
-			"type": "object",
-			"properties": {
-			  "tag": {
-				"title": "Tag",
-				"type": "string"
-			  },
-			  "tag_group": {
-				"title": "Tag group",
-				"type": "string"
-			  }
-			}
-		  },
-		  "required": [
-			"tag"
-		  ]
+			"type": "array",
+			"title": "Tags (user-defined)",
+			"description": "Tags",
+			"items": {
+				"type": "object",
+				"properties": {
+					"tag": {
+						"title": "Tag",
+						"type": "string"
+					},
+					"tag_group": {
+						"title": "Tag group",
+						"type": "string"
+					}
+				}
+			},
+			"required": [
+				"tag"
+			]
 		},
 		"additional": {
-		  "type": "object",
-		  "title":"Additional custom metadata",
-		  "description": "Any other custom metadata not covered by the schema",
-		  "properties": {}
+			"type": "object",
+			"title": "Additional custom metadata",
+			"description": "Any other custom metadata not covered by the schema",
+			"properties": {}
 		}
-	  },    
-	  "required": [
+	},
+	"required": [
 		"series_description"
-	  ]
-	}
\ No newline at end of file
+	]
+}
\ No newline at end of file
diff --git a/application/schemas/video-schema.json b/application/schemas/video-schema.json
index 6690084f7..9a979015e 100644
--- a/application/schemas/video-schema.json
+++ b/application/schemas/video-schema.json
@@ -87,7 +87,29 @@
         "idno": {
           "type": "string",
           "title": "Unique video identifier"
-        },        
+        },
+        "identifiers": {
+          "type": "array",
+          "title": "Other identifiers",
+          "description": "Other identifiers",
+          "items": {
+            "type": "object",
+            "properties": {
+              "type": {
+                "title": "Identifier type",
+                "description": "Type of identifier e.g. `doi`, `handle`, `other`",
+                "type": "string"
+              },
+              "identifier": {
+                "title": "Identifier",
+                "type": "string"
+              }
+            },
+            "required": [
+              "identifier"
+            ]
+          }
+        },
         "title": {
           "type": "string",
           "description": "Title"

From 33afa576ef49e2af8253555ab180efca14c173ba Mon Sep 17 00:00:00 2001
From: Mehmood Asghar <mah0001@gmail.com>
Date: Thu, 10 Mar 2022 09:46:34 -0500
Subject: [PATCH 13/79] misc updates for schemas

---
 .../catalog-admin/document-schema.json        | 295 +++++-----
 .../catalog-admin/geospatial-schema.json      | 132 ++++-
 .../catalog-admin/image-schema.json           | 174 +++++-
 .../catalog-admin/script-schema.json          | 254 ++++++--
 .../catalog-admin/survey-schema.json          | 231 ++++++--
 .../catalog-admin/table-schema.json           | 134 +++++
 .../catalog-admin/timeseries-db-schema.json   |  69 ++-
 .../catalog-admin/timeseries-schema.json      | 253 +++++++-
 .../catalog-admin/variable-schema.json        | 149 ++---
 .../catalog-admin/video-schema.json           | 171 +++++-
 .../catalog-admin/visualization-schema.json   | 188 +++++-
 application/schemas/document-schema.json      | 295 +++++-----
 application/schemas/geospatial-schema.json    | 132 ++++-
 application/schemas/image-schema.json         | 174 +++++-
 application/schemas/script-schema.json        | 386 +++++++++---
 application/schemas/survey-schema.json        | 231 ++++++--
 application/schemas/table-schema.json         | 134 +++++
 application/schemas/timeseries-db-schema.json |  69 ++-
 application/schemas/timeseries-schema.json    | 253 +++++++-
 application/schemas/variable-schema.json      | 149 ++---
 application/schemas/video-schema.json         | 553 +++++++++++++++---
 application/schemas/visualization-schema.json | 188 +++++-
 22 files changed, 3681 insertions(+), 933 deletions(-)

diff --git a/api-documentation/catalog-admin/document-schema.json b/api-documentation/catalog-admin/document-schema.json
index b85794a16..311756b1b 100644
--- a/api-documentation/catalog-admin/document-schema.json
+++ b/api-documentation/catalog-admin/document-schema.json
@@ -130,12 +130,10 @@
             },
             "alternate_title": {
               "type": "string",
-              "title": "Abbreviation or Acronym",
-              "description": "Any form of the title used as a substitute or alternative to the formal title of the resource."
+              "title": "Abbreviation or Acronym"
             },
-            "abbreviated_title": {
-              "title": "Abbreviated Title",
-              "description": "Title as abbreviated for indexing or identification.",
+            "translated_title": {
+              "title": "Translated Title",              
               "type": "string"              
             }
           },
@@ -185,6 +183,11 @@
                     }
                   }
                 }
+              },
+              "full_name": {
+                "title": "Full name",
+                "type": "string",
+                "description": "Full name of the author. This element to be used only when first or last name cannot be distinguished."
               }
             }
           },
@@ -586,7 +589,7 @@
         },
 
         "url": {
-          "type": "string",
+          "type": ["string", "array"],
           "title": "URL",
           "description":"URL of the document, preferably a permanent URL"
         },
@@ -733,30 +736,29 @@
         },
 
         "sources": {
-          "type": "object",
+          "type":"array",
           "title": "Sources",
-          "description": "Description of sources used. The element is nestable so that the sources statement might encompass a series of discrete source statements, each of which could contain the facts about an individual source. ",
-          "_ddi_xpath":"stdyDscr/method/dataColl/sources",
+          "description": "Description of sources used. The element is nestable so that the sources statement might encompass a series of discrete source statements, each of which could contain the facts about an individual source. ",          
+          "items":{
+          "type": "object",          
             "properties": {              
               "source_origin":{
                 "type":"string",
                 "title":"Origin of Source",
-                "description":"For historical materials, information about the origin(s) of the sources and the rules followed in establishing the sources should be specified. May not be relevant to survey data. ",
-                "_ddi_xpath":"stdyDscr/method/dataColl/sources/srcOrig"
+                "description":"For historical materials, information about the origin(s) of the sources and the rules followed in establishing the sources should be specified. May not be relevant to survey data. "
               },
               "source_char":{
                 "type":"string",
                 "title":"Characteristics of Source Noted",
-                "description":"Assessment of characteristics and quality of source material. May not be relevant to survey data.",
-                "_ddi_xpath":"stdyDscr/method/dataColl/sources/srcChar"
+                "description":"Assessment of characteristics and quality of source material. May not be relevant to survey data."
               },
               "source_doc":{
                 "type":"string",
                 "title":"Source documentation",
-                "description":"Documentation and Access to Sources",
-                "_ddi_xpath":"stdyDscr/method/dataColl/sources/srcDocu"
+                "description":"Documentation and Access to Sources"
               }                
             }
+          }
         },
 
         "data_sources":{
@@ -982,138 +984,7 @@
               }
             }
           }          
-        },        
-
-        "lda_topics": {
-          "type": "array",
-          "title": "LDA topics",
-          "description": "LDA topics",
-          "items": {
-            "type": "object",
-            "properties": {
-              "model_info": {
-                "type": "array",
-                "title": "Model information",
-                "items": {
-                  "type": "object",
-                  "properties": {
-                    "source": {
-                      "title": "Source",
-                      "type": "string"
-                    },
-                    "author": {
-                      "title": "Author",
-                      "type": "string"
-                    },
-                    "version": {
-                      "title": "Version",
-                      "type": "string"
-                    },
-                    "model_id": {
-                      "title": "Model Identifier",
-                      "type": "string"
-                    },
-                    "nb_topics": {
-                      "title": "Number of topics",
-                      "type": "number"
-                    },
-                    "description": {
-                      "title": "Description",
-                      "type": "string"
-                    },
-                    "corpus": {
-                      "title": "Corpus name",
-                      "type": "string"
-                    },
-                    "uri": {
-                      "title": "URI",
-                      "type": "string"
-                    }
-                  }
-                },
-                "required": [
-                  "model_id"
-                ]
-              },              
-              "topic_description": {
-                "type": "array",
-                "title": "Topic information",
-                "items": {
-                  "type": "object",
-                  "properties": {
-                    "topic_id": {
-                      "title": "Topic identifier",
-                      "type": ["integer", "string"]
-                    },
-                    "topic_score": {
-                      "title": "Topic score",
-                      "type": ["number", "string"]
-                    },
-                    "topic_label": {
-                      "title": "Topic label",
-                      "type": "string"
-                    },
-                    "topic_words": {
-                      "type": "array",
-                      "title": "Topic words",
-                      "description": "Words",
-                      "items": {
-                        "type": "object",
-                        "properties": {
-                          "word": {
-                            "title": "Word",
-                            "type": "string"
-                          },
-                          "word_weight": {
-                            "title": "Word weight",
-                            "type": "number"
-                          }
-                        }
-                      },
-                      "required": [
-                        "word"
-                      ]
-                    }
-                  }
-                },
-                "required": [
-                  "topic_id"
-                ]
-              }
-              
-            },
-            "additionalProperties": false
-          }
-        },
-        "embeddings":{
-          "type": "array",
-          "title": "Word embeddings",
-          "description": "Word embeddings",
-          "items": {
-            "type": "object",
-            "properties": {
-              "id": {
-                "title": "Vector Model ID",
-                "type": "string"
-              },
-              "description": {
-                "title": "Vector Model Description",
-                "type": "string"
-              },
-              "date": {
-                "title": "Date (YYYY-MM-DD)",
-                "type": "string"
-              },
-              "vector": {
-                "title": "Vector",
-                "type": "object"
-              }
-            },
-            "required": [
-              "id","vector"
-            ]
-          }
-        }
+        }        
       },
       "required":["title_statement"],
       "additionalProperties": false
@@ -1146,6 +1017,136 @@
         "tag"
       ]
     },
+    "lda_topics": {
+      "type": "array",
+      "title": "LDA topics",
+      "description": "LDA topics",
+      "items": {
+        "type": "object",
+        "properties": {
+          "model_info": {
+            "type": "array",
+            "title": "Model information",
+            "items": {
+              "type": "object",
+              "properties": {
+                "source": {
+                  "title": "Source",
+                  "type": "string"
+                },
+                "author": {
+                  "title": "Author",
+                  "type": "string"
+                },
+                "version": {
+                  "title": "Version",
+                  "type": "string"
+                },
+                "model_id": {
+                  "title": "Model Identifier",
+                  "type": "string"
+                },
+                "nb_topics": {
+                  "title": "Number of topics",
+                  "type": "number"
+                },
+                "description": {
+                  "title": "Description",
+                  "type": "string"
+                },
+                "corpus": {
+                  "title": "Corpus name",
+                  "type": "string"
+                },
+                "uri": {
+                  "title": "URI",
+                  "type": "string"
+                }
+              }
+            },
+            "required": [
+              "model_id"
+            ]
+          },              
+          "topic_description": {
+            "type": "array",
+            "title": "Topic information",
+            "items": {
+              "type": "object",
+              "properties": {
+                "topic_id": {
+                  "title": "Topic identifier",
+                  "type": ["integer", "string"]
+                },
+                "topic_score": {
+                  "title": "Topic score",
+                  "type": ["number", "string"]
+                },
+                "topic_label": {
+                  "title": "Topic label",
+                  "type": "string"
+                },
+                "topic_words": {
+                  "type": "array",
+                  "title": "Topic words",
+                  "description": "Words",
+                  "items": {
+                    "type": "object",
+                    "properties": {
+                      "word": {
+                        "title": "Word",
+                        "type": "string"
+                      },
+                      "word_weight": {
+                        "title": "Word weight",
+                        "type": "number"
+                      }
+                    }
+                  },
+                  "required": [
+                    "word"
+                  ]
+                }
+              }
+            },
+            "required": [
+              "topic_id"
+            ]
+          }
+          
+        },
+        "additionalProperties": false
+      }
+    },
+    "embeddings":{
+      "type": "array",
+      "title": "Word embeddings",
+      "description": "Word embeddings",
+      "items": {
+        "type": "object",
+        "properties": {
+          "id": {
+            "title": "Vector Model ID",
+            "type": "string"
+          },
+          "description": {
+            "title": "Vector Model Description",
+            "type": "string"
+          },
+          "date": {
+            "title": "Date (YYYY-MM-DD)",
+            "type": "string"
+          },
+          "vector": {
+            "title": "Vector",
+            "type": "object"
+          }
+        },
+        "required": [
+          "id","vector"
+        ]
+      }
+    },
     "additional": {
       "type": "object",
       "description": "Additional metadata",
diff --git a/api-documentation/catalog-admin/geospatial-schema.json b/api-documentation/catalog-admin/geospatial-schema.json
index 67d68df1a..ef94c08d5 100644
--- a/api-documentation/catalog-admin/geospatial-schema.json
+++ b/api-documentation/catalog-admin/geospatial-schema.json
@@ -2027,7 +2027,137 @@
 			"required": [
 				"tag"
 			]
-		},		
+		},
+		"lda_topics": {
+			"type": "array",
+			"title": "LDA topics",
+			"description": "LDA topics",
+			"items": {
+			  "type": "object",
+			  "properties": {
+				"model_info": {
+				  "type": "array",
+				  "title": "Model information",
+				  "items": {
+					"type": "object",
+					"properties": {
+					  "source": {
+						"title": "Source",
+						"type": "string"
+					  },
+					  "author": {
+						"title": "Author",
+						"type": "string"
+					  },
+					  "version": {
+						"title": "Version",
+						"type": "string"
+					  },
+					  "model_id": {
+						"title": "Model Identifier",
+						"type": "string"
+					  },
+					  "nb_topics": {
+						"title": "Number of topics",
+						"type": "number"
+					  },
+					  "description": {
+						"title": "Description",
+						"type": "string"
+					  },
+					  "corpus": {
+						"title": "Corpus name",
+						"type": "string"
+					  },
+					  "uri": {
+						"title": "URI",
+						"type": "string"
+					  }
+					}
+				  },
+				  "required": [
+					"model_id"
+				  ]
+				},              
+				"topic_description": {
+				  "type": "array",
+				  "title": "Topic information",
+				  "items": {
+					"type": "object",
+					"properties": {
+					  "topic_id": {
+						"title": "Topic identifier",
+						"type": ["integer", "string"]
+					  },
+					  "topic_score": {
+						"title": "Topic score",
+						"type": ["number", "string"]
+					  },
+					  "topic_label": {
+						"title": "Topic label",
+						"type": "string"
+					  },
+					  "topic_words": {
+						"type": "array",
+						"title": "Topic words",
+						"description": "Words",
+						"items": {
+						  "type": "object",
+						  "properties": {
+							"word": {
+							  "title": "Word",
+							  "type": "string"
+							},
+							"word_weight": {
+							  "title": "Word weight",
+							  "type": "number"
+							}
+						  }
+						},
+						"required": [
+						  "word"
+						]
+					  }
+					}
+				  },
+				  "required": [
+					"topic_id"
+				  ]
+				}
+				
+			  },
+			  "additionalProperties": false
+			}
+		  },
+		  "embeddings":{
+			"type": "array",
+			"title": "Word embeddings",
+			"description": "Word embeddings",
+			"items": {
+			  "type": "object",
+			  "properties": {
+				"id": {
+				  "title": "Vector Model ID",
+				  "type": "string"
+				},
+				"description": {
+				  "title": "Vector Model Description",
+				  "type": "string"
+				},
+				"date": {
+				  "title": "Date (YYYY-MM-DD)",
+				  "type": "string"
+				},
+				"vector": {
+				  "title": "Vector",
+				  "type": "object"
+				}
+			  },
+			  "required": [
+				"id","vector"
+			  ]
+			}
+		  },
 		"additional": {
 			"title": "Additional metadata",
 			"description": "Any additional metadata",
diff --git a/api-documentation/catalog-admin/image-schema.json b/api-documentation/catalog-admin/image-schema.json
index de8188bf2..01be446d4 100644
--- a/api-documentation/catalog-admin/image-schema.json
+++ b/api-documentation/catalog-admin/image-schema.json
@@ -165,28 +165,7 @@
 							}
 						}
 					}
-				},
-				"tags": {
-					"type": "array",
-					"title": "Tags",
-					"description": "Tags",
-					"items": {
-						"type": "object",
-						"properties": {
-							"tag": {
-								"title": "Tag",
-								"type": "string"
-							},
-							"tag_group": {
-								"title": "Tag group",
-								"type": "string"
-							}
-						}
-					},
-					"required": [
-						"tag"
-					]
-				}
+				}				
 			}
 		},
 		"provenance":{
@@ -196,6 +175,157 @@
 			  "$ref":"provenance-schema.json"
 			}
 		  },
+		  "tags": {
+			"type": "array",
+			"title": "Tags",
+			"description": "Tags",
+			"items": {
+				"type": "object",
+				"properties": {
+					"tag": {
+						"title": "Tag",
+						"type": "string"
+					},
+					"tag_group": {
+						"title": "Tag group",
+						"type": "string"
+					}
+				}
+			},
+			"required": [
+				"tag"
+			]
+		},
+		"lda_topics": {
+			"type": "array",
+			"title": "LDA topics",
+			"description": "LDA topics",
+			"items": {
+			  "type": "object",
+			  "properties": {
+				"model_info": {
+				  "type": "array",
+				  "title": "Model information",
+				  "items": {
+					"type": "object",
+					"properties": {
+					  "source": {
+						"title": "Source",
+						"type": "string"
+					  },
+					  "author": {
+						"title": "Author",
+						"type": "string"
+					  },
+					  "version": {
+						"title": "Version",
+						"type": "string"
+					  },
+					  "model_id": {
+						"title": "Model Identifier",
+						"type": "string"
+					  },
+					  "nb_topics": {
+						"title": "Number of topics",
+						"type": "number"
+					  },
+					  "description": {
+						"title": "Description",
+						"type": "string"
+					  },
+					  "corpus": {
+						"title": "Corpus name",
+						"type": "string"
+					  },
+					  "uri": {
+						"title": "URI",
+						"type": "string"
+					  }
+					}
+				  },
+				  "required": [
+					"model_id"
+				  ]
+				},              
+				"topic_description": {
+				  "type": "array",
+				  "title": "Topic information",
+				  "items": {
+					"type": "object",
+					"properties": {
+					  "topic_id": {
+						"title": "Topic identifier",
+						"type": ["integer", "string"]
+					  },
+					  "topic_score": {
+						"title": "Topic score",
+						"type": ["number", "string"]
+					  },
+					  "topic_label": {
+						"title": "Topic label",
+						"type": "string"
+					  },
+					  "topic_words": {
+						"type": "array",
+						"title": "Topic words",
+						"description": "Words",
+						"items": {
+						  "type": "object",
+						  "properties": {
+							"word": {
+							  "title": "Word",
+							  "type": "string"
+							},
+							"word_weight": {
+							  "title": "Word weight",
+							  "type": "number"
+							}
+						  }
+						},
+						"required": [
+						  "word"
+						]
+					  }
+					}
+				  },
+				  "required": [
+					"topic_id"
+				  ]
+				}
+				
+			  },
+			  "additionalProperties": false
+			}
+		  },
+		  "embeddings":{
+			"type": "array",
+			"title": "Word embeddings",
+			"description": "Word embeddings",
+			"items": {
+			  "type": "object",
+			  "properties": {
+				"id": {
+				  "title": "Vector Model ID",
+				  "type": "string"
+				},
+				"description": {
+				  "title": "Vector Model Description",
+				  "type": "string"
+				},
+				"date": {
+				  "title": "Date (YYYY-MM-DD)",
+				  "type": "string"
+				},
+				"vector": {
+				  "title": "Vector",
+				  "type": "object"
+				}
+			  },
+			  "required": [
+				"id","vector"
+			  ]
+			}
+		  },
 		"additional": {
 			"type": "object",
 			"description": "Additional metadata",
diff --git a/api-documentation/catalog-admin/script-schema.json b/api-documentation/catalog-admin/script-schema.json
index b73cac6cf..d2dbfc4c1 100644
--- a/api-documentation/catalog-admin/script-schema.json
+++ b/api-documentation/catalog-admin/script-schema.json
@@ -369,10 +369,12 @@
               },
               "abbreviation": {
                 "title": "Abbreviation",
-                "description": "Abbreviation"
+                "description": "Abbreviation",
+                "type": "string"
               },
               "email": {
                 "title": "Email",
+                "type": "string",
                 "description": "Email"
               },
               "author_id": {
@@ -384,10 +386,12 @@
                   "properties": {
                     "type": {
                       "title": "Type",
+                      "type": "string",
                       "description": "Source of identifier, e.g. ORCID"
                     },
                     "id": {
                       "title": "Identifier",
+                      "type": "string",
                       "description": "Author's unique identifier for the corresponding source"
                     }
                   }
@@ -407,7 +411,7 @@
             "type": "object",
             "properties": {
               "name": {
-                "title": "N`ame",
+                "title": "Name",
                 "type": "string",
                 "description": "Name of the person, corporate body, or agency responsible for the work's substantive and intellectual content. If a person, invert first and last name and use commas."
               },
@@ -422,14 +426,17 @@
               },
               "abbreviation": {
                 "title": "Abbreviation",
+                "type": "string",
                 "description": "Abbreviation"
               },
               "email": {
                 "title": "Email",
+                "type": "string",
                 "description": "Email"
               },
               "url": {
                 "title": "URL",
+                "type": "string",
                 "description": "URL"
               }
             },
@@ -490,14 +497,17 @@
               },
               "abbreviation": {
                 "title": "Abbreviation",
+                "type": "string",
                 "description": "Abbreviation"
               },
               "email": {
                 "title": "Email",
+                "type": "string",
                 "description": "Email"
               },
               "url": {
                 "title": "URL",
+                "type": "string",
                 "description": "URL"
               }
             },
@@ -507,29 +517,32 @@
           }
         },
         "reviews_comments": {
-          "type": "object",
-          "title": "Reviews and comments",
-          "description": "List and description of reviews and comments received on the project",
-          "properties": {
-            "comment_date": {
-              "title": "Date of the comment",
-              "description": "Date when the comment was provided",
-              "type": "string"
-            },
-            "comment_by": {
-              "title": "Provider of the comment",
-              "description": "Name and title of the comment provider (individual or organization)",
-              "type": "string"
-            },
-            "comment_description": {
-              "title": "Description of the comment",
-              "description": "A description of the comment",
-              "type": "string"
-            },
-            "comment_response": {
-              "title": "Response on the comment",
-              "description": "Response by the primary investigator or research team on the comment",
-              "type": "string"
+          "type": "array",
+          "items": {
+            "type": "object",
+            "title": "Reviews and comments",
+            "description": "List and description of reviews and comments received on the project",
+            "properties": {
+              "comment_date": {
+                "title": "Date of the comment",
+                "description": "Date when the comment was provided",
+                "type": "string"
+              },
+              "comment_by": {
+                "title": "Provider of the comment",
+                "description": "Name and title of the comment provider (individual or organization)",
+                "type": "string"
+              },
+              "comment_description": {
+                "title": "Description of the comment",
+                "description": "A description of the comment",
+                "type": "string"
+              },
+              "comment_response": {
+                "title": "Response on the comment",
+                "description": "Response by the primary investigator or research team on the comment",
+                "type": "string"
+              }
             }
           }
         },
@@ -652,27 +665,37 @@
           }
         },
         "themes": {
-          "title": "Themes",
           "type": "array",
-          "description": "Themes covered by the project (ideally, a controlled vocabulary should be used)",
+          "description": "Themes",
           "items": {
             "type": "object",
             "properties": {
+              "id": {
+                "title": "Unique Identifier",
+                "type": "string"
+              },
               "name": {
                 "title": "Name",
-                "description": "Theme label, typically extracted from a pre-defined taxonomy",
+                "type": "string"
+              },
+              "parent_id": {
+                "title": "Parent Identifier",
                 "type": "string"
               },
               "vocabulary": {
-                "title": "Vocabulary name",
-                "description": "Vocabulary name (for themes extracted from controlled vocabularies)",
+                "title": "Vocabulary",
+                "description": "Name of the controlled vocabulary",
                 "type": "string"
               },
               "uri": {
                 "title": "Vocabulary URI",
+                "description": "Link to the controlled vocabulary web page, if the theme is from a taxonomy.",
                 "type": "string"
               }
-            }
+            },
+            "required": [
+              "name"
+            ]
           }
         },
         "topics": {
@@ -715,22 +738,31 @@
         "disciplines": {
           "type": "array",
           "title": "Disciplines",
-          "description": "Disciplines e.g. `Social sciences, economics`, `Natural sciences, biology` (ideally, a controlled vocabulary should be used)",
+          "description": "Disciplines e.g. `Social sciences, economics`, `Natural sciences, biology`",
           "items": {
             "type": "object",
             "properties": {
+              "id": {
+                "title": "Unique Identifier",
+                "type": "string"
+              },
               "name": {
                 "title": "Discipline title or name",
                 "type": "string"
               },
+              "parent_id": {
+                "title": "Parent discipline Identifier",
+                "description": "Parent discipline ID",
+                "type": "string"
+              },
               "vocabulary": {
-                "title": "Vocabulary name",
-                "description": "Vocabulary name (for disciplines extracted from controlled vocabularies)",
+                "title": "Vocabulary",
+                "description": "Vocabulary",
                 "type": "string"
               },
               "uri": {
-                "title": "Vocabulary URI",
-                "description": "Vocabulary uri",
+                "title": "URI",
+                "description": "Website link",
                 "type": "string"
               }
             },
@@ -1016,20 +1048,24 @@
                 "title": "Name",
                 "type": "string"
               },
+              "role": {
+                "title": "Role",
+                "type": "string"
+              },
               "affiliation": {
                 "title": "Affiliation",
                 "type": "string"
               },
-              "role": {
-                "title": "Role",
+              "email": {
+                "title": "Email",
                 "type": "string"
               },
-              "uri": {
-                "title": "URI",
+              "telephone": {
+                "title": "Telephone",
                 "type": "string"
               },
-              "phone": {
-                "title": "Phone number",
+              "uri": {
+                "title": "URI",
                 "type": "string"
               }
             }
@@ -1037,8 +1073,8 @@
           "required": [
             "name"
           ]
-        }        
-      }      
+        }
+      }
     },
     "provenance": {
       "type": "array",
@@ -1068,6 +1104,136 @@
         "tag"
       ]
     },
+    "lda_topics": {
+      "type": "array",
+      "title": "LDA topics",
+      "description": "LDA topics",
+      "items": {
+        "type": "object",
+        "properties": {
+          "model_info": {
+            "type": "array",
+            "title": "Model information",
+            "items": {
+              "type": "object",
+              "properties": {
+                "source": {
+                  "title": "Source",
+                  "type": "string"
+                },
+                "author": {
+                  "title": "Author",
+                  "type": "string"
+                },
+                "version": {
+                  "title": "Version",
+                  "type": "string"
+                },
+                "model_id": {
+                  "title": "Model Identifier",
+                  "type": "string"
+                },
+                "nb_topics": {
+                  "title": "Number of topics",
+                  "type": "number"
+                },
+                "description": {
+                  "title": "Description",
+                  "type": "string"
+                },
+                "corpus": {
+                  "title": "Corpus name",
+                  "type": "string"
+                },
+                "uri": {
+                  "title": "URI",
+                  "type": "string"
+                }
+              }
+            },
+            "required": [
+              "model_id"
+            ]
+          },              
+          "topic_description": {
+            "type": "array",
+            "title": "Topic information",
+            "items": {
+              "type": "object",
+              "properties": {
+                "topic_id": {
+                  "title": "Topic identifier",
+                  "type": ["integer", "string"]
+                },
+                "topic_score": {
+                  "title": "Topic score",
+                  "type": ["number", "string"]
+                },
+                "topic_label": {
+                  "title": "Topic label",
+                  "type": "string"
+                },
+                "topic_words": {
+                  "type": "array",
+                  "title": "Topic words",
+                  "description": "Words",
+                  "items": {
+                    "type": "object",
+                    "properties": {
+                      "word": {
+                        "title": "Word",
+                        "type": "string"
+                      },
+                      "word_weight": {
+                        "title": "Word weight",
+                        "type": "number"
+                      }
+                    }
+                  },
+                  "required": [
+                    "word"
+                  ]
+                }
+              }
+            },
+            "required": [
+              "topic_id"
+            ]
+          }
+          
+        },
+        "additionalProperties": false
+      }
+    },
+    "embeddings":{
+      "type": "array",
+      "title": "Word embeddings",
+      "description": "Word embeddings",
+      "items": {
+        "type": "object",
+        "properties": {
+          "id": {
+            "title": "Vector Model ID",
+            "type": "string"
+          },
+          "description": {
+            "title": "Vector Model Description",
+            "type": "string"
+          },
+          "date": {
+            "title": "Date (YYYY-MM-DD)",
+            "type": "string"
+          },
+          "vector": {
+            "title": "Vector",
+            "type": "object"
+          }
+        },
+        "required": [
+          "id","vector"
+        ]
+      }
+    },
     "additional": {
       "type": "object",
       "description": "Additional metadata",
diff --git a/api-documentation/catalog-admin/survey-schema.json b/api-documentation/catalog-admin/survey-schema.json
index 9cec126ee..1b484cddc 100644
--- a/api-documentation/catalog-admin/survey-schema.json
+++ b/api-documentation/catalog-admin/survey-schema.json
@@ -3,56 +3,61 @@
   "$schema": "http://json-schema.org/draft-07/schema#",
   "title": "Survey Microdata Schema",
   "id": "survey-schema.json",
-  "version" :"0.0",
-  "description": "Schema for Survey data type based on DDI 2.5",  
-  "allOf": [    
+  "version": "0.0",
+  "description": "Schema for Survey data type based on DDI 2.5",
+  "allOf": [
     {
-        "type": "object",
-        "properties": {
-          "repositoryid": {
-            "type": "string",
-            "title": "Collection ID that owns the survey",
-            "description": "Abbreviation for the collection that owns this survey."
-          },
-          "access_policy": {
-            "type": "string",
-            "title": "Data access policy",
-            "description": "Data access policy for attached microdata resources",
-            "enum": [
-              "direct",
-              "open",
-              "public",
-              "licensed",
-              "remote",
-              "data_na"
-            ],
-            "default": "data_na"
-          },
-          "published": {
-            "type": "integer",
-            "description": "Status of the survey - 0=draft, 1=published",
-            "default": 0
-          },
-          "overwrite": {
-            "type": "string",
-            "description": "Overwrite survey if already exists?",            
-            "enum":["yes","no"],
-            "default": "no"
-          }
+      "type": "object",
+      "properties": {
+        "repositoryid": {
+          "type": "string",
+          "title": "Collection ID that owns the survey",
+          "description": "Abbreviation for the collection that owns this survey."
+        },
+        "access_policy": {
+          "type": "string",
+          "title": "Data access policy",
+          "description": "Data access policy for attached microdata resources",
+          "enum": [
+            "direct",
+            "open",
+            "public",
+            "licensed",
+            "remote",
+            "data_na"
+          ],
+          "default": "data_na"
+        },
+        "published": {
+          "type": "integer",
+          "description": "Status of the survey - 0=draft, 1=published",
+          "default": 0
+        },
+        "overwrite": {
+          "type": "string",
+          "description": "Overwrite survey if already exists?",
+          "enum": [
+            "yes",
+            "no"
+          ],
+          "default": "no"
         }
+      }
+    },
+    {
+      "$ref": "ddi-schema.json"
     },
-    { "$ref": "ddi-schema.json" },
     {
       "type": "object",
-      "properties": {        
-        "provenance":{
-          "type":"array",
-          "description":"Provenance",
-          "items":{
-            "$ref":"provenance-schema.json"
+      "properties": {
+        "provenance": {
+          "type": "array",
+          "description": "Provenance",
+          "items": {
+            "$ref": "provenance-schema.json"
           }
         },
-         "tags": {
+        "tags": {
           "type": "array",
           "title": "Tags (user-defined)",
           "description": "Tags",
@@ -73,12 +78,148 @@
             "tag"
           ]
         },
+        "lda_topics": {
+          "type": "array",
+          "title": "LDA topics",
+          "description": "LDA topics",
+          "items": {
+            "type": "object",
+            "properties": {
+              "model_info": {
+                "type": "array",
+                "title": "Model information",
+                "items": {
+                  "type": "object",
+                  "properties": {
+                    "source": {
+                      "title": "Source",
+                      "type": "string"
+                    },
+                    "author": {
+                      "title": "Author",
+                      "type": "string"
+                    },
+                    "version": {
+                      "title": "Version",
+                      "type": "string"
+                    },
+                    "model_id": {
+                      "title": "Model Identifier",
+                      "type": "string"
+                    },
+                    "nb_topics": {
+                      "title": "Number of topics",
+                      "type": "number"
+                    },
+                    "description": {
+                      "title": "Description",
+                      "type": "string"
+                    },
+                    "corpus": {
+                      "title": "Corpus name",
+                      "type": "string"
+                    },
+                    "uri": {
+                      "title": "URI",
+                      "type": "string"
+                    }
+                  }
+                },
+                "required": [
+                  "model_id"
+                ]
+              },
+              "topic_description": {
+                "type": "array",
+                "title": "Topic information",
+                "items": {
+                  "type": "object",
+                  "properties": {
+                    "topic_id": {
+                      "title": "Topic identifier",
+                      "type": [
+                        "integer",
+                        "string"
+                      ]
+                    },
+                    "topic_score": {
+                      "title": "Topic score",
+                      "type": [
+                        "number",
+                        "string"
+                      ]
+                    },
+                    "topic_label": {
+                      "title": "Topic label",
+                      "type": "string"
+                    },
+                    "topic_words": {
+                      "type": "array",
+                      "title": "Topic words",
+                      "description": "Words",
+                      "items": {
+                        "type": "object",
+                        "properties": {
+                          "word": {
+                            "title": "Word",
+                            "type": "string"
+                          },
+                          "word_weight": {
+                            "title": "Word weight",
+                            "type": "number"
+                          }
+                        }
+                      },
+                      "required": [
+                        "word"
+                      ]
+                    }
+                  }
+                },
+                "required": [
+                  "topic_id"
+                ]
+              }
+            },
+            "additionalProperties": false
+          }
+        },
+        "embeddings": {
+          "type": "array",
+          "title": "Word embeddings",
+          "description": "Word embeddings",
+          "items": {
+            "type": "object",
+            "properties": {
+              "id": {
+                "title": "Vector Model ID",
+                "type": "string"
+              },
+              "description": {
+                "title": "Vector Model Description",
+                "type": "string"
+              },
+              "date": {
+                "title": "Date (YYYY-MM-DD)",
+                "type": "string"
+              },
+              "vector": {
+                "title": "Vector",
+                "type": "object"
+              }
+            },
+            "required": [
+              "id",
+              "vector"
+            ]
+          }
+        },
         "additional": {
           "type": "object",
           "description": "Additional metadata not covered by DDI elements",
           "properties": {}
         }
+      }
     }
-  }
-]
+  ]
 }
\ No newline at end of file
diff --git a/api-documentation/catalog-admin/table-schema.json b/api-documentation/catalog-admin/table-schema.json
index b1c7ad573..6334fd3f7 100644
--- a/api-documentation/catalog-admin/table-schema.json
+++ b/api-documentation/catalog-admin/table-schema.json
@@ -133,6 +133,10 @@
           "title": "Unique ID number for the document",
           "type": "string"
         },
+        "title": {
+          "title": "Document title",
+          "type": "string"
+        },
         "producers": {
           "type": "array",
           "title": "Producers",
@@ -966,6 +970,136 @@
         "tag"
       ]
     },
+    "lda_topics": {
+      "type": "array",
+      "title": "LDA topics",
+      "description": "LDA topics",
+      "items": {
+        "type": "object",
+        "properties": {
+          "model_info": {
+            "type": "array",
+            "title": "Model information",
+            "items": {
+              "type": "object",
+              "properties": {
+                "source": {
+                  "title": "Source",
+                  "type": "string"
+                },
+                "author": {
+                  "title": "Author",
+                  "type": "string"
+                },
+                "version": {
+                  "title": "Version",
+                  "type": "string"
+                },
+                "model_id": {
+                  "title": "Model Identifier",
+                  "type": "string"
+                },
+                "nb_topics": {
+                  "title": "Number of topics",
+                  "type": "number"
+                },
+                "description": {
+                  "title": "Description",
+                  "type": "string"
+                },
+                "corpus": {
+                  "title": "Corpus name",
+                  "type": "string"
+                },
+                "uri": {
+                  "title": "URI",
+                  "type": "string"
+                }
+              }
+            },
+            "required": [
+              "model_id"
+            ]
+          },              
+          "topic_description": {
+            "type": "array",
+            "title": "Topic information",
+            "items": {
+              "type": "object",
+              "properties": {
+                "topic_id": {
+                  "title": "Topic identifier",
+                  "type": ["integer", "string"]
+                },
+                "topic_score": {
+                  "title": "Topic score",
+                  "type": ["number", "string"]
+                },
+                "topic_label": {
+                  "title": "Topic label",
+                  "type": "string"
+                },
+                "topic_words": {
+                  "type": "array",
+                  "title": "Topic words",
+                  "description": "Words",
+                  "items": {
+                    "type": "object",
+                    "properties": {
+                      "word": {
+                        "title": "Word",
+                        "type": "string"
+                      },
+                      "word_weight": {
+                        "title": "Word weight",
+                        "type": "number"
+                      }
+                    }
+                  },
+                  "required": [
+                    "word"
+                  ]
+                }
+              }
+            },
+            "required": [
+              "topic_id"
+            ]
+          }
+          
+        },
+        "additionalProperties": false
+      }
+    },
+    "embeddings":{
+      "type": "array",
+      "title": "Word embeddings",
+      "description": "Word embeddings",
+      "items": {
+        "type": "object",
+        "properties": {
+          "id": {
+            "title": "Vector Model ID",
+            "type": "string"
+          },
+          "description": {
+            "title": "Vector Model Description",
+            "type": "string"
+          },
+          "date": {
+            "title": "Date (YYYY-MM-DD)",
+            "type": "string"
+          },
+          "vector": {
+            "title": "Vector",
+            "type": "object"
+          }
+        },
+        "required": [
+          "id","vector"
+        ]
+      }
+    },
     "additional": {
       "type": "object",
       "description": "Additional metadata",
diff --git a/api-documentation/catalog-admin/timeseries-db-schema.json b/api-documentation/catalog-admin/timeseries-db-schema.json
index b8e30c18b..7c7636e89 100644
--- a/api-documentation/catalog-admin/timeseries-db-schema.json
+++ b/api-documentation/catalog-admin/timeseries-db-schema.json
@@ -62,7 +62,7 @@
 						}
 					}
 				},
-				"production_date": {
+				"prod_date": {
 					"type": "string",
 					"title": "Date of Production",
 					"description": "Document production date using format(YYYY-MM-DD)"
@@ -154,11 +154,13 @@
 							},
 							"abbreviation": {
 								"title": "Abbreviation",
-								"description": "Abbreviation"
+								"description": "Abbreviation",
+								"type": "string"
 							},
 							"email": {
 								"title": "Email",
-								"description": "Email"
+								"description": "Email",
+								"type": "string"
 							},
 							"uri": {
 								"title": "URI",
@@ -289,33 +291,40 @@
 						}
 					}
 				},
-				"themes": {
-					"type": "array",
-					"title": "Themes",
-					"description": "Themes",
+				"themes":{
+					"type":"array",
+					"description":"Themes",
 					"items": {
-						"type": "object",
-						"properties": {
-							"name": {
-								"title": "Topic",
-								"type": "string"
-							},
-							"vocabulary": {
-								"title": "Vocabulary",
-								"description": "Name of the controlled vocabulary, if the topic is from a taxonomy.",
-								"type": "string"
-							},
-							"uri": {
-								"title": "Vocabulary URI",
-								"description": "Link to the controlled vocabulary web page, if the topic is from a taxonomy.",
-								"type": "string"
-							}
+					  "type": "object",
+					  "properties": {
+						"id": {
+						  "title": "Unique Identifier",
+						  "type": "string"
 						},
-						"required": [
-							"name"
-						]
+						"name": {
+						  "title": "Name",
+						  "type": "string"
+						},
+						"parent_id": {
+						  "title": "Parent Identifier",
+						  "type": "string"
+						},
+						"vocabulary": {
+						  "title": "Vocabulary",
+						  "description": "Name of the controlled vocabulary",
+						  "type": "string"
+						},
+						"uri": {
+						  "title": "Vocabulary URI",
+						  "description": "Link to the controlled vocabulary web page, if the theme is from a taxonomy.",
+						  "type": "string"
+						}
+					  },
+					  "required": [
+						"name"
+					  ]
 					}
-				},
+				  },
 				"topics": {
 					"type": "array",
 					"title": "Topics",
@@ -629,8 +638,8 @@
 					"items": {
 						"type": "object",
 						"properties": {
-							"type": {
-								"title": "Type",
+							"name": {
+								"title": "Name",
 								"type": "string"
 							},
 							"uri": {
@@ -644,7 +653,7 @@
 						}
 					},
 					"required": [
-						"type"
+						"name"
 					]
 				},
 				"citation": {
diff --git a/api-documentation/catalog-admin/timeseries-schema.json b/api-documentation/catalog-admin/timeseries-schema.json
index 2a7e2cf30..b3545b15e 100644
--- a/api-documentation/catalog-admin/timeseries-schema.json
+++ b/api-documentation/catalog-admin/timeseries-schema.json
@@ -49,6 +49,17 @@
 			"title": "Metadata creation",
 			"description": "Information on who generated the documentation",
 			"properties": {
+				"title": {
+					"title": "Document title",
+					"description": "Document title",
+					"type": "string",
+					"_ddi_xpath": "docDscr/citation/titlStmt/titl"
+				},
+				"idno": {
+					"title": "Unique ID number for the document",
+					"type": "string",
+					"_ddi_xpath": "docDscr/citation/titlStmt/IDNo"
+				},
 				"producers": {
 					"type": "array",
 					"title": "Producers",
@@ -101,6 +112,10 @@
 					"title": "Series unique ID",
 					"description": "Unique series ID"
 				},
+				"doi": {
+					"type": "string",
+					"title": "DOI handle"
+				},
 				"name": {
 					"type": "string",
 					"title": "Series Name"
@@ -155,6 +170,28 @@
 						]
 					}
 				},
+				"languages": {
+					"type": "array",
+					"description": "Supported languages",
+					"items": {
+						"type": "object",
+						"properties": {
+							"name": {
+								"title": "Name",
+								"description": "Language title",
+								"type": "string"
+							},
+							"code": {
+								"title": "code",
+								"Descripton": "Language code",
+								"type": "string"
+							}
+						}
+					},
+					"required": [
+						"name"
+					]
+				},
 				"measurement_unit": {
 					"type": "string",
 					"title": "Series unit of measure"
@@ -287,23 +324,36 @@
 				},
 				"themes": {
 					"type": "array",
-					"title": "Themes",
+					"description": "Themes",
 					"items": {
 						"type": "object",
 						"properties": {
+							"id": {
+								"title": "Unique Identifier",
+								"type": "string"
+							},
 							"name": {
 								"title": "Name",
 								"type": "string"
 							},
+							"parent_id": {
+								"title": "Parent Identifier",
+								"type": "string"
+							},
 							"vocabulary": {
-								"title": "Vocabulary name",
+								"title": "Vocabulary",
+								"description": "Name of the controlled vocabulary",
 								"type": "string"
 							},
 							"uri": {
 								"title": "Vocabulary URI",
+								"description": "Link to the controlled vocabulary web page, if the theme is from a taxonomy.",
 								"type": "string"
 							}
-						}
+						},
+						"required": [
+							"name"
+						]
 					}
 				},
 				"topics": {
@@ -390,6 +440,24 @@
 						}
 					}
 				},
+				"ref_country": {
+					"type": "array",
+					"title": "Reference country",
+					"description": "List of countries for which data are available",
+					"items": {
+						"type": "object",
+						"properties": {
+							"name": {
+								"title": "Country name",
+								"type": "string"
+							},
+							"code": {
+								"title": "Country code",
+								"type": "string"
+							}
+						}
+					}
+				},
 				"geographic_units": {
 					"title": "Geographic locations",
 					"description": "List of geographic units (regions, countries, states, provinces, etc.) for which data are available in the database.",
@@ -452,18 +520,29 @@
 					"title": "Dissaggregation"
 				},
 				"license": {
-					"type": "object",
-					"title": "Access licence",
-					"properties": {
-						"name": {
-							"type": "string",
-							"title": "Name"
-						},
-						"uri": {
-							"type": "string",
-							"title": "URI"
+					"type": "array",
+					"title": "License",
+					"description": "License information",
+					"items": {
+						"type": "object",
+						"properties": {
+							"name": {
+								"title": "Name",
+								"type": "string"
+							},
+							"uri": {
+								"title": "URI",
+								"type": "string"
+							},
+							"note": {
+								"title": "Note",
+								"type": "string"
+							}
 						}
-					}
+					},
+					"required": [
+						"name"
+					]
 				},
 				"confidentiality": {
 					"type": "string",
@@ -685,9 +764,13 @@
 								"type": "string",
 								"title": "Standard name"
 							},
-							"organization": {
+							"abbreviation": {
+								"type": "string",
+								"title": "Abbreviation"
+							},
+							"custodian": {
 								"type": "string",
-								"title": "Organization name"
+								"title": "Name of the custodian organization"
 							},
 							"uri": {
 								"type": "string",
@@ -709,6 +792,14 @@
 								"type": "string",
 								"title": "Name"
 							},
+							"abbreviation": {
+								"type": "string",
+								"title": "Abbreviation"
+							},
+							"custodian": {
+								"type": "string",
+								"title": "Custodian"
+							},
 							"description": {
 								"type": "string",
 								"title": "Description"
@@ -963,6 +1054,136 @@
 				"tag"
 			]
 		},
+		"lda_topics": {
+			"type": "array",
+			"title": "LDA topics",
+			"description": "LDA topics",
+			"items": {
+			  "type": "object",
+			  "properties": {
+				"model_info": {
+				  "type": "array",
+				  "title": "Model information",
+				  "items": {
+					"type": "object",
+					"properties": {
+					  "source": {
+						"title": "Source",
+						"type": "string"
+					  },
+					  "author": {
+						"title": "Author",
+						"type": "string"
+					  },
+					  "version": {
+						"title": "Version",
+						"type": "string"
+					  },
+					  "model_id": {
+						"title": "Model Identifier",
+						"type": "string"
+					  },
+					  "nb_topics": {
+						"title": "Number of topics",
+						"type": "number"
+					  },
+					  "description": {
+						"title": "Description",
+						"type": "string"
+					  },
+					  "corpus": {
+						"title": "Corpus name",
+						"type": "string"
+					  },
+					  "uri": {
+						"title": "URI",
+						"type": "string"
+					  }
+					}
+				  },
+				  "required": [
+					"model_id"
+				  ]
+				},              
+				"topic_description": {
+				  "type": "array",
+				  "title": "Topic information",
+				  "items": {
+					"type": "object",
+					"properties": {
+					  "topic_id": {
+						"title": "Topic identifier",
+						"type": ["integer", "string"]
+					  },
+					  "topic_score": {
+						"title": "Topic score",
+						"type": ["number", "string"]
+					  },
+					  "topic_label": {
+						"title": "Topic label",
+						"type": "string"
+					  },
+					  "topic_words": {
+						"type": "array",
+						"title": "Topic words",
+						"description": "Words",
+						"items": {
+						  "type": "object",
+						  "properties": {
+							"word": {
+							  "title": "Word",
+							  "type": "string"
+							},
+							"word_weight": {
+							  "title": "Word weight",
+							  "type": "number"
+							}
+						  }
+						},
+						"required": [
+						  "word"
+						]
+					  }
+					}
+				  },
+				  "required": [
+					"topic_id"
+				  ]
+				}
+				
+			  },
+			  "additionalProperties": false
+			}
+		  },
+		  "embeddings":{
+			"type": "array",
+			"title": "Word embeddings",
+			"description": "Word embeddings",
+			"items": {
+			  "type": "object",
+			  "properties": {
+				"id": {
+				  "title": "Vector Model ID",
+				  "type": "string"
+				},
+				"description": {
+				  "title": "Vector Model Description",
+				  "type": "string"
+				},
+				"date": {
+				  "title": "Date (YYYY-MM-DD)",
+				  "type": "string"
+				},
+				"vector": {
+				  "title": "Vector",
+				  "type": "object"
+				}
+			  },
+			  "required": [
+				"id","vector"
+			  ]
+			}
+		  },
 		"additional": {
 			"type": "object",
 			"title": "Additional custom metadata",
diff --git a/api-documentation/catalog-admin/variable-schema.json b/api-documentation/catalog-admin/variable-schema.json
index 9d887e678..c29c7df68 100644
--- a/api-documentation/catalog-admin/variable-schema.json
+++ b/api-documentation/catalog-admin/variable-schema.json
@@ -1,6 +1,6 @@
 {
 	"$id": "http://ihsn.org/schemas/variable",
-  "$schema": "http://json-schema.org/draft-07/schema#",
+	"$schema": "http://json-schema.org/draft-07/schema#",
 	"type": "object",
 	"definitions": {},
 	"properties": {
@@ -24,9 +24,12 @@
 		},
 		"var_intrvl": {
 			"type": "string",
-			  "title" : "Interval type",
+			"title": "Interval type",
 			"description": "indicates the interval type; options are discrete or continuous.",
-			  "enum": [ "discrete", "contin"]
+			"enum": [
+				"discrete",
+				"contin"
+			]
 		},
 		"var_dcml": {
 			"type": "string",
@@ -35,10 +38,10 @@
 		},
 		"var_wgt": {
 			"type": "integer",
-			"title":"Weight",
+			"title": "Weight",
 			"description": "indicates whether the variable is a weight",
 			"default": 0
-		},		
+		},
 		"loc_start_pos": {
 			"type": "integer",
 			"title": "Variable start position"
@@ -49,24 +52,22 @@
 		},
 		"loc_width": {
 			"type": "integer",
-            "title": "Variable width"		
-        },
+			"title": "Variable width"
+		},
 		"loc_rec_seg_no": {
 			"type": "integer",
-            "title": "Record segment number, deck or card number the variable is located on"
-        },		
+			"title": "Record segment number, deck or card number the variable is located on"
+		},
 		"var_imputation": {
 			"type": "string",
 			"title": "Imputation",
 			"description": "According to the Statistical Terminology glossary maintained by the National Science Foundation, this is `the process by which one estimates missing values for items that a survey respondent failed to provide,` and if applicable in this context, it refers to the type of procedure used. "
 		},
-
 		"var_derivation": {
 			"type": "string",
 			"title": "Derivation",
 			"description": "Used only in the case of a derived variable, this element provides both a description of how the derivation was performed and the command used to generate the derived variable, as well as a specification of the other variables in the study used to generate the derivation. The `var` attribute provides the ID values of the other variables in the study used to generate this derived variable."
 		},
-
 		"var_security": {
 			"type": "string",
 			"title": "Security"
@@ -88,19 +89,16 @@
 			"type": "string",
 			"title": "Post-question text"
 		},
-
 		"var_forward": {
 			"type": "string",
 			"title": "Forward skip",
-			"description":"Contains a reference to IDs of possible following questions. This can be used to document forward skip instructions."
+			"description": "Contains a reference to IDs of possible following questions. This can be used to document forward skip instructions."
 		},
-
 		"var_backward": {
 			"type": "string",
 			"title": "Backward skip",
-			"description":"Contains a reference to IDs of possible preceding questions. This can be used to document backward skip instructions."
+			"description": "Contains a reference to IDs of possible preceding questions. This can be used to document backward skip instructions."
 		},
-
 		"var_qstn_ivulnstr": {
 			"type": "string",
 			"title": "Interviewer instructions"
@@ -110,8 +108,8 @@
 			"title": "Universe"
 		},
 		"var_sumstat": {
-            "type": "array",
-            "description": "One or more statistical measures that describe the responses to a particular variable and may include one or more standard summaries, e.g., minimum and maximum values, median, mode, etc. \n\n The attribute 'type' denotes the type of statistics being shown: mean, median, mode, valid cases, invalid cases, minimum, maximum, or standard deviation.",
+			"type": "array",
+			"description": "One or more statistical measures that describe the responses to a particular variable and may include one or more standard summaries, e.g., minimum and maximum values, median, mode, etc. \n\n The attribute 'type' denotes the type of statistics being shown: mean, median, mode, valid cases, invalid cases, minimum, maximum, or standard deviation.",
 			"items": {
 				"type": "object",
 				"properties": {
@@ -120,7 +118,10 @@
 						"title": "Type"
 					},
 					"value": {
-						"type": ["integer", "string"],
+						"type": [
+							"integer",
+							"string"
+						],
 						"title": "Value"
 					},
 					"wgtd": {
@@ -136,8 +137,8 @@
 			"title": "Variable description"
 		},
 		"var_catgry": {
-            "type": "array",
-            "title": "Categories",
+			"type": "array",
+			"title": "Categories",
 			"items": {
 				"type": "object",
 				"properties": {
@@ -162,45 +163,46 @@
 									"description": "Type such as frequency, percent, etc"
 								},
 								"value": {
-									"type": ["integer", "string"],
+									"type": [
+										"integer",
+										"string"
+									],
 									"title": "Value"
 								},
 								"wgtd": {
 									"type": "string",
 									"title": "Weighted",
 									"description": "For weighted values, enter `weighted`"
-								}									
+								}
 							}
 						}
 					}
 				}
 			}
 		},
-
 		"var_std_catgry": {
 			"type": "object",
 			"title": "Standard categories",
-			"description":"Standard category codes used in the variable, like industry codes, employment codes, or social class codes. The attribute `date` is provided to indicate the version of the code in place at the time of the study. The attribute `URI` is provided to indicate a URN or URL that can be used to obtain an electronic list of the category codes.",
-			"properties":{
+			"description": "Standard category codes used in the variable, like industry codes, employment codes, or social class codes. The attribute `date` is provided to indicate the version of the code in place at the time of the study. The attribute `URI` is provided to indicate a URN or URL that can be used to obtain an electronic list of the category codes.",
+			"properties": {
 				"name": {
 					"title": "Standard classification name",
 					"type": "string"
-				  },
-				  "source": {
+				},
+				"source": {
 					"title": "Source",
 					"type": "string"
-				  },
-				  "date": {
+				},
+				"date": {
 					"title": "Date",
 					"type": "string"
-				  },
-				  "uri": {
+				},
+				"uri": {
 					"title": "URI",
 					"type": "string"
-				  }
+				}
 			}
 		},
-
 		"var_codinstr": {
 			"type": "string",
 			"title": "Recoding and derivation"
@@ -209,49 +211,54 @@
 			"type": "array",
 			"title": "Concepts",
 			"items": {
-			  "type": "object",
-			  "properties": {
-				"title": {
-				  "title": "Concept",
-				  "type": "string"
+				"type": "object",
+				"properties": {
+					"title": {
+						"title": "Concept",
+						"type": "string"
+					},
+					"vocab": {
+						"title": "Vocabulary",
+						"type": "string"
+					},
+					"uri": {
+						"title": "Vocabulary URI",
+						"type": "string"
+					}
+				},
+				"required": [
+					"title"
+				]
+			}
+		},
+		"var_format": {
+			"type": "object",
+			"title": "Variable format",
+			"description": "The technical format of the variable in question. Attributes for this element include: 'type', which indicates if the variable is character or numeric; 'formatname,' which in some cases may provide the name of the particular, proprietary format actually used; 'schema,' which identifies the vendor or standards body that defined the format (acceptable choices are SAS, SPSS, IBM, ANSI, ISO, XML-data or other); 'category,' which describes what kind of data the format represents, and includes date, time, currency, or 'other' conceptual possibilities.",
+			"properties": {
+				"type": {
+					"type": "string",
+					"title": "Type"
 				},
-				"vocab": {
-				  "title": "Vocabulary",
-				  "type": "string"
+				"name": {
+					"type": "string",
+					"title": "Name"
 				},
-				"uri": {
-				  "title": "Vocabulary URI",
-				  "type": "string"
+				"note": {
+					"type": "string",
+					"title": "Note"
 				}
-			  },
-			  "required": [
-				"title"
-			  ]
 			}
-		  },
-		"var_format": {
-            "type": "object",
-            "title": "Variable format",
-            "description": "The technical format of the variable in question. Attributes for this element include: 'type', which indicates if the variable is character or numeric; 'formatname,' which in some cases may provide the name of the particular, proprietary format actually used; 'schema,' which identifies the vendor or standards body that defined the format (acceptable choices are SAS, SPSS, IBM, ANSI, ISO, XML-data or other); 'category,' which describes what kind of data the format represents, and includes date, time, currency, or 'other' conceptual possibilities.",            
-            "properties": {
-              "type": {
-                "type": "string",
-                "title": "Type"
-              },
-              "name": {
-                "type": "string",
-                "title": "Name"
-              },
-              "note": {
-                "type": "string",
-                "title": "Note"
-              }
-            }
-          },
+		},
 		"var_notes": {
 			"type": "string",
 			"title": "Variable notes"
 		}
-    },
-    "required": [ "vid", "file_id", "name","labl" ]	
+	},
+	"required": [
+		"vid",
+		"file_id",
+		"name",
+		"labl"
+	]
 }
\ No newline at end of file
diff --git a/api-documentation/catalog-admin/video-schema.json b/api-documentation/catalog-admin/video-schema.json
index b7c37cd25..42243302c 100644
--- a/api-documentation/catalog-admin/video-schema.json
+++ b/api-documentation/catalog-admin/video-schema.json
@@ -338,6 +338,43 @@
           "type": "string",
           "title": "Repository"
         },
+        "contacts": {
+          "type": "array",
+          "title": "Contacts",
+          "description": "Contacts",
+          "items": {
+            "type": "object",
+            "properties": {
+              "name": {
+                "title": "Name",
+                "type": "string"
+              },
+              "role": {
+                "title": "Role",
+                "type": "string"
+              },
+              "affiliation": {
+                "title": "Affiliation",
+                "type": "string"
+              },
+              "email": {
+                "title": "Email",
+                "type": "string"
+              },
+              "telephone": {
+                "title": "Telephone",
+                "type": "string"
+              },
+              "uri": {
+                "title": "URI",
+                "type": "string"
+              }
+            }
+          },
+          "required": [
+            "name"
+          ]
+        },
 
         "contributors": {
           "type": "array",
@@ -370,7 +407,7 @@
             ]
           }
         },
-        "funder": {
+        "sponsors": {
           "type": "array",
           "title": "Funding Agency/Sponsor",
           "items": {
@@ -440,7 +477,7 @@
         },
 
         "relations": {
-          "type": "string",
+          "type": "array",
           "title":"Defines, as a free text field, the relation between the video being documented and other resources. This is a Dublin Core element."
         },
 
@@ -592,6 +629,136 @@
         "tag"
       ]
     },
+    "lda_topics": {
+      "type": "array",
+      "title": "LDA topics",
+      "description": "LDA topics",
+      "items": {
+        "type": "object",
+        "properties": {
+          "model_info": {
+            "type": "array",
+            "title": "Model information",
+            "items": {
+              "type": "object",
+              "properties": {
+                "source": {
+                  "title": "Source",
+                  "type": "string"
+                },
+                "author": {
+                  "title": "Author",
+                  "type": "string"
+                },
+                "version": {
+                  "title": "Version",
+                  "type": "string"
+                },
+                "model_id": {
+                  "title": "Model Identifier",
+                  "type": "string"
+                },
+                "nb_topics": {
+                  "title": "Number of topics",
+                  "type": "number"
+                },
+                "description": {
+                  "title": "Description",
+                  "type": "string"
+                },
+                "corpus": {
+                  "title": "Corpus name",
+                  "type": "string"
+                },
+                "uri": {
+                  "title": "URI",
+                  "type": "string"
+                }
+              }
+            },
+            "required": [
+              "model_id"
+            ]
+          },              
+          "topic_description": {
+            "type": "array",
+            "title": "Topic information",
+            "items": {
+              "type": "object",
+              "properties": {
+                "topic_id": {
+                  "title": "Topic identifier",
+                  "type": ["integer", "string"]
+                },
+                "topic_score": {
+                  "title": "Topic score",
+                  "type": ["number", "string"]
+                },
+                "topic_label": {
+                  "title": "Topic label",
+                  "type": "string"
+                },
+                "topic_words": {
+                  "type": "array",
+                  "title": "Topic words",
+                  "description": "Words",
+                  "items": {
+                    "type": "object",
+                    "properties": {
+                      "word": {
+                        "title": "Word",
+                        "type": "string"
+                      },
+                      "word_weight": {
+                        "title": "Word weight",
+                        "type": "number"
+                      }
+                    }
+                  },
+                  "required": [
+                    "word"
+                  ]
+                }
+              }
+            },
+            "required": [
+              "topic_id"
+            ]
+          }
+          
+        },
+        "additionalProperties": false
+      }
+    },
+    "embeddings":{
+      "type": "array",
+      "title": "Word embeddings",
+      "description": "Word embeddings",
+      "items": {
+        "type": "object",
+        "properties": {
+          "id": {
+            "title": "Vector Model ID",
+            "type": "string"
+          },
+          "description": {
+            "title": "Vector Model Description",
+            "type": "string"
+          },
+          "date": {
+            "title": "Date (YYYY-MM-DD)",
+            "type": "string"
+          },
+          "vector": {
+            "title": "Vector",
+            "type": "object"
+          }
+        },
+        "required": [
+          "id","vector"
+        ]
+      }
+    },
 
     "additional": {
       "type": "object",
diff --git a/api-documentation/catalog-admin/visualization-schema.json b/api-documentation/catalog-admin/visualization-schema.json
index 538f102d6..14aac2b7d 100644
--- a/api-documentation/catalog-admin/visualization-schema.json
+++ b/api-documentation/catalog-admin/visualization-schema.json
@@ -935,35 +935,7 @@
           "required": [
             "name"
           ]
-        },
-        "provenance":{
-          "type":"array",
-          "description":"Provenance",
-          "items":{
-            "$ref":"provenance-schema.json"
-          }
-          },
-        "tags": {
-          "type": "array",
-          "title": "Tags",
-          "description": "Tags",
-          "items": {
-            "type": "object",
-            "properties": {
-              "tag": {
-                "title": "Tag",
-                "type": "string"
-              },
-              "tag_group": {
-                "title": "Tag group",
-                "type": "string"
-              }
-            }
-          },
-          "required": [
-            "tag"
-          ]
-        }
+        }        
         
       },
       "additionalProperties": false
@@ -999,6 +971,164 @@
       ]
     }
     },
+    "provenance":{
+      "type":"array",
+      "description":"Provenance",
+      "items":{
+        "$ref":"provenance-schema.json"
+      }
+      },
+    "tags": {
+      "type": "array",
+      "title": "Tags",
+      "description": "Tags",
+      "items": {
+        "type": "object",
+        "properties": {
+          "tag": {
+            "title": "Tag",
+            "type": "string"
+          },
+          "tag_group": {
+            "title": "Tag group",
+            "type": "string"
+          }
+        }
+      },
+      "required": [
+        "tag"
+      ]
+    },
+    "lda_topics": {
+      "type": "array",
+      "title": "LDA topics",
+      "description": "LDA topics",
+      "items": {
+        "type": "object",
+        "properties": {
+          "model_info": {
+            "type": "array",
+            "title": "Model information",
+            "items": {
+              "type": "object",
+              "properties": {
+                "source": {
+                  "title": "Source",
+                  "type": "string"
+                },
+                "author": {
+                  "title": "Author",
+                  "type": "string"
+                },
+                "version": {
+                  "title": "Version",
+                  "type": "string"
+                },
+                "model_id": {
+                  "title": "Model Identifier",
+                  "type": "string"
+                },
+                "nb_topics": {
+                  "title": "Number of topics",
+                  "type": "number"
+                },
+                "description": {
+                  "title": "Description",
+                  "type": "string"
+                },
+                "corpus": {
+                  "title": "Corpus name",
+                  "type": "string"
+                },
+                "uri": {
+                  "title": "URI",
+                  "type": "string"
+                }
+              }
+            },
+            "required": [
+              "model_id"
+            ]
+          },              
+          "topic_description": {
+            "type": "array",
+            "title": "Topic information",
+            "items": {
+              "type": "object",
+              "properties": {
+                "topic_id": {
+                  "title": "Topic identifier",
+                  "type": ["integer", "string"]
+                },
+                "topic_score": {
+                  "title": "Topic score",
+                  "type": ["number", "string"]
+                },
+                "topic_label": {
+                  "title": "Topic label",
+                  "type": "string"
+                },
+                "topic_words": {
+                  "type": "array",
+                  "title": "Topic words",
+                  "description": "Words",
+                  "items": {
+                    "type": "object",
+                    "properties": {
+                      "word": {
+                        "title": "Word",
+                        "type": "string"
+                      },
+                      "word_weight": {
+                        "title": "Word weight",
+                        "type": "number"
+                      }
+                    }
+                  },
+                  "required": [
+                    "word"
+                  ]
+                }
+              }
+            },
+            "required": [
+              "topic_id"
+            ]
+          }
+          
+        },
+        "additionalProperties": false
+      }
+    },
+    "embeddings":{
+      "type": "array",
+      "title": "Word embeddings",
+      "description": "Word embeddings",
+      "items": {
+        "type": "object",
+        "properties": {
+          "id": {
+            "title": "Vector Model ID",
+            "type": "string"
+          },
+          "description": {
+            "title": "Vector Model Description",
+            "type": "string"
+          },
+          "date": {
+            "title": "Date (YYYY-MM-DD)",
+            "type": "string"
+          },
+          "vector": {
+            "title": "Vector",
+            "type": "object"
+          }
+        },
+        "required": [
+          "id","vector"
+        ]
+      }
+    },
     "additional": {
       "type": "object",
       "description": "Additional metadata",
diff --git a/application/schemas/document-schema.json b/application/schemas/document-schema.json
index b85794a16..311756b1b 100644
--- a/application/schemas/document-schema.json
+++ b/application/schemas/document-schema.json
@@ -130,12 +130,10 @@
             },
             "alternate_title": {
               "type": "string",
-              "title": "Abbreviation or Acronym",
-              "description": "Any form of the title used as a substitute or alternative to the formal title of the resource."
+              "title": "Abbreviation or Acronym"
             },
-            "abbreviated_title": {
-              "title": "Abbreviated Title",
-              "description": "Title as abbreviated for indexing or identification.",
+            "translated_title": {
+              "title": "Translated Title",              
               "type": "string"              
             }
           },
@@ -185,6 +183,11 @@
                     }
                   }
                 }
+              },
+              "full_name": {
+                "title": "Full name",
+                "type": "string",
+                "description": "Full name of the author. This element to be used only when first or last name cannot be distinguished."
               }
             }
           },
@@ -586,7 +589,7 @@
         },
 
         "url": {
-          "type": "string",
+          "type": ["string", "array"],
           "title": "URL",
           "description":"URL of the document, preferably a permanent URL"
         },
@@ -733,30 +736,29 @@
         },
 
         "sources": {
-          "type": "object",
+          "type":"array",
           "title": "Sources",
-          "description": "Description of sources used. The element is nestable so that the sources statement might encompass a series of discrete source statements, each of which could contain the facts about an individual source. ",
-          "_ddi_xpath":"stdyDscr/method/dataColl/sources",
+          "description": "Description of sources used. The element is nestable so that the sources statement might encompass a series of discrete source statements, each of which could contain the facts about an individual source. ",          
+          "items":{
+          "type": "object",          
             "properties": {              
               "source_origin":{
                 "type":"string",
                 "title":"Origin of Source",
-                "description":"For historical materials, information about the origin(s) of the sources and the rules followed in establishing the sources should be specified. May not be relevant to survey data. ",
-                "_ddi_xpath":"stdyDscr/method/dataColl/sources/srcOrig"
+                "description":"For historical materials, information about the origin(s) of the sources and the rules followed in establishing the sources should be specified. May not be relevant to survey data. "
               },
               "source_char":{
                 "type":"string",
                 "title":"Characteristics of Source Noted",
-                "description":"Assessment of characteristics and quality of source material. May not be relevant to survey data.",
-                "_ddi_xpath":"stdyDscr/method/dataColl/sources/srcChar"
+                "description":"Assessment of characteristics and quality of source material. May not be relevant to survey data."
               },
               "source_doc":{
                 "type":"string",
                 "title":"Source documentation",
-                "description":"Documentation and Access to Sources",
-                "_ddi_xpath":"stdyDscr/method/dataColl/sources/srcDocu"
+                "description":"Documentation and Access to Sources"
               }                
             }
+          }
         },
 
         "data_sources":{
@@ -982,138 +984,7 @@
               }
             }
           }          
-        },        
-
-        "lda_topics": {
-          "type": "array",
-          "title": "LDA topics",
-          "description": "LDA topics",
-          "items": {
-            "type": "object",
-            "properties": {
-              "model_info": {
-                "type": "array",
-                "title": "Model information",
-                "items": {
-                  "type": "object",
-                  "properties": {
-                    "source": {
-                      "title": "Source",
-                      "type": "string"
-                    },
-                    "author": {
-                      "title": "Author",
-                      "type": "string"
-                    },
-                    "version": {
-                      "title": "Version",
-                      "type": "string"
-                    },
-                    "model_id": {
-                      "title": "Model Identifier",
-                      "type": "string"
-                    },
-                    "nb_topics": {
-                      "title": "Number of topics",
-                      "type": "number"
-                    },
-                    "description": {
-                      "title": "Description",
-                      "type": "string"
-                    },
-                    "corpus": {
-                      "title": "Corpus name",
-                      "type": "string"
-                    },
-                    "uri": {
-                      "title": "URI",
-                      "type": "string"
-                    }
-                  }
-                },
-                "required": [
-                  "model_id"
-                ]
-              },              
-              "topic_description": {
-                "type": "array",
-                "title": "Topic information",
-                "items": {
-                  "type": "object",
-                  "properties": {
-                    "topic_id": {
-                      "title": "Topic identifier",
-                      "type": ["integer", "string"]
-                    },
-                    "topic_score": {
-                      "title": "Topic score",
-                      "type": ["number", "string"]
-                    },
-                    "topic_label": {
-                      "title": "Topic label",
-                      "type": "string"
-                    },
-                    "topic_words": {
-                      "type": "array",
-                      "title": "Topic words",
-                      "description": "Words",
-                      "items": {
-                        "type": "object",
-                        "properties": {
-                          "word": {
-                            "title": "Word",
-                            "type": "string"
-                          },
-                          "word_weight": {
-                            "title": "Word weight",
-                            "type": "number"
-                          }
-                        }
-                      },
-                      "required": [
-                        "word"
-                      ]
-                    }
-                  }
-                },
-                "required": [
-                  "topic_id"
-                ]
-              }
-              
-            },
-            "additionalProperties": false
-          }
-        },
-        "embeddings":{
-          "type": "array",
-          "title": "Word embeddings",
-          "description": "Word embeddings",
-          "items": {
-            "type": "object",
-            "properties": {
-              "id": {
-                "title": "Vector Model ID",
-                "type": "string"
-              },
-              "description": {
-                "title": "Vector Model Description",
-                "type": "string"
-              },
-              "date": {
-                "title": "Date (YYYY-MM-DD)",
-                "type": "string"
-              },
-              "vector": {
-                "title": "Vector",
-                "type": "object"
-              }
-            },
-            "required": [
-              "id","vector"
-            ]
-          }
-        }
+        }        
       },
       "required":["title_statement"],
       "additionalProperties": false
@@ -1146,6 +1017,136 @@
         "tag"
       ]
     },
+    "lda_topics": {
+      "type": "array",
+      "title": "LDA topics",
+      "description": "LDA topics",
+      "items": {
+        "type": "object",
+        "properties": {
+          "model_info": {
+            "type": "array",
+            "title": "Model information",
+            "items": {
+              "type": "object",
+              "properties": {
+                "source": {
+                  "title": "Source",
+                  "type": "string"
+                },
+                "author": {
+                  "title": "Author",
+                  "type": "string"
+                },
+                "version": {
+                  "title": "Version",
+                  "type": "string"
+                },
+                "model_id": {
+                  "title": "Model Identifier",
+                  "type": "string"
+                },
+                "nb_topics": {
+                  "title": "Number of topics",
+                  "type": "number"
+                },
+                "description": {
+                  "title": "Description",
+                  "type": "string"
+                },
+                "corpus": {
+                  "title": "Corpus name",
+                  "type": "string"
+                },
+                "uri": {
+                  "title": "URI",
+                  "type": "string"
+                }
+              }
+            },
+            "required": [
+              "model_id"
+            ]
+          },              
+          "topic_description": {
+            "type": "array",
+            "title": "Topic information",
+            "items": {
+              "type": "object",
+              "properties": {
+                "topic_id": {
+                  "title": "Topic identifier",
+                  "type": ["integer", "string"]
+                },
+                "topic_score": {
+                  "title": "Topic score",
+                  "type": ["number", "string"]
+                },
+                "topic_label": {
+                  "title": "Topic label",
+                  "type": "string"
+                },
+                "topic_words": {
+                  "type": "array",
+                  "title": "Topic words",
+                  "description": "Words",
+                  "items": {
+                    "type": "object",
+                    "properties": {
+                      "word": {
+                        "title": "Word",
+                        "type": "string"
+                      },
+                      "word_weight": {
+                        "title": "Word weight",
+                        "type": "number"
+                      }
+                    }
+                  },
+                  "required": [
+                    "word"
+                  ]
+                }
+              }
+            },
+            "required": [
+              "topic_id"
+            ]
+          }
+          
+        },
+        "additionalProperties": false
+      }
+    },
+    "embeddings":{
+      "type": "array",
+      "title": "Word embeddings",
+      "description": "Word embeddings",
+      "items": {
+        "type": "object",
+        "properties": {
+          "id": {
+            "title": "Vector Model ID",
+            "type": "string"
+          },
+          "description": {
+            "title": "Vector Model Description",
+            "type": "string"
+          },
+          "date": {
+            "title": "Date (YYYY-MM-DD)",
+            "type": "string"
+          },
+          "vector": {
+            "title": "Vector",
+            "type": "object"
+          }
+        },
+        "required": [
+          "id","vector"
+        ]
+      }
+    },
     "additional": {
       "type": "object",
       "description": "Additional metadata",
diff --git a/application/schemas/geospatial-schema.json b/application/schemas/geospatial-schema.json
index 67d68df1a..ef94c08d5 100644
--- a/application/schemas/geospatial-schema.json
+++ b/application/schemas/geospatial-schema.json
@@ -2027,7 +2027,137 @@
 			"required": [
 				"tag"
 			]
-		},		
+		},
+		"lda_topics": {
+			"type": "array",
+			"title": "LDA topics",
+			"description": "LDA topics",
+			"items": {
+			  "type": "object",
+			  "properties": {
+				"model_info": {
+				  "type": "array",
+				  "title": "Model information",
+				  "items": {
+					"type": "object",
+					"properties": {
+					  "source": {
+						"title": "Source",
+						"type": "string"
+					  },
+					  "author": {
+						"title": "Author",
+						"type": "string"
+					  },
+					  "version": {
+						"title": "Version",
+						"type": "string"
+					  },
+					  "model_id": {
+						"title": "Model Identifier",
+						"type": "string"
+					  },
+					  "nb_topics": {
+						"title": "Number of topics",
+						"type": "number"
+					  },
+					  "description": {
+						"title": "Description",
+						"type": "string"
+					  },
+					  "corpus": {
+						"title": "Corpus name",
+						"type": "string"
+					  },
+					  "uri": {
+						"title": "URI",
+						"type": "string"
+					  }
+					}
+				  },
+				  "required": [
+					"model_id"
+				  ]
+				},              
+				"topic_description": {
+				  "type": "array",
+				  "title": "Topic information",
+				  "items": {
+					"type": "object",
+					"properties": {
+					  "topic_id": {
+						"title": "Topic identifier",
+						"type": ["integer", "string"]
+					  },
+					  "topic_score": {
+						"title": "Topic score",
+						"type": ["number", "string"]
+					  },
+					  "topic_label": {
+						"title": "Topic label",
+						"type": "string"
+					  },
+					  "topic_words": {
+						"type": "array",
+						"title": "Topic words",
+						"description": "Words",
+						"items": {
+						  "type": "object",
+						  "properties": {
+							"word": {
+							  "title": "Word",
+							  "type": "string"
+							},
+							"word_weight": {
+							  "title": "Word weight",
+							  "type": "number"
+							}
+						  }
+						},
+						"required": [
+						  "word"
+						]
+					  }
+					}
+				  },
+				  "required": [
+					"topic_id"
+				  ]
+				}
+				
+			  },
+			  "additionalProperties": false
+			}
+		  },
+		  "embeddings":{
+			"type": "array",
+			"title": "Word embeddings",
+			"description": "Word embeddings",
+			"items": {
+			  "type": "object",
+			  "properties": {
+				"id": {
+				  "title": "Vector Model ID",
+				  "type": "string"
+				},
+				"description": {
+				  "title": "Vector Model Description",
+				  "type": "string"
+				},
+				"date": {
+				  "title": "Date (YYYY-MM-DD)",
+				  "type": "string"
+				},
+				"vector": {
+				  "title": "Vector",
+				  "type": "object"
+				}
+			  },
+			  "required": [
+				"id","vector"
+			  ]
+			}
+		  },
 		"additional": {
 			"title": "Additional metadata",
 			"description": "Any additional metadata",
diff --git a/application/schemas/image-schema.json b/application/schemas/image-schema.json
index de8188bf2..01be446d4 100644
--- a/application/schemas/image-schema.json
+++ b/application/schemas/image-schema.json
@@ -165,28 +165,7 @@
 							}
 						}
 					}
-				},
-				"tags": {
-					"type": "array",
-					"title": "Tags",
-					"description": "Tags",
-					"items": {
-						"type": "object",
-						"properties": {
-							"tag": {
-								"title": "Tag",
-								"type": "string"
-							},
-							"tag_group": {
-								"title": "Tag group",
-								"type": "string"
-							}
-						}
-					},
-					"required": [
-						"tag"
-					]
-				}
+				}				
 			}
 		},
 		"provenance":{
@@ -196,6 +175,157 @@
 			  "$ref":"provenance-schema.json"
 			}
 		  },
+		  "tags": {
+			"type": "array",
+			"title": "Tags",
+			"description": "Tags",
+			"items": {
+				"type": "object",
+				"properties": {
+					"tag": {
+						"title": "Tag",
+						"type": "string"
+					},
+					"tag_group": {
+						"title": "Tag group",
+						"type": "string"
+					}
+				}
+			},
+			"required": [
+				"tag"
+			]
+		},
+		"lda_topics": {
+			"type": "array",
+			"title": "LDA topics",
+			"description": "LDA topics",
+			"items": {
+			  "type": "object",
+			  "properties": {
+				"model_info": {
+				  "type": "array",
+				  "title": "Model information",
+				  "items": {
+					"type": "object",
+					"properties": {
+					  "source": {
+						"title": "Source",
+						"type": "string"
+					  },
+					  "author": {
+						"title": "Author",
+						"type": "string"
+					  },
+					  "version": {
+						"title": "Version",
+						"type": "string"
+					  },
+					  "model_id": {
+						"title": "Model Identifier",
+						"type": "string"
+					  },
+					  "nb_topics": {
+						"title": "Number of topics",
+						"type": "number"
+					  },
+					  "description": {
+						"title": "Description",
+						"type": "string"
+					  },
+					  "corpus": {
+						"title": "Corpus name",
+						"type": "string"
+					  },
+					  "uri": {
+						"title": "URI",
+						"type": "string"
+					  }
+					}
+				  },
+				  "required": [
+					"model_id"
+				  ]
+				},              
+				"topic_description": {
+				  "type": "array",
+				  "title": "Topic information",
+				  "items": {
+					"type": "object",
+					"properties": {
+					  "topic_id": {
+						"title": "Topic identifier",
+						"type": ["integer", "string"]
+					  },
+					  "topic_score": {
+						"title": "Topic score",
+						"type": ["number", "string"]
+					  },
+					  "topic_label": {
+						"title": "Topic label",
+						"type": "string"
+					  },
+					  "topic_words": {
+						"type": "array",
+						"title": "Topic words",
+						"description": "Words",
+						"items": {
+						  "type": "object",
+						  "properties": {
+							"word": {
+							  "title": "Word",
+							  "type": "string"
+							},
+							"word_weight": {
+							  "title": "Word weight",
+							  "type": "number"
+							}
+						  }
+						},
+						"required": [
+						  "word"
+						]
+					  }
+					}
+				  },
+				  "required": [
+					"topic_id"
+				  ]
+				}
+				
+			  },
+			  "additionalProperties": false
+			}
+		  },
+		  "embeddings":{
+			"type": "array",
+			"title": "Word embeddings",
+			"description": "Word embeddings",
+			"items": {
+			  "type": "object",
+			  "properties": {
+				"id": {
+				  "title": "Vector Model ID",
+				  "type": "string"
+				},
+				"description": {
+				  "title": "Vector Model Description",
+				  "type": "string"
+				},
+				"date": {
+				  "title": "Date (YYYY-MM-DD)",
+				  "type": "string"
+				},
+				"vector": {
+				  "title": "Vector",
+				  "type": "object"
+				}
+			  },
+			  "required": [
+				"id","vector"
+			  ]
+			}
+		  },
 		"additional": {
 			"type": "object",
 			"description": "Additional metadata",
diff --git a/application/schemas/script-schema.json b/application/schemas/script-schema.json
index 0a87296ee..d2dbfc4c1 100644
--- a/application/schemas/script-schema.json
+++ b/application/schemas/script-schema.json
@@ -96,6 +96,28 @@
               "title": "Unique user defined ID",
               "description": "The ID number of a research project is a unique number that is used to identify a particular project. Define and use a consistent scheme to use."
             },
+            "identifiers": {
+              "type": "array",
+              "title": "Other identifiers",
+              "description": "Other identifiers",
+              "items": {
+                "type": "object",
+                "properties": {
+                  "type": {
+                    "title": "Identifier type",
+                    "description": "Type of identifier e.g. `doi`, `handle`, `other`",
+                    "type": "string"
+                  },
+                  "identifier": {
+                    "title": "Identifier",
+                    "type": "string"
+                  }
+                },
+                "required": [
+                  "identifier"
+                ]
+              }
+            },
             "title": {
               "type": "string",
               "title": "Project title",
@@ -275,19 +297,22 @@
           }
         },
         "errata": {
-          "type": "object",
+          "type": "array",
           "title": "Errata",
           "description": "List of corrected errors in data, scripts or output",
-          "properties": {
-            "erratum_date": {
-              "title": "Date of erratum",
-              "description": "Date when the erratum was reported or published",
-              "type": "string"
-            },
-            "erratum_description": {
-              "title": "Description of the erratum",
-              "description": "A description of the erratum, with information on which data, scripts, or output were impacted",
-              "type": "string"
+          "items": {
+            "type": "object",
+            "properties": {
+              "date": {
+                "title": "Date of erratum",
+                "description": "Date when the erratum was reported or published",
+                "type": "string"
+              },
+              "description": {
+                "title": "Description of the erratum",
+                "description": "A description of the erratum, with information on which data, scripts, or output were impacted",
+                "type": "string"
+              }
             }
           }
         },
@@ -344,10 +369,12 @@
               },
               "abbreviation": {
                 "title": "Abbreviation",
-                "description": "Abbreviation"
+                "description": "Abbreviation",
+                "type": "string"
               },
               "email": {
                 "title": "Email",
+                "type": "string",
                 "description": "Email"
               },
               "author_id": {
@@ -359,10 +386,12 @@
                   "properties": {
                     "type": {
                       "title": "Type",
+                      "type": "string",
                       "description": "Source of identifier, e.g. ORCID"
                     },
                     "id": {
                       "title": "Identifier",
+                      "type": "string",
                       "description": "Author's unique identifier for the corresponding source"
                     }
                   }
@@ -382,7 +411,7 @@
             "type": "object",
             "properties": {
               "name": {
-                "title": "N`ame",
+                "title": "Name",
                 "type": "string",
                 "description": "Name of the person, corporate body, or agency responsible for the work's substantive and intellectual content. If a person, invert first and last name and use commas."
               },
@@ -397,14 +426,17 @@
               },
               "abbreviation": {
                 "title": "Abbreviation",
+                "type": "string",
                 "description": "Abbreviation"
               },
               "email": {
                 "title": "Email",
+                "type": "string",
                 "description": "Email"
               },
               "url": {
                 "title": "URL",
+                "type": "string",
                 "description": "URL"
               }
             },
@@ -465,14 +497,17 @@
               },
               "abbreviation": {
                 "title": "Abbreviation",
+                "type": "string",
                 "description": "Abbreviation"
               },
               "email": {
                 "title": "Email",
+                "type": "string",
                 "description": "Email"
               },
               "url": {
                 "title": "URL",
+                "type": "string",
                 "description": "URL"
               }
             },
@@ -482,29 +517,32 @@
           }
         },
         "reviews_comments": {
-          "type": "object",
-          "title": "Reviews and comments",
-          "description": "List and description of reviews and comments received on the project",
-          "properties": {
-            "comment_date": {
-              "title": "Date of the comment",
-              "description": "Date when the comment was provided",
-              "type": "string"
-            },
-            "comment_by": {
-              "title": "Provider of the comment",
-              "description": "Name and title of the comment provider (individual or organization)",
-              "type": "string"
-            },
-            "comment_description": {
-              "title": "Description of the comment",
-              "description": "A description of the comment",
-              "type": "string"
-            },
-            "comment_response": {
-              "title": "Response on the comment",
-              "description": "Response by the primary investigator or research team on the comment",
-              "type": "string"
+          "type": "array",
+          "items": {
+            "type": "object",
+            "title": "Reviews and comments",
+            "description": "List and description of reviews and comments received on the project",
+            "properties": {
+              "comment_date": {
+                "title": "Date of the comment",
+                "description": "Date when the comment was provided",
+                "type": "string"
+              },
+              "comment_by": {
+                "title": "Provider of the comment",
+                "description": "Name and title of the comment provider (individual or organization)",
+                "type": "string"
+              },
+              "comment_description": {
+                "title": "Description of the comment",
+                "description": "A description of the comment",
+                "type": "string"
+              },
+              "comment_response": {
+                "title": "Response on the comment",
+                "description": "Response by the primary investigator or research team on the comment",
+                "type": "string"
+              }
             }
           }
         },
@@ -538,6 +576,18 @@
           "description": "Acknowledgement statement",
           "type": "string"
         },
+        "disclaimer": {
+          "title": "Disclaimer",
+          "type": "string"
+        },
+        "confidentiality": {
+          "title": "Confidentiality",
+          "type": "string"
+        },
+        "citation_requirement": {
+          "type": "string",
+          "description": "Citation requirement (can include a specific recommended citation)"
+        },
         "related_projects": {
           "type": "array",
           "title": "Related research projects",
@@ -615,27 +665,37 @@
           }
         },
         "themes": {
-          "title": "Themes",
           "type": "array",
-          "description": "Themes covered by the project (ideally, a controlled vocabulary should be used)",
+          "description": "Themes",
           "items": {
             "type": "object",
             "properties": {
+              "id": {
+                "title": "Unique Identifier",
+                "type": "string"
+              },
               "name": {
                 "title": "Name",
-                "description": "Theme label, typically extracted from a pre-defined taxonomy",
+                "type": "string"
+              },
+              "parent_id": {
+                "title": "Parent Identifier",
                 "type": "string"
               },
               "vocabulary": {
-                "title": "Vocabulary name",
-                "description": "Vocabulary name (for themes extracted from controlled vocabularies)",
+                "title": "Vocabulary",
+                "description": "Name of the controlled vocabulary",
                 "type": "string"
               },
               "uri": {
                 "title": "Vocabulary URI",
+                "description": "Link to the controlled vocabulary web page, if the theme is from a taxonomy.",
                 "type": "string"
               }
-            }
+            },
+            "required": [
+              "name"
+            ]
           }
         },
         "topics": {
@@ -678,22 +738,31 @@
         "disciplines": {
           "type": "array",
           "title": "Disciplines",
-          "description": "Disciplines e.g. `Social sciences, economics`, `Natural sciences, biology` (ideally, a controlled vocabulary should be used)",
+          "description": "Disciplines e.g. `Social sciences, economics`, `Natural sciences, biology`",
           "items": {
             "type": "object",
             "properties": {
+              "id": {
+                "title": "Unique Identifier",
+                "type": "string"
+              },
               "name": {
                 "title": "Discipline title or name",
                 "type": "string"
               },
+              "parent_id": {
+                "title": "Parent discipline Identifier",
+                "description": "Parent discipline ID",
+                "type": "string"
+              },
               "vocabulary": {
-                "title": "Vocabulary name",
-                "description": "Vocabulary name (for disciplines extracted from controlled vocabularies)",
+                "title": "Vocabulary",
+                "description": "Vocabulary",
                 "type": "string"
               },
               "uri": {
-                "title": "Vocabulary URI",
-                "description": "Vocabulary uri",
+                "title": "URI",
+                "description": "Website link",
                 "type": "string"
               }
             },
@@ -747,6 +816,10 @@
             }
           }
         },
+        "copyright": {
+          "title": "Copyright",
+          "type": "string"
+        },
         "technology_environment": {
           "title": "Technology environment",
           "description": "Notes about the technology environment used by the authors to implement the project",
@@ -808,7 +881,7 @@
             },
             "additionalProperties": false
           },
-          "required": [ 
+          "required": [
             "name"
           ]
         },
@@ -975,20 +1048,24 @@
                 "title": "Name",
                 "type": "string"
               },
+              "role": {
+                "title": "Role",
+                "type": "string"
+              },
               "affiliation": {
                 "title": "Affiliation",
                 "type": "string"
               },
-              "role": {
-                "title": "Role",
+              "email": {
+                "title": "Email",
                 "type": "string"
               },
-              "uri": {
-                "title": "URI",
+              "telephone": {
+                "title": "Telephone",
                 "type": "string"
               },
-              "phone": {
-                "title": "Phone number",
+              "uri": {
+                "title": "URI",
                 "type": "string"
               }
             }
@@ -996,52 +1073,171 @@
           "required": [
             "name"
           ]
-        },
-        "provenance":{
-          "type":"array",
-          "description":"Provenance",
-          "items":{
-            "$ref":"provenance-schema.json"
-          }
+        }
+      }
+    },
+    "provenance": {
+      "type": "array",
+      "description": "Provenance",
+      "items": {
+        "$ref": "provenance-schema.json"
+      }
+    },
+    "tags": {
+      "type": "array",
+      "title": "Tags (user-defined)",
+      "description": "Tags",
+      "items": {
+        "type": "object",
+        "properties": {
+          "tag": {
+            "title": "Tag",
+            "type": "string"
           },
-        "tags": {
-          "type": "array",
-          "title": "Tags (user-defined)",
-          "description": "Tags",
-          "items": {
-            "type": "object",
-            "properties": {
-              "tag": {
-                "title": "Tag",
-                "type": "string"
-              },
-              "tag_group": {
-                "title": "Tag group",
-                "type": "string"
+          "tag_group": {
+            "title": "Tag group",
+            "type": "string"
+          }
+        }
+      },
+      "required": [
+        "tag"
+      ]
+    },
+    "lda_topics": {
+      "type": "array",
+      "title": "LDA topics",
+      "description": "LDA topics",
+      "items": {
+        "type": "object",
+        "properties": {
+          "model_info": {
+            "type": "array",
+            "title": "Model information",
+            "items": {
+              "type": "object",
+              "properties": {
+                "source": {
+                  "title": "Source",
+                  "type": "string"
+                },
+                "author": {
+                  "title": "Author",
+                  "type": "string"
+                },
+                "version": {
+                  "title": "Version",
+                  "type": "string"
+                },
+                "model_id": {
+                  "title": "Model Identifier",
+                  "type": "string"
+                },
+                "nb_topics": {
+                  "title": "Number of topics",
+                  "type": "number"
+                },
+                "description": {
+                  "title": "Description",
+                  "type": "string"
+                },
+                "corpus": {
+                  "title": "Corpus name",
+                  "type": "string"
+                },
+                "uri": {
+                  "title": "URI",
+                  "type": "string"
+                }
               }
-            }
-          },
-          "required": [
-            "tag"
-          ]
-        },
-        "copyright": {
-          "title": "Copyright",
-          "type": "string"
-        },
-        "disclaimer": {
-          "title": "Disclaimer",
-          "type": "string"
+            },
+            "required": [
+              "model_id"
+            ]
+          },              
+          "topic_description": {
+            "type": "array",
+            "title": "Topic information",
+            "items": {
+              "type": "object",
+              "properties": {
+                "topic_id": {
+                  "title": "Topic identifier",
+                  "type": ["integer", "string"]
+                },
+                "topic_score": {
+                  "title": "Topic score",
+                  "type": ["number", "string"]
+                },
+                "topic_label": {
+                  "title": "Topic label",
+                  "type": "string"
+                },
+                "topic_words": {
+                  "type": "array",
+                  "title": "Topic words",
+                  "description": "Words",
+                  "items": {
+                    "type": "object",
+                    "properties": {
+                      "word": {
+                        "title": "Word",
+                        "type": "string"
+                      },
+                      "word_weight": {
+                        "title": "Word weight",
+                        "type": "number"
+                      }
+                    }
+                  },
+                  "required": [
+                    "word"
+                  ]
+                }
+              }
+            },
+            "required": [
+              "topic_id"
+            ]
+          }
+          
         },
-        "confidentiality": {
-          "title": "Confidentiality",
-          "type": "string"
+        "additionalProperties": false
+      }
+    },
+    "embeddings":{
+      "type": "array",
+      "title": "Word embeddings",
+      "description": "Word embeddings",
+      "items": {
+        "type": "object",
+        "properties": {
+          "id": {
+            "title": "Vector Model ID",
+            "type": "string"
+          },
+          "description": {
+            "title": "Vector Model Description",
+            "type": "string"
+          },
+          "date": {
+            "title": "Date (YYYY-MM-DD)",
+            "type": "string"
+          },
+          "vector": {
+            "title": "Vector",
+            "type": "object"
+          }
         },
-        "citation_requirement": {
-          "type": "string",
-          "description": "Citation requirement (can include a specific recommended citation)"
-        }
+        "required": [
+          "id","vector"
+        ]
       }
+    },
+    "additional": {
+      "type": "object",
+      "description": "Additional metadata",
+      "properties": {}
     }
   }
 }
\ No newline at end of file
diff --git a/application/schemas/survey-schema.json b/application/schemas/survey-schema.json
index 9cec126ee..1b484cddc 100644
--- a/application/schemas/survey-schema.json
+++ b/application/schemas/survey-schema.json
@@ -3,56 +3,61 @@
   "$schema": "http://json-schema.org/draft-07/schema#",
   "title": "Survey Microdata Schema",
   "id": "survey-schema.json",
-  "version" :"0.0",
-  "description": "Schema for Survey data type based on DDI 2.5",  
-  "allOf": [    
+  "version": "0.0",
+  "description": "Schema for Survey data type based on DDI 2.5",
+  "allOf": [
     {
-        "type": "object",
-        "properties": {
-          "repositoryid": {
-            "type": "string",
-            "title": "Collection ID that owns the survey",
-            "description": "Abbreviation for the collection that owns this survey."
-          },
-          "access_policy": {
-            "type": "string",
-            "title": "Data access policy",
-            "description": "Data access policy for attached microdata resources",
-            "enum": [
-              "direct",
-              "open",
-              "public",
-              "licensed",
-              "remote",
-              "data_na"
-            ],
-            "default": "data_na"
-          },
-          "published": {
-            "type": "integer",
-            "description": "Status of the survey - 0=draft, 1=published",
-            "default": 0
-          },
-          "overwrite": {
-            "type": "string",
-            "description": "Overwrite survey if already exists?",            
-            "enum":["yes","no"],
-            "default": "no"
-          }
+      "type": "object",
+      "properties": {
+        "repositoryid": {
+          "type": "string",
+          "title": "Collection ID that owns the survey",
+          "description": "Abbreviation for the collection that owns this survey."
+        },
+        "access_policy": {
+          "type": "string",
+          "title": "Data access policy",
+          "description": "Data access policy for attached microdata resources",
+          "enum": [
+            "direct",
+            "open",
+            "public",
+            "licensed",
+            "remote",
+            "data_na"
+          ],
+          "default": "data_na"
+        },
+        "published": {
+          "type": "integer",
+          "description": "Status of the survey - 0=draft, 1=published",
+          "default": 0
+        },
+        "overwrite": {
+          "type": "string",
+          "description": "Overwrite survey if already exists?",
+          "enum": [
+            "yes",
+            "no"
+          ],
+          "default": "no"
         }
+      }
+    },
+    {
+      "$ref": "ddi-schema.json"
     },
-    { "$ref": "ddi-schema.json" },
     {
       "type": "object",
-      "properties": {        
-        "provenance":{
-          "type":"array",
-          "description":"Provenance",
-          "items":{
-            "$ref":"provenance-schema.json"
+      "properties": {
+        "provenance": {
+          "type": "array",
+          "description": "Provenance",
+          "items": {
+            "$ref": "provenance-schema.json"
           }
         },
-         "tags": {
+        "tags": {
           "type": "array",
           "title": "Tags (user-defined)",
           "description": "Tags",
@@ -73,12 +78,148 @@
             "tag"
           ]
         },
+        "lda_topics": {
+          "type": "array",
+          "title": "LDA topics",
+          "description": "LDA topics",
+          "items": {
+            "type": "object",
+            "properties": {
+              "model_info": {
+                "type": "array",
+                "title": "Model information",
+                "items": {
+                  "type": "object",
+                  "properties": {
+                    "source": {
+                      "title": "Source",
+                      "type": "string"
+                    },
+                    "author": {
+                      "title": "Author",
+                      "type": "string"
+                    },
+                    "version": {
+                      "title": "Version",
+                      "type": "string"
+                    },
+                    "model_id": {
+                      "title": "Model Identifier",
+                      "type": "string"
+                    },
+                    "nb_topics": {
+                      "title": "Number of topics",
+                      "type": "number"
+                    },
+                    "description": {
+                      "title": "Description",
+                      "type": "string"
+                    },
+                    "corpus": {
+                      "title": "Corpus name",
+                      "type": "string"
+                    },
+                    "uri": {
+                      "title": "URI",
+                      "type": "string"
+                    }
+                  }
+                },
+                "required": [
+                  "model_id"
+                ]
+              },
+              "topic_description": {
+                "type": "array",
+                "title": "Topic information",
+                "items": {
+                  "type": "object",
+                  "properties": {
+                    "topic_id": {
+                      "title": "Topic identifier",
+                      "type": [
+                        "integer",
+                        "string"
+                      ]
+                    },
+                    "topic_score": {
+                      "title": "Topic score",
+                      "type": [
+                        "number",
+                        "string"
+                      ]
+                    },
+                    "topic_label": {
+                      "title": "Topic label",
+                      "type": "string"
+                    },
+                    "topic_words": {
+                      "type": "array",
+                      "title": "Topic words",
+                      "description": "Words",
+                      "items": {
+                        "type": "object",
+                        "properties": {
+                          "word": {
+                            "title": "Word",
+                            "type": "string"
+                          },
+                          "word_weight": {
+                            "title": "Word weight",
+                            "type": "number"
+                          }
+                        }
+                      },
+                      "required": [
+                        "word"
+                      ]
+                    }
+                  }
+                },
+                "required": [
+                  "topic_id"
+                ]
+              }
+            },
+            "additionalProperties": false
+          }
+        },
+        "embeddings": {
+          "type": "array",
+          "title": "Word embeddings",
+          "description": "Word embeddings",
+          "items": {
+            "type": "object",
+            "properties": {
+              "id": {
+                "title": "Vector Model ID",
+                "type": "string"
+              },
+              "description": {
+                "title": "Vector Model Description",
+                "type": "string"
+              },
+              "date": {
+                "title": "Date (YYYY-MM-DD)",
+                "type": "string"
+              },
+              "vector": {
+                "title": "Vector",
+                "type": "object"
+              }
+            },
+            "required": [
+              "id",
+              "vector"
+            ]
+          }
+        },
         "additional": {
           "type": "object",
           "description": "Additional metadata not covered by DDI elements",
           "properties": {}
         }
+      }
     }
-  }
-]
+  ]
 }
\ No newline at end of file
diff --git a/application/schemas/table-schema.json b/application/schemas/table-schema.json
index b1c7ad573..6334fd3f7 100644
--- a/application/schemas/table-schema.json
+++ b/application/schemas/table-schema.json
@@ -133,6 +133,10 @@
           "title": "Unique ID number for the document",
           "type": "string"
         },
+        "title": {
+          "title": "Document title",
+          "type": "string"
+        },
         "producers": {
           "type": "array",
           "title": "Producers",
@@ -966,6 +970,136 @@
         "tag"
       ]
     },
+    "lda_topics": {
+      "type": "array",
+      "title": "LDA topics",
+      "description": "LDA topics",
+      "items": {
+        "type": "object",
+        "properties": {
+          "model_info": {
+            "type": "array",
+            "title": "Model information",
+            "items": {
+              "type": "object",
+              "properties": {
+                "source": {
+                  "title": "Source",
+                  "type": "string"
+                },
+                "author": {
+                  "title": "Author",
+                  "type": "string"
+                },
+                "version": {
+                  "title": "Version",
+                  "type": "string"
+                },
+                "model_id": {
+                  "title": "Model Identifier",
+                  "type": "string"
+                },
+                "nb_topics": {
+                  "title": "Number of topics",
+                  "type": "number"
+                },
+                "description": {
+                  "title": "Description",
+                  "type": "string"
+                },
+                "corpus": {
+                  "title": "Corpus name",
+                  "type": "string"
+                },
+                "uri": {
+                  "title": "URI",
+                  "type": "string"
+                }
+              }
+            },
+            "required": [
+              "model_id"
+            ]
+          },              
+          "topic_description": {
+            "type": "array",
+            "title": "Topic information",
+            "items": {
+              "type": "object",
+              "properties": {
+                "topic_id": {
+                  "title": "Topic identifier",
+                  "type": ["integer", "string"]
+                },
+                "topic_score": {
+                  "title": "Topic score",
+                  "type": ["number", "string"]
+                },
+                "topic_label": {
+                  "title": "Topic label",
+                  "type": "string"
+                },
+                "topic_words": {
+                  "type": "array",
+                  "title": "Topic words",
+                  "description": "Words",
+                  "items": {
+                    "type": "object",
+                    "properties": {
+                      "word": {
+                        "title": "Word",
+                        "type": "string"
+                      },
+                      "word_weight": {
+                        "title": "Word weight",
+                        "type": "number"
+                      }
+                    }
+                  },
+                  "required": [
+                    "word"
+                  ]
+                }
+              }
+            },
+            "required": [
+              "topic_id"
+            ]
+          }
+          
+        },
+        "additionalProperties": false
+      }
+    },
+    "embeddings":{
+      "type": "array",
+      "title": "Word embeddings",
+      "description": "Word embeddings",
+      "items": {
+        "type": "object",
+        "properties": {
+          "id": {
+            "title": "Vector Model ID",
+            "type": "string"
+          },
+          "description": {
+            "title": "Vector Model Description",
+            "type": "string"
+          },
+          "date": {
+            "title": "Date (YYYY-MM-DD)",
+            "type": "string"
+          },
+          "vector": {
+            "title": "Vector",
+            "type": "object"
+          }
+        },
+        "required": [
+          "id","vector"
+        ]
+      }
+    },
     "additional": {
       "type": "object",
       "description": "Additional metadata",
diff --git a/application/schemas/timeseries-db-schema.json b/application/schemas/timeseries-db-schema.json
index b8e30c18b..7c7636e89 100644
--- a/application/schemas/timeseries-db-schema.json
+++ b/application/schemas/timeseries-db-schema.json
@@ -62,7 +62,7 @@
 						}
 					}
 				},
-				"production_date": {
+				"prod_date": {
 					"type": "string",
 					"title": "Date of Production",
 					"description": "Document production date using format(YYYY-MM-DD)"
@@ -154,11 +154,13 @@
 							},
 							"abbreviation": {
 								"title": "Abbreviation",
-								"description": "Abbreviation"
+								"description": "Abbreviation",
+								"type": "string"
 							},
 							"email": {
 								"title": "Email",
-								"description": "Email"
+								"description": "Email",
+								"type": "string"
 							},
 							"uri": {
 								"title": "URI",
@@ -289,33 +291,40 @@
 						}
 					}
 				},
-				"themes": {
-					"type": "array",
-					"title": "Themes",
-					"description": "Themes",
+				"themes":{
+					"type":"array",
+					"description":"Themes",
 					"items": {
-						"type": "object",
-						"properties": {
-							"name": {
-								"title": "Topic",
-								"type": "string"
-							},
-							"vocabulary": {
-								"title": "Vocabulary",
-								"description": "Name of the controlled vocabulary, if the topic is from a taxonomy.",
-								"type": "string"
-							},
-							"uri": {
-								"title": "Vocabulary URI",
-								"description": "Link to the controlled vocabulary web page, if the topic is from a taxonomy.",
-								"type": "string"
-							}
+					  "type": "object",
+					  "properties": {
+						"id": {
+						  "title": "Unique Identifier",
+						  "type": "string"
 						},
-						"required": [
-							"name"
-						]
+						"name": {
+						  "title": "Name",
+						  "type": "string"
+						},
+						"parent_id": {
+						  "title": "Parent Identifier",
+						  "type": "string"
+						},
+						"vocabulary": {
+						  "title": "Vocabulary",
+						  "description": "Name of the controlled vocabulary",
+						  "type": "string"
+						},
+						"uri": {
+						  "title": "Vocabulary URI",
+						  "description": "Link to the controlled vocabulary web page, if the theme is from a taxonomy.",
+						  "type": "string"
+						}
+					  },
+					  "required": [
+						"name"
+					  ]
 					}
-				},
+				  },
 				"topics": {
 					"type": "array",
 					"title": "Topics",
@@ -629,8 +638,8 @@
 					"items": {
 						"type": "object",
 						"properties": {
-							"type": {
-								"title": "Type",
+							"name": {
+								"title": "Name",
 								"type": "string"
 							},
 							"uri": {
@@ -644,7 +653,7 @@
 						}
 					},
 					"required": [
-						"type"
+						"name"
 					]
 				},
 				"citation": {
diff --git a/application/schemas/timeseries-schema.json b/application/schemas/timeseries-schema.json
index 2a7e2cf30..b3545b15e 100644
--- a/application/schemas/timeseries-schema.json
+++ b/application/schemas/timeseries-schema.json
@@ -49,6 +49,17 @@
 			"title": "Metadata creation",
 			"description": "Information on who generated the documentation",
 			"properties": {
+				"title": {
+					"title": "Document title",
+					"description": "Document title",
+					"type": "string",
+					"_ddi_xpath": "docDscr/citation/titlStmt/titl"
+				},
+				"idno": {
+					"title": "Unique ID number for the document",
+					"type": "string",
+					"_ddi_xpath": "docDscr/citation/titlStmt/IDNo"
+				},
 				"producers": {
 					"type": "array",
 					"title": "Producers",
@@ -101,6 +112,10 @@
 					"title": "Series unique ID",
 					"description": "Unique series ID"
 				},
+				"doi": {
+					"type": "string",
+					"title": "DOI handle"
+				},
 				"name": {
 					"type": "string",
 					"title": "Series Name"
@@ -155,6 +170,28 @@
 						]
 					}
 				},
+				"languages": {
+					"type": "array",
+					"description": "Supported languages",
+					"items": {
+						"type": "object",
+						"properties": {
+							"name": {
+								"title": "Name",
+								"description": "Language title",
+								"type": "string"
+							},
+							"code": {
+								"title": "code",
+								"Descripton": "Language code",
+								"type": "string"
+							}
+						}
+					},
+					"required": [
+						"name"
+					]
+				},
 				"measurement_unit": {
 					"type": "string",
 					"title": "Series unit of measure"
@@ -287,23 +324,36 @@
 				},
 				"themes": {
 					"type": "array",
-					"title": "Themes",
+					"description": "Themes",
 					"items": {
 						"type": "object",
 						"properties": {
+							"id": {
+								"title": "Unique Identifier",
+								"type": "string"
+							},
 							"name": {
 								"title": "Name",
 								"type": "string"
 							},
+							"parent_id": {
+								"title": "Parent Identifier",
+								"type": "string"
+							},
 							"vocabulary": {
-								"title": "Vocabulary name",
+								"title": "Vocabulary",
+								"description": "Name of the controlled vocabulary",
 								"type": "string"
 							},
 							"uri": {
 								"title": "Vocabulary URI",
+								"description": "Link to the controlled vocabulary web page, if the theme is from a taxonomy.",
 								"type": "string"
 							}
-						}
+						},
+						"required": [
+							"name"
+						]
 					}
 				},
 				"topics": {
@@ -390,6 +440,24 @@
 						}
 					}
 				},
+				"ref_country": {
+					"type": "array",
+					"title": "Reference country",
+					"description": "List of countries for which data are available",
+					"items": {
+						"type": "object",
+						"properties": {
+							"name": {
+								"title": "Country name",
+								"type": "string"
+							},
+							"code": {
+								"title": "Country code",
+								"type": "string"
+							}
+						}
+					}
+				},
 				"geographic_units": {
 					"title": "Geographic locations",
 					"description": "List of geographic units (regions, countries, states, provinces, etc.) for which data are available in the database.",
@@ -452,18 +520,29 @@
 					"title": "Dissaggregation"
 				},
 				"license": {
-					"type": "object",
-					"title": "Access licence",
-					"properties": {
-						"name": {
-							"type": "string",
-							"title": "Name"
-						},
-						"uri": {
-							"type": "string",
-							"title": "URI"
+					"type": "array",
+					"title": "License",
+					"description": "License information",
+					"items": {
+						"type": "object",
+						"properties": {
+							"name": {
+								"title": "Name",
+								"type": "string"
+							},
+							"uri": {
+								"title": "URI",
+								"type": "string"
+							},
+							"note": {
+								"title": "Note",
+								"type": "string"
+							}
 						}
-					}
+					},
+					"required": [
+						"name"
+					]
 				},
 				"confidentiality": {
 					"type": "string",
@@ -685,9 +764,13 @@
 								"type": "string",
 								"title": "Standard name"
 							},
-							"organization": {
+							"abbreviation": {
+								"type": "string",
+								"title": "Abbreviation"
+							},
+							"custodian": {
 								"type": "string",
-								"title": "Organization name"
+								"title": "Name of the custodian organization"
 							},
 							"uri": {
 								"type": "string",
@@ -709,6 +792,14 @@
 								"type": "string",
 								"title": "Name"
 							},
+							"abbreviation": {
+								"type": "string",
+								"title": "Abbreviation"
+							},
+							"custodian": {
+								"type": "string",
+								"title": "Custodian"
+							},
 							"description": {
 								"type": "string",
 								"title": "Description"
@@ -963,6 +1054,136 @@
 				"tag"
 			]
 		},
+		"lda_topics": {
+			"type": "array",
+			"title": "LDA topics",
+			"description": "LDA topics",
+			"items": {
+			  "type": "object",
+			  "properties": {
+				"model_info": {
+				  "type": "array",
+				  "title": "Model information",
+				  "items": {
+					"type": "object",
+					"properties": {
+					  "source": {
+						"title": "Source",
+						"type": "string"
+					  },
+					  "author": {
+						"title": "Author",
+						"type": "string"
+					  },
+					  "version": {
+						"title": "Version",
+						"type": "string"
+					  },
+					  "model_id": {
+						"title": "Model Identifier",
+						"type": "string"
+					  },
+					  "nb_topics": {
+						"title": "Number of topics",
+						"type": "number"
+					  },
+					  "description": {
+						"title": "Description",
+						"type": "string"
+					  },
+					  "corpus": {
+						"title": "Corpus name",
+						"type": "string"
+					  },
+					  "uri": {
+						"title": "URI",
+						"type": "string"
+					  }
+					}
+				  },
+				  "required": [
+					"model_id"
+				  ]
+				},              
+				"topic_description": {
+				  "type": "array",
+				  "title": "Topic information",
+				  "items": {
+					"type": "object",
+					"properties": {
+					  "topic_id": {
+						"title": "Topic identifier",
+						"type": ["integer", "string"]
+					  },
+					  "topic_score": {
+						"title": "Topic score",
+						"type": ["number", "string"]
+					  },
+					  "topic_label": {
+						"title": "Topic label",
+						"type": "string"
+					  },
+					  "topic_words": {
+						"type": "array",
+						"title": "Topic words",
+						"description": "Words",
+						"items": {
+						  "type": "object",
+						  "properties": {
+							"word": {
+							  "title": "Word",
+							  "type": "string"
+							},
+							"word_weight": {
+							  "title": "Word weight",
+							  "type": "number"
+							}
+						  }
+						},
+						"required": [
+						  "word"
+						]
+					  }
+					}
+				  },
+				  "required": [
+					"topic_id"
+				  ]
+				}
+				
+			  },
+			  "additionalProperties": false
+			}
+		  },
+		  "embeddings":{
+			"type": "array",
+			"title": "Word embeddings",
+			"description": "Word embeddings",
+			"items": {
+			  "type": "object",
+			  "properties": {
+				"id": {
+				  "title": "Vector Model ID",
+				  "type": "string"
+				},
+				"description": {
+				  "title": "Vector Model Description",
+				  "type": "string"
+				},
+				"date": {
+				  "title": "Date (YYYY-MM-DD)",
+				  "type": "string"
+				},
+				"vector": {
+				  "title": "Vector",
+				  "type": "object"
+				}
+			  },
+			  "required": [
+				"id","vector"
+			  ]
+			}
+		  },
 		"additional": {
 			"type": "object",
 			"title": "Additional custom metadata",
diff --git a/application/schemas/variable-schema.json b/application/schemas/variable-schema.json
index 9d887e678..c29c7df68 100644
--- a/application/schemas/variable-schema.json
+++ b/application/schemas/variable-schema.json
@@ -1,6 +1,6 @@
 {
 	"$id": "http://ihsn.org/schemas/variable",
-  "$schema": "http://json-schema.org/draft-07/schema#",
+	"$schema": "http://json-schema.org/draft-07/schema#",
 	"type": "object",
 	"definitions": {},
 	"properties": {
@@ -24,9 +24,12 @@
 		},
 		"var_intrvl": {
 			"type": "string",
-			  "title" : "Interval type",
+			"title": "Interval type",
 			"description": "indicates the interval type; options are discrete or continuous.",
-			  "enum": [ "discrete", "contin"]
+			"enum": [
+				"discrete",
+				"contin"
+			]
 		},
 		"var_dcml": {
 			"type": "string",
@@ -35,10 +38,10 @@
 		},
 		"var_wgt": {
 			"type": "integer",
-			"title":"Weight",
+			"title": "Weight",
 			"description": "indicates whether the variable is a weight",
 			"default": 0
-		},		
+		},
 		"loc_start_pos": {
 			"type": "integer",
 			"title": "Variable start position"
@@ -49,24 +52,22 @@
 		},
 		"loc_width": {
 			"type": "integer",
-            "title": "Variable width"		
-        },
+			"title": "Variable width"
+		},
 		"loc_rec_seg_no": {
 			"type": "integer",
-            "title": "Record segment number, deck or card number the variable is located on"
-        },		
+			"title": "Record segment number, deck or card number the variable is located on"
+		},
 		"var_imputation": {
 			"type": "string",
 			"title": "Imputation",
 			"description": "According to the Statistical Terminology glossary maintained by the National Science Foundation, this is `the process by which one estimates missing values for items that a survey respondent failed to provide,` and if applicable in this context, it refers to the type of procedure used. "
 		},
-
 		"var_derivation": {
 			"type": "string",
 			"title": "Derivation",
 			"description": "Used only in the case of a derived variable, this element provides both a description of how the derivation was performed and the command used to generate the derived variable, as well as a specification of the other variables in the study used to generate the derivation. The `var` attribute provides the ID values of the other variables in the study used to generate this derived variable."
 		},
-
 		"var_security": {
 			"type": "string",
 			"title": "Security"
@@ -88,19 +89,16 @@
 			"type": "string",
 			"title": "Post-question text"
 		},
-
 		"var_forward": {
 			"type": "string",
 			"title": "Forward skip",
-			"description":"Contains a reference to IDs of possible following questions. This can be used to document forward skip instructions."
+			"description": "Contains a reference to IDs of possible following questions. This can be used to document forward skip instructions."
 		},
-
 		"var_backward": {
 			"type": "string",
 			"title": "Backward skip",
-			"description":"Contains a reference to IDs of possible preceding questions. This can be used to document backward skip instructions."
+			"description": "Contains a reference to IDs of possible preceding questions. This can be used to document backward skip instructions."
 		},
-
 		"var_qstn_ivulnstr": {
 			"type": "string",
 			"title": "Interviewer instructions"
@@ -110,8 +108,8 @@
 			"title": "Universe"
 		},
 		"var_sumstat": {
-            "type": "array",
-            "description": "One or more statistical measures that describe the responses to a particular variable and may include one or more standard summaries, e.g., minimum and maximum values, median, mode, etc. \n\n The attribute 'type' denotes the type of statistics being shown: mean, median, mode, valid cases, invalid cases, minimum, maximum, or standard deviation.",
+			"type": "array",
+			"description": "One or more statistical measures that describe the responses to a particular variable and may include one or more standard summaries, e.g., minimum and maximum values, median, mode, etc. \n\n The attribute 'type' denotes the type of statistics being shown: mean, median, mode, valid cases, invalid cases, minimum, maximum, or standard deviation.",
 			"items": {
 				"type": "object",
 				"properties": {
@@ -120,7 +118,10 @@
 						"title": "Type"
 					},
 					"value": {
-						"type": ["integer", "string"],
+						"type": [
+							"integer",
+							"string"
+						],
 						"title": "Value"
 					},
 					"wgtd": {
@@ -136,8 +137,8 @@
 			"title": "Variable description"
 		},
 		"var_catgry": {
-            "type": "array",
-            "title": "Categories",
+			"type": "array",
+			"title": "Categories",
 			"items": {
 				"type": "object",
 				"properties": {
@@ -162,45 +163,46 @@
 									"description": "Type such as frequency, percent, etc"
 								},
 								"value": {
-									"type": ["integer", "string"],
+									"type": [
+										"integer",
+										"string"
+									],
 									"title": "Value"
 								},
 								"wgtd": {
 									"type": "string",
 									"title": "Weighted",
 									"description": "For weighted values, enter `weighted`"
-								}									
+								}
 							}
 						}
 					}
 				}
 			}
 		},
-
 		"var_std_catgry": {
 			"type": "object",
 			"title": "Standard categories",
-			"description":"Standard category codes used in the variable, like industry codes, employment codes, or social class codes. The attribute `date` is provided to indicate the version of the code in place at the time of the study. The attribute `URI` is provided to indicate a URN or URL that can be used to obtain an electronic list of the category codes.",
-			"properties":{
+			"description": "Standard category codes used in the variable, like industry codes, employment codes, or social class codes. The attribute `date` is provided to indicate the version of the code in place at the time of the study. The attribute `URI` is provided to indicate a URN or URL that can be used to obtain an electronic list of the category codes.",
+			"properties": {
 				"name": {
 					"title": "Standard classification name",
 					"type": "string"
-				  },
-				  "source": {
+				},
+				"source": {
 					"title": "Source",
 					"type": "string"
-				  },
-				  "date": {
+				},
+				"date": {
 					"title": "Date",
 					"type": "string"
-				  },
-				  "uri": {
+				},
+				"uri": {
 					"title": "URI",
 					"type": "string"
-				  }
+				}
 			}
 		},
-
 		"var_codinstr": {
 			"type": "string",
 			"title": "Recoding and derivation"
@@ -209,49 +211,54 @@
 			"type": "array",
 			"title": "Concepts",
 			"items": {
-			  "type": "object",
-			  "properties": {
-				"title": {
-				  "title": "Concept",
-				  "type": "string"
+				"type": "object",
+				"properties": {
+					"title": {
+						"title": "Concept",
+						"type": "string"
+					},
+					"vocab": {
+						"title": "Vocabulary",
+						"type": "string"
+					},
+					"uri": {
+						"title": "Vocabulary URI",
+						"type": "string"
+					}
+				},
+				"required": [
+					"title"
+				]
+			}
+		},
+		"var_format": {
+			"type": "object",
+			"title": "Variable format",
+			"description": "The technical format of the variable in question. Attributes for this element include: 'type', which indicates if the variable is character or numeric; 'formatname,' which in some cases may provide the name of the particular, proprietary format actually used; 'schema,' which identifies the vendor or standards body that defined the format (acceptable choices are SAS, SPSS, IBM, ANSI, ISO, XML-data or other); 'category,' which describes what kind of data the format represents, and includes date, time, currency, or 'other' conceptual possibilities.",
+			"properties": {
+				"type": {
+					"type": "string",
+					"title": "Type"
 				},
-				"vocab": {
-				  "title": "Vocabulary",
-				  "type": "string"
+				"name": {
+					"type": "string",
+					"title": "Name"
 				},
-				"uri": {
-				  "title": "Vocabulary URI",
-				  "type": "string"
+				"note": {
+					"type": "string",
+					"title": "Note"
 				}
-			  },
-			  "required": [
-				"title"
-			  ]
 			}
-		  },
-		"var_format": {
-            "type": "object",
-            "title": "Variable format",
-            "description": "The technical format of the variable in question. Attributes for this element include: 'type', which indicates if the variable is character or numeric; 'formatname,' which in some cases may provide the name of the particular, proprietary format actually used; 'schema,' which identifies the vendor or standards body that defined the format (acceptable choices are SAS, SPSS, IBM, ANSI, ISO, XML-data or other); 'category,' which describes what kind of data the format represents, and includes date, time, currency, or 'other' conceptual possibilities.",            
-            "properties": {
-              "type": {
-                "type": "string",
-                "title": "Type"
-              },
-              "name": {
-                "type": "string",
-                "title": "Name"
-              },
-              "note": {
-                "type": "string",
-                "title": "Note"
-              }
-            }
-          },
+		},
 		"var_notes": {
 			"type": "string",
 			"title": "Variable notes"
 		}
-    },
-    "required": [ "vid", "file_id", "name","labl" ]	
+	},
+	"required": [
+		"vid",
+		"file_id",
+		"name",
+		"labl"
+	]
 }
\ No newline at end of file
diff --git a/application/schemas/video-schema.json b/application/schemas/video-schema.json
index 9a979015e..42243302c 100644
--- a/application/schemas/video-schema.json
+++ b/application/schemas/video-schema.json
@@ -126,33 +126,60 @@
           "type": "string",
           "description": "Genre"
         },
-        "keywords": {
-          "type": "string",
-          "description": "Keywords"
-        },
-
-        "topics":{
+        "keywords":{
           "type":"array",
-          "title":"Topic Classification",
-          "description":"Topic Classification",
           "items":{
             "type":"object",
             "properties":{
-              "topic":{
-                "title":"Topic",
+              "name":{
+                "title":"Name",
                 "type":"string"
               },
-              "vocab":{
-                "title":"Vocab",
+              "vocabulary":{
+                "title":"Vocabulary name",
                 "type":"string"
               },
               "uri":{
-                "title":"URI",
+                "title":"Vocabulary URI",
                 "type":"string"
               }
+            }
+          }
+        },
+
+        "topics": {
+          "type": "array",
+          "title": "Topics",
+          "description": "Topics covered by the table (ideally, the list of topics will be a controlled vocabulary)",
+          "items": {
+            "type": "object",
+            "properties": {
+              "id": {
+                "title": "Unique Identifier",
+                "type": "string"
+              },
+              "name": {
+                "title": "Topic",
+                "type": "string"
+              },
+              "parent_id": {
+                "title": "Parent topic Identifier",
+                "description":"For subtopics, provide the ID of the parent topic",
+                "type": "string"
+              },
+              "vocabulary": {
+                "title": "Vocabulary",
+                "description": "Name of the controlled vocabulary, if the topic is from a taxonomy.",
+                "type": "string"
+              },
+              "uri": {
+                "title": "Vocabulary URI",
+                "description": "Link to the controlled vocabulary web page, if the topic is from a taxonomy.",
+                "type": "string"
+              }
             },
-            "required":[
-              "topic"
+            "required": [
+              "name"
             ]
           }
         },
@@ -182,34 +209,40 @@
           "description": "Primary entity described in the video"
         },
 
-        "video_provider": {
-          "type": "string",
-          "description": "Video provider e.g.  youtube, vimeo, facebook"
-        },
-
-        "video_url": {
+        "date_created": {
           "type": "string",
-          "description": "Video URL"
+          "description": "Date of creation (YYYY-MM-DD)"
         },
-
-        "embed_url": {
+        "date_published": {
           "type": "string",
-          "description": "Video embed URL"
+          "description": "Date published (YYYY-MM-DD)"
         },
-        "encoding_format": {
+        "version": {
           "type": "string",
-          "title":"Encoding format",
-          "description": "Media type using a MIME format"
+          "description": "Version"
         },
-        "duration": {
+        "status": {
           "type": "string",
-          "title":"Duration",
-          "description": "The duration of the video in ISO 8601 date time format - `hh:mm:ss`"
+          "title":"Creative work status",
+          "description": "Status of a creative work in terms of its stage in lifecycle. e.g. `incomplete`, `draft`, `published`, `obsolete`"
         },
 
-        "content_location": {
-          "type": "string",
-          "description": "Location depicted or described in the video"
+        "country": {
+          "type": "array",
+          "title": "Countries",
+          "items": {
+            "type": "object",
+            "properties": {
+              "name": {
+                "title": "Country name",
+                "type": "string"
+              },
+              "code": {
+                "title": "Country code",
+                "type": "string"
+              }
+            }
+          }
         },
 
         "spatial_coverage": {
@@ -227,39 +260,250 @@
           "description": "Period that the content applies to using ISO 8601 date time format"
         },
 
+        "recorded_at": {
+          "type": "string",
+          "description": "Location where video was recorded"
+        },
+
         "audience": {
           "type": "string",
           "description": "Intended audience"
         },
-        
-        "country": {
-          "type": "string",
-          "description": "Country"
+
+        "bbox": {
+          "title": "Geographic bounding box",
+          "type": "array",
+          "items": {
+            "type": "object",
+            "properties": {
+              "west": {
+                "title": "West",
+                "type": "string"
+              },
+              "east": {
+                "title": "East",
+                "type": "string"
+              },
+              "south": {
+                "title": "South",
+                "type": "string"
+              },
+              "north": {
+                "title": "North",
+                "type": "string"
+              }
+            }
+          }
         },
+                
         "language": {
+          "type": "array",
+          "description": "languages",
+          "items": {
+            "type": "object",
+            "properties": {
+              "name": {
+                "title": "Name",
+                "description": "Language name",
+                "type": "string"
+              },
+              "code": {
+                "title": "code",
+                "Descripton": "Language code",
+                "type": "string"
+              }
+            }
+          },
+          "required": [
+            "name"
+          ]
+        },
+
+        "creator": {
           "type": "string",
-          "description": "Language"
+          "description": "Creator"
         },
-        "author": {
+
+        "production_company": {
           "type": "string",
-          "description": "Author"
+          "description": "Production company"
         },
+
         "publisher": {
           "type": "string",
           "description": "Publisher"
         },
-        "contributor": {
+
+        "repository": {
+          "type": "string",
+          "title": "Repository"
+        },
+        "contacts": {
+          "type": "array",
+          "title": "Contacts",
+          "description": "Contacts",
+          "items": {
+            "type": "object",
+            "properties": {
+              "name": {
+                "title": "Name",
+                "type": "string"
+              },
+              "role": {
+                "title": "Role",
+                "type": "string"
+              },
+              "affiliation": {
+                "title": "Affiliation",
+                "type": "string"
+              },
+              "email": {
+                "title": "Email",
+                "type": "string"
+              },
+              "telephone": {
+                "title": "Telephone",
+                "type": "string"
+              },
+              "uri": {
+                "title": "URI",
+                "type": "string"
+              }
+            }
+          },
+          "required": [
+            "name"
+          ]
+        },
+
+        "contributors": {
+          "type": "array",
+          "items": {
+            "type": "object",
+            "properties": {
+              "name": {
+                "title": "Name",
+                "type": "string"
+              },
+              "affiliation": {
+                "title": "Affiliation",
+                "type": "string"
+              },
+              "abbreviation": {
+                "title": "Abbreviation",
+                "type": "string"
+              },
+              "role": {
+                "title": "Role",
+                "type": "string"
+              },
+              "uri": {
+                "title": "URI",
+                "type": "string"
+              }
+            },
+            "required": [
+              "name"
+            ]
+          }
+        },
+        "sponsors": {
+          "type": "array",
+          "title": "Funding Agency/Sponsor",
+          "items": {
+            "type": "object",
+            "properties": {
+              "name": {
+                "title": "Funding Agency/Sponsor",
+                "type": "string"
+              },
+              "abbr": {
+                "title": "Abbreviation",
+                "type": "string"
+              },
+              "grant": {
+                "title": "Grant Number",
+                "type": "string"
+              },
+              "role": {
+                "title": "Role",
+                "type": "string"
+              }
+            },
+            "required": [
+              "name"
+            ]
+          }
+        },
+        
+        "translators": {
+          "type": "array",
+          "title": "Translators",
+          "description": "Translators",
+          "items": {
+            "type": "object",
+            "properties": {
+              "first_name": {
+                "title": "First name",
+                "type": "string"
+              },
+              "initial": {
+                "title": "Initial",
+                "type": "string"
+              },
+              "last_name": {
+                "title": "Last name",
+                "type": "string"
+              },              
+              "affiliation": {
+                "title": "Affiliation",
+                "type": "string"
+              }
+            }
+          },
+          "required": [
+            "first_name"
+          ]
+        },
+
+        "is_based_on": {
+          "type": "string",
+          "title":"A resource from which this work is derived",
+          "description": "A resource from which this work is derived or from which it is a modification or adaption"
+        },
+        "is_part_of": {
+          "type": "string",
+          "title":"Indicate an item that this item is part of"
+        },
+
+        "relations": {
+          "type": "array",
+          "title":"Defines, as a free text field, the relation between the video being documented and other resources. This is a Dublin Core element."
+        },
+
+        "video_provider": {
           "type": "string",
-          "description": "Contributor"
+          "description": "Video provider e.g.  youtube, vimeo, facebook"
         },
-        "funder": {
+
+        "video_url": {
           "type": "string",
-          "description": "Funder"
+          "description": "Video URL"
         },
-        "translator": {
+
+        "embed_url": {
           "type": "string",
-          "title": "Translator",
-          "description": "Organization or person who adapts a creative work to different languages"
+          "description": "Video embed URL"
+        },
+        "encoding_format": {
+          "type": "string",
+          "title":"Encoding format",
+          "description": "Media type using a MIME format"
+        },
+        "duration": {
+          "type": "string",
+          "title":"Duration",
+          "description": "The duration of the video in ISO 8601 date time format - `hh:mm:ss`"
         },
         "rights": {
           "type": "string",
@@ -283,34 +527,73 @@
           "description": "Year during which claimed copyright for the video was first asserted"
         },
 
-
-
-        "date_created": {
-          "type": "string",
-          "description": "Date of creation (YYYY-MM-DD)"
-        },
-        "date_published": {
+        "credit_text": {
           "type": "string",
-          "description": "Date published (YYYY-MM-DD)"
+          "title": "Credits",
+          "description": "This element that can be used to credit the person(s) and/or organization(s) associated with a published video. It corresponds to the `creditText` element of VideoObject."
         },
-        "version": {
+
+        "citation": {
           "type": "string",
-          "description": "Version"
+          "title": "Citation",
+          "description": "This element provides a required or recommended citation of the audio file."
         },
-        "status": {
-          "type": "string",
-          "title":"Creative work status",
-          "description": "Status of a creative work in terms of its stage in lifecycle. e.g. `incomplete`, `draft`, `published`, `obsolete`"
+
+        "transcript": {
+          "type": "array",
+          "title": "Transcript",
+          "items": {
+            "type": "object",
+            "properties": {
+              "language": {
+                "title": "Language",
+                "type": "string"
+              },
+              "text": {
+                "title": "Text",
+                "type": "string"
+              }              
+            }
+          },
+          "required": [
+            "text"
+          ]
         },
-        "is_based_on": {
-          "type": "string",
-          "title":"A resource from which this work is derived",
-          "description": "A resource from which this work is derived or from which it is a modification or adaption"
+
+        "media": {
+          "type": "array",
+          "title": "Media",
+          "items": {
+            "type": "string"
+          }          
         },
-        "is_part_of": {
-          "type": "string",
-          "title":"Indicate an item that this item is part of"
-        }
+        
+        "album": {
+					"type": "array",
+					"title": "Album",
+					"items": {
+						"type": "object",
+						"properties": {
+							"name": {
+								"title": "Name of album",
+								"type": "string"
+							},
+							"description": {
+								"title": "Description",
+								"type": "string"
+							},
+							"owner": {
+								"title": "Owner",
+								"type": "string"
+							},
+							"uri": {
+								"title": "URI",
+								"type": "string"
+							}
+						}
+					}
+				}
+
         
       },
       "required": [
@@ -346,6 +629,136 @@
         "tag"
       ]
     },
+    "lda_topics": {
+      "type": "array",
+      "title": "LDA topics",
+      "description": "LDA topics",
+      "items": {
+        "type": "object",
+        "properties": {
+          "model_info": {
+            "type": "array",
+            "title": "Model information",
+            "items": {
+              "type": "object",
+              "properties": {
+                "source": {
+                  "title": "Source",
+                  "type": "string"
+                },
+                "author": {
+                  "title": "Author",
+                  "type": "string"
+                },
+                "version": {
+                  "title": "Version",
+                  "type": "string"
+                },
+                "model_id": {
+                  "title": "Model Identifier",
+                  "type": "string"
+                },
+                "nb_topics": {
+                  "title": "Number of topics",
+                  "type": "number"
+                },
+                "description": {
+                  "title": "Description",
+                  "type": "string"
+                },
+                "corpus": {
+                  "title": "Corpus name",
+                  "type": "string"
+                },
+                "uri": {
+                  "title": "URI",
+                  "type": "string"
+                }
+              }
+            },
+            "required": [
+              "model_id"
+            ]
+          },              
+          "topic_description": {
+            "type": "array",
+            "title": "Topic information",
+            "items": {
+              "type": "object",
+              "properties": {
+                "topic_id": {
+                  "title": "Topic identifier",
+                  "type": ["integer", "string"]
+                },
+                "topic_score": {
+                  "title": "Topic score",
+                  "type": ["number", "string"]
+                },
+                "topic_label": {
+                  "title": "Topic label",
+                  "type": "string"
+                },
+                "topic_words": {
+                  "type": "array",
+                  "title": "Topic words",
+                  "description": "Words",
+                  "items": {
+                    "type": "object",
+                    "properties": {
+                      "word": {
+                        "title": "Word",
+                        "type": "string"
+                      },
+                      "word_weight": {
+                        "title": "Word weight",
+                        "type": "number"
+                      }
+                    }
+                  },
+                  "required": [
+                    "word"
+                  ]
+                }
+              }
+            },
+            "required": [
+              "topic_id"
+            ]
+          }
+          
+        },
+        "additionalProperties": false
+      }
+    },
+    "embeddings":{
+      "type": "array",
+      "title": "Word embeddings",
+      "description": "Word embeddings",
+      "items": {
+        "type": "object",
+        "properties": {
+          "id": {
+            "title": "Vector Model ID",
+            "type": "string"
+          },
+          "description": {
+            "title": "Vector Model Description",
+            "type": "string"
+          },
+          "date": {
+            "title": "Date (YYYY-MM-DD)",
+            "type": "string"
+          },
+          "vector": {
+            "title": "Vector",
+            "type": "object"
+          }
+        },
+        "required": [
+          "id","vector"
+        ]
+      }
+    },
 
     "additional": {
       "type": "object",
diff --git a/application/schemas/visualization-schema.json b/application/schemas/visualization-schema.json
index 538f102d6..14aac2b7d 100644
--- a/application/schemas/visualization-schema.json
+++ b/application/schemas/visualization-schema.json
@@ -935,35 +935,7 @@
           "required": [
             "name"
           ]
-        },
-        "provenance":{
-          "type":"array",
-          "description":"Provenance",
-          "items":{
-            "$ref":"provenance-schema.json"
-          }
-          },
-        "tags": {
-          "type": "array",
-          "title": "Tags",
-          "description": "Tags",
-          "items": {
-            "type": "object",
-            "properties": {
-              "tag": {
-                "title": "Tag",
-                "type": "string"
-              },
-              "tag_group": {
-                "title": "Tag group",
-                "type": "string"
-              }
-            }
-          },
-          "required": [
-            "tag"
-          ]
-        }
+        }        
         
       },
       "additionalProperties": false
@@ -999,6 +971,164 @@
       ]
     }
     },
+    "provenance":{
+      "type":"array",
+      "description":"Provenance",
+      "items":{
+        "$ref":"provenance-schema.json"
+      }
+      },
+    "tags": {
+      "type": "array",
+      "title": "Tags",
+      "description": "Tags",
+      "items": {
+        "type": "object",
+        "properties": {
+          "tag": {
+            "title": "Tag",
+            "type": "string"
+          },
+          "tag_group": {
+            "title": "Tag group",
+            "type": "string"
+          }
+        }
+      },
+      "required": [
+        "tag"
+      ]
+    },
+    "lda_topics": {
+      "type": "array",
+      "title": "LDA topics",
+      "description": "LDA topics",
+      "items": {
+        "type": "object",
+        "properties": {
+          "model_info": {
+            "type": "array",
+            "title": "Model information",
+            "items": {
+              "type": "object",
+              "properties": {
+                "source": {
+                  "title": "Source",
+                  "type": "string"
+                },
+                "author": {
+                  "title": "Author",
+                  "type": "string"
+                },
+                "version": {
+                  "title": "Version",
+                  "type": "string"
+                },
+                "model_id": {
+                  "title": "Model Identifier",
+                  "type": "string"
+                },
+                "nb_topics": {
+                  "title": "Number of topics",
+                  "type": "number"
+                },
+                "description": {
+                  "title": "Description",
+                  "type": "string"
+                },
+                "corpus": {
+                  "title": "Corpus name",
+                  "type": "string"
+                },
+                "uri": {
+                  "title": "URI",
+                  "type": "string"
+                }
+              }
+            },
+            "required": [
+              "model_id"
+            ]
+          },              
+          "topic_description": {
+            "type": "array",
+            "title": "Topic information",
+            "items": {
+              "type": "object",
+              "properties": {
+                "topic_id": {
+                  "title": "Topic identifier",
+                  "type": ["integer", "string"]
+                },
+                "topic_score": {
+                  "title": "Topic score",
+                  "type": ["number", "string"]
+                },
+                "topic_label": {
+                  "title": "Topic label",
+                  "type": "string"
+                },
+                "topic_words": {
+                  "type": "array",
+                  "title": "Topic words",
+                  "description": "Words",
+                  "items": {
+                    "type": "object",
+                    "properties": {
+                      "word": {
+                        "title": "Word",
+                        "type": "string"
+                      },
+                      "word_weight": {
+                        "title": "Word weight",
+                        "type": "number"
+                      }
+                    }
+                  },
+                  "required": [
+                    "word"
+                  ]
+                }
+              }
+            },
+            "required": [
+              "topic_id"
+            ]
+          }
+          
+        },
+        "additionalProperties": false
+      }
+    },
+    "embeddings":{
+      "type": "array",
+      "title": "Word embeddings",
+      "description": "Word embeddings",
+      "items": {
+        "type": "object",
+        "properties": {
+          "id": {
+            "title": "Vector Model ID",
+            "type": "string"
+          },
+          "description": {
+            "title": "Vector Model Description",
+            "type": "string"
+          },
+          "date": {
+            "title": "Date (YYYY-MM-DD)",
+            "type": "string"
+          },
+          "vector": {
+            "title": "Vector",
+            "type": "object"
+          }
+        },
+        "required": [
+          "id","vector"
+        ]
+      }
+    },
     "additional": {
       "type": "object",
       "description": "Additional metadata",

From d5f64ca35ac6fb35776bb31940e6401e3ba58970 Mon Sep 17 00:00:00 2001
From: Mehmood Asghar <mah0001@gmail.com>
Date: Thu, 10 Mar 2022 15:37:18 -0500
Subject: [PATCH 14/79] fix line endings issue for reading nada generated DDIs
 in Nesstar publisher

---
 application/libraries/DDI_Writer.php      | 11 +---
 application/views/ddi/ddi25_stdy_dscr.php | 67 ++++++++++++-----------
 2 files changed, 36 insertions(+), 42 deletions(-)

diff --git a/application/libraries/DDI_Writer.php b/application/libraries/DDI_Writer.php
index 8d314df1f..aa257c41f 100644
--- a/application/libraries/DDI_Writer.php
+++ b/application/libraries/DDI_Writer.php
@@ -344,16 +344,7 @@ function get_var_desc_xml($data)
             'notes'=>$var['var_notes'],
             'txt'=>$var['var_txt'],
             'codInstr'=>$var['var_codinstr'],
-            'concept'=>$var['var_concept'],
-
-            'varFormat'=>[
-                '_value'=> (string)$var['var_format.value'],
-                '_attributes'=>[
-                    'type'=>$var['var_format.type'],
-                    //'schema'=>$var['var_format.schema'],//not supported
-                    'formatname'=>$var['var_format.name']
-                ]
-            ]
+            'concept'=>$var['var_concept']            
         ]);
 
 
diff --git a/application/views/ddi/ddi25_stdy_dscr.php b/application/views/ddi/ddi25_stdy_dscr.php
index f6227f151..0fc7df7f9 100644
--- a/application/views/ddi/ddi25_stdy_dscr.php
+++ b/application/views/ddi/ddi25_stdy_dscr.php
@@ -51,7 +51,7 @@
         <?php endforeach;?>
 
         <?php //contacts ?>
-        <?php $contacts=$ddi->get_el('study_desc/distribution_statement/contact');?>
+        <?php $contacts=(array)$ddi->get_el('study_desc/distribution_statement/contact');?>
         <?php foreach($contacts as $contact):?>   
           <contact affiliation="<?php echo $ddi->attr_val($contact,'affiliation');?>" URI="<?php echo $ddi->attr_val($contact,'uri');?>" email="<?php echo $ddi->attr_val($contact,'email');?>"><?php echo $ddi->el_val($contact,'name');?></contact>
         <?php endforeach;?>
@@ -68,23 +68,23 @@
 
      <serStmt>
         <serName><?php $ddi->el('study_desc/series_statement/series_name');?></serName>
-        <serInfo><?php $ddi->el('study_desc/series_statement/series_info');?></serInfo>
+        <serInfo><![CDATA[<?php $ddi->el('study_desc/series_statement/series_info');?>]]></serInfo>
      </serStmt>
 
      <verStmt>
         <version date="<?php $ddi->el('study_desc/version_statement/version_date');?>" ><?php $ddi->el('study_desc/version_statement/version');?></version>
         <verResp><?php $ddi->el('study_desc/version_statement/version_resp');?></verResp>
-        <notes><?php $ddi->el('study_desc/version_statement/version_notes');?></notes>
+        <notes><![CDATA[<?php $ddi->el('study_desc/version_statement/version_notes');?>]]></notes>
      </verStmt>
      
-     <biblCit format="<?php $ddi->el('study_desc/bib_citation_format');?>"><?php $ddi->el('study_desc/bib_citation');?></biblCit>
+     <biblCit format="<?php $ddi->el('study_desc/bib_citation_format');?>"><![CDATA[<?php $ddi->el('study_desc/bib_citation');?>]]></biblCit>
 
       <?php //holdings ?>
       <?php $holdings=(array)$ddi->get_el('study_desc/holdings');?>
       <?php foreach($holdings as $holding):?>   
         <holdings location="<?php echo $ddi->attr_val($holding,'location');?>" callno="<?php echo $ddi->attr_val($holding,'callno');?>" URI="<?php echo $ddi->attr_val($holding,'uri');?>"><?php echo $ddi->el_val($holding,'name');?></holdings>
       <?php endforeach;?>
-      <notes><?php $ddi->el('study_desc/study_notes');?></notes>
+      <notes><![CDATA[<?php $ddi->el('study_desc/study_notes');?>]]></notes>
   </citation>
   
   <?php  /*
@@ -105,7 +105,7 @@
      between DDI 2 and DDI 3 structures.
      --> 
      */?>
-     <studyBudget><?php $ddi->el('study_desc/study_info/study_budget');?></studyBudget>
+     <studyBudget><![CDATA[<?php $ddi->el('study_desc/study_info/study_budget');?>]]></studyBudget>
      <subject>
       <?php //keywords ?>
       <?php $keywords=(array)$ddi->get_el('study_desc/study_info/keywords');?>
@@ -120,7 +120,7 @@
       <?php endforeach;?>
 
     </subject>
-     <abstract><?php $ddi->el('study_desc/study_info/abstract');?></abstract>
+     <abstract><![CDATA[<?php $ddi->el('study_desc/study_info/abstract');?>]]></abstract>
      <sumDscr>
         <?php //time periods ?>
         <?php $time_periods=(array)$ddi->get_el('study_desc/study_info/time_periods');?>
@@ -175,11 +175,11 @@
         </boundPoly>
         */ ?>  
 
-        <anlyUnit><?php $ddi->el('study_desc/study_info/analysis_unit');?></anlyUnit>
-        <universe><?php $ddi->el('study_desc/study_info/universe');?></universe>
+        <anlyUnit><![CDATA[<?php $ddi->el('study_desc/study_info/analysis_unit');?>]]></anlyUnit>
+        <universe><![CDATA[<?php $ddi->el('study_desc/study_info/universe');?>]]></universe>
         <dataKind><?php $ddi->el('study_desc/study_info/data_kind');?></dataKind>
      </sumDscr>
-     
+     <?php /*
      <!-- qualityStatement - ddi2.5 - complex type
      
      This structure consists of two parts, standardsCompliance and otherQualityStatements. 
@@ -188,6 +188,7 @@
      Enter any additional quality statements in otherQualityStatements.
      
      -->
+     */?>
      <qualityStatement>
         <standardsCompliance>
           <standard> 
@@ -199,9 +200,9 @@
         <otherQualityStatement><?php $ddi->el('study_desc/study_info/quality_statement/other_quality_statement');?></otherQualityStatement>
      </qualityStatement> 
      
-     <notes><?php $ddi->el('study_desc/study_info/notes');?></notes>
+     <notes><![CDATA[<?php $ddi->el('study_desc/study_info/notes');?>]]></notes>
 
-    <!-- exPostEvaluation ddi2.5
+    <?php /* <!-- exPostEvaluation ddi2.5
       Use this section to describe evaluation procedures not address in data evaluation processes. 
       These may include issues such as timing of the study, sequencing issues, cost/budget issues, 
       relevance, instituional or legal arrangments etc. of the study. 
@@ -209,7 +210,7 @@
       The completionDate attribute holds the date the evaluation was completed. 
       The type attribute is an optional type to identify the type of evaluation with or without 
       the use of a controlled vocabulary.
-    -->
+    --> */ ?>
     <exPostEvaluation completionDate="<?php $ddi->el('study_desc/study_info/ex_post_evaluation/completion_date');?>" type="<?php $ddi->el('study_desc/study_info/ex_post_evaluation/type');?>"> 
         <?php //evaluators?>  
         <?php $evals=(array)$ddi->get_el('study_desc/study_info/ex_post_evaluation/evaluator');?>
@@ -271,7 +272,7 @@
         <collectorTraining type="<?php $ddi->el('study_desc/method/data_collection/collector_training/type');?>"><?php $ddi->el('study_desc/method/data_collection/collector_training/training');?></collectorTraining>
 
         <frequenc><?php $ddi->el('study_desc/method/data_collection/frequency');?></frequenc>
-        <sampProc><?php $ddi->el('study_desc/method/data_collection/sampling_procedure');?></sampProc>
+        <sampProc><![CDATA[<?php $ddi->el('study_desc/method/data_collection/sampling_procedure');?>]]></sampProc>
         
         <sampleFrame>
           <sampleFrameName><?php $ddi->el('study_desc/method/data_collection/sample_frame/name');?></sampleFrameName>
@@ -300,11 +301,13 @@
         <?php foreach($coll_mode_arr as $coll_mode):?>
         <collMode><?php echo $coll_mode;?></collMode>
         <?php endforeach;?>
-        <resInstru><?php $ddi->el('study_desc/method/data_collection/research_instrument');?></resInstru>
+        <resInstru><![CDATA[<?php $ddi->el('study_desc/method/data_collection/research_instrument');?>]]></resInstru>
 
+        <?php /*
         <!-- instrumentDevelopment - DDI2.5             
         Describe any development work on the data collection instrument. Type attribute allows for the optional use of a defined development type with or without use of a controlled vocabulary.
         -->
+        */?>
         <instrumentDevelopment type="<?php $ddi->el('study_desc/method/data_collection/instru_development_type');?>"><?php $ddi->el('study_desc/method/data_collection/instru_development');?></instrumentDevelopment>
 
         <?php /*
@@ -323,19 +326,19 @@
         </sources>
         */?>
 
-        <collSitu><?php $ddi->el('study_desc/method/data_collection/coll_situation');?></collSitu>
-        <actMin><?php $ddi->el('study_desc/method/data_collection/act_min');?></actMin>
-        <ConOps><?php $ddi->el('study_desc/method/data_collection/control_operations');?></ConOps>
-        <weight><?php $ddi->el('study_desc/method/data_collection/weight');?></weight>
-        <cleanOps><?php $ddi->el('study_desc/method/data_collection/cleaning_operations');?></cleanOps>
+        <collSitu><![CDATA[<?php $ddi->el('study_desc/method/data_collection/coll_situation');?>]]></collSitu>
+        <actMin><![CDATA[<?php $ddi->el('study_desc/method/data_collection/act_min');?>]]></actMin>
+        <ConOps><![CDATA[<?php $ddi->el('study_desc/method/data_collection/control_operations');?>]]></ConOps>
+        <weight><![CDATA[<?php $ddi->el('study_desc/method/data_collection/weight');?>]]></weight>
+        <cleanOps><![CDATA[<?php $ddi->el('study_desc/method/data_collection/cleaning_operations');?>]]></cleanOps>
      </dataColl>
-     <notes><?php $ddi->el('study_desc/method/method_notes');?></notes>
+     <notes><![CDATA[<?php $ddi->el('study_desc/method/method_notes');?>]]></notes>
      <anlyInfo>
-        <respRate><?php $ddi->el('study_desc/method/analysis_info/response_rate');?></respRate>
-        <EstSmpErr><?php $ddi->el('study_desc/method/analysis_info/sampling_error_estimates');?></EstSmpErr>
-        <dataAppr><?php $ddi->el('study_desc/method/analysis_info/data_appraisal');?></dataAppr>
+        <respRate><![CDATA[<?php $ddi->el('study_desc/method/analysis_info/response_rate');?>]]></respRate>
+        <EstSmpErr><![CDATA[<?php $ddi->el('study_desc/method/analysis_info/sampling_error_estimates');?>]]></EstSmpErr>
+        <dataAppr><![CDATA[<?php $ddi->el('study_desc/method/analysis_info/data_appraisal');?>]]></dataAppr>
      </anlyInfo>
-     <stdyClas><?php $ddi->el('study_desc/method/study_class');?></stdyClas>
+     <stdyClas><![CDATA[<?php $ddi->el('study_desc/method/study_class');?>]]></stdyClas>
 
      <dataProcessing type="<?php $ddi->el('study_desc/method/data_processing_type');?>"><?php $ddi->el('study_desc/method/data_processing');?></dataProcessing>
 
@@ -361,7 +364,7 @@
         <collSize><?php $ddi->el('study_desc/data_access/dataset_availability/coll_size');?></collSize>
         <complete><?php $ddi->el('study_desc/data_access/dataset_availability/complete');?></complete>
         <fileQnty><?php $ddi->el('study_desc/data_access/dataset_availability/file_quantity');?></fileQnty>
-        <notes><?php $ddi->el('study_desc/data_access/dataset_availability/notes');?></notes>
+        <notes><![CDATA[<?php $ddi->el('study_desc/data_access/dataset_availability/notes');?>]]></notes>
      </setAvail>
 
 
@@ -385,12 +388,12 @@
           <contact affiliation="<?php echo $ddi->attr_val($contact,'affiliation');?>" URI="<?php echo $ddi->attr_val($contact,'uri');?>" email="<?php echo $ddi->attr_val($contact,'email');?>"><?php echo $ddi->el_val($contact,'name');?></contact>
         <?php endforeach;?>
         
-        <citReq><?php $ddi->el('study_desc/data_access/dataset_use/cit_req');?></citReq>
-        <deposReq><?php $ddi->el('study_desc/data_access/dataset_use/deposit_req');?></deposReq>
-        <conditions><?php $ddi->el('study_desc/data_access/dataset_use/conditions');?></conditions>
-        <disclaimer><?php $ddi->el('study_desc/data_access/dataset_use/disclaimer');?></disclaimer>
+        <citReq><![CDATA[<?php $ddi->el('study_desc/data_access/dataset_use/cit_req');?>]]></citReq>
+        <deposReq><![CDATA[<?php $ddi->el('study_desc/data_access/dataset_use/deposit_req');?>]]></deposReq>
+        <conditions><![CDATA[<?php $ddi->el('study_desc/data_access/dataset_use/conditions');?>]]></conditions>
+        <disclaimer><![CDATA[<?php $ddi->el('study_desc/data_access/dataset_use/disclaimer');?>]]></disclaimer>
      </useStmt>
-     <notes><?php $ddi->el('study_desc/data_access/notes');?></notes>
+     <notes><![CDATA[<?php $ddi->el('study_desc/data_access/notes');?>]]></notes>
   </dataAccs>
-  <notes><?php $ddi->el('study_desc/notes');?></notes>      
+  <notes><![CDATA[<?php $ddi->el('study_desc/notes');?>]]></notes>      
 </stdyDscr>
\ No newline at end of file

From 5da180dd06b3cf6e08655d46539f0b83d300556d Mon Sep 17 00:00:00 2001
From: Mehmood Asghar <mah0001@gmail.com>
Date: Thu, 10 Mar 2022 15:41:15 -0500
Subject: [PATCH 15/79] minor

---
 .../catalog-admin/timeseries-db-schema.json    | 18 ++++++++++++++++++
 application/schemas/timeseries-db-schema.json  | 18 ++++++++++++++++++
 2 files changed, 36 insertions(+)

diff --git a/api-documentation/catalog-admin/timeseries-db-schema.json b/api-documentation/catalog-admin/timeseries-db-schema.json
index 7c7636e89..83ef8a63b 100644
--- a/api-documentation/catalog-admin/timeseries-db-schema.json
+++ b/api-documentation/catalog-admin/timeseries-db-schema.json
@@ -386,6 +386,24 @@
 						]
 					}
 				},
+				"ref_country": {
+					"type": "array",
+					"title": "Reference country",
+					"description": "List of countries for which data are available",
+					"items": {
+						"type": "object",
+						"properties": {
+							"name": {
+								"title": "Country name",
+								"type": "string"
+							},
+							"code": {
+								"title": "Country code",
+								"type": "string"
+							}
+						}
+					}
+				},
 				"geographic_units": {
 					"title": "Geographic locations",
 					"description": "List of geographic units (regions, countries, states, provinces, etc.) for which data are available in the database.",
diff --git a/application/schemas/timeseries-db-schema.json b/application/schemas/timeseries-db-schema.json
index 7c7636e89..83ef8a63b 100644
--- a/application/schemas/timeseries-db-schema.json
+++ b/application/schemas/timeseries-db-schema.json
@@ -386,6 +386,24 @@
 						]
 					}
 				},
+				"ref_country": {
+					"type": "array",
+					"title": "Reference country",
+					"description": "List of countries for which data are available",
+					"items": {
+						"type": "object",
+						"properties": {
+							"name": {
+								"title": "Country name",
+								"type": "string"
+							},
+							"code": {
+								"title": "Country code",
+								"type": "string"
+							}
+						}
+					}
+				},
 				"geographic_units": {
 					"title": "Geographic locations",
 					"description": "List of geographic units (regions, countries, states, provinces, etc.) for which data are available in the database.",

From 8b3639cb903caafe5cd3cb654f221ddce8c0d6a8 Mon Sep 17 00:00:00 2001
From: Mehmood Asghar <mah0001@gmail.com>
Date: Thu, 10 Mar 2022 16:45:41 -0500
Subject: [PATCH 16/79] minor

---
 application/views/ddi/ddi25_stdy_dscr.php | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/application/views/ddi/ddi25_stdy_dscr.php b/application/views/ddi/ddi25_stdy_dscr.php
index 0fc7df7f9..27baa6280 100644
--- a/application/views/ddi/ddi25_stdy_dscr.php
+++ b/application/views/ddi/ddi25_stdy_dscr.php
@@ -260,6 +260,7 @@
           <dataCollector abbr="<?php echo $ddi->attr_val($collector,'abbreviation');?>" affiliation="<?php echo $ddi->attr_val($collector,'affiliation');?>"><?php echo $ddi->el_val($collector,'name');?></dataCollector>
         <?php endforeach;?> 
         
+        <?php /*
         <!-- collectorTraining - DDI2.5
         
         Collector Training
@@ -268,7 +269,8 @@
         compliance with standards etc. This is repeatable for language and to capture different aspects of the 
         training process. The type attribute allows specification of the type of training being described.
         
-        -->        
+        --> 
+        */?>       
         <collectorTraining type="<?php $ddi->el('study_desc/method/data_collection/collector_training/type');?>"><?php $ddi->el('study_desc/method/data_collection/collector_training/training');?></collectorTraining>
 
         <frequenc><?php $ddi->el('study_desc/method/data_collection/frequency');?></frequenc>

From 89c57a4529d8946513f1bc4a433651c07cbf68a9 Mon Sep 17 00:00:00 2001
From: Mehmood Asghar <mah0001@gmail.com>
Date: Fri, 11 Mar 2022 12:29:35 -0500
Subject: [PATCH 17/79] Update display template for documents

---
 .../catalog-admin/document-schema.json        |  2 +-
 .../language/english/fields_document_lang.php | 58 +++++++++++++++++--
 application/models/Dataset_document_model.php |  2 +-
 application/schemas/document-schema.json      |  2 +-
 .../metadata_templates/document-template.php  | 49 ++++++++++------
 5 files changed, 88 insertions(+), 25 deletions(-)

diff --git a/api-documentation/catalog-admin/document-schema.json b/api-documentation/catalog-admin/document-schema.json
index 311756b1b..8f37dc225 100644
--- a/api-documentation/catalog-admin/document-schema.json
+++ b/api-documentation/catalog-admin/document-schema.json
@@ -1139,7 +1139,7 @@
           },
           "vector": {
             "title": "Vector",
-            "type": "object"
+            "type": ["object","array"]
           }
         },
         "required": [
diff --git a/application/language/english/fields_document_lang.php b/application/language/english/fields_document_lang.php
index 530100b56..30faa5600 100644
--- a/application/language/english/fields_document_lang.php
+++ b/application/language/english/fields_document_lang.php
@@ -23,12 +23,17 @@
 $lang['metadata.metadata_information.producers.role']='Role';
 $lang['metadata.metadata_information.production_date']='Date of Production';
 $lang['metadata.metadata_information.version']='Document version';
+
 $lang['metadata.document_description']='Document Description';
-$lang['metadata.document_description.title_statement.idno']='Unique user defined ID';
+$lang['metadata.document_description.title_statement.idno']='Identifier';
 $lang['metadata.document_description.title_statement.title']='Title';
 $lang['metadata.document_description.title_statement.sub_title']='Subtitle';
 $lang['metadata.document_description.title_statement.alternate_title']='Abbreviation or Acronym';
-$lang['metadata.document_description.title_statement.abbreviated_title']='Abbreviated Title';
+$lang['metadata.document_description.title_statement.translated_title']='Translated Title';
+$lang['metadata.document_description.identifiers']='Identifiers';
+$lang['metadata.document_description.identifiers.type']='Type';
+$lang['metadata.document_description.identifiers.identifier']='Identifier';
+
 $lang['metadata.document_description.type']='Resource type';
 $lang['metadata.document_description.status']='Status';
 $lang['metadata.document_description.description']='Description';
@@ -41,6 +46,13 @@
 $lang['metadata.document_description.notes']='Notes';
 $lang['metadata.document_description.notes.note']='Note';
 $lang['metadata.document_description.scope']='Scope';
+
+$lang['metadata.document_description.geographic_units']='Geographic units';
+$lang['metadata.document_description.geographic_units.name']='Name';
+$lang['metadata.document_description.geographic_units.code']='Code';
+$lang['metadata.document_description.geographic_units.type']='Type';
+
+
 $lang['metadata.document_description.ref_country']='Reference country';
 $lang['metadata.document_description.ref_country.name']='Country name';
 $lang['metadata.document_description.ref_country.code']='Country code';
@@ -66,6 +78,7 @@
 $lang['metadata.document_description.institution']='Institution';
 $lang['metadata.document_description.journal']='Journal name';
 $lang['metadata.document_description.volume']='Volume number';
+$lang['metadata.document_description.number']='Number';
 $lang['metadata.document_description.issue']='Issue number';
 $lang['metadata.document_description.pages']='Page numbers';
 $lang['metadata.document_description.series']='Series name';
@@ -75,6 +88,8 @@
 $lang['metadata.document_description.authors.initial']='Initial';
 $lang['metadata.document_description.authors.last_name']='Last name';
 $lang['metadata.document_description.authors.affiliation']='Affiliation';
+$lang['metadata.document_description.authors.author_id']='ID';
+$lang['metadata.document_description.authors.full_name']='Full name';
 $lang['metadata.document_description.editors']='Editors';
 $lang['metadata.document_description.editors.first_name']='First name';
 $lang['metadata.document_description.editors.initial']='Initial';
@@ -90,8 +105,27 @@
 $lang['metadata.document_description.contributors.initial']='Initial';
 $lang['metadata.document_description.contributors.last_name']='Last name';
 $lang['metadata.document_description.contributors.affiliation']='Affiliation';
+$lang['metadata.document_description.contributors.role']='Role';
+$lang['metadata.document_description.contributors.contribution']='Contribution';
+
+$lang['metadata.document_description.contacts']='Contacts';
+$lang['metadata.document_description.contacts.name']='Name';
+$lang['metadata.document_description.contacts.role']='Role';
+$lang['metadata.document_description.contacts.affiliation']='Affiliation';
+$lang['metadata.document_description.contacts.email']='Email';
+$lang['metadata.document_description.contacts.telephone']='Telephone';
+$lang['metadata.document_description.contacts.uri']='uri';
+
 $lang['metadata.document_description.publisher']='Publisher';
 $lang['metadata.document_description.publisher_address']='Publisher\'s address';
+$lang['metadata.document_description.annote']='Annote';
+$lang['metadata.document_description.booktitle']='Book title';
+$lang['metadata.document_description.crossref']='Cross reference';
+$lang['metadata.document_description.howpublished']='Published';
+$lang['metadata.document_description.key']='Key';
+$lang['metadata.document_description.organization']='Organization';
+$lang['metadata.document_description.url']='URI';
+$lang['metadata.document_description.disclaimer']='Disclaimer';
 $lang['metadata.document_description.rights']='Rights';
 $lang['metadata.document_description.copyright']='Copyright';
 $lang['metadata.document_description.usage_terms']='Terms governing use and reproduction';
@@ -102,22 +136,30 @@
 $lang['metadata.document_description.sources.source_origin']='Origin of Source';
 $lang['metadata.document_description.sources.source_char']='Characteristics of Source Noted';
 $lang['metadata.document_description.sources.source_doc']='Source documentation';
+
+$lang['metadata.document_description.data_sources']='Data sources';
+$lang['metadata.document_description.data_sources.name']='Name';
+$lang['metadata.document_description.data_sources.uri']='URI';
+$lang['metadata.document_description.data_sources.note']='Note';
+
 $lang['metadata.document_description.keywords']='Keywords';
 $lang['metadata.document_description.keywords.name']='Name';
 $lang['metadata.document_description.keywords.vocabulary']='Vocabulary name';
 $lang['metadata.document_description.keywords.uri']='Vocabulary URI';
 $lang['metadata.document_description.themes']='Themes';
+$lang['metadata.document_description.themes.id']='Identifier';
 $lang['metadata.document_description.themes.name']='Name';
 $lang['metadata.document_description.themes.vocabulary']='Vocabulary name';
 $lang['metadata.document_description.themes.uri']='Vocabulary URI';
 $lang['metadata.document_description.topics']='Topics';
-$lang['metadata.document_description.topics.id']='Unique Identifier';
+$lang['metadata.document_description.topics.id']='Identifier';
 $lang['metadata.document_description.topics.name']='Topic';
 $lang['metadata.document_description.topics.parent_id']='Parent topic Identifier';
 $lang['metadata.document_description.topics.vocabulary']='Vocabulary';
 $lang['metadata.document_description.topics.uri']='Vocabulary URI';
 $lang['metadata.document_description.disciplines']='Disciplines';
-$lang['metadata.document_description.disciplines.name']='Discipline title or name';
+$lang['metadata.document_description.disciplines.id']='Identifier';
+$lang['metadata.document_description.disciplines.name']='Name';
 $lang['metadata.document_description.disciplines.vocabulary']='Vocabulary';
 $lang['metadata.document_description.disciplines.uri']='URI';
 $lang['metadata.document_description.audience']='Audience';
@@ -135,6 +177,7 @@
 $lang['metadata.document_description.lda_topics']='LDA topics';
 $lang['metadata.document_description.lda_topics.model_info']='Model information';
 $lang['metadata.document_description.lda_topics.model_info.source']='Source';
+$lang['lda_model.source']='Source';
 $lang['lda_model.author']='Author';
 $lang['lda_model.version']='Version';
 $lang['lda_model.model_id']='Model Identifier';
@@ -163,3 +206,10 @@
 
 $lang['metadata.tags']='Tags';
 $lang['metadata.tags.tag']='Tag';
+
+
+$lang['metadata.embeddings']='Embeddings';
+$lang['metadata.embeddings.id']='ID';
+$lang['metadata.embeddings.description']='Description';
+$lang['metadata.embeddings.date']='Date';
+$lang['metadata.embeddings.vector']='Vector';
\ No newline at end of file
diff --git a/application/models/Dataset_document_model.php b/application/models/Dataset_document_model.php
index e2178793d..062db6400 100644
--- a/application/models/Dataset_document_model.php
+++ b/application/models/Dataset_document_model.php
@@ -78,7 +78,7 @@ function create_dataset($type,$options, $sid=null)
         $options['changed']=date("U");
         
         //fields to be stored as metadata
-        $study_metadata_sections=array('metadata_information','document_description','files','resources','tags','additional');
+        $study_metadata_sections=array('metadata_information','document_description','files','resources','provenance','embeddings','lda_topics','tags','additional');
 
         //external resources
         $external_resources=$this->get_array_nested_value($options,'resources');
diff --git a/application/schemas/document-schema.json b/application/schemas/document-schema.json
index 311756b1b..8f37dc225 100644
--- a/application/schemas/document-schema.json
+++ b/application/schemas/document-schema.json
@@ -1139,7 +1139,7 @@
           },
           "vector": {
             "title": "Vector",
-            "type": "object"
+            "type": ["object","array"]
           }
         },
         "required": [
diff --git a/application/views/metadata_templates/document-template.php b/application/views/metadata_templates/document-template.php
index e48d2f2fb..5ba73c86a 100644
--- a/application/views/metadata_templates/document-template.php
+++ b/application/views/metadata_templates/document-template.php
@@ -24,6 +24,7 @@
     $fields=array(
         "metadata.document_description.title_statement.idno"=>"text",
         "metadata.document_description.title_statement.title"=>"text",
+        "metadata.document_description.identifiers"=>"array",
         
         "metadata.resources"=>'resources',
         
@@ -32,7 +33,11 @@
 
         "metadata.document_description.title_statement.sub_title"=>"text",
         "metadata.document_description.title_statement.alternate_title"=>"text",
-        "metadata.document_description.title_statement.abbreviated_title"=>"text",
+        "metadata.document_description.title_statement.translated_title"=>"text",
+
+
+        
+
         "metadata.document_description.type"=>"text",
         "metadata.document_description.status"=>"text",
         "metadata.document_description.description"=>"text",
@@ -42,6 +47,8 @@
         "metadata.document_description.notes"=>"array",
         "metadata.document_description.scope"=>"text",
         "metadata.document_description.ref_country"=>"array",
+        "metadata.document_description.geographic_units"=>"array",
+        "metadata.document_description.bbox"=>"bounding_box",
         "metadata.document_description.spatial_coverage"=>"text",
         "metadata.document_description.temporal_coverage"=>"text",
         "metadata.document_description.date_created"=>"text",
@@ -61,8 +68,8 @@
         "metadata.document_description.institution"=>"text",
         
         "metadata.document_description.volume"=>"text",
-        "metadata.document_description.issue"=>"text",
-        "metadata.document_description.pages"=>"text"        
+        "metadata.document_description.number"=>"text",
+        "metadata.document_description.pages"=>"text"
     ),
     $metadata);
     ?>
@@ -83,8 +90,16 @@
             "metadata.document_description.editors"=>"array",
             "metadata.document_description.translators"=>"array",
             "metadata.document_description.contributors"=>"array",
+            "metadata.document_description.contacts"=>"array",
             "metadata.document_description.publisher"=>"text",
-            "metadata.document_description.publisher_address"=>"text"
+            "metadata.document_description.publisher_address"=>"text",
+            "metadata.document_description.annote"=>"text",
+            "metadata.document_description.booktitle"=>"text",
+            "metadata.document_description.crossref"=>"text",
+            "metadata.document_description.howpublished"=>"text",
+            "metadata.document_description.key"=>"text",
+            "metadata.document_description.organization"=>"text",
+            "metadata.document_description.url"=>"text"
         ),
         $metadata);
         ?>
@@ -103,6 +118,7 @@
             "metadata.document_description.rights"=>"text",
             "metadata.document_description.copyright"=>"text",
             "metadata.document_description.usage_terms"=>"text",
+            "metadata.document_description.disclaimer"=>"text",
             "metadata.document_description.security_classification"=>"text",
             "metadata.document_description.access_restrictions"=>"text"
         ),
@@ -111,15 +127,9 @@
     
     <?php $output['themes_topics']= render_group('themes_topics',
         $fields=array( 
-        "metadata.document_description.sources.data_source"=>"array",
-        "metadata.document_description.keywords"=>"",
-        "metadata.document_description.keywords.name"=>"text",
-        "metadata.document_description.keywords.vocabulary"=>"text",
-        "metadata.document_description.keywords.uri"=>"text",
-        "metadata.document_description.themes"=>"",
-        "metadata.document_description.themes.name"=>"text",
-        "metadata.document_description.themes.vocabulary"=>"text",
-        "metadata.document_description.themes.uri"=>"text",
+        "metadata.document_description.sources"=>"array",
+        "metadata.document_description.data_sources"=>"array",
+        "metadata.document_description.themes"=>"array",
         "metadata.document_description.topics"=>"array",
         "metadata.document_description.disciplines"=>"array",
         "metadata.document_description.audience"=>"text",        
@@ -133,10 +143,12 @@
 
 <?php $output['lda_topics']= render_group('lda_topics',
         $fields=array(  
-        "metadata.document_description.lda_topics"=>"lda_topics",
-        "metadata.document_description.lda_topics.model_info"=>"array",        
-        "metadata.document_description.lda_topics.topic_description"=>"array",
-        "metadata.document_description.lda_topics.topic_description.topic_words.word"=>"text",
+        "metadata.lda_topics"=>"lda_topics",
+        "metadata.lda_topics.model_info"=>"array",        
+        "metadata.lda_topics.topic_description"=>"array",
+        "metadata.lda_topics.topic_description.topic_words.word"=>"text",
+        "metadata.embeddings"=>"array",
+        "metadata.additional"=>"dump",
     ),
     $metadata);
 ?>
@@ -149,7 +161,8 @@
         "metadata.metadata_information.title"=>"text",
         "metadata.metadata_information.idno"=>"text",
         "metadata.metadata_information.producers"=>"array",
-        "metadata.metadata_information.version"=>"text",
+        "metadata.metadata_information.production_date"=>"text",
+        "metadata.metadata_information.version"=>"text",        
     ),
     $metadata);
 ?>

From 8cddf0d46ac815be70adedc99f091449f350131e Mon Sep 17 00:00:00 2001
From: Mehmood Asghar <mah0001@gmail.com>
Date: Wed, 16 Mar 2022 15:45:34 -0400
Subject: [PATCH 18/79] update document display page + add subtitle field

---
 application/helpers/metadata_view_helper.php  |  22 ++-
 .../libraries/Catalog_search_mysql.php        |   4 +-
 application/models/Dataset_document_model.php |   1 +
 application/models/Dataset_model.php          |  31 +++
 .../metadata_templates/document-template.php  | 181 ++++++++++--------
 .../metadata_templates/fields/field_dump.php  |   4 +-
 .../fields/field_lda_model.php                |  32 ++++
 .../fields/field_lda_topics.php               |   2 +-
 application/views/search/layout.php           |   3 +
 application/views/search/surveys.php          |   5 +-
 application/views/survey_info/info.php        |  44 ++++-
 application/views/survey_info/layout.php      |   5 +
 install/schema.mysql.sql                      |   1 +
 install/schema.sqlsrv.sql                     |   1 +
 14 files changed, 236 insertions(+), 100 deletions(-)
 create mode 100644 application/views/metadata_templates/fields/field_lda_model.php

diff --git a/application/helpers/metadata_view_helper.php b/application/helpers/metadata_view_helper.php
index dc1db5eac..37b590ac9 100644
--- a/application/helpers/metadata_view_helper.php
+++ b/application/helpers/metadata_view_helper.php
@@ -227,5 +227,23 @@ function get_string_value($data,$type='text')
     throw new Exception("TYPE_NOT_SUPPORTED: ".$type);
 }
 
-/* End of file search_helper.php */
-/* Location: ./application/helpers/search_helper.php */
\ No newline at end of file
+
+if ( ! function_exists('authors_to_string'))
+{
+    function authors_to_string($authors=array())
+    {
+		$output=array();
+        foreach($authors as $author){
+			$author_name=array(
+				isset($author['first_name']) ? $author['first_name'] : '', 
+				isset($author['last_name']) ? $author['last_name']: ''
+			);
+			$output[]=implode(" ", array_filter($author_name));
+		}
+
+		return implode(", ", $output);
+    }
+}
+
+/* End of file metadata_view_helper.php */
+/* Location: ./application/helpers/metadata_view_helper.php */
\ No newline at end of file
diff --git a/application/libraries/Catalog_search_mysql.php b/application/libraries/Catalog_search_mysql.php
index e6c91f07a..7b4020f25 100644
--- a/application/libraries/Catalog_search_mysql.php
+++ b/application/libraries/Catalog_search_mysql.php
@@ -190,7 +190,7 @@ public function search($limit=15, $offset=0)
 		}
 		
 		//study fields returned by the select statement
-		$study_fields='surveys.id as id, surveys.type, surveys.idno as idno,surveys.title,nation,authoring_entity';
+		$study_fields='surveys.id as id, surveys.type, surveys.idno as idno,surveys.title,surveys.subtitle,nation,authoring_entity';
 		$study_fields.=',forms.model as form_model, data_class_id, surveys.year_start,surveys.year_end, surveys.thumbnail';
 		$study_fields.=',surveys.repositoryid as repositoryid, link_da, repositories.title as repo_title, surveys.created,surveys.changed,surveys.total_views,surveys.total_downloads,varcount';
 
@@ -373,7 +373,7 @@ public function search_counts_by_type()
 		}
 		
 		//study fields returned by the select statement
-		$study_fields='surveys.id as id, surveys.type, surveys.idno as idno,surveys.title,nation,authoring_entity,forms.model as form_model,data_class_id,surveys.year_start,surveys.year_end';
+		$study_fields='surveys.id as id, surveys.type, surveys.idno as idno,surveys.title,surveys.subtitle,nation,authoring_entity,forms.model as form_model,data_class_id,surveys.year_start,surveys.year_end';
 		$study_fields.=', surveys.repositoryid as repositoryid, link_da, repositories.title as repo_title, surveys.created,surveys.changed,surveys.total_views,surveys.total_downloads';
 
 		//build final search sql query
diff --git a/application/models/Dataset_document_model.php b/application/models/Dataset_document_model.php
index 062db6400..d52e249dd 100644
--- a/application/models/Dataset_document_model.php
+++ b/application/models/Dataset_document_model.php
@@ -140,6 +140,7 @@ function get_core_fields($options)
 	{        
         $output=array();
         $output['title']=$this->get_array_nested_value($options,'document_description/title_statement/title');
+        $output['subtitle']=$this->get_array_nested_value($options,'document_description/title_statement/sub_title');
         $output['idno']=$this->get_array_nested_value($options,'document_description/title_statement/idno');
 
         $nations=(array)$this->get_array_nested_value($options,'document_description/ref_country');
diff --git a/application/models/Dataset_model.php b/application/models/Dataset_model.php
index 6f44eb65a..497c0867f 100644
--- a/application/models/Dataset_model.php
+++ b/application/models/Dataset_model.php
@@ -20,6 +20,7 @@ class Dataset_model extends CI_Model {
 		'repositoryid',
 		'idno',
 		'title',
+		'subtitle',
 		'abbreviation',
 		'authoring_entity',
 		'nation',
@@ -1850,5 +1851,35 @@ function get_country_names_string($nations)
         return $nation_str;
     }
 
+
+	function update_locations($sid, $bounds=array())
+    {
+		var_dump($bounds);
+
+        //delete any existing locations
+        $this->db->delete('survey_locations',array('sid' => $sid));
+
+        if(!is_array($bounds)){
+            return false;
+        }
+        
+        foreach($bounds as $bbox)
+        {
+            $north=$bbox['north'];
+            $south=$bbox['south'];
+            $east=$bbox['east'];
+            $west=$bbox['west'];
+
+            $this->load->helper("gis_helper");
+            $bbox_wkt=$this->db->escape(bbox_to_wkt($north, $south, $east, $west));
+
+            $this->db->set('sid',$sid);
+            $this->db->set('location','ST_GeomFromText('.$bbox_wkt.')',false);
+            $this->db->insert('survey_locations');
+
+			echo $this->db->last_query();
+        }
+    }
+
 }//end-class
 	
diff --git a/application/views/metadata_templates/document-template.php b/application/views/metadata_templates/document-template.php
index 5ba73c86a..c96a214f0 100644
--- a/application/views/metadata_templates/document-template.php
+++ b/application/views/metadata_templates/document-template.php
@@ -12,6 +12,13 @@
  **/
 ?>
 
+<style>
+    .field-label{
+        font-weight:bold;
+    }
+</style>
+
+
 
 <?php 
     //rendered html for all sections
@@ -22,136 +29,144 @@
 <!-- identification section -->
 <?php $output['description']= render_group('description',
     $fields=array(
-        "metadata.document_description.title_statement.idno"=>"text",
         "metadata.document_description.title_statement.title"=>"text",
-        "metadata.document_description.identifiers"=>"array",
-        
-        "metadata.resources"=>'resources',
-        
-        "metadata.document_description.journal"=>"text",
-        "metadata.document_description.date_published"=>"text",
-
         "metadata.document_description.title_statement.sub_title"=>"text",
         "metadata.document_description.title_statement.alternate_title"=>"text",
         "metadata.document_description.title_statement.translated_title"=>"text",
 
 
-        
-
-        "metadata.document_description.type"=>"text",
-        "metadata.document_description.status"=>"text",
-        "metadata.document_description.description"=>"text",
-        "metadata.document_description.toc"=>"text",
-        "metadata.document_description.toc_structured"=>"array",
-        "metadata.document_description.abstract"=>"text",
-        "metadata.document_description.notes"=>"array",
-        "metadata.document_description.scope"=>"text",
-        "metadata.document_description.ref_country"=>"array",
-        "metadata.document_description.geographic_units"=>"array",
-        "metadata.document_description.bbox"=>"bounding_box",
-        "metadata.document_description.spatial_coverage"=>"text",
-        "metadata.document_description.temporal_coverage"=>"text",
         "metadata.document_description.date_created"=>"text",
         "metadata.document_description.date_available"=>"text",
+        "metadata.document_description.date_published"=>"text",
         "metadata.document_description.date_modified"=>"text",
-        
-        
-        //"metadata.document_description.id_numbers"=>"object",
-        "metadata.document_description.id_numbers.type"=>"text",
-        "metadata.document_description.id_numbers.value"=>"text",
+
+
+        "metadata.document_description.authors"=>"array",
+        "metadata.document_description.editors"=>"array",
+        "metadata.document_description.type"=>"text",
         "metadata.document_description.publication_frequency"=>"text",
+        "metadata.document_description.series"=>"text",
+        "metadata.document_description.status"=>"text",
+        "metadata.document_description.abstract"=>"text",
+        "metadata.document_description.description"=>"text",
+
+        "metadata.document_description.audience"=>"text",
+        "metadata.document_description.mandate"=>"text",
+
+        "metadata.document_description.title_statement.idno"=>"text",
+        "metadata.document_description.identifiers"=>"array",
+
         "metadata.document_description.languages"=>"array",
-        "metadata.document_description.license"=>"array",
-        "metadata.document_description.bibliographic_citation"=>"text",
-        "metadata.document_description.chapter"=>"text",
-        "metadata.document_description.edition"=>"text",
-        "metadata.document_description.institution"=>"text",
         
-        "metadata.document_description.volume"=>"text",
-        "metadata.document_description.number"=>"text",
-        "metadata.document_description.pages"=>"text"
+        "metadata.resources"=>'resources',
     ),
     $metadata);
     ?>
 
  
 
-<?php $output['series']= render_group('series',
+<?php $output['scope and coverage']= render_group('scope and coverage',
     $fields=array(
-        "metadata.document_description.series"=>"text",
+        "metadata.document_description.scope"=>"text",
+        "metadata.document_description.ref_country"=>"array",
+        "metadata.document_description.geographic_units"=>"array",
+        "metadata.document_description.bbox"=>"bounding_box",
+        "metadata.document_description.spatial_coverage"=>"text",
+        "metadata.document_description.temporal_coverage"=>"text",
+        "metadata.document_description.toc"=>"text",
+        "metadata.document_description.toc_structured"=>"array",
+
+        "metadata.document_description.keywords"=>"array",
+        "metadata.tags"=>"array_comma",
+        "metadata.document_description.topics"=>"array",
+        "metadata.document_description.themes"=>"array",
+        "metadata.document_description.disciplines"=>"array",
+          
     ),
     $metadata);
     ?>
 
-    <?php $output['authors']= render_group('authors',
+<?php $output['lda_topics']= render_group('lda_topics',
+        $fields=array(  
+        "metadata.lda_topics"=>"lda_topics",
+        "metadata.lda_topics.model_info"=>"array",
+        "metadata.lda_topics.topic_description"=>"array",
+        "metadata.lda_topics.topic_description.topic_words.word"=>"text",
+        "metadata.embeddings"=>"array",
+        "metadata.additional"=>"dump",
+    ),
+    $metadata);
+?>
+
+    <?php $output['contributors']= render_group('contributors',
         $fields=array(            
-            "metadata.document_description.creator"=>"text",
-            "metadata.document_description.authors"=>"array",
-            "metadata.document_description.editors"=>"array",
+            "metadata.document_description.creator"=>"text",            
             "metadata.document_description.translators"=>"array",
             "metadata.document_description.contributors"=>"array",
-            "metadata.document_description.contacts"=>"array",
-            "metadata.document_description.publisher"=>"text",
-            "metadata.document_description.publisher_address"=>"text",
-            "metadata.document_description.annote"=>"text",
-            "metadata.document_description.booktitle"=>"text",
-            "metadata.document_description.crossref"=>"text",
-            "metadata.document_description.howpublished"=>"text",
-            "metadata.document_description.key"=>"text",
-            "metadata.document_description.organization"=>"text",
-            "metadata.document_description.url"=>"text"
+            "metadata.document_description.contacts"=>"array"            
         ),
         $metadata);
         ?>
 
+
+<?php $output['bibliographic information']= render_group('bibliographic information',
+    $fields=array(
+        "metadata.document_description.bibliographic_citation"=>"text",
+        "metadata.document_description.chapter"=>"text",
+        "metadata.document_description.edition"=>"text",
+        "metadata.document_description.institution"=>"text",
+        "metadata.document_description.journal"=>"text",
+        "metadata.document_description.volume"=>"text",
+        "metadata.document_description.number"=>"text",
+        "metadata.document_description.pages"=>"text",
+        "metadata.document_description.publisher"=>"text",
+        "metadata.document_description.publisher_address"=>"text",
+        "metadata.document_description.annote"=>"text",
+        "metadata.document_description.booktitle"=>"text",
+        "metadata.document_description.crossref"=>"text",
+        "metadata.document_description.howpublished"=>"text",
+        "metadata.document_description.key"=>"text",
+        "metadata.document_description.organization"=>"text",
+        "metadata.document_description.url"=>"text"
+    ),
+    $metadata);
+?>
+
 <!--  reproducibility section -->
 <?php $output['reproducibility']= render_group('reproducibility',
     $fields=array(
-        "metadata.document_description.reproducibility.statement"=>"text",
-        "metadata.document_description.reproducibility.links"=>"array",
+        "metadata.document_description.reproducibility.statement"=>"text",        
+        "metadata.document_description.sources"=>"array",
+        "metadata.document_description.data_sources"=>"array",
+        "metadata.document_description.relations"=>"array",
     ),
     $metadata);
-    ?>   
+?>   
     
     <?php $output['copyrights']= render_group('copyrights',
-        $fields=array(  
+        $fields=array(
+            "metadata.document_description.license"=>"array",
+            "metadata.document_description.disclaimer"=>"text",
             "metadata.document_description.rights"=>"text",
             "metadata.document_description.copyright"=>"text",
             "metadata.document_description.usage_terms"=>"text",
-            "metadata.document_description.disclaimer"=>"text",
+        
             "metadata.document_description.security_classification"=>"text",
-            "metadata.document_description.access_restrictions"=>"text"
+            "metadata.document_description.access_restrictions"=>"text",
+            "metadata.document_description.pricing"=>"text",
+            "metadata.document_description.reproducibility.links"=>"array",
         ),
         $metadata);
     ?>
     
-    <?php $output['themes_topics']= render_group('themes_topics',
-        $fields=array( 
-        "metadata.document_description.sources"=>"array",
-        "metadata.document_description.data_sources"=>"array",
-        "metadata.document_description.themes"=>"array",
-        "metadata.document_description.topics"=>"array",
-        "metadata.document_description.disciplines"=>"array",
-        "metadata.document_description.audience"=>"text",        
-        "metadata.document_description.mandate"=>"text",
-        "metadata.document_description.pricing"=>"text",
-        "metadata.document_description.relations"=>"array",
-        "metadata.tags"=>"array_comma",        
-    ),
-    $metadata);
+    <?php $output['notes']= render_group('notes',
+        $fields=array(         
+            "metadata.document_description.notes"=>"array",
+        ),
+        $metadata);
     ?>    
 
-<?php $output['lda_topics']= render_group('lda_topics',
-        $fields=array(  
-        "metadata.lda_topics"=>"lda_topics",
-        "metadata.lda_topics.model_info"=>"array",        
-        "metadata.lda_topics.topic_description"=>"array",
-        "metadata.lda_topics.topic_description.topic_words.word"=>"text",
-        "metadata.embeddings"=>"array",
-        "metadata.additional"=>"dump",
-    ),
-    $metadata);
-?>
+
 
 
 
diff --git a/application/views/metadata_templates/fields/field_dump.php b/application/views/metadata_templates/fields/field_dump.php
index 90bc965c0..ddfe31423 100644
--- a/application/views/metadata_templates/fields/field_dump.php
+++ b/application/views/metadata_templates/fields/field_dump.php
@@ -1,3 +1,5 @@
+<?php if(!empty($data)):?>
 <pre>
 <?php print_r($data);?>
-</pre>
\ No newline at end of file
+</pre>
+<?php endif;?>
\ No newline at end of file
diff --git a/application/views/metadata_templates/fields/field_lda_model.php b/application/views/metadata_templates/fields/field_lda_model.php
new file mode 100644
index 000000000..d74aa6259
--- /dev/null
+++ b/application/views/metadata_templates/fields/field_lda_model.php
@@ -0,0 +1,32 @@
+<?php if ($data):?>
+<?php 
+    $columns=array(
+        'source',
+        'author',
+        'version',
+        'model_id',
+        'nb_topics',
+        'description',
+        'corpus'
+    );
+?>
+<div class="field field-<?php echo $name;?>">
+    <div class="xsl-caption field-caption"><?php echo t($name);?></div>
+    <div class="field-value">
+        <?php foreach($data as $row):?>
+            <?php foreach($columns as $column_name):?>
+                <?php if(isset($row[$column_name])):?>
+                    <?php if($column_name=='model_id'):?>
+                        <div>
+                            <span class="field-label"><?php echo t($name.'.'.$column_name);?></span>
+                            <a href="<?php echo isset($row['uri']) ? $row['uri'] : '#';?>"><?php echo $row[$column_name];?></a>
+                        </div>
+                    <?php else:?>                    
+                        <div><span class="field-label"><?php echo t($name.'.'.$column_name);?></span> <?php echo $row[$column_name];?></div>
+                    <?php endif;?>
+                <?php endif;?>
+            <?php endforeach;?>
+        <?php endforeach;?>
+    </div>
+</div>
+<?php endif;?>
diff --git a/application/views/metadata_templates/fields/field_lda_topics.php b/application/views/metadata_templates/fields/field_lda_topics.php
index 2fe357585..e9c97789e 100644
--- a/application/views/metadata_templates/fields/field_lda_topics.php
+++ b/application/views/metadata_templates/fields/field_lda_topics.php
@@ -12,7 +12,7 @@
         <?php foreach($data as $lda_topic):?>
             <!-- LDA model info -->
             <?php if(isset($lda_topic['model_info'])):?>
-                <?php echo render_field($field_type='array',$field_name='lda_model',$value=$lda_topic['model_info']);?>
+                <?php echo render_field($field_type='lda_model',$field_name='lda_model',$value=$lda_topic['model_info']);?>
             <?php endif;?>
 
             <!-- LDA topics -->
diff --git a/application/views/search/layout.php b/application/views/search/layout.php
index 8647efaf3..fe556c5c6 100644
--- a/application/views/search/layout.php
+++ b/application/views/search/layout.php
@@ -7,6 +7,9 @@
     margin-bottom:10px;
     font-weight:bold;
 }
+.study-subtitle{
+    font-size:small;
+}
 </style>
 <div class="container catalog-search-container">
 <form method="get" id="catalog-search-form">    
diff --git a/application/views/search/surveys.php b/application/views/search/surveys.php
index c5e6222dd..54d52aa09 100644
--- a/application/views/search/surveys.php
+++ b/application/views/search/surveys.php
@@ -190,7 +190,10 @@
                     <a href="<?php echo site_url('catalog/'.$row['id']); ?>"  title="<?php echo $row['title']; ?>" class="d-flex" >   
                         <i class="fa <?php echo $type_icons[$row['type']];?> fa-nada-icon wb-title-icon"></i>             
                         <span>
-                            <?php echo $row['title'];?>                             
+                            <?php echo $row['title'];?>
+                            <?php if(isset($row['subtitle'])):?>
+                                <div class="study-subtitle"><?php echo $row['subtitle'];?></div>
+                            <?php endif;?>
                         </span>
                     </a>
                 </h5>
diff --git a/application/views/survey_info/info.php b/application/views/survey_info/info.php
index 2f5037f31..2eb5f43f2 100644
--- a/application/views/survey_info/info.php
+++ b/application/views/survey_info/info.php
@@ -1,18 +1,24 @@
 <?php 
-	$sub_title=array();
-	if ($survey['nation']!=''){
-		$sub_title[]='<span id="dataset-country">'.$survey['nation'].'</span>';
-	}
+
+    $sub_title=array();
+    
+    if ($survey['type']=='document' && isset($survey['metadata']['document_description']['authors'])){
+        $sub_title[]= '<span id="dataset-country">'.authors_to_string($survey['metadata']['document_description']['authors']).'</span>';
+    }else{        
+        if ($survey['nation']!=''){
+            $sub_title[]='<span id="dataset-country">'.$survey['nation'].'</span>';
+        }
+    }
 
     $dates=array_unique(array($survey['year_start'],$survey['year_end']));
-	$dates=implode(" - ", $dates);
+    $dates=implode(" - ", $dates);
 
     if(!empty($dates)){
-		$sub_title[]='<span id="dataset-year">'.$dates.'</span>';
-	}
+        $sub_title[]='<span id="dataset-year">'.$dates.'</span>';
+    }
+    
 	$sub_title=implode(", ", $sub_title);
 ?>
-
 <div class="row study-info">
 	<?php if ($survey['owner_repo']['thumbnail']!='' || ( isset($survey['thumbnail']) && trim($survey['thumbnail'])!='')):?>
 		<?php 
@@ -33,7 +39,12 @@
 	<div class="col">
 		
 		<div>
-		    <h1 class="mt-0 mb-1" id="dataset-title"><?php echo $survey_title;?></h1>
+		    <h1 class="mt-0 mb-1" id="dataset-title">
+                <span><?php echo $survey_title;?></span>
+                <?php if (isset($survey['subtitle'])):?>
+                    <div class="study-subtitle"><?php echo $survey['subtitle'];?></div>
+                <?php endif;?>
+            </h1>
             <div class="clearfix">
 		        <h6 class="sub-title float-left" id="dataset-sub-title"><?php echo $sub_title;?></h6>
                 <?php if(isset($data_access_type) && $data_access_type!='data_na' && $survey['type']=='survey'):?>
@@ -76,7 +87,7 @@ class="get-microdata-btn badge badge-primary wb-text-link-uppercase float-left m
                 </div>
                 <?php endif;?>
 		
-                <?php if (isset($survey['authoring_entity']) && !empty($survey['authoring_entity'])):?>
+                <?php if ($survey['type']!='document' && isset($survey['authoring_entity']) && !empty($survey['authoring_entity'])):?>
                 <div class="row mb-2 pb-2  border-bottom">
                     <div class="col-md-2">
                         <?php echo t('producers');?>
@@ -88,6 +99,19 @@ class="get-microdata-btn badge badge-primary wb-text-link-uppercase float-left m
                     </div>
                 </div>
                 <?php endif;?>
+                
+                <?php if ($survey['type']=='document' && isset($survey['metadata']['document_description']['abstract']) ):?>
+                <div class="row mb-2 pb-2  border-bottom">
+                    <div class="col-md-2">
+                        <?php echo t('abstract');?>
+                    </div>
+                    <div class="col">
+                        <div class="abstract" id="study-abstract">
+                            <?php echo ($survey['metadata']['document_description']['abstract']);?>
+                        </div>
+                    </div>
+                </div>
+                <?php endif;?>
 
                 <?php if (isset($survey['repositories']) && is_array($survey['repositories']) && count($survey['repositories'])>0): ?> 
                 <div class="row  border-bottom mb-2 pb-2 mt-2">
diff --git a/application/views/survey_info/layout.php b/application/views/survey_info/layout.php
index cf6138d77..8b992f063 100644
--- a/application/views/survey_info/layout.php
+++ b/application/views/survey_info/layout.php
@@ -14,6 +14,11 @@
     font-size: 14px;
 }
 
+.study-subtitle{
+	font-size:.7em;
+	margin-bottom:10px;
+}
+
 .badge-outline{
 	background:transparent;
 	color:#03a9f4;
diff --git a/install/schema.mysql.sql b/install/schema.mysql.sql
index 801a1fb1d..0faa349ee 100644
--- a/install/schema.mysql.sql
+++ b/install/schema.mysql.sql
@@ -346,6 +346,7 @@ CREATE TABLE `surveys` (
   `type` varchar(15) DEFAULT NULL,
   `repositoryid` varchar(100) DEFAULT NULL,
   `title` varchar(255) NOT NULL DEFAULT '',
+  `subtitle` varchar(255) DEFAULT NULL,
   `abbreviation` varchar(45) DEFAULT NULL,
   `authoring_entity` text,
   `nation` varchar(150) DEFAULT '',
diff --git a/install/schema.sqlsrv.sql b/install/schema.sqlsrv.sql
index 33232c835..b2b928cb7 100644
--- a/install/schema.sqlsrv.sql
+++ b/install/schema.sqlsrv.sql
@@ -337,6 +337,7 @@ CREATE TABLE surveys (
   type varchar(15) DEFAULT NULL,
   repositoryid varchar(128) NOT NULL,
   title varchar(255) DEFAULT '',
+  subtitle varchar(255) DEFAULT '',
   abbreviation varchar(45) DEFAULT NULL,
   authoring_entity varchar(max) DEFAULT NULL,
   nation varchar(150) DEFAULT '',

From 48e00070c45d79c2409c2fe6df20aa7cda5cb315 Mon Sep 17 00:00:00 2001
From: Mehmood Asghar <mah0001@gmail.com>
Date: Thu, 17 Mar 2022 10:35:38 -0400
Subject: [PATCH 19/79] Minor fixes for display for related datasets/studies

---
 application/controllers/admin/Attach_related_data.php |  2 +-
 application/views/catalog/select_related_studies.php  | 10 ++--------
 application/views/survey_info/related_studies.php     | 10 +++++++---
 3 files changed, 10 insertions(+), 12 deletions(-)

diff --git a/application/controllers/admin/Attach_related_data.php b/application/controllers/admin/Attach_related_data.php
index 688e56a9d..ab2576cd9 100644
--- a/application/controllers/admin/Attach_related_data.php
+++ b/application/controllers/admin/Attach_related_data.php
@@ -131,7 +131,7 @@ private function _search($skey){
 
 
 		//set pagination options
-		$base_url = site_url('admin/dialog_select_studies/index/'.$skey);
+		$base_url = site_url('admin/catalog/attach_related_data/'.$skey);
 		$config['base_url'] = $base_url;
 		$config['total_rows'] = $total;
 		$config['per_page'] = $limit;
diff --git a/application/views/catalog/select_related_studies.php b/application/views/catalog/select_related_studies.php
index ccb9edbc9..29c851f9a 100644
--- a/application/views/catalog/select_related_studies.php
+++ b/application/views/catalog/select_related_studies.php
@@ -54,13 +54,7 @@
 <nav class="navbar navbar-default" style="background:#337ab7;">
   <div class="container-fluid">
     <!-- Brand and toggle get grouped for better mobile display -->
-    <div class="navbar-header" >
-      <button type="button" class="navbar-toggle collapsed" data-toggle="collapse" data-target="#bs-example-navbar-collapse-1" aria-expanded="false">
-        <span class="sr-only">Toggle navigation</span>
-        <span class="icon-bar"></span>
-        <span class="icon-bar"></span>
-        <span class="icon-bar"></span>
-      </button>
+    <div class="navbar-header" >      
       <div class="navbar-brand">
 				<a style="color:white;" href="<?php echo site_url('admin/catalog/edit/'.$survey_id.'/related-data');?>">
 					<span class="glyphicon glyphicon-arrow-left" aria-hidden="true"></span> <?php echo $survey_title;?></a>
@@ -77,7 +71,7 @@
 
 <div class="body-container container-fluid">
 
-	<h2><span><?php echo t('attach_related_data');?></span></h2>
+	<h2 class="mt-2"><?php echo t('attach_related_data');?></h2>
 
 <!-- search form-->
 <form class="left-pad" style="margin-bottom:10px;" method="GET" id="catalog-search">
diff --git a/application/views/survey_info/related_studies.php b/application/views/survey_info/related_studies.php
index 00420e1e5..4303509a0 100644
--- a/application/views/survey_info/related_studies.php
+++ b/application/views/survey_info/related_studies.php
@@ -5,11 +5,15 @@
 ?>
 
 <div class="related-studies">
-    <h4><?php echo t('related_studies');?></h4>
+    <h4 class="mb-4"><?php echo t('related_studies');?></h4>
     <?php foreach($related_studies as $related_study):?>
-        <div class="related-study-row" >
+        <?php
+                $nation_year=array();
+                $nation_year=implode(", ",array_filter(array($related_study['nation'],$related_study['year_start'])));
+        ?>
+        <div class="related-study-row mb-2 pb-2 border-bottom" >
         <div><a href="<?php echo site_url('catalog/'.$related_study['id']);?>"><?php echo $related_study['title'];?></a></div>
-        <div class="sub-info"><?php echo $related_study['nation'];?>, <?php echo $related_study['year_start'];?></div>
+        <div class="sub-info"><?php echo $nation_year;?></div>
         </div>
     <?php endforeach;?>
 </div>

From 39d5de7a21fbce498ea97615a96906e994df35f5 Mon Sep 17 00:00:00 2001
From: Mehmood Asghar <mah0001@gmail.com>
Date: Thu, 17 Mar 2022 10:45:09 -0400
Subject: [PATCH 20/79] Add subtitles for all data types

---
 .../models/Dataset_geospatial_model.php       | 24 +++++++++++++++++--
 application/models/Dataset_image_model.php    |  4 ++--
 .../models/Dataset_microdata_model.php        | 10 ++++----
 application/models/Dataset_model.php          |  4 ----
 application/models/Dataset_script_model.php   |  3 ++-
 application/models/Dataset_table_model.php    |  3 ++-
 .../models/Dataset_visualization_model.php    |  1 +
 7 files changed, 33 insertions(+), 16 deletions(-)

diff --git a/application/models/Dataset_geospatial_model.php b/application/models/Dataset_geospatial_model.php
index 641586583..ea32b58e5 100644
--- a/application/models/Dataset_geospatial_model.php
+++ b/application/models/Dataset_geospatial_model.php
@@ -54,7 +54,7 @@ function create_dataset($type,$options,$sid=null)
         $options['changed']=date("U");
         
         //fields to be stored as metadata
-        $study_metadata_sections=array('description','tags','provenance','additional');
+        $study_metadata_sections=array('description','provenance','embeddings','lda_topics','tags','additional');
 
         foreach($study_metadata_sections as $section){
 			if(array_key_exists($section,$options)){
@@ -96,6 +96,8 @@ function create_dataset($type,$options,$sid=null)
 		//set aliases
 
 		//set geographic locations (bounding box)
+        $bbox=$this->get_bbox_array($options['metadata']);
+        $this->update_locations($dataset_id, $bbox);
 
 		//complete transaction
 		$this->db->trans_complete();
@@ -177,7 +179,7 @@ function get_core_fields($options)
 
         $output['year_start']=$years['start'];
         $output['year_end']=$years['end'];
-        
+
         return $output;
     }
     
@@ -255,4 +257,22 @@ function update_filters($sid, $metadata)
         $this->Survey_country_model->update_countries($sid,$core_fields['nations']);
     }
 
+
+    function get_bbox_array($metadata)
+    {
+        $bbox_arr=(array)array_data_get($metadata, 'description.identificationInfo.*.extent.geographicElement.*.geographicBoundingBox');
+
+        $bbox=array();
+        foreach($bbox_arr as $row){
+            $bbox[]=array(
+                'north'=>$row['northBoundLatitude'],
+                'south'=>$row['southBoundLatitude'],
+                'east'=>$row['eastBoundLongitude'],
+                'west'=>$row['westBoundLongitude']
+            );
+        }
+
+        return $bbox;
+    }
+
 }
\ No newline at end of file
diff --git a/application/models/Dataset_image_model.php b/application/models/Dataset_image_model.php
index c28156655..8b0cc8df4 100644
--- a/application/models/Dataset_image_model.php
+++ b/application/models/Dataset_image_model.php
@@ -40,7 +40,7 @@ function create_dataset($type,$options)
         }
         
         //fields to be stored as metadata
-        $study_metadata_sections=array('metadata_information','image_description','files','additional');
+        $study_metadata_sections=array('metadata_information','image_description','files','provenance','embeddings','lda_topics','tags','additional');
 
         foreach($study_metadata_sections as $section){		
 			if(array_key_exists($section,$options)){
@@ -114,7 +114,7 @@ function update_dataset($sid,$type,$options, $merge_metadata=false)
         $options['changed']=date("U");
         
         //fields to be stored as metadata
-        $study_metadata_sections=array('metadata_information','image_description','files','additional');
+        $study_metadata_sections=array('metadata_information','image_description','files','provenance','embeddings','lda_topics','tags','additional');
 
         foreach($study_metadata_sections as $section){		
 			if(array_key_exists($section,$options)){
diff --git a/application/models/Dataset_microdata_model.php b/application/models/Dataset_microdata_model.php
index 837b9f353..911091fa1 100644
--- a/application/models/Dataset_microdata_model.php
+++ b/application/models/Dataset_microdata_model.php
@@ -75,7 +75,7 @@ function create_dataset($type,$options, $sid=null,$is_update=false)
 		$variables=null;
         $variable_groups=null;
 
-        $study_metadata_sections=array('doc_desc','study_desc','additional','tags');
+        $study_metadata_sections=array('doc_desc','study_desc','provenance','embeddings','lda_topics','tags','additional');
 
         foreach($study_metadata_sections as $section){		
 			if(array_key_exists($section,$options)){
@@ -469,11 +469,9 @@ function get_core_fields($type,$options)
 	{
 		$output=array();
 
-        $title=array();
-        $title[]=$this->get_array_nested_value($options,'study_desc/title_statement/title');
-        $title[]=$this->get_array_nested_value($options,'study_desc/title_statement/sub_title');
-        $title=array_filter($title);
-        $output['title']=implode(", ",$title);
+        $output['title']=$this->get_array_nested_value($options,'study_desc/title_statement/title');
+        $output['subtitle']=$this->get_array_nested_value($options,'study_desc/title_statement/sub_title');
+        
         $output['idno']=$this->get_array_nested_value($options,'study_desc/title_statement/idno');
 
         $nations=(array)$this->get_array_nested_value($options,'study_desc/study_info/nation');
diff --git a/application/models/Dataset_model.php b/application/models/Dataset_model.php
index 497c0867f..c530ec86a 100644
--- a/application/models/Dataset_model.php
+++ b/application/models/Dataset_model.php
@@ -1854,8 +1854,6 @@ function get_country_names_string($nations)
 
 	function update_locations($sid, $bounds=array())
     {
-		var_dump($bounds);
-
         //delete any existing locations
         $this->db->delete('survey_locations',array('sid' => $sid));
 
@@ -1876,8 +1874,6 @@ function update_locations($sid, $bounds=array())
             $this->db->set('sid',$sid);
             $this->db->set('location','ST_GeomFromText('.$bbox_wkt.')',false);
             $this->db->insert('survey_locations');
-
-			echo $this->db->last_query();
         }
     }
 
diff --git a/application/models/Dataset_script_model.php b/application/models/Dataset_script_model.php
index 45b344f0c..4c492fdc0 100644
--- a/application/models/Dataset_script_model.php
+++ b/application/models/Dataset_script_model.php
@@ -40,7 +40,7 @@ function create_dataset($type,$options)
         }
         
         //fields to be stored as metadata
-        $study_metadata_sections=array('doc_desc','project_desc','additional');
+        $study_metadata_sections=array('doc_desc','project_desc','provenance','embeddings','lda_topics','tags','additional');
 
         $options['metadata']=array();
 
@@ -92,6 +92,7 @@ function get_core_fields($options)
 	{        
         $output=array();
         $output['title']=$this->get_array_nested_value($options,'project_desc/title_statement/title');
+        $output['subtitle']=$this->get_array_nested_value($options,'project_desc/title_statement/sub_title');
         $output['idno']=$this->get_array_nested_value($options,'project_desc/title_statement/idno');
 
         $nations=(array)array_data_get($options, 'project_desc.geographic_units.*.name');        
diff --git a/application/models/Dataset_table_model.php b/application/models/Dataset_table_model.php
index 008a4bd63..a7a321b74 100644
--- a/application/models/Dataset_table_model.php
+++ b/application/models/Dataset_table_model.php
@@ -80,7 +80,7 @@ function create_dataset($type,$options,$sid=null)
 
         
         //fields to be stored as metadata
-        $study_metadata_sections=array('metadata_information','table_description','files','resources','tags','additional');
+        $study_metadata_sections=array('metadata_information','table_description','files','resources','provenance','embeddings','lda_topics','tags','additional');
 
         //external resources
         $external_resources=$this->get_array_nested_value($options,'resources');
@@ -144,6 +144,7 @@ function get_core_fields($options)
 	{        
         $output=array();
         $output['title']=$this->get_array_nested_value($options,'table_description/title_statement/title');
+        $output['subtitle']=$this->get_array_nested_value($options,'table_description/title_statement/sub_title');
         $output['idno']=$this->get_array_nested_value($options,'table_description/title_statement/idno');
 
         $nations=(array)$this->get_array_nested_value($options,'table_description/ref_country');
diff --git a/application/models/Dataset_visualization_model.php b/application/models/Dataset_visualization_model.php
index 47fa04250..4e8e08339 100644
--- a/application/models/Dataset_visualization_model.php
+++ b/application/models/Dataset_visualization_model.php
@@ -89,6 +89,7 @@ function get_core_fields($options)
 	{        
         $output=array();
         $output['title']=$this->get_array_nested_value($options,'visualization_description/title_statement/title');
+        $output['subtitle']=$this->get_array_nested_value($options,'visualization_description/title_statement/sub_title');
         $output['idno']=$this->get_array_nested_value($options,'visualization_description/title_statement/idno');
 
         //todo

From 26ffccae7afa852b94ae806c8fa7f26df1686a0b Mon Sep 17 00:00:00 2001
From: Mehmood Asghar <mah0001@gmail.com>
Date: Fri, 18 Mar 2022 14:54:33 -0400
Subject: [PATCH 21/79] minor fixes for timeseries schema

---
 .../catalog-admin/timeseries-schema.json      | 138 +-----------------
 application/schemas/timeseries-schema.json    | 138 +-----------------
 2 files changed, 2 insertions(+), 274 deletions(-)

diff --git a/api-documentation/catalog-admin/timeseries-schema.json b/api-documentation/catalog-admin/timeseries-schema.json
index b3545b15e..125524f36 100644
--- a/api-documentation/catalog-admin/timeseries-schema.json
+++ b/api-documentation/catalog-admin/timeseries-schema.json
@@ -854,142 +854,6 @@
 						]
 					}
 				},
-				"lda_topics": {
-					"type": "array",
-					"title": "LDA topics",
-					"description": "LDA topics",
-					"items": {
-						"type": "object",
-						"properties": {
-							"model_info": {
-								"type": "array",
-								"title": "Model information",
-								"items": {
-									"type": "object",
-									"properties": {
-										"source": {
-											"title": "Source",
-											"type": "string"
-										},
-										"author": {
-											"title": "Author",
-											"type": "string"
-										},
-										"version": {
-											"title": "Version",
-											"type": "string"
-										},
-										"model_id": {
-											"title": "Model Identifier",
-											"type": "string"
-										},
-										"nb_topics": {
-											"title": "Number of topics",
-											"type": "number"
-										},
-										"description": {
-											"title": "Description",
-											"type": "string"
-										},
-										"corpus": {
-											"title": "Corpus name",
-											"type": "string"
-										},
-										"uri": {
-											"title": "URI",
-											"type": "string"
-										}
-									}
-								},
-								"required": [
-									"model_id"
-								]
-							},
-							"topic_description": {
-								"type": "array",
-								"title": "Topic information",
-								"items": {
-									"type": "object",
-									"properties": {
-										"topic_id": {
-											"title": "Topic identifier",
-											"type": [
-												"integer",
-												"string"
-											]
-										},
-										"topic_score": {
-											"title": "Topic score",
-											"type": [
-												"number",
-												"string"
-											]
-										},
-										"topic_label": {
-											"title": "Topic label",
-											"type": "string"
-										},
-										"topic_words": {
-											"type": "array",
-											"title": "Topic words",
-											"description": "Words",
-											"items": {
-												"type": "object",
-												"properties": {
-													"word": {
-														"title": "Word",
-														"type": "string"
-													},
-													"word_weight": {
-														"title": "Word weight",
-														"type": "number"
-													}
-												}
-											},
-											"required": [
-												"word"
-											]
-										}
-									}
-								},
-								"required": [
-									"topic_id"
-								]
-							}
-						},
-						"additionalProperties": false
-					}
-				},
-				"embeddings": {
-					"type": "array",
-					"title": "Word embeddings",
-					"description": "Word embeddings",
-					"items": {
-						"type": "object",
-						"properties": {
-							"id": {
-								"title": "Vector Model ID",
-								"type": "string"
-							},
-							"description": {
-								"title": "Vector Model Description",
-								"type": "string"
-							},
-							"date": {
-								"title": "Date (YYYY-MM-DD)",
-								"type": "string"
-							},
-							"vector": {
-								"title": "Vector",
-								"type": "object"
-							}
-						}
-					},
-					"required": [
-						"id",
-						"vector"
-					]
-				},
 				"series_groups": {
 					"type": "array",
 					"title": "Series groups",
@@ -1176,7 +1040,7 @@
 				},
 				"vector": {
 				  "title": "Vector",
-				  "type": "object"
+				  "type": ["object","array"]
 				}
 			  },
 			  "required": [
diff --git a/application/schemas/timeseries-schema.json b/application/schemas/timeseries-schema.json
index b3545b15e..125524f36 100644
--- a/application/schemas/timeseries-schema.json
+++ b/application/schemas/timeseries-schema.json
@@ -854,142 +854,6 @@
 						]
 					}
 				},
-				"lda_topics": {
-					"type": "array",
-					"title": "LDA topics",
-					"description": "LDA topics",
-					"items": {
-						"type": "object",
-						"properties": {
-							"model_info": {
-								"type": "array",
-								"title": "Model information",
-								"items": {
-									"type": "object",
-									"properties": {
-										"source": {
-											"title": "Source",
-											"type": "string"
-										},
-										"author": {
-											"title": "Author",
-											"type": "string"
-										},
-										"version": {
-											"title": "Version",
-											"type": "string"
-										},
-										"model_id": {
-											"title": "Model Identifier",
-											"type": "string"
-										},
-										"nb_topics": {
-											"title": "Number of topics",
-											"type": "number"
-										},
-										"description": {
-											"title": "Description",
-											"type": "string"
-										},
-										"corpus": {
-											"title": "Corpus name",
-											"type": "string"
-										},
-										"uri": {
-											"title": "URI",
-											"type": "string"
-										}
-									}
-								},
-								"required": [
-									"model_id"
-								]
-							},
-							"topic_description": {
-								"type": "array",
-								"title": "Topic information",
-								"items": {
-									"type": "object",
-									"properties": {
-										"topic_id": {
-											"title": "Topic identifier",
-											"type": [
-												"integer",
-												"string"
-											]
-										},
-										"topic_score": {
-											"title": "Topic score",
-											"type": [
-												"number",
-												"string"
-											]
-										},
-										"topic_label": {
-											"title": "Topic label",
-											"type": "string"
-										},
-										"topic_words": {
-											"type": "array",
-											"title": "Topic words",
-											"description": "Words",
-											"items": {
-												"type": "object",
-												"properties": {
-													"word": {
-														"title": "Word",
-														"type": "string"
-													},
-													"word_weight": {
-														"title": "Word weight",
-														"type": "number"
-													}
-												}
-											},
-											"required": [
-												"word"
-											]
-										}
-									}
-								},
-								"required": [
-									"topic_id"
-								]
-							}
-						},
-						"additionalProperties": false
-					}
-				},
-				"embeddings": {
-					"type": "array",
-					"title": "Word embeddings",
-					"description": "Word embeddings",
-					"items": {
-						"type": "object",
-						"properties": {
-							"id": {
-								"title": "Vector Model ID",
-								"type": "string"
-							},
-							"description": {
-								"title": "Vector Model Description",
-								"type": "string"
-							},
-							"date": {
-								"title": "Date (YYYY-MM-DD)",
-								"type": "string"
-							},
-							"vector": {
-								"title": "Vector",
-								"type": "object"
-							}
-						}
-					},
-					"required": [
-						"id",
-						"vector"
-					]
-				},
 				"series_groups": {
 					"type": "array",
 					"title": "Series groups",
@@ -1176,7 +1040,7 @@
 				},
 				"vector": {
 				  "title": "Vector",
-				  "type": "object"
+				  "type": ["object","array"]
 				}
 			  },
 			  "required": [

From 69b411d1f988f18f4febf46b3f87faaa81be82d7 Mon Sep 17 00:00:00 2001
From: Mehmood Asghar <mah0001@gmail.com>
Date: Fri, 18 Mar 2022 14:59:24 -0400
Subject: [PATCH 22/79] rename metadata_creation to metadata_information for
 timeseries

---
 api-documentation/catalog-admin/timeseries-schema.json | 2 +-
 application/schemas/timeseries-schema.json             | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/api-documentation/catalog-admin/timeseries-schema.json b/api-documentation/catalog-admin/timeseries-schema.json
index 125524f36..2dd7edf2d 100644
--- a/api-documentation/catalog-admin/timeseries-schema.json
+++ b/api-documentation/catalog-admin/timeseries-schema.json
@@ -44,7 +44,7 @@
 			],
 			"default": "no"
 		},
-		"metadata_creation": {
+		"metadata_information": {
 			"type": "object",
 			"title": "Metadata creation",
 			"description": "Information on who generated the documentation",
diff --git a/application/schemas/timeseries-schema.json b/application/schemas/timeseries-schema.json
index 125524f36..2dd7edf2d 100644
--- a/application/schemas/timeseries-schema.json
+++ b/application/schemas/timeseries-schema.json
@@ -44,7 +44,7 @@
 			],
 			"default": "no"
 		},
-		"metadata_creation": {
+		"metadata_information": {
 			"type": "object",
 			"title": "Metadata creation",
 			"description": "Information on who generated the documentation",

From 73d495c1d1478e55390974c1cf83024b2cffa567 Mon Sep 17 00:00:00 2001
From: Mehmood Asghar <mah0001@gmail.com>
Date: Fri, 18 Mar 2022 15:39:42 -0400
Subject: [PATCH 23/79] minor

---
 .../catalog-admin/timeseries-db-schema.json              | 9 ++++++++-
 application/models/Dataset_timeseries_model.php          | 3 ++-
 application/schemas/timeseries-db-schema.json            | 2 +-
 3 files changed, 11 insertions(+), 3 deletions(-)

diff --git a/api-documentation/catalog-admin/timeseries-db-schema.json b/api-documentation/catalog-admin/timeseries-db-schema.json
index 83ef8a63b..be19fb3a4 100644
--- a/api-documentation/catalog-admin/timeseries-db-schema.json
+++ b/api-documentation/catalog-admin/timeseries-db-schema.json
@@ -538,7 +538,7 @@
 						"name"
 					]
 				},
-				"acknowledgement_statement": {
+				"acknowledgment_statement": {
 					"title": "An overall statement of acknowledgment, which can be used as an alternative (or supplement) to the itemized list provided in `acknowledgments`.",
 					"type": "string"
 				},
@@ -706,6 +706,13 @@
 			],
 			"additionalProperties": false
 		},
+		"provenance": {
+			"type": "array",
+			"description": "Provenance",
+			"items": {
+				"$ref": "provenance-schema.json"
+			}
+		},
 		"additional": {
 			"type": "object",
 			"title": "Additional custom metadata",
diff --git a/application/models/Dataset_timeseries_model.php b/application/models/Dataset_timeseries_model.php
index 3fe424024..d0b4f495f 100644
--- a/application/models/Dataset_timeseries_model.php
+++ b/application/models/Dataset_timeseries_model.php
@@ -78,7 +78,8 @@ function create_dataset($type,$options, $sid=null)
 
         $options['changed']=date("U");
         
-        $study_metadata_sections=array('metadata_creation','series_description','additional','tags');
+        $study_metadata_sections=array('metadata_creation','series_description','provenance','embeddings','lda_topics','tags','additional');
+        
 
         foreach($study_metadata_sections as $section){		
 			if(array_key_exists($section,$options)){
diff --git a/application/schemas/timeseries-db-schema.json b/application/schemas/timeseries-db-schema.json
index 83ef8a63b..13242fe97 100644
--- a/application/schemas/timeseries-db-schema.json
+++ b/application/schemas/timeseries-db-schema.json
@@ -538,7 +538,7 @@
 						"name"
 					]
 				},
-				"acknowledgement_statement": {
+				"acknowledgment_statement": {
 					"title": "An overall statement of acknowledgment, which can be used as an alternative (or supplement) to the itemized list provided in `acknowledgments`.",
 					"type": "string"
 				},

From 3c506660c82a9c0b30d0cb38a8502a3f22223f50 Mon Sep 17 00:00:00 2001
From: Mehmood Asghar <mah0001@gmail.com>
Date: Fri, 18 Mar 2022 15:40:19 -0400
Subject: [PATCH 24/79] misc template changes

---
 .../metadata_templates/document-template.php  |  2 +-
 .../timeseries-template.php                   | 70 ++++++++++---------
 .../timeseriesdb-template.php                 | 20 +++---
 3 files changed, 51 insertions(+), 41 deletions(-)

diff --git a/application/views/metadata_templates/document-template.php b/application/views/metadata_templates/document-template.php
index c96a214f0..204872273 100644
--- a/application/views/metadata_templates/document-template.php
+++ b/application/views/metadata_templates/document-template.php
@@ -100,7 +100,7 @@
 
     <?php $output['contributors']= render_group('contributors',
         $fields=array(            
-            "metadata.document_description.creator"=>"text",            
+            "metadata.document_description.creator"=>"text",
             "metadata.document_description.translators"=>"array",
             "metadata.document_description.contributors"=>"array",
             "metadata.document_description.contacts"=>"array"            
diff --git a/application/views/metadata_templates/timeseries-template.php b/application/views/metadata_templates/timeseries-template.php
index 62c9ca3f9..156c1d727 100644
--- a/application/views/metadata_templates/timeseries-template.php
+++ b/application/views/metadata_templates/timeseries-template.php
@@ -26,55 +26,51 @@
 <?php $output['overview']= render_group('overview',
     $fields=array(
         "metadata.series_description.idno"=>"text",
+        "metadata.series_description.doi"=>"text",
         "metadata.series_description.name"=>"text",
         "metadata.series_description.database_id"=>"text",
-        "metadata.series_description.aliases"=>"array",        
+        "metadata.series_description.aliases"=>"array",
+        "metadata.series_description.alternate_identifiers"=>"array",        
+        "metadata.series_description.languages"=>"array",
+        "metadata.series_description.dimensions"=>"array",
         "metadata.series_description.measurement_unit"=>"text",
         "metadata.series_description.periodicity"=>"text",
         "metadata.series_description.base_period"=>"text",
-        "metadata.iframe_embeds"=>'iframe_embed',        
+        "metadata.iframe_embeds"=>'iframe_embed',
         "metadata.series_description.definition_short"=>"text",
         "metadata.series_description.definition_long"=>"text",
         "metadata.series_description.definition_references"=>"array",
         "metadata.series_description.concepts"=>"array",
-        "metadata.series_description.concepts.name"=>"text",
-        "metadata.series_description.concepts.definition"=>"text",
-        "metadata.series_description.concepts.uri"=>"text",
         "metadata.series_description.methodology"=>"text",
         "metadata.series_description.imputation"=>"text",
+        "metadata.series_description.missing"=>"text",
         "metadata.series_description.quality_checks"=>"text",
         "metadata.series_description.quality_note"=>"text",
+        "metadata.series_description.sources_discrepancies"=>"text",        
         "metadata.series_description.series_break"=>"text",
         "metadata.series_description.limitation"=>"text",
-        "metadata.series_description.themes"=>"array",
-        "metadata.series_description.themes.name"=>"text",
-        "metadata.series_description.themes.vocabulary"=>"text",
-        "metadata.series_description.themes.uri"=>"text",
+        "metadata.series_description.themes"=>"array",        
         "metadata.series_description.topics"=>"array",
-        "metadata.series_description.topics.id"=>"text",
-        "metadata.series_description.topics.name"=>"text",
-        "metadata.series_description.topics.parent_id"=>"text",
-        "metadata.series_description.topics.vocabulary"=>"text",
-        "metadata.series_description.topics.uri"=>"text",
         "metadata.series_description.disciplines"=>"array",
-        "metadata.series_description.disciplines.name"=>"text",
-        "metadata.series_description.disciplines.vocabulary"=>"text",
-        "metadata.series_description.disciplines.uri"=>"text",
         "metadata.series_description.relevance"=>"text",
         "metadata.series_description.time_periods"=>"array",
-        "metadata.series_description.time_periods.start"=>"text",
-        "metadata.series_description.time_periods.end"=>"text",
+        "metadata.series_description.ref_country"=>"array",
 
         "metadata.series_description.aggregation_method"=>"text",
+        "metadata.series_description.disaggregation"=>"text",
+
+
+        "metadata.series_description.authoring_entity"=>"array",
+
         "metadata.series_description.sources"=>"array",
-        "metadata.series_description.source_notes"=>"text",
+        "metadata.series_description.sources_note"=>"text",
         "metadata.series_description.keywords"=>"array",
+        "metadata.series_description.acronyms"=>"array",
         "metadata.series_description.notes"=>"array",
-        "metadata.series_description.related_indicators"=>"array",
-        "metadata.series_description.related_indicators.code"=>"text",
-        "metadata.series_description.related_indicators.label"=>"text",
-        "metadata.series_description.related_indicators.uri"=>"text",
+        
+        "metadata.series_description.related_indicators"=>"array",        
         "metadata.series_description.compliance"=>"array",
+        "metadata.series_description.framework"=>"array",
         "metadata.series_description.series_groups"=>"array",
         "metadata.additional"=>"object"        
     ),
@@ -103,9 +99,7 @@
 <?php $output['geographic_units']= render_group('geographic_units',
     $fields=array(
         "metadata.series_description.geographic_units"=>"array",
-        "metadata.series_description.geographic_units.name"=>"text",
-        "metadata.series_description.geographic_units.code"=>"text",
-        "metadata.series_description.geographic_units.type"=>"text",
+        "metadata.series_description.bbox"=>"bounding_box",
     ),
     $metadata);
 ?>
@@ -113,8 +107,7 @@
 
 <?php $output['license_rights']= render_group('license_rights',
     $fields=array(
-        "metadata.series_description.license.name"=>"text",
-        "metadata.series_description.license.uri"=>"text",
+        "metadata.series_description.license"=>"array",
         "metadata.series_description.confidentiality"=>"text",
         "metadata.series_description.confidentiality_status"=>"text",
         "metadata.series_description.confidentiality_note"=>"text",
@@ -122,15 +115,28 @@
     $metadata);
 ?>
 
+<?php $output['lda_topics']= render_group('lda_topics',
+        $fields=array(  
+        "metadata.lda_topics"=>"lda_topics",
+        "metadata.lda_topics.model_info"=>"array",
+        "metadata.lda_topics.topic_description"=>"array",
+        "metadata.lda_topics.topic_description.topic_words.word"=>"text",
+        "metadata.embeddings"=>"array",
+        "metadata.additional"=>"dump",
+    ),
+    $metadata);
+?>
         
 
 
 
 <?php $output['metadata_production']= render_group('metadata_production',
     $fields=array(
-        "metadata.metadata_creation.producers"=>"array",
-        "metadata.metadata_creation.prod_date"=>"text",
-        "metadata.metadata_creation.version"=>"text",
+        "metadata.metadata_information.title"=>"text",
+        "metadata.metadata_information.idno"=>"text",
+        "metadata.metadata_information.producers"=>"array",
+        "metadata.metadata_information.prod_date"=>"text",
+        "metadata.metadata_information.version"=>"text",
     ),
     $metadata);
 ?>
diff --git a/application/views/metadata_templates/timeseriesdb-template.php b/application/views/metadata_templates/timeseriesdb-template.php
index 228af3ca3..02b02d20c 100644
--- a/application/views/metadata_templates/timeseriesdb-template.php
+++ b/application/views/metadata_templates/timeseriesdb-template.php
@@ -19,12 +19,13 @@
 <!-- identification section -->
 <?php $output['overview']= render_group('',
     $fields=array(
-        "metadata.database_description.title_statement.title"=>"text",        
+        "metadata.database_description.title_statement.title"=>"text",
         "metadata.database_description.title_statement.sub_title"=>"text",
         "metadata.database_description.title_statement.alternate_title"=>"text",
         "metadata.database_description.title_statement.translated_title"=>"text",
 
         "metadata.database_description.title_statement.idno"=>"text",
+        "metadata.database_description.identifiers"=>"array",
 
         "metadata.database_description.authoring_entity"=>"array",
         "metadata.database_description.abstract"=>"text",
@@ -38,22 +39,23 @@
         "metadata.database_description.update_frequency"=>"text",
         "metadata.database_description.update_schedule"=>"array",
 
-        "metadata.database_description.time_coverage"=>"text",
+        "metadata.database_description.time_coverage"=>"array",
         "metadata.database_description.time_coverage_note"=>"text",
+
         "metadata.database_description.periodicity"=>"array",
         "metadata.database_description.themes"=>"array",
         "metadata.database_description.topics"=>"array",
         "metadata.database_description.keywords"=>"array",
+        "metadata.database_description.ref_country"=>"array",
         "metadata.database_description.geographic_units"=>"array",
-
         "metadata.database_description.geographic_coverage_note"=>"text",
-        "metadata.database_description.bbox"=>"array",
+        "metadata.database_description.bbox"=>"bounding_box",
         "metadata.database_description.geographic_granularity"=>"text",
         "metadata.database_description.geographic_area_count"=>"text",
         "metadata.database_description.sponsors"=>"array",
         "metadata.database_description.acknowledgments"=>"array",
+        "metadata.database_description.acknowledgment_statement"=>"text",
         "metadata.database_description.contacts"=>"array",
-
         "metadata.database_description.links"=>"array",
         "metadata.database_description.languages"=>"array",
         "metadata.database_description.access_options"=>"array",
@@ -73,9 +75,11 @@
 
 <?php $output['metadata_production']= render_group('metadata_production',
     $fields=array(
-        "metadata.metadata_creation.producers"=>"array",
-        "metadata.metadata_creation.prod_date"=>"text",
-        "metadata.metadata_creation.version"=>"text",
+        "metadata.metadata_information.title"=>"text",
+        "metadata.metadata_information.idno"=>"text",
+        "metadata.metadata_information.producers"=>"array",
+        "metadata.metadata_information.prod_date"=>"text",
+        "metadata.metadata_information.version"=>"text",
     ),
     $metadata);
 ?>

From bf63ba43ff425be22a8463d6dcd3b5cd35b632c0 Mon Sep 17 00:00:00 2001
From: Mehmood Asghar <mah0001@gmail.com>
Date: Tue, 22 Mar 2022 16:25:05 -0400
Subject: [PATCH 25/79] show subtitle for latest studies list on home page

---
 application/models/Stats_model.php            |  2 +-
 .../views/static/recent_studies_list.php      | 58 +++++++++++++------
 2 files changed, 41 insertions(+), 19 deletions(-)

diff --git a/application/models/Stats_model.php b/application/models/Stats_model.php
index c2219068f..b6638bd5f 100644
--- a/application/models/Stats_model.php
+++ b/application/models/Stats_model.php
@@ -40,7 +40,7 @@ function get_popular_surveys($limit=10)
 	
 	function get_latest_surveys($limit=10,$repositoryid=null)
 	{
-		$this->db->select("surveys.id,surveys.type,surveys.title,surveys.nation,surveys.authoring_entity,forms.model as form_model,surveys.created, surveys.changed");
+		$this->db->select("surveys.id,surveys.type,surveys.title,surveys.subtitle,surveys.nation,surveys.authoring_entity,forms.model as form_model,surveys.created, surveys.changed");
 		$this->db->join("forms", "surveys.formid=forms.formid","left");
 		$this->db->where("surveys.published", 1); 
 		$this->db->order_by("surveys.changed", "desc"); 
diff --git a/application/views/static/recent_studies_list.php b/application/views/static/recent_studies_list.php
index a6081afe7..b067cba63 100644
--- a/application/views/static/recent_studies_list.php
+++ b/application/views/static/recent_studies_list.php
@@ -3,6 +3,15 @@
         margin-bottom:0px;
     }
     .survey-row{padding-bottom:0px;}
+    .study-subtitle{
+        font-size:smaller;
+    }
+    .study-type-icon{
+        width:36px;
+    }
+    .survey-row{
+        padding:10px 5px;
+    }
 </style>
 <?php
 
@@ -34,27 +43,40 @@
 
         <div class="survey-row recent-studies-list-home border-bottom">
             <div class="row">
-                <div class="col-12 col-lg-12">                    
-                    <h5>
-                    <a href="<?php echo site_url(); ?>/catalog/<?php echo $row['id']; ?>"  title="<?php echo $row['title']; ?>" >
-                        <?php if(isset($row['type'])):?>
-                            <i title="<?php echo $row['type'];?>" class="fa <?php echo $type_icons[$row['type']];?> fa-nada-icon wb-title-icon"></i>    
-                        <?php endif;?>                        
-                            <?php echo $row['title'];?>
-                        </a>
-                    </h5>
+                <div class="col-12 col-lg-12">
+                                
+                    <div class="d-flex flex-row ">
 
-                    <?php if($row['nation'] && $regional_search===true) :?>
-                        <strong><?php echo $row['nation'];?></strong>
-                    <?php endif;?>
+                        <div class="study-type-icon">
+                            <?php if(isset($row['type'])):?>
+                                <i title="<?php echo $row['type'];?>" class="fa <?php echo $type_icons[$row['type']];?> fa-nada-icon wb-title-icon"></i>    
+                            <?php endif;?>                    
+                        </div>
+                        <div>                        
+                            <h5><a href="<?php echo site_url(); ?>/catalog/<?php echo $row['id']; ?>"  title="<?php echo $row['title']; ?>" >
+                                <span class="study-title"><?php echo $row['title'];?>
+                                    <?php if(isset($row['subtitle'])):?>
+                                        <div class="study-subtitle"><?php echo $row['subtitle'];?></div>
+                                    <?php endif;?>
+                                </span>
+                                </a>
+                            </h5>
+                            
+                            <div>
+                                <?php if($row['nation'] && $regional_search===true) :?>
+                                    <strong><?php echo $row['nation'];?></strong>
+                                <?php endif;?>
 
-                    <?php if (isset($row['authoring_entity']) && $row['authoring_entity']!=''):?>
-                        <div class="sub-title"><?php echo $row['authoring_entity'];?></div>
-                    <?php endif;?>
+                                <?php if (isset($row['authoring_entity']) && $row['authoring_entity']!=''):?>
+                                    <div class="sub-title"><?php echo $row['authoring_entity'];?></div>
+                                <?php endif;?>
 
-                    <div class="survey-stats">                        
-                        <span><?php echo date("M d, Y",$row['changed']);?></span>
-                    </div>
+                                <div class="survey-stats">                        
+                                    <span><?php echo date("M d, Y",$row['changed']);?></span>
+                                </div>
+                            </div>
+                        </div>
+                    </div>                        
                 </div>
             </div>
         </div>

From 718adef3935a7af3b568a4713b13b2811183d04b Mon Sep 17 00:00:00 2001
From: Mehmood Asghar <mah0001@gmail.com>
Date: Tue, 22 Mar 2022 16:25:51 -0400
Subject: [PATCH 26/79] update display for document template

---
 application/helpers/metadata_view_helper.php  | 26 ++++++-
 .../language/english/fields_document_lang.php |  2 +-
 .../metadata_templates/document-template.php  | 75 +++++++++----------
 3 files changed, 62 insertions(+), 41 deletions(-)

diff --git a/application/helpers/metadata_view_helper.php b/application/helpers/metadata_view_helper.php
index 37b590ac9..c67579c4c 100644
--- a/application/helpers/metadata_view_helper.php
+++ b/application/helpers/metadata_view_helper.php
@@ -118,6 +118,30 @@ function render_group($name, $fields, $metadata,$options=array())
 	}
 }
 
+
+if ( ! function_exists('render_group_array'))
+{
+	function render_group_array($name, $fields, $metadata,$options=array())
+	{
+		$ci =& get_instance();
+
+		$output=[];
+		foreach($fields as $field_name=>$field_type){
+			$value=get_field_value($field_name,$metadata);
+			//$field_options=isset($field_type['options'])
+			if (is_array($field_type)){
+				$output[$field_name]= render_field($field_type[0],$field_name,$value,$options=$field_type['options']);
+			}
+			else{
+				$output[$field_name]= render_field($field_type,$field_name,$value,$options);
+			}
+		}
+    
+		return $output;
+	}
+}
+
+
 if ( ! function_exists('render_group_text'))
 {
 	function render_group_text($section_name, $html)
@@ -134,7 +158,7 @@ function render_group_text($section_name, $html)
 
 
 
-if ( ! function_exists('render_columns'))
+if ( ! function_exists('render_columns')) 
 {
 	function render_columns($name, $fields, $metadata,$options=array())
 	{
diff --git a/application/language/english/fields_document_lang.php b/application/language/english/fields_document_lang.php
index 30faa5600..248d14de5 100644
--- a/application/language/english/fields_document_lang.php
+++ b/application/language/english/fields_document_lang.php
@@ -166,7 +166,7 @@
 $lang['metadata.document_description.location']='Location(s)';
 $lang['metadata.document_description.location.name']='Name';
 $lang['metadata.document_description.location.uri']='URI';
-$lang['metadata.document_description.mandate']='Audience';
+$lang['metadata.document_description.mandate']='Mandate';
 $lang['metadata.document_description.pricing']='Pricing';
 $lang['metadata.document_description.relations']='Document relations';
 $lang['metadata.document_description.relations.name']='Name';
diff --git a/application/views/metadata_templates/document-template.php b/application/views/metadata_templates/document-template.php
index 204872273..ac1f363d2 100644
--- a/application/views/metadata_templates/document-template.php
+++ b/application/views/metadata_templates/document-template.php
@@ -25,45 +25,42 @@
     $output=array();
 ?>
 
+<!-- description -->
+<?php 
+    $description= array(
+        render_field("text","title",get_field_value("metadata.document_description.title_statement.title",$metadata)),
+        render_field("text","subtitle",get_field_value("metadata.document_description.title_statement.sub_title",$metadata)),
+        render_field("text","alternate_title",get_field_value("metadata.document_description.title_statement.alternate_title",$metadata)),
+        render_field("text","translated_title",get_field_value("metadata.document_description.title_statement.translated_title",$metadata)),
+
+        render_columns("",
+            $fields=array(
+                "metadata.document_description.date_created"=>"text",
+                "metadata.document_description.date_available"=>"text",
+                "metadata.document_description.date_published"=>"text",
+                "metadata.document_description.date_modified"=>"text"
+            ),
+        $metadata),
+                    
+        render_field("array","metadata.document_description.authors",get_field_value("metadata.document_description.authors",$metadata)),
+        render_field("array","metadata.document_description.editors",get_field_value("metadata.document_description.editors",$metadata)),
+        render_field("text","metadata.document_description.type",get_field_value("metadata.document_description.type",$metadata)),
+        render_field("text","metadata.document_description.publication_frequency",get_field_value("metadata.document_description.publication_frequency",$metadata)),
+        render_field("text","metadata.document_description.series",get_field_value("metadata.document_description.series",$metadata)),
+        render_field("text","metadata.document_description.status",get_field_value("metadata.document_description.status",$metadata)),
+        render_field("text","metadata.document_description.abstract",get_field_value("metadata.document_description.abstract",$metadata)),
+        render_field("text","metadata.document_description.description",get_field_value("metadata.document_description.description",$metadata)),
+        render_field("text","metadata.document_description.audience",get_field_value("metadata.document_description.audience",$metadata)),
+        render_field("text","metadata.document_description.mandate",get_field_value("metadata.document_description.mandate",$metadata)),
+        render_field("text","metadata.document_description.title_statement.idno",get_field_value("metadata.document_description.title_statement.idno",$metadata)),
+        render_field("array","metadata.document_description.identifiers",get_field_value("metadata.document_description.identifiers",$metadata)),
+        render_field("array","metadata.document_description.languages",get_field_value("metadata.document_description.languages",$metadata)),        
+        render_field("resources","metadata.resources",get_field_value("metadata.resources",$metadata))
+    );
+
+    $output["dscription"]=render_group_text ("description",implode("",$description));
 
-<!-- identification section -->
-<?php $output['description']= render_group('description',
-    $fields=array(
-        "metadata.document_description.title_statement.title"=>"text",
-        "metadata.document_description.title_statement.sub_title"=>"text",
-        "metadata.document_description.title_statement.alternate_title"=>"text",
-        "metadata.document_description.title_statement.translated_title"=>"text",
-
-
-        "metadata.document_description.date_created"=>"text",
-        "metadata.document_description.date_available"=>"text",
-        "metadata.document_description.date_published"=>"text",
-        "metadata.document_description.date_modified"=>"text",
-
-
-        "metadata.document_description.authors"=>"array",
-        "metadata.document_description.editors"=>"array",
-        "metadata.document_description.type"=>"text",
-        "metadata.document_description.publication_frequency"=>"text",
-        "metadata.document_description.series"=>"text",
-        "metadata.document_description.status"=>"text",
-        "metadata.document_description.abstract"=>"text",
-        "metadata.document_description.description"=>"text",
-
-        "metadata.document_description.audience"=>"text",
-        "metadata.document_description.mandate"=>"text",
-
-        "metadata.document_description.title_statement.idno"=>"text",
-        "metadata.document_description.identifiers"=>"array",
-
-        "metadata.document_description.languages"=>"array",
-        
-        "metadata.resources"=>'resources',
-    ),
-    $metadata);
-    ?>
-
- 
+?>
 
 <?php $output['scope and coverage']= render_group('scope and coverage',
     $fields=array(
@@ -77,7 +74,7 @@
         "metadata.document_description.toc_structured"=>"array",
 
         "metadata.document_description.keywords"=>"array",
-        "metadata.tags"=>"array_comma",
+        "metadata.tags"=>"tags",
         "metadata.document_description.topics"=>"array",
         "metadata.document_description.themes"=>"array",
         "metadata.document_description.disciplines"=>"array",

From fbc1c191af1c90a4d1c296385d66f1f997e72733 Mon Sep 17 00:00:00 2001
From: Mehmood Asghar <mah0001@gmail.com>
Date: Wed, 23 Mar 2022 15:25:33 -0400
Subject: [PATCH 27/79] Sort resources by date and title

---
 application/controllers/api/Resources.php    | 8 +-------
 application/models/Survey_resource_model.php | 5 ++++-
 2 files changed, 5 insertions(+), 8 deletions(-)

diff --git a/application/controllers/api/Resources.php b/application/controllers/api/Resources.php
index aa3d2e994..52b6cceb5 100644
--- a/application/controllers/api/Resources.php
+++ b/application/controllers/api/Resources.php
@@ -311,14 +311,8 @@ public function import_rdf_post($idno=NULL)
 			$sid=$this->get_sid_from_idno($idno);
 			$this->has_dataset_access('edit',$sid);
 
-			$result=$this->Survey_resource_model->upload_rdf($tmp_path=null,'file');
-			$uploaded_file_name=$result['file_name'];
-			$uploaded_path=$result['full_path'];
-
-			//import entries
+			$uploaded_path=$this->Survey_resource_model->upload_rdf($tmp_path=null,'file');
 			$imported_count=$this->Survey_resource_model->import_rdf($sid,$uploaded_path);
-
-			//delete rdf
 			@unlink($uploaded_path);
 
 			$output=array(
diff --git a/application/models/Survey_resource_model.php b/application/models/Survey_resource_model.php
index d8141ae7f..aaedc4ff1 100644
--- a/application/models/Survey_resource_model.php
+++ b/application/models/Survey_resource_model.php
@@ -28,6 +28,7 @@ public function __construct()
 		parent::__construct();
 		$this->load->model("Dataset_model");
 		$this->load->model("Catalog_model");
+		$this->load->library('upload');
 		//$this->output->enable_profiler(TRUE);
     }
 	
@@ -653,7 +654,9 @@ function is_microdata_resource($dctype)
 	function get_microdata_resources($surveyid)
 	{
 		$this->db->select('*');
-		$this->db->where("survey_id=$surveyid AND (dctype like '%dat/micro]%' OR dctype like '%dat]%' OR dctype like '%[dat/%')",NULL,FALSE);
+		$this->db->where("survey_id=$surveyid AND (dctype like '%dat/micro]%' OR dctype like '%dat]%' OR dctype like '%[dat/%')",NULL,FALSE);		
+		$this->db->order_by("dcdate","desc");
+		$this->db->order_by("title","asc");
 		return $this->db->get('resources')->result_array();
 	}
 	

From d3b911be4564f70a73fc2a2198dd14ddeb0e8a8b Mon Sep 17 00:00:00 2001
From: Mehmood Asghar <mah0001@gmail.com>
Date: Thu, 24 Mar 2022 09:57:57 -0400
Subject: [PATCH 28/79] minor

---
 application/models/Survey_resource_model.php | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/application/models/Survey_resource_model.php b/application/models/Survey_resource_model.php
index aaedc4ff1..997a94648 100644
--- a/application/models/Survey_resource_model.php
+++ b/application/models/Survey_resource_model.php
@@ -28,7 +28,6 @@ public function __construct()
 		parent::__construct();
 		$this->load->model("Dataset_model");
 		$this->load->model("Catalog_model");
-		$this->load->library('upload');
 		//$this->output->enable_profiler(TRUE);
     }
 	
@@ -1222,7 +1221,7 @@ function upload_rdf($tmp_path,$file_field='file')
 		$config['encrypt_name']=TRUE;
 		$config['allowed_types'] = 'rdf|xml';
 
-		$this->upload->initialize($config);
+		$this->load->library('upload', $config);
 
 		//process uploaded rdf file
 		$rdf_upload_result=$this->upload->do_upload($file_field);

From 6a5a914b393765cb80a0ebf646dd4648cd534e9a Mon Sep 17 00:00:00 2001
From: Mehmood Asghar <mah0001@gmail.com>
Date: Fri, 25 Mar 2022 13:22:09 -0400
Subject: [PATCH 29/79] minor

---
 application/models/Data_table_mongo_model.php | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/application/models/Data_table_mongo_model.php b/application/models/Data_table_mongo_model.php
index 88c2b17a6..12c053c73 100644
--- a/application/models/Data_table_mongo_model.php
+++ b/application/models/Data_table_mongo_model.php
@@ -693,6 +693,13 @@ function parse_filter_value($value)
                 );
                 continue;
             }
+            if (substr($val,0,4)=='&lt;' && is_numeric(substr($val,4))){
+                $output[]=array(
+                    'type'=>'lte',
+                    'value'=>substr($val,4)
+                );
+                continue;
+            }
             
             $range=explode("-",$val);
 

From cc7af318a43255035080d8ba76137a3eccccc5ba Mon Sep 17 00:00:00 2001
From: Mehmood Asghar <mah0001@gmail.com>
Date: Tue, 29 Mar 2022 11:32:06 -0400
Subject: [PATCH 30/79] minor fixes for data access white listing feature

---
 application/controllers/Study.php                    | 12 +++++++-----
 .../controllers/admin/Dataaccess_whitelist.php       |  9 +++++++--
 application/models/Data_access_whitelist_model.php   |  1 +
 3 files changed, 15 insertions(+), 7 deletions(-)

diff --git a/application/controllers/Study.php b/application/controllers/Study.php
index 7a18b4305..b662a48e2 100644
--- a/application/controllers/Study.php
+++ b/application/controllers/Study.php
@@ -329,12 +329,14 @@ public function get_microdata($sid)
 			$content="Data Access Not Available";
 		}
 
-		$user=$this->ion_auth->current_user();		
-		$this->load->model("Data_access_whitelist_model");
-		$user_whitelisted=$this->Data_access_whitelist_model->has_access($user->id,$sid);
+		$user=$this->ion_auth->current_user();
+		
+		if($user){
+			$user_whitelisted=$this->Data_access_whitelist_model->has_access($user->id,$sid);
 
-		if($user_whitelisted){
-			$content=$this->Data_access_whitelist_model->get_data_files($sid);
+			if($user_whitelisted){
+				$content=$this->Data_access_whitelist_model->get_data_files($sid);
+			}
 		}
 
 		$this->render_page($sid, $content,'get_microdata');
diff --git a/application/controllers/admin/Dataaccess_whitelist.php b/application/controllers/admin/Dataaccess_whitelist.php
index d1b4a1804..f3c7226d2 100644
--- a/application/controllers/admin/Dataaccess_whitelist.php
+++ b/application/controllers/admin/Dataaccess_whitelist.php
@@ -38,8 +38,13 @@ function create()
     		redirect("admin/dataaccess_whitelist","refresh");        
         }
 
-        $result=$this->Data_access_whitelist_model->insert($repository_id,$user_id);
-        
+        try{
+            $result=$this->Data_access_whitelist_model->insert($repository_id,$user_id);
+        }
+        catch(Exception $e){
+            $this->session->set_flashdata('error', $e->getMessage());
+		    redirect("admin/dataaccess_whitelist","refresh");
+        }
         $this->session->set_flashdata('message', t('form_update_success'));
 		redirect("admin/dataaccess_whitelist","refresh");        
     }
diff --git a/application/models/Data_access_whitelist_model.php b/application/models/Data_access_whitelist_model.php
index feef90d0b..f00423f8f 100644
--- a/application/models/Data_access_whitelist_model.php
+++ b/application/models/Data_access_whitelist_model.php
@@ -81,6 +81,7 @@ function row_exists($repository_id,$user_id)
 	{
 		$this->db->select("*");
 		$this->db->where('repository_id', $repository_id); 
+		$this->db->where('user_id', $user_id); 
 		$result=$this->db->get("data_access_whitelist")->result_array(); 
 
 		if ($result)

From 576eb95d1417f0e5379f973bd55422f7f331d318 Mon Sep 17 00:00:00 2001
From: Mehmood Asghar <mah0001@gmail.com>
Date: Tue, 29 Mar 2022 14:47:13 -0400
Subject: [PATCH 31/79] Update .htaccess with security headers

---
 .htaccess | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/.htaccess b/.htaccess
index eee07900b..6cb557cb8 100644
--- a/.htaccess
+++ b/.htaccess
@@ -1,2 +1,11 @@
 Options -Indexes
 
+<ifModule mod_headers.c>
+    Header set X-Frame-Options "SAMEORIGIN"
+    Header set X-XSS-Protection "1; mode=block"
+    Header set X-Content-Type-Options "nosniff"
+    Header set Referrer-Policy "same-origin"
+
+    #always connect via https
+    Header set Strict-Transport-Security "max-age=31536000; includeSubDomains"
+</IfModule>

From 6c47578a18e2f1f92047ad29d8059483cb32b216 Mon Sep 17 00:00:00 2001
From: Mehmood Asghar <mah0001@gmail.com>
Date: Mon, 4 Apr 2022 19:33:56 -0400
Subject: [PATCH 32/79] minor

---
 application/controllers/Study.php | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/application/controllers/Study.php b/application/controllers/Study.php
index b662a48e2..aa944c897 100644
--- a/application/controllers/Study.php
+++ b/application/controllers/Study.php
@@ -302,7 +302,8 @@ public function related_datasets($sid)
 	
 	public function get_microdata($sid)
 	{
-		$this->load->model("Form_model");		
+		$this->load->model("Form_model");	
+		$this->load->model("Data_access_whitelist_model");
 
 		$form_obj=$this->Form_model->get_form_by_survey($sid);
 		

From 02a96b9503974aae087e5b54dbe9077b85cbb22d Mon Sep 17 00:00:00 2001
From: Mehmood Asghar <mah0001@gmail.com>
Date: Tue, 5 Apr 2022 12:01:32 -0400
Subject: [PATCH 33/79] misc

---
 .../catalog-admin/ddi-schema.json             | 73 +-------------
 .../catalog-admin/variable-group-schema.json  | 75 +++++++++++++++
 .../models/Dataset_microdata_model.php        | 96 ++++++++++---------
 application/models/Dataset_model.php          |  2 +-
 application/models/Variable_model.php         | 34 ++++---
 application/schemas/ddi-schema.json           | 73 +-------------
 .../schemas/variable-group-schema.json        | 75 +++++++++++++++
 .../metadata_templates/fields/field_tags.php  | 38 ++++++++
 8 files changed, 263 insertions(+), 203 deletions(-)
 create mode 100644 api-documentation/catalog-admin/variable-group-schema.json
 create mode 100644 application/schemas/variable-group-schema.json
 create mode 100644 application/views/metadata_templates/fields/field_tags.php

diff --git a/api-documentation/catalog-admin/ddi-schema.json b/api-documentation/catalog-admin/ddi-schema.json
index 4fc2d3e02..5c5cd7b78 100644
--- a/api-documentation/catalog-admin/ddi-schema.json
+++ b/api-documentation/catalog-admin/ddi-schema.json
@@ -1615,78 +1615,9 @@
       "description": "Variable group",
       "title": "Variable groups",
       "items": {
-        "type": "object",
-        "properties": {
-          "vgid": {
-            "title": "Variable Group ID",
-            "description": "Unique ID for the variable group e.g. VG1",
-            "type": "string",
-            "maxLength": 45
-          },
-          "variables": {
-            "title": "Variables",
-            "description": "List of variables for the group seperated by space e.g. V1 V2 V3",
-            "type": "string",
-            "maxLength": 5000
-          },
-          "variable_groups": {
-            "title": "Variable groups",
-            "description": "List of sub-groups e.g. VG2 VG3 VG4",
-            "type": "string",
-            "maxLength": 1000
-          },
-          "group_type": {
-            "title": "Type",
-            "type": "string",
-            "enum": [
-              "subject",
-              "section",
-              "multiResp",
-              "grid",
-              "display",
-              "repetition",
-              "version",
-              "iteration",
-              "analysis",
-              "pragmatic",
-              "record",
-              "file",
-              "randomized",
-              "other"
-            ],
-            "maxLength": 45
-          },
-          "label": {
-            "title": "Label",
-            "type": "string",
-            "maxLength": 255
-          },
-          "universe": {
-            "title": "Universe",
-            "type": "string",
-            "maxLength": 255
-          },
-          "notes": {
-            "title": "Notes",
-            "type": "string",
-            "maxLength": 500
-          },
-          "txt": {
-            "title": "Text",
-            "type": "string",
-            "maxLength": 500
-          },
-          "definition": {
-            "title": "Definition",
-            "type": "string",
-            "maxLength": 500
-          }
-        },
-        "required": [
-          "vgid"
-        ]
+        "$ref": "variable-group-schema.json"
       },
       "additionalProperties": false
-    }
+    } 
   }
 }
\ No newline at end of file
diff --git a/api-documentation/catalog-admin/variable-group-schema.json b/api-documentation/catalog-admin/variable-group-schema.json
new file mode 100644
index 000000000..d0911475c
--- /dev/null
+++ b/api-documentation/catalog-admin/variable-group-schema.json
@@ -0,0 +1,75 @@
+{
+	"$id": "http://ihsn.org/schemas/variable-group",
+	"$schema": "http://json-schema.org/draft-07/schema#",
+	"type": "object",
+	"definitions": {},
+	"properties": {
+		"vgid": {
+		  "title": "Variable Group ID",
+		  "description": "Unique ID for the variable group e.g. VG1",
+		  "type": "string",
+		  "maxLength": 45
+		},
+		"variables": {
+		  "title": "Variables",
+		  "description": "List of variables for the group seperated by space e.g. V1 V2 V3",
+		  "type": "string",
+		  "maxLength": 5000
+		},
+		"variable_groups": {
+		  "title": "Variable groups",
+		  "description": "List of sub-groups e.g. VG2 VG3 VG4",
+		  "type": "string",
+		  "maxLength": 1000
+		},
+		"group_type": {
+		  "title": "Type",
+		  "type": "string",
+		  "enum": [
+			"subject",
+			"section",
+			"multiResp",
+			"grid",
+			"display",
+			"repetition",
+			"version",
+			"iteration",
+			"analysis",
+			"pragmatic",
+			"record",
+			"file",
+			"randomized",
+			"other"
+		  ],
+		  "maxLength": 45
+		},
+		"label": {
+		  "title": "Label",
+		  "type": "string",
+		  "maxLength": 255
+		},
+		"universe": {
+		  "title": "Universe",
+		  "type": "string",
+		  "maxLength": 255
+		},
+		"notes": {
+		  "title": "Notes",
+		  "type": "string",
+		  "maxLength": 500
+		},
+		"txt": {
+		  "title": "Text",
+		  "type": "string",
+		  "maxLength": 500
+		},
+		"definition": {
+		  "title": "Definition",
+		  "type": "string",
+		  "maxLength": 500
+		}
+	  },
+	  "required": [
+		"vgid"
+	  ]
+}
\ No newline at end of file
diff --git a/application/models/Dataset_microdata_model.php b/application/models/Dataset_microdata_model.php
index 911091fa1..f8d8eff19 100644
--- a/application/models/Dataset_microdata_model.php
+++ b/application/models/Dataset_microdata_model.php
@@ -34,6 +34,25 @@ public function __construct()
      */
     function create_dataset($type,$options, $sid=null,$is_update=false)
 	{
+        $data_files=null;
+		$variables=null;
+        $variable_groups=null;
+
+        if(isset($options['data_files'])){
+            $data_files=$options['data_files'];
+            unset($options['data_files']);
+        }
+
+        if(isset($options['variables'])){
+            $variables=$options['variables'];
+            unset($options['variables']);
+        }
+
+        if(isset($options['variable_groups'])){
+            $variable_groups=$options['variable_groups'];
+            unset($options['variable_groups']);
+        }
+
 		//validate schema
         $this->validate_schema($type,$options);
 
@@ -70,11 +89,6 @@ function create_dataset($type,$options, $sid=null,$is_update=false)
 
         $options['changed']=date("U");
 		
-        //split parts of the metadata
-        $data_files=null;
-		$variables=null;
-        $variable_groups=null;
-
         $study_metadata_sections=array('doc_desc','study_desc','provenance','embeddings','lda_topics','tags','additional');
 
         foreach($study_metadata_sections as $section){		
@@ -84,22 +98,6 @@ function create_dataset($type,$options, $sid=null,$is_update=false)
             }
         }
 
-        if(isset($options['data_files'])){
-            $data_files=$options['data_files'];
-            unset($options['data_files']);
-        }
-
-        if(isset($options['variables'])){
-            $variables=$options['variables'];
-            unset($options['variables']);
-        }
-
-        if(isset($options['variable_groups'])){
-            $variable_groups=$options['variable_groups'];
-            unset($options['variable_groups']);
-        }
-
-
 		//start transaction
 		$this->db->trans_start();
 
@@ -320,36 +318,37 @@ private function create_update_variables($dataset_id,$variables, $remove_existin
             $this->Variable_model->remove_all_variables($dataset_id);
         }
         
-        if(is_array($variables)){
-			foreach($variables as $idx=>$variable){ 
-				//validate file_id exists
-				$fid=$this->Data_file_model->get_fid_by_fileid($dataset_id,$variable['file_id']);
-		
-				if(!$fid){
-					throw new exception("variable creation failed. Variable 'file_id' not found: ".$variable['file_id']);
-				}
+        if(!is_array($variables)){
+            return false;
+        }
 
-                $variable['fid']=$variable['file_id'];
-				$this->Variable_model->validate_variable($variable);
-			}
+        $valid_data_files=(array)$this->Data_file_model->list_fileid($dataset_id);
+        foreach($variables as $idx=>$variable){ 
+            if(!in_array($variable['file_id'],$valid_data_files)){
+                throw new exception("variable creation failed. Variable 'file_id' not found: ".$variable['file_id']);
+            }
 
-			$result=array();
-			foreach($variables as $variable){
-                $variable['fid']=$variable['file_id'];
-                $variable['qstn']=$this->variable_question_to_str($variable);
+            $variable['fid']=$variable['file_id'];
+            $this->Variable_model->validate_variable($variable);
+        }
 
-                $variable_categories=isset($variable['var_catgry']) ? $variable['var_catgry'] : null;
-                $variable['catgry']=$this->variable_categories_to_str($variable_categories);
-                //$variable['keywords']=$this->variable_keywords_to_str($variable);
+        $result=array();
+        foreach($variables as $variable){
+            $variable['fid']=$variable['file_id'];
+            $variable['qstn']=$this->variable_question_to_str($variable);
 
-				//all fields are stored as metadata
-				$variable['metadata']=$variable;
-				$variable_id=$this->Variable_model->insert($dataset_id,$variable);
-			}
+            $variable_categories=isset($variable['var_catgry']) ? $variable['var_catgry'] : null;
+            $variable['catgry']=$this->variable_categories_to_str($variable_categories);
+            //$variable['keywords']=$this->variable_keywords_to_str($variable);
 
-			//update survey varcount
-			$this->update_varcount($dataset_id);
-		}
+            //all fields are stored as metadata
+            $variable['metadata']=$variable;
+            $variable_id=$this->Variable_model->insert($dataset_id,$variable, $upsert=!$remove_existing);
+        }
+
+        //update survey varcount
+        $this->update_varcount($dataset_id);
+        $this->Variable_model->update_survey_timestamp($dataset_id);
     }
 
     /*private function variable_keywords_to_str($variable)
@@ -420,6 +419,10 @@ private function create_update_variable_groups($dataset_id,$variable_groups, $re
         }
         
         if(is_array($variable_groups)){
+            foreach($variable_groups as $vgroup){
+                $this->validate_schema($type='variable-group',$vgroup);
+            }
+
 			foreach($variable_groups as $vgroup){
 					$this->Variable_group_model->insert($dataset_id,$vgroup);
 			}
@@ -471,7 +474,6 @@ function get_core_fields($type,$options)
 
         $output['title']=$this->get_array_nested_value($options,'study_desc/title_statement/title');
         $output['subtitle']=$this->get_array_nested_value($options,'study_desc/title_statement/sub_title');
-        
         $output['idno']=$this->get_array_nested_value($options,'study_desc/title_statement/idno');
 
         $nations=(array)$this->get_array_nested_value($options,'study_desc/study_info/nation');
diff --git a/application/models/Dataset_model.php b/application/models/Dataset_model.php
index c530ec86a..2e68d2cbe 100644
--- a/application/models/Dataset_model.php
+++ b/application/models/Dataset_model.php
@@ -379,7 +379,7 @@ function get_array_nested_value($data, $path, $glue = '/')
         $reference = $data;
         foreach ($paths as $key) {
             if (!array_key_exists($key, $reference)) {
-                return false;
+                return null;
             }
             $reference = $reference[$key];
         }
diff --git a/application/models/Variable_model.php b/application/models/Variable_model.php
index 164cacb52..920491a3c 100644
--- a/application/models/Variable_model.php
+++ b/application/models/Variable_model.php
@@ -343,7 +343,15 @@ function get_variables_count($sid)
         return $this->db->count_all_results();        
     }
 
-    public function insert($sid,$options)
+
+    /**
+     * 
+     * 
+     * @is_upsert - if true, do upsert instead of insert
+     * 
+     * 
+     */
+    public function insert($sid,$options,$is_upsert=true)
     {
         $valid_fields=array(
             'name',
@@ -357,17 +365,17 @@ public function insert($sid,$options)
             'metadata'
         );
 
-        //check if variable already exists
-        $uid=$this->get_uid_by_vid($sid,$options['vid']);
+        if ($is_upsert==true){            
+            //check if variable already exists
+            $uid=$this->get_uid_by_vid($sid,$options['vid']);
 
-        if($uid){
-            return $this->update($sid,$uid,$options);
+            if($uid){
+                return $this->update($sid,$uid,$options);
+            }
         }
 
-        foreach($options as $key=>$value)
-        {
-            if(!in_array($key,$valid_fields))
-            {
+        foreach($options as $key=>$value){
+            if(!in_array($key,$valid_fields)){
                 unset($options[$key]);
             }
         }
@@ -382,7 +390,7 @@ public function insert($sid,$options)
 
         $this->db->insert("variables",$options);
         $insert_id=$this->db->insert_id();
-        $this->update_survey_timestamp($sid);
+        //$this->update_survey_timestamp($sid);
         return $insert_id;
     }
 
@@ -406,7 +414,7 @@ public function update($sid,$uid,$options)
             }
         }
 
-        $options['sid']=$sid;        
+        $options['sid']=$sid;
 
         //metadata
         if(isset($options['metadata'])){
@@ -417,11 +425,11 @@ public function update($sid,$uid,$options)
         $this->db->where('sid',$sid);
         $this->db->where('uid',$uid);
         $this->db->update("variables",$options);
-        $this->update_survey_timestamp($sid);
+        //$this->update_survey_timestamp($sid);
         return $uid;
     }
 
-    private function update_survey_timestamp($sid,$changed=null)
+    function update_survey_timestamp($sid,$changed=null)
     {
         if(!$changed){
             $changed=date("U");
diff --git a/application/schemas/ddi-schema.json b/application/schemas/ddi-schema.json
index 4fc2d3e02..5c5cd7b78 100644
--- a/application/schemas/ddi-schema.json
+++ b/application/schemas/ddi-schema.json
@@ -1615,78 +1615,9 @@
       "description": "Variable group",
       "title": "Variable groups",
       "items": {
-        "type": "object",
-        "properties": {
-          "vgid": {
-            "title": "Variable Group ID",
-            "description": "Unique ID for the variable group e.g. VG1",
-            "type": "string",
-            "maxLength": 45
-          },
-          "variables": {
-            "title": "Variables",
-            "description": "List of variables for the group seperated by space e.g. V1 V2 V3",
-            "type": "string",
-            "maxLength": 5000
-          },
-          "variable_groups": {
-            "title": "Variable groups",
-            "description": "List of sub-groups e.g. VG2 VG3 VG4",
-            "type": "string",
-            "maxLength": 1000
-          },
-          "group_type": {
-            "title": "Type",
-            "type": "string",
-            "enum": [
-              "subject",
-              "section",
-              "multiResp",
-              "grid",
-              "display",
-              "repetition",
-              "version",
-              "iteration",
-              "analysis",
-              "pragmatic",
-              "record",
-              "file",
-              "randomized",
-              "other"
-            ],
-            "maxLength": 45
-          },
-          "label": {
-            "title": "Label",
-            "type": "string",
-            "maxLength": 255
-          },
-          "universe": {
-            "title": "Universe",
-            "type": "string",
-            "maxLength": 255
-          },
-          "notes": {
-            "title": "Notes",
-            "type": "string",
-            "maxLength": 500
-          },
-          "txt": {
-            "title": "Text",
-            "type": "string",
-            "maxLength": 500
-          },
-          "definition": {
-            "title": "Definition",
-            "type": "string",
-            "maxLength": 500
-          }
-        },
-        "required": [
-          "vgid"
-        ]
+        "$ref": "variable-group-schema.json"
       },
       "additionalProperties": false
-    }
+    } 
   }
 }
\ No newline at end of file
diff --git a/application/schemas/variable-group-schema.json b/application/schemas/variable-group-schema.json
new file mode 100644
index 000000000..d0911475c
--- /dev/null
+++ b/application/schemas/variable-group-schema.json
@@ -0,0 +1,75 @@
+{
+	"$id": "http://ihsn.org/schemas/variable-group",
+	"$schema": "http://json-schema.org/draft-07/schema#",
+	"type": "object",
+	"definitions": {},
+	"properties": {
+		"vgid": {
+		  "title": "Variable Group ID",
+		  "description": "Unique ID for the variable group e.g. VG1",
+		  "type": "string",
+		  "maxLength": 45
+		},
+		"variables": {
+		  "title": "Variables",
+		  "description": "List of variables for the group seperated by space e.g. V1 V2 V3",
+		  "type": "string",
+		  "maxLength": 5000
+		},
+		"variable_groups": {
+		  "title": "Variable groups",
+		  "description": "List of sub-groups e.g. VG2 VG3 VG4",
+		  "type": "string",
+		  "maxLength": 1000
+		},
+		"group_type": {
+		  "title": "Type",
+		  "type": "string",
+		  "enum": [
+			"subject",
+			"section",
+			"multiResp",
+			"grid",
+			"display",
+			"repetition",
+			"version",
+			"iteration",
+			"analysis",
+			"pragmatic",
+			"record",
+			"file",
+			"randomized",
+			"other"
+		  ],
+		  "maxLength": 45
+		},
+		"label": {
+		  "title": "Label",
+		  "type": "string",
+		  "maxLength": 255
+		},
+		"universe": {
+		  "title": "Universe",
+		  "type": "string",
+		  "maxLength": 255
+		},
+		"notes": {
+		  "title": "Notes",
+		  "type": "string",
+		  "maxLength": 500
+		},
+		"txt": {
+		  "title": "Text",
+		  "type": "string",
+		  "maxLength": 500
+		},
+		"definition": {
+		  "title": "Definition",
+		  "type": "string",
+		  "maxLength": 500
+		}
+	  },
+	  "required": [
+		"vgid"
+	  ]
+}
\ No newline at end of file
diff --git a/application/views/metadata_templates/fields/field_tags.php b/application/views/metadata_templates/fields/field_tags.php
new file mode 100644
index 000000000..9cfda1e9b
--- /dev/null
+++ b/application/views/metadata_templates/fields/field_tags.php
@@ -0,0 +1,38 @@
+<?php
+/**
+ * 
+ * tags
+ *
+ *  options
+ * 
+ */
+$hide_column_headings=false;
+
+ if(isset($options['hide_column_headings'])){
+     $hide_column_headings=$options['hide_column_headings'];
+ }
+?>
+<?php if (isset($data) && is_array($data) && count($data)>0 ):?>
+<div class="field field-<?php echo $name;?>">
+    <?php if($hide_column_headings!==true):?>
+        <div class="xsl-caption field-caption"><?php echo t($name);?></div>
+    <?php endif;?>
+    <div class="field-value">                
+        <?php if (isset($data[0]) && is_array($data[0])):?>
+        <?php            
+            if(!isset($columns)){
+             $columns=array_keys($data[0]);
+            }            
+        ?>
+        <?php 
+            $output=array();
+            foreach($data as $row):?>
+                <span class="mr-2 badge badge-primary"><?php echo implode(": ",$row);?></span>
+            <?php endforeach;?>        
+        <?php else:?>            
+            <span class="mr-2 badge badge-light"><?php echo implode(", ",$output);?></span>
+        <?php endif;?>
+
+    </div>
+</div>
+<?php endif;?>

From f8851fe6b2670af389f20cd6e59f78f2e03fd8d9 Mon Sep 17 00:00:00 2001
From: Mehmood Asghar <mah0001@gmail.com>
Date: Tue, 5 Apr 2022 21:48:02 -0400
Subject: [PATCH 34/79] fix issue with RDF uploads not working when RDF file is
 uploaded with DDI

---
 application/models/Survey_resource_model.php | 1 +
 1 file changed, 1 insertion(+)

diff --git a/application/models/Survey_resource_model.php b/application/models/Survey_resource_model.php
index 997a94648..a8d20b087 100644
--- a/application/models/Survey_resource_model.php
+++ b/application/models/Survey_resource_model.php
@@ -1222,6 +1222,7 @@ function upload_rdf($tmp_path,$file_field='file')
 		$config['allowed_types'] = 'rdf|xml';
 
 		$this->load->library('upload', $config);
+		$this->upload->initialize($config);
 
 		//process uploaded rdf file
 		$rdf_upload_result=$this->upload->do_upload($file_field);

From d94222357ccb427094be9270268f1d899fcf5ef7 Mon Sep 17 00:00:00 2001
From: Mehmood Asghar <mah0001@gmail.com>
Date: Thu, 7 Apr 2022 11:55:25 -0400
Subject: [PATCH 35/79] Add support for deleting resources using POST method

---
 application/config/routes.php             | 1 +
 application/controllers/api/Resources.php | 8 +++++---
 2 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/application/config/routes.php b/application/config/routes.php
index 8aec05bf3..45e862faa 100644
--- a/application/config/routes.php
+++ b/application/config/routes.php
@@ -82,6 +82,7 @@
 //dataset resources
 $route['api/datasets/(:any)/resources'] = "api/resources/$1";
 $route['api/datasets/(:any)/resources/(:num)'] = "api/resources/$1/$2";
+$route['api/datasets/(:any)/resources/delete/(:num)'] = "api/resources/delete/$1/$2";
 $route['api/datasets/(:any)/resources/delete_all'] = "api/resources/delete_all/$1";
 $route['api/datasets/(:any)/resources/import_rdf'] = "api/resources/import_rdf/$1";
 $route['api/datasets/(:any)/resources/download/(:num)'] = "api/resources/download/$1/$2";
diff --git a/application/controllers/api/Resources.php b/application/controllers/api/Resources.php
index 52b6cceb5..3130b2572 100644
--- a/application/controllers/api/Resources.php
+++ b/application/controllers/api/Resources.php
@@ -244,9 +244,6 @@ function index_put($idno=null,$resource_id=null)
 		}		
 	}
 
-
-
-
 	//delete a single resource by resource id
 	function index_delete($idno=null,$resource_id=null)
 	{
@@ -280,6 +277,11 @@ function index_delete($idno=null,$resource_id=null)
 		}		
 	}
 
+	//delete using post
+	function delete_post($idno=null,$resource_id=null)
+	{
+		return $this->index_delete($idno,$resource_id);
+	}
 
 
 	//delete all resources by study

From 5b3a9826f2bc44a7eda21f25032701d7eea06e48 Mon Sep 17 00:00:00 2001
From: Mehmood Asghar <mah0001@gmail.com>
Date: Thu, 7 Apr 2022 12:05:44 -0400
Subject: [PATCH 36/79] Add POST endpoint for deleting all resources

---
 application/controllers/api/Resources.php | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/application/controllers/api/Resources.php b/application/controllers/api/Resources.php
index 3130b2572..8720791cf 100644
--- a/application/controllers/api/Resources.php
+++ b/application/controllers/api/Resources.php
@@ -303,6 +303,10 @@ public function delete_all_delete($idno=null)
 		}
 	}
 
+	public function delete_all_post($idno=null){
+		return $this->delete_all_delete($idno);
+	}
+
 
 	//import rdf file
 	public function import_rdf_post($idno=NULL)

From 1c09c366285561e4fce4c10bae6f8d8dd7b155a9 Mon Sep 17 00:00:00 2001
From: Mehmood Asghar <mah0001@gmail.com>
Date: Wed, 13 Apr 2022 14:31:07 -0400
Subject: [PATCH 37/79] Update scripts display template

---
 .../metadata_templates/fields/field_array.php |  2 +-
 .../fields/field_script_file.php              | 38 ++++++++++++++++---
 .../fields/field_script_file_v2.php           | 25 +-----------
 .../metadata_templates/script-template.php    | 11 ++++--
 4 files changed, 43 insertions(+), 33 deletions(-)

diff --git a/application/views/metadata_templates/fields/field_array.php b/application/views/metadata_templates/fields/field_array.php
index 3a1738bb4..10407c1d2 100644
--- a/application/views/metadata_templates/fields/field_array.php
+++ b/application/views/metadata_templates/fields/field_array.php
@@ -70,7 +70,7 @@
                         <td>
                             <?php if(empty($row[$column_name])){continue;}?>    
                             <?php if(is_array($row[$column_name])):?>
-                            <?php echo render_field($field_type='array_br',$field_name=$name.'.'.$column_name,$row[$column_name], array('hide_column_headings'=>true));?>
+                            <?php echo render_field($field_type='array_badge',$field_name=$name.'.'.$column_name,$row[$column_name], array('hide_column_headings'=>true));?>
                             <?php else:?>
                                 <?php if(is_url($row[$column_name])):?>
                                      <a target="_blank" href="<?php echo html_escape($row[$column_name]);?>"><i class="fas fa-external-link-alt"></i> <?php echo t('Link');?></a>
diff --git a/application/views/metadata_templates/fields/field_script_file.php b/application/views/metadata_templates/fields/field_script_file.php
index d5263665d..957ac5fc4 100644
--- a/application/views/metadata_templates/fields/field_script_file.php
+++ b/application/views/metadata_templates/fields/field_script_file.php
@@ -52,7 +52,8 @@ class="btn btn-primary btn-sm float-right"
                     <?php endif;?>
                     <?php //for zip packages ?>
                     <?php if (isset($options['resources']) && 
-                            isset($script['zip_package']) && 
+                            isset($script['zip_package']) &&                             
+                            !array_key_exists($script['file_name'],$options['resources']) &&
                             array_key_exists($script['zip_package'],$options['resources'])):?>                        
                         <?php 
                             $resource = $options['resources'][$script['zip_package']];                            
@@ -68,12 +69,37 @@ class="btn btn-primary btn-sm float-right"
                 <?php endif;?>
             </div>
 
-            <div id="script-body-<?php echo $k;?>" class="collapse show" aria-labelledby="script-<?php echo $k;?>" data-parent="#accordion-script-files">
+            <div id="script-body-<?php echo $k;?>" class="collapse show" aria-labelledby="script-<?php echo $k;?>" xdata-parent="#accordion-script-files">
                 <div class="card-body" style="padding:15px;">
-                    <?php foreach($script_file_template as $field_name=>$field_type):?>
-                        <?php $value=get_field_value($field_name,$script); ?>
-                        <?php echo render_field($field_type,'metadata.project_desc.scripts.'.$field_name,$value);?>
-                    <?php endforeach;?>        
+                <?php foreach($script_file_template as $field_name=>$field_type):?>
+                            <?php $value=get_field_value($field_name,$script); ?>
+
+                            <?php if(empty($value) || $value==''){continue;}?>
+                            <div class="row">
+                                <div class="col-md-2">
+                                    <div class="text-secondary"><?php echo t('metadata.project_desc.scripts.'.$field_name);?></div>
+                                </div>
+                                <div class="col">
+                                    <?php if($field_name=='zip_package' || $field_name=='file_name'):?>
+                                        <?php if (isset($options['resources']) &&                 
+                                                array_key_exists($value,$options['resources'])):?>                        
+                                            <?php 
+                                                $resource = $options['resources'][$value];
+                                            ?>
+                                            <a class="download_script download_<?php echo $field_name;?>" href="<?php echo site_url("catalog/{$resource['survey_id']}/download/{$resource['resource_id']}");?>" >
+                                            <i class="fa fa-download" aria-hidden="true"></i> <?php print_r($value);?>
+                                            </a>
+                                        <?php else:?>
+                                            <?php echo $value;?>
+                                        <?php endif;?>
+                                    <?php elseif(is_array($value)):?>
+                                        <?php echo render_field($field_type,'metadata.project_desc.scripts.'.$field_name,$value,array('hide_field_title'=>true));?>
+                                    <?php else:?>
+                                        <?php print_r($value);?>
+                                    <?php endif;?>
+                                </div>
+                            </div>
+                        <?php endforeach;?>        
                 </div>
             </div>
             </div>
diff --git a/application/views/metadata_templates/fields/field_script_file_v2.php b/application/views/metadata_templates/fields/field_script_file_v2.php
index 49b711a49..05ea1514c 100644
--- a/application/views/metadata_templates/fields/field_script_file_v2.php
+++ b/application/views/metadata_templates/fields/field_script_file_v2.php
@@ -65,26 +65,8 @@ class="btn btn-danger btn-sm btn-xs float-right"
 
     <div id="accordion-script-files">
         
-        
-        <table class="tablex table-sm">
-            <thead class="border-bottom">
-            <tr>
-                <td><input type="checkbox" class="checkbox_toggle mr-2" id="script_chk_toggle" /> </td>
-                <td>
-                    <label for="script_chk_toggle" class="my-0">Select/Deselect</label>
-                    <span class="ml-5 script_download_selection"></span>
-                    <button 
-                        type="button" 
-                        class="script_batch_download btn btn-primary btn-sm mr-2 float-right">
-                        <i class="fa fa-download" aria-hidden="true"></i>  Download selected files
-                    </button>
-                </td>
-            </tr>
-            </thead>
         <?php $k=0;foreach($data as $script):$k++;?>
-            <tr class="script-file-container border-top">
-                <td style="vertical-align:top"><input type="checkbox" class="mr-2 chk_script_download" id="chk_<?php echo $k;?>" /></td>
-                <td>
+            <div class="script-file-container border-top">
                     <div class="mb-0" >
                         <label class="my-0 font-weight-bold" for="chk_<?php echo $k;?>"><?php echo $script['title'];?></label>
                     </div>                
@@ -126,11 +108,8 @@ class="script_batch_download btn btn-primary btn-sm mr-2 float-right">
                     </div>
                 </div>
                 </div>
-                </td>
-            </tr>
+        </div>
         <?php endforeach;?>
-        </table>
-
         
     </div>
     </div>
diff --git a/application/views/metadata_templates/script-template.php b/application/views/metadata_templates/script-template.php
index 881cfe7d3..9e559c103 100644
--- a/application/views/metadata_templates/script-template.php
+++ b/application/views/metadata_templates/script-template.php
@@ -12,7 +12,7 @@
 <style>
     .accordion-title{
         cursor:pointer;
-        font-size:1.2em;
+        font-size:1em;
         color:#0275d8;
         font-weight:normal;
     }
@@ -22,6 +22,11 @@
 
     #accordion-script-files .card{
         margin-top:5px;
+        border-radius:0px;
+    }
+
+    #accordion-script-files .card-header {
+        padding: 0.25rem 1rem;
     }
 
     [data-toggle="collapse"] i:before{
@@ -120,7 +125,7 @@
             "metadata.project_desc.repository_url" =>'array',
 
 
-            "metadata.project_desc.scripts"=>'script_file_v2',
+            "metadata.project_desc.scripts"=>'script_file',
             "metadata.project_desc.technology_environment"=>'text',
             "metadata.project_desc.technology_requirements"=>'text',
             "metadata.project_desc.reproduction_instructions"=>'text'
@@ -187,6 +192,6 @@
 
 <?php 
     //renders html
-    $this->load->view('metadata_templates/metadata_output', array('output'=>$output, 'hide_sidebar'=>true));
+    $this->load->view('metadata_templates/metadata_output', array('output'=>$output, 'hide_sidebar'=>FALSE));
 ?>
 

From 18da4949f0e05d180ff54793ab5c62f308c537a9 Mon Sep 17 00:00:00 2001
From: Mehmood Asghar <mah0001@gmail.com>
Date: Thu, 14 Apr 2022 14:45:09 -0400
Subject: [PATCH 38/79] Fix for licensed request admin page not showing all
 requests

---
 application/models/Licensed_model.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/application/models/Licensed_model.php b/application/models/Licensed_model.php
index ddf866cd2..d4b44b3e3 100644
--- a/application/models/Licensed_model.php
+++ b/application/models/Licensed_model.php
@@ -690,7 +690,7 @@ function search_requests($limit = NULL, $offset = NULL,$search_options=NULL,$sor
 		//set Limit clause
 	  	$this->db->select('lic_requests.request_title,lic_requests.id, lic_requests.userid, lic_requests.created, lic_requests.status,users.username');
 		$this->db->join($this->tables['users'], $this->tables['users'].'.id = lic_requests.userid');
-		$this->db->join('survey_lic_requests', 'survey_lic_requests.id = lic_requests.id');
+		$this->db->join('survey_lic_requests', 'survey_lic_requests.request_id = lic_requests.id');
 		//$this->db->join('survey_repos', 'survey_lic_requests.sid = survey_repos.sid');
 		$this->db->group_by('lic_requests.request_title,lic_requests.id, lic_requests.userid, lic_requests.created, lic_requests.status,users.username');
 

From f5e93d3f57a3410c2fbfbbaab3ccc55859afbc45 Mon Sep 17 00:00:00 2001
From: Mehmood Asghar <mah0001@gmail.com>
Date: Tue, 19 Apr 2022 14:17:19 -0400
Subject: [PATCH 39/79] minor

---
 application/controllers/Study.php                    | 6 +++---
 application/language/english/fields_scripts_lang.php | 2 +-
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/application/controllers/Study.php b/application/controllers/Study.php
index aa944c897..b304530e2 100644
--- a/application/controllers/Study.php
+++ b/application/controllers/Study.php
@@ -443,7 +443,6 @@ private function render_page($sid, $content, $active_tab='description')
 				break;
 			case 'video':
 			case 'image':
-				//$display_layout='survey_info/layout_scripts';
 				$page_tabs=array(
 					'description'=>array(
 						'label'=>t($dataset_type.'_description'),
@@ -458,7 +457,6 @@ private function render_page($sid, $content, $active_tab='description')
 				);
 				break;
 			case 'timeseries':
-				//$display_layout='survey_info/layout_scripts';
 				$page_tabs=array(
 					'description'=>array(
 						'label'=>t($dataset_type.'_description'),
@@ -488,7 +486,9 @@ private function render_page($sid, $content, $active_tab='description')
 					),
 					//hide related materials
 					'related_materials'=>array(
-						'show_tab'=> 0
+						'show_tab'=> (int)$related_resources_count,
+						'label'=>t('related_materials'),
+						'url'=>site_url("catalog/$sid/related-materials"),
 					)
 				);
 				break;
diff --git a/application/language/english/fields_scripts_lang.php b/application/language/english/fields_scripts_lang.php
index b4517db8e..65cdfd0d1 100644
--- a/application/language/english/fields_scripts_lang.php
+++ b/application/language/english/fields_scripts_lang.php
@@ -144,7 +144,7 @@
 $lang['metadata.project_desc.scripts.zip_package']='Zip archive';
 $lang['metadata.project_desc.scripts.title']='Title';
 $lang['metadata.project_desc.scripts.authors']='Authors';
-$lang['metadata.project_desc.scripts.authors.name']='Person or Organization name';
+$lang['metadata.project_desc.scripts.authors.name']='Name';
 $lang['metadata.project_desc.scripts.authors.abbr']='Abbreviation';
 $lang['metadata.project_desc.scripts.authors.role']='Role';
 $lang['metadata.project_desc.scripts.date']='Date';

From a8c468dc98888c0a166d5fdcdb6c2577efae128a Mon Sep 17 00:00:00 2001
From: Mehmood Asghar <mah0001@gmail.com>
Date: Thu, 21 Apr 2022 11:06:21 -0400
Subject: [PATCH 40/79] Add support for searching geospatial features similar
 to variable search

---
 application/controllers/Study.php             |   4 +
 .../models/Dataset_geospatial_model.php       | 146 ++++++++++++++++++
 application/views/catalog_search/compare.php  |   6 +-
 .../views/survey_info/geospatial_features.php | 100 ++++++++++++
 themes/nada52/blank.php                       |   7 -
 5 files changed, 253 insertions(+), 10 deletions(-)
 create mode 100644 application/views/survey_info/geospatial_features.php

diff --git a/application/controllers/Study.php b/application/controllers/Study.php
index b304530e2..64e8356f7 100644
--- a/application/controllers/Study.php
+++ b/application/controllers/Study.php
@@ -191,6 +191,10 @@ public function variable($sid,$file_id=null, $var_id=null)
 				$variable_template='variable_ddi';
 			break;
 
+			case 'geospatial':
+				$variable_template='geospatial_features';
+			break;
+
 			case 'timeseries':
 				$variable_template='timeseries';
 			break;
diff --git a/application/models/Dataset_geospatial_model.php b/application/models/Dataset_geospatial_model.php
index ea32b58e5..7dbb4a3c7 100644
--- a/application/models/Dataset_geospatial_model.php
+++ b/application/models/Dataset_geospatial_model.php
@@ -74,6 +74,12 @@ function create_dataset($type,$options,$sid=null)
 
 		//start transaction
 		$this->db->trans_start();
+
+        $feature_catalog=isset($options['metadata']['description']['feature_catalogue']) ? $options['metadata']['description']['feature_catalogue'] : null;
+
+        if (isset($options['metadata']['description']['feature_catalogue'])){
+            //unset($options['metadata']['description']['feature_catalogue']);
+        }
         
         if($dataset_id>0){
             $this->update($dataset_id,$type,$options);
@@ -84,12 +90,19 @@ function create_dataset($type,$options,$sid=null)
 
 		//update years
         $this->update_years($dataset_id,$core_fields['year_start'],$core_fields['year_end']);
+
+        $this->add_tags($dataset_id,$this->get_array_nested_value($options,'metadata/tags'));
         
         //import external resources
         $this->update_resources($dataset_id,$external_resources);
 
 		//set topics
 
+        //feature catalog
+        $this->upsert_feature_catalog($dataset_id,$feature_catalog);
+
+        $this->update_feature_keywords($dataset_id,$feature_catalog);
+        
         //update related countries
         $this->Survey_country_model->update_countries($dataset_id,$core_fields['nations']);
 
@@ -275,4 +288,137 @@ function get_bbox_array($metadata)
         return $bbox;
     }
 
+
+    function upsert_feature_catalog($sid,$feature_catalog)
+    {
+        $this->Data_file_model->remove_all_files($sid);
+
+        if (!isset($feature_catalog['featureType'])){
+            return false;
+        }
+
+        //featureType [data file]
+        $file_counter=1;
+        foreach($feature_catalog['featureType'] as $feature_type)
+        {
+            $file_id='F'.$file_counter++;
+            $data_file=array(
+                'sid'=>$sid,
+                'file_id'=>$file_id,
+                'file_name'=>$feature_type['typeName'],
+                'description'=>$feature_type['definition']                
+            );
+
+            $file=$this->Data_file_model->get_file_by_id($sid,$file_id);
+                
+            if($file){
+                $this->Data_file_model->update($file['id'],$data_file);
+            }else{
+                $this->Data_file_model->insert($sid,$data_file);
+            }
+
+            $car_chars=isset($feature_type['carrierOfCharacteristics']) ? $feature_type['carrierOfCharacteristics'] : null;
+            $this->upsert_carrierOfCharacteristics($sid,$file_id,$car_chars,true);
+        }
+    }
+
+    private function upsert_carrierOfCharacteristics($sid,$fid,$car_chars, $remove_existing=false)
+    {        
+        if ($remove_existing==true){
+            $this->delete_variables($sid,$fid);
+        }
+        
+        if(!is_array($car_chars)){
+            return false;
+        }
+
+        $var_counter=1;
+        foreach($car_chars as $variable){
+            $vid='V'.$var_counter++;
+            $listed_values=isset($variable['listedValue']) ? $variable['listedValue'] : '';
+            $variable_metadata=array(
+                'fid'=>$fid,
+                'vid'=>$fid.'-'.$vid,
+                'name'=>isset($variable['memberName']) ? $variable['memberName'] : '',
+                //'labl'=>$variable['memberName'],
+                'qstn'=>isset($variable['definition']) ? $variable['definition'] : '',
+                'catgry'=>$this->listed_values_to_str($listed_values),
+                'metadata'=>$variable
+            );
+
+            $variable_id=$this->Variable_model->insert($sid,$variable_metadata, $upsert=!$remove_existing);
+        }
+
+        //update survey varcount
+        $this->update_varcount($sid);
+        $this->Variable_model->update_survey_timestamp($sid);
+    }
+
+    function delete_variables($sid,$fid)
+    {
+        $this->db->where('sid',$sid);
+        $this->db->where('fid',$fid);
+        $this->db->delete('variables');
+    }
+
+
+    function update_feature_keywords($sid,$feature_catalog)
+    {
+        if (!isset($feature_catalog['featureType'])){
+            return '';
+        }
+
+        $output=array();
+        foreach($feature_catalog['featureType'] as $feature_type)
+        {
+            $output[]=$feature_type['typeName'];
+            $output[]=$feature_type['definition'];
+
+            $car_chars=isset($feature_type['carrierOfCharacteristics']) ? $feature_type['carrierOfCharacteristics'] : null;
+            foreach($car_chars as $variable)
+            {
+                $output[]=isset($variable['memberName']) ? $variable['memberName'] : '';
+                $output[]=isset($variable['definition']) ? $variable['definition'] : '';
+
+                if (isset($variable['listedValue'])){                    
+                    $output[]=$this->listed_values_to_str($variable['listedValue']);
+                }
+            }
+        }
+
+        $output= implode(" ", $output);
+
+        $options=array(
+            'var_keywords'=>$output
+        );
+
+        $this->db->where('id',$sid);    
+        $this->db->update("surveys",$options);
+    }
+
+    //convert listed values array to string
+    function listed_values_to_str($listed_values)
+    {
+        if (!is_array($listed_values)){
+            return '';
+        }
+        $output=array();
+        foreach($listed_values as $lv){
+            $output[]=isset($lv['label']) ? $lv['label'] : '';
+            $output[]=isset($lv['definition']) ? $lv['definition'] : '';
+        }
+
+        return implode(" ",$output);
+    }
+
+
+    function add_tags($sid, $tags)
+    {
+        if(empty($tags)){
+            return false;
+        }
+        
+        $tags=array_column($tags,'tag');
+        return parent::add_survey_tags($sid,$tags);        
+    }
 }
\ No newline at end of file
diff --git a/application/views/catalog_search/compare.php b/application/views/catalog_search/compare.php
index c8fd8af1c..a034235c8 100644
--- a/application/views/catalog_search/compare.php
+++ b/application/views/catalog_search/compare.php
@@ -88,13 +88,13 @@ function eraseCookie(name) {
 }
 
 $( document ).ready(function() {
-	$(".compare-header #wb-variables-fullscreen" ).click(function() {
+	$(".compare-header #variables-compare-fullscreen" ).click(function() {
 		$("body").toggleClass("wb-fullscreen");
 	});  
 });
 </script>
 
-<div class="compare-header clearfix py-3 px-3">
+<div class="compare-header clearfix py-4 px-3">
 	<div class="container">
 		<div class="row">
 			<div class="col">
@@ -130,7 +130,7 @@ function eraseCookie(name) {
 							<?php echo t('download_json');?>
 						</a> 
 
-						<a href="#" class="fullscreen btn btn-sm" id="wb-variables-fullscreen">
+						<a href="#" class="fullscreen btn btn-sm" id="variables-compare-fullscreen">
 							<i class="fas fa-expand-alt"></i>
 							<i class="fas fa-compress-alt"></i>
 						</a> 
diff --git a/application/views/survey_info/geospatial_features.php b/application/views/survey_info/geospatial_features.php
new file mode 100644
index 000000000..d814b48aa
--- /dev/null
+++ b/application/views/survey_info/geospatial_features.php
@@ -0,0 +1,100 @@
+<style>
+    .fld-inline .fld-name{color:gray;}
+    .float-left {width:35%;float:left;}
+    .fld-container,.clear{clear:both;}
+
+    .var-breadcrumb{
+        list-style:none;
+        clear:both;
+        margin-bottom:25px;
+        color:gray;
+    }
+
+    .var-breadcrumb li{display:inline;}
+</style>
+
+
+<?php
+$core_fields=array(
+    "fid",
+    "vid",
+    "name",
+    "labl");
+?>
+
+
+<h5><?php echo $variable['labl'] . ' ('. $variable['name'].')';?></h5>
+<h5 class="var-file">Data File: <a href="<?php echo site_url('catalog/'.$file['sid'].'/data-dictionary/'.$file['file_id']);?>"><?php echo $file['file_name'];?></a></h5>
+
+<!-- Overview -->
+<?php echo render_group('overview',
+    $fields=array(
+        "fid"=>'text',
+        "vid"=>'text',
+        "name"=>'text',
+        "labl"=>'text'
+    ),
+    $variable['metadata']);
+
+    $feature=$variable['metadata'];
+?>
+
+<div class="row p-3" >
+                    <!--<div class="row"><pre><?php print_r($feature);?></pre>
+                    </div>-->
+                    
+
+                    <div class="col-md-12">                        
+                        <div>
+                            <h5><?php echo $feature['memberName'];?></h5>
+                            <p><?php echo $feature['definition'];?></p>
+                        </div>
+                    </div>
+
+
+                    <?php if (isset($feature['cardinality'])):?>
+                    <div class="col-md-12">
+                        <div class="row">
+                            <div class="col-auto font-weight-bold">Cardinality</div>
+                            <div class="col-md-9">
+                                Lower: <?php echo $feature['cardinality']['lower'];?>
+                                Upper: <?php echo $feature['cardinality']['upper'];?>                            
+                            </div>
+                        </div>
+                    </div>
+                    <?php endif;?>
+
+                    <?php if (isset($feature['valueMeasurementUnit'])):?>
+                    <div class="col-md-12">
+                        <div class="row">
+                            <div class="col-auto font-weight-bold">Measurement unit</div>
+                            <div class="col"><?php echo $feature['valueMeasurementUnit'];?></div>
+                        </div>
+                    </div>
+                    <?php endif;?>
+
+                    <?php if (isset($feature['valueType'])):?>
+                    <div class="col-md-12">
+                        <div class="row">
+                            <div class="col-auto font-weight-bold">Value type</div>
+                            <div class="col"><?php echo $feature['valueType'];?></div>
+                        </div>
+                    </div>
+                    <?php endif;?>
+
+                    
+                    <?php if (isset($feature['listedValue'])):?>
+                    <div class="col-md-12">
+                        <div class="border-bottom mt-3 font-weight-bold">Listed values</div>
+                        
+                            <?php foreach($feature['listedValue'] as $row):?>
+                                <div class="row border-bottom">
+                                    <div class="col-md-2 text-break"><?php echo $row['label'];?></div>
+                                    <div class="col"><?php echo $row['definition'];?></div>
+                                </div>
+                            <?php endforeach;?>
+                        
+                    </div>
+                    <?php endif;?>
+
+                </div>
\ No newline at end of file
diff --git a/themes/nada52/blank.php b/themes/nada52/blank.php
index 6a57ce5a3..f9a8e9649 100644
--- a/themes/nada52/blank.php
+++ b/themes/nada52/blank.php
@@ -43,13 +43,6 @@
 
 <!-- page footer -->
 <?php //include_once 'footer.php';?>
-    <script>
-        $( document ).ready(function() {
-            $(".compare-header #wb-variables-fullscreen" ).click(function() {
-                $("body").toggleClass("wb-fullscreen");
-            });  
-        });
-    </script>
 </body>
 
 </html>
\ No newline at end of file

From 1c40b0a77290176b0bf507ee884473c31cd99dca Mon Sep 17 00:00:00 2001
From: Mehmood Asghar <mah0001@gmail.com>
Date: Thu, 21 Apr 2022 11:21:42 -0400
Subject: [PATCH 41/79] populate study metadata with tags

---
 application/models/Dataset_model.php | 18 +++++++++++++++---
 1 file changed, 15 insertions(+), 3 deletions(-)

diff --git a/application/models/Dataset_model.php b/application/models/Dataset_model.php
index 2e68d2cbe..31445ec8d 100644
--- a/application/models/Dataset_model.php
+++ b/application/models/Dataset_model.php
@@ -84,6 +84,7 @@ public function __construct()
 		$this->load->model("Vocabulary_model");
 		$this->load->model("Term_model");
 		$this->load->model("Survey_resource_model");
+		$this->load->model("Catalog_tags_model");
 	}
 	
 	
@@ -290,12 +291,22 @@ function decode_encoded_fields_rows($data)
     //returns survey metadata array
     function get_metadata($sid)
     {
-        $this->db->select("metadata");
+        $this->db->select("type,metadata");
         $this->db->where("id",$sid);
         $survey=$this->db->get("surveys")->row_array();
 
         if ($survey){
-            return $this->decode_metadata($survey['metadata']);
+            $metadata= $this->decode_metadata($survey['metadata']);
+			$metadata['schematype']=$survey['type'];
+
+			//tags
+			$tags=$this->Catalog_tags_model->survey_tags_with_key($sid);
+
+			if($tags){
+				$metadata['tags']=$tags;
+			}
+
+			return $metadata;
         }
 	}
 
@@ -1854,6 +1865,7 @@ function get_country_names_string($nations)
 
 	function update_locations($sid, $bounds=array())
     {
+		return false;//disabled
         //delete any existing locations
         $this->db->delete('survey_locations',array('sid' => $sid));
 
@@ -1872,7 +1884,7 @@ function update_locations($sid, $bounds=array())
             $bbox_wkt=$this->db->escape(bbox_to_wkt($north, $south, $east, $west));
 
             $this->db->set('sid',$sid);
-            $this->db->set('location','ST_GeomFromText('.$bbox_wkt.')',false);
+            $this->db->set('location',$bbox_wkt);
             $this->db->insert('survey_locations');
         }
     }

From f5ec5b0e4201fdcb0711b96614d40e0264b5554c Mon Sep 17 00:00:00 2001
From: Mehmood Asghar <mah0001@gmail.com>
Date: Thu, 21 Apr 2022 11:24:34 -0400
Subject: [PATCH 42/79] Add method to return tags by study

---
 application/models/Catalog_tags_model.php | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/application/models/Catalog_tags_model.php b/application/models/Catalog_tags_model.php
index 650bc3161..2807498f1 100644
--- a/application/models/Catalog_tags_model.php
+++ b/application/models/Catalog_tags_model.php
@@ -61,6 +61,13 @@ function survey_tags($sid)
 		return $this->db->get('survey_tags')->result_array();
 	}
 
+	function survey_tags_with_key($sid)
+	{
+		$this->db->select("tag");
+		$this->db->where('sid',$sid);
+		return $this->db->get('survey_tags')->result_array();
+	}
+
 	
 	function survey_tags_list($sid)
 	{

From 2a73adacd1930e942e45ec22ca98a422e0202e07 Mon Sep 17 00:00:00 2001
From: Mehmood Asghar <mah0001@gmail.com>
Date: Mon, 25 Apr 2022 12:35:07 -0400
Subject: [PATCH 43/79] Show geospatial features similar to variables

---
 application/controllers/Catalog.php           |  13 ++-
 application/controllers/api/Datasets.php      | 110 +-----------------
 .../libraries/Catalog_search_mysql.php        |   5 +-
 .../libraries/Catalog_search_sqlsrv.php       |   3 +-
 application/libraries/Dataset_manager.php     |  76 +++++++-----
 application/views/catalog_search/compare.php  |   2 +-
 .../views/catalog_search/var_quick_list.php   |   8 +-
 7 files changed, 71 insertions(+), 146 deletions(-)

diff --git a/application/controllers/Catalog.php b/application/controllers/Catalog.php
index 63183ad80..562bfc999 100644
--- a/application/controllers/Catalog.php
+++ b/application/controllers/Catalog.php
@@ -540,10 +540,10 @@ function vsearch($sid=NULL)
 			'sort_order'=>$this->input->get_post('sort_order'),
 			'repo'=>$this->input->get_post('repo')
 		);
+
 		$this->load->library('catalog_search',$params);
 		$data['variables']=$this->catalog_search->v_quick_search($sid);
-
-		$this->load->view("catalog_search/var_quick_list", $data);
+		$this->load->view("catalog_search/var_quick_list", $data); 
 	}
 
 
@@ -829,7 +829,11 @@ function compare($option=NULL, $format=NULL)
 			}
 		}
 
-		//PDF
+		$view_types=array(
+			'survey'=>'variable_ddi',
+			'geospatial'=>'geospatial_features'
+		);
+
 		foreach($items as $item=>$value){
 			$tmp=explode('/',$value);
 			if (isset($tmp[1])){
@@ -841,7 +845,8 @@ function compare($option=NULL, $format=NULL)
 					'dataset'=>$this->Dataset_model->get_row($tmp[0])
 				);
 
-				$item_data['html']=$this->load->view('survey_info/variable_ddi',$item_data,true);
+				$view_name=isset($view_types[$item_data['dataset']['type']]) ? $view_types[$item_data['dataset']['type']] : 'survey';
+				$item_data['html']=$this->load->view('survey_info/'.$view_name,$item_data,true);
 				$list[]=$item_data;
 			}
 		}		
diff --git a/application/controllers/api/Datasets.php b/application/controllers/api/Datasets.php
index 0b6a1fd03..35ab25342 100644
--- a/application/controllers/api/Datasets.php
+++ b/application/controllers/api/Datasets.php
@@ -1720,106 +1720,6 @@ function strip_ddi_put($idno=NULL,$strip='')
 	}
 
 
-	/**
-	 * 
-	 *  Reload facets/filters
-	 * 
-	 * @sid - study id
-	 * 
-	 */
-	public function refresh_filters_put($idno=null)
-	{		
-		try{
-			$sid=$this->get_sid_from_idno($idno);
-			$this->has_dataset_access('edit',$sid);
-			$this->dataset_manager->refresh_filters($sid);
-
-			$output=array(
-				'status'=>'success'				
-			);
-			$this->set_response($output, REST_Controller::HTTP_OK);
-		}
-		catch(Exception $e){
-			$this->set_response($e->getMessage(), REST_Controller::HTTP_BAD_REQUEST);
-		}				
-	}
-
-	public function refresh_filters_get($idno=null)
-	{
-		return $this->refresh_filters_put($idno);
-	}
-
-	/**
-	 * 
-	 *  Reload year facets
-	 * 
-	 * @sid - study id
-	 * 
-	 */
-	public function refresh_year_facets_get($start_row=NULL, $limit=1000)
-	{		        
-        try{
-			$this->has_dataset_access('edit');
-			$output=$this->Dataset_model->refresh_year_facets($start_row, $limit);
-			$output=array(
-                'status'=>'success',
-                'result'=>$output
-			);
-			$this->set_response($output, REST_Controller::HTTP_OK);			
-		}
-		catch(Exception $e){
-            $error_output=array(
-				'status'=>'failed',
-				'message'=>$e->getMessage()
-			);
-			$this->set_response($error_output, REST_Controller::HTTP_BAD_REQUEST);			
-		}
-    }
-
-	/**
-	 * 
-	 *  Batch Reload facets/filters by dataset type
-	 * 
-	 * @dataset_type - dataset type - microdata, timeseries, etc
-	 * @limit - number of items to process per request
-	 * @start - starting dataset id
-	 * 
-	 */
-	public function batch_refresh_filters_get($dataset_type=null, $limit=100, $start=0)
-	{		
-		try{
-			$user_id=$this->get_api_user_id();
-			$this->has_dataset_access('edit');
-			if ($dataset_type==null){
-				throw new Exception("DATASET_TYPE_IS_REQUIRED");
-			}
-
-			if(!is_numeric($start)){
-				throw new Exception("PARAM:START-INVALID");
-			}
-			
-			$datasets=(array)$this->dataset_manager->get_list_by_type($dataset_type, $limit, $start);
-			
-			$last_processed=null;
-			$output=array();
-			foreach($datasets  as $dataset){
-				$this->dataset_manager->refresh_filters($dataset['id']);
-				$output[]=$dataset['id'];
-				$last_processed=$dataset['id'];
-			}
-			
-			$output=array(
-				'status'=>'success',
-				'datasets_updated'=>$output,
-				'last_processed'=>$last_processed			
-			);
-			$this->set_response($output, REST_Controller::HTTP_OK);
-		}
-		catch(Exception $e){
-			$this->set_response($e->getMessage(), REST_Controller::HTTP_BAD_REQUEST);
-		}				
-	}
-
 
 	/**
 	 * 
@@ -1829,14 +1729,15 @@ public function batch_refresh_filters_get($dataset_type=null, $limit=100, $start
 	 * @start - starting dataset id
 	 * 
 	 */
-	public function batch_repopulate_index_put($dataset_type=null, $limit=100, $start=0)
+	public function batch_repopulate_index_get($dataset_type=null, $limit=100, $start=0)
 	{		
 		try{
 			$user_id=$this->get_api_user_id();
 			$this->has_dataset_access('edit');
-			if ($dataset_type==null){
+
+			/*if ($dataset_type==null){
 				throw new Exception("DATASET_TYPE_IS_REQUIRED");
-			}
+			}*/
 
 			if(!is_numeric($start)){
 				throw new Exception("PARAM:START-INVALID");
@@ -1845,7 +1746,8 @@ public function batch_repopulate_index_put($dataset_type=null, $limit=100, $star
 			$datasets=$this->dataset_manager->get_list_by_type($dataset_type, $limit, $start);
 			
 			$output=array();
-			foreach($datasets  as $dataset){
+			$last_processed=0;
+			foreach($datasets as $dataset){
 				$this->dataset_manager->repopulate_index($dataset['id']);
 				$output[]=$dataset['id'];
 				$last_processed=$dataset['id'];
diff --git a/application/libraries/Catalog_search_mysql.php b/application/libraries/Catalog_search_mysql.php
index 7b4020f25..1b3330862 100644
--- a/application/libraries/Catalog_search_mysql.php
+++ b/application/libraries/Catalog_search_mysql.php
@@ -1083,9 +1083,10 @@ public function vsearch($limit = 15, $offset = 0)
 		$dtype=$this->_build_dtype_query();
 		$tags=$this->_build_tags_query();
 		$repository=$this->_build_repository_query();
+		$type=$this->_build_dataset_type_query();
 		
 		//array of all options
-		$where_list=array($study,$variable,$topics,$countries,$years,$collections,$dtype,$tags,$repository,$regions);
+		$where_list=array($study,$variable,$topics,$countries,$years,$collections,$dtype,$tags,$repository,$regions,$type);
 
         //show only publshed studies
         $where_list[]='published=1';
@@ -1198,7 +1199,7 @@ public function v_quick_search($sid=NULL,$limit=50,$offset=0)
 
 		//search
 		$this->ci->db->limit($limit, $offset);		
-		$this->ci->db->select("v.uid,v.name,v.labl,v.vid,v.qstn");
+		$this->ci->db->select("v.uid,v.name,v.labl,v.vid,v.qstn, v.fid");
 		$this->ci->db->order_by($sort_by, $sort_order); 
 		$this->ci->db->where($where);
 		$this->ci->db->where('sid',$sid);
diff --git a/application/libraries/Catalog_search_sqlsrv.php b/application/libraries/Catalog_search_sqlsrv.php
index 815999485..b5a821350 100644
--- a/application/libraries/Catalog_search_sqlsrv.php
+++ b/application/libraries/Catalog_search_sqlsrv.php
@@ -880,9 +880,10 @@ function vsearch($limit = 15, $offset = 0)
 		$years=$this->_build_years_query();
 		$dtype=$this->_build_dtype_query();
 		$repository = $this->_build_repository_query();
+		$type=$this->_build_dataset_type_query();
 		
 		//array of all options
-		$where_list=array($variable,$topics,$countries,$years,$dtype,$repository);
+		$where_list=array($variable,$topics,$countries,$years,$dtype,$repository,$type);
 
         //show only publshed studies
         $where_list[]='published=1';
diff --git a/application/libraries/Dataset_manager.php b/application/libraries/Dataset_manager.php
index a81f320c0..454456a9a 100644
--- a/application/libraries/Dataset_manager.php
+++ b/application/libraries/Dataset_manager.php
@@ -138,43 +138,59 @@ function get_metadata($sid,$type=null)
 
     /**
      * 
+     * Repopulate indexes
      * 
-     * Reload facets/filters data
-     * 
+     * @sid_arr - array of IDs
+     * @index_options (array)
+     *  - study | all study level options (core, facets,keywords, var_keywords)
+     *  - core | only subtitle field for now
+     *  - facets | tags, years
+     *  - keywords | study keywords
+     *  - var_keywords | variable keywords
+     *  - var | all fields for vars
      */
-    function refresh_filters($sid)
+    function repopulate_index($sid, $index_options=array('core','facets','keywords'))
     {
-        $dataset=$this->get_row($sid);
-        $metadata=$this->get_metadata($sid);
-        $type=$dataset['type'];
+        $metadata=$this->ci->Dataset_model->get_metadata($sid);
+        $type=$metadata['schematype'];
+        $core_fields=$this->ci->{'Dataset_'.$this->types[$type].'_model'}->get_core_fields($metadata);
 
-        return $this->ci->{'Dataset_'.$this->types[$type].'_model'}->update_filters($sid,$metadata);
-    }
+        //core/subtitle
+        if (in_array('core',$index_options) || in_array('study',$index_options)){
 
+            $this->ci->Dataset_model->update_options($sid,array(
+                'subtitle'=>isset($core_fields['subtitle']) ? $core_fields['subtitle']: null,
+                'year_start'=>$core_fields['year_start'],
+                'year_end'=>$core_fields['year_end'],
+                ));
+        }
 
-    /**
-     * 
-     * 
-     * Repopulate dataset index
-     * 
-     */
-    function repopulate_index($sid)
-    {
-        //return $this->ci->Dataset_model->repopulate_index($sid);
+        //study keywords
+        if (in_array('keywords',$index_options) || in_array('study',$index_options)){
+            $data=array(
+                'keywords'=>$this->ci->Dataset_model->extract_keywords($metadata,$type)
+            );
+    
+            $this->ci->db->where('id',$sid);
+            $this->ci->db->update('surveys',$data);
+        }
 
-        $metadata=$this->ci->Dataset_model->get_metadata($sid);
-		$type=$this->ci->Dataset_model->get_type($sid);
-
-		$data=array(
-			'keywords'=>$this->ci->Dataset_model->extract_keywords($metadata,$type)
-		);
-
-		if($type=='survey'){
-			$this->ci->Dataset_microdata_model->index_variable_data($sid);
-		}
-		
-		$this->ci->db->where('id',$sid);
-		return $this->ci->db->update('surveys',$data);
+        //microdata variable keywords
+        if (in_array('var_keywords',$index_options) || in_array('study',$index_options)){
+            if($type=='survey'){
+                $this->ci->Dataset_microdata_model->index_variable_data($sid);
+            }    
+        }
+
+        //facets
+        if (in_array('facets',$index_options) || in_array('study',$index_options)){
+            $this->ci->{'Dataset_'.$this->types[$metadata['schematype']].'_model'}->update_filters($sid,$metadata);
+        }
+
+        //variables
+        if (in_array('var',$index_options)){
+            //todo
+        }
     }
 
 
diff --git a/application/views/catalog_search/compare.php b/application/views/catalog_search/compare.php
index a034235c8..cb90d768b 100644
--- a/application/views/catalog_search/compare.php
+++ b/application/views/catalog_search/compare.php
@@ -161,7 +161,7 @@ function eraseCookie(name) {
                 <?php if ($survey_title!==FALSE && $variable_name!==FALSE):?>
             	<div class="compare-box" >
 	            	<div class="compare-box-title" title="<?php echo t('click_drag_move');?>">
-						<div class="var-name" ><?php echo $variable_name;?></div>
+						<div class="var-name text-truncate" style="max-width:70%" ><?php echo $variable_name;?></div>
                         <div class="var-links" >
 							<?php echo anchor('catalog/compare/#remove='.$item['sid'].'/'.$item['vid'],t('remove'),array('class'=>'remove btn btn-outline-primary btn-sm','title'=>t('remove'),'id'=>$item['sid'].'/'.$item['vid']));?>
                         </div>
diff --git a/application/views/catalog_search/var_quick_list.php b/application/views/catalog_search/var_quick_list.php
index bacd7e179..bed9b7af1 100644
--- a/application/views/catalog_search/var_quick_list.php
+++ b/application/views/catalog_search/var_quick_list.php
@@ -7,6 +7,7 @@
         <thead>
             <tr>
                 <th><?php echo anchor('catalog/compare',t('compare'), array('class'=>'btn-compare-var','title'=>t('compare_selected_variables'),'target'=>'_blank'));?></th>
+                <th><?php echo t('File');?></th>
                 <th><?php echo t('name');?></th>
                 <th><?php echo t('label');?></th>
             </tr>
@@ -15,17 +16,16 @@
             <?php foreach($variables as $row):?>
                 <?php
                 $compare='';
-                //compare items selected
-                if (in_array($surveyid.'/'.$row['vid'],$compare_items) )
-                {
+                if (in_array($surveyid.'/'.$row['vid'],$compare_items) ){
                     $compare=' checked="checked" ';
                 }
                 ?>
-                <tr  class="vrow" data-url="<?php echo site_url('catalog/'.$surveyid.'/variable/'.$row['vid']); ?>" data-url-target="_blank" data-title="<?php echo $row['labl'];?>">
+                <tr  class="vrow" data-url="<?php echo site_url('catalog/'.$surveyid.'/variable/'.$row['vid']); ?>" data-url-target="_blank" data-title="<?php echo $row['labl'];?>">                    
                     <td title="<?php echo t('mark_for_variable_comparison');?>">
                         <input type="checkbox" class="nada-form-check-input compare" value="<?php echo $surveyid.'/'
                             .$row['vid'] ?>" <?php echo $compare; ?>/>
                     </td>
+                    <td><div style="max-width:160px;" class="text-truncate"><?php echo $row['fid'];?></div></td>
                     <td><?php echo anchor('catalog/'.$surveyid.'/variable/'.$row['vid'],$row['name'],array('target'=>'blank_','title'=>$row['labl'],'class'=>'link'));?></td>
                     <td><?php echo $row['labl']?></td>
                 </tr>

From 189180a36e5db744819ececc28350090a16530d5 Mon Sep 17 00:00:00 2001
From: Mehmood Asghar <mah0001@gmail.com>
Date: Mon, 25 Apr 2022 12:36:56 -0400
Subject: [PATCH 44/79] clean up how facets are populated

---
 application/models/Dataset_document_model.php | 28 +++------
 .../models/Dataset_geospatial_model.php       | 58 ++++++++-----------
 application/models/Dataset_image_model.php    | 38 +++++++-----
 .../models/Dataset_microdata_model.php        | 46 +++------------
 application/models/Dataset_model.php          | 17 +++++-
 application/models/Dataset_script_model.php   | 29 ++++------
 application/models/Dataset_table_model.php    | 34 ++++++-----
 .../models/Dataset_timeseries_model.php       | 41 ++++---------
 application/models/Dataset_video_model.php    | 29 ++++------
 .../models/Dataset_visualization_model.php    | 33 +++++++----
 10 files changed, 151 insertions(+), 202 deletions(-)

diff --git a/application/models/Dataset_document_model.php b/application/models/Dataset_document_model.php
index d52e249dd..0204548e2 100644
--- a/application/models/Dataset_document_model.php
+++ b/application/models/Dataset_document_model.php
@@ -105,25 +105,12 @@ function create_dataset($type,$options, $sid=null)
             $dataset_id=$this->insert($type,$options);
         }
 
-		//update years
-		$this->update_years($dataset_id,$core_fields['year_start'],$core_fields['year_end']);
-
-		//update tags
-        $this->update_survey_tags($dataset_id, $this->get_tags($options['metadata']));
+        $this->update_filters($dataset_id,$options['metadata']);
 
         //import external resources
         $this->update_resources($dataset_id,$external_resources);
 
-        //update related countries
-        $this->Survey_country_model->update_countries($dataset_id,$core_fields['nations']);
-
-		//set aliases
-
-		//set geographic locations (bounding box)
-
-		//complete transaction
 		$this->db->trans_complete();
-
 		return $dataset_id;
     }
 
@@ -206,17 +193,18 @@ function get_years($options)
      * 
      * 
      */
-    function update_filters($sid, $metadata)
+    function update_filters($sid, $metadata=null)
     {
+        if (!is_array($metadata)){            
+            return false;
+        }
+
         $core_fields=$this->get_core_fields($metadata);
 
-        //update years
 		$this->update_years($sid,$core_fields['year_start'],$core_fields['year_end']);
-
-		//set topics
-
-        //update related countries
         $this->Survey_country_model->update_countries($sid,$core_fields['nations']);
+        $this->add_tags($sid,$this->get_array_nested_value($metadata,'tags'));
+        return true;
     }
 
 
diff --git a/application/models/Dataset_geospatial_model.php b/application/models/Dataset_geospatial_model.php
index 7dbb4a3c7..1dc94f8d0 100644
--- a/application/models/Dataset_geospatial_model.php
+++ b/application/models/Dataset_geospatial_model.php
@@ -71,7 +71,6 @@ function create_dataset($type,$options,$sid=null)
             unset($options['metadata']['description']['distributionInfo']['transferOptions']['onLine']);
         }
 
-
 		//start transaction
 		$this->db->trans_start();
 
@@ -88,30 +87,17 @@ function create_dataset($type,$options,$sid=null)
             $dataset_id=$this->insert($type,$options);
         }
 
-		//update years
-        $this->update_years($dataset_id,$core_fields['year_start'],$core_fields['year_end']);
+        $this->update_filters($dataset_id,$options['metadata']);
 
-        $this->add_tags($dataset_id,$this->get_array_nested_value($options,'metadata/tags'));
-        
         //import external resources
         $this->update_resources($dataset_id,$external_resources);
 
-		//set topics
-
         //feature catalog
         $this->upsert_feature_catalog($dataset_id,$feature_catalog);
 
+        //update surveys.keywords
         $this->update_feature_keywords($dataset_id,$feature_catalog);
         
-        //update related countries
-        $this->Survey_country_model->update_countries($dataset_id,$core_fields['nations']);
-
-		//set aliases
-
-		//set geographic locations (bounding box)
-        $bbox=$this->get_bbox_array($options['metadata']);
-        $this->update_locations($dataset_id, $bbox);
-
 		//complete transaction
 		$this->db->trans_complete();
 
@@ -253,21 +239,29 @@ function get_metadata($sid)
 	}    
 
 
-     /**
+    
+    /**
      * 
      * Update all related tables used for facets/filters
      * 
      * 
      */
-    function update_filters($sid, $metadata)
+    function update_filters($sid, $metadata=null)
     {
+        if (!is_array($metadata)){            
+            return false;
+        }
+
         $core_fields=$this->get_core_fields($metadata);
 
-        //update years
 		$this->update_years($sid,$core_fields['year_start'],$core_fields['year_end']);
-
-        //update related countries
         $this->Survey_country_model->update_countries($sid,$core_fields['nations']);
+        $this->add_tags($sid,$this->get_array_nested_value($metadata,'tags'));
+
+        $bbox=$this->get_bbox_array($metadata);
+        $this->update_locations($sid, $bbox);
+
+        return true;
     }
 
 
@@ -277,6 +271,9 @@ function get_bbox_array($metadata)
 
         $bbox=array();
         foreach($bbox_arr as $row){
+            if (!isset($row['northBoundLatitude'])){
+                continue;
+            }
             $bbox[]=array(
                 'north'=>$row['northBoundLatitude'],
                 'south'=>$row['southBoundLatitude'],
@@ -336,11 +333,17 @@ private function upsert_carrierOfCharacteristics($sid,$fid,$car_chars, $remove_e
         foreach($car_chars as $variable){
             $vid='V'.$var_counter++;
             $listed_values=isset($variable['listedValue']) ? $variable['listedValue'] : '';
+            $labl=isset($variable['definition']) ? $variable['definition'] : '';
+            
+            if ($labl>255){
+                $labl=substr(0,250).'...';
+            }
+
             $variable_metadata=array(
                 'fid'=>$fid,
                 'vid'=>$fid.'-'.$vid,
                 'name'=>isset($variable['memberName']) ? $variable['memberName'] : '',
-                //'labl'=>$variable['memberName'],
+                'labl'=>$labl,
                 'qstn'=>isset($variable['definition']) ? $variable['definition'] : '',
                 'catgry'=>$this->listed_values_to_str($listed_values),
                 'metadata'=>$variable
@@ -410,15 +413,4 @@ function listed_values_to_str($listed_values)
 
         return implode(" ",$output);
     }
-
-
-    function add_tags($sid, $tags)
-    {
-        if(empty($tags)){
-            return false;
-        }
-        
-        $tags=array_column($tags,'tag');
-        return parent::add_survey_tags($sid,$tags);        
-    }
 }
\ No newline at end of file
diff --git a/application/models/Dataset_image_model.php b/application/models/Dataset_image_model.php
index 8b0cc8df4..6e549402a 100644
--- a/application/models/Dataset_image_model.php
+++ b/application/models/Dataset_image_model.php
@@ -59,22 +59,9 @@ function create_dataset($type,$options)
             $dataset_id=$this->insert($type,$options);
         }
 
-		//update years
-        $this->update_years($dataset_id,$core_fields['year_start'],$core_fields['year_end']);
-        
-        //countries
-        $this->Survey_country_model->update_countries($dataset_id,$core_fields['nations']);
-
-		//set topics
-
-        //update tags
-        $this->update_survey_tags($dataset_id, $this->get_tags($options['metadata']));
+        $this->update_filters($dataset_id,$options['metadata']);
 
-		//set aliases
-
-		//set geographic locations (bounding box)
-
-		//complete transaction
+        //complete transaction
 		$this->db->trans_complete();
 
 		return $dataset_id;
@@ -230,6 +217,25 @@ function get_tags($options)
 
         return $output;
     }
-    
+ 
+    /**
+     * 
+     * Update all related tables used for facets/filters
+     * 
+     * 
+     */
+    function update_filters($sid, $metadata=null)
+    {
+        if (!is_array($metadata)){            
+            return false;
+        }
+
+        $core_fields=$this->get_core_fields($metadata);
+
+		$this->update_years($sid,$core_fields['year_start'],$core_fields['year_end']);
+        $this->Survey_country_model->update_countries($sid,$core_fields['nations']);
+        $this->add_tags($sid,$this->get_array_nested_value($metadata,'tags'));
+        return true;
+    }
 
 }
\ No newline at end of file
diff --git a/application/models/Dataset_microdata_model.php b/application/models/Dataset_microdata_model.php
index f8d8eff19..bb6f76c42 100644
--- a/application/models/Dataset_microdata_model.php
+++ b/application/models/Dataset_microdata_model.php
@@ -61,7 +61,7 @@ function create_dataset($type,$options, $sid=null,$is_update=false)
         }
 
         //get core fields for listing datasets in the catalog
-        $core_fields=$this->get_core_fields($type,$options);
+        $core_fields=$this->get_core_fields($options);
         $options=array_merge($options,$core_fields);
 
         if(!isset($core_fields['idno']) || empty($core_fields['idno'])){
@@ -113,22 +113,8 @@ function create_dataset($type,$options, $sid=null,$is_update=false)
         //set owner repo
         $this->Dataset_model->set_dataset_owner_repo($dataset_id,$options['repositoryid']); 
 
-		//update years
-		$this->update_years($dataset_id,$core_fields['year_start'],$core_fields['year_end']);
-
-        //set topics
-        //$this->delete_topics($dataset_id);
-        //$this->update_topics($dataset_id,$this->get_array_nested_value($options,'study_desc/study_info/topics'));
-
-		//update countries
-		$this->Survey_country_model->update_countries($dataset_id,$core_fields['nations']);
-
-		//set aliases
-        
-        //tags
-        $this->add_tags($dataset_id,$this->get_array_nested_value($options,'metadata/tags'));
-
-		//set geographic locations (bounding box)
+        //facets/filters
+        $this->update_filters($dataset_id,$options['metadata']);
 
         //for creating new studies, always remove the existing data
         $remove_existing=true;
@@ -468,7 +454,7 @@ private function create_update_data_files($dataset_id,$data_files, $remove_exist
 	 * 
 	 * 
 	 */
-	function get_core_fields($type,$options)
+	function get_core_fields($options)
 	{
 		$output=array();
 
@@ -614,35 +600,17 @@ function get_data_collection_years($options)
      * 
      * 
      */
-    function update_filters($sid, $metadata)
+    function update_filters($sid, $metadata=null)
     {        
         if (!is_array($metadata)){            
             return false;
         }
 
-        $core_fields=$this->get_core_fields($type='survey',$metadata);
-
-        //update years
-		$this->update_years($sid,$core_fields['year_start'],$core_fields['year_end']);
-
-		//tags
+        $core_fields=$this->get_core_fields($metadata);
+		$this->update_years($sid,$core_fields['year_start'],$core_fields['year_end']);        
         $this->add_tags($sid,$this->get_array_nested_value($metadata,'tags'));
-
-        //update related countries
         $this->Survey_country_model->update_countries($sid,$core_fields['nations']);
-
         return true;
     }
 
-
-
-    function add_tags($sid, $tags)
-    {
-        if(empty($tags)){
-            return false;
-        }
-        
-        $tags=array_column($tags,'tag');
-        return parent::add_survey_tags($sid,$tags);        
-    }
 }
\ No newline at end of file
diff --git a/application/models/Dataset_model.php b/application/models/Dataset_model.php
index 31445ec8d..04b0df3c4 100644
--- a/application/models/Dataset_model.php
+++ b/application/models/Dataset_model.php
@@ -132,10 +132,13 @@ function get_total_count()
 	 * 
 	 * 
 	 */
-	function get_list_by_type($dataset_type, $limit=100, $start=0)
+	function get_list_by_type($dataset_type=null, $limit=100, $start=0)
 	{
 		$this->db->select('id,idno');
-		$this->db->where('type',$dataset_type);
+		
+		if($dataset_type){
+			$this->db->where('type',$dataset_type);
+		}
 
 		if(is_numeric($start)){
 			$this->db->where('id>',$start);
@@ -1148,6 +1151,16 @@ function add_survey_tags($sid, $tags=array())
 		}
 	}
 
+	function add_tags($sid, $tags)
+    {
+        if(empty($tags)){
+            return false;
+        }
+        
+        $tags=array_column($tags,'tag');
+        return $this->add_survey_tags($sid,$tags);        
+    }
+
 
 
 	function add_survey_aliases($sid, $aliases=array())
diff --git a/application/models/Dataset_script_model.php b/application/models/Dataset_script_model.php
index 4c492fdc0..9ade934fd 100644
--- a/application/models/Dataset_script_model.php
+++ b/application/models/Dataset_script_model.php
@@ -61,18 +61,8 @@ function create_dataset($type,$options)
             $dataset_id=$this->insert($type,$options);
         }
 
-		//update years
-		$this->update_years($dataset_id,$core_fields['year_start'],$core_fields['year_end']);
-
-		//set topics
-
-        //update related countries
-		$this->Survey_country_model->update_countries($dataset_id,$core_fields['nations']);
-
-		//set aliases
-
-		//set geographic locations (bounding box)
-
+		$this->update_filters($dataset_id,$options['metadata']);
+        
 		//complete transaction
 		$this->db->trans_complete();
 
@@ -161,16 +151,17 @@ function get_years($options)
      * 
      * 
      */
-    function update_filters($sid, $metadata)
+    function update_filters($sid, $metadata=null)
     {
-        $core_fields=$this->get_core_fields($type='script',$metadata);
-
-        //update years
-		$this->update_years($sid,$core_fields['year_start'],$core_fields['year_end']);
+        if (!is_array($metadata)){            
+            return false;
+        }
 
-		//set topics
+        $core_fields=$this->get_core_fields($metadata);
 
-        //update related countries
+		$this->update_years($sid,$core_fields['year_start'],$core_fields['year_end']);
         $this->Survey_country_model->update_countries($sid,$core_fields['nations']);
+        $this->add_tags($sid,$this->get_array_nested_value($metadata,'tags'));
+        return true;
     }
 }
\ No newline at end of file
diff --git a/application/models/Dataset_table_model.php b/application/models/Dataset_table_model.php
index a7a321b74..b0acfec2b 100644
--- a/application/models/Dataset_table_model.php
+++ b/application/models/Dataset_table_model.php
@@ -107,24 +107,11 @@ function create_dataset($type,$options,$sid=null)
             $dataset_id=$this->insert($type,$options);
         }
 
-		//update years
-        $this->update_years($dataset_id,$core_fields['year_start'],$core_fields['year_end']);
-        
-        //update tags
-        $this->update_survey_tags($dataset_id, $this->get_tags($options['metadata']));
+        $this->update_filters($dataset_id,$options['metadata']);		
 
         //import external resources
         $this->update_resources($dataset_id,$external_resources);
 
-		//set topics
-
-        //update related countries
-        $this->Survey_country_model->update_countries($dataset_id,$core_fields['nations']);
-
-		//set aliases
-
-		//set geographic locations (bounding box)
-
 		//complete transaction
 		$this->db->trans_complete();
 
@@ -230,4 +217,23 @@ function get_metadata($sid)
        return $metadata;
 	}
 
+    /**
+     * 
+     * Update all related tables used for facets/filters
+     * 
+     * 
+     */
+    function update_filters($sid, $metadata=null)
+    {
+        if (!is_array($metadata)){            
+            return false;
+        }
+
+        $core_fields=$this->get_core_fields($metadata);
+
+		$this->update_years($sid,$core_fields['year_start'],$core_fields['year_end']);
+        $this->Survey_country_model->update_countries($sid,$core_fields['nations']);
+        $this->add_tags($sid,$this->get_array_nested_value($metadata,'tags'));
+        return true;
+    }
 }
\ No newline at end of file
diff --git a/application/models/Dataset_timeseries_model.php b/application/models/Dataset_timeseries_model.php
index d0b4f495f..9c1714963 100644
--- a/application/models/Dataset_timeseries_model.php
+++ b/application/models/Dataset_timeseries_model.php
@@ -78,16 +78,14 @@ function create_dataset($type,$options, $sid=null)
 
         $options['changed']=date("U");
         
-        $study_metadata_sections=array('metadata_creation','series_description','provenance','embeddings','lda_topics','tags','additional');
-        
+        $study_metadata_sections=array('metadata_creation','series_description','provenance','embeddings','lda_topics','tags','additional');        
 
         foreach($study_metadata_sections as $section){		
 			if(array_key_exists($section,$options)){
                 $options['metadata'][$section]=$options[$section];
                 unset($options[$section]);
             }
-        }
-                        
+        }                        
 
 		//start transaction
 		$this->db->trans_start();
@@ -101,17 +99,7 @@ function create_dataset($type,$options, $sid=null)
             $dataset_id=$this->insert($type,$options);
         }
 
-		//update years
-		$this->update_years($dataset_id,$core_fields['year_start'],$core_fields['year_end']);
-
-		//set topics
-
-        //update related countries
-		$this->Survey_country_model->update_countries($dataset_id,$core_fields['nations']);
-
-		//set aliases
-
-		//set geographic locations (bounding box)
+        $this->update_filters($dataset_id,$options['metadata']);
 
 		//complete transaction
 		$this->db->trans_complete();
@@ -126,25 +114,18 @@ function create_dataset($type,$options, $sid=null)
      * 
      * 
      */
-    function update_filters($sid, $metadata)
+    function update_filters($sid, $metadata=null)
     {
+        if (!is_array($metadata)){            
+            return false;
+        }
+
         $core_fields=$this->get_core_fields($metadata);
 
-        //update years
 		$this->update_years($sid,$core_fields['year_start'],$core_fields['year_end']);
-
-		//set topics
-
-        //update countries field for dataset
-        $dataset_options=array(
-            'nation'=>$core_fields['nation']
-        );
-
-        $this->update_options($sid,$dataset_options);
-
-        //update related countries
-        $countries=$core_fields['nations'];
-		$this->Survey_country_model->update_countries($sid,$countries);
+        $this->Survey_country_model->update_countries($sid,$core_fields['nations']);
+        $this->add_tags($sid,$this->get_array_nested_value($metadata,'tags'));
+        return true;
     }
 
 
diff --git a/application/models/Dataset_video_model.php b/application/models/Dataset_video_model.php
index 56a7722c7..1527f1c91 100644
--- a/application/models/Dataset_video_model.php
+++ b/application/models/Dataset_video_model.php
@@ -105,23 +105,12 @@ function create_dataset($type,$options, $sid=null)
             $dataset_id=$this->insert($type,$options);
         }
 
-		//update years
-		$this->update_years($dataset_id,$core_fields['year_start'],$core_fields['year_end']);
-
-		//update tags
-        $this->update_survey_tags($dataset_id, $this->get_tags($options['metadata']));
+        $this->update_filters($dataset_id,$options['metadata']);
 
         //import external resources
         $this->update_resources($dataset_id,$external_resources);
 
-        //update related countries
-        $this->Survey_country_model->update_countries($dataset_id,$core_fields['nations']);
-
-		//set aliases
-
-		//set geographic locations (bounding box)
-
-		//complete transaction
+        //complete transaction
 		$this->db->trans_complete();
 
 		return $dataset_id;
@@ -190,17 +179,19 @@ function get_years($options)
      * 
      * 
      */
-    function update_filters($sid, $metadata)
+    function update_filters($sid, $metadata=null)
     {
+        if (!is_array($metadata)){            
+            return false;
+        }
+
         $core_fields=$this->get_core_fields($metadata);
 
-        //update years
 		$this->update_years($sid,$core_fields['year_start'],$core_fields['year_end']);
-
-		//set topics
-
-        //update related countries
         $this->Survey_country_model->update_countries($sid,$core_fields['nations']);
+        $this->add_tags($sid,$this->get_array_nested_value($metadata,'tags'));
+
+        return true;
     }
 
 
diff --git a/application/models/Dataset_visualization_model.php b/application/models/Dataset_visualization_model.php
index 4e8e08339..b6bfba034 100644
--- a/application/models/Dataset_visualization_model.php
+++ b/application/models/Dataset_visualization_model.php
@@ -59,16 +59,7 @@ function create_dataset($type,$options)
             $dataset_id=$this->insert($type,$options);
         }
 
-		//update years
-		$this->update_years($dataset_id,$core_fields['year_start'],$core_fields['year_end']);
-
-		//set topics
-
-        //update related countries
-
-		//set aliases
-
-		//set geographic locations (bounding box)
+        $this->update_filters($dataset_id,$options['metadata']);
 
 		//complete transaction
 		$this->db->trans_complete();
@@ -129,4 +120,26 @@ function get_years($options)
 		);
 	}
 
+
+    /**
+     * 
+     * Update all related tables used for facets/filters
+     * 
+     * 
+     */
+    function update_filters($sid, $metadata=null)
+    {
+        if (!is_array($metadata)){            
+            return false;
+        }
+
+        $core_fields=$this->get_core_fields($metadata);
+
+		$this->update_years($sid,$core_fields['year_start'],$core_fields['year_end']);
+        $this->Survey_country_model->update_countries($sid,$core_fields['nations']);
+        $this->add_tags($sid,$this->get_array_nested_value($metadata,'tags'));
+
+        return true;
+    }
+
 }
\ No newline at end of file

From 7e05693b9a61b4912dee5bdb29f76267367c27c6 Mon Sep 17 00:00:00 2001
From: Mehmood Asghar <mah0001@gmail.com>
Date: Mon, 25 Apr 2022 14:19:22 -0400
Subject: [PATCH 45/79] Update display for 'data dictionary' tab for geospatial
 features

---
 .../language/base/catalog_search_lang.php     |  2 +-
 .../language/english/catalog_search_lang.php  |  2 +-
 application/models/Data_file_model.php        |  9 +++---
 .../models/Dataset_geospatial_model.php       |  8 ++++-
 application/views/survey_info/data_files.php  | 29 +++++++++++++++----
 .../views/survey_info/variables_by_file.php   |  5 ++++
 6 files changed, 41 insertions(+), 14 deletions(-)

diff --git a/application/language/base/catalog_search_lang.php b/application/language/base/catalog_search_lang.php
index ec9441c7f..21c035324 100644
--- a/application/language/base/catalog_search_lang.php
+++ b/application/language/base/catalog_search_lang.php
@@ -245,7 +245,7 @@
 $lang['script_description']="Project Description";
 $lang['visualization_description']="Visualization Description";
 $lang['microdata_description']="Study Description";
-$lang['data_dictionary']="Data Description";
+$lang['data_dictionary']="Data Dictionary";
 $lang['get_microdata']="Get Microdata";
 $lang['related_materials']="Downloads";
 $lang['downloads']="Downloads";
diff --git a/application/language/english/catalog_search_lang.php b/application/language/english/catalog_search_lang.php
index c6d888942..f3af4efbb 100644
--- a/application/language/english/catalog_search_lang.php
+++ b/application/language/english/catalog_search_lang.php
@@ -246,7 +246,7 @@
 $lang['script_description']="Project Description";
 $lang['visualization_description']="Visualization Description";
 $lang['microdata_description']="Study Description";
-$lang['data_dictionary']="Data Description";
+$lang['data_dictionary']="Data Dictionary";
 $lang['get_microdata']="Get Microdata";
 $lang['related_materials']="Downloads";
 $lang['downloads']="Downloads";
diff --git a/application/models/Data_file_model.php b/application/models/Data_file_model.php
index 5657feea6..57ead330f 100644
--- a/application/models/Data_file_model.php
+++ b/application/models/Data_file_model.php
@@ -13,7 +13,8 @@ class Data_file_model extends CI_Model {
 		'data_checks',
 		'missing_data',
 		'version',
-		'notes'
+		'notes',
+		'metadata'
 	);
 
     public function __construct()
@@ -166,12 +167,10 @@ function insert($sid,$options)
 			}
 		}
 
-		$data['sid']=$sid;
-		
+		$data['sid']=$sid;		
 		$result=$this->db->insert('data_files', $data);
 
-		if ($result===false)
-		{
+		if ($result===false){
 			throw new MY_Exception($this->db->_error_message());
 		}
 		
diff --git a/application/models/Dataset_geospatial_model.php b/application/models/Dataset_geospatial_model.php
index 1dc94f8d0..5043acb97 100644
--- a/application/models/Dataset_geospatial_model.php
+++ b/application/models/Dataset_geospatial_model.php
@@ -298,12 +298,18 @@ function upsert_feature_catalog($sid,$feature_catalog)
         $file_counter=1;
         foreach($feature_catalog['featureType'] as $feature_type)
         {
+            $file_metadata=$feature_type;
+            if (isset($file_metadata['carrierOfCharacteristics'])){
+                unset($file_metadata['carrierOfCharacteristics']);
+            }
+            
             $file_id='F'.$file_counter++;
             $data_file=array(
                 'sid'=>$sid,
                 'file_id'=>$file_id,
                 'file_name'=>$feature_type['typeName'],
-                'description'=>$feature_type['definition']                
+                'description'=>$feature_type['definition'],
+                'metadata'=> json_encode($file_metadata)
             );
 
             $file=$this->Data_file_model->get_file_by_id($sid,$file_id);
diff --git a/application/views/survey_info/data_files.php b/application/views/survey_info/data_files.php
index 2be97fdf9..06f92cb1b 100644
--- a/application/views/survey_info/data_files.php
+++ b/application/views/survey_info/data_files.php
@@ -6,24 +6,41 @@
 
 </style>
 
+<?php
+    $case_counts_col=array_filter(array_column($files,'case_count'));
+    $var_count_col=array_filter(array_column($files,'var_count'));
+?>
+
 <h3><?php echo t('data_dictionary');?></h3>
 <table class="table table-data-files ddi-table data-dictionary" >
     <tbody>
     <tr>
         <th><?php echo t('data_file');?></th>
-        <th><?php echo t('cases');?></th>
-        <th><?php echo t('variables');?></th>
+
+        <?php if(!empty($case_counts_col)):?>
+            <th><?php echo t('cases');?></th>
+        <?php endif;?>
+        
+        <?php if(!empty($case_counts_col)):?>
+            <th><?php echo t('variables');?></th>
+        <?php endif;?>
     </tr>
     <?php foreach($files as $file):?>
     <tr class="data-file-row row-color1" data-url="<?php echo site_url("catalog/$sid/data-dictionary/{$file['file_id']}");?>">
         <td>
             <a href="<?php echo site_url("catalog/$sid/data-dictionary/{$file['file_id']}");?>?file_name=<?php echo html_escape($file['file_name']);?>"><?php echo $file['file_name'];?></a>
-            <!--<a href="<?php echo site_url("study/data_file/$sid/{$file['file_id']}");?>?file_name=<?php echo html_escape($file['file_name']);?>"><?php echo $file['file_name'];?></a>-->
+            <?php /*
+            <a href="<?php echo site_url("study/data_file/$sid/{$file['file_id']}");?>?file_name=<?php echo html_escape($file['file_name']);?>"><?php echo $file['file_name'];?></a>
+            */ ?>
         
-        <div class="file-description"><?php echo nl2br($file['description']);?></div>
-    </td>
-        <td><?php echo $file['case_count'];?></td>
+            <div class="file-description"><?php echo nl2br($file['description']);?></div>
+        </td>
+        <?php if(!empty($case_counts_col)):?>)
+            <td><?php echo $file['case_count'];?></td>
+        <?php endif;?>
+        <?php if(!empty($case_counts_col)):?>
         <td><?php echo $file['var_count'];?></td>
+        <?php endif;?>
     </tr>
     <?php endforeach;?>
     </tbody>
diff --git a/application/views/survey_info/variables_by_file.php b/application/views/survey_info/variables_by_file.php
index 46ed91ebd..0ea845419 100644
--- a/application/views/survey_info/variables_by_file.php
+++ b/application/views/survey_info/variables_by_file.php
@@ -110,14 +110,19 @@
             <?php endif;?>
         
             <table class="data-file-bg1">
+                <?php if ($file['case_count']):?>
                 <tr>
                     <td style="width:100px;"><?php echo t('cases');?>: </td>
                     <td><?php echo $file['case_count'];?></td>
                 </tr>
+                <?php endif;?>
+                
+                <?php if ($file['var_count']):?>
                 <tr>
                     <td><?php echo t('variables');?>: </td>
                     <td><?php echo $file['var_count'];?></td>
                 </tr>
+                <?php endif;?>
 
                 <?php if(isset($file['producer']) && !empty($file['producer'])):?>
                 <tr>

From 445e53c770492802d07703c65db967cb3947728f Mon Sep 17 00:00:00 2001
From: Mehmood Asghar <mah0001@gmail.com>
Date: Mon, 25 Apr 2022 15:07:09 -0400
Subject: [PATCH 46/79] db changes for geospatial features

---
 install/nada52.1-upgrade-mysql.sql  | 5 +++++
 install/nada52.1-upgrade-sqlsrv.sql | 5 +++++
 install/schema.mysql.sql            | 1 +
 install/schema.sqlsrv.sql           | 1 +
 4 files changed, 12 insertions(+)
 create mode 100644 install/nada52.1-upgrade-mysql.sql
 create mode 100644 install/nada52.1-upgrade-sqlsrv.sql

diff --git a/install/nada52.1-upgrade-mysql.sql b/install/nada52.1-upgrade-mysql.sql
new file mode 100644
index 000000000..831bf66d9
--- /dev/null
+++ b/install/nada52.1-upgrade-mysql.sql
@@ -0,0 +1,5 @@
+-- nada 5.2.1 db changes for mysql
+
+ALTER TABLE `data_files` ADD `metadata` varchar(5000) DEFAULT NULL;
+ALTER TABLE `surveys` ADD `subtitle` varchar(255) DEFAULT NULL;
+
diff --git a/install/nada52.1-upgrade-sqlsrv.sql b/install/nada52.1-upgrade-sqlsrv.sql
new file mode 100644
index 000000000..740706758
--- /dev/null
+++ b/install/nada52.1-upgrade-sqlsrv.sql
@@ -0,0 +1,5 @@
+-- nada 5.2.1 db changes for SQLSRV
+
+ALTER TABLE data_files ADD metadata varchar(5000) DEFAULT NULL;
+ALTER TABLE surveys ADD subtitle varchar(255) DEFAULT NULL;
+
diff --git a/install/schema.mysql.sql b/install/schema.mysql.sql
index 0faa349ee..dce5d4ea4 100644
--- a/install/schema.mysql.sql
+++ b/install/schema.mysql.sql
@@ -1252,6 +1252,7 @@ CREATE TABLE `data_files` (
   `missing_data` varchar(255) DEFAULT NULL,
   `version` varchar(255) DEFAULT NULL,
   `notes` varchar(255) DEFAULT NULL,
+  `metadata` varchar(5000) DEFAULT NULL,
   PRIMARY KEY (`id`),
   UNIQUE KEY `survey_file` (`sid`,`file_id`)  
 ) AUTO_INCREMENT=1 DEFAULT CHARSET=utf8;
diff --git a/install/schema.sqlsrv.sql b/install/schema.sqlsrv.sql
index b2b928cb7..2a8e3629b 100644
--- a/install/schema.sqlsrv.sql
+++ b/install/schema.sqlsrv.sql
@@ -1369,6 +1369,7 @@ CREATE TABLE data_files (
   missing_data varchar(255) DEFAULT NULL,
   version varchar(255) DEFAULT NULL,
   notes varchar(255) DEFAULT NULL,
+  metadata varchar(max) DEFAULT NULL,
   PRIMARY KEY (id)  
 );
 

From 181cd1dfa33e9db1ffb08bf356fc62929a11375b Mon Sep 17 00:00:00 2001
From: Mehmood Asghar <mah0001@gmail.com>
Date: Mon, 25 Apr 2022 15:15:19 -0400
Subject: [PATCH 47/79] minor

---
 application/libraries/Catalog_search_sqlsrv.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/application/libraries/Catalog_search_sqlsrv.php b/application/libraries/Catalog_search_sqlsrv.php
index b5a821350..7da38f163 100644
--- a/application/libraries/Catalog_search_sqlsrv.php
+++ b/application/libraries/Catalog_search_sqlsrv.php
@@ -911,7 +911,7 @@ function vsearch($limit = 15, $offset = 0)
 		
 		//search
 		$this->ci->db->limit($limit, $offset);		
-		$this->ci->db->select("v.uid,v.name,v.labl,v.vid, v.qstn, surveys.title as title,surveys.nation as nation, v.sid, surveys.idno",FALSE);
+		$this->ci->db->select("v.fid,v.uid,v.name,v.labl,v.vid, v.qstn, surveys.title as title,surveys.nation as nation, v.sid, surveys.idno",FALSE);
 		$this->ci->db->join('surveys', 'v.sid = surveys.id','inner');	
 		$this->ci->db->join('forms f','surveys.formid=f.formid','left');
 		$this->ci->db->join('repositories','surveys.repositoryid=repositories.repositoryid','left');

From 6a85730d2f6ba2a1a09cb9a53c82ac3484916581 Mon Sep 17 00:00:00 2001
From: Mehmood Asghar <mah0001@gmail.com>
Date: Mon, 25 Apr 2022 15:21:22 -0400
Subject: [PATCH 48/79] minor

---
 application/libraries/Catalog_search_sqlsrv.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/application/libraries/Catalog_search_sqlsrv.php b/application/libraries/Catalog_search_sqlsrv.php
index 7da38f163..1644a0f95 100644
--- a/application/libraries/Catalog_search_sqlsrv.php
+++ b/application/libraries/Catalog_search_sqlsrv.php
@@ -911,7 +911,7 @@ function vsearch($limit = 15, $offset = 0)
 		
 		//search
 		$this->ci->db->limit($limit, $offset);		
-		$this->ci->db->select("v.fid,v.uid,v.name,v.labl,v.vid, v.qstn, surveys.title as title,surveys.nation as nation, v.sid, surveys.idno",FALSE);
+		$this->ci->db->select("v.uid,v.name,v.labl,v.vid, v.qstn, surveys.title as title,surveys.nation as nation, v.sid, surveys.idno",FALSE);
 		$this->ci->db->join('surveys', 'v.sid = surveys.id','inner');	
 		$this->ci->db->join('forms f','surveys.formid=f.formid','left');
 		$this->ci->db->join('repositories','surveys.repositoryid=repositories.repositoryid','left');
@@ -1037,7 +1037,7 @@ function v_quick_search($surveyid=NULL,$limit=50,$offset=0)
 		
 		//search
 		$this->ci->db->limit($limit, $offset);		
-		$this->ci->db->select("v.uid,v.name,v.labl,v.vid,v.qstn");
+		$this->ci->db->select("v.uid,v.name,v.labl,v.vid,v.qstn,v.fid");
 		$this->ci->db->order_by($sort_by, $sort_order); 
 		$this->ci->db->where($where);
 		$this->ci->db->where('v.sid',$surveyid);

From c74aa8e10f96f2490e969b116c5a4615bfcf1bc0 Mon Sep 17 00:00:00 2001
From: Mehmood Asghar <mah0001@gmail.com>
Date: Wed, 27 Apr 2022 14:40:31 -0400
Subject: [PATCH 49/79] truncate long labels for geospatial features

---
 application/models/Dataset_geospatial_model.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/application/models/Dataset_geospatial_model.php b/application/models/Dataset_geospatial_model.php
index 5043acb97..0337d743f 100644
--- a/application/models/Dataset_geospatial_model.php
+++ b/application/models/Dataset_geospatial_model.php
@@ -341,7 +341,7 @@ private function upsert_carrierOfCharacteristics($sid,$fid,$car_chars, $remove_e
             $listed_values=isset($variable['listedValue']) ? $variable['listedValue'] : '';
             $labl=isset($variable['definition']) ? $variable['definition'] : '';
             
-            if ($labl>255){
+            if (strlen($labl)>255){
                 $labl=substr(0,250).'...';
             }
 

From b195a55ed2420299e7a320ed0aa6d26ed0b1542d Mon Sep 17 00:00:00 2001
From: Mehmood Asghar <mah0001@gmail.com>
Date: Fri, 29 Apr 2022 14:33:53 -0400
Subject: [PATCH 50/79] Update display for scripts

---
 application/controllers/api/Resources.php                | 4 ++++
 application/language/english/fields_scripts_lang.php     | 2 ++
 .../metadata_templates/fields/field_script_file.php      | 9 ++++++---
 3 files changed, 12 insertions(+), 3 deletions(-)

diff --git a/application/controllers/api/Resources.php b/application/controllers/api/Resources.php
index 8720791cf..323d2da93 100644
--- a/application/controllers/api/Resources.php
+++ b/application/controllers/api/Resources.php
@@ -149,6 +149,10 @@ function index_post($idno=null)
 					$options['filename']=$uploaded_file_name;
 				}
 
+				if(!isset($options['filename'])){
+					$options['filename']=null;
+				}
+				
 				//check if resource already exists
 				$resource_exists=$this->Survey_resource_model->check_duplicate($sid,$options['filename'], $options['title'],$options['dctype']);
 				$overwrite=isset($options["overwrite"]) ? $options["overwrite"] : false;
diff --git a/application/language/english/fields_scripts_lang.php b/application/language/english/fields_scripts_lang.php
index 65cdfd0d1..ca7d4885c 100644
--- a/application/language/english/fields_scripts_lang.php
+++ b/application/language/english/fields_scripts_lang.php
@@ -139,6 +139,8 @@
 $lang['metadata.project_desc.contacts.affiliation']='Affiliation';
 $lang['metadata.project_desc.contacts.uri']='URI';
 $lang['metadata.project_desc.contacts.phone']='Phone number';
+$lang['metadata.project_desc.contacts.role']='Role';
+$lang['metadata.project_desc.contacts.email']='Email';
 $lang['metadata.project_desc.scripts']='Scripts';
 $lang['metadata.project_desc.scripts.file_name']='File name';
 $lang['metadata.project_desc.scripts.zip_package']='Zip archive';
diff --git a/application/views/metadata_templates/fields/field_script_file.php b/application/views/metadata_templates/fields/field_script_file.php
index 957ac5fc4..6b50d5993 100644
--- a/application/views/metadata_templates/fields/field_script_file.php
+++ b/application/views/metadata_templates/fields/field_script_file.php
@@ -40,7 +40,7 @@
                 <?php if (isset($script['file_name'])):?> 
                     <?php if (isset($options['resources']) && array_key_exists($script['file_name'],$options['resources'])):?>                        
                         <?php 
-                            $resource = $options['resources'][$script['file_name']];                            
+                            $resource = $options['resources'][basename($script['file_name'])];
                         ?>
                         <a 
                             href="<?php echo site_url("catalog/{$resource['survey_id']}/download/{$resource['resource_id']}");?>" 
@@ -54,9 +54,9 @@ class="btn btn-primary btn-sm float-right"
                     <?php if (isset($options['resources']) && 
                             isset($script['zip_package']) &&                             
                             !array_key_exists($script['file_name'],$options['resources']) &&
-                            array_key_exists($script['zip_package'],$options['resources'])):?>                        
+                            array_key_exists(basename($script['zip_package']),$options['resources'])):?>                        
                         <?php 
-                            $resource = $options['resources'][$script['zip_package']];                            
+                            $resource = $options['resources'][basename($script['zip_package'])];                            
                         ?>
                         <a 
                             href="<?php echo site_url("catalog/{$resource['survey_id']}/download/{$resource['resource_id']}");?>" 
@@ -81,6 +81,9 @@ class="btn btn-primary btn-sm float-right"
                                 </div>
                                 <div class="col">
                                     <?php if($field_name=='zip_package' || $field_name=='file_name'):?>
+                                        <?php
+                                            $value=basename($value);
+                                        ?>
                                         <?php if (isset($options['resources']) &&                 
                                                 array_key_exists($value,$options['resources'])):?>                        
                                             <?php 

From 2eb2961dc3a66dd3f7afcfb23a2e2da087b14300 Mon Sep 17 00:00:00 2001
From: Mehmood Asghar <mah0001@gmail.com>
Date: Mon, 9 May 2022 16:11:25 -0400
Subject: [PATCH 51/79] Add API endpoints for listing and downloading data
 deposits

---
 application/controllers/api/Datadeposits.php | 1030 ++----------------
 1 file changed, 74 insertions(+), 956 deletions(-)

diff --git a/application/controllers/api/Datadeposits.php b/application/controllers/api/Datadeposits.php
index 5fdd74dd1..4544111b0 100644
--- a/application/controllers/api/Datadeposits.php
+++ b/application/controllers/api/Datadeposits.php
@@ -1,101 +1,21 @@
 <?php
 
-require(APPPATH.'/libraries/REST_Controller.php');
+require(APPPATH.'/libraries/MY_REST_Controller.php');
 
-class Datadeposits extends REST_Controller
+class Datadeposits extends MY_REST_Controller
 {
 	public function __construct()
 	{
 		parent::__construct();
-		die("disabled");
 		$this->load->model('Catalog_model'); 	
 		$this->load->helper("date");
         $this->load->model('DD_project_model');
 		$this->load->model('DD_resource_model');
 		$this->load->model('DD_citation_model');
+		$this->is_admin_or_die();
 	}
 
 
-	//return raw json input
-	private function raw_json_input()
-	{
-		$data=$this->input->raw_input_stream;				
-		//$data = file_get_contents("php://input");
-
-		if(!$data || trim($data)==""){
-			return null;
-		}
-		
-		$json=json_decode($data,true);
-
-		if (!$json){
-			throw new Exception("INVALID_JSON_INPUT");
-		}
-
-		return $json;
-	}
-
-
-	private function get_api_user_id()
-	{
-		if(isset($this->_apiuser) && isset($this->_apiuser->user_id)){
-			return $this->_apiuser->user_id;
-		}
-
-		return false;
-	}
-
-
-
-	/**
-	 * 
-	 * Check if user has access to project
-	 * 
-	 * @is_project_locked - true/false - if set to true, check if user can update project or not
-	 * 
-	 */
-	private function get_user_project_or_die($project_id,$is_project_locked=false)
-	{
-		$user_id=$this->get_api_user_id();
-		$project=$this->DD_project_model->select_single($project_id, $user_id);
-
-		if (!$project){
-			throw new Exception("PROJECT_NOT_FOUND"); 
-		}
-
-		if($is_project_locked){
-			if (strtolower(trim($project['status']))!=='draft'){
-				throw new Exception("PROJECT_IS_LOCKED"); 
-			}
-		}
-
-		return $project;
-	}
-
-
-	/**
-	 * 
-	 * 
-	 * Check project status 
-	 * 
-	 * User can only edit a project in DRAFT mode
-	 * 
-	 */
-	private function is_project_locked($project_id)
-	{
-		$status=$this->DD_project_model->get_project_status($project_id);
-		if (strtolower(trim($status))=='draft'){
-			return false;
-		}
-		return true;
-	}
-
-
-
-
-	
-	/////////////////////////////////// PROJECT ///////////////////////////////
-
 
 	/** 
 	 * 
@@ -114,10 +34,7 @@ public function index_get($pid=null)
 		$user_id=$this->get_api_user_id();   
 
 		//get all projects for current user
-        $projects=$this->DD_project_model->get_projects($user_id);
-
-        //convert date fields to GMT
-		array_walk($projects, 'unix_date_to_gmt',array('created','changed'));
+        $projects=$this->DD_project_model->all_projects($user_id);
         
         $response=array(
             'items'=>$projects
@@ -141,10 +58,10 @@ public function project_get($pid=null,$user_id=null)
 				throw new Exception("MISSING_PARAM: PID"); 
 			}
 
-			$project=$this->get_user_project_or_die($pid);
+			$project=$this->DD_project_model->get_by_id($pid);
 
 			//format dates
-			array_walk($project, 'unix_date_to_gmt_row',array('created','changed','submitted_date','administer_date'));
+			array_walk($project, 'unix_date_to_gmt_row',array('created_on','last_modified','submitted_date','administer_date'));
 
 			$response=array(
 				'project'=>$project
@@ -163,924 +80,125 @@ public function project_get($pid=null,$user_id=null)
 	
 
 
-	
-	/**
-	* 
-	* 
-	* Create new project
-	* 
-	*/
-    public function index_post()
-    {
-		try{
-			//post data
-			//$options=$this->input->post();
-
-			//raw data
-			$options=$this->raw_json_input();
-
-			$user_id=$this->get_api_user_id();
-			$options['created_by']=$user_id;
-			$options['changed_by']=$user_id;
-
-			//validate 
-			if ($this->DD_project_model->validate_project($options)){
-				$project_id=$this->DD_project_model->insert($options);
-				$project=$this->DD_project_model->select_single($project_id);
-
-				$response=array(
-					'status'=>'success',
-					'project'=>$project
-				);
-
-				$this->set_response($response, REST_Controller::HTTP_OK);
-			}
-		}
-		catch(ValidationException $e){
-			$error_output=array(
-				'status'=>'failed',
-				'message'=>$e->getMessage(),
-				'errors'=>$e->GetValidationErrors()
-			);
-			$this->set_response($error_output, REST_Controller::HTTP_BAD_REQUEST);
-		}
-		catch(Exception $e){
-			$error_output=array(
-				'status'=>'failed',
-				'message'=>$e->getMessage()
-			);
-			$this->set_response($error_output, REST_Controller::HTTP_BAD_REQUEST);
-		}
-	}
-
-
-
-	
-	/**
+    /**
 	 * 
-	 * Update project
 	 * 
-	 * Note: PUT method does work with formData
+	 * Get all resources by the project
 	 * 
+	 * @pid - (required) project ID
+	 * @resource_id	- (optional) resource ID
 	 * 
-	 */
-	function index_put($project_id=null)
-	{
-		try{
-			if (!$project_id){
-				throw new Exception("MISSING_PARAM: PID"); 
-			}
-
-			$options=$this->raw_json_input();
-			$user_id=$this->get_api_user_id();
-			$options['changed_by']=$user_id;
-						
-			$project=$this->get_user_project_or_die($project_id);
-					
-			//validate 
-			if ($this->DD_project_model->validate_project($options,$is_new=false)){
-				//update project
-				$this->DD_project_model->update($project_id,$options);
-				//reload project
-				$project=$this->DD_project_model->select_single($project_id);
-
-				$response=array(
-					'status'=>'success',
-					'project'=>$project
-				);
+	 **/ 
+    public function resources_get($pid=null, $resource_id=null)
+    {
+		//get single resource if resource id is provided
+		if(is_numeric($pid) && is_numeric($resource_id)){
+			return $this->resource_get($pid,$resource_id);
+		}		
+		
+        try{
+			$project=$this->DD_project_model->get_by_id($pid);
+            $resources=$this->DD_resource_model->get_project_resources($pid);
+			
+			array_walk($resources, 'unix_date_to_gmt',array('created','changed'));
+			
+			$response=array(
+                'items'=>$resources
+            );
 
-				$this->set_response($response, REST_Controller::HTTP_OK);
-			}
-		}
-		catch(ValidationException $e){
-			$error_output=array(
-				'status'=>'error',
-				'message'=>$e->getMessage(),
-				'errors'=>$e->GetValidationErrors()
-			);
-			$this->set_response($error_output, REST_Controller::HTTP_BAD_REQUEST);
-		}
-		catch(Exception $e){
+            $this->set_response($response, REST_Controller::HTTP_OK);    
+        }
+        catch(Exception $e){
 			$error_output=array(
 				'status'=>'error',
 				'message'=>$e->getMessage()
 			);
 			$this->set_response($error_output, REST_Controller::HTTP_BAD_REQUEST);
 		}
-	}
+    }
 
 
 	/**
 	 * 
+	 * Get a single resource
 	 * 
-	 * Delete a project
 	 * 
-	 * @id	project ID
 	 * 
 	 */
-	function index_delete($id=null)
+	public function resource_get($project_id=null,$resource_id=null)
 	{
 		try{
-			if (!$id){
-				throw new Exception("MISSING_PARAM: PID"); 
-			}
-
-			$project=$this->get_user_project_or_die($pid);
-
-			$this->DD_project_model->delete($id);
-			$result=array(
-				'status'=>'success',
-				'message'=>'project deleted successfully!!!'
-			);
-			$this->set_response($result, REST_Controller::HTTP_OK);
-		}
-		catch(Exception $e){
-			$error_output=array(
-				'status'=>'failed',
-				'message'=>$e->getMessage()
-			);
-			$this->set_response($error_output, REST_Controller::HTTP_BAD_REQUEST);
-		}
-	}
-
-	
-	
-
-	/** 
-	 * 
-	 * 
-	 * Submit project
-	 * 
-	 * Note: Submitting a project, locks the project for any further edits
-	 * 
-	 *
-	*
-	*/
-   function submit_put($project_id=null)
-   {
-	   try{
-		   if (!$project_id){
-			   throw new Exception("MISSING_PARAM: PID"); 
-		   }
-
-		   $user_id=$this->get_api_user_id();
-		   $options['changed_by']=$user_id;
-					   
-		   $project=$this->get_user_project_or_die($project_id,true);
-				   
-		   //submit project
-		   if ($this->DD_project_model->submit_project($project_id,$email_notifications=true)){
-			   //reload project
-			   $project=$this->DD_project_model->select_single($project_id);
-
-			   $response=array(
-				   'status'=>'success',
-				   'project'=>$project
-			   );
+			$project=$this->DD_project_model->get_by_id($project_id);
 
-			   $this->set_response($response, REST_Controller::HTTP_OK);
-		   }
-	   }
-	   catch(Exception $e){
-		   $error_output=array(
-			   'status'=>'error',
-			   'message'=>$e->getMessage()
-		   );
-		   $this->set_response($error_output, REST_Controller::HTTP_BAD_REQUEST);
-	   }
-   }
-
-
-   /** 
-	 * 
-	 * 
-	 * update project status
-	 * 
-	 * TODO: to be removed. Added for testing the api
-	 * 
-	 *
-	*
-	*/
-	function project_status_put($project_id=null,$status=null)
-	{
-		try{
-			if (!$project_id){
-				throw new Exception("MISSING_PARAM: PROJECT_ID"); 
-			}
-			if (!$status){
-				throw new Exception("MISSING_PARAM: STATUS"); 
-			}
- 
-			$user_id=$this->get_api_user_id();
-			$options['changed_by']=$user_id;
-						
-			$project=$this->get_user_project_or_die($project_id);
-					
-			//submit project
-			if ($this->DD_project_model->set_project_status($project_id,$status,$options)){
-				//reload project
-				$project=$this->DD_project_model->select_single($project_id);
- 
-				$response=array(
-					'status'=>'success',
-					'project'=>$project
-				);
- 
-				$this->set_response($response, REST_Controller::HTTP_OK);
+			if(!$project){
+				throw new Exception("Project not found");
 			}
+			
+			$resource=$this->DD_resource_model->get_project_resource($resource_id);
+			$this->set_response($resource, REST_Controller::HTTP_OK);
 		}
 		catch(Exception $e){
 			$error_output=array(
 				'status'=>'error',
-				'message'=>$e->getMessage()
+				'message'=>$e->getMessage()			
 			);
 			$this->set_response($error_output, REST_Controller::HTTP_BAD_REQUEST);
 		}
-	}
-
+    }
 
-	/**
-	 * 
-	 * Update project access policy
-	 * 
-	 * 
-	 */
-	function access_policy_put($project_id=null)
+	function download_get($project_id=null,$resource_id=null)
 	{
 		try{
-			if (!$project_id){
-				throw new Exception("MISSING_PARAM: PID"); 
-			}
-
-			$project=$this->get_user_project_or_die($project_id);
+			$project=$this->DD_project_model->get_by_id($project_id);
 
-			$options=$this->raw_json_input();
-			$user_id=$this->get_api_user_id();
-			$options['changed_by']=$user_id;						
-					
-			//validate 
-			if ($this->DD_project_model->validate_project($options,$is_new=false)){
-				//update project
-				$this->DD_project_model->update($project_id,$options);
-				//reload project
-				$project=$this->DD_project_model->select_single($project_id);
+			if(!$project){
+				throw new Exception("Project not found");
+			}
 
-				$response=array(
-					'status'=>'success',
-					'project'=>$project
-				);
+			$user=$this->api_user();
 
-				$this->set_response($response, REST_Controller::HTTP_OK);
+			if(!$user){
+				throw new Exception("USER_NOT_LOGGEDIN");
 			}
-		}
-		catch(ValidationException $e){
-			$error_output=array(
-				'status'=>'error',
-				'message'=>$e->getMessage(),
-				'errors'=>$e->GetValidationErrors()
-			);
-			$this->set_response($error_output, REST_Controller::HTTP_BAD_REQUEST);
-		}
-		catch(Exception $e){
-			$error_output=array(
-				'status'=>'error',
-				'message'=>$e->getMessage()
-			);
-			$this->set_response($error_output, REST_Controller::HTTP_BAD_REQUEST);
-		}
-	}
 
-	/**
-	 * 
-	 * get project access policy
-	 * 
-	 * 
-	 */
-	function access_policy_get($project_id=null)
-	{
-		try{
-			if (!$project_id){
-				throw new Exception("MISSING_PARAM: PID"); 
+			if(!$resource_id){
+				throw new Exception("PARAM_NOT_SET: resource_id");
 			}
-			
-			$project=$this->get_user_project_or_die($project_id);
 
-			$options=$this->raw_json_input();
-			$user_id=$this->get_api_user_id();
-			$options['changed_by']=$user_id;
+				//get project data folder path
+			$project_folder_path=$this->DD_project_model->get_project_fullpath($project_id);
 			
-			$access_policy=$this->DD_project_model->get_access_policy_info($project_id,$user_id);
-					
-				$response=array(
-					'status'=>'success',
-					'access_policy'=>$access_policy
-				);
-
-				$this->set_response($response, REST_Controller::HTTP_OK);
-		}
-		catch(Exception $e){
-			$error_output=array(
-				'status'=>'error',
-				'message'=>$e->getMessage()
-			);
-			$this->set_response($error_output, REST_Controller::HTTP_BAD_REQUEST);
-		}
-	}
-
-
-
-	/** 
-	*
-	*
-	* Get projects by user
-	*
-	*
-	*
-	*	
-	*/
-	public function user_projects_get($user_id=null)
-    {
-		try{		
-			//get current user ID
-			if(!$user_id){
-				$user_id=$this->get_api_user_id();
+			if (!$project_folder_path){
+				throw new Exception("PROJECT_DATA_FOLDER_NOT_SET");
 			}
-
-			$projects=$this->DD_project_model->get_user_projects($user_id);
-
-			if (!$project){
-				throw new Exception("PROJECT_NOT_FOUND"); 
+			
+			$this->load->helper('download');
+			$this->load->model('DD_resource_model');
+			$this->lang->load("resource_manager");
+			$this->load->model('managefiles_model');
+					
+			$resource = $this->DD_resource_model->get_project_resource($resource_id);
+			
+			if (!$resource){
+				throw new Exception("FILE_NOT_FOUND");
 			}
-
-			//convert date fields to GMT
-			array_walk($projects, 'unix_date_to_gmt',array('created','changed'));
 			
-			$response=array(
-				'items'=>$projects
-			);
+			$resource_path=unix_path($project_folder_path.'/'.$resource[0]->filename);
+			
+			if (!file_exists($resource_path)){
+				throw new Exception("FILE_NOT_FOUND:".$resource_path);
+			}
 
-			$this->set_response($response, REST_Controller::HTTP_OK);
+			force_download3($resource_path,$resource[0]->filename);
 		}
 		catch(Exception $e){
-			$error_output=array(
+			$output=array(
 				'status'=>'error',
 				'message'=>$e->getMessage()
 			);
-			$this->set_response($error_output, REST_Controller::HTTP_BAD_REQUEST);
+			$this->set_response($output, REST_Controller::HTTP_BAD_REQUEST);
 		}
+	}    
 
-    }
-
-
-
-
-
-	/**
-	 * 
-	 * 
-	 * Update project metadata
-	 * 
-	 * 
-	 * 
-	 * */
-    public function metadata_post($project_id=null)
-    {
-		try{
-			//raw data
-			$data = file_get_contents("php://input");
-			
-			if (trim($data)==""){
-				throw new Exception("NO_INPUT_DATA");
-			}
-
-			//decode to JSON to validate JSON is valid
-			$json=json_decode($data,true);
-			if (!$json){
-				throw new Exception("INVALID_JSON_INPUT");
-			}
-			$project=$this->get_user_project_or_die($project_id);
-
-			//store JSON as is - no encoding/decoding
-			$this->DD_project_model->set_metadata($project_id,$data);
-			$this->set_response($json, REST_Controller::HTTP_OK);
-		}
-		catch(Exception $e){
-			$error_output=array(
-				'status'=>'error',
-				'message'=>$e->getMessage()
-			);
-			$this->set_response($error_output, REST_Controller::HTTP_BAD_REQUEST);
-		}
-	}
-	
-
-	/** 
-	 * 
-	 * 
-	 * Get project metadata
-	 * 
-	 * 
-	 */
-    function metadata_get($project_id)
-	{
-		try{
-			$project=$this->get_user_project_or_die($project_id);
-			$metadata=$this->DD_project_model->get_metadata($project_id);
-
-			//when there is no metadata
-			if (trim($metadata)==""){
-				$metadata='{}';
-			}
-
-			header('Content-Type: application/json');
-			echo $metadata;
-			die();
-		}
-		catch(Exception $e){
-			$error_output=array(
-				'status'=>'error',
-				'message'=>$e->getMessage()
-			);
-			$this->set_response($error_output, REST_Controller::HTTP_BAD_REQUEST);
-		}
-
-	}
-
-
-	///////////////////////////////////////////////////////////////////////
-	/// CITATIONS
-	///////////////////////////////////////////////////////////////////////
-	/**
-	 * 
-	 *  [GET] 	citations - list of resources
-	 * 	[POST]  citations - upload one or more files
-	 * 	[PUT]	citations/id - update resource metadata - no file uploads
-	 *  [GET] 	citations/id - Get a single resource
-	 * 	[DELETE] citations/id - delete a single resource + attachment
-	 * 
-	 * 
-	 */
-
-    /** 
-	 * 
-	 * Get project citations
-	 * 
-	 * 
-	 */
-    public function citations_get($project_id=null, $citation_id=null)
-    {
-		//get single resource if resource id is provided
-		if(is_numeric($project_id) && is_numeric($citation_id)){
-			return $this->citation_get($project_id,$citation_id);
-		}
-		
-		try{
-			$project=$this->get_user_project_or_die($project_id);
-            $citations=$this->DD_citation_model->get_project_citations($project_id);
-            array_walk($citations, 'unix_date_to_gmt',array('created','changed'));
-            $response=array(
-                'items'=>$citations
-            );
-
-            $this->set_response($response, REST_Controller::HTTP_OK);    
-        }
-        catch(Exception $e){
-			$error_output=array(
-				'status'=>'error',
-				'message'=>$e->getMessage()
-			);
-			$this->set_response($error_output, REST_Controller::HTTP_BAD_REQUEST);
-		}
-    }
-
-
-	/**
-	 * 
-	 * Get a single citation
-	 * 
-	 * 
-	 * 
-	 */
-	public function citation_get($project_id=null,$citation_id=null)
-	{
-		try{
-			$project=$this->get_user_project_or_die($project_id);
-			$citation=$this->DD_citation_model->get_project_single_citation($project_id,$citation_id);
-			$this->set_response($citation, REST_Controller::HTTP_OK);
-		}
-		catch(Exception $e){
-			$error_output=array(
-				'status'=>'error',
-				'message'=>$e->getMessage()			
-			);
-			$this->set_response($error_output, REST_Controller::HTTP_BAD_REQUEST);
-		}
-    }
-	
-
-    /**
-	 * 
-	 * 
-	 * 
-	 * create new citation for the project
-	 * 
-	 * 
-	 * 
-	 * */
-    public function citations_post($project_id=null)
-    {
-		try{
-			$project=$this->get_user_project_or_die($project_id);			
-			$options['citation']=$this->raw_json_input();
-			$options['pid']=$project_id;
-			$options['created_by']=$this->get_api_user_id();
-			$options['changed_by']=$this->get_api_user_id();
-
-			//store JSON as is - no encoding/decoding
-			$citation_id=$this->DD_citation_model->insert($options);
-			$citation=$this->DD_citation_model->get_project_single_citation($project_id,$citation_id);
-
-			$output=array(
-				'status'=>'success',
-				'citation'=>$citation
-			);
-
-			$this->set_response($output, REST_Controller::HTTP_OK);
-		}
-		catch(Exception $e){
-			$error_output=array(
-				'status'=>'error',
-				'message'=>$e->getMessage()
-			);
-			$this->set_response($error_output, REST_Controller::HTTP_BAD_REQUEST);
-		}
-    }
-
-	/**
-	 * 
-	 *  Update a single citation
-	 * 
-	 */
-    public function citations_put($pid=null,$cid=null)
-    {
-		try{			
-			$project=$this->get_user_project_or_die($pid);
-			
-			if(!$cid){
-				throw new Exception("CITATION_ID_NOT_SET");
-			}
-
-			$citation=$this->DD_citation_model->get_project_single_citation($pid,$cid);
-			
-			if(!$citation){
-				throw new Exception("CITATION_NOT_FOUND");
-			}
-
-			$options['citation']=$this->raw_json_input();			
-			$options['citation']=$json;
-			$options['pid']=$pid;			
-			$options['changed_by']=$this->get_api_user_id();
-
-			//update
-			$this->DD_citation_model->update($cid,$options);
-			$citation=$this->DD_citation_model->get_project_single_citation($pid,$cid);
-			
-			$output=array(
-				'status'=>'success',
-				'citation'=>$citation
-			);
-
-			$this->set_response($output, REST_Controller::HTTP_OK);
-		}
-		catch(Exception $e){
-			$error_output=array(
-				'status'=>'error',
-				'message'=>$e->getMessage()
-			);
-			$this->set_response($error_output, REST_Controller::HTTP_BAD_REQUEST);
-		}
-    }
-
-
-	/**
-	 * 
-	 * 
-	 * Delete a citation
-	 * 
-	 */
-    public function citations_delete($pid=null,$cid=null)
-    {
-		try{
-			$project=$this->get_user_project_or_die($pid);
-
-			if(!$cid){
-				throw new Exception("CITATION_ID_NOT_SET");
-			}
-			
-			//check citations exists for the project
-			$citation=$this->DD_citation_model->get_project_single_citation($pid,$cid);
-
-			if(!$citation){
-				throw new Exception('CITATION_NOT_FOUND');
-			}
-            
-			$this->DD_citation_model->delete($cid);
-			
-			$response=array(
-				'status'=>'success',
-				'message'=>'Citation removed'
-			);
-            $this->set_response($response, REST_Controller::HTTP_OK);
-		}
-		catch(Exception $e){
-			$error_output=array(
-				'status'=>'error',
-				'message'=>$e->getMessage()
-			);
-			$this->set_response($error_output, REST_Controller::HTTP_BAD_REQUEST);
-		}
-	}
-	
-
-	///////////////////////////////////////////////////////////////////////
-	/// RESOURCES
-	///////////////////////////////////////////////////////////////////////
-	/**
-	 * 
-	 *  [GET] 	Resources - list of resources
-	 * 	[POST]  Resources - upload one or more files
-	 * 	[PUT]	Resources/id - update resource metadata - no file uploads
-	 *  [GET] 	Resources/id - Get a single resource
-	 * 	[DELETE] Resources/id - delete a single resource + attachment
-	 * 
-	 * 
-	 */
-
-    
-    /**
-	 * 
-	 * 
-	 * Get all resources by the project
-	 * 
-	 * @pid - (required) project ID
-	 * @resource_id	- (optional) resource ID
-	 * 
-	 **/ 
-    public function resources_get($pid=null, $resource_id=null)
-    {
-		//get single resource if resource id is provided
-		if(is_numeric($pid) && is_numeric($resource_id)){
-			return $this->resource_get($pid,$resource_id);
-		}		
-		
-        try{
-			$project=$this->get_user_project_or_die($pid);			
-            $resources=$this->DD_resource_model->get_project_resources($pid);
-			
-			array_walk($resources, 'unix_date_to_gmt',array('created','changed'));
-			
-			$response=array(
-                'items'=>$resources
-            );
-
-            $this->set_response($response, REST_Controller::HTTP_OK);    
-        }
-        catch(Exception $e){
-			$error_output=array(
-				'status'=>'error',
-				'message'=>$e->getMessage()
-			);
-			$this->set_response($error_output, REST_Controller::HTTP_BAD_REQUEST);
-		}
-    }
-
-
-	/**
-	 * 
-	 * Get a single resource
-	 * 
-	 * 
-	 * 
-	 */
-	public function resource_get($project_id=null,$resource_id=null)
-	{
-		try{
-			$project=$this->get_user_project_or_die($project_id);
-			
-			$resource=$this->DD_resource_model->get_project_single_resource($project_id,$resource_id);
-			$this->set_response($resource, REST_Controller::HTTP_OK);
-		}
-		catch(Exception $e){
-			$error_output=array(
-				'status'=>'error',
-				'message'=>$e->getMessage()			
-			);
-			$this->set_response($error_output, REST_Controller::HTTP_BAD_REQUEST);
-		}
-    }
-
-
-	/**
-	 * 
-	 * 
-	 * Add new resource by uploading a document
-	 * 
-	 * 
-	 */
-	function resources_post($pid=null)
-	{
-		try{
-			if(!$pid){
-				throw new Exception("PROJECT_ID_NOT_SET");
-			}
-			$project=$this->get_user_project_or_die($pid);			
-			
-            $options=$this->input->post();
-            $user_id=$this->get_api_user_id();
-            $options['created_by']=$user_id;
-            $options['changed_by']=$user_id;
-            $options['pid']=$pid;
-
-            //process file upload
-			$result=$this->DD_resource_model->upload_file($pid,$file_field_name='file');
-			
-			$uploaded_file_name=$result['file_name'];
-			$uploaded_path=$result['full_path'];			
-
-            $options['filename']=$uploaded_file_name;
-
-            //title is required
-            if(!isset($options['title'])){
-                $options['title']=$uploaded_file_name;                
-            }
-
-            //type is required
-            if(!isset($options['resource_type'])){
-                $options['resource_type']='other';                
-            }
-
-            //validate 
-            if ($this->DD_resource_model->validate_resource($options)){
-                $resource_id=$this->DD_resource_model->insert($options);
-                $resource=$this->DD_resource_model->select_single($resource_id);
-
-                $response=array(
-                    'status'=>'success',
-                    'resource'=>$resource,
-                    'uploaded_file_name'=>$uploaded_file_name,
-                );
-
-                $this->set_response($response, REST_Controller::HTTP_OK);
-            }
-		}
-		catch(ValidationException $e){
-			$error_output=array(
-				'status'=>'error',
-				'message'=>$e->getMessage(),
-				'errors'=>$e->GetValidationErrors(),
-				'supported_file_types'=>str_replace(",","|",$this->config->item("allowed_resource_types"))
-			);
-			$this->set_response($error_output, REST_Controller::HTTP_BAD_REQUEST);
-		}
-		catch(Exception $e){
-			$error_output=array(
-				'status'=>'error',
-				'message'=>$e->getMessage(),
-				'supported_file_types'=>$this->config->item("allowed_resource_types")
-			);
-			$this->set_response($error_output, REST_Controller::HTTP_BAD_REQUEST);
-		}
-	}
-
-
-
-	/**
-	 * 
-	 * 
-	 * Update a single project resource
-	 * 
-	 */
-    public function resources_put($pid=null, $resource_id=null){
-		try{
-			if(!$pid){
-				throw new Exception("PROJECT_ID_NOT_SET");
-			}
-			$project=$this->get_user_project_or_die($pid);
-			
-			if(!$resource_id){
-				throw new Exception("RESOURCE_ID_NOT_SET");
-			}
-			
-			//check resource exists for the project
-			$resource=$this->DD_resource_model->get_project_single_resource($pid,$resource_id);
-
-			if(!$resource){
-				throw new Exception('RESOURCE_NOT_FOUND');
-			}
-            
-            $options=$this->raw_json_input();
-            $user_id=$this->get_api_user_id();
-            $options['created_by']=$user_id;
-            $options['changed_by']=$user_id;
-            $options['pid']=$pid;
-
-
-            //validate 
-            if ($this->DD_resource_model->validate_resource($options,$is_new=false)){
-                $this->DD_resource_model->update($resource_id,$options);
-                $resource=$this->DD_resource_model->select_single($resource_id);
-
-                $response=array(
-                    'status'=>'success',
-                    'resource'=>$resource
-                );
-
-                $this->set_response($response, REST_Controller::HTTP_OK);
-            }
-		}
-		catch(ValidationException $e){
-			$error_output=array(
-				'status'=>'error',
-				'message'=>$e->getMessage(),
-				'errors'=>$e->GetValidationErrors()
-			);
-			$this->set_response($error_output, REST_Controller::HTTP_BAD_REQUEST);
-		}
-		catch(Exception $e){
-			$this->set_response($e->getMessage(), REST_Controller::HTTP_BAD_REQUEST);
-		}
-	}
-	
-	
-	/**
-	 * 
-	 * Delete a single resource
-	 * 
-	 */
-    public function resources_delete($pid=null,$resource_id=null){
-
-        try{
-			if(!$pid){
-				throw new Exception("PROJECT_ID_NOT_SET");
-			}
-			$project=$this->get_user_project_or_die($pid);
-			
-			if(!$resource_id){
-				throw new Exception("RESOURCE_ID_NOT_SET");
-			}
-			
-			//check resource exists for the project
-			$resource=$this->DD_resource_model->get_project_single_resource($pid,$resource_id);
-
-			if(!$resource){
-				throw new Exception('RESOURCE_NOT_FOUND');
-			}
-            
-			$this->DD_resource_model->delete($resource_id);
-			
-			$response=array(
-				'status'=>'success',
-				'message'=>'Resource removed'
-			);
-            $this->set_response($response, REST_Controller::HTTP_OK);
-		}
-		catch(Exception $e){
-			$error_output=array(
-				'status'=>'error',
-				'message'=>$e->getMessage()
-			);
-			$this->set_response($error_output, REST_Controller::HTTP_BAD_REQUEST);
-		}
-    }
-    
-    
-    /////////////// REVIEW ///////////////////////////
-    public function review_get($pid)
-    {
-
-    }
-
-
-
-    /////////////// CONTROLLED  VOCABULARIES ///////////////////
-
-    //return a list of all access policies
-    public function list_access_policies_get()
-    {
-
-    }
-
-    //list of available catalogs for publishing the project
-    public function list_target_catalogs_get()
-    {
-
-    }
-
-    //list project types
-    public function list_project_types_get()
-    {
-
-	}
-		
 	
 }

From efbcf76704b086e672c37cf4d8a925756a7ed4b9 Mon Sep 17 00:00:00 2001
From: Mehmood Asghar <mah0001@gmail.com>
Date: Tue, 10 May 2022 13:30:05 -0400
Subject: [PATCH 52/79] add support for partially updating variables

---
 api-documentation/catalog-admin/swagger.yaml  | 12 ++--
 application/config/metadata_parser.php        |  9 ++-
 application/controllers/api/Datasets.php      | 64 ++++++++++++-------
 .../Metadata_parser/classes/DDI2Reader.php    | 10 +++
 .../survey_form_template.json                 |  4 +-
 application/models/Variable_model.php         | 13 +---
 application/views/ddi/ddi25_stdy_dscr.php     |  7 +-
 7 files changed, 73 insertions(+), 46 deletions(-)

diff --git a/api-documentation/catalog-admin/swagger.yaml b/api-documentation/catalog-admin/swagger.yaml
index 7c769cb2d..cab5cb618 100644
--- a/api-documentation/catalog-admin/swagger.yaml
+++ b/api-documentation/catalog-admin/swagger.yaml
@@ -1158,11 +1158,12 @@ paths:
               $ref: '#/definitions/VariableList'
       security:
         - ApiKeyAuth: []    
+  /datasets/variables/{IDNo}/{partialUpdate}:
     post:
       tags:
         - Survey
       summary: Create variable
-      description: Create a new variable for a data file. To create multiple variables at once, pass them as a list of variables.
+      description: Create or update a variable. To create multiple variables at once, pass them as a list of variables.
       operationId: createDatasetVariable
       consumes:
         - application/json
@@ -1175,12 +1176,11 @@ paths:
           required: true
           type: string
           format: string
-        - name: fileId
+        - name: partialUpdate
           in: path
-          description: File ID - user defined unique file identifier
-          required: true
-          type: string
-          format: string  
+          description: To update partial metadata, set value to `true`. Default is `false` to replace all metadata fields.
+          type: boolean
+          format: boolean  
         - in: "body"
           name: "body"
           required: true
diff --git a/application/config/metadata_parser.php b/application/config/metadata_parser.php
index 2eaefa76a..16c7b68d9 100644
--- a/application/config/metadata_parser.php
+++ b/application/config/metadata_parser.php
@@ -173,8 +173,13 @@
         'transform_callback'=>'transform_ddi_datacollector','type'=>'array'
     ),
     #method > data collection > collector training
-    'study_desc/method/data_collection/collector_training/type'=>array('xpath'=>'codeBook/stdyDscr/method/dataColl/collectorTraining/@type', 'transform_callback'=>'none'),
-    'study_desc/method/data_collection/collector_training/training'=>array('xpath'=>'codeBook/stdyDscr/method/dataColl/collectorTraining', 'transform_callback'=>'none'),
+    //'study_desc/method/data_collection/collector_training/type'=>array('xpath'=>'codeBook/stdyDscr/method/dataColl/collectorTraining/@type', 'transform_callback'=>'none'),
+    //'study_desc/method/data_collection/collector_training/training'=>array('xpath'=>'codeBook/stdyDscr/method/dataColl/collectorTraining', 'transform_callback'=>'none'),
+    'study_desc/method/data_collection/collector_training'=>array(
+        'xpath'=>'codeBook/stdyDscr/method/dataColl/collectorTraining', 
+        'transform_callback'=>'none',
+        'type'=>'array'
+    ),
 
     'study_desc/method/data_collection/frequency'=>array('xpath'=>'codeBook/stdyDscr/method/dataColl/frequenc', 'transform_callback'=>'none'),
     'study_desc/method/data_collection/sampling_procedure'=>array('xpath'=>'codeBook/stdyDscr/method/dataColl/sampProc', 'transform_callback'=>'none'),
diff --git a/application/controllers/api/Datasets.php b/application/controllers/api/Datasets.php
index 35ab25342..e756076aa 100644
--- a/application/controllers/api/Datasets.php
+++ b/application/controllers/api/Datasets.php
@@ -829,25 +829,20 @@ function variable_get($idno=null,$var_id=null)
 	 * 
 	 * Create variables for Datasets
 	 * @idno - dataset IDNo
-	 * @file_id - user defined file id e.g. F1
-	 * 
+	 * @merge_metadata - true|false 
+	 * 	- true = partial update metadata 
+	 *  - false = replace all metadata with new
 	 */
-	function variables_post($idno=null,$file_id=null,$type='survey')
+	function variables_post($idno=null,$merge_metadata=false)
 	{
 		try{
 			$this->has_dataset_access('edit');
 			$options=(array)$this->raw_json_input();
 			$user_id=$this->get_api_user_id();
+			$merge_metadata=$merge_metadata==='true';
 
 			$sid=$this->get_sid_from_idno($idno);
 
-			//get file id
-			$fid=$this->Data_file_model->get_fid_by_fileid($sid,$file_id);
-
-			if(!$fid){
-				throw new exception("FILE_NOT_FOUND: ".$file_id);
-			}
-
 			//check if a single variable input is provided or a list of variables
 			$key=key($options);
 
@@ -858,23 +853,46 @@ function variables_post($idno=null,$file_id=null,$type='survey')
 				$options=null;
 				$options=$tmp_options;
 			}
+
+			$valid_data_files=$this->Data_file_model->list_fileid($sid);
 			
 			//validate all variables
 			foreach($options as $key=>$variable){
-				$variable['fid']=$file_id;
-				$this->Variable_model->validate_variable($variable);
-			}
 
-			$result=array();
-			foreach($options as $variable)
-			{
-				$variable['fid']=$file_id;
-				//all fields are stored as metadata
-				$variable['metadata']=$variable;
-				$variable_id=$this->Variable_model->insert($sid,$variable);
-				//$variable=$this->Variable_model->select_single($variable_id);
-				//$result[$variable['vid']]=$variable;
-				$result[$variable['vid']]=$variable_id;
+				if (!isset($variable['file_id'])){
+					throw new Exception("`file_id` is required");
+				}
+
+				if (!in_array($variable['file_id'],$valid_data_files)){
+					throw new Exception("Invalid `file_id`: valid values are: ". implode(", ", $valid_data_files ));
+				}
+
+				if (isset($variable['vid']) && !empty($variable['vid'])){
+					//check if variable already exists
+					$uid=$this->Variable_model->get_uid_by_vid($sid,$variable['vid']);
+					$variable['fid']=$variable['file_id'];
+		
+					if($uid){
+						$var_mt=$this->Variable_model->get_var_by_vid($sid,$variable['vid']);
+						$var_mt=isset($var_mt['metadata']) ? $var_mt['metadata']: array();
+						
+						//replace metadata with new options
+						if($merge_metadata==true){
+							$variable=array_replace_recursive($var_mt,$variable);
+						}
+												
+						$this->Variable_model->validate_variable($variable);						
+						$variable['metadata']=$variable;
+						$this->Variable_model->update($sid,$uid,$variable);
+					}
+					else{
+						$this->Variable_model->validate_variable($variable);
+						$variable['metadata']=$variable;
+						$this->Variable_model->insert($sid,$variable);
+					}
+
+					$result[]=$variable['vid'];
+				}
 			}
 
 			//update survey varcount
diff --git a/application/libraries/Metadata_parser/classes/DDI2Reader.php b/application/libraries/Metadata_parser/classes/DDI2Reader.php
index 65cfe036f..e595c4567 100644
--- a/application/libraries/Metadata_parser/classes/DDI2Reader.php
+++ b/application/libraries/Metadata_parser/classes/DDI2Reader.php
@@ -183,6 +183,16 @@ function __construct($xml_file)
             )
         );
 
+        $xpath_group["codeBook/stdyDscr/method/dataColl/collectorTraining"] = array(
+            'label' => 'Collector training',
+            'type' => 'table',
+            'cols' => array(
+                '.' => 'txt',
+                '@type' => 'type',
+                '.' => 'training'
+            )
+        );
+
         $xpath_group["codeBook/stdyDscr/dataAccs/useStmt/specPerm"] = array(
             'label' => 'Special permissions',
             'type' => 'table',
diff --git a/application/metadata_editor_templates/survey_form_template.json b/application/metadata_editor_templates/survey_form_template.json
index 1c31e6e18..d50e36017 100644
--- a/application/metadata_editor_templates/survey_form_template.json
+++ b/application/metadata_editor_templates/survey_form_template.json
@@ -131,7 +131,7 @@
             "title": "Overview",
             "items": [
                 {
-                    "key": "study_desc.study_info.notes",
+                    "key": "study_desc.study_info.abstract",
                     "title": "Abstract",
                     "type": "textarea"
                 },
@@ -156,7 +156,7 @@
             "title": "Scope",
             "items": [
                 {
-                    "key": "study_desc.study_notes",
+                    "key": "study_desc.study_info.notes",
                     "title": "Description of scope",
                     "type": "textarea"
                 }
diff --git a/application/models/Variable_model.php b/application/models/Variable_model.php
index 920491a3c..1145f6241 100644
--- a/application/models/Variable_model.php
+++ b/application/models/Variable_model.php
@@ -347,11 +347,11 @@ function get_variables_count($sid)
     /**
      * 
      * 
-     * @is_upsert - if true, do upsert instead of insert
+     * insert new variable
      * 
      * 
      */
-    public function insert($sid,$options,$is_upsert=true)
+    public function insert($sid,$options)
     {
         $valid_fields=array(
             'name',
@@ -365,15 +365,6 @@ public function insert($sid,$options,$is_upsert=true)
             'metadata'
         );
 
-        if ($is_upsert==true){            
-            //check if variable already exists
-            $uid=$this->get_uid_by_vid($sid,$options['vid']);
-
-            if($uid){
-                return $this->update($sid,$uid,$options);
-            }
-        }
-
         foreach($options as $key=>$value){
             if(!in_array($key,$valid_fields)){
                 unset($options[$key]);
diff --git a/application/views/ddi/ddi25_stdy_dscr.php b/application/views/ddi/ddi25_stdy_dscr.php
index 27baa6280..95b181b42 100644
--- a/application/views/ddi/ddi25_stdy_dscr.php
+++ b/application/views/ddi/ddi25_stdy_dscr.php
@@ -270,8 +270,11 @@
         training process. The type attribute allows specification of the type of training being described.
         
         --> 
-        */?>       
-        <collectorTraining type="<?php $ddi->el('study_desc/method/data_collection/collector_training/type');?>"><?php $ddi->el('study_desc/method/data_collection/collector_training/training');?></collectorTraining>
+        */?>
+        <?php $collector_trainings=(array)$ddi->get_el('study_desc/method/data_collection/collector_training');?>
+        <?php foreach($collector_trainings as $coll_train):?>
+        <collectorTraining type="<?php echo $ddi->attr_val($coll_train,'type');?>"><?php echo $ddi->el_val($coll_train,'training');?></collectorTraining>
+        <?php endforeach;?>
 
         <frequenc><?php $ddi->el('study_desc/method/data_collection/frequency');?></frequenc>
         <sampProc><![CDATA[<?php $ddi->el('study_desc/method/data_collection/sampling_procedure');?>]]></sampProc>

From 685f27716dcf1434d229fc95c3a286c7dc9d3885 Mon Sep 17 00:00:00 2001
From: Mehmood Asghar <mah0001@gmail.com>
Date: Tue, 10 May 2022 16:54:18 -0400
Subject: [PATCH 53/79] Update table and timeseries schema and display

---
 .../catalog-admin/table-schema.json           |  35 ++-
 .../catalog-admin/timeseries-schema.json      | 252 +++++++++---------
 .../language/english/fields_document_lang.php |   3 +
 .../english/fields_timeseries_lang.php        |  71 ++++-
 .../english/fields_timeseriesdb_lang.php      |  15 +-
 .../image_form_template.json                  |   2 +-
 application/models/Dataset_document_model.php |  17 +-
 application/schemas/table-schema.json         |  17 ++
 application/schemas/timeseries-schema.json    | 252 +++++++++---------
 .../metadata_templates/document-template.php  |  18 +-
 .../fields/bootstrap_columns.php              |   2 +-
 .../fields/field_array_authors.php            | 123 +++++++++
 .../fields/field_array_vertical.php           | 102 +++++++
 .../timeseries-template.php                   |   5 +-
 .../timeseriesdb-template.php                 |  14 +-
 application/views/survey_info/info.php        |   2 +-
 16 files changed, 655 insertions(+), 275 deletions(-)
 create mode 100644 application/views/metadata_templates/fields/field_array_authors.php
 create mode 100644 application/views/metadata_templates/fields/field_array_vertical.php

diff --git a/api-documentation/catalog-admin/table-schema.json b/api-documentation/catalog-admin/table-schema.json
index 6334fd3f7..530f9ca90 100644
--- a/api-documentation/catalog-admin/table-schema.json
+++ b/api-documentation/catalog-admin/table-schema.json
@@ -628,6 +628,23 @@
             }
           }
         },
+        "api_documentation": {
+          "type": "array",
+          "description": "API Documentation",
+          "items": {
+            "type": "object",
+            "properties": {
+              "description": {
+                "title": "Description",
+                "type": "string"
+              },
+              "uri": {
+                "title": "URI",
+                "type": "string"
+              }
+            }
+          }
+        },
         "publications": {
           "type": "array",
           "title": "Publications",
@@ -1020,7 +1037,7 @@
             "required": [
               "model_id"
             ]
-          },              
+          },
           "topic_description": {
             "type": "array",
             "title": "Topic information",
@@ -1029,11 +1046,17 @@
               "properties": {
                 "topic_id": {
                   "title": "Topic identifier",
-                  "type": ["integer", "string"]
+                  "type": [
+                    "integer",
+                    "string"
+                  ]
                 },
                 "topic_score": {
                   "title": "Topic score",
-                  "type": ["number", "string"]
+                  "type": [
+                    "number",
+                    "string"
+                  ]
                 },
                 "topic_label": {
                   "title": "Topic label",
@@ -1066,12 +1089,11 @@
               "topic_id"
             ]
           }
-          
         },
         "additionalProperties": false
       }
     },
-    "embeddings":{
+    "embeddings": {
       "type": "array",
       "title": "Word embeddings",
       "description": "Word embeddings",
@@ -1096,7 +1118,8 @@
           }
         },
         "required": [
-          "id","vector"
+          "id",
+          "vector"
         ]
       }
     },
diff --git a/api-documentation/catalog-admin/timeseries-schema.json b/api-documentation/catalog-admin/timeseries-schema.json
index 2dd7edf2d..61c06772f 100644
--- a/api-documentation/catalog-admin/timeseries-schema.json
+++ b/api-documentation/catalog-admin/timeseries-schema.json
@@ -581,16 +581,19 @@
 					}
 				},
 				"api_documentation": {
-					"type": "object",
+					"type": "array",
 					"description": "API Documentation",
-					"properties": {
-						"description": {
-							"title": "Description",
-							"type": "string"
-						},
-						"uri": {
-							"title": "URI",
-							"type": "string"
+					"items": {
+						"type": "object",
+						"properties": {
+							"description": {
+								"title": "Description",
+								"type": "string"
+							},
+							"uri": {
+								"title": "URI",
+								"type": "string"
+							}
 						}
 					}
 				},
@@ -923,131 +926,140 @@
 			"title": "LDA topics",
 			"description": "LDA topics",
 			"items": {
-			  "type": "object",
-			  "properties": {
-				"model_info": {
-				  "type": "array",
-				  "title": "Model information",
-				  "items": {
-					"type": "object",
-					"properties": {
-					  "source": {
-						"title": "Source",
-						"type": "string"
-					  },
-					  "author": {
-						"title": "Author",
-						"type": "string"
-					  },
-					  "version": {
-						"title": "Version",
-						"type": "string"
-					  },
-					  "model_id": {
-						"title": "Model Identifier",
-						"type": "string"
-					  },
-					  "nb_topics": {
-						"title": "Number of topics",
-						"type": "number"
-					  },
-					  "description": {
-						"title": "Description",
-						"type": "string"
-					  },
-					  "corpus": {
-						"title": "Corpus name",
-						"type": "string"
-					  },
-					  "uri": {
-						"title": "URI",
-						"type": "string"
-					  }
-					}
-				  },
-				  "required": [
-					"model_id"
-				  ]
-				},              
-				"topic_description": {
-				  "type": "array",
-				  "title": "Topic information",
-				  "items": {
-					"type": "object",
-					"properties": {
-					  "topic_id": {
-						"title": "Topic identifier",
-						"type": ["integer", "string"]
-					  },
-					  "topic_score": {
-						"title": "Topic score",
-						"type": ["number", "string"]
-					  },
-					  "topic_label": {
-						"title": "Topic label",
-						"type": "string"
-					  },
-					  "topic_words": {
+				"type": "object",
+				"properties": {
+					"model_info": {
 						"type": "array",
-						"title": "Topic words",
-						"description": "Words",
+						"title": "Model information",
 						"items": {
-						  "type": "object",
-						  "properties": {
-							"word": {
-							  "title": "Word",
-							  "type": "string"
-							},
-							"word_weight": {
-							  "title": "Word weight",
-							  "type": "number"
+							"type": "object",
+							"properties": {
+								"source": {
+									"title": "Source",
+									"type": "string"
+								},
+								"author": {
+									"title": "Author",
+									"type": "string"
+								},
+								"version": {
+									"title": "Version",
+									"type": "string"
+								},
+								"model_id": {
+									"title": "Model Identifier",
+									"type": "string"
+								},
+								"nb_topics": {
+									"title": "Number of topics",
+									"type": "number"
+								},
+								"description": {
+									"title": "Description",
+									"type": "string"
+								},
+								"corpus": {
+									"title": "Corpus name",
+									"type": "string"
+								},
+								"uri": {
+									"title": "URI",
+									"type": "string"
+								}
 							}
-						  }
 						},
 						"required": [
-						  "word"
+							"model_id"
+						]
+					},
+					"topic_description": {
+						"type": "array",
+						"title": "Topic information",
+						"items": {
+							"type": "object",
+							"properties": {
+								"topic_id": {
+									"title": "Topic identifier",
+									"type": [
+										"integer",
+										"string"
+									]
+								},
+								"topic_score": {
+									"title": "Topic score",
+									"type": [
+										"number",
+										"string"
+									]
+								},
+								"topic_label": {
+									"title": "Topic label",
+									"type": "string"
+								},
+								"topic_words": {
+									"type": "array",
+									"title": "Topic words",
+									"description": "Words",
+									"items": {
+										"type": "object",
+										"properties": {
+											"word": {
+												"title": "Word",
+												"type": "string"
+											},
+											"word_weight": {
+												"title": "Word weight",
+												"type": "number"
+											}
+										}
+									},
+									"required": [
+										"word"
+									]
+								}
+							}
+						},
+						"required": [
+							"topic_id"
 						]
-					  }
 					}
-				  },
-				  "required": [
-					"topic_id"
-				  ]
-				}
-				
-			  },
-			  "additionalProperties": false
+				},
+				"additionalProperties": false
 			}
-		  },
-		  "embeddings":{
+		},
+		"embeddings": {
 			"type": "array",
 			"title": "Word embeddings",
 			"description": "Word embeddings",
 			"items": {
-			  "type": "object",
-			  "properties": {
-				"id": {
-				  "title": "Vector Model ID",
-				  "type": "string"
-				},
-				"description": {
-				  "title": "Vector Model Description",
-				  "type": "string"
-				},
-				"date": {
-				  "title": "Date (YYYY-MM-DD)",
-				  "type": "string"
+				"type": "object",
+				"properties": {
+					"id": {
+						"title": "Vector Model ID",
+						"type": "string"
+					},
+					"description": {
+						"title": "Vector Model Description",
+						"type": "string"
+					},
+					"date": {
+						"title": "Date (YYYY-MM-DD)",
+						"type": "string"
+					},
+					"vector": {
+						"title": "Vector",
+						"type": [
+							"object",
+							"array"
+						]
+					}
 				},
-				"vector": {
-				  "title": "Vector",
-				  "type": ["object","array"]
-				}
-			  },
-			  "required": [
-				"id","vector"
-			  ]
+				"required": [
+					"id",
+					"vector"
+				]
 			}
-		  },
+		},
 		"additional": {
 			"type": "object",
 			"title": "Additional custom metadata",
diff --git a/application/language/english/fields_document_lang.php b/application/language/english/fields_document_lang.php
index 248d14de5..500932496 100644
--- a/application/language/english/fields_document_lang.php
+++ b/application/language/english/fields_document_lang.php
@@ -207,6 +207,9 @@
 $lang['metadata.tags']='Tags';
 $lang['metadata.tags.tag']='Tag';
 
+$lang['scope and coverage']='Scope and coverage';
+$lang['bibliographic information']='Bibliographic information';
+
 
 $lang['metadata.embeddings']='Embeddings';
 $lang['metadata.embeddings.id']='ID';
diff --git a/application/language/english/fields_timeseries_lang.php b/application/language/english/fields_timeseries_lang.php
index 408274942..4e9c0117b 100644
--- a/application/language/english/fields_timeseries_lang.php
+++ b/application/language/english/fields_timeseries_lang.php
@@ -18,6 +18,12 @@
 $lang['metadata.series_description.idno']='Series unique ID';
 $lang['metadata.series_description.name']='Series Name';
 $lang['metadata.series_description.database_id']='Database ID';
+$lang['metadata.series_description.alternate_identifiers']='Identifiers';
+$lang['metadata.series_description.alternate_identifiers.identifier']='ID';
+$lang['metadata.series_description.alternate_identifiers.name']='Name';
+$lang['metadata.series_description.alternate_identifiers.database']='Database';
+$lang['metadata.series_description.alternate_identifiers.uri']='URI';
+$lang['metadata.series_description.alternate_identifiers.notes']='Notes';
 $lang['metadata.series_description.aliases']='Series other names';
 $lang['metadata.series_description.aliases.alias']='Alias';
 $lang['metadata.series_description.measurement_unit']='Series unit of measure';
@@ -42,16 +48,17 @@
 $lang['metadata.series_description.limitation']='Limitations  and exceptions';
 $lang['metadata.series_description.themes']='Themes';
 $lang['metadata.series_description.themes.name']='Name';
+$lang['metadata.series_description.themes.id']='ID';
 $lang['metadata.series_description.themes.vocabulary']='Vocabulary name';
 $lang['metadata.series_description.themes.uri']='Vocabulary URI';
 $lang['metadata.series_description.topics']='Topics';
-$lang['metadata.series_description.topics.id']='Unique Identifier';
+$lang['metadata.series_description.topics.id']='ID';
 $lang['metadata.series_description.topics.name']='Topic';
 $lang['metadata.series_description.topics.parent_id']='Parent topic Identifier';
 $lang['metadata.series_description.topics.vocabulary']='Vocabulary';
 $lang['metadata.series_description.topics.uri']='Vocabulary URI';
 $lang['metadata.series_description.disciplines']='Disciplines';
-$lang['metadata.series_description.disciplines.name']='Discipline title or name';
+$lang['metadata.series_description.disciplines.name']='Name';
 $lang['metadata.series_description.disciplines.vocabulary']='Vocabulary';
 $lang['metadata.series_description.disciplines.uri']='URI';
 $lang['metadata.series_description.relevance']='Relevance';
@@ -66,6 +73,8 @@
 $lang['metadata.series_description.license']='Access license';
 $lang['metadata.series_description.license.name']='License';
 $lang['metadata.series_description.license.uri']='License Link';
+$lang['metadata.series_description.license.note']='Note';
+
 $lang['metadata.series_description.confidentiality']='Confidentiality statement';
 $lang['metadata.series_description.confidentiality_status']='Confidentiality status';
 $lang['metadata.series_description.confidentiality_note']='Confidentiality note';
@@ -76,6 +85,41 @@
 $lang['metadata.series_description.links.uri']='Link';
 $lang['metadata.series_description.links.format']='Format';
 
+$lang['metadata.series_description.acronyms']='Acronyms';
+$lang['metadata.series_description.acronyms.acronym']='Acronym';
+$lang['metadata.series_description.acronyms.expansion']='Expansion';
+$lang['metadata.series_description.acronyms.occurrence']='Occurrence';
+
+$lang['metadata.series_description.framework']='Framework';
+$lang['metadata.series_description.framework.name']='Name';
+$lang['metadata.series_description.framework.description']='Description';
+$lang['metadata.series_description.framework.custodian']='Custodian';
+$lang['metadata.series_description.framework.goal_id']='Goal ID#';
+$lang['metadata.series_description.framework.goal_name']='Goal name';
+$lang['metadata.series_description.framework.goal_description']='Goal description';
+$lang['metadata.series_description.framework.target_id']='Target ID#';
+$lang['metadata.series_description.framework.target_name']='Target name';
+$lang['metadata.series_description.framework.target_description']='Target description';
+$lang['metadata.series_description.framework.indicator_id']='Indicator ID#';
+$lang['metadata.series_description.framework.indicator_name']='Indicator name';
+$lang['metadata.series_description.framework.indicator_description']='Indicator description';
+$lang['metadata.series_description.framework.uri']='URI';
+$lang['metadata.series_description.framework.notes']='Notes';
+
+
+
+$lang['metadata.series_description.ref_country']='Reference countries';
+$lang['metadata.series_description.ref_country.name']='Name';
+$lang['metadata.series_description.ref_country.code']='Code';
+
+$lang['metadata.series_description.disaggregation']='Disaggregation';
+
+$lang['metadata.series_description.authoring_entity']='Authoring entity';
+$lang['metadata.series_description.authoring_entity.name']='Name';
+$lang['metadata.series_description.authoring_entity.affiliation']='Affiliation';
+$lang['metadata.series_description.authoring_entity.abbreviation']='Abbreviation';
+$lang['metadata.series_description.authoring_entity.email']='Email';
+$lang['metadata.series_description.authoring_entity.uri']='URI';
 
 
 //tobo removed
@@ -85,13 +129,19 @@
 $lang['metadata.series_description.series_links.url']='Link';
 
 
+$lang['metadata.series_description.dimensions']='Dimensions';
+$lang['metadata.series_description.dimensions.label']='Label';
+$lang['metadata.series_description.dimensions.description']='Description';
+$lang['metadata.series_description.missing']='Missing';
 
+$lang['metadata.series_description.sources_discrepancies']='Sources discrepancies';
+$lang['metadata.series_description.sources_note']='Sources note';
 
-$lang['metadata.series_description.api_documentation']='';
-$lang['metadata.series_description.api_documentation.description']='Description';
 
+$lang['metadata.series_description.api_documentation']='Api documentation';
+$lang['metadata.series_description.api_documentation.description']='Description';
 $lang['metadata.series_description.api_documentation.uri']='Documentation Link';
-$lang['metadata.series_description.api_documentation.url']='Documentation Link';
+
 
 $lang['metadata.series_description.sources']='Original sources';
 $lang['metadata.series_description.sources.id']='Source ID';
@@ -107,13 +157,14 @@
 $lang['metadata.series_description.keywords.uri']='URI';
 $lang['metadata.series_description.notes']='Notes';
 $lang['metadata.series_description.notes.note']='Note';
-$lang['metadata.series_description.related_indicators']='';
-$lang['metadata.series_description.related_indicators.code']='Indicator code';
-$lang['metadata.series_description.related_indicators.label']='Indicator name';
+$lang['metadata.series_description.related_indicators']='Related indicators';
+$lang['metadata.series_description.related_indicators.code']='Code';
+$lang['metadata.series_description.related_indicators.label']='Label';
 $lang['metadata.series_description.related_indicators.uri']='URI';
 $lang['metadata.series_description.compliance']='Compliance with international resolution';
-$lang['metadata.series_description.compliance.standard']='Standard name';
-$lang['metadata.series_description.compliance.organization']='Organization name';
+$lang['metadata.series_description.compliance.standard']='Standard';
+$lang['metadata.series_description.compliance.custodian']='Custodian';
+$lang['metadata.series_description.compliance.organization']='Organization';
 $lang['metadata.series_description.compliance.uri']='URI';
 $lang['metadata.series_description.series_groups']='Series groups';
 $lang['metadata.series_description.series_groups.name']='Name';
diff --git a/application/language/english/fields_timeseriesdb_lang.php b/application/language/english/fields_timeseriesdb_lang.php
index c0fe63791..9d6a7fbdf 100644
--- a/application/language/english/fields_timeseriesdb_lang.php
+++ b/application/language/english/fields_timeseriesdb_lang.php
@@ -11,6 +11,8 @@
 $lang['metadata.database_description.authoring_entity.role']='Role';
 $lang['metadata.database_description.authoring_entity.affiliation']='Affiliation';
 $lang['metadata.database_description.authoring_entity.abbreviation']='Abbreviation';
+$lang['metadata.database_description.authoring_entity.email']='Email';
+$lang['metadata.database_description.authoring_entity.uri']='URI';
 
 
 $lang['metadata.database_description.abstract']='Abstract';
@@ -31,13 +33,16 @@
 $lang['metadata.database_description.update_frequency']='Update frequency';
 $lang['metadata.database_description.update_schedule']='Update schedule';
 $lang['metadata.database_description.update_schedule.update']='Schedule';
-$lang['metadata.database_description.time_coverage']='Time';
+$lang['metadata.database_description.time_coverage']='Time coverage';
 $lang['metadata.database_description.time_coverage_note']='Time coverage note';
+$lang['metadata.database_description.time_coverage.start']='Start';
+$lang['metadata.database_description.time_coverage.end']='End';
 $lang['metadata.database_description.periodicity']='Periodicity';
 $lang['metadata.database_description.periodicity.period']='Period';
 
 $lang['metadata.database_description.themes']='Themes';
 $lang['metadata.database_description.themes.name']='Theme';
+$lang['metadata.database_description.themes.id']='ID';
 $lang['metadata.database_description.themes.vocabulary']='Vocabulary';
 $lang['metadata.database_description.themes.uri']='URI';
 
@@ -48,6 +53,11 @@
 $lang['metadata.database_description.topics.vocabulary']='Vocabulary';
 $lang['metadata.database_description.topics.uri']='URI';
 
+$lang['metadata.database_description.ref_country']='Reference countries';
+$lang['metadata.database_description.ref_country.name']='Name';
+$lang['metadata.database_description.ref_country.code']='Code';
+
+$lang['metadata.database_description.acknowledgment_statement']='Acknowledgement statement';
 
 
 $lang['metadata.database_description.keywords']='Keywords';
@@ -55,7 +65,7 @@
 $lang['metadata.database_description.keywords.vocabulary']='Vocabulary';
 $lang['metadata.database_description.keywords.uri']='URI';
 
-$lang['metadata.database_description.geographic_units']='Geograhic coverage';
+$lang['metadata.database_description.geographic_units']='Geographic coverage';
 
 $lang['metadata.database_description.geographic_units.name']='Name';
 $lang['metadata.database_description.geographic_units.code']='Code';
@@ -111,6 +121,7 @@
 $lang['metadata.database_description.license.type']='Type';
 $lang['metadata.database_description.license.uri']='URI';
 $lang['metadata.database_description.license.note']='Note';
+$lang['metadata.database_description.license.name']='Name';
 
 $lang['metadata.database_description.citation']='Citation';
 
diff --git a/application/metadata_editor_templates/image_form_template.json b/application/metadata_editor_templates/image_form_template.json
index 67e9d19fd..93dd612bc 100644
--- a/application/metadata_editor_templates/image_form_template.json
+++ b/application/metadata_editor_templates/image_form_template.json
@@ -139,7 +139,7 @@
                     "title": "Art Work or Object",
                     "class": "required",
                     "help_text": "A set of metadata about artwork or an object in the image",
-                    "type": "array",
+                    "type": "nested_array",
                     "props": {
                         "circaDateCreated": {
                             "key": "circaDateCreated",
diff --git a/application/models/Dataset_document_model.php b/application/models/Dataset_document_model.php
index 0204548e2..f401cea6d 100644
--- a/application/models/Dataset_document_model.php
+++ b/application/models/Dataset_document_model.php
@@ -144,18 +144,23 @@ function get_core_fields($options)
         if(is_array($authors)){
             $authors_str=array();
             foreach($authors as $author){
-                $tmp=array();
-                $tmp[]=$this->get_array_nested_value($author,'first_name');
-                $tmp[]=$this->get_array_nested_value($author,'last_name');
 
-                $authors_str[]=implode(" ", $tmp);
+                $fullname=$this->get_array_nested_value($author,'full_name');
+
+                if (!empty($fullname)){
+                    $authors_str[]=$fullname;
+                }
+                else{
+                    $tmp=array();
+                    $tmp[]=$this->get_array_nested_value($author,'first_name');
+                    $tmp[]=$this->get_array_nested_value($author,'last_name');
+                    $authors_str[]=implode(" ", $tmp);
+                }
             }
 
             $output['authoring_entity']=implode(", ",$authors_str);
         }
 
-        
-
         $years=$this->get_years($options);
         $output['year_start']=$years['start'];
         $output['year_end']=$years['end'];
diff --git a/application/schemas/table-schema.json b/application/schemas/table-schema.json
index 6334fd3f7..f58f0a4fe 100644
--- a/application/schemas/table-schema.json
+++ b/application/schemas/table-schema.json
@@ -628,6 +628,23 @@
             }
           }
         },
+        "api_documentation": {
+          "type":"array",
+          "description": "API Documentation",
+          "items":{          
+					"type": "object",					
+					"properties": {
+						"description": {
+							"title": "Description",
+							"type": "string"
+						},
+						"uri": {
+							"title": "URI",
+							"type": "string"
+						}
+					}
+          }
+				},
         "publications": {
           "type": "array",
           "title": "Publications",
diff --git a/application/schemas/timeseries-schema.json b/application/schemas/timeseries-schema.json
index 2dd7edf2d..61c06772f 100644
--- a/application/schemas/timeseries-schema.json
+++ b/application/schemas/timeseries-schema.json
@@ -581,16 +581,19 @@
 					}
 				},
 				"api_documentation": {
-					"type": "object",
+					"type": "array",
 					"description": "API Documentation",
-					"properties": {
-						"description": {
-							"title": "Description",
-							"type": "string"
-						},
-						"uri": {
-							"title": "URI",
-							"type": "string"
+					"items": {
+						"type": "object",
+						"properties": {
+							"description": {
+								"title": "Description",
+								"type": "string"
+							},
+							"uri": {
+								"title": "URI",
+								"type": "string"
+							}
 						}
 					}
 				},
@@ -923,131 +926,140 @@
 			"title": "LDA topics",
 			"description": "LDA topics",
 			"items": {
-			  "type": "object",
-			  "properties": {
-				"model_info": {
-				  "type": "array",
-				  "title": "Model information",
-				  "items": {
-					"type": "object",
-					"properties": {
-					  "source": {
-						"title": "Source",
-						"type": "string"
-					  },
-					  "author": {
-						"title": "Author",
-						"type": "string"
-					  },
-					  "version": {
-						"title": "Version",
-						"type": "string"
-					  },
-					  "model_id": {
-						"title": "Model Identifier",
-						"type": "string"
-					  },
-					  "nb_topics": {
-						"title": "Number of topics",
-						"type": "number"
-					  },
-					  "description": {
-						"title": "Description",
-						"type": "string"
-					  },
-					  "corpus": {
-						"title": "Corpus name",
-						"type": "string"
-					  },
-					  "uri": {
-						"title": "URI",
-						"type": "string"
-					  }
-					}
-				  },
-				  "required": [
-					"model_id"
-				  ]
-				},              
-				"topic_description": {
-				  "type": "array",
-				  "title": "Topic information",
-				  "items": {
-					"type": "object",
-					"properties": {
-					  "topic_id": {
-						"title": "Topic identifier",
-						"type": ["integer", "string"]
-					  },
-					  "topic_score": {
-						"title": "Topic score",
-						"type": ["number", "string"]
-					  },
-					  "topic_label": {
-						"title": "Topic label",
-						"type": "string"
-					  },
-					  "topic_words": {
+				"type": "object",
+				"properties": {
+					"model_info": {
 						"type": "array",
-						"title": "Topic words",
-						"description": "Words",
+						"title": "Model information",
 						"items": {
-						  "type": "object",
-						  "properties": {
-							"word": {
-							  "title": "Word",
-							  "type": "string"
-							},
-							"word_weight": {
-							  "title": "Word weight",
-							  "type": "number"
+							"type": "object",
+							"properties": {
+								"source": {
+									"title": "Source",
+									"type": "string"
+								},
+								"author": {
+									"title": "Author",
+									"type": "string"
+								},
+								"version": {
+									"title": "Version",
+									"type": "string"
+								},
+								"model_id": {
+									"title": "Model Identifier",
+									"type": "string"
+								},
+								"nb_topics": {
+									"title": "Number of topics",
+									"type": "number"
+								},
+								"description": {
+									"title": "Description",
+									"type": "string"
+								},
+								"corpus": {
+									"title": "Corpus name",
+									"type": "string"
+								},
+								"uri": {
+									"title": "URI",
+									"type": "string"
+								}
 							}
-						  }
 						},
 						"required": [
-						  "word"
+							"model_id"
+						]
+					},
+					"topic_description": {
+						"type": "array",
+						"title": "Topic information",
+						"items": {
+							"type": "object",
+							"properties": {
+								"topic_id": {
+									"title": "Topic identifier",
+									"type": [
+										"integer",
+										"string"
+									]
+								},
+								"topic_score": {
+									"title": "Topic score",
+									"type": [
+										"number",
+										"string"
+									]
+								},
+								"topic_label": {
+									"title": "Topic label",
+									"type": "string"
+								},
+								"topic_words": {
+									"type": "array",
+									"title": "Topic words",
+									"description": "Words",
+									"items": {
+										"type": "object",
+										"properties": {
+											"word": {
+												"title": "Word",
+												"type": "string"
+											},
+											"word_weight": {
+												"title": "Word weight",
+												"type": "number"
+											}
+										}
+									},
+									"required": [
+										"word"
+									]
+								}
+							}
+						},
+						"required": [
+							"topic_id"
 						]
-					  }
 					}
-				  },
-				  "required": [
-					"topic_id"
-				  ]
-				}
-				
-			  },
-			  "additionalProperties": false
+				},
+				"additionalProperties": false
 			}
-		  },
-		  "embeddings":{
+		},
+		"embeddings": {
 			"type": "array",
 			"title": "Word embeddings",
 			"description": "Word embeddings",
 			"items": {
-			  "type": "object",
-			  "properties": {
-				"id": {
-				  "title": "Vector Model ID",
-				  "type": "string"
-				},
-				"description": {
-				  "title": "Vector Model Description",
-				  "type": "string"
-				},
-				"date": {
-				  "title": "Date (YYYY-MM-DD)",
-				  "type": "string"
+				"type": "object",
+				"properties": {
+					"id": {
+						"title": "Vector Model ID",
+						"type": "string"
+					},
+					"description": {
+						"title": "Vector Model Description",
+						"type": "string"
+					},
+					"date": {
+						"title": "Date (YYYY-MM-DD)",
+						"type": "string"
+					},
+					"vector": {
+						"title": "Vector",
+						"type": [
+							"object",
+							"array"
+						]
+					}
 				},
-				"vector": {
-				  "title": "Vector",
-				  "type": ["object","array"]
-				}
-			  },
-			  "required": [
-				"id","vector"
-			  ]
+				"required": [
+					"id",
+					"vector"
+				]
 			}
-		  },
+		},
 		"additional": {
 			"type": "object",
 			"title": "Additional custom metadata",
diff --git a/application/views/metadata_templates/document-template.php b/application/views/metadata_templates/document-template.php
index ac1f363d2..db0a6cc84 100644
--- a/application/views/metadata_templates/document-template.php
+++ b/application/views/metadata_templates/document-template.php
@@ -16,6 +16,11 @@
     .field-label{
         font-weight:bold;
     }
+    .field-metadata__document_description__ref_country .field-value{
+        max-height:300px;
+        overflow-y:auto;
+    }
+    
 </style>
 
 
@@ -23,6 +28,15 @@
 <?php 
     //rendered html for all sections
     $output=array();
+
+    //remove vectors
+    if (isset($metadata['metadata']['embeddings'])){
+        foreach($metadata['metadata']['embeddings'] as $embed_key=>$embedding){
+            if (isset($embedding['vector'])){
+                unset($metadata['metadata']['embeddings'][$embed_key]['vector']);
+            }
+        }
+    }
 ?>
 
 <!-- description -->
@@ -42,7 +56,7 @@
             ),
         $metadata),
                     
-        render_field("array","metadata.document_description.authors",get_field_value("metadata.document_description.authors",$metadata)),
+        render_field("array_authors","metadata.document_description.authors",get_field_value("metadata.document_description.authors",$metadata)),
         render_field("array","metadata.document_description.editors",get_field_value("metadata.document_description.editors",$metadata)),
         render_field("text","metadata.document_description.type",get_field_value("metadata.document_description.type",$metadata)),
         render_field("text","metadata.document_description.publication_frequency",get_field_value("metadata.document_description.publication_frequency",$metadata)),
@@ -58,7 +72,7 @@
         render_field("resources","metadata.resources",get_field_value("metadata.resources",$metadata))
     );
 
-    $output["dscription"]=render_group_text ("description",implode("",$description));
+    $output["description"]=render_group_text ("description",implode("",$description));
 
 ?>
 
diff --git a/application/views/metadata_templates/fields/bootstrap_columns.php b/application/views/metadata_templates/fields/bootstrap_columns.php
index bcf2b9989..6191365aa 100644
--- a/application/views/metadata_templates/fields/bootstrap_columns.php
+++ b/application/views/metadata_templates/fields/bootstrap_columns.php
@@ -1,7 +1,7 @@
 <?php 
 
     $column_class='col-3';//set boostrap column size
-    $show_empty=true; //show empty fields
+    $show_empty=false; //show empty fields
 
     if (isset($options['column_class'])){
         $column_class=$options['column_class'];
diff --git a/application/views/metadata_templates/fields/field_array_authors.php b/application/views/metadata_templates/fields/field_array_authors.php
new file mode 100644
index 000000000..f643ff9b1
--- /dev/null
+++ b/application/views/metadata_templates/fields/field_array_authors.php
@@ -0,0 +1,123 @@
+<?php
+/**
+ * 
+ * Table field
+ *
+ *  options
+ * 
+ *  - hide_column_headings - hide column headings 
+ */
+
+ $hide_column_headings=false;
+ $hide_field_title=false;
+ $columns=NULL;
+
+ if (isset($options[$name])){
+    $options=$options[$name];
+}
+
+ if(isset($options['hide_column_headings'])){
+     $hide_column_headings=$options['hide_column_headings'];
+ }
+ 
+ if(isset($options['columns'])){
+    $columns=$options['columns'];
+}
+
+ if(isset($options['hide_field_title'])){
+    $hide_field_title=$options['hide_field_title'];
+ }
+
+ 
+
+?>
+<?php if (isset($data) && is_array($data) && count($data)>0 ):?>
+<div class="table-responsive field field-<?php echo str_replace(".","__",$name);?>">
+    <?php if ($hide_field_title!=true):?>
+    <div class="xsl-caption field-caption"><?php echo t($name);?></div>
+    <?php endif;?>
+    <div class="field-value">                
+        <?php if (isset($data[0]) && is_array($data[0])):?>
+        <?php            
+            if(!isset($columns)){
+             $columns=array('last_name','first_name','initial','affiliation','author_id');
+            }
+
+            //remove empty columns
+            $non_empty_columns=array();            
+            foreach($columns as $column){
+                $column_data=array_filter(array_column($data, $column));
+                if(!empty($column_data)){
+                    $non_empty_columns[]=$column;
+                }
+            }
+            $columns=$non_empty_columns;
+        ?>
+        
+        <table class="table table-bordered table-striped table-condensed xsl-table table-grid">
+            <?php if($hide_column_headings!==true):?>
+            <tr>
+                <?php foreach($columns as $column_name):?>
+                    <th><?php echo t($name.'.'.$column_name);?></th>
+                <?php endforeach;?>
+            </tr>
+            <?php endif;?>
+            
+            <?php foreach($data as $row):?>
+                <tr>
+                    
+                    <?php foreach($columns as $column_name):?>                        
+                        <td>
+                            <?php if(empty($row[$column_name])){continue;}?>    
+                            <?php if($column_name=='author_id' && is_array($row['author_id'])):?>
+                                <?php foreach($row['author_id'] as $author_id):?>
+                                    <div>
+                                    <?php if (isset($author_id['type'])):?>
+                                        <?php echo $author_id['type'];?>: 
+                                    <?php endif;?>
+                                    <?php if (isset($author_id['id'])):?>
+                                        <?php echo $author_id['id'];?>
+                                    <?php endif;?>
+                                    </div>                                      
+                                <?php endforeach;?>
+                            <?php else:?>
+                                <?php if(is_url($row[$column_name])):?>
+                                     <a target="_blank" href="<?php echo html_escape($row[$column_name]);?>"><i class="fas fa-external-link-alt"></i> <?php echo t('Link');?></a>
+                                <?php else:?>
+                                    <?php if($column_name=='last_name' && isset($row['full_name'])):?>
+                                        <?php echo $row['full_name'];?>
+                                    <?php else:?>
+                                        <?php echo $row[$column_name];?>
+                                    <?php endif;?>
+                                <?php endif;?>
+                            <?php endif;?>    
+                        </td>
+                    <?php endforeach;?>                    
+                    <?php  /*
+                    <?php foreach($row as $key=>$value):?>
+                        <?php if(!in_array($key,$columns)){continue;}?>
+                        <td>
+                            <?php if(is_array($value)):?>
+                            <?php echo render_field($field_type='array_br',$field_name=$name.'.'.$key,$value, array('hide_column_headings'=>true));?>
+                            <?php else:?>
+                                <?php echo $value;?>
+                            <?php endif;?>    
+                        </td>
+                    <?php endforeach;?>                    
+                    */ ?>
+                </tr>
+            <?php endforeach;?>
+        </table>
+        <?php else:?>
+        <table class="table xsl-table table-grid">            
+               <?php foreach($data as $row):?>
+               <tr>
+                <td><?php echo $row;?></td>
+               </tr>
+               <?php endforeach;?>
+        </table>
+        <?php endif;?>
+
+    </div>
+</div>
+<?php endif;?>
diff --git a/application/views/metadata_templates/fields/field_array_vertical.php b/application/views/metadata_templates/fields/field_array_vertical.php
new file mode 100644
index 000000000..06301a8fc
--- /dev/null
+++ b/application/views/metadata_templates/fields/field_array_vertical.php
@@ -0,0 +1,102 @@
+<?php
+/**
+ * 
+ * Table field
+ *
+ *  options
+ * 
+ *  - hide_column_headings - hide column headings 
+ */
+
+ $hide_column_headings=false;
+ $hide_field_title=false;
+ $columns=NULL;
+
+ if (isset($options[$name])){
+    $options=$options[$name];
+}
+
+ if(isset($options['hide_column_headings'])){
+     $hide_column_headings=$options['hide_column_headings'];
+ }
+ 
+ if(isset($options['columns'])){
+    $columns=$options['columns'];
+}
+
+ if(isset($options['hide_field_title'])){
+    $hide_field_title=$options['hide_field_title'];
+ }
+
+ 
+
+?>
+<?php if (isset($data) && is_array($data) && count($data)>0 ):?>
+<div class="table-responsive field field-<?php echo str_replace(".","__",$name);?>">
+    <?php if ($hide_field_title!=true):?>
+    <div class="xsl-caption field-caption"><?php echo t($name);?></div>
+    <?php endif;?>
+    <div class="field-value">                
+        <?php if (isset($data[0]) && is_array($data[0])):?>
+        <?php            
+            if(!isset($columns)){
+             $columns=array_keys($data[0]);
+            }
+
+            //remove empty columns
+            $non_empty_columns=array();            
+            foreach($columns as $column){
+                $column_data=array_filter(array_column($data, $column));
+                if(!empty($column_data)){
+                    $non_empty_columns[]=$column;
+                }
+            }
+            $columns=$non_empty_columns;
+        ?>
+        
+        <div class="field-container">
+            <?php foreach($data as $row):?>                
+                    <?php foreach($columns as $column_name):?>                        
+                        <div>
+                            <div class="field-caption"><?php echo t($name.'.'.$column_name);?></div>
+                            <div class="mb-3">
+                                <?php if(empty($row[$column_name])){continue;}?>    
+                                <?php if(is_array($row[$column_name])):?>
+                                <?php echo render_field($field_type='array_badge',$field_name=$name.'.'.$column_name,$row[$column_name], array('hide_column_headings'=>true));?>
+                                <?php else:?>
+                                    <?php if(is_url($row[$column_name])):?>
+                                        <a target="_blank" href="<?php echo html_escape($row[$column_name]);?>"><i class="fas fa-external-link-alt"></i> <?php echo t('Link');?></a>
+                                    <?php else:?>
+                                        <?php echo $row[$column_name];?>
+                                    <?php endif;?>
+                                <?php endif;?>    
+                            </div>
+                        </div>
+                    <?php endforeach;?>                    
+                    <?php  /*
+                    <?php foreach($row as $key=>$value):?>
+                        <?php if(!in_array($key,$columns)){continue;}?>
+                        <td>
+                            <?php if(is_array($value)):?>
+                            <?php echo render_field($field_type='array_br',$field_name=$name.'.'.$key,$value, array('hide_column_headings'=>true));?>
+                            <?php else:?>
+                                <?php echo $value;?>
+                            <?php endif;?>    
+                        </td>
+                    <?php endforeach;?>                    
+                    */ ?>                
+            <?php endforeach;?>
+        </div>
+        <?php else:?>
+        <table class="table xsl-table table-grid">            
+               <?php foreach($data as $row):?>
+               <tr>
+                <td><?php echo $row;?></td>
+               </tr>
+               <?php endforeach;?>
+        </table>
+        <?php endif;?>
+
+    </div>
+</div>
+<?php endif;?>
diff --git a/application/views/metadata_templates/timeseries-template.php b/application/views/metadata_templates/timeseries-template.php
index 156c1d727..3641b26a9 100644
--- a/application/views/metadata_templates/timeseries-template.php
+++ b/application/views/metadata_templates/timeseries-template.php
@@ -70,7 +70,7 @@
         
         "metadata.series_description.related_indicators"=>"array",        
         "metadata.series_description.compliance"=>"array",
-        "metadata.series_description.framework"=>"array",
+        "metadata.series_description.framework"=>"array_vertical",
         "metadata.series_description.series_groups"=>"array",
         "metadata.additional"=>"object"        
     ),
@@ -80,8 +80,7 @@
 
 <?php $output['api_documentation']= render_group('api_documentation',
     $fields=array(
-        "metadata.series_description.api_documentation.description"=>"text",
-        "metadata.series_description.api_documentation.url"=>"text",
+        "metadata.series_description.api_documentation"=>"array"
     ),
     $metadata);
 ?>
diff --git a/application/views/metadata_templates/timeseriesdb-template.php b/application/views/metadata_templates/timeseriesdb-template.php
index 02b02d20c..0578d5ed6 100644
--- a/application/views/metadata_templates/timeseriesdb-template.php
+++ b/application/views/metadata_templates/timeseriesdb-template.php
@@ -10,6 +10,16 @@
 ?>
 
 
+<style>
+.field-metadata__database_description__geographic_units  .field-value{
+    max-height:300px;
+    overflow-y:auto;
+}
+
+
+</style>
+
+
 <?php 
     //rendered html for all sections
     $output=array();
@@ -64,9 +74,7 @@
 
         "metadata.database_description.notes"=>"array",
         "metadata.database_description.disclaimer"=>"text",
-        "metadata.database_description.copyright"=>"text",
-
-        "metadata.additional"=>"object",
+        "metadata.database_description.copyright"=>"text",        
     ),
     $metadata);
 ?>
diff --git a/application/views/survey_info/info.php b/application/views/survey_info/info.php
index 2eb5f43f2..27508d485 100644
--- a/application/views/survey_info/info.php
+++ b/application/views/survey_info/info.php
@@ -3,7 +3,7 @@
     $sub_title=array();
     
     if ($survey['type']=='document' && isset($survey['metadata']['document_description']['authors'])){
-        $sub_title[]= '<span id="dataset-country">'.authors_to_string($survey['metadata']['document_description']['authors']).'</span>';
+        $sub_title[]= '<span id="dataset-country">'.$survey['authoring_entity'].'</span>';
     }else{        
         if ($survey['nation']!=''){
             $sub_title[]='<span id="dataset-country">'.$survey['nation'].'</span>';

From 08f6e8f60a704d657df238741d85c8ad4b628281 Mon Sep 17 00:00:00 2001
From: Mehmood Asghar <mah0001@gmail.com>
Date: Tue, 10 May 2022 19:41:06 -0400
Subject: [PATCH 54/79] minor fixes for generating ddi

---
 application/libraries/DDI_Writer.php      | 8 +++++---
 application/views/ddi/ddi25_stdy_dscr.php | 2 +-
 2 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/application/libraries/DDI_Writer.php b/application/libraries/DDI_Writer.php
index aa257c41f..b33d5fa74 100644
--- a/application/libraries/DDI_Writer.php
+++ b/application/libraries/DDI_Writer.php
@@ -143,9 +143,11 @@ function generate_ddi($id=null, $output='php://output')
         $files=$this->ci->Data_file_model->get_all_by_survey($id);
         $writer->writeRaw("\n");
         
-        foreach($files as $file){
-            $writer->writeRaw($this->get_file_desc_xml($file));
-            $writer->writeRaw("\n");
+        if (!empty($files)){
+            foreach($files as $file){
+                $writer->writeRaw($this->get_file_desc_xml($file));
+                $writer->writeRaw("\n");
+            }
         }
 
         //dataDscr
diff --git a/application/views/ddi/ddi25_stdy_dscr.php b/application/views/ddi/ddi25_stdy_dscr.php
index 95b181b42..5ca33e47f 100644
--- a/application/views/ddi/ddi25_stdy_dscr.php
+++ b/application/views/ddi/ddi25_stdy_dscr.php
@@ -12,7 +12,7 @@
         <IDNo><?php $ddi->el('study_desc/title_statement/idno');?></IDNo>
       </titlStmt>      
       <rspStmt>
-        <?php $authoring_entities=$ddi->get_el('study_desc/authoring_entity');?>
+        <?php $authoring_entities=(array)$ddi->get_el('study_desc/authoring_entity');?>
         <?php foreach($authoring_entities as $auth_entity):?>
         <AuthEnty affiliation="<?php echo $ddi->attr_val($auth_entity,'affiliation');?>"><?php echo $ddi->el_Val($auth_entity,'name');?></AuthEnty>
         <?php endforeach;?>

From ad6ac11c976d539dbd06a4a74b8e00fcc6cae261 Mon Sep 17 00:00:00 2001
From: Mehmood Asghar <mah0001@gmail.com>
Date: Wed, 11 May 2022 14:00:52 -0400
Subject: [PATCH 55/79] minor

---
 application/views/survey_info/data_files.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/application/views/survey_info/data_files.php b/application/views/survey_info/data_files.php
index 06f92cb1b..54812a67e 100644
--- a/application/views/survey_info/data_files.php
+++ b/application/views/survey_info/data_files.php
@@ -35,7 +35,7 @@
         
             <div class="file-description"><?php echo nl2br($file['description']);?></div>
         </td>
-        <?php if(!empty($case_counts_col)):?>)
+        <?php if(!empty($case_counts_col)):?>
             <td><?php echo $file['case_count'];?></td>
         <?php endif;?>
         <?php if(!empty($case_counts_col)):?>

From 1d4eb280e74a68c0db80fb230bfc72367d9f5a26 Mon Sep 17 00:00:00 2001
From: Mehmood Asghar <mah0001@gmail.com>
Date: Fri, 20 May 2022 14:00:58 -0400
Subject: [PATCH 56/79] minor

---
 application/libraries/Catalog_search_mysql.php  | 4 ++--
 application/libraries/Catalog_search_sqlsrv.php | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/application/libraries/Catalog_search_mysql.php b/application/libraries/Catalog_search_mysql.php
index 1b3330862..b91b6f5ba 100644
--- a/application/libraries/Catalog_search_mysql.php
+++ b/application/libraries/Catalog_search_mysql.php
@@ -328,7 +328,7 @@ public function search($limit=15, $offset=0)
 	 */
 	public function search_counts_by_type()
 	{		
-		//$type=$this->_build_dataset_type_query();
+		$type=$this->_build_dataset_type_query();
 		$study=$this->_build_study_query();
 		$variable=false;//$this->_build_variable_query();
 		$topics=$this->_build_topics_query();
@@ -344,7 +344,7 @@ public function search_counts_by_type()
         $countries_iso3=$this->_build_countries_iso3_query();
 		
 		//array of all options
-		$where_list=array($tags,$study,$variable,$topics,$countries,$years,$repository,$collections,$dtype,$data_classification,$sid,$countries_iso3,$regions);
+		$where_list=array($tags,$study,$variable,$topics,$countries,$years,$repository,$collections,$dtype,$data_classification,$sid,$countries_iso3,$regions,$type);
 
 		foreach($this->user_facets as $fc){
 			if (array_key_exists($fc['name'],$this->params)){
diff --git a/application/libraries/Catalog_search_sqlsrv.php b/application/libraries/Catalog_search_sqlsrv.php
index 1644a0f95..06383a1e0 100644
--- a/application/libraries/Catalog_search_sqlsrv.php
+++ b/application/libraries/Catalog_search_sqlsrv.php
@@ -1165,7 +1165,7 @@ protected function _build_tags_query()
 	 */
 	public function search_counts_by_type()
 	{		
-		//$type=$this->_build_dataset_type_query();
+		$type=$this->_build_dataset_type_query();
 		$study=$this->_build_study_query();
 		$topics=$this->_build_topics_query();
 		$countries=$this->_build_countries_query();
@@ -1179,7 +1179,7 @@ public function search_counts_by_type()
         $countries_iso3=$this->_build_countries_iso3_query();
 		
 		//array of all options
-		$where_list=array($tags,$study,$topics,$countries,$years,$repository,$collections,$dtype,$data_class,$sid,$countries_iso3,$tags);
+		$where_list=array($tags,$study,$topics,$countries,$years,$repository,$collections,$dtype,$data_class,$sid,$countries_iso3,$tags,$type);
 		
 		foreach($this->user_facets as $fc){
 			if (array_key_exists($fc['name'],$this->params)){

From efb78c0d7730871b28e0049c792403fa8191e240 Mon Sep 17 00:00:00 2001
From: Mehmood Asghar <mah0001@gmail.com>
Date: Fri, 20 May 2022 14:02:36 -0400
Subject: [PATCH 57/79] fix icon for geospatial data types

---
 application/models/Dataset_model.php             |  9 ++++++++-
 application/models/Search_helper_model.php       | 16 +++++++++++++---
 application/views/search/facet.php               |  4 ++--
 application/views/search/history.php             |  2 +-
 application/views/search/search_nav_bar.php      |  4 ++--
 application/views/search/surveys.php             |  2 +-
 application/views/search/tables.php              |  2 +-
 application/views/search/variables.php           |  2 ++
 application/views/static/recent_studies_list.php |  2 +-
 application/views/survey_info/info.php           |  2 +-
 .../views/tokens/cards-featured-entries.php      |  2 +-
 application/views/tokens/recent-entries.php      |  2 +-
 12 files changed, 34 insertions(+), 15 deletions(-)

diff --git a/application/models/Dataset_model.php b/application/models/Dataset_model.php
index 04b0df3c4..f8649ab89 100644
--- a/application/models/Dataset_model.php
+++ b/application/models/Dataset_model.php
@@ -110,7 +110,14 @@ function get_all($limit=0,$offset=0, $fields=array())
 			$this->db->limit($limit, $offset);
 		}
 		
-		$result= $this->db->get("surveys")->result_array();
+		$result= $this->db->get("surveys");
+		
+		if ($result){
+			$result=$result->result_array();
+		}else{
+			$error=$this->db->error();
+			throw  new Exception(implode(", ", $error));
+		}
 
 		if($result){
 			return $this->decode_encoded_fields_rows($result);
diff --git a/application/models/Search_helper_model.php b/application/models/Search_helper_model.php
index 4fccce3dc..fb39cbc01 100644
--- a/application/models/Search_helper_model.php
+++ b/application/models/Search_helper_model.php
@@ -748,12 +748,22 @@ function get_repositories_list($published=1)
 	*/	
 	function get_countries_list($countries)
 	{
-		$this->db->select('countryid,name');
-		
+		$countries_list=array();
+
 		if(is_array($countries) && count($countries)>0){
-			$this->db->where_in('countryid',$countries);
+			
+			foreach($countries as $country_id){
+				if(is_numeric($country_id)){
+					$countries_list[]=$country_id;
+				}
+			}
+			if(count($countries_list)==0){
+				return false;
+			}
 		}
 		
+		$this->db->select('countryid,name');
+		$this->db->where_in('countryid',$countries);
 		$result=$this->db->get('countries')->result_array();
 		
 		$output=array();
diff --git a/application/views/search/facet.php b/application/views/search/facet.php
index 3ade9d716..984b75a57 100644
--- a/application/views/search/facet.php
+++ b/application/views/search/facet.php
@@ -95,7 +95,7 @@ class="wb-filter-title <?php echo $filter_collapse ? 'collapsed' :'';?>"
                                 <?php if (isset($item['translated_title'])):?>
                                     <?php echo $item['translated_title']; ?>
                                 <?php else:?>
-                                    <?php echo $item['title'];?>
+                                    <?php echo t($item['title']);?>
                                 <?php endif;?>
                                 
                                 <?php if(isset($item['found'])):?>
@@ -124,7 +124,7 @@ class="wb-filter-title <?php echo $filter_collapse ? 'collapsed' :'';?>"
                                     <?php if (isset($item['translated_title'])):?>
                                         <?php echo $item['translated_title']; ?>
                                     <?php else:?>
-                                        <?php echo $item['title'];?>
+                                        <?php echo t($item['title']);?>
                                     <?php endif;?>
                                     
                                     <?php if(isset($item['found'])):?>
diff --git a/application/views/search/history.php b/application/views/search/history.php
index f65a5fdf1..1dfbb7c92 100644
--- a/application/views/search/history.php
+++ b/application/views/search/history.php
@@ -8,7 +8,7 @@
     $type_icons=array(
         'survey'=>'fa-database',
         'microdata'=>'fa-database',
-        'geospatial'=>'fa-globe',
+        'geospatial'=>'fa-globe-americas',
         'timeseries'=>'fa-chart-line',
         'document'=>'fa-file-alt',
         'table'=>'fa-table',
diff --git a/application/views/search/search_nav_bar.php b/application/views/search/search_nav_bar.php
index 4ec67b04c..c67035beb 100644
--- a/application/views/search/search_nav_bar.php
+++ b/application/views/search/search_nav_bar.php
@@ -18,7 +18,7 @@
     $variable_view=http_build_query($variable_view);
 
     $show_variable_toggle=false;
-    if (isset($search_options->tab_type) && in_array($search_options->tab_type,array("","survey"))){
+    if (isset($search_options->tab_type) && in_array($search_options->tab_type,array("","survey","geospatial"))){
         $show_variable_toggle=true;
     }
 
@@ -54,7 +54,7 @@
                 </div>
 
                 <?php if($show_variable_toggle && (isset($surveys['search_counts_by_type']) && array_key_exists('survey',$surveys['search_counts_by_type']))):?>
-                <div class="col mt-1 wb-search-toggle">                    
+                <div class="col mt-1 wb-search-toggle">               
                     <div class="btn-group btn-group-toggle study-view-toggle" >
                         <button type="button" class="btn btn-sm btn-outline-primary rounded-left active toggle_view" data-value="s" ><?php echo t('Study view');?></button>
                         <button type="button" class="btn btn-sm btn-outline-secondary rounded-right toggle_view" data-value="v"><a href="<?php echo site_url('catalog/'.@$active_repo['repositoryid'].'?'.$variable_view);?>"><?php echo t('Variable view');?></a></button>
diff --git a/application/views/search/surveys.php b/application/views/search/surveys.php
index 54d52aa09..9f41f7542 100644
--- a/application/views/search/surveys.php
+++ b/application/views/search/surveys.php
@@ -75,7 +75,7 @@
     $type_icons=array(
         'survey'=>'fa-database',
         'microdata'=>'fa-database',
-        'geospatial'=>'fa-globe',
+        'geospatial'=>'fa-globe-americas',
         'timeseries'=>'fa-chart-line',
         'document'=>'fa-file-alt',
         'table'=>'fa-table',
diff --git a/application/views/search/tables.php b/application/views/search/tables.php
index 9c9c5912b..79487c942 100644
--- a/application/views/search/tables.php
+++ b/application/views/search/tables.php
@@ -139,7 +139,7 @@
     $type_icons=array(
         'survey'=>'fa-database',
         'microdata'=>'fa-database',
-        'geospatial'=>'fa-globe',
+        'geospatial'=>'fa-globe-americas',
         'timeseries'=>'fa-clock-o',
         'document'=>'fa-file-text-o',
         'table'=>'fa-table',
diff --git a/application/views/search/variables.php b/application/views/search/variables.php
index 6fbef6086..715e61430 100644
--- a/application/views/search/variables.php
+++ b/application/views/search/variables.php
@@ -102,7 +102,9 @@
                             <div class="title font-weight-bold">
                                 <a href="<?php echo site_url('catalog/'.$row['sid'].'/variable/'.$row['vid']);?>" target="_blank" class="dlg link" title="<?php t('variable_info');?>"><?php echo $title;?></a>
                             </div>
+                            <?php if(isset($row['qstn'])):?>
                             <div class="qstn" ><?php echo (isset($row['qstn']) && $row['qstn']!=='') ? $row['qstn'] : 'n/a'; ?></div>
+                            <?php endif;?>
                             <div class="var-subtitle var-study-link mt-2">
                                 <a target="_blank" href="<?php echo site_url('catalog/'.$row['sid']);?>"><?php echo $row['title']; ?> <i class="fa fa-external-link" aria-hidden="true"></i></a>
                                 <div><?php echo $var_country_info; ?></div>
diff --git a/application/views/static/recent_studies_list.php b/application/views/static/recent_studies_list.php
index b067cba63..0581cd040 100644
--- a/application/views/static/recent_studies_list.php
+++ b/application/views/static/recent_studies_list.php
@@ -18,7 +18,7 @@
 $type_icons=array(
     'survey'=>'fa-database',
     'microdata'=>'fa-database',
-    'geospatial'=>'fa-globe',
+    'geospatial'=>'fa-globe-americas',
     'timeseries'=>'fa-chart-line',
     'document'=>'fa-file-alt',
     'table'=>'fa-table',
diff --git a/application/views/survey_info/info.php b/application/views/survey_info/info.php
index 27508d485..17a202c7b 100644
--- a/application/views/survey_info/info.php
+++ b/application/views/survey_info/info.php
@@ -172,7 +172,7 @@ class="get-microdata-btn badge badge-primary wb-text-link-uppercase float-left m
                             <?php if($survey['link_study']!=''): ?>						
                                 <a  target="_blank" href="<?php echo html_escape($survey['link_study']);?>" title="<?php echo t('link_study_website_hover');?>">
                                     <span class="mr-2">
-                                        <i class="fa fa-globe" aria-hidden="true"> </i> <?php echo t('link_study_website');?>
+                                        <i class="fa fa-globe-americas" aria-hidden="true"> </i> <?php echo t('link_study_website');?>
                                     </span>
                                 </a>
                             <?php endif; ?>
diff --git a/application/views/tokens/cards-featured-entries.php b/application/views/tokens/cards-featured-entries.php
index ca1cc5cf3..b17feea1c 100644
--- a/application/views/tokens/cards-featured-entries.php
+++ b/application/views/tokens/cards-featured-entries.php
@@ -29,7 +29,7 @@
 $type_icons=array(
     'survey'=>'fa-database',
     'microdata'=>'fa-database',
-    'geospatial'=>'fa-globe',
+    'geospatial'=>'fa-globe-americas',
     'timeseries'=>'fa-chart-line',
     'document'=>'fa-file-alt',
     'table'=>'fa-table',
diff --git a/application/views/tokens/recent-entries.php b/application/views/tokens/recent-entries.php
index 00241b564..cb00b3b87 100644
--- a/application/views/tokens/recent-entries.php
+++ b/application/views/tokens/recent-entries.php
@@ -9,7 +9,7 @@
 $type_icons=array(
     'survey'=>'fa-database',
     'microdata'=>'fa-database',
-    'geospatial'=>'fa-globe',
+    'geospatial'=>'fa-globe-americas',
     'timeseries'=>'fa-chart-line',
     'document'=>'fa-file-alt',
     'table'=>'fa-table',

From bf6ab97b11d583ae43eb30d61381f8dfdda08feb Mon Sep 17 00:00:00 2001
From: Mehmood Asghar <mah0001@gmail.com>
Date: Wed, 25 May 2022 15:40:27 -0400
Subject: [PATCH 58/79] minor fix

---
 application/libraries/Chunked_uploader.php | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/application/libraries/Chunked_uploader.php b/application/libraries/Chunked_uploader.php
index 1017d392f..2bf4e6a38 100644
--- a/application/libraries/Chunked_uploader.php
+++ b/application/libraries/Chunked_uploader.php
@@ -353,11 +353,11 @@ public function __construct()
 		// clean the filename for security
 		$this->_name = preg_replace('/[^\w\._]+/', '_', $name);
 		// attempt to get the content-type from $_SERVER array
-		$this->_content_type = (isset($_SERVER["HTTP_CONTENT_TYPE"]))
-				? $_SERVER["HTTP_CONTENT_TYPE"]
-				: (isset($_SERVER["CONTENT_TYPE"]))
-						? $_SERVER["CONTENT_TYPE"]
-						: '';
+		$this->_content_type = (isset($_SERVER["HTTP_CONTENT_TYPE"])) ? $_SERVER["HTTP_CONTENT_TYPE"]: '';
+		
+		if ($this->_content_type==''){
+			$this->_content_type=(isset($_SERVER["CONTENT_TYPE"])) ? $_SERVER["CONTENT_TYPE"]: '';
+		}
 	}
 
 	/**

From 6fe40a52d2708ebde862d1f783feb5c156570442 Mon Sep 17 00:00:00 2001
From: Mehmood Asghar <mah0001@gmail.com>
Date: Fri, 27 May 2022 10:55:29 -0400
Subject: [PATCH 59/79] Fix issues with variable search using solr

---
 application/config/solr.php                   |  11 ++
 application/libraries/Catalog_search_solr.php | 112 ++++++++++--------
 2 files changed, 72 insertions(+), 51 deletions(-)

diff --git a/application/config/solr.php b/application/config/solr.php
index 3fff03b4b..a08e31238 100644
--- a/application/config/solr.php
+++ b/application/config/solr.php
@@ -30,6 +30,17 @@
   'bf'=>''
 );
 
+//variable search
+$config['solr_edismax_variable_options']=array(
+  'qf'=>'labl^20.0 name^20.0 catgry qstn', //query fields - qf="title^20 nation keywords"
+  'pf'=>'', //phrase fields
+  'mm'=>'3<90%', //minimum match - 3, 2, 75%, -25% 
+  'ps'=>'',
+  'qs'=>'',
+  'bq'=>'',
+  'bf'=>''
+);
+
 $config['solr_debug']=false;
 
 
diff --git a/application/libraries/Catalog_search_solr.php b/application/libraries/Catalog_search_solr.php
index 4e879a7fc..985cc0352 100644
--- a/application/libraries/Catalog_search_solr.php
+++ b/application/libraries/Catalog_search_solr.php
@@ -73,6 +73,7 @@ function __construct($params = array())
 		}
 
 		$this->solr_options=$this->ci->config->item("solr_edismax_options");
+		$this->solr_variable_options=$this->ci->config->item("solr_edismax_variable_options");
 
 		if($this->ci->config->item('solr_debug')==true){
 			$this->debug=true;
@@ -866,11 +867,13 @@ function get_survey_citation()
 	//search on variables
 	function vsearch($limit = 15, $offset = 0)
 	{
+        $dataset_types=$this->_build_dataset_type_query();
 		$countries=$this->_build_countries_query();
+		$collections=$this->_build_collections_query();
 		$years=$this->_build_years_query();
-		$dtype=$this->_build_dtype_query();
+		$repository=!empty($this->repo) ? (string)$this->repo : false;
+        $dtype=$this->_build_dtype_query();
 
-		//get a select query instance
 		$query = $this->solr_client->createSelect();
 
 		$query->setFields(array(
@@ -880,91 +883,97 @@ function vsearch($limit = 15, $offset = 0)
 				'qstn',
 				'sid'
 			));
+		
+		$edismax = $query->getEDisMax();
+		$helper = $query->getHelper();
 
 		//vk
-		if($this->variable_keywords)
-		{
-			//$search_query[]='{!join from=sid to=survey_uid}'.$this->variable_keywords;
-			//{!join from=survey_uid to=sid}survey AND countries:1
+		//$search_query[]='{!join from=sid to=survey_uid}'.$this->variable_keywords;
+		//{!join from=survey_uid to=sid}survey AND countries:1
 
-			//join FQ must have all the other filters for countries, years, topics, data access types in the same FQ to work
+		//join FQ must have all the other filters for countries, years, topics, data access types in the same FQ to work
 
-			$join_fq=array();
+		$join_fq=array();
+		$sk="*";
 
-			$sk=$this->study_keywords;
+		//survey keyword search
+		$var_survey_join=sprintf("{!join from=survey_uid to=sid} %s",$sk);
 
-			if (trim($sk)=="")
-			{
-				$sk="*";
+		//published content only
+		$join_fq[]='published:1';
+
+		if($countries){
+			$join_fq[]=$countries;
+		}
+
+		if ($years)	{
+			foreach($years as $key=>$year){
+				$join_fq[]=$year;
 			}
+		}
 
-			//survey keyword search
-			$var_survey_join=sprintf("{!join from=survey_uid to=sid} %s",$sk);
+		if($dtype){
+			$join_fq[]=$dtype;
+		}
 
-			//published content only
-			$join_fq[]='published:1';
+		if($repository){
+			$join_fq[]=$repository;
+		}
 
-			//countries filter
-			if($countries){
-				$join_fq[]=$countries;
-			}
+		if($collections){
+			$join_fq[]=$collections;
+		}
 
-			//years filter
-			if ($years)	{
-				foreach($years as $key=>$year){
-					$join_fq[]=$year;
-				}
-			}
+		if($dataset_types){
+			$join_fq[]=$dataset_types;
+		}
 
-			//dtype filter
-			if($dtype){
-				$join_fq[]=$dtype;
+		//custom user defined filters
+		foreach($this->user_facets as $fc){
+			if (array_key_exists($fc['name'],$this->params)){
+				$filter_=$this->_build_facet_query('fq_'.$fc['name'],$this->params[$fc['name']]);
+				if($filter_){
+					$join_fq[]=$filter_;
+					//$query->createFilterQuery('fq_'.$fc['name'])->setQuery($filter_);
+				}
 			}
-
-			$join_query=$var_survey_join . ' AND '.implode(" AND ",$join_fq);
-			$query->createFilterQuery('variable_join')->setQuery($join_query);
 		}
 
-		// create a filterquery
+		$join_query=$var_survey_join . ' AND '.implode(" AND ",$join_fq);
+		$query->createFilterQuery('variable_join')->setQuery($join_query);
+
 		$query->createFilterQuery('doctype_vsearch')->setQuery('doctype:2');
 		// {!join from=survey_uid to=sid}survey AND countries:1
-
-		//set a query (all prices starting from 12)
-		if ($this->study_keywords){
-			$query->setQuery(sprintf('labl:%s',$this->study_keywords) );
+		
+		$edismax->setQueryFields($this->solr_variable_options['qf']);
+        $edismax->setMinimumMatch($this->solr_variable_options['mm']);
+		
+		if($this->study_keywords){
+			$query->setQuery($helper->escapeTerm($this->study_keywords));
 		}
 
 		$query->setStart($offset)->setRows($limit); //get 0-100 rows
 
-		//execute search
 		$resultset = $this->solr_client->select($query);
-
-		//get the total number of documents found by solr
 		$found_rows=$resultset->getNumFound();
-
-		//get search result as array
 		$this->search_result=$resultset->getData();
 
 		//get raw query
-		if($this->debug){			
-			var_dump($resultset->getDebug());
+		if($this->debug){
+			$request = $this->solr_client->createRequest($query);
+			echo 'Request URI: ' . $request->getUri() . '<br/>';
 		}
 
 		if ($found_rows>0)
 		{
 			//get the survey title, country info for all found variables
 			$survey_list=array();
-			foreach($this->search_result['response']['docs'] as $row)
-			{
+			foreach($this->search_result['response']['docs'] as $row){
 				$survey_list[]=$row['sid'];
 			}
 
-			//get survey info from db
 			$surveys=$this->_get_survey_by_id($survey_list);
-
-			//update the resultset with survey info
-			foreach($this->search_result['response']['docs'] as $key=>$row)
-			{
+			foreach($this->search_result['response']['docs'] as $key=>$row){
 				$this->search_result['response']['docs'][$key]['title']=$surveys[$row['sid']]['title'];
 				$this->search_result['response']['docs'][$key]['nation']=$surveys[$row['sid']]['nation'];
 				$this->search_result['response']['docs'][$key]['idno']=$surveys[$row['sid']]['idno'];
@@ -979,6 +988,7 @@ function vsearch($limit = 15, $offset = 0)
 		return $tmp;		
 	}
 
+
 	//search for variables for a single survey
 	function v_quick_search($surveyid=NULL,$limit=50,$offset=0)
 	{

From 1c31df4f70ac23154dd42674de37a2ba7ebd62aa Mon Sep 17 00:00:00 2001
From: Mehmood Asghar <mah0001@gmail.com>
Date: Wed, 22 Jun 2022 08:45:55 -0400
Subject: [PATCH 60/79] Fix: DDI field method_notes is not displayed

---
 application/views/metadata_templates/survey-template.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/application/views/metadata_templates/survey-template.php b/application/views/metadata_templates/survey-template.php
index 67631ea2b..8db8125bc 100644
--- a/application/views/metadata_templates/survey-template.php
+++ b/application/views/metadata_templates/survey-template.php
@@ -135,7 +135,7 @@
 <?php $output['data_processing']= render_group('data_processing',
     $fields=array(
             "metadata.study_desc.method.data_collection.cleaning_operations"=>'text',
-            "metadata.study_desc.method.method_notes"=>'text'
+            "metadata.study_desc.method.data_collection.method_notes"=>'text'
             ),
     $metadata);
 ?>

From d0436d8297646a93a1efe8eb6930b6b61a496e24 Mon Sep 17 00:00:00 2001
From: Mehmood Asghar <mah0001@gmail.com>
Date: Mon, 18 Jul 2022 11:16:10 -0400
Subject: [PATCH 61/79] Add POST endpoint for updating dataset options

---
 application/controllers/api/Datasets.php | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/application/controllers/api/Datasets.php b/application/controllers/api/Datasets.php
index e756076aa..96faf767c 100644
--- a/application/controllers/api/Datasets.php
+++ b/application/controllers/api/Datasets.php
@@ -257,6 +257,15 @@ function doi_post($idno=null)
 
 
 
+	/**
+	 * 
+	 * Alias for index_put method when PUT is not enabled
+	 * 
+	 */
+	function options_post($idno=null)
+	{
+		return $this->index_put($idno);
+	}
 
 	/**
 	 * 

From 83e6e25df09bdbb6e12815b1842c47ef9f46af2b Mon Sep 17 00:00:00 2001
From: Mehmood Asghar <mah0001@gmail.com>
Date: Mon, 18 Jul 2022 11:17:01 -0400
Subject: [PATCH 62/79] Allow using full and partial DOI handles

---
 application/views/survey_info/info.php | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/application/views/survey_info/info.php b/application/views/survey_info/info.php
index 17a202c7b..d02e16d1a 100644
--- a/application/views/survey_info/info.php
+++ b/application/views/survey_info/info.php
@@ -81,7 +81,11 @@ class="get-microdata-btn badge badge-primary wb-text-link-uppercase float-left m
                     </div>
                     <div class="col">
                         <div class="study-doi">
-                            <?php echo 'https://doi.org/'.$survey['doi'];?>
+                            <?php if (strtolower(substr($survey['doi'],0,4))=='http'):?>
+                                <a target="_blank" href="<?php echo html_escape($survey['doi']);?>"><?php echo $survey['doi'];?></a>
+                            <?php else:?>                                
+                                <a target="_blank" href="<?php echo html_escape('https://doi.org/'.$survey['doi']);?>"><?php echo 'https://doi.org/'.$survey['doi'];?></a>
+                            <?php endif;?>
                         </div>
                     </div>
                 </div>

From 4ee8a63a894d73b2a80b32eb7c6bb5b444747abc Mon Sep 17 00:00:00 2001
From: Mehmood Asghar <mah0001@gmail.com>
Date: Tue, 26 Jul 2022 11:00:28 -0400
Subject: [PATCH 63/79] minor

---
 application/models/Survey_resource_model.php | 1 -
 1 file changed, 1 deletion(-)

diff --git a/application/models/Survey_resource_model.php b/application/models/Survey_resource_model.php
index a8d20b087..7f01e1c50 100644
--- a/application/models/Survey_resource_model.php
+++ b/application/models/Survey_resource_model.php
@@ -42,7 +42,6 @@ function update($resource_id,$options)
 	{
 		//allowed fields
 		$valid_fields=array(
-			'resource_id',
 			'survey_id',
 			'dctype',
 			'title',

From 150da687dc6d0e527714eb13b8946c308ba4e522 Mon Sep 17 00:00:00 2001
From: Mehmood Asghar <mah0001@gmail.com>
Date: Wed, 7 Sep 2022 09:54:29 -0400
Subject: [PATCH 64/79] fix element type for geospatial field spatialResolution

---
 api-documentation/catalog-admin/geospatial-schema.json | 10 +++++++---
 application/schemas/geospatial-schema.json             | 10 +++++++---
 2 files changed, 14 insertions(+), 6 deletions(-)

diff --git a/api-documentation/catalog-admin/geospatial-schema.json b/api-documentation/catalog-admin/geospatial-schema.json
index ef94c08d5..55edd3388 100644
--- a/api-documentation/catalog-admin/geospatial-schema.json
+++ b/api-documentation/catalog-admin/geospatial-schema.json
@@ -1263,14 +1263,18 @@
 							"spatialResolution": {
 								"title": "Spatial Resolution",
 								"description": "Spatial resolution of the resource",
-								"type": "number",
+								"type": "object",
 								"_xpath": "gmd:identificationInfo/gmd:MD_DataIdentification/gmd:spatialResolution/gmd:MD_Resolution/gco:Distance",
 								"properties": {
 									"uom": {
 										"title": "Unit Of Measure",
 										"description": "Unit considered for the resolution measure",
-										"type": "string",
-										"propertyType": "attribute"
+										"type": "string"										
+									},
+									"value": {
+										"title": "Value",
+										"description": "Value",
+										"type": "number"
 									}
 								}
 							},
diff --git a/application/schemas/geospatial-schema.json b/application/schemas/geospatial-schema.json
index ef94c08d5..55edd3388 100644
--- a/application/schemas/geospatial-schema.json
+++ b/application/schemas/geospatial-schema.json
@@ -1263,14 +1263,18 @@
 							"spatialResolution": {
 								"title": "Spatial Resolution",
 								"description": "Spatial resolution of the resource",
-								"type": "number",
+								"type": "object",
 								"_xpath": "gmd:identificationInfo/gmd:MD_DataIdentification/gmd:spatialResolution/gmd:MD_Resolution/gco:Distance",
 								"properties": {
 									"uom": {
 										"title": "Unit Of Measure",
 										"description": "Unit considered for the resolution measure",
-										"type": "string",
-										"propertyType": "attribute"
+										"type": "string"										
+									},
+									"value": {
+										"title": "Value",
+										"description": "Value",
+										"type": "number"
 									}
 								}
 							},

From eb6a053ad2d853e597f6d68014810f6b63f57ddd Mon Sep 17 00:00:00 2001
From: Mehmood Asghar <mah0001@gmail.com>
Date: Wed, 7 Sep 2022 09:55:13 -0400
Subject: [PATCH 65/79] minor fix for geospatial detail page

---
 .../metadata_templates/fields/field_geo_lineage.php    | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/application/views/metadata_templates/fields/field_geo_lineage.php b/application/views/metadata_templates/fields/field_geo_lineage.php
index 19001eda7..4a8d18802 100644
--- a/application/views/metadata_templates/fields/field_geo_lineage.php
+++ b/application/views/metadata_templates/fields/field_geo_lineage.php
@@ -10,21 +10,23 @@
         <?php endif;?>
 
         <?php if (isset($row['dateTime'])):?>
-            <div class="mb-3"><span class="font-weight-bold">Date:</span> <?php echo $row['dateTime'];?></div>    
+            <div class="mb-3"><span class="font-weight-bold"><?php echo t('Date');?>:</span> <?php echo $row['dateTime'];?></div>    
         <?php endif;?>
 
+        <?php if (isset($row['processor'])):?>
         <div>
             <?php echo render_field($field_type='geog_contact',$field_name=$name.'.processor',$row['processor'], array('hide_column_headings'=>false));?>            
         </div>
+        <?php endif;?>
 
         <?php if(isset($row['source'])):?>
             <div class="xsl-caption field-caption"><?php echo t('Sources');?></div>
 
             <table class="table table-striped  table-sm">
                 <tr>
-                    <th>Description</th>
-                    <th>Citation source</th>
-                    <th>Organization</th>
+                    <th><?php echo t('Description');?></th>
+                    <th><?php echo t('Citation source');?></th>
+                    <th><?php echo t('Organization');?></th>
                 </td>
             <?php foreach($row['source'] as $source):?>
                 <tr>

From f0a816a3b6eb69c479a50cae9119d496d056e1e6 Mon Sep 17 00:00:00 2001
From: Mehmood Asghar <mah0001@gmail.com>
Date: Wed, 7 Sep 2022 12:17:21 -0400
Subject: [PATCH 66/79] fix missing translations and display for geospatial
 detail page

---
 .../language/base/iso19139_fields_lang.php    |  5 +++++
 .../language/english/iso19139_fields_lang.php |  4 ++++
 .../fields/field_geo_lineage.php              |  2 +-
 .../fields/field_object.php                   | 21 +++++++++++++++++++
 .../geospatial-iso19139.php                   |  3 ++-
 5 files changed, 33 insertions(+), 2 deletions(-)
 create mode 100644 application/views/metadata_templates/fields/field_object.php

diff --git a/application/language/base/iso19139_fields_lang.php b/application/language/base/iso19139_fields_lang.php
index 2215915d6..51cdf8729 100644
--- a/application/language/base/iso19139_fields_lang.php
+++ b/application/language/base/iso19139_fields_lang.php
@@ -8,6 +8,7 @@
 $lang['distribution']='Distribution';
 
 $lang['citation.title']='Title';
+$lang['citation.alternateTitle']='Alternate title';
 $lang['citation.date']='Date';
 $lang['citation.date.date']='Date';
 $lang['citation.date.type']='Type';
@@ -91,3 +92,7 @@
 $lang['lineage.processStep.processor']='Processor';
 $lang['resourceMaintenance.maintenanceAndUpdateFrequency']='Update frequency';
 
+
+$lang['spatialResolution']='Spatial resolution';
+$lang['spatialResolution.uom']='Unit of measurement';
+$lang['spatialResolution.value']='Value';
\ No newline at end of file
diff --git a/application/language/english/iso19139_fields_lang.php b/application/language/english/iso19139_fields_lang.php
index 2215915d6..20ddefbd8 100644
--- a/application/language/english/iso19139_fields_lang.php
+++ b/application/language/english/iso19139_fields_lang.php
@@ -8,6 +8,7 @@
 $lang['distribution']='Distribution';
 
 $lang['citation.title']='Title';
+$lang['citation.alternateTitle']='Alternate title';
 $lang['citation.date']='Date';
 $lang['citation.date.date']='Date';
 $lang['citation.date.type']='Type';
@@ -91,3 +92,6 @@
 $lang['lineage.processStep.processor']='Processor';
 $lang['resourceMaintenance.maintenanceAndUpdateFrequency']='Update frequency';
 
+$lang['spatialResolution']='Spatial resolution';
+$lang['spatialResolution.uom']='Unit of measurement';
+$lang['spatialResolution.value']='Value';
\ No newline at end of file
diff --git a/application/views/metadata_templates/fields/field_geo_lineage.php b/application/views/metadata_templates/fields/field_geo_lineage.php
index 4a8d18802..9d6210b3b 100644
--- a/application/views/metadata_templates/fields/field_geo_lineage.php
+++ b/application/views/metadata_templates/fields/field_geo_lineage.php
@@ -6,7 +6,7 @@
     <?php foreach($data as $row):?>
         <div class="mb-3">
         <?php if (isset($row['description'])):?>
-            <div class="mb-2"><?php echo $row['description'];?></div>
+            <div class="mb-2"><?php echo nl2br(html_escape($row['description']));?></div>
         <?php endif;?>
 
         <?php if (isset($row['dateTime'])):?>
diff --git a/application/views/metadata_templates/fields/field_object.php b/application/views/metadata_templates/fields/field_object.php
new file mode 100644
index 000000000..7d4f646bc
--- /dev/null
+++ b/application/views/metadata_templates/fields/field_object.php
@@ -0,0 +1,21 @@
+<?php
+/**
+ * 
+ * Object field
+ *
+ */
+?>
+<?php if (isset($data) && is_array($data) && count($data)>0 ):?>
+<div class="field field-<?php echo str_replace(".","__",$name);?>">    
+    <div class="xsl-caption field-caption"><?php echo t($name);?></div>    
+    <div class="field-value">                
+        
+        <div class="row mt-3">
+               <?php foreach($data as $row_key=>$row):?>               
+                    <div class="col col-auto"><strong><?php echo t($name.'.'.$row_key);?></strong><br/> <?php echo $row;?></div>               
+               <?php endforeach;?>
+        </div>
+        
+    </div>
+</div>
+<?php endif;?>
diff --git a/application/views/metadata_templates/geospatial-iso19139.php b/application/views/metadata_templates/geospatial-iso19139.php
index 07d822b1d..523dbf495 100644
--- a/application/views/metadata_templates/geospatial-iso19139.php
+++ b/application/views/metadata_templates/geospatial-iso19139.php
@@ -86,7 +86,8 @@
    //"graphicOverview"=>'array',
     "resourceFormats"=>'array',
     "descriptiveKeywords"=>'array',
-    "spatialRepresentationType"=>"text",        
+    "spatialRepresentationType"=>"text",
+    "spatialResolution"=>'object',
     "topicCategory"=>"text",
 );
 

From 5b9a0c1e913be7d359366e872e0e0a9489492e8a Mon Sep 17 00:00:00 2001
From: Ricardo Rodriguez <ca.ricardor@gmail.com>
Date: Wed, 12 Oct 2022 09:29:12 +0200
Subject: [PATCH 67/79] Create dependency-review.yml

---
 .github/workflows/dependency-review.yml | 20 ++++++++++++++++++++
 1 file changed, 20 insertions(+)
 create mode 100644 .github/workflows/dependency-review.yml

diff --git a/.github/workflows/dependency-review.yml b/.github/workflows/dependency-review.yml
new file mode 100644
index 000000000..fe461b424
--- /dev/null
+++ b/.github/workflows/dependency-review.yml
@@ -0,0 +1,20 @@
+# Dependency Review Action
+#
+# This Action will scan dependency manifest files that change as part of a Pull Request, surfacing known-vulnerable versions of the packages declared or updated in the PR. Once installed, if the workflow run is marked as required, PRs introducing known-vulnerable packages will be blocked from merging.
+#
+# Source repository: https://github.com/actions/dependency-review-action
+# Public documentation: https://docs.github.com/en/code-security/supply-chain-security/understanding-your-software-supply-chain/about-dependency-review#dependency-review-enforcement
+name: 'Dependency Review'
+on: [pull_request]
+
+permissions:
+  contents: read
+
+jobs:
+  dependency-review:
+    runs-on: ubuntu-latest
+    steps:
+      - name: 'Checkout Repository'
+        uses: actions/checkout@v3
+      - name: 'Dependency Review'
+        uses: actions/dependency-review-action@v2

From 37eb36301568de64047c146244918e1ea4df24b0 Mon Sep 17 00:00:00 2001
From: Mehmood Asghar <mah0001@gmail.com>
Date: Wed, 12 Oct 2022 16:30:46 -0400
Subject: [PATCH 68/79] show country names for recent studies list on home page

---
 application/views/static/recent_studies_list.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/application/views/static/recent_studies_list.php b/application/views/static/recent_studies_list.php
index 0581cd040..c9f2e6133 100644
--- a/application/views/static/recent_studies_list.php
+++ b/application/views/static/recent_studies_list.php
@@ -63,8 +63,8 @@
                             </h5>
                             
                             <div>
-                                <?php if($row['nation'] && $regional_search===true) :?>
-                                    <strong><?php echo $row['nation'];?></strong>
+                                <?php if($row['nation']) :?>
+                                    <span class="text-secondary"><?php echo $row['nation'];?></span>
                                 <?php endif;?>
 
                                 <?php if (isset($row['authoring_entity']) && $row['authoring_entity']!=''):?>

From d3d556dba9eb09a5d2e3def99b26574bc99ed882 Mon Sep 17 00:00:00 2001
From: Mehmood Asghar <mah0001@gmail.com>
Date: Wed, 12 Oct 2022 16:32:03 -0400
Subject: [PATCH 69/79] Fix photo gallery view for geospatial type

---
 .../views/metadata_templates/geospatial-iso19139.php       | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/application/views/metadata_templates/geospatial-iso19139.php b/application/views/metadata_templates/geospatial-iso19139.php
index 523dbf495..798709229 100644
--- a/application/views/metadata_templates/geospatial-iso19139.php
+++ b/application/views/metadata_templates/geospatial-iso19139.php
@@ -14,7 +14,10 @@
 
 if($resources){
     foreach($resources as $idx => $resource){
-        $resource_filename=$resource['filename'];
+        if (!isset($resource['filename'])){
+            unset($resources[$idx]);
+            continue;
+        }
         /*if($this->form_validation->valid_url($resource['filename'])){
             $resources[$idx]['download_link']=$resource['filename'];
             $resources[$idx]['extension']=pathinfo($resource['filename'],PATHINFO_EXTENSION);
@@ -23,7 +26,7 @@
             $resources[$idx]['extension']=pathinfo($resource['filename'],PATHINFO_EXTENSION);
         }*/  
         $resources[$idx]['download_link']=$resource['filename'];
-            $resources[$idx]['extension']=pathinfo($resource['filename'],PATHINFO_EXTENSION);
+        $resources[$idx]['extension']=pathinfo($resource['filename'],PATHINFO_EXTENSION);
     }
 $metadata['metadata']['description']['distributionInfo']['transferOptions']['onLine']=$resources;
 } 

From e344048da22582cacbc0891df7e96a4c5d40acee Mon Sep 17 00:00:00 2001
From: ch-ricardor <ca.ricardor@gmail.com>
Date: Fri, 14 Oct 2022 17:09:51 +0200
Subject: [PATCH 70/79] Catalog Upload Survey Fix

---
 application/config/form_validation.php        |  11 ++
 application/controllers/admin/Catalog.php     | 123 +++++++++++++-----
 application/views/catalog/ddi_upload_form.php |  45 +++----
 3 files changed, 127 insertions(+), 52 deletions(-)
 create mode 100644 application/config/form_validation.php

diff --git a/application/config/form_validation.php b/application/config/form_validation.php
new file mode 100644
index 000000000..1adbb27e3
--- /dev/null
+++ b/application/config/form_validation.php
@@ -0,0 +1,11 @@
+<?php  if ( ! defined('BASEPATH')) exit('No direct script access allowed');
+/*
+| -------------------------------------------------------------------------
+| Configurations parameters to Form Validations
+| -------------------------------------------------------------------------
+|
+*/
+
+// Format Error Messages using Bootstrap
+$config['error_prefix'] = '<div class="alert alert-warning" role="alert">';
+$config['error_suffix'] = '</div>';
diff --git a/application/controllers/admin/Catalog.php b/application/controllers/admin/Catalog.php
index d284536d7..3e6a9f8d4 100644
--- a/application/controllers/admin/Catalog.php
+++ b/application/controllers/admin/Catalog.php
@@ -24,7 +24,7 @@ public function __construct()
 		$this->load->helper('querystring_helper','url');
 		$this->load->helper('form');
 		//$this->load->helper("catalog");
-		$this->template->set_template('admin'); 
+		$this->template->set_template('admin');
 		$this->load->library("Dataset_manager");
 
 		//load language file
@@ -64,10 +64,10 @@ public function __construct()
 	 */
 	function index()
 	{
-		$this->template->set_template('admin5'); 
+		$this->template->set_template('admin5');
 		//css files
 		$inline_styles=$this->load->view('catalog/catalog_style',NULL, TRUE);
-        $this->template->add_css($inline_styles,'embed');
+	        $this->template->add_css($inline_styles,'embed');
 
 
 		//js files
@@ -300,31 +300,84 @@ private function get_temp_upload_folder()
 
 
 	function upload()
-	{
-		$this->add_study();
-	}
-
-	/**
-	 * Upload form for DDI (xml) file
-	 *
-	 * @return void
-	 **/
-	function add_study()
 	{
 		//user has permissions on the repo
 		//$this->acl->user_has_repository_access($this->active_repo->id);
 		$this->acl_manager->has_access_or_die('study', 'create',null,$this->active_repo->repositoryid);
 
-		$this->template->set_template('admin');
+		// @TODO: File Validation Rules
+		// Files XML or RDF should be allowed in one field, they are exclusive
+		$this->form_validation->set_rules('userfile',t('msg_select_ddi'),'callback_upload_file_check');
+		// RRE - One call back check both
+		//$this->form_validation->set_rules('rdf-file',t('msg_select_ddi'),'callback_upload_file_check');
+
+//		$this->form_validation->set_rules('userfile',t('msg_select_ddi'),'uploaded[userfile]|ext_in[userfile.xml]]');
+//		$this->form_validation->set_rules('rdf-file',t('msg_select_ddi'),'uploaded[rdf-file]|mime_in[rdf-file.xml]|ext_in[rdf-file.xml]');
+
+		if ($this->form_validation->run() == FALSE) {
+
+			$this->template->set_template('admin');
 
-		//show upload form when no DDI is uploaded
-		if(!$this->input->post("submit")){
 			$content=$this->load->view('catalog/ddi_upload_form', array('active_repo'=>$this->active_repo),true);
 			$this->template->write('content', $content,true);
 	  		$this->template->render();
 			return;
+		} else {
+
+			$new_survey=$this->add_study();
+
+			if (!empty($new_survey)){
+				// RRE Clear Errors
+				$this->session->unset_userdata('error');
+				//redirect('admin/catalog/edit/'.$result['sid'],'refresh');
+				redirect('admin/catalog/edit/'.$new_survey,'refresh');
+				return;
+			}
+
+		}
+		return redirect('admin/catalog/upload');
+	}
+
+	/**
+	 * Upload Form Validation file
+	 *
+	 * @return TRUE | FALSE
+	 * RRE - Validation runs for xml and rdf files
+	 *   Rules: $_FILES Array()
+	 *	fields: xml - userfile,rdf -  rdf-file
+	 *	rdf files requires xml
+	 * matching file names
+	 **/
+	function upload_file_check()
+	{
+		if (empty($_FILES['userfile']['name'])) {
+			$this->form_validation->set_message('upload_file_check','{field} '.t('msg_select_ddi'));
+			return FALSE;
 		}
 
+		if (!empty($_FILES['rdf-file']['name'])) {
+			if (strtolower(basename($_FILES['rdf-file']['name'],'.rdf')) <> strtolower(basename($_FILES['userfile']['name'],'.xml'))) {
+				$this->form_validation->set_message('upload_file_check','{field} '.t('Files need to have the same Name'));
+				return FALSE;
+			}
+		}
+		return TRUE;
+	}
+
+	/**
+	 * Upload form for DDI (xml) file
+	 *
+	 * @return void
+	 * @return Survey ID | NULL
+	 * @TODO: Due a possible Duplicated Record Error or Parse Error
+	 * 	Message should be returned to the form
+	 **/
+	function add_study()
+	{
+		// @TODO: Move the Form one level up, add_study calls the model
+
+		//process form
+
 		$overwrite=$this->input->post("overwrite");
 		$repositoryid=$this->input->post("repositoryid");
 
@@ -335,8 +388,7 @@ function add_study()
 			$overwrite=FALSE;
 		}
 
-		//process form
-
+		// Uploads the xml File
 		$temp_upload_folder=$this->get_temp_upload_folder();
 
 		//upload class configurations for DDI
@@ -347,8 +399,8 @@ function add_study()
 
 		$this->load->library('upload', $config);
 
-		//process uploaded ddi file
-		$ddi_upload_result=$this->upload->do_upload();
+
+		$ddi_upload_result=$this->upload->do_upload('userfile');
 
 		$uploaded_ddi_path=NULL;
 
@@ -357,7 +409,8 @@ function add_study()
 			$error = $this->upload->display_errors();
 			$this->db_logger->write_log('ddi-upload',$error,'catalog');
 			$this->session->set_flashdata('error', $error);
-			redirect('admin/catalog/add_study','refresh');
+			return NULL;
+			//redirect('admin/catalog/add_study','refresh');
 		}
 		else //successful upload
 		{
@@ -369,7 +422,7 @@ function add_study()
 
 		$this->load->model("Data_file_model");
 		$this->load->library('DDI2_import');
-		
+
 		$user=$this->ion_auth->current_user();
 
 		$ddi_path=$uploaded_ddi_path;
@@ -390,8 +443,11 @@ function add_study()
 
 			$this->events->emit('db.after.update', 'surveys', $result['sid'],'refresh');
 			$this->session->set_flashdata('success', $result);
-			redirect('admin/catalog/edit/'.$result['sid'],'refresh');return;
+
+			//redirect('admin/catalog/edit/'.$result['sid'],'refresh');return;
+			return $result['sid'];
 		}
+		// @TODO: Find how to replicate this error
 		catch(ValidationException $e){
 			$error_output=array(
 				'status'=>'failed',
@@ -399,13 +455,19 @@ function add_study()
 				'errors'=>$e->GetValidationErrors()
 			);
 
-			$error_str='Validation Error<br/><pre class="error-pre">'.print_r($e->GetValidationErrors(),true).'</pre>';			
+			$error_str='Validation Error<br/><pre class="error-pre">'.print_r($e->GetValidationErrors(),true).'</pre>';
 			$this->session->set_flashdata('error', $error_str);
-			redirect('admin/catalog/add_study','refresh');return;
+			//redirect('admin/catalog/add_study','refresh');return;
+			//redirect('admin/catalog/upload','refresh');
+
+			// @TODO: Find how to replicate this error
+return;
 		}
 		catch(Exception $e){
 			$this->session->set_flashdata('error', $e->getMessage());
-			redirect('admin/catalog/add_study','refresh');return;
+			//redirect('admin/catalog/add_study','refresh');return;
+			//redirect('admin/catalog/upload','refresh');
+			return NULL;
 		}
 	}
 
@@ -413,7 +475,7 @@ function add_study()
 	private function upload_rdf_file($sid)
 	{
 		$this->load->library('catalog_admin');
-		
+
 		//upload class configurations for RDF
 		$config['upload_path'] = $this->get_temp_upload_folder();
 		$config['overwrite'] = FALSE;
@@ -423,7 +485,8 @@ private function upload_rdf_file($sid)
 		$this->upload->initialize($config);
 
 		//process uploaded rdf file
-		$rdf_upload_result=$this->upload->do_upload('rdf');
+		//$rdf_upload_result=$this->upload->do_upload('rdf');
+		$rdf_upload_result=$this->upload->do_upload('rdf-file');
 
 		$uploaded_rdf_path='';
 
@@ -445,9 +508,9 @@ private function upload_rdf_file($sid)
 		return true;
 	}
 
-	
+
 	/**
-	 * 
+	 *
 	 * Sanitize file name
 	 */
 	private function sanitize_filename($name)
diff --git a/application/views/catalog/ddi_upload_form.php b/application/views/catalog/ddi_upload_form.php
index a4c8bc0e2..ad75e6832 100644
--- a/application/views/catalog/ddi_upload_form.php
+++ b/application/views/catalog/ddi_upload_form.php
@@ -25,38 +25,39 @@
 <?php //include 'catalog_page_links.php'; ?>
 
 <?php $error=$this->session->flashdata('error');?>
-<?php echo ($error!="") ? '<div class="error">'.$error.'</div>' : '';?>
+<?php echo ($error!="") ? '<div class="alert alert-danger">'.$error.'</div>' : '';?>
 
 <?php $message=$this->session->flashdata('message');?>
 <?php echo ($message!="") ? '<div class="success">'.$message.'</div>' : '';?>
 
+<?php echo validation_errors(); ?>
 
 <div class="col-md-6">
 
-  <h1 class="page-title"><?php echo t('add_study_to_collection');?> 
-      <!--<span class="active-repo"><?php echo $repositories_list[$active_repository];?></span>-->
+  <h1 class="page-title"><?php echo t('add_study_to_collection');?>
+      <!--<span class="active-repo"><?php // echo $repositories_list[$active_repository];?></span>-->
   </h1>
 
-	<?php echo form_open_multipart("", array('class'=>'form')	 );?>
-    <input type="hidden" name="repositoryid" value="<?php echo $active_repository;?>"/>
+   <?php echo form_open_multipart("", array('class'=>'form')	 );?>
 
-  <div class="form-group">
-    <label for="userfile"><?php echo t('msg_select_ddi');?></label>
-    <input  class="form-control-file"  type="file" name="userfile" id="userfile" size="60"/>
-    <small id="ddi-help" class="form-text text-muted"><span class="max-file-size">(<?php echo t('max_upload_limit') ." ".$max_limit;?>MB)</span></small>
-  </div>
+   <input type="hidden" name="repositoryid" value="<?php echo $active_repository;?>"/>
 
+      <div class="form-group">
+         <label for="userfile"><?php echo t('msg_select_ddi');?></label>
+         <input  class="form-control-file"  type="file" name="userfile" id="userfile" size="60"/>
+         <small id="ddi-help" class="form-text text-muted"><span class="max-file-size">(<?php echo t('max_upload_limit') ." ".$max_limit;?>MB)</span></small>
+      </div>
 
-  <div class="form-group">
-    <label for="userfile"><?php echo t('msg_select_rdf');?></label>
-    <input class="form-control-file" type="file" name="rdf" id="rdf-file" size="60"/>    
-  </div>
+      <div class="form-group">
+         <label for="rdf-file"><?php echo t('msg_select_rdf');?></label>
+         <input class="form-control-file" type="file" name="rdf-file" id="rdf-file" size="60"/>
+         <small id="ddi-help" class="form-text text-muted"><span class="max-file-size">(<?php echo t('max_upload_limit') ." ".$max_limit;?>MB)</span></small>
+      </div>
 
-  <div class="form-group" style="margin-top:10px;">
-  <label for="overwrite" class="desc">
-      <input type="checkbox" name="overwrite" id="overwrite" value="yes"/> <?php echo t('ddi_overwrite_exist');?>
-  </label>
-  </div>
+      <div class="form-group" style="margin-top:10px;">
+         <input type="checkbox" name="overwrite" id="overwrite" value="yes" <?php echo set_checkbox('overwrite','yes'); ?>" />
+         <label for="overwrite" class="desc"><?php echo t('ddi_overwrite_exist');?></label>
+      </div>
 
 	<?php echo form_submit('submit',t('submit'), 'class="btn btn-primary"'); ?>
     <?php echo anchor('admin/catalog',t('cancel'));?>
@@ -66,7 +67,7 @@
 
 <div class="col-md-6" style="background:#eeeeee; padding:20px;">
   <h2 style="margin:0px;margin-bottom:15px;"><?php echo t('Create new study');?> </h2>
-  
+
 
   <form class="form"  method="get" action="<?php echo site_url('admin/catalog/create');?>">    
 
@@ -80,7 +81,7 @@
         <option value="timeseries">Timeseries</option>
         <option value="script">Script</option>
         <option value="image">Image</option>
-      </select>  
+      </select>
     </div>
 
     <button type="submit" class="btn btn-primary">Create</button>
@@ -88,4 +89,4 @@
 
 </div>
 
-</div>
\ No newline at end of file
+</div>

From 16733d036f34897d7ee21519a8997a11506f6e3f Mon Sep 17 00:00:00 2001
From: ch-ricardor <ca.ricardor@gmail.com>
Date: Mon, 17 Oct 2022 17:32:28 +0200
Subject: [PATCH 71/79] Catalog Manage Studies Index Query Fix

---
 application/controllers/admin/Catalog.php     |  31 ++-
 .../models/Catalog_admin_search_model.php     | 215 +++++++++---------
 2 files changed, 126 insertions(+), 120 deletions(-)

diff --git a/application/controllers/admin/Catalog.php b/application/controllers/admin/Catalog.php
index d284536d7..fad23ffdc 100644
--- a/application/controllers/admin/Catalog.php
+++ b/application/controllers/admin/Catalog.php
@@ -24,7 +24,7 @@ public function __construct()
 		$this->load->helper('querystring_helper','url');
 		$this->load->helper('form');
 		//$this->load->helper("catalog");
-		$this->template->set_template('admin'); 
+		$this->template->set_template('admin');
 		$this->load->library("Dataset_manager");
 
 		//load language file
@@ -64,11 +64,10 @@ public function __construct()
 	 */
 	function index()
 	{
-		$this->template->set_template('admin5'); 
+		$this->template->set_template('admin5');
 		//css files
 		$inline_styles=$this->load->view('catalog/catalog_style',NULL, TRUE);
-        $this->template->add_css($inline_styles,'embed');
-
+		$this->template->add_css($inline_styles,'embed');
 
 		//js files
 		$this->template->add_js('var site_url="'.site_url().'";','embed');
@@ -93,12 +92,12 @@ function index()
 		//data access types
 		$this->data_access_types=$this->Form_model->get_all();
 		//data types
-		$this->catalog_data_types=$this->Search_helper_model->get_dataset_types($this->active_repo->repositoryid); 
+		$this->catalog_data_types=$this->Search_helper_model->get_dataset_types($this->active_repo->repositoryid);
 
 		if ($db_rows['rows'])
 		{
 			$sid_list=array();
-			foreach($db_rows['rows'] as $row) 
+			foreach($db_rows['rows'] as $row)
 			{
 				$sid_list[]=$row['id'];
 			}
@@ -120,10 +119,10 @@ function index()
 		$this->template->write('content', $content,true);
 	  	$this->template->render();
 	}
-	
+
 
 	function search()
-	{		
+	{
 		if (isset($this->active_repo) && $this->active_repo!=null){
 			$this->Catalog_model->active_repo=$this->active_repo->repositoryid;
 		}
@@ -144,6 +143,7 @@ function search()
 	 **/
 	function _search()
 	{
+
 		//records to show per page
 		$per_page = $this->input->get("ps");
 
@@ -153,7 +153,7 @@ function _search()
 		}
 
 		//current page
-		$curr_page=$this->input->get('per_page');//$this->uri->segment(4);
+		$curr_page=$this->input->get('per_page'); //$this->uri->segment(4);
 
 		//filter to further limit search
 		$filter=array();
@@ -174,7 +174,6 @@ function _search()
 
 		//survey rows
 		$surveys=$this->Catalog_admin_search_model->search($search_options,$per_page,$curr_page, $filter);
-
 		$survey_id_array=array();
 
 		if(is_array($surveys))
@@ -266,13 +265,13 @@ function _search()
 		return $data;
 	}
 
-	
+
 	//return temp upload folder path
 	private function get_temp_upload_folder()
 	{
 		//catalog folder path
 		$catalog_root=$this->config->item("catalog_root");
-		
+
 		//if not fixed path, use a relative path
 		if (!file_exists($catalog_root) )
 		{
@@ -369,7 +368,7 @@ function add_study()
 
 		$this->load->model("Data_file_model");
 		$this->load->library('DDI2_import');
-		
+
 		$user=$this->ion_auth->current_user();
 
 		$ddi_path=$uploaded_ddi_path;
@@ -413,7 +412,7 @@ function add_study()
 	private function upload_rdf_file($sid)
 	{
 		$this->load->library('catalog_admin');
-		
+
 		//upload class configurations for RDF
 		$config['upload_path'] = $this->get_temp_upload_folder();
 		$config['overwrite'] = FALSE;
@@ -445,9 +444,9 @@ private function upload_rdf_file($sid)
 		return true;
 	}
 
-	
+
 	/**
-	 * 
+	 *
 	 * Sanitize file name
 	 */
 	private function sanitize_filename($name)
diff --git a/application/models/Catalog_admin_search_model.php b/application/models/Catalog_admin_search_model.php
index c5d12f7d0..dfcbb87b4 100644
--- a/application/models/Catalog_admin_search_model.php
+++ b/application/models/Catalog_admin_search_model.php
@@ -4,10 +4,10 @@
 *
 **/
 class Catalog_admin_search_model extends CI_Model {
-	
+
 	//database allowed column names
 	var $allowed_fields=array('title', 'nation','year', 'authoring_entity');
-	
+
 	//fields for the study description
 	var $study_fields=array(
 					'surveys.type',
@@ -19,7 +19,7 @@ class Catalog_admin_search_model extends CI_Model {
 					'nation',
 					'dirpath',
 					'metafile',
-					'link_technical', 
+					'link_technical',
 					'link_study',
 					'link_report',
 					'link_indicator',
@@ -32,12 +32,14 @@ class Catalog_admin_search_model extends CI_Model {
 					'surveys.created_by',
 					'surveys.changed_by'
 					);
-	
+
 	//additional filters on search
-	var $filter=array('isdeleted='=>0);
+	// @TODO: Validate this definition
+	// var $filter=array('isdeleted='=>0);
+	var $filter=array();
 	var $active_repo=NULL;
-	var $active_repo_negate=FALSE;//show repo surveys or negate repo surveys
-	
+	var $active_repo_negate=FALSE; //show repo surveys or negate repo surveys
+
     public function __construct()
     {
         parent::__construct();
@@ -48,24 +50,24 @@ public function set_active_repo($repo)
 	{
 		$this->active_repo=$repo;
 	}
-	
-	
+
+
 	/**
 	* searches the catalog
-	* 
+	*
 	* supported fields	idno, id, nation, title, repositoryid, country_name, tags, 
 	**/
-    function search($options=array(), $limit = 15, $offset = 0,$filter=NULL)
-    {	
+	function search($options=array(), $limit = 15, $offset = 0,$filter=NULL)
+	{
 		$this->params=$options;
-		
+
 		if ($filter!=NULL)
 		{
 			$this->filter=$filter;
 		}
-			
+
 		$this->search_count=$this->search_count();
-		
+
 		if ($this->search_count==0)
 		{
 			//no point in searching
@@ -75,27 +77,27 @@ function search($options=array(), $limit = 15, $offset = 0,$filter=NULL)
 		//sort
 		$sort_order=$this->get_param('sort_order');
 		$sort_by=$this->get_param('sort_by');
-		
-		//$this->db->start_cache();		
-		
+
+		//$this->db->start_cache();
 
 		$this->study_fields[]='users.username as created_by_user';
 
 		//survey fields
 		$this->db->select(implode(",", $this->study_fields));
-		
+
 		//form fields
 		$this->db->select('forms.model as form_model');
+
 		$this->db->join('forms', 'forms.formid= surveys.formid','left');
 
 		//user info
 		$this->db->join('users', 'users.id= surveys.created_by','left');
-		
-		if ($this->active_repo!=NULL && $this->active_repo!='central') 
+
+		if ($this->active_repo!=NULL && $this->active_repo!='central')
 		{
 			//$this->db->select("sr.repositoryid as repo_link, sr.isadmin as repo_isadmin");
 			$this->db->join('survey_repos sr', 'sr.sid= surveys.id','left');
-		}	
+		}
 
 		//build search using the parameters passed to the GET/POST variables
 		$where=$this->_build_search_query();
@@ -103,57 +105,60 @@ function search($options=array(), $limit = 15, $offset = 0,$filter=NULL)
 		if ($where!='')
 		{
 			$this->db->where($where,NULL,FALSE);
-		}	
+		}
 
 		//set order by
 		if ($sort_by!='' && $sort_order!='')
-		{		
+		{
 			if (in_array($sort_by, $this->study_fields) )
 			{
-				$this->db->order_by('surveys.'.$sort_by, $sort_order); 
+				$this->db->order_by('surveys.'.$sort_by, $sort_order);
 			}
 		}
 		else
 		{
-			$this->db->order_by('changed', 'desc'); 
+			$this->db->order_by('changed', 'desc');
 		}
 
 	  	$this->db->limit($limit, $offset);
+
 		$this->db->from('surveys');
-        $result= $this->db->get()->result_array();
+
+		$result= $this->db->get()->result_array();
 		return $result;
-    }
-	
-	//builds where clause 
+	}
+
+	//builds where clause
 	function _build_search_query()
-	{		
+	{
+
 		if ($this->active_repo!=NULL && $this->active_repo!='central')
 		{
 			$allowed_fields['repositoryid']='sr.repositoryid';
-		}	
-		
+		}
+
 		$filter='';
 		$where_clause='';
-		
+
 		//build where clause for FILTERS
-		foreach($this->filter as $f)
+		foreach($this->filter as $f => $condition)
 		{
-			if($f==''){break;}//skip blanks
-			
+
+			if($f==''){break;} //skip blanks
 			if ($filter!='')
 			{
-				$filter.=' AND (' . $f. ')';
+				$filter.=' AND (' . $f . $condition . ')';
 			}
 			else
 			{
-				$filter=' (' . $f. ')';
-			}		
+				$filter=' (' . $f . $condition . ')';
+			}
 		}
 
 		if ( trim($where_clause)!='')
 		{
 			$where_clause='('.$where_clause.') ';
-			
+
 			if ($filter!='')
 			{
 				$where_clause.=' AND '.$filter;
@@ -170,28 +175,28 @@ function _build_search_query()
 		if ($this->active_repo!=NULL && $this->active_repo!='central')
 		{
 			$additional_filters=array('repositoryid');
-		}	
+		}
+
 
-		
 		foreach($additional_filters as $afilter)
 		{
 			$value=$this->input->get($afilter,TRUE);
 			if ($value)
 			{
 				if ( trim($where_clause)!='')
-				{	
+				{
 					$where_clause.= ' AND '.$afilter.' = '.$this->db->escape($value); 
 				}
 				else
 				{
 					$where_clause.= ' '.$afilter.'= '.$this->db->escape($value); 
 				}
-			}			
+			}
 		}
-		
+
 		//search tags
 		$tags=$this->get_param('tag');
-		
+
 		$tags_sql=NULL;
 		$tags_sub_query=NULL;
 
@@ -200,24 +205,24 @@ function _build_search_query()
 			{
 				if (trim($value)!=''){
 					$tags_sql[$key]=sprintf('tag=%s',$this->db->escape($value));
-				}	
+				}
 			}
-			
+
 			if ( is_array($tags_sql) && count($tags_sql)>0){
 				$tags_sub_query='select sid from survey_tags where '.implode(' OR ',$tags_sql);
-			}	
-		
+			}
+
 			if ( !empty($tags_sub_query)){
-				if ( trim($where_clause)!=''){	
+				if ( trim($where_clause)!=''){
 					$where_clause.= sprintf(' AND surveys.id in (%s)',$tags_sub_query);
 				}
 				else{
 					$where_clause.= sprintf('  surveys.id in (%s)',$tags_sub_query);
 				}
-			}	
+			}
 		}
-		
-		
+
+
 		//data types
 		//search tags
 		$types=$this->get_param('type');
@@ -227,20 +232,20 @@ function _build_search_query()
 			foreach($types as $key=>$value){
 				$types[$key]= "'" . $value . "'";
 			}
-			
+
 			if ( trim($where_clause)!='')
-			{	
+			{
 				$where_clause.= ' AND ' . '(surveys.type in ('.implode(",",$types).') )';
 			}
 			else
 			{
 				$where_clause.= '(surveys.type in ('.implode(",",$types).') )';
-			}			
+			}
 		}
-			
-		
+
+
 		$active_repo_filter='';
-		
+
 		//active repo
 		if ($this->active_repo!=NULL && $this->active_repo!='central')
 		{
@@ -252,22 +257,22 @@ function _build_search_query()
 			else
 			{	//show studies not part of the active repository
 				$active_repo_filter=' surveys.repositoryid!='.$this->db->escape($this->active_repo).' and surveys.id not in (select sid from survey_repos where repositoryid='.$this->db->escape($this->active_repo).')';
-			}	
+			}
 		}
-		
+
 		if ( trim($where_clause)!='' && $active_repo_filter!='')
-		{	
+		{
 			$where_clause.= ' AND ' .$active_repo_filter;
 		}
 		else
 		{
 			$where_clause.= $active_repo_filter;
 		}
-		
-		
+
+
 		//apply DA filters
 		$da_filters=$this->get_param('dtype');
-		
+
 		if($da_filters)
 		{
 			$da_arr=array();
@@ -277,73 +282,73 @@ function _build_search_query()
 				$da_arr[]=$dtype;
 				}
 			}
-			
+
 			if( count($da_arr)>0)
 			{
 				if ( trim($where_clause)!='')
-				{	
+				{
 					$where_clause.= ' AND ' . '(surveys.formid in ('.implode(",",$da_arr).') )';
 				}
 				else
 				{
 					$where_clause.= '(surveys.formid in ('.implode(",",$da_arr).') )';
-				}			
+				}
 			}
 		}
-		
+
 		//studies with no questions
 		$no_question=$this->input->get('no_question');
-		
+
 		if($no_question)
 		{
 			//get an array of surveys with no questions
 			if ( trim($where_clause)!='')
-			{	
+			{
 				$where_clause.= ' AND ' . 'surveys.id not in (select survey_id from resources where dctype like \'%doc/qst]%\')';
 			}
 			else
 			{
 				$where_clause.= 'surveys.id not in (select survey_id from resources where dctype like \'%doc/qst]%\')';
-			}		
+			}
 		}
 
 		//studies with no datafile
 		$no_datafile=$this->input->get('no_datafile');
-		
+
 		if($no_datafile)
 		{
 			//get an array of surveys with no questions
 			if ( trim($where_clause)!='')
-			{	
+			{
 				$where_clause.= ' AND ' . 'surveys.id not in (select survey_id from resources where dctype like \'%dat/micro]%\' OR dctype like \'%dat]%\' )';
 			}
 			else
 			{
 				$where_clause.= 'surveys.id not in (select survey_id from resources where dctype like \'%dat/micro]%\' OR dctype like \'%dat]%\' )';
-			}		
+			}
 		}
-		
-		
+
+
 		//search on FIELDS [country, idno, title, producer]
 		$search_fields=array('nation','idno','title','published');
 		$search_options=NULL;
-		
+
 		foreach($search_fields as $name)
 		{
 			$value=$this->get_param($name);
-			
+
 			//for repeatable fields eg. nation[]=xyz&nation[]=abc
 			if (is_array($value))
 			{
 				$tmp=NULL;
 				foreach($value as $val)
 				{
-					if(trim($val)!=='') 
+					if(trim($val)!=='')
 					{
 						$tmp[]=sprintf("%s like %s",$name,$this->db->escape('%'.$val.'%'));
-					}	
+					}
 				}
-				
+
 				if (is_array($tmp)&& count($tmp)>0)
 				{
 					$search_options[]='('.implode(' OR ', $tmp).')';
@@ -352,20 +357,20 @@ function _build_search_query()
 			else
 			{
 				//single value fields
-				if(trim($value)!=='') 
+				if(trim($value)!=='')
 				{
 					$search_options[]=sprintf("%s like %s",$name,$this->db->escape('%'.$value.'%'));
-				}	
-			}			
-		}//end-foreach
-				
+				}
+			}
+		} //end-foreach
+
 		$search_options_str=NULL;
 		if (is_array($search_options) && count($search_options)>0)
 		{
 			$search_options_str='('.implode(' AND ', $search_options).')';
-			
+
 			if ( trim($where_clause)!='')
-			{	
+			{
 				$where_clause.= ' AND ' . $search_options_str;
 			}
 			else
@@ -373,48 +378,50 @@ function _build_search_query()
 				$where_clause=$search_options_str;
 			}
 		}
-		 
-		
-		
+
+
+
 		/*
 		echo '<pre>';
 		var_dump($search_options);
 		var_dump($where_clause);
 		echo '</pre>';
 		*/
-		
+
 		return $where_clause;
 	}
 
-	//returns the search result count  	
-    function search_count()
-    {
-        //build search using the parameters passed to the GET/POST variables
+	//returns the search result count
+	function search_count() {
+		//build search using the parameters passed to the GET/POST variables
 		$where=$this->_build_search_query();
 
 		if ($where!='')
 		{
 			$this->db->where($where,NULL,FALSE);
 		}
+
 		if ($this->active_repo!=NULL && $this->active_repo!='central')
 		{
 			$this->db->join('survey_repos sr', 'sr.sid= surveys.id','left');
-		}	
+		}
+
 		$result=$this->db->count_all_results('surveys');
+
 		//echo $this->db->last_query();
 		return $result;
     }
-	
-	
+
+
 	private function get_param($key)
 	{
 		if (isset($this->params[$key]))
 		{
 			return $this->params[$key];
 		}
-		
+
 		return FALSE;
 	}
 
 
-}//end-class
\ No newline at end of file
+} //end-class

From eccb1fffa6bd6e7c50713501b26f4401ee7e1204 Mon Sep 17 00:00:00 2001
From: ch-ricardor <ca.ricardor@gmail.com>
Date: Tue, 18 Oct 2022 15:09:05 +0200
Subject: [PATCH 72/79] Catalog Batch Import

---
 application/controllers/admin/Catalog.php     | 47 +++++++------
 application/libraries/Chunked_uploader.php    | 22 ++++--
 .../views/catalog/batch_file_upload.php       | 13 ++--
 .../views/catalog/ddi_batch_import.php        | 69 ++++++++++---------
 4 files changed, 83 insertions(+), 68 deletions(-)

diff --git a/application/controllers/admin/Catalog.php b/application/controllers/admin/Catalog.php
index 3e6a9f8d4..956528131 100644
--- a/application/controllers/admin/Catalog.php
+++ b/application/controllers/admin/Catalog.php
@@ -93,12 +93,12 @@ function index()
 		//data access types
 		$this->data_access_types=$this->Form_model->get_all();
 		//data types
-		$this->catalog_data_types=$this->Search_helper_model->get_dataset_types($this->active_repo->repositoryid); 
+		$this->catalog_data_types=$this->Search_helper_model->get_dataset_types($this->active_repo->repositoryid);
 
 		if ($db_rows['rows'])
 		{
 			$sid_list=array();
-			foreach($db_rows['rows'] as $row) 
+			foreach($db_rows['rows'] as $row)
 			{
 				$sid_list[]=$row['id'];
 			}
@@ -120,10 +120,10 @@ function index()
 		$this->template->write('content', $content,true);
 	  	$this->template->render();
 	}
-	
+
 
 	function search()
-	{		
+	{
 		if (isset($this->active_repo) && $this->active_repo!=null){
 			$this->Catalog_model->active_repo=$this->active_repo->repositoryid;
 		}
@@ -544,9 +544,9 @@ private function __replace_ddi($sid,$new_ddi_file)
             'file_type'=>'survey',
             'file_path'=>$new_ddi_file
         );
-        
+
 		$this->load->library('Metadata_parser', $parser_params);
-		
+
 		 //parser to read metadata
 		 $parser=$this->metadata_parser->get_reader();
 
@@ -701,14 +701,14 @@ function refresh($id=NULL)
 		}
 	}
 
-	
+
 
 	/**
 	*
 	* Clear files from the imports folder
 	**/
 	function clear_import_folder()
-	{		
+	{
 		$this->load->helper('file');
 		$import_folder=$this->config->item('ddi_import_folder');
 
@@ -743,17 +743,16 @@ function process_batch_uploads()
 	{
 		//import folder path
 		$import_folder=$this->config->item('ddi_import_folder');
-
 		if (!file_exists($import_folder)){
 			show_error('FOLDER-NOT-SET');
 		}
 
 		$config = array(
-				'max_tmp_file_age' 		=> 900,
-				'max_execution_time' 	=> 300,
-				'target_dir' 			=> $import_folder,
+				'max_tmp_file_age'	=> 900,
+				'max_execution_time'	=> 300,
+				'target_dir' 		=> $import_folder,
 				'allowed_extensions'	=>'xml|rdf',
-				'overwrite_file'		=>TRUE
+				'overwrite_file'	=>TRUE
 				);
 
 		$this->load->library('Chunked_uploader', $config, 'uploader');
@@ -783,7 +782,6 @@ function process_batch_uploads()
 	}
 
 
-
 	/**
 	 * Imports multiple ddi files from the server folder
 	 *
@@ -802,20 +800,25 @@ function batch_import()
 		$import_folder=$this->config->item('ddi_import_folder');
 
 		if (!file_exists($import_folder) ){
-			$import_folder="/datasets";
+			// @TODO: Review datasets directory does not exist either
+			// $import_folder="/datasets";
+			$import_folder="/datafiles/tmp";
 		}
 
 		//read files
 		$files['files']=get_dir_file_info($import_folder);
 
 		if ( $files['files']){
-			foreach($files['files'] as $key=>$value){				
-				if (substr($value['name'],-4)!='.xml'){
+			foreach($files['files'] as $key=>$value){
+				//if (substr($value['name'],-4)!='.xml'){
+				//if (! in_array(pathinfo($value['name'], PATHINFO_EXTENSION), array('xml','rdf'))) {
+				if (! in_array(pathinfo($value['name'], PATHINFO_EXTENSION), array('xml'))) {
+					// @TODO: Check if rdf files should be processed
 					unset($files['files'][$key]);
 				}
 			}
 		}
-		
+
 		$options=array(
 			'repositories'=>$this->Repository_model->select_all(),
 			'files'=>$files['files'],
@@ -855,10 +858,10 @@ function do_batch_import()
 			echo json_encode(array('error'=>t('REPO_ACCESS_DENIED')) );
 			exit;
 		}
-		
+
 		$this->load->model("Data_file_model");
 		$this->load->library('DDI2_import');
-		
+
 		$user=$this->ion_auth->current_user();
 
 		$ddi_path=$ddi_file;
@@ -890,7 +893,7 @@ function do_batch_import()
 				'message'=>$e->getMessage(),
 				'errors'=>$e->GetValidationErrors()
 			);
-			
+
 			$error=print_r($e->GetValidationErrors(),true);
 			echo json_encode(array('error'=>$error) );
 			die();
@@ -902,7 +905,7 @@ function do_batch_import()
 		}
 	}
 
-	
+
 
 	/**
 	*
diff --git a/application/libraries/Chunked_uploader.php b/application/libraries/Chunked_uploader.php
index 1017d392f..4256028f5 100644
--- a/application/libraries/Chunked_uploader.php
+++ b/application/libraries/Chunked_uploader.php
@@ -329,7 +329,7 @@ class Chunked_upload_request {
 	private $_file_type; // mime-type of file
 
 	/**
-	 * Initialises new object with values from the $_REQUEST and 
+	 * Initialises new object with values from the $_REQUEST and
 	 * $_SERVER arrays
 	 */
 
@@ -344,25 +344,33 @@ public function __construct()
 		$this->_file_type = isset($_SERVER['HTTP_X_FILE_TYPE'])
 				? $_SERVER['HTTP_X_FILE_TYPE']
 				: '';
+
+		// @TODO: Fatal error: Unparenthesized 'a ? b : c ? d : e' is not supported. 
+		//	Use either '(a ? b : c) ? d : e' or 'a ? b : (c ? d : e)
 		// attempt to get file name from $_REQUEST, otherwise look for X_FILE_NAME header
 		$name = isset($_REQUEST["name"])
 				? $_REQUEST["name"]
-				: (isset($_SERVER['HTTP_X_FILE_NAME'])
+				: (
+					(isset($_SERVER['HTTP_X_FILE_NAME'])
 						? $_SERVER['HTTP_X_FILE_NAME']
-						: 'file');
+						: 'file')
+				  );
+
 		// clean the filename for security
 		$this->_name = preg_replace('/[^\w\._]+/', '_', $name);
 		// attempt to get the content-type from $_SERVER array
 		$this->_content_type = (isset($_SERVER["HTTP_CONTENT_TYPE"]))
 				? $_SERVER["HTTP_CONTENT_TYPE"]
-				: (isset($_SERVER["CONTENT_TYPE"]))
+				: (
+					 (isset($_SERVER["CONTENT_TYPE"]))
 						? $_SERVER["CONTENT_TYPE"]
-						: '';
+						: ''
+				   );
 	}
 
 	/**
 	 * Returns the original filename (from client machine)
-	 * @return string file name 
+	 * @return string file name
 	 */
 	public function get_name()
 	{
@@ -426,4 +434,4 @@ public function is_multipart()
 }
 
 /* End of file Chunked_uploader.php */
-/* Location: /sparks/chunked_uploader/0.0.1/libraries/Chunked_uploader.php */
\ No newline at end of file
+/* Location: /sparks/chunked_uploader/0.0.1/libraries/Chunked_uploader.php */
diff --git a/application/views/catalog/batch_file_upload.php b/application/views/catalog/batch_file_upload.php
index fe37534f5..24b9bbb49 100644
--- a/application/views/catalog/batch_file_upload.php
+++ b/application/views/catalog/batch_file_upload.php
@@ -6,8 +6,7 @@
 // Convert divs to queue widgets when the DOM is ready
 $(function() {
 
-	function log()
-	{
+	function log() {
 	}
 
 	$("#uploader").pluploadQueue({
@@ -21,9 +20,11 @@ function log()
 		multipart_params: { 'upload_folder': 'default', 'overwrite':0},
 
 		// Specify what files to browse for
-		filters : [
+		filters : {
+			mime_types: [
 			{title : "External Resources", extensions : "<?php echo $allowed_extensions;?>"}
-		],
+			]
+		},
 
 		// Flash settings
 		flash_swf_url : 'javascript/plupload/js/Moxie.swf',
@@ -79,12 +80,12 @@ function log()
 
 			FileUploaded: function(up, file, info) {
 				// Called when a file has finished uploading
-				//console.log('[FileUploaded] File:', file, "Info:", info);
+				console.log('[FileUploaded] File:', file, "Info:", info);
 			},
 
 			ChunkUploaded: function(up, file, info) {
 				// Called when a file chunk has finished uploading
-				//log('[ChunkUploaded] File:', file, "Info:", info);
+				log('[ChunkUploaded] File:', file, "Info:", info);
 			},
 
 			UploadComplete: function (up, file) {
diff --git a/application/views/catalog/ddi_batch_import.php b/application/views/catalog/ddi_batch_import.php
index 442b09f51..33c9a890b 100644
--- a/application/views/catalog/ddi_batch_import.php
+++ b/application/views/catalog/ddi_batch_import.php
@@ -15,12 +15,12 @@
 }
 ?>
 
-<?php 
+<?php
 //batch uploader using PLUPLOAD
 $batch_upload_options=array(
 	'allowed_extensions'	=>'xml,rdf',
-	'destination_url'		=>'admin/catalog/batch_import',
-	'upload_url'			=>'admin/catalog/process_batch_uploads'
+	'destination_url'	=>'admin/catalog/batch_import',
+	'upload_url'		=>'admin/catalog/process_batch_uploads'
 );
 $batch_uploader=$this->load->view('catalog/batch_file_upload',$batch_upload_options,TRUE);
 ?>
@@ -34,30 +34,31 @@
 <div>
 
 <?php if ( count($files)==0 || $files===false) :?>
-    <div class="alert alert-block">
+    <div class="alert alert-warning">
 		<?php echo sprintf(t('import_ddi_no_files_found'),$this->config->item('ddi_import_folder'));?>
     </div>
-    
     <?php echo $batch_uploader;?>
     <?php return; ?>
 <?php endif; ?>
 
 <div>
 	<?php echo sprintf(t('import_ddi_files_found'),count($files));?> <input class="btn btn-primary" type="button" name="import" value="<?php echo t('btn_import');?>" onclick="batch_import.process();"/>
-    
+
     <div>
-    
+
     <div class="form-group">
         <label for="overwrite" class="desc" >
         	<input type="checkbox" name="overwrite" id="overwrite" checked="checked"  value="yes"/> <?php echo t('ddi_overwrite_exist');?> 
         </label>
-    </div>  
-    
+    </div>
+
     </div>
 </div>
 
 <div class="note" id="batch-import-box" style="display:none;" >
-    <div id="batch-import-processing" style="padding:5px;border-bottom:1px solid gainsboro;margin-bottom:10px;">Processing survey...</div>
+<!--    <div id="batch-import-processing" style="padding:5px;border-bottom:1px solid gainsboro;margin-bottom:10px;">Processing survey...</div>
+-->
+    <div id="batch-import-processing" class="alert alert-info">Processing survey...</div>
     <div id="batch-import-log" ></div>
 </div>
 
@@ -66,7 +67,7 @@
 <input type="hidden" name="repositoryid" id="repositoryid" value="<?php echo $active_repository;?>"/>
 
 <div class="batch-links">
-<a class="batch-uploader" href="#" onclick="javascript:return false;"><?php echo t('batch_upload_files');?></a> | 
+<a class="batch-uploader" href="#" onclick="javascript:return false;"><?php echo t('batch_upload_files');?></a> |
 <a href="<?php echo site_url('admin/catalog/clear_import_folder');?>"><?php echo t('clear_import_folder');?></a>
 </div>
 
@@ -103,90 +104,92 @@
 
 $(".log").css({ border: '1px solid gray'});
 var batch_import = {
-	
+
 	id:null,
 	queue:[],
 	queue_idx:0,
 	xhr:null,
 	isprocessing:false,
-	
+
 	process : function() {
-		
+
 		if (this.isprocessing==true){
 			return false;
 		}
-		
+
 		this.queue_idx=0;
 		this.queue=[];
 		obj=this;
 		var i=0;
 
-		$('.chk').each(function(){ 
+		$('.chk').each(function(){
 		   if (this.checked==true) {
 				obj.queue[i++]={id:this.id,name:this.value};
 		   }
-	    }); 
+	    });
 
 		html=$("#batch-import-box").html();
 		$("#batch-import-log").html("");
 		this.process_queue();
 	},
-	
+
 	//process items in queue
 	process_queue: function(){
-		if (this.queue_idx<this.queue.length) {			
-			
+		if (this.queue_idx<this.queue.length) {
+
 			html='<i class="fa fa-spinner fa-pulse fa-2x fa-fw"></i> Importing '+ (this.queue_idx+1) +' of '+this.queue.length+'... <b>['+this.queue[this.queue_idx].name+']</b>';
 			html+=' <a href="#" onclick="batch_import.abort();return false;">' +i18n.cancel_import_process+'</a>';
 			$("#batch-import-box").show();
 			$("#batch-import-processing").html(html);
-			
+
 			this.isprocessing=true;
-			this.import_single(this.queue[this.queue_idx++].id);		
+			this.import_single(this.queue[this.queue_idx++].id);
 		}
 		else{
 			$("#batch-import-processing").html(i18n.import_completed);
 			this.isprocessing=false;
 		}
-		
+
 	},
-	
+
 	import_single: function(id) {
 		obj=this;
 		//set error hanlder
 		$.ajaxSetup({
-				error:function(x,e){	
+				error:function(x,e){
 					alert("Error code: " + x.status + " " + x.responseText);
 					obj.abort();
 				}
-			});		
-		
+			});
+
 		var overwrite=0;
 		var repositoryid=null;
 		if ($("#overwrite").is(":checked")){overwrite=1}
 		repositoryid=$("#repositoryid").val();
-		//post	
+		//post
 		this.xhr=$.post(CI.base_url+"/admin/catalog/do_batch_import",{id:id,overwrite:overwrite,repositoryid:repositoryid},func_data, "json");
-		
+
 		//handle json returned values
 		function func_data(data){
 			 if (data.success){
 				obj.queue[obj.queue_idx-1].status=data.success;
-				$("#batch-import-log").append('<div class="log" style="color:green;">#' + (obj.queue_idx) + ': '  + obj.queue[obj.queue_idx-1].name + ' - ' + data.success+ '</div>');
+				// $("#batch-import-log").append('<div class="log" style="color:green;">#' + (obj.queue_idx) + ': '  + obj.queue[obj.queue_idx-1].name + ' - ' + data.success+ '</div>');
+				$("#batch-import-log").append('<div class="alert alert-success">#' + (obj.queue_idx) + ': '  + obj.queue[obj.queue_idx-1].name + ' - ' + data.success+ '</div>');
 			 }
 			 else{
 			 	obj.queue[obj.queue_idx-1].status=data.error;
-				$("#batch-import-log").append('<div class="log" style="color:red">#' + (obj.queue_idx) + ': '  +  obj.queue[obj.queue_idx-1].name + ' - ' + data.error+ '</div>');
+				//$("#batch-import-log").append('<div class="log" style="color:red">#' + (obj.queue_idx) + ': '  +  obj.queue[obj.queue_idx-1].name + ' - ' + data.error+ '</div>');
+				$("#batch-import-log").append('<div class="alert alert-danger">#' + (obj.queue_idx) + ': '  +  obj.queue[obj.queue_idx-1].name + ' - ' + data.error+ '</div>');
 			 }
 			 obj.process_queue();
 		}//end-func
 	},
-	
+
 	abort: function(){
 		$("#batch-import-processing").html(i18n.import_cancelled);
 		this.xhr.abort();
 		this.isprocessing=false;
-	}	
+	}
 };
 
 

From 78679350b391dd0a7ab211e59e356be37594a0b7 Mon Sep 17 00:00:00 2001
From: Mehmood Asghar <mah0001@gmail.com>
Date: Tue, 18 Oct 2022 12:44:23 -0400
Subject: [PATCH 73/79] fix for SOLR search not returning any results when no
 collections are selected

---
 application/libraries/Catalog_search_solr.php | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/application/libraries/Catalog_search_solr.php b/application/libraries/Catalog_search_solr.php
index 985cc0352..f1b459e3d 100644
--- a/application/libraries/Catalog_search_solr.php
+++ b/application/libraries/Catalog_search_solr.php
@@ -727,12 +727,13 @@ function _build_collections_query()
 		$param_list=array();
 
 		foreach($params  as $param){
-			$param_list[]=$this->ci->db->escape($param);
+			if (trim($param)!==''){
+				$param_list[]=$this->ci->db->escape($param);
+			}
 		}
 
 		if ( count($param_list)>0){
 			$params= implode(' OR ',$param_list);
-
 			return sprintf(' repositories:(%s)',$params);
 		}
 		

From 37f05ebaa533766b8d2738e3b3d6ee51a808b97c Mon Sep 17 00:00:00 2001
From: Mehmood Asghar <mah0001@gmail.com>
Date: Tue, 18 Oct 2022 12:46:48 -0400
Subject: [PATCH 74/79] Show search counts for all data types regardless of
 active data type tab

---
 application/libraries/Catalog_search_mysql.php  | 2 +-
 application/libraries/Catalog_search_sqlsrv.php | 6 +++++-
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/application/libraries/Catalog_search_mysql.php b/application/libraries/Catalog_search_mysql.php
index b91b6f5ba..b2d479980 100644
--- a/application/libraries/Catalog_search_mysql.php
+++ b/application/libraries/Catalog_search_mysql.php
@@ -328,7 +328,7 @@ public function search($limit=15, $offset=0)
 	 */
 	public function search_counts_by_type()
 	{		
-		$type=$this->_build_dataset_type_query();
+		$type=false;//$this->_build_dataset_type_query();
 		$study=$this->_build_study_query();
 		$variable=false;//$this->_build_variable_query();
 		$topics=$this->_build_topics_query();
diff --git a/application/libraries/Catalog_search_sqlsrv.php b/application/libraries/Catalog_search_sqlsrv.php
index 06383a1e0..8a8f756d1 100644
--- a/application/libraries/Catalog_search_sqlsrv.php
+++ b/application/libraries/Catalog_search_sqlsrv.php
@@ -871,6 +871,10 @@ function vsearch($limit = 15, $offset = 0)
 		$sort_by=in_array($this->sort_by,$sortable_fields) ? $this->sort_by : 'title';
 		$sort_order=in_array($this->sort_order,$this->sort_allowed_order) ? $this->sort_order : 'ASC';
 
+		if ($sort_by=='title'){
+			$sort_by="surveys.title";
+		}
+
 		//$variable_keywords=$this->variable_keywords;
 		//$variable_fields=$this->variable_fields;
 
@@ -1165,7 +1169,7 @@ protected function _build_tags_query()
 	 */
 	public function search_counts_by_type()
 	{		
-		$type=$this->_build_dataset_type_query();
+		$type=false;//$this->_build_dataset_type_query();
 		$study=$this->_build_study_query();
 		$topics=$this->_build_topics_query();
 		$countries=$this->_build_countries_query();

From 80ce4a3f289c2dfac581f52198b59411f3b8c216 Mon Sep 17 00:00:00 2001
From: Mehmood Asghar <mah0001@gmail.com>
Date: Tue, 18 Oct 2022 13:11:14 -0400
Subject: [PATCH 75/79] update dependencies

---
 composer.json                                 |    2 +-
 composer.lock                                 |  213 +--
 vendor/adbario/php-dot-notation/composer.json |    6 +-
 vendor/adbario/php-dot-notation/src/Dot.php   |   34 +-
 .../adbario/php-dot-notation/src/helpers.php  |    9 +-
 vendor/composer/InstalledVersions.php         |   70 +-
 vendor/composer/autoload_classmap.php         |    1 +
 vendor/composer/autoload_files.php            |    2 +-
 vendor/composer/autoload_psr4.php             |    2 +-
 vendor/composer/autoload_static.php           |    7 +-
 vendor/composer/installed.json                |  225 +--
 vendor/composer/installed.php                 |   70 +-
 vendor/guzzlehttp/guzzle/CHANGELOG.md         |   29 +
 vendor/guzzlehttp/guzzle/README.md            |   28 +-
 vendor/guzzlehttp/guzzle/composer.json        |   15 +-
 .../guzzle/src/Cookie/CookieJar.php           |    6 +-
 .../guzzle/src/Cookie/SetCookie.php           |    6 +-
 .../guzzle/src/Handler/CurlMultiHandler.php   |    5 +-
 .../guzzle/src/Handler/StreamHandler.php      |    9 +-
 .../guzzle/src/RedirectMiddleware.php         |   26 +-
 .../guzzlehttp/guzzle/src/RetryMiddleware.php |    2 +-
 vendor/guzzlehttp/guzzle/src/Utils.php        |   15 +-
 vendor/guzzlehttp/promises/CHANGELOG.md       |    9 +-
 vendor/guzzlehttp/promises/Makefile           |   13 -
 vendor/guzzlehttp/promises/README.md          |   57 +-
 .../guzzlehttp/promises/src/EachPromise.php   |    8 -
 vendor/guzzlehttp/psr7/CHANGELOG.md           |   58 +
 vendor/guzzlehttp/psr7/README.md              |   35 +-
 vendor/guzzlehttp/psr7/composer.json          |   13 +-
 vendor/guzzlehttp/psr7/src/AppendStream.php   |    1 -
 vendor/guzzlehttp/psr7/src/CachingStream.php  |    5 +
 vendor/guzzlehttp/psr7/src/DroppingStream.php |    3 +
 vendor/guzzlehttp/psr7/src/FnStream.php       |    1 +
 vendor/guzzlehttp/psr7/src/Header.php         |  105 +-
 vendor/guzzlehttp/psr7/src/InflateStream.php  |    3 +
 vendor/guzzlehttp/psr7/src/LazyOpenStream.php |    1 +
 vendor/guzzlehttp/psr7/src/LimitStream.php    |    3 +
 vendor/guzzlehttp/psr7/src/Message.php        |    4 +
 vendor/guzzlehttp/psr7/src/MessageTrait.php   |   47 +-
 vendor/guzzlehttp/psr7/src/MimeType.php       | 1311 +++++++++++++++--
 .../guzzlehttp/psr7/src/MultipartStream.php   |    8 +-
 vendor/guzzlehttp/psr7/src/NoSeekStream.php   |    3 +
 vendor/guzzlehttp/psr7/src/Query.php          |    2 +-
 vendor/guzzlehttp/psr7/src/ServerRequest.php  |    2 +-
 vendor/guzzlehttp/psr7/src/Stream.php         |   15 +-
 vendor/guzzlehttp/psr7/src/Uri.php            |    7 +-
 vendor/guzzlehttp/psr7/src/UriComparator.php  |   52 +
 vendor/guzzlehttp/psr7/src/Utils.php          |   51 +-
 .../vendor-bin/php-cs-fixer/composer.json     |    9 -
 .../psr7/vendor-bin/phpstan/composer.json     |   10 -
 .../psr7/vendor-bin/psalm/composer.json       |    9 -
 vendor/justinrainbow/json-schema/.php_cs.dist |   34 -
 .../justinrainbow/json-schema/demo/README.md  |   14 -
 .../justinrainbow/json-schema/demo/data.json  |    3 -
 .../justinrainbow/json-schema/demo/demo.php   |   18 -
 .../json-schema/demo/schema.json              |    3 -
 .../json-schema/phpunit.xml.dist              |   26 -
 .../JsonSchema/Constraints/TypeConstraint.php |    2 +-
 vendor/phpmailer/phpmailer/README.md          |    3 +
 vendor/phpmailer/phpmailer/VERSION            |    2 +-
 vendor/phpmailer/phpmailer/composer.json      |   15 +-
 .../phpmailer/phpmailer/get_oauth_token.php   |   44 +-
 .../phpmailer/language/phpmailer.lang-ch.php  |   27 -
 .../phpmailer/language/phpmailer.lang-da.php  |   10 +-
 .../phpmailer/language/phpmailer.lang-el.php  |   41 +-
 .../phpmailer/language/phpmailer.lang-fr.php  |    2 +-
 .../phpmailer/language/phpmailer.lang-mn.php  |   27 +
 .../phpmailer/language/phpmailer.lang-pl.php  |   13 +-
 vendor/phpmailer/phpmailer/src/OAuth.php      |    2 +-
 .../phpmailer/src/OAuthTokenProvider.php      |   44 +
 vendor/phpmailer/phpmailer/src/PHPMailer.php  |  142 +-
 vendor/phpmailer/phpmailer/src/POP3.php       |    2 +-
 vendor/phpmailer/phpmailer/src/SMTP.php       |   11 +-
 vendor/solarium/solarium/CHANGELOG.md         |   76 +-
 vendor/solarium/solarium/README.md            |   71 +-
 vendor/solarium/solarium/composer.json        |   14 +-
 vendor/solarium/solarium/src/Client.php       |   25 +-
 .../src/Component/Analytics/Analytics.php     |    1 +
 .../src/Component/Analytics/Facet/Pivot.php   |    1 +
 .../Component/Analytics/Facet/PivotFacet.php  |    1 +
 .../Component/Analytics/Facet/QueryFacet.php  |    1 +
 .../Component/Analytics/Facet/RangeFacet.php  |    1 +
 .../Analytics/Facet/Sort/Criterion.php        |    1 +
 .../Component/Analytics/Facet/Sort/Sort.php   |    1 +
 .../Component/Analytics/Facet/ValueFacet.php  |    1 +
 .../src/Component/Analytics/Grouping.php      |    1 +
 .../ComponentTraits/SpellcheckTrait.php       |   24 +
 .../solarium/src/Component/DisMax.php         |    4 +-
 .../Facet/FieldValueParametersInterface.php   |    7 +
 .../Facet/FieldValueParametersTrait.php       |    7 +
 .../src/Component/Facet/JsonTerms.php         |    6 +-
 .../src/Component/Facet/MultiQuery.php        |    2 +-
 .../Component/Facet/PivotMinCountTrait.php    |    7 +
 .../solarium/src/Component/FacetSetTrait.php  |    4 +-
 .../src/Component/Highlighting/Field.php      |  268 +---
 .../Component/Highlighting/Highlighting.php   |  747 +---------
 .../Highlighting/HighlightingInterface.php    |  936 ++++++++++++
 .../Highlighting/HighlightingTrait.php        | 1184 +++++++++++++++
 .../solarium/src/Component/QueryInterface.php |    2 +-
 .../Component/RequestBuilder/Analytics.php    |   22 +-
 .../src/Component/RequestBuilder/FacetSet.php |    2 +-
 .../Component/RequestBuilder/Highlighting.php |  117 +-
 .../RequestBuilder/RequestParamsTrait.php     |    2 +-
 .../Component/RequestBuilder/Spellcheck.php   |    1 +
 .../src/Component/Result/Analytics/Facet.php  |    4 +-
 .../src/Component/Result/Analytics/Result.php |    4 +-
 .../src/Component/Result/Debug/Detail.php     |   35 +
 .../src/Component/Result/Debug/Document.php   |    3 +
 .../src/Component/Result/FacetSet.php         |    2 +-
 .../Result/MoreLikeThis/MoreLikeThis.php      |    4 +-
 .../src/Component/SpellcheckInterface.php     |   18 +
 .../solarium/src/Component/Stats/Stats.php    |    2 +-
 .../src/Core/Client/Adapter/AdapterHelper.php |    2 +-
 .../ConnectionTimeoutAwareInterface.php       |    8 +-
 .../Adapter/ConnectionTimeoutAwareTrait.php   |    8 +-
 .../solarium/src/Core/Client/Adapter/Curl.php |   62 +-
 .../solarium/src/Core/Client/Adapter/Http.php |   46 +-
 .../Client/Adapter/ProxyAwareInterface.php    |   30 +
 .../Core/Client/Adapter/ProxyAwareTrait.php   |   41 +
 .../src/Core/Client/Adapter/Psr18Adapter.php  |   19 +-
 .../Client/Adapter/TimeoutAwareInterface.php  |    8 +-
 .../Core/Client/Adapter/TimeoutAwareTrait.php |    6 +-
 .../solarium/src/Core/Client/Client.php       |   81 +-
 .../src/Core/Client/ClientInterface.php       |  105 +-
 .../solarium/src/Core/Client/Endpoint.php     |   35 +-
 .../solarium/src/Core/Client/Request.php      |  125 +-
 .../solarium/src/Core/Event/Events.php        |    2 +-
 .../src/Core/Event/PostCreateQuery.php        |    2 +-
 .../src/Core/Event/PostCreateRequest.php      |    2 +-
 .../src/Core/Event/PostCreateResult.php       |    2 +-
 .../solarium/src/Core/Event/PostExecute.php   |    2 +-
 .../src/Core/Event/PostExecuteRequest.php     |    2 +-
 .../src/Core/Event/PreCreateQuery.php         |    2 +-
 .../src/Core/Event/PreCreateRequest.php       |    2 +-
 .../src/Core/Event/PreCreateResult.php        |    2 +-
 .../solarium/src/Core/Event/PreExecute.php    |    2 +-
 .../src/Core/Event/PreExecuteRequest.php      |    2 +-
 .../src/Core/Plugin/AbstractPlugin.php        |   12 +-
 .../src/Core/Plugin/PluginInterface.php       |    9 +-
 .../src/Core/Query/AbstractDocument.php       |    8 +-
 .../src/Core/Query/AbstractRequestBuilder.php |    3 +-
 .../src/Core/Query/AbstractResponseParser.php |   34 +-
 .../solarium/src/Core/Query/Helper.php        |   48 +-
 .../Query/LocalParameters/LocalParameters.php |   40 +-
 .../solarium/src/Core/Query/Result/Result.php |   11 +-
 .../src/Exception/ExceptionInterface.php      |    2 +-
 .../solarium/src/Exception/HttpException.php  |    2 +-
 .../AbstractBufferedUpdate.php                |  146 ++
 .../Event/AbstractEvents.php                  |   63 +
 .../Event/AbstractPostCommit.php              |   46 +
 .../Event/AbstractPostFlush.php               |   46 +
 .../Event/AbstractPreCommit.php               |  146 ++
 .../Event/AbstractPreFlush.php                |   59 +
 .../src/Plugin/BufferedAdd/BufferedAdd.php    |  221 +--
 .../Plugin/BufferedAdd/BufferedAddLite.php    |  210 +++
 .../Plugin/BufferedAdd/Event/AddDocument.php  |    4 +-
 .../src/Plugin/BufferedAdd/Event/Events.php   |   37 +-
 .../Plugin/BufferedAdd/Event/PostCommit.php   |   31 +-
 .../Plugin/BufferedAdd/Event/PostFlush.php    |   31 +-
 .../Plugin/BufferedAdd/Event/PreCommit.php    |  117 +-
 .../src/Plugin/BufferedAdd/Event/PreFlush.php |   33 +-
 .../Plugin/BufferedDelete/AbstractDelete.php  |   35 +
 .../Plugin/BufferedDelete/BufferedDelete.php  |  127 ++
 .../BufferedDelete/BufferedDeleteLite.php     |  186 +++
 .../src/Plugin/BufferedDelete/Delete/Id.php   |   75 +
 .../Plugin/BufferedDelete/Delete/Query.php    |   75 +
 .../BufferedDelete/Event/AddDeleteById.php    |   60 +
 .../BufferedDelete/Event/AddDeleteQuery.php   |   60 +
 .../Plugin/BufferedDelete/Event/Events.php    |   76 +
 .../BufferedDelete/Event/PostCommit.php       |   21 +
 .../Plugin/BufferedDelete/Event/PostFlush.php |   21 +
 .../Plugin/BufferedDelete/Event/PreCommit.php |   26 +
 .../Plugin/BufferedDelete/Event/PreFlush.php  |   26 +
 .../CustomizeRequest/CustomizeRequest.php     |   19 +-
 .../Loadbalancer/Event/EndpointFailure.php    |    2 +-
 .../src/Plugin/Loadbalancer/Loadbalancer.php  |   16 +-
 .../Plugin/MinimumScoreFilter/Document.php    |   13 +-
 .../MinimumScoreFilter/MinimumScoreFilter.php |    2 +-
 .../ParallelExecution/Event/ExecuteEnd.php    |    4 +-
 .../ParallelExecution/Event/ExecuteStart.php  |    4 +-
 .../ParallelExecution/ParallelExecution.php   |   93 +-
 .../src/Plugin/PostBigExtractRequest.php      |   34 +-
 .../solarium/src/Plugin/PostBigRequest.php    |   25 +-
 .../solarium/src/Plugin/PrefetchIterator.php  |    4 +-
 .../Analysis/RequestBuilder/Document.php      |    5 +-
 .../Analysis/ResponseParser/Field.php         |    2 +-
 .../src/QueryType/Extract/RequestBuilder.php  |   12 +-
 .../ManagedResources/Query/AbstractQuery.php  |    3 +
 .../ManagedResources/Query/Command/Exists.php |   48 +-
 .../Query/Command/Stopwords/Create.php        |    2 +
 .../Query/Command/Synonyms/Create.php         |    2 +
 .../RequestBuilder/Resource.php               |    2 +-
 .../QueryType/MoreLikeThis/RequestBuilder.php |    4 +-
 .../src/QueryType/Select/Query/Query.php      |   13 +-
 .../src/QueryType/Select/RequestBuilder.php   |    2 +-
 .../src/QueryType/Select/Result/Document.php  |    9 +
 .../src/QueryType/Server/Api/Query.php        |   44 +-
 .../QueryType/Server/Api/RequestBuilder.php   |   16 +-
 .../QueryType/Server/Api/ResponseParser.php   |    1 +
 .../Expression.php => Server/Api/Result.php}  |    8 +-
 .../Query/Action/ClusterStatus.php            |    6 +-
 .../Collections/Query/Action/Create.php       |   15 -
 .../Server/Configsets/RequestBuilder.php      |    2 +-
 .../Query/Action/CoreActionInterface.php      |    2 +-
 .../Query/Action/CoreActionTrait.php          |    2 +-
 .../Server/CoreAdmin/Query/Action/Create.php  |    4 +-
 .../QueryType/Server/Query/AbstractResult.php |    2 +-
 .../src/QueryType/Stream/RequestBuilder.php   |    4 +-
 .../src/QueryType/Stream/ResponseParser.php   |    2 +-
 .../QueryType/Suggester/ResponseParser.php    |    2 +-
 .../QueryType/Update/Query/Command/Add.php    |   28 +
 .../QueryType/Update/Query/Command/Delete.php |   21 +-
 .../QueryType/Update/Query/Command/RawXml.php |   12 +
 .../src/QueryType/Update/Query/Document.php   |  115 +-
 .../src/QueryType/Update/RequestBuilder.php   |   78 +-
 vendor/symfony/deprecation-contracts/LICENSE  |    2 +-
 .../event-dispatcher-contracts/LICENSE        |    2 +-
 .../Debug/TraceableEventDispatcher.php        |    6 +-
 .../event-dispatcher/EventDispatcher.php      |    4 +-
 vendor/symfony/event-dispatcher/LICENSE       |    2 +-
 vendor/symfony/polyfill-php80/Php80.php       |   12 +-
 vendor/symfony/polyfill-php80/PhpToken.php    |  103 ++
 vendor/symfony/polyfill-php80/README.md       |    7 +-
 .../Resources/stubs/PhpToken.php              |    7 +
 vendor/symfony/polyfill-php80/composer.json   |    2 +-
 225 files changed, 7573 insertions(+), 2724 deletions(-)
 delete mode 100644 vendor/guzzlehttp/promises/Makefile
 create mode 100644 vendor/guzzlehttp/psr7/src/UriComparator.php
 delete mode 100644 vendor/guzzlehttp/psr7/vendor-bin/php-cs-fixer/composer.json
 delete mode 100644 vendor/guzzlehttp/psr7/vendor-bin/phpstan/composer.json
 delete mode 100644 vendor/guzzlehttp/psr7/vendor-bin/psalm/composer.json
 delete mode 100644 vendor/justinrainbow/json-schema/.php_cs.dist
 delete mode 100644 vendor/justinrainbow/json-schema/demo/README.md
 delete mode 100644 vendor/justinrainbow/json-schema/demo/data.json
 delete mode 100644 vendor/justinrainbow/json-schema/demo/demo.php
 delete mode 100644 vendor/justinrainbow/json-schema/demo/schema.json
 delete mode 100644 vendor/justinrainbow/json-schema/phpunit.xml.dist
 delete mode 100644 vendor/phpmailer/phpmailer/language/phpmailer.lang-ch.php
 create mode 100644 vendor/phpmailer/phpmailer/language/phpmailer.lang-mn.php
 create mode 100644 vendor/phpmailer/phpmailer/src/OAuthTokenProvider.php
 create mode 100644 vendor/solarium/solarium/src/Component/Highlighting/HighlightingInterface.php
 create mode 100644 vendor/solarium/solarium/src/Component/Highlighting/HighlightingTrait.php
 create mode 100644 vendor/solarium/solarium/src/Core/Client/Adapter/ProxyAwareInterface.php
 create mode 100644 vendor/solarium/solarium/src/Core/Client/Adapter/ProxyAwareTrait.php
 create mode 100644 vendor/solarium/solarium/src/Plugin/AbstractBufferedUpdate/AbstractBufferedUpdate.php
 create mode 100644 vendor/solarium/solarium/src/Plugin/AbstractBufferedUpdate/Event/AbstractEvents.php
 create mode 100644 vendor/solarium/solarium/src/Plugin/AbstractBufferedUpdate/Event/AbstractPostCommit.php
 create mode 100644 vendor/solarium/solarium/src/Plugin/AbstractBufferedUpdate/Event/AbstractPostFlush.php
 create mode 100644 vendor/solarium/solarium/src/Plugin/AbstractBufferedUpdate/Event/AbstractPreCommit.php
 create mode 100644 vendor/solarium/solarium/src/Plugin/AbstractBufferedUpdate/Event/AbstractPreFlush.php
 create mode 100644 vendor/solarium/solarium/src/Plugin/BufferedAdd/BufferedAddLite.php
 create mode 100644 vendor/solarium/solarium/src/Plugin/BufferedDelete/AbstractDelete.php
 create mode 100644 vendor/solarium/solarium/src/Plugin/BufferedDelete/BufferedDelete.php
 create mode 100644 vendor/solarium/solarium/src/Plugin/BufferedDelete/BufferedDeleteLite.php
 create mode 100644 vendor/solarium/solarium/src/Plugin/BufferedDelete/Delete/Id.php
 create mode 100644 vendor/solarium/solarium/src/Plugin/BufferedDelete/Delete/Query.php
 create mode 100644 vendor/solarium/solarium/src/Plugin/BufferedDelete/Event/AddDeleteById.php
 create mode 100644 vendor/solarium/solarium/src/Plugin/BufferedDelete/Event/AddDeleteQuery.php
 create mode 100644 vendor/solarium/solarium/src/Plugin/BufferedDelete/Event/Events.php
 create mode 100644 vendor/solarium/solarium/src/Plugin/BufferedDelete/Event/PostCommit.php
 create mode 100644 vendor/solarium/solarium/src/Plugin/BufferedDelete/Event/PostFlush.php
 create mode 100644 vendor/solarium/solarium/src/Plugin/BufferedDelete/Event/PreCommit.php
 create mode 100644 vendor/solarium/solarium/src/Plugin/BufferedDelete/Event/PreFlush.php
 rename vendor/solarium/solarium/src/QueryType/{Stream/Expression.php => Server/Api/Result.php} (58%)
 create mode 100644 vendor/symfony/polyfill-php80/PhpToken.php
 create mode 100644 vendor/symfony/polyfill-php80/Resources/stubs/PhpToken.php

diff --git a/composer.json b/composer.json
index 51396c00e..10a5034e5 100644
--- a/composer.json
+++ b/composer.json
@@ -11,7 +11,7 @@
         "laminas/laminas-permissions-acl": "^2.7",
         "phpmailer/phpmailer": "^6.5",
         "spatie/array-to-xml": "^2.15",
-        "guzzlehttp/guzzle": "^7.0",
+        "guzzlehttp/guzzle": "^7.5",
         "symfony/event-dispatcher": "^5.3",
         "firebase/php-jwt": "^5.4"
     },
diff --git a/composer.lock b/composer.lock
index 4647f4a0d..41ee56958 100644
--- a/composer.lock
+++ b/composer.lock
@@ -4,29 +4,29 @@
         "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies",
         "This file is @generated automatically"
     ],
-    "content-hash": "93188a0cc81a7c9ec802b0e94da86c22",
+    "content-hash": "d1f6ad559409436eef91195cca4f8201",
     "packages": [
         {
             "name": "adbario/php-dot-notation",
-            "version": "2.2.0",
+            "version": "2.5.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/adbario/php-dot-notation.git",
-                "reference": "eee4fc81296531e6aafba4c2bbccfc5adab1676e"
+                "reference": "081e2cca50c84bfeeea2e3ef9b2c8d206d80ccae"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/adbario/php-dot-notation/zipball/eee4fc81296531e6aafba4c2bbccfc5adab1676e",
-                "reference": "eee4fc81296531e6aafba4c2bbccfc5adab1676e",
+                "url": "https://api.github.com/repos/adbario/php-dot-notation/zipball/081e2cca50c84bfeeea2e3ef9b2c8d206d80ccae",
+                "reference": "081e2cca50c84bfeeea2e3ef9b2c8d206d80ccae",
                 "shasum": ""
             },
             "require": {
                 "ext-json": "*",
-                "php": ">=5.5"
+                "php": "^5.5 || ^7.0 || ^8.0"
             },
             "require-dev": {
-                "phpunit/phpunit": "^4.0|^5.0|^6.0",
-                "squizlabs/php_codesniffer": "^3.0"
+                "phpunit/phpunit": "^4.8|^5.7|^6.6|^7.5|^8.5|^9.5",
+                "squizlabs/php_codesniffer": "^3.6"
             },
             "type": "library",
             "autoload": {
@@ -55,9 +55,9 @@
             ],
             "support": {
                 "issues": "https://github.com/adbario/php-dot-notation/issues",
-                "source": "https://github.com/adbario/php-dot-notation/tree/2.x"
+                "source": "https://github.com/adbario/php-dot-notation/tree/2.5.0"
             },
-            "time": "2019-01-01T23:59:15+00:00"
+            "time": "2022-10-14T20:31:46+00:00"
         },
         {
             "name": "firebase/php-jwt",
@@ -118,22 +118,22 @@
         },
         {
             "name": "guzzlehttp/guzzle",
-            "version": "7.4.1",
+            "version": "7.5.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/guzzle/guzzle.git",
-                "reference": "ee0a041b1760e6a53d2a39c8c34115adc2af2c79"
+                "reference": "b50a2a1251152e43f6a37f0fa053e730a67d25ba"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/guzzle/guzzle/zipball/ee0a041b1760e6a53d2a39c8c34115adc2af2c79",
-                "reference": "ee0a041b1760e6a53d2a39c8c34115adc2af2c79",
+                "url": "https://api.github.com/repos/guzzle/guzzle/zipball/b50a2a1251152e43f6a37f0fa053e730a67d25ba",
+                "reference": "b50a2a1251152e43f6a37f0fa053e730a67d25ba",
                 "shasum": ""
             },
             "require": {
                 "ext-json": "*",
                 "guzzlehttp/promises": "^1.5",
-                "guzzlehttp/psr7": "^1.8.3 || ^2.1",
+                "guzzlehttp/psr7": "^1.9 || ^2.4",
                 "php": "^7.2.5 || ^8.0",
                 "psr/http-client": "^1.0",
                 "symfony/deprecation-contracts": "^2.2 || ^3.0"
@@ -142,10 +142,10 @@
                 "psr/http-client-implementation": "1.0"
             },
             "require-dev": {
-                "bamarni/composer-bin-plugin": "^1.4.1",
+                "bamarni/composer-bin-plugin": "^1.8.1",
                 "ext-curl": "*",
                 "php-http/client-integration-tests": "^3.0",
-                "phpunit/phpunit": "^8.5.5 || ^9.3.5",
+                "phpunit/phpunit": "^8.5.29 || ^9.5.23",
                 "psr/log": "^1.1 || ^2.0 || ^3.0"
             },
             "suggest": {
@@ -155,17 +155,21 @@
             },
             "type": "library",
             "extra": {
+                "bamarni-bin": {
+                    "bin-links": true,
+                    "forward-command": false
+                },
                 "branch-alias": {
-                    "dev-master": "7.4-dev"
+                    "dev-master": "7.5-dev"
                 }
             },
             "autoload": {
-                "psr-4": {
-                    "GuzzleHttp\\": "src/"
-                },
                 "files": [
                     "src/functions_include.php"
-                ]
+                ],
+                "psr-4": {
+                    "GuzzleHttp\\": "src/"
+                }
             },
             "notification-url": "https://packagist.org/downloads/",
             "license": [
@@ -222,7 +226,7 @@
             ],
             "support": {
                 "issues": "https://github.com/guzzle/guzzle/issues",
-                "source": "https://github.com/guzzle/guzzle/tree/7.4.1"
+                "source": "https://github.com/guzzle/guzzle/tree/7.5.0"
             },
             "funding": [
                 {
@@ -238,20 +242,20 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2021-12-06T18:43:05+00:00"
+            "time": "2022-08-28T15:39:27+00:00"
         },
         {
             "name": "guzzlehttp/promises",
-            "version": "1.5.1",
+            "version": "1.5.2",
             "source": {
                 "type": "git",
                 "url": "https://github.com/guzzle/promises.git",
-                "reference": "fe752aedc9fd8fcca3fe7ad05d419d32998a06da"
+                "reference": "b94b2807d85443f9719887892882d0329d1e2598"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/guzzle/promises/zipball/fe752aedc9fd8fcca3fe7ad05d419d32998a06da",
-                "reference": "fe752aedc9fd8fcca3fe7ad05d419d32998a06da",
+                "url": "https://api.github.com/repos/guzzle/promises/zipball/b94b2807d85443f9719887892882d0329d1e2598",
+                "reference": "b94b2807d85443f9719887892882d0329d1e2598",
                 "shasum": ""
             },
             "require": {
@@ -267,12 +271,12 @@
                 }
             },
             "autoload": {
-                "psr-4": {
-                    "GuzzleHttp\\Promise\\": "src/"
-                },
                 "files": [
                     "src/functions_include.php"
-                ]
+                ],
+                "psr-4": {
+                    "GuzzleHttp\\Promise\\": "src/"
+                }
             },
             "notification-url": "https://packagist.org/downloads/",
             "license": [
@@ -306,7 +310,7 @@
             ],
             "support": {
                 "issues": "https://github.com/guzzle/promises/issues",
-                "source": "https://github.com/guzzle/promises/tree/1.5.1"
+                "source": "https://github.com/guzzle/promises/tree/1.5.2"
             },
             "funding": [
                 {
@@ -322,20 +326,20 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2021-10-22T20:56:57+00:00"
+            "time": "2022-08-28T14:55:35+00:00"
         },
         {
             "name": "guzzlehttp/psr7",
-            "version": "2.1.0",
+            "version": "2.4.1",
             "source": {
                 "type": "git",
                 "url": "https://github.com/guzzle/psr7.git",
-                "reference": "089edd38f5b8abba6cb01567c2a8aaa47cec4c72"
+                "reference": "69568e4293f4fa993f3b0e51c9723e1e17c41379"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/guzzle/psr7/zipball/089edd38f5b8abba6cb01567c2a8aaa47cec4c72",
-                "reference": "089edd38f5b8abba6cb01567c2a8aaa47cec4c72",
+                "url": "https://api.github.com/repos/guzzle/psr7/zipball/69568e4293f4fa993f3b0e51c9723e1e17c41379",
+                "reference": "69568e4293f4fa993f3b0e51c9723e1e17c41379",
                 "shasum": ""
             },
             "require": {
@@ -349,17 +353,21 @@
                 "psr/http-message-implementation": "1.0"
             },
             "require-dev": {
-                "bamarni/composer-bin-plugin": "^1.4.1",
+                "bamarni/composer-bin-plugin": "^1.8.1",
                 "http-interop/http-factory-tests": "^0.9",
-                "phpunit/phpunit": "^8.5.8 || ^9.3.10"
+                "phpunit/phpunit": "^8.5.29 || ^9.5.23"
             },
             "suggest": {
                 "laminas/laminas-httphandlerrunner": "Emit PSR-7 responses"
             },
             "type": "library",
             "extra": {
+                "bamarni-bin": {
+                    "bin-links": true,
+                    "forward-command": false
+                },
                 "branch-alias": {
-                    "dev-master": "2.1-dev"
+                    "dev-master": "2.4-dev"
                 }
             },
             "autoload": {
@@ -421,7 +429,7 @@
             ],
             "support": {
                 "issues": "https://github.com/guzzle/psr7/issues",
-                "source": "https://github.com/guzzle/psr7/tree/2.1.0"
+                "source": "https://github.com/guzzle/psr7/tree/2.4.1"
             },
             "funding": [
                 {
@@ -437,20 +445,20 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2021-10-06T17:43:30+00:00"
+            "time": "2022-08-28T14:45:39+00:00"
         },
         {
             "name": "justinrainbow/json-schema",
-            "version": "5.2.11",
+            "version": "5.2.12",
             "source": {
                 "type": "git",
                 "url": "https://github.com/justinrainbow/json-schema.git",
-                "reference": "2ab6744b7296ded80f8cc4f9509abbff393399aa"
+                "reference": "ad87d5a5ca981228e0e205c2bc7dfb8e24559b60"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/justinrainbow/json-schema/zipball/2ab6744b7296ded80f8cc4f9509abbff393399aa",
-                "reference": "2ab6744b7296ded80f8cc4f9509abbff393399aa",
+                "url": "https://api.github.com/repos/justinrainbow/json-schema/zipball/ad87d5a5ca981228e0e205c2bc7dfb8e24559b60",
+                "reference": "ad87d5a5ca981228e0e205c2bc7dfb8e24559b60",
                 "shasum": ""
             },
             "require": {
@@ -505,9 +513,9 @@
             ],
             "support": {
                 "issues": "https://github.com/justinrainbow/json-schema/issues",
-                "source": "https://github.com/justinrainbow/json-schema/tree/5.2.11"
+                "source": "https://github.com/justinrainbow/json-schema/tree/5.2.12"
             },
-            "time": "2021-07-22T09:24:00+00:00"
+            "time": "2022-04-13T08:02:27+00:00"
         },
         {
             "name": "laminas/laminas-permissions-acl",
@@ -611,12 +619,12 @@
                 }
             },
             "autoload": {
-                "psr-4": {
-                    "League\\Csv\\": "src"
-                },
                 "files": [
                     "src/functions_include.php"
-                ]
+                ],
+                "psr-4": {
+                    "League\\Csv\\": "src"
+                }
             },
             "notification-url": "https://packagist.org/downloads/",
             "license": [
@@ -762,16 +770,16 @@
         },
         {
             "name": "phpmailer/phpmailer",
-            "version": "v6.5.3",
+            "version": "v6.6.5",
             "source": {
                 "type": "git",
                 "url": "https://github.com/PHPMailer/PHPMailer.git",
-                "reference": "baeb7cde6b60b1286912690ab0693c7789a31e71"
+                "reference": "8b6386d7417526d1ea4da9edb70b8352f7543627"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/PHPMailer/PHPMailer/zipball/baeb7cde6b60b1286912690ab0693c7789a31e71",
-                "reference": "baeb7cde6b60b1286912690ab0693c7789a31e71",
+                "url": "https://api.github.com/repos/PHPMailer/PHPMailer/zipball/8b6386d7417526d1ea4da9edb70b8352f7543627",
+                "reference": "8b6386d7417526d1ea4da9edb70b8352f7543627",
                 "shasum": ""
             },
             "require": {
@@ -783,11 +791,11 @@
             "require-dev": {
                 "dealerdirect/phpcodesniffer-composer-installer": "^0.7.0",
                 "doctrine/annotations": "^1.2",
-                "php-parallel-lint/php-console-highlighter": "^0.5.0",
-                "php-parallel-lint/php-parallel-lint": "^1.3",
+                "php-parallel-lint/php-console-highlighter": "^1.0.0",
+                "php-parallel-lint/php-parallel-lint": "^1.3.2",
                 "phpcompatibility/php-compatibility": "^9.3.5",
                 "roave/security-advisories": "dev-latest",
-                "squizlabs/php_codesniffer": "^3.6.0",
+                "squizlabs/php_codesniffer": "^3.6.2",
                 "yoast/phpunit-polyfills": "^1.0.0"
             },
             "suggest": {
@@ -795,8 +803,8 @@
                 "hayageek/oauth2-yahoo": "Needed for Yahoo XOAUTH2 authentication",
                 "league/oauth2-google": "Needed for Google XOAUTH2 authentication",
                 "psr/log": "For optional PSR-3 debug logging",
-                "stevenmaguire/oauth2-microsoft": "Needed for Microsoft XOAUTH2 authentication",
-                "symfony/polyfill-mbstring": "To support UTF-8 if the Mbstring PHP extension is not enabled (^1.2)"
+                "symfony/polyfill-mbstring": "To support UTF-8 if the Mbstring PHP extension is not enabled (^1.2)",
+                "thenetworg/oauth2-azure": "Needed for Microsoft XOAUTH2 authentication"
             },
             "type": "library",
             "autoload": {
@@ -828,7 +836,7 @@
             "description": "PHPMailer is a full-featured email creation and transfer class for PHP",
             "support": {
                 "issues": "https://github.com/PHPMailer/PHPMailer/issues",
-                "source": "https://github.com/PHPMailer/PHPMailer/tree/v6.5.3"
+                "source": "https://github.com/PHPMailer/PHPMailer/tree/v6.6.5"
             },
             "funding": [
                 {
@@ -836,7 +844,7 @@
                     "type": "github"
                 }
             ],
-            "time": "2021-11-25T16:34:11+00:00"
+            "time": "2022-10-07T12:23:10+00:00"
         },
         {
             "name": "psr/event-dispatcher",
@@ -1219,25 +1227,26 @@
         },
         {
             "name": "solarium/solarium",
-            "version": "6.2.1",
+            "version": "6.2.7",
             "source": {
                 "type": "git",
                 "url": "https://github.com/solariumphp/solarium.git",
-                "reference": "3c13804d3e12b2783ca450a4e8a6d759e496d651"
+                "reference": "6d6d13b4eda222e7bdb9616545aa67efbe8c6cec"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/solariumphp/solarium/zipball/3c13804d3e12b2783ca450a4e8a6d759e496d651",
-                "reference": "3c13804d3e12b2783ca450a4e8a6d759e496d651",
+                "url": "https://api.github.com/repos/solariumphp/solarium/zipball/6d6d13b4eda222e7bdb9616545aa67efbe8c6cec",
+                "reference": "6d6d13b4eda222e7bdb9616545aa67efbe8c6cec",
                 "shasum": ""
             },
             "require": {
+                "composer-runtime-api": ">=2.0",
                 "ext-json": "*",
                 "php": "^7.3 || ^8.0",
                 "psr/event-dispatcher": "^1.0",
                 "psr/http-client": "^1.0",
                 "psr/http-factory": "^1.0",
-                "symfony/event-dispatcher-contracts": "^1.0 || ^2.0"
+                "symfony/event-dispatcher-contracts": "^1.0 || ^2.0 || ^3.0"
             },
             "require-dev": {
                 "escapestudios/symfony2-coding-standard": "^3.11",
@@ -1245,11 +1254,11 @@
                 "nyholm/psr7": "^1.2",
                 "php-http/guzzle7-adapter": "^0.1",
                 "phpstan/extension-installer": "^1.0",
-                "phpstan/phpstan": "^0.12",
-                "phpstan/phpstan-phpunit": "^0.12",
+                "phpstan/phpstan": "^1.0",
+                "phpstan/phpstan-phpunit": "^1.0",
                 "phpunit/phpunit": "^9.5",
                 "roave/security-advisories": "dev-master",
-                "symfony/event-dispatcher": "^4.3 || ^5.0"
+                "symfony/event-dispatcher": "^4.3 || ^5.0 || ^6.0"
             },
             "type": "library",
             "autoload": {
@@ -1276,9 +1285,9 @@
             ],
             "support": {
                 "issues": "https://github.com/solariumphp/solarium/issues",
-                "source": "https://github.com/solariumphp/solarium/tree/6.2.1"
+                "source": "https://github.com/solariumphp/solarium/tree/6.2.7"
             },
-            "time": "2021-12-26T10:15:52+00:00"
+            "time": "2022-09-12T09:20:39+00:00"
         },
         {
             "name": "spatie/array-to-xml",
@@ -1336,16 +1345,16 @@
         },
         {
             "name": "symfony/deprecation-contracts",
-            "version": "v2.5.0",
+            "version": "v2.5.2",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/deprecation-contracts.git",
-                "reference": "6f981ee24cf69ee7ce9736146d1c57c2780598a8"
+                "reference": "e8b495ea28c1d97b5e0c121748d6f9b53d075c66"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/deprecation-contracts/zipball/6f981ee24cf69ee7ce9736146d1c57c2780598a8",
-                "reference": "6f981ee24cf69ee7ce9736146d1c57c2780598a8",
+                "url": "https://api.github.com/repos/symfony/deprecation-contracts/zipball/e8b495ea28c1d97b5e0c121748d6f9b53d075c66",
+                "reference": "e8b495ea28c1d97b5e0c121748d6f9b53d075c66",
                 "shasum": ""
             },
             "require": {
@@ -1383,7 +1392,7 @@
             "description": "A generic function and convention to trigger deprecation notices",
             "homepage": "https://symfony.com",
             "support": {
-                "source": "https://github.com/symfony/deprecation-contracts/tree/v2.5.0"
+                "source": "https://github.com/symfony/deprecation-contracts/tree/v2.5.2"
             },
             "funding": [
                 {
@@ -1399,20 +1408,20 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2021-07-12T14:48:14+00:00"
+            "time": "2022-01-02T09:53:40+00:00"
         },
         {
             "name": "symfony/event-dispatcher",
-            "version": "v5.4.0",
+            "version": "v5.4.9",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/event-dispatcher.git",
-                "reference": "27d39ae126352b9fa3be5e196ccf4617897be3eb"
+                "reference": "8e6ce1cc0279e3ff3c8ff0f43813bc88d21ca1bc"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/event-dispatcher/zipball/27d39ae126352b9fa3be5e196ccf4617897be3eb",
-                "reference": "27d39ae126352b9fa3be5e196ccf4617897be3eb",
+                "url": "https://api.github.com/repos/symfony/event-dispatcher/zipball/8e6ce1cc0279e3ff3c8ff0f43813bc88d21ca1bc",
+                "reference": "8e6ce1cc0279e3ff3c8ff0f43813bc88d21ca1bc",
                 "shasum": ""
             },
             "require": {
@@ -1468,7 +1477,7 @@
             "description": "Provides tools that allow your application components to communicate with each other by dispatching events and listening to them",
             "homepage": "https://symfony.com",
             "support": {
-                "source": "https://github.com/symfony/event-dispatcher/tree/v5.4.0"
+                "source": "https://github.com/symfony/event-dispatcher/tree/v5.4.9"
             },
             "funding": [
                 {
@@ -1484,20 +1493,20 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2021-11-23T10:19:22+00:00"
+            "time": "2022-05-05T16:45:39+00:00"
         },
         {
             "name": "symfony/event-dispatcher-contracts",
-            "version": "v2.5.0",
+            "version": "v2.5.2",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/event-dispatcher-contracts.git",
-                "reference": "66bea3b09be61613cd3b4043a65a8ec48cfa6d2a"
+                "reference": "f98b54df6ad059855739db6fcbc2d36995283fe1"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/event-dispatcher-contracts/zipball/66bea3b09be61613cd3b4043a65a8ec48cfa6d2a",
-                "reference": "66bea3b09be61613cd3b4043a65a8ec48cfa6d2a",
+                "url": "https://api.github.com/repos/symfony/event-dispatcher-contracts/zipball/f98b54df6ad059855739db6fcbc2d36995283fe1",
+                "reference": "f98b54df6ad059855739db6fcbc2d36995283fe1",
                 "shasum": ""
             },
             "require": {
@@ -1547,7 +1556,7 @@
                 "standards"
             ],
             "support": {
-                "source": "https://github.com/symfony/event-dispatcher-contracts/tree/v2.5.0"
+                "source": "https://github.com/symfony/event-dispatcher-contracts/tree/v2.5.2"
             },
             "funding": [
                 {
@@ -1563,20 +1572,20 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2021-07-12T14:48:14+00:00"
+            "time": "2022-01-02T09:53:40+00:00"
         },
         {
             "name": "symfony/polyfill-php80",
-            "version": "v1.24.0",
+            "version": "v1.26.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/polyfill-php80.git",
-                "reference": "57b712b08eddb97c762a8caa32c84e037892d2e9"
+                "reference": "cfa0ae98841b9e461207c13ab093d76b0fa7bace"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/polyfill-php80/zipball/57b712b08eddb97c762a8caa32c84e037892d2e9",
-                "reference": "57b712b08eddb97c762a8caa32c84e037892d2e9",
+                "url": "https://api.github.com/repos/symfony/polyfill-php80/zipball/cfa0ae98841b9e461207c13ab093d76b0fa7bace",
+                "reference": "cfa0ae98841b9e461207c13ab093d76b0fa7bace",
                 "shasum": ""
             },
             "require": {
@@ -1585,7 +1594,7 @@
             "type": "library",
             "extra": {
                 "branch-alias": {
-                    "dev-main": "1.23-dev"
+                    "dev-main": "1.26-dev"
                 },
                 "thanks": {
                     "name": "symfony/polyfill",
@@ -1593,12 +1602,12 @@
                 }
             },
             "autoload": {
-                "psr-4": {
-                    "Symfony\\Polyfill\\Php80\\": ""
-                },
                 "files": [
                     "bootstrap.php"
                 ],
+                "psr-4": {
+                    "Symfony\\Polyfill\\Php80\\": ""
+                },
                 "classmap": [
                     "Resources/stubs"
                 ]
@@ -1630,7 +1639,7 @@
                 "shim"
             ],
             "support": {
-                "source": "https://github.com/symfony/polyfill-php80/tree/v1.24.0"
+                "source": "https://github.com/symfony/polyfill-php80/tree/v1.26.0"
             },
             "funding": [
                 {
@@ -1646,7 +1655,7 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2021-09-13T13:58:33+00:00"
+            "time": "2022-05-10T07:21:04+00:00"
         },
         {
             "name": "violet/streaming-json-encoder",
diff --git a/vendor/adbario/php-dot-notation/composer.json b/vendor/adbario/php-dot-notation/composer.json
index b7b82cb49..cea712612 100644
--- a/vendor/adbario/php-dot-notation/composer.json
+++ b/vendor/adbario/php-dot-notation/composer.json
@@ -11,12 +11,12 @@
         }
     ],
     "require": {
-        "php": ">=5.5",
+        "php": "^5.5 || ^7.0 || ^8.0",
         "ext-json": "*"
     },
     "require-dev": {
-        "phpunit/phpunit": "^4.0|^5.0|^6.0",
-        "squizlabs/php_codesniffer": "^3.0"
+        "phpunit/phpunit": "^4.8|^5.7|^6.6|^7.5|^8.5|^9.5",
+        "squizlabs/php_codesniffer": "^3.6"
     },
     "autoload": {
         "files": [
diff --git a/vendor/adbario/php-dot-notation/src/Dot.php b/vendor/adbario/php-dot-notation/src/Dot.php
index 8d504d9e6..3cd1c5017 100644
--- a/vendor/adbario/php-dot-notation/src/Dot.php
+++ b/vendor/adbario/php-dot-notation/src/Dot.php
@@ -29,14 +29,25 @@ class Dot implements ArrayAccess, Countable, IteratorAggregate, JsonSerializable
      */
     protected $items = [];
 
+
+    /**
+     * The delimiter (alternative to a '.') to be used.
+     *
+     * @var string
+     */
+    protected $delimiter = '.';
+
+
     /**
      * Create a new Dot instance
      *
      * @param mixed $items
+     * @param string $delimiter
      */
-    public function __construct($items = [])
+    public function __construct($items = [], $delimiter = '.')
     {
         $this->items = $this->getArrayItems($items);
+        $this->delimiter = strlen($delimiter) ? $delimiter : '.';
     }
 
     /**
@@ -104,7 +115,7 @@ public function delete($keys)
             }
 
             $items = &$this->items;
-            $segments = explode('.', $key);
+            $segments = explode($this->delimiter, $key);
             $lastSegment = array_pop($segments);
 
             foreach ($segments as $segment) {
@@ -148,6 +159,10 @@ public function flatten($delimiter = '.', $items = null, $prepend = '')
             $items = $this->items;
         }
 
+        if (!func_num_args()) {
+            $delimiter = $this->delimiter;
+        }
+
         foreach ($items as $key => $value) {
             if (is_array($value) && !empty($value)) {
                 $flatten = array_merge(
@@ -179,13 +194,13 @@ public function get($key = null, $default = null)
             return $this->items[$key];
         }
 
-        if (strpos($key, '.') === false) {
+        if (strpos($key, $this->delimiter) === false) {
             return $default;
         }
 
         $items = $this->items;
 
-        foreach (explode('.', $key) as $segment) {
+        foreach (explode($this->delimiter, $key) as $segment) {
             if (!is_array($items) || !$this->exists($items, $segment)) {
                 return $default;
             }
@@ -234,7 +249,7 @@ public function has($keys)
                 continue;
             }
 
-            foreach (explode('.', $key) as $segment) {
+            foreach (explode($this->delimiter, $key) as $segment) {
                 if (!is_array($items) || !$this->exists($items, $segment)) {
                     return false;
                 }
@@ -446,7 +461,7 @@ public function set($keys, $value = null)
 
         $items = &$this->items;
 
-        foreach (explode('.', $keys) as $key) {
+        foreach (explode($this->delimiter, $keys) as $key) {
             if (!isset($items[$key]) || !is_array($items[$key])) {
                 $items[$key] = [];
             }
@@ -507,6 +522,7 @@ public function toJson($key = null, $options = 0)
      * @param  int|string $key
      * @return bool
      */
+    #[\ReturnTypeWillChange]
     public function offsetExists($key)
     {
         return $this->has($key);
@@ -518,6 +534,7 @@ public function offsetExists($key)
      * @param  int|string $key
      * @return mixed
      */
+    #[\ReturnTypeWillChange]
     public function offsetGet($key)
     {
         return $this->get($key);
@@ -529,6 +546,7 @@ public function offsetGet($key)
      * @param int|string|null $key
      * @param mixed           $value
      */
+    #[\ReturnTypeWillChange]
     public function offsetSet($key, $value)
     {
         if (is_null($key)) {
@@ -545,6 +563,7 @@ public function offsetSet($key, $value)
      *
      * @param int|string $key
      */
+    #[\ReturnTypeWillChange]
     public function offsetUnset($key)
     {
         $this->delete($key);
@@ -562,6 +581,7 @@ public function offsetUnset($key)
      * @param  int|string|null $key
      * @return int
      */
+    #[\ReturnTypeWillChange]
     public function count($key = null)
     {
         return count($this->get($key));
@@ -578,6 +598,7 @@ public function count($key = null)
      *
      * @return \ArrayIterator
      */
+    #[\ReturnTypeWillChange]
     public function getIterator()
     {
         return new ArrayIterator($this->items);
@@ -594,6 +615,7 @@ public function getIterator()
      *
      * @return array
      */
+    #[\ReturnTypeWillChange]
     public function jsonSerialize()
     {
         return $this->items;
diff --git a/vendor/adbario/php-dot-notation/src/helpers.php b/vendor/adbario/php-dot-notation/src/helpers.php
index ffdc82687..bebb9527d 100644
--- a/vendor/adbario/php-dot-notation/src/helpers.php
+++ b/vendor/adbario/php-dot-notation/src/helpers.php
@@ -11,13 +11,14 @@
 
 if (! function_exists('dot')) {
     /**
-     * Create a new Dot object with the given items
+     * Create a new Dot object with the given items and optional delimiter
      *
-     * @param  mixed $items
+     * @param  mixed  $items
+     * @param  string $delimiter
      * @return \Adbar\Dot
      */
-    function dot($items)
+    function dot($items, $delimiter = '.')
     {
-        return new Dot($items);
+        return new Dot($items, $delimiter);
     }
 }
diff --git a/vendor/composer/InstalledVersions.php b/vendor/composer/InstalledVersions.php
index c61b05824..48f3f21d8 100644
--- a/vendor/composer/InstalledVersions.php
+++ b/vendor/composer/InstalledVersions.php
@@ -30,7 +30,7 @@ class InstalledVersions
     'aliases' => 
     array (
     ),
-    'reference' => '55c2e6b289ede299cfd128707c43685c81d030db',
+    'reference' => '2c94715a6950e813173148eff0ad35a208e23893',
     'name' => '__root__',
   ),
   'versions' => 
@@ -42,16 +42,16 @@ class InstalledVersions
       'aliases' => 
       array (
       ),
-      'reference' => '55c2e6b289ede299cfd128707c43685c81d030db',
+      'reference' => '2c94715a6950e813173148eff0ad35a208e23893',
     ),
     'adbario/php-dot-notation' => 
     array (
-      'pretty_version' => '2.2.0',
-      'version' => '2.2.0.0',
+      'pretty_version' => '2.5.0',
+      'version' => '2.5.0.0',
       'aliases' => 
       array (
       ),
-      'reference' => 'eee4fc81296531e6aafba4c2bbccfc5adab1676e',
+      'reference' => '081e2cca50c84bfeeea2e3ef9b2c8d206d80ccae',
     ),
     'firebase/php-jwt' => 
     array (
@@ -64,39 +64,39 @@ class InstalledVersions
     ),
     'guzzlehttp/guzzle' => 
     array (
-      'pretty_version' => '7.4.1',
-      'version' => '7.4.1.0',
+      'pretty_version' => '7.5.0',
+      'version' => '7.5.0.0',
       'aliases' => 
       array (
       ),
-      'reference' => 'ee0a041b1760e6a53d2a39c8c34115adc2af2c79',
+      'reference' => 'b50a2a1251152e43f6a37f0fa053e730a67d25ba',
     ),
     'guzzlehttp/promises' => 
     array (
-      'pretty_version' => '1.5.1',
-      'version' => '1.5.1.0',
+      'pretty_version' => '1.5.2',
+      'version' => '1.5.2.0',
       'aliases' => 
       array (
       ),
-      'reference' => 'fe752aedc9fd8fcca3fe7ad05d419d32998a06da',
+      'reference' => 'b94b2807d85443f9719887892882d0329d1e2598',
     ),
     'guzzlehttp/psr7' => 
     array (
-      'pretty_version' => '2.1.0',
-      'version' => '2.1.0.0',
+      'pretty_version' => '2.4.1',
+      'version' => '2.4.1.0',
       'aliases' => 
       array (
       ),
-      'reference' => '089edd38f5b8abba6cb01567c2a8aaa47cec4c72',
+      'reference' => '69568e4293f4fa993f3b0e51c9723e1e17c41379',
     ),
     'justinrainbow/json-schema' => 
     array (
-      'pretty_version' => '5.2.11',
-      'version' => '5.2.11.0',
+      'pretty_version' => '5.2.12',
+      'version' => '5.2.12.0',
       'aliases' => 
       array (
       ),
-      'reference' => '2ab6744b7296ded80f8cc4f9509abbff393399aa',
+      'reference' => 'ad87d5a5ca981228e0e205c2bc7dfb8e24559b60',
     ),
     'laminas/laminas-permissions-acl' => 
     array (
@@ -136,12 +136,12 @@ class InstalledVersions
     ),
     'phpmailer/phpmailer' => 
     array (
-      'pretty_version' => 'v6.5.3',
-      'version' => '6.5.3.0',
+      'pretty_version' => 'v6.6.5',
+      'version' => '6.6.5.0',
       'aliases' => 
       array (
       ),
-      'reference' => 'baeb7cde6b60b1286912690ab0693c7789a31e71',
+      'reference' => '8b6386d7417526d1ea4da9edb70b8352f7543627',
     ),
     'psr/event-dispatcher' => 
     array (
@@ -236,12 +236,12 @@ class InstalledVersions
     ),
     'solarium/solarium' => 
     array (
-      'pretty_version' => '6.2.1',
-      'version' => '6.2.1.0',
+      'pretty_version' => '6.2.7',
+      'version' => '6.2.7.0',
       'aliases' => 
       array (
       ),
-      'reference' => '3c13804d3e12b2783ca450a4e8a6d759e496d651',
+      'reference' => '6d6d13b4eda222e7bdb9616545aa67efbe8c6cec',
     ),
     'spatie/array-to-xml' => 
     array (
@@ -254,30 +254,30 @@ class InstalledVersions
     ),
     'symfony/deprecation-contracts' => 
     array (
-      'pretty_version' => 'v2.5.0',
-      'version' => '2.5.0.0',
+      'pretty_version' => 'v2.5.2',
+      'version' => '2.5.2.0',
       'aliases' => 
       array (
       ),
-      'reference' => '6f981ee24cf69ee7ce9736146d1c57c2780598a8',
+      'reference' => 'e8b495ea28c1d97b5e0c121748d6f9b53d075c66',
     ),
     'symfony/event-dispatcher' => 
     array (
-      'pretty_version' => 'v5.4.0',
-      'version' => '5.4.0.0',
+      'pretty_version' => 'v5.4.9',
+      'version' => '5.4.9.0',
       'aliases' => 
       array (
       ),
-      'reference' => '27d39ae126352b9fa3be5e196ccf4617897be3eb',
+      'reference' => '8e6ce1cc0279e3ff3c8ff0f43813bc88d21ca1bc',
     ),
     'symfony/event-dispatcher-contracts' => 
     array (
-      'pretty_version' => 'v2.5.0',
-      'version' => '2.5.0.0',
+      'pretty_version' => 'v2.5.2',
+      'version' => '2.5.2.0',
       'aliases' => 
       array (
       ),
-      'reference' => '66bea3b09be61613cd3b4043a65a8ec48cfa6d2a',
+      'reference' => 'f98b54df6ad059855739db6fcbc2d36995283fe1',
     ),
     'symfony/event-dispatcher-implementation' => 
     array (
@@ -288,12 +288,12 @@ class InstalledVersions
     ),
     'symfony/polyfill-php80' => 
     array (
-      'pretty_version' => 'v1.24.0',
-      'version' => '1.24.0.0',
+      'pretty_version' => 'v1.26.0',
+      'version' => '1.26.0.0',
       'aliases' => 
       array (
       ),
-      'reference' => '57b712b08eddb97c762a8caa32c84e037892d2e9',
+      'reference' => 'cfa0ae98841b9e461207c13ab093d76b0fa7bace',
     ),
     'violet/streaming-json-encoder' => 
     array (
diff --git a/vendor/composer/autoload_classmap.php b/vendor/composer/autoload_classmap.php
index 4ebd53fca..dc15c4871 100644
--- a/vendor/composer/autoload_classmap.php
+++ b/vendor/composer/autoload_classmap.php
@@ -8,6 +8,7 @@
 return array(
     'Attribute' => $vendorDir . '/symfony/polyfill-php80/Resources/stubs/Attribute.php',
     'Composer\\InstalledVersions' => $vendorDir . '/composer/InstalledVersions.php',
+    'PhpToken' => $vendorDir . '/symfony/polyfill-php80/Resources/stubs/PhpToken.php',
     'Stringable' => $vendorDir . '/symfony/polyfill-php80/Resources/stubs/Stringable.php',
     'UnhandledMatchError' => $vendorDir . '/symfony/polyfill-php80/Resources/stubs/UnhandledMatchError.php',
     'ValueError' => $vendorDir . '/symfony/polyfill-php80/Resources/stubs/ValueError.php',
diff --git a/vendor/composer/autoload_files.php b/vendor/composer/autoload_files.php
index 378689a32..a7df24103 100644
--- a/vendor/composer/autoload_files.php
+++ b/vendor/composer/autoload_files.php
@@ -11,6 +11,6 @@
     'c964ee0ededf28c96ebd9db5099ef910' => $vendorDir . '/guzzlehttp/promises/src/functions_include.php',
     'a4a119a56e50fbb293281d9a48007e0e' => $vendorDir . '/symfony/polyfill-php80/bootstrap.php',
     '37a3dc5111fe8f707ab4c132ef1dbc62' => $vendorDir . '/guzzlehttp/guzzle/src/functions_include.php',
-    'd767e4fc2dc52fe66584ab8c6684783e' => $vendorDir . '/adbario/php-dot-notation/src/helpers.php',
     '9e4824c5afbdc1482b6025ce3d4dfde8' => $vendorDir . '/league/csv/src/functions_include.php',
+    'd767e4fc2dc52fe66584ab8c6684783e' => $vendorDir . '/adbario/php-dot-notation/src/helpers.php',
 );
diff --git a/vendor/composer/autoload_psr4.php b/vendor/composer/autoload_psr4.php
index 9cbb38735..19f3dc69b 100644
--- a/vendor/composer/autoload_psr4.php
+++ b/vendor/composer/autoload_psr4.php
@@ -13,7 +13,7 @@
     'Spatie\\ArrayToXml\\' => array($vendorDir . '/spatie/array-to-xml/src'),
     'Solarium\\' => array($vendorDir . '/solarium/solarium/src'),
     'Slim\\Csrf\\' => array($vendorDir . '/slim/csrf/src'),
-    'Psr\\Http\\Message\\' => array($vendorDir . '/psr/http-message/src', $vendorDir . '/psr/http-factory/src'),
+    'Psr\\Http\\Message\\' => array($vendorDir . '/psr/http-factory/src', $vendorDir . '/psr/http-message/src'),
     'Psr\\Http\\Client\\' => array($vendorDir . '/psr/http-client/src'),
     'Psr\\EventDispatcher\\' => array($vendorDir . '/psr/event-dispatcher/src'),
     'PHPMailer\\PHPMailer\\' => array($vendorDir . '/phpmailer/phpmailer/src'),
diff --git a/vendor/composer/autoload_static.php b/vendor/composer/autoload_static.php
index 93ba7820b..94cd04ce4 100644
--- a/vendor/composer/autoload_static.php
+++ b/vendor/composer/autoload_static.php
@@ -12,8 +12,8 @@ class ComposerStaticInite028826cd22ea780e9a7bc0793633ac7
         'c964ee0ededf28c96ebd9db5099ef910' => __DIR__ . '/..' . '/guzzlehttp/promises/src/functions_include.php',
         'a4a119a56e50fbb293281d9a48007e0e' => __DIR__ . '/..' . '/symfony/polyfill-php80/bootstrap.php',
         '37a3dc5111fe8f707ab4c132ef1dbc62' => __DIR__ . '/..' . '/guzzlehttp/guzzle/src/functions_include.php',
-        'd767e4fc2dc52fe66584ab8c6684783e' => __DIR__ . '/..' . '/adbario/php-dot-notation/src/helpers.php',
         '9e4824c5afbdc1482b6025ce3d4dfde8' => __DIR__ . '/..' . '/league/csv/src/functions_include.php',
+        'd767e4fc2dc52fe66584ab8c6684783e' => __DIR__ . '/..' . '/adbario/php-dot-notation/src/helpers.php',
     );
 
     public static $prefixLengthsPsr4 = array (
@@ -96,8 +96,8 @@ class ComposerStaticInite028826cd22ea780e9a7bc0793633ac7
         ),
         'Psr\\Http\\Message\\' => 
         array (
-            0 => __DIR__ . '/..' . '/psr/http-message/src',
-            1 => __DIR__ . '/..' . '/psr/http-factory/src',
+            0 => __DIR__ . '/..' . '/psr/http-factory/src',
+            1 => __DIR__ . '/..' . '/psr/http-message/src',
         ),
         'Psr\\Http\\Client\\' => 
         array (
@@ -160,6 +160,7 @@ class ComposerStaticInite028826cd22ea780e9a7bc0793633ac7
     public static $classMap = array (
         'Attribute' => __DIR__ . '/..' . '/symfony/polyfill-php80/Resources/stubs/Attribute.php',
         'Composer\\InstalledVersions' => __DIR__ . '/..' . '/composer/InstalledVersions.php',
+        'PhpToken' => __DIR__ . '/..' . '/symfony/polyfill-php80/Resources/stubs/PhpToken.php',
         'Stringable' => __DIR__ . '/..' . '/symfony/polyfill-php80/Resources/stubs/Stringable.php',
         'UnhandledMatchError' => __DIR__ . '/..' . '/symfony/polyfill-php80/Resources/stubs/UnhandledMatchError.php',
         'ValueError' => __DIR__ . '/..' . '/symfony/polyfill-php80/Resources/stubs/ValueError.php',
diff --git a/vendor/composer/installed.json b/vendor/composer/installed.json
index d282ed98a..243695bd4 100644
--- a/vendor/composer/installed.json
+++ b/vendor/composer/installed.json
@@ -2,28 +2,28 @@
     "packages": [
         {
             "name": "adbario/php-dot-notation",
-            "version": "2.2.0",
-            "version_normalized": "2.2.0.0",
+            "version": "2.5.0",
+            "version_normalized": "2.5.0.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/adbario/php-dot-notation.git",
-                "reference": "eee4fc81296531e6aafba4c2bbccfc5adab1676e"
+                "reference": "081e2cca50c84bfeeea2e3ef9b2c8d206d80ccae"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/adbario/php-dot-notation/zipball/eee4fc81296531e6aafba4c2bbccfc5adab1676e",
-                "reference": "eee4fc81296531e6aafba4c2bbccfc5adab1676e",
+                "url": "https://api.github.com/repos/adbario/php-dot-notation/zipball/081e2cca50c84bfeeea2e3ef9b2c8d206d80ccae",
+                "reference": "081e2cca50c84bfeeea2e3ef9b2c8d206d80ccae",
                 "shasum": ""
             },
             "require": {
                 "ext-json": "*",
-                "php": ">=5.5"
+                "php": "^5.5 || ^7.0 || ^8.0"
             },
             "require-dev": {
-                "phpunit/phpunit": "^4.0|^5.0|^6.0",
-                "squizlabs/php_codesniffer": "^3.0"
+                "phpunit/phpunit": "^4.8|^5.7|^6.6|^7.5|^8.5|^9.5",
+                "squizlabs/php_codesniffer": "^3.6"
             },
-            "time": "2019-01-01T23:59:15+00:00",
+            "time": "2022-10-14T20:31:46+00:00",
             "type": "library",
             "installation-source": "dist",
             "autoload": {
@@ -52,7 +52,7 @@
             ],
             "support": {
                 "issues": "https://github.com/adbario/php-dot-notation/issues",
-                "source": "https://github.com/adbario/php-dot-notation/tree/2.x"
+                "source": "https://github.com/adbario/php-dot-notation/tree/2.5.0"
             },
             "install-path": "../adbario/php-dot-notation"
         },
@@ -118,23 +118,23 @@
         },
         {
             "name": "guzzlehttp/guzzle",
-            "version": "7.4.1",
-            "version_normalized": "7.4.1.0",
+            "version": "7.5.0",
+            "version_normalized": "7.5.0.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/guzzle/guzzle.git",
-                "reference": "ee0a041b1760e6a53d2a39c8c34115adc2af2c79"
+                "reference": "b50a2a1251152e43f6a37f0fa053e730a67d25ba"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/guzzle/guzzle/zipball/ee0a041b1760e6a53d2a39c8c34115adc2af2c79",
-                "reference": "ee0a041b1760e6a53d2a39c8c34115adc2af2c79",
+                "url": "https://api.github.com/repos/guzzle/guzzle/zipball/b50a2a1251152e43f6a37f0fa053e730a67d25ba",
+                "reference": "b50a2a1251152e43f6a37f0fa053e730a67d25ba",
                 "shasum": ""
             },
             "require": {
                 "ext-json": "*",
                 "guzzlehttp/promises": "^1.5",
-                "guzzlehttp/psr7": "^1.8.3 || ^2.1",
+                "guzzlehttp/psr7": "^1.9 || ^2.4",
                 "php": "^7.2.5 || ^8.0",
                 "psr/http-client": "^1.0",
                 "symfony/deprecation-contracts": "^2.2 || ^3.0"
@@ -143,10 +143,10 @@
                 "psr/http-client-implementation": "1.0"
             },
             "require-dev": {
-                "bamarni/composer-bin-plugin": "^1.4.1",
+                "bamarni/composer-bin-plugin": "^1.8.1",
                 "ext-curl": "*",
                 "php-http/client-integration-tests": "^3.0",
-                "phpunit/phpunit": "^8.5.5 || ^9.3.5",
+                "phpunit/phpunit": "^8.5.29 || ^9.5.23",
                 "psr/log": "^1.1 || ^2.0 || ^3.0"
             },
             "suggest": {
@@ -154,21 +154,25 @@
                 "ext-intl": "Required for Internationalized Domain Name (IDN) support",
                 "psr/log": "Required for using the Log middleware"
             },
-            "time": "2021-12-06T18:43:05+00:00",
+            "time": "2022-08-28T15:39:27+00:00",
             "type": "library",
             "extra": {
+                "bamarni-bin": {
+                    "bin-links": true,
+                    "forward-command": false
+                },
                 "branch-alias": {
-                    "dev-master": "7.4-dev"
+                    "dev-master": "7.5-dev"
                 }
             },
             "installation-source": "dist",
             "autoload": {
-                "psr-4": {
-                    "GuzzleHttp\\": "src/"
-                },
                 "files": [
                     "src/functions_include.php"
-                ]
+                ],
+                "psr-4": {
+                    "GuzzleHttp\\": "src/"
+                }
             },
             "notification-url": "https://packagist.org/downloads/",
             "license": [
@@ -225,7 +229,7 @@
             ],
             "support": {
                 "issues": "https://github.com/guzzle/guzzle/issues",
-                "source": "https://github.com/guzzle/guzzle/tree/7.4.1"
+                "source": "https://github.com/guzzle/guzzle/tree/7.5.0"
             },
             "funding": [
                 {
@@ -245,17 +249,17 @@
         },
         {
             "name": "guzzlehttp/promises",
-            "version": "1.5.1",
-            "version_normalized": "1.5.1.0",
+            "version": "1.5.2",
+            "version_normalized": "1.5.2.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/guzzle/promises.git",
-                "reference": "fe752aedc9fd8fcca3fe7ad05d419d32998a06da"
+                "reference": "b94b2807d85443f9719887892882d0329d1e2598"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/guzzle/promises/zipball/fe752aedc9fd8fcca3fe7ad05d419d32998a06da",
-                "reference": "fe752aedc9fd8fcca3fe7ad05d419d32998a06da",
+                "url": "https://api.github.com/repos/guzzle/promises/zipball/b94b2807d85443f9719887892882d0329d1e2598",
+                "reference": "b94b2807d85443f9719887892882d0329d1e2598",
                 "shasum": ""
             },
             "require": {
@@ -264,7 +268,7 @@
             "require-dev": {
                 "symfony/phpunit-bridge": "^4.4 || ^5.1"
             },
-            "time": "2021-10-22T20:56:57+00:00",
+            "time": "2022-08-28T14:55:35+00:00",
             "type": "library",
             "extra": {
                 "branch-alias": {
@@ -273,12 +277,12 @@
             },
             "installation-source": "dist",
             "autoload": {
-                "psr-4": {
-                    "GuzzleHttp\\Promise\\": "src/"
-                },
                 "files": [
                     "src/functions_include.php"
-                ]
+                ],
+                "psr-4": {
+                    "GuzzleHttp\\Promise\\": "src/"
+                }
             },
             "notification-url": "https://packagist.org/downloads/",
             "license": [
@@ -312,7 +316,7 @@
             ],
             "support": {
                 "issues": "https://github.com/guzzle/promises/issues",
-                "source": "https://github.com/guzzle/promises/tree/1.5.1"
+                "source": "https://github.com/guzzle/promises/tree/1.5.2"
             },
             "funding": [
                 {
@@ -332,17 +336,17 @@
         },
         {
             "name": "guzzlehttp/psr7",
-            "version": "2.1.0",
-            "version_normalized": "2.1.0.0",
+            "version": "2.4.1",
+            "version_normalized": "2.4.1.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/guzzle/psr7.git",
-                "reference": "089edd38f5b8abba6cb01567c2a8aaa47cec4c72"
+                "reference": "69568e4293f4fa993f3b0e51c9723e1e17c41379"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/guzzle/psr7/zipball/089edd38f5b8abba6cb01567c2a8aaa47cec4c72",
-                "reference": "089edd38f5b8abba6cb01567c2a8aaa47cec4c72",
+                "url": "https://api.github.com/repos/guzzle/psr7/zipball/69568e4293f4fa993f3b0e51c9723e1e17c41379",
+                "reference": "69568e4293f4fa993f3b0e51c9723e1e17c41379",
                 "shasum": ""
             },
             "require": {
@@ -356,18 +360,22 @@
                 "psr/http-message-implementation": "1.0"
             },
             "require-dev": {
-                "bamarni/composer-bin-plugin": "^1.4.1",
+                "bamarni/composer-bin-plugin": "^1.8.1",
                 "http-interop/http-factory-tests": "^0.9",
-                "phpunit/phpunit": "^8.5.8 || ^9.3.10"
+                "phpunit/phpunit": "^8.5.29 || ^9.5.23"
             },
             "suggest": {
                 "laminas/laminas-httphandlerrunner": "Emit PSR-7 responses"
             },
-            "time": "2021-10-06T17:43:30+00:00",
+            "time": "2022-08-28T14:45:39+00:00",
             "type": "library",
             "extra": {
+                "bamarni-bin": {
+                    "bin-links": true,
+                    "forward-command": false
+                },
                 "branch-alias": {
-                    "dev-master": "2.1-dev"
+                    "dev-master": "2.4-dev"
                 }
             },
             "installation-source": "dist",
@@ -430,7 +438,7 @@
             ],
             "support": {
                 "issues": "https://github.com/guzzle/psr7/issues",
-                "source": "https://github.com/guzzle/psr7/tree/2.1.0"
+                "source": "https://github.com/guzzle/psr7/tree/2.4.1"
             },
             "funding": [
                 {
@@ -450,17 +458,17 @@
         },
         {
             "name": "justinrainbow/json-schema",
-            "version": "5.2.11",
-            "version_normalized": "5.2.11.0",
+            "version": "5.2.12",
+            "version_normalized": "5.2.12.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/justinrainbow/json-schema.git",
-                "reference": "2ab6744b7296ded80f8cc4f9509abbff393399aa"
+                "reference": "ad87d5a5ca981228e0e205c2bc7dfb8e24559b60"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/justinrainbow/json-schema/zipball/2ab6744b7296ded80f8cc4f9509abbff393399aa",
-                "reference": "2ab6744b7296ded80f8cc4f9509abbff393399aa",
+                "url": "https://api.github.com/repos/justinrainbow/json-schema/zipball/ad87d5a5ca981228e0e205c2bc7dfb8e24559b60",
+                "reference": "ad87d5a5ca981228e0e205c2bc7dfb8e24559b60",
                 "shasum": ""
             },
             "require": {
@@ -471,7 +479,7 @@
                 "json-schema/json-schema-test-suite": "1.2.0",
                 "phpunit/phpunit": "^4.8.35"
             },
-            "time": "2021-07-22T09:24:00+00:00",
+            "time": "2022-04-13T08:02:27+00:00",
             "bin": [
                 "bin/validate-json"
             ],
@@ -517,7 +525,7 @@
             ],
             "support": {
                 "issues": "https://github.com/justinrainbow/json-schema/issues",
-                "source": "https://github.com/justinrainbow/json-schema/tree/5.2.11"
+                "source": "https://github.com/justinrainbow/json-schema/tree/5.2.12"
             },
             "install-path": "../justinrainbow/json-schema"
         },
@@ -786,17 +794,17 @@
         },
         {
             "name": "phpmailer/phpmailer",
-            "version": "v6.5.3",
-            "version_normalized": "6.5.3.0",
+            "version": "v6.6.5",
+            "version_normalized": "6.6.5.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/PHPMailer/PHPMailer.git",
-                "reference": "baeb7cde6b60b1286912690ab0693c7789a31e71"
+                "reference": "8b6386d7417526d1ea4da9edb70b8352f7543627"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/PHPMailer/PHPMailer/zipball/baeb7cde6b60b1286912690ab0693c7789a31e71",
-                "reference": "baeb7cde6b60b1286912690ab0693c7789a31e71",
+                "url": "https://api.github.com/repos/PHPMailer/PHPMailer/zipball/8b6386d7417526d1ea4da9edb70b8352f7543627",
+                "reference": "8b6386d7417526d1ea4da9edb70b8352f7543627",
                 "shasum": ""
             },
             "require": {
@@ -808,11 +816,11 @@
             "require-dev": {
                 "dealerdirect/phpcodesniffer-composer-installer": "^0.7.0",
                 "doctrine/annotations": "^1.2",
-                "php-parallel-lint/php-console-highlighter": "^0.5.0",
-                "php-parallel-lint/php-parallel-lint": "^1.3",
+                "php-parallel-lint/php-console-highlighter": "^1.0.0",
+                "php-parallel-lint/php-parallel-lint": "^1.3.2",
                 "phpcompatibility/php-compatibility": "^9.3.5",
                 "roave/security-advisories": "dev-latest",
-                "squizlabs/php_codesniffer": "^3.6.0",
+                "squizlabs/php_codesniffer": "^3.6.2",
                 "yoast/phpunit-polyfills": "^1.0.0"
             },
             "suggest": {
@@ -820,10 +828,10 @@
                 "hayageek/oauth2-yahoo": "Needed for Yahoo XOAUTH2 authentication",
                 "league/oauth2-google": "Needed for Google XOAUTH2 authentication",
                 "psr/log": "For optional PSR-3 debug logging",
-                "stevenmaguire/oauth2-microsoft": "Needed for Microsoft XOAUTH2 authentication",
-                "symfony/polyfill-mbstring": "To support UTF-8 if the Mbstring PHP extension is not enabled (^1.2)"
+                "symfony/polyfill-mbstring": "To support UTF-8 if the Mbstring PHP extension is not enabled (^1.2)",
+                "thenetworg/oauth2-azure": "Needed for Microsoft XOAUTH2 authentication"
             },
-            "time": "2021-11-25T16:34:11+00:00",
+            "time": "2022-10-07T12:23:10+00:00",
             "type": "library",
             "installation-source": "dist",
             "autoload": {
@@ -855,7 +863,7 @@
             "description": "PHPMailer is a full-featured email creation and transfer class for PHP",
             "support": {
                 "issues": "https://github.com/PHPMailer/PHPMailer/issues",
-                "source": "https://github.com/PHPMailer/PHPMailer/tree/v6.5.3"
+                "source": "https://github.com/PHPMailer/PHPMailer/tree/v6.6.5"
             },
             "funding": [
                 {
@@ -1267,26 +1275,27 @@
         },
         {
             "name": "solarium/solarium",
-            "version": "6.2.1",
-            "version_normalized": "6.2.1.0",
+            "version": "6.2.7",
+            "version_normalized": "6.2.7.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/solariumphp/solarium.git",
-                "reference": "3c13804d3e12b2783ca450a4e8a6d759e496d651"
+                "reference": "6d6d13b4eda222e7bdb9616545aa67efbe8c6cec"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/solariumphp/solarium/zipball/3c13804d3e12b2783ca450a4e8a6d759e496d651",
-                "reference": "3c13804d3e12b2783ca450a4e8a6d759e496d651",
+                "url": "https://api.github.com/repos/solariumphp/solarium/zipball/6d6d13b4eda222e7bdb9616545aa67efbe8c6cec",
+                "reference": "6d6d13b4eda222e7bdb9616545aa67efbe8c6cec",
                 "shasum": ""
             },
             "require": {
+                "composer-runtime-api": ">=2.0",
                 "ext-json": "*",
                 "php": "^7.3 || ^8.0",
                 "psr/event-dispatcher": "^1.0",
                 "psr/http-client": "^1.0",
                 "psr/http-factory": "^1.0",
-                "symfony/event-dispatcher-contracts": "^1.0 || ^2.0"
+                "symfony/event-dispatcher-contracts": "^1.0 || ^2.0 || ^3.0"
             },
             "require-dev": {
                 "escapestudios/symfony2-coding-standard": "^3.11",
@@ -1294,13 +1303,13 @@
                 "nyholm/psr7": "^1.2",
                 "php-http/guzzle7-adapter": "^0.1",
                 "phpstan/extension-installer": "^1.0",
-                "phpstan/phpstan": "^0.12",
-                "phpstan/phpstan-phpunit": "^0.12",
+                "phpstan/phpstan": "^1.0",
+                "phpstan/phpstan-phpunit": "^1.0",
                 "phpunit/phpunit": "^9.5",
                 "roave/security-advisories": "dev-master",
-                "symfony/event-dispatcher": "^4.3 || ^5.0"
+                "symfony/event-dispatcher": "^4.3 || ^5.0 || ^6.0"
             },
-            "time": "2021-12-26T10:15:52+00:00",
+            "time": "2022-09-12T09:20:39+00:00",
             "type": "library",
             "installation-source": "dist",
             "autoload": {
@@ -1327,7 +1336,7 @@
             ],
             "support": {
                 "issues": "https://github.com/solariumphp/solarium/issues",
-                "source": "https://github.com/solariumphp/solarium/tree/6.2.1"
+                "source": "https://github.com/solariumphp/solarium/tree/6.2.7"
             },
             "install-path": "../solarium/solarium"
         },
@@ -1390,23 +1399,23 @@
         },
         {
             "name": "symfony/deprecation-contracts",
-            "version": "v2.5.0",
-            "version_normalized": "2.5.0.0",
+            "version": "v2.5.2",
+            "version_normalized": "2.5.2.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/deprecation-contracts.git",
-                "reference": "6f981ee24cf69ee7ce9736146d1c57c2780598a8"
+                "reference": "e8b495ea28c1d97b5e0c121748d6f9b53d075c66"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/deprecation-contracts/zipball/6f981ee24cf69ee7ce9736146d1c57c2780598a8",
-                "reference": "6f981ee24cf69ee7ce9736146d1c57c2780598a8",
+                "url": "https://api.github.com/repos/symfony/deprecation-contracts/zipball/e8b495ea28c1d97b5e0c121748d6f9b53d075c66",
+                "reference": "e8b495ea28c1d97b5e0c121748d6f9b53d075c66",
                 "shasum": ""
             },
             "require": {
                 "php": ">=7.1"
             },
-            "time": "2021-07-12T14:48:14+00:00",
+            "time": "2022-01-02T09:53:40+00:00",
             "type": "library",
             "extra": {
                 "branch-alias": {
@@ -1440,7 +1449,7 @@
             "description": "A generic function and convention to trigger deprecation notices",
             "homepage": "https://symfony.com",
             "support": {
-                "source": "https://github.com/symfony/deprecation-contracts/tree/v2.5.0"
+                "source": "https://github.com/symfony/deprecation-contracts/tree/v2.5.2"
             },
             "funding": [
                 {
@@ -1460,17 +1469,17 @@
         },
         {
             "name": "symfony/event-dispatcher",
-            "version": "v5.4.0",
-            "version_normalized": "5.4.0.0",
+            "version": "v5.4.9",
+            "version_normalized": "5.4.9.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/event-dispatcher.git",
-                "reference": "27d39ae126352b9fa3be5e196ccf4617897be3eb"
+                "reference": "8e6ce1cc0279e3ff3c8ff0f43813bc88d21ca1bc"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/event-dispatcher/zipball/27d39ae126352b9fa3be5e196ccf4617897be3eb",
-                "reference": "27d39ae126352b9fa3be5e196ccf4617897be3eb",
+                "url": "https://api.github.com/repos/symfony/event-dispatcher/zipball/8e6ce1cc0279e3ff3c8ff0f43813bc88d21ca1bc",
+                "reference": "8e6ce1cc0279e3ff3c8ff0f43813bc88d21ca1bc",
                 "shasum": ""
             },
             "require": {
@@ -1500,7 +1509,7 @@
                 "symfony/dependency-injection": "",
                 "symfony/http-kernel": ""
             },
-            "time": "2021-11-23T10:19:22+00:00",
+            "time": "2022-05-05T16:45:39+00:00",
             "type": "library",
             "installation-source": "dist",
             "autoload": {
@@ -1528,7 +1537,7 @@
             "description": "Provides tools that allow your application components to communicate with each other by dispatching events and listening to them",
             "homepage": "https://symfony.com",
             "support": {
-                "source": "https://github.com/symfony/event-dispatcher/tree/v5.4.0"
+                "source": "https://github.com/symfony/event-dispatcher/tree/v5.4.9"
             },
             "funding": [
                 {
@@ -1548,17 +1557,17 @@
         },
         {
             "name": "symfony/event-dispatcher-contracts",
-            "version": "v2.5.0",
-            "version_normalized": "2.5.0.0",
+            "version": "v2.5.2",
+            "version_normalized": "2.5.2.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/event-dispatcher-contracts.git",
-                "reference": "66bea3b09be61613cd3b4043a65a8ec48cfa6d2a"
+                "reference": "f98b54df6ad059855739db6fcbc2d36995283fe1"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/event-dispatcher-contracts/zipball/66bea3b09be61613cd3b4043a65a8ec48cfa6d2a",
-                "reference": "66bea3b09be61613cd3b4043a65a8ec48cfa6d2a",
+                "url": "https://api.github.com/repos/symfony/event-dispatcher-contracts/zipball/f98b54df6ad059855739db6fcbc2d36995283fe1",
+                "reference": "f98b54df6ad059855739db6fcbc2d36995283fe1",
                 "shasum": ""
             },
             "require": {
@@ -1568,7 +1577,7 @@
             "suggest": {
                 "symfony/event-dispatcher-implementation": ""
             },
-            "time": "2021-07-12T14:48:14+00:00",
+            "time": "2022-01-02T09:53:40+00:00",
             "type": "library",
             "extra": {
                 "branch-alias": {
@@ -1610,7 +1619,7 @@
                 "standards"
             ],
             "support": {
-                "source": "https://github.com/symfony/event-dispatcher-contracts/tree/v2.5.0"
+                "source": "https://github.com/symfony/event-dispatcher-contracts/tree/v2.5.2"
             },
             "funding": [
                 {
@@ -1630,27 +1639,27 @@
         },
         {
             "name": "symfony/polyfill-php80",
-            "version": "v1.24.0",
-            "version_normalized": "1.24.0.0",
+            "version": "v1.26.0",
+            "version_normalized": "1.26.0.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/polyfill-php80.git",
-                "reference": "57b712b08eddb97c762a8caa32c84e037892d2e9"
+                "reference": "cfa0ae98841b9e461207c13ab093d76b0fa7bace"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/polyfill-php80/zipball/57b712b08eddb97c762a8caa32c84e037892d2e9",
-                "reference": "57b712b08eddb97c762a8caa32c84e037892d2e9",
+                "url": "https://api.github.com/repos/symfony/polyfill-php80/zipball/cfa0ae98841b9e461207c13ab093d76b0fa7bace",
+                "reference": "cfa0ae98841b9e461207c13ab093d76b0fa7bace",
                 "shasum": ""
             },
             "require": {
                 "php": ">=7.1"
             },
-            "time": "2021-09-13T13:58:33+00:00",
+            "time": "2022-05-10T07:21:04+00:00",
             "type": "library",
             "extra": {
                 "branch-alias": {
-                    "dev-main": "1.23-dev"
+                    "dev-main": "1.26-dev"
                 },
                 "thanks": {
                     "name": "symfony/polyfill",
@@ -1659,12 +1668,12 @@
             },
             "installation-source": "dist",
             "autoload": {
-                "psr-4": {
-                    "Symfony\\Polyfill\\Php80\\": ""
-                },
                 "files": [
                     "bootstrap.php"
                 ],
+                "psr-4": {
+                    "Symfony\\Polyfill\\Php80\\": ""
+                },
                 "classmap": [
                     "Resources/stubs"
                 ]
@@ -1696,7 +1705,7 @@
                 "shim"
             ],
             "support": {
-                "source": "https://github.com/symfony/polyfill-php80/tree/v1.24.0"
+                "source": "https://github.com/symfony/polyfill-php80/tree/v1.26.0"
             },
             "funding": [
                 {
diff --git a/vendor/composer/installed.php b/vendor/composer/installed.php
index 414304fb4..b2fae72a3 100644
--- a/vendor/composer/installed.php
+++ b/vendor/composer/installed.php
@@ -6,7 +6,7 @@
     'aliases' => 
     array (
     ),
-    'reference' => '55c2e6b289ede299cfd128707c43685c81d030db',
+    'reference' => '2c94715a6950e813173148eff0ad35a208e23893',
     'name' => '__root__',
   ),
   'versions' => 
@@ -18,16 +18,16 @@
       'aliases' => 
       array (
       ),
-      'reference' => '55c2e6b289ede299cfd128707c43685c81d030db',
+      'reference' => '2c94715a6950e813173148eff0ad35a208e23893',
     ),
     'adbario/php-dot-notation' => 
     array (
-      'pretty_version' => '2.2.0',
-      'version' => '2.2.0.0',
+      'pretty_version' => '2.5.0',
+      'version' => '2.5.0.0',
       'aliases' => 
       array (
       ),
-      'reference' => 'eee4fc81296531e6aafba4c2bbccfc5adab1676e',
+      'reference' => '081e2cca50c84bfeeea2e3ef9b2c8d206d80ccae',
     ),
     'firebase/php-jwt' => 
     array (
@@ -40,39 +40,39 @@
     ),
     'guzzlehttp/guzzle' => 
     array (
-      'pretty_version' => '7.4.1',
-      'version' => '7.4.1.0',
+      'pretty_version' => '7.5.0',
+      'version' => '7.5.0.0',
       'aliases' => 
       array (
       ),
-      'reference' => 'ee0a041b1760e6a53d2a39c8c34115adc2af2c79',
+      'reference' => 'b50a2a1251152e43f6a37f0fa053e730a67d25ba',
     ),
     'guzzlehttp/promises' => 
     array (
-      'pretty_version' => '1.5.1',
-      'version' => '1.5.1.0',
+      'pretty_version' => '1.5.2',
+      'version' => '1.5.2.0',
       'aliases' => 
       array (
       ),
-      'reference' => 'fe752aedc9fd8fcca3fe7ad05d419d32998a06da',
+      'reference' => 'b94b2807d85443f9719887892882d0329d1e2598',
     ),
     'guzzlehttp/psr7' => 
     array (
-      'pretty_version' => '2.1.0',
-      'version' => '2.1.0.0',
+      'pretty_version' => '2.4.1',
+      'version' => '2.4.1.0',
       'aliases' => 
       array (
       ),
-      'reference' => '089edd38f5b8abba6cb01567c2a8aaa47cec4c72',
+      'reference' => '69568e4293f4fa993f3b0e51c9723e1e17c41379',
     ),
     'justinrainbow/json-schema' => 
     array (
-      'pretty_version' => '5.2.11',
-      'version' => '5.2.11.0',
+      'pretty_version' => '5.2.12',
+      'version' => '5.2.12.0',
       'aliases' => 
       array (
       ),
-      'reference' => '2ab6744b7296ded80f8cc4f9509abbff393399aa',
+      'reference' => 'ad87d5a5ca981228e0e205c2bc7dfb8e24559b60',
     ),
     'laminas/laminas-permissions-acl' => 
     array (
@@ -112,12 +112,12 @@
     ),
     'phpmailer/phpmailer' => 
     array (
-      'pretty_version' => 'v6.5.3',
-      'version' => '6.5.3.0',
+      'pretty_version' => 'v6.6.5',
+      'version' => '6.6.5.0',
       'aliases' => 
       array (
       ),
-      'reference' => 'baeb7cde6b60b1286912690ab0693c7789a31e71',
+      'reference' => '8b6386d7417526d1ea4da9edb70b8352f7543627',
     ),
     'psr/event-dispatcher' => 
     array (
@@ -212,12 +212,12 @@
     ),
     'solarium/solarium' => 
     array (
-      'pretty_version' => '6.2.1',
-      'version' => '6.2.1.0',
+      'pretty_version' => '6.2.7',
+      'version' => '6.2.7.0',
       'aliases' => 
       array (
       ),
-      'reference' => '3c13804d3e12b2783ca450a4e8a6d759e496d651',
+      'reference' => '6d6d13b4eda222e7bdb9616545aa67efbe8c6cec',
     ),
     'spatie/array-to-xml' => 
     array (
@@ -230,30 +230,30 @@
     ),
     'symfony/deprecation-contracts' => 
     array (
-      'pretty_version' => 'v2.5.0',
-      'version' => '2.5.0.0',
+      'pretty_version' => 'v2.5.2',
+      'version' => '2.5.2.0',
       'aliases' => 
       array (
       ),
-      'reference' => '6f981ee24cf69ee7ce9736146d1c57c2780598a8',
+      'reference' => 'e8b495ea28c1d97b5e0c121748d6f9b53d075c66',
     ),
     'symfony/event-dispatcher' => 
     array (
-      'pretty_version' => 'v5.4.0',
-      'version' => '5.4.0.0',
+      'pretty_version' => 'v5.4.9',
+      'version' => '5.4.9.0',
       'aliases' => 
       array (
       ),
-      'reference' => '27d39ae126352b9fa3be5e196ccf4617897be3eb',
+      'reference' => '8e6ce1cc0279e3ff3c8ff0f43813bc88d21ca1bc',
     ),
     'symfony/event-dispatcher-contracts' => 
     array (
-      'pretty_version' => 'v2.5.0',
-      'version' => '2.5.0.0',
+      'pretty_version' => 'v2.5.2',
+      'version' => '2.5.2.0',
       'aliases' => 
       array (
       ),
-      'reference' => '66bea3b09be61613cd3b4043a65a8ec48cfa6d2a',
+      'reference' => 'f98b54df6ad059855739db6fcbc2d36995283fe1',
     ),
     'symfony/event-dispatcher-implementation' => 
     array (
@@ -264,12 +264,12 @@
     ),
     'symfony/polyfill-php80' => 
     array (
-      'pretty_version' => 'v1.24.0',
-      'version' => '1.24.0.0',
+      'pretty_version' => 'v1.26.0',
+      'version' => '1.26.0.0',
       'aliases' => 
       array (
       ),
-      'reference' => '57b712b08eddb97c762a8caa32c84e037892d2e9',
+      'reference' => 'cfa0ae98841b9e461207c13ab093d76b0fa7bace',
     ),
     'violet/streaming-json-encoder' => 
     array (
diff --git a/vendor/guzzlehttp/guzzle/CHANGELOG.md b/vendor/guzzlehttp/guzzle/CHANGELOG.md
index b278efca9..12949ba67 100644
--- a/vendor/guzzlehttp/guzzle/CHANGELOG.md
+++ b/vendor/guzzlehttp/guzzle/CHANGELOG.md
@@ -2,6 +2,35 @@
 
 Please refer to [UPGRADING](UPGRADING.md) guide for upgrading to a major version.
 
+## 7.5.0 - 2022-08-28
+
+### Added
+
+- Support PHP 8.2
+- Add request to delay closure params
+
+## 7.4.5 - 2022-06-20
+
+* Fix change in port should be considered a change in origin
+* Fix `CURLOPT_HTTPAUTH` option not cleared on change of origin
+
+## 7.4.4 - 2022-06-09
+
+* Fix failure to strip Authorization header on HTTP downgrade
+* Fix failure to strip the Cookie header on change in host or HTTP downgrade
+
+## 7.4.3 - 2022-05-25
+
+* Fix cross-domain cookie leakage
+
+## 7.4.2 - 2022-03-20
+
+### Fixed
+
+- Remove curl auth on cross-domain redirects to align with the Authorization HTTP header
+- Reject non-HTTP schemes in StreamHandler
+- Set a default ssl.peer_name context in StreamHandler to allow `force_ip_resolve`
+
 ## 7.4.1 - 2021-12-06
 
 ### Changed
diff --git a/vendor/guzzlehttp/guzzle/README.md b/vendor/guzzlehttp/guzzle/README.md
index 0025aa7a1..f287fa98d 100644
--- a/vendor/guzzlehttp/guzzle/README.md
+++ b/vendor/guzzlehttp/guzzle/README.md
@@ -42,9 +42,9 @@ $promise->wait();
 
 We use GitHub issues only to discuss bugs and new features. For support please refer to:
 
-- [Documentation](http://guzzlephp.org/)
-- [Stack Overflow](http://stackoverflow.com/questions/tagged/guzzle)
-- [#guzzle](https://app.slack.com/client/T0D2S9JCT/CE6UAAKL4) channel on [PHP-HTTP Slack](http://slack.httplug.io/)
+- [Documentation](https://docs.guzzlephp.org)
+- [Stack Overflow](https://stackoverflow.com/questions/tagged/guzzle)
+- [#guzzle](https://app.slack.com/client/T0D2S9JCT/CE6UAAKL4) channel on [PHP-HTTP Slack](https://slack.httplug.io/)
 - [Gitter](https://gitter.im/guzzle/guzzle)
 
 
@@ -60,23 +60,23 @@ composer require guzzlehttp/guzzle
 
 ## Version Guidance
 
-| Version | Status     | Packagist           | Namespace    | Repo                | Docs                | PSR-7 | PHP Version |
-|---------|------------|---------------------|--------------|---------------------|---------------------|-------|-------------|
-| 3.x     | EOL        | `guzzle/guzzle`     | `Guzzle`     | [v3][guzzle-3-repo] | [v3][guzzle-3-docs] | No    | >= 5.3.3    |
-| 4.x     | EOL        | `guzzlehttp/guzzle` | `GuzzleHttp` | [v4][guzzle-4-repo] | N/A                 | No    | >= 5.4      |
-| 5.x     | EOL        | `guzzlehttp/guzzle` | `GuzzleHttp` | [v5][guzzle-5-repo] | [v5][guzzle-5-docs] | No    | >= 5.4      |
-| 6.x     | Security fixes | `guzzlehttp/guzzle` | `GuzzleHttp` | [v6][guzzle-6-repo] | [v6][guzzle-6-docs] | Yes   | >= 5.5      |
-| 7.x     | Latest     | `guzzlehttp/guzzle` | `GuzzleHttp` | [v7][guzzle-7-repo] | [v7][guzzle-7-docs] | Yes   | >= 7.2      |
+| Version | Status         | Packagist           | Namespace    | Repo                | Docs                | PSR-7 | PHP Version  |
+|---------|----------------|---------------------|--------------|---------------------|---------------------|-------|--------------|
+| 3.x     | EOL            | `guzzle/guzzle`     | `Guzzle`     | [v3][guzzle-3-repo] | [v3][guzzle-3-docs] | No    | >=5.3.3,<7.0 |
+| 4.x     | EOL            | `guzzlehttp/guzzle` | `GuzzleHttp` | [v4][guzzle-4-repo] | N/A                 | No    | >=5.4,<7.0   |
+| 5.x     | EOL            | `guzzlehttp/guzzle` | `GuzzleHttp` | [v5][guzzle-5-repo] | [v5][guzzle-5-docs] | No    | >=5.4,<7.4   |
+| 6.x     | Security fixes | `guzzlehttp/guzzle` | `GuzzleHttp` | [v6][guzzle-6-repo] | [v6][guzzle-6-docs] | Yes   | >=5.5,<8.0   |
+| 7.x     | Latest         | `guzzlehttp/guzzle` | `GuzzleHttp` | [v7][guzzle-7-repo] | [v7][guzzle-7-docs] | Yes   | >=7.2.5,<8.2 |
 
 [guzzle-3-repo]: https://github.com/guzzle/guzzle3
 [guzzle-4-repo]: https://github.com/guzzle/guzzle/tree/4.x
 [guzzle-5-repo]: https://github.com/guzzle/guzzle/tree/5.3
 [guzzle-6-repo]: https://github.com/guzzle/guzzle/tree/6.5
 [guzzle-7-repo]: https://github.com/guzzle/guzzle
-[guzzle-3-docs]: http://guzzle3.readthedocs.org
-[guzzle-5-docs]: http://docs.guzzlephp.org/en/5.3/
-[guzzle-6-docs]: http://docs.guzzlephp.org/en/6.5/
-[guzzle-7-docs]: http://docs.guzzlephp.org/en/latest/
+[guzzle-3-docs]: https://guzzle3.readthedocs.io/
+[guzzle-5-docs]: https://docs.guzzlephp.org/en/5.3/
+[guzzle-6-docs]: https://docs.guzzlephp.org/en/6.5/
+[guzzle-7-docs]: https://docs.guzzlephp.org/en/latest/
 
 
 ## Security
diff --git a/vendor/guzzlehttp/guzzle/composer.json b/vendor/guzzlehttp/guzzle/composer.json
index 2549f78b2..f369ce67e 100644
--- a/vendor/guzzlehttp/guzzle/composer.json
+++ b/vendor/guzzlehttp/guzzle/composer.json
@@ -54,7 +54,7 @@
         "php": "^7.2.5 || ^8.0",
         "ext-json": "*",
         "guzzlehttp/promises": "^1.5",
-        "guzzlehttp/psr7": "^1.8.3 || ^2.1",
+        "guzzlehttp/psr7": "^1.9 || ^2.4",
         "psr/http-client": "^1.0",
         "symfony/deprecation-contracts": "^2.2 || ^3.0"
     },
@@ -63,9 +63,9 @@
     },
     "require-dev": {
         "ext-curl": "*",
-        "bamarni/composer-bin-plugin": "^1.4.1",
+        "bamarni/composer-bin-plugin": "^1.8.1",
         "php-http/client-integration-tests": "^3.0",
-        "phpunit/phpunit": "^8.5.5 || ^9.3.5",
+        "phpunit/phpunit": "^8.5.29 || ^9.5.23",
         "psr/log": "^1.1 || ^2.0 || ^3.0"
     },
     "suggest": {
@@ -74,12 +74,19 @@
         "psr/log": "Required for using the Log middleware"
     },
     "config": {
+        "allow-plugins": {
+            "bamarni/composer-bin-plugin": true
+        },
         "preferred-install": "dist",
         "sort-packages": true
     },
     "extra": {
+        "bamarni-bin": {
+            "bin-links": true,
+            "forward-command": false
+        },
         "branch-alias": {
-            "dev-master": "7.4-dev"
+            "dev-master": "7.5-dev"
         }
     },
     "autoload": {
diff --git a/vendor/guzzlehttp/guzzle/src/Cookie/CookieJar.php b/vendor/guzzlehttp/guzzle/src/Cookie/CookieJar.php
index d6757c654..9985a9814 100644
--- a/vendor/guzzlehttp/guzzle/src/Cookie/CookieJar.php
+++ b/vendor/guzzlehttp/guzzle/src/Cookie/CookieJar.php
@@ -178,7 +178,6 @@ public function setCookie(SetCookie $cookie): bool
 
         // Resolve conflicts with previously set cookies
         foreach ($this->cookies as $i => $c) {
-
             // Two cookies are identical, when their path, and domain are
             // identical.
             if ($c->getPath() != $cookie->getPath() ||
@@ -241,6 +240,11 @@ public function extractCookies(RequestInterface $request, ResponseInterface $res
                 if (0 !== \strpos($sc->getPath(), '/')) {
                     $sc->setPath($this->getCookiePathFromRequest($request));
                 }
+                if (!$sc->matchesDomain($request->getUri()->getHost())) {
+                    continue;
+                }
+                // Note: At this point `$sc->getDomain()` being a public suffix should
+                // be rejected, but we don't want to pull in the full PSL dependency.
                 $this->setCookie($sc);
             }
         }
diff --git a/vendor/guzzlehttp/guzzle/src/Cookie/SetCookie.php b/vendor/guzzlehttp/guzzle/src/Cookie/SetCookie.php
index 7c04034d2..a613c77bf 100644
--- a/vendor/guzzlehttp/guzzle/src/Cookie/SetCookie.php
+++ b/vendor/guzzlehttp/guzzle/src/Cookie/SetCookie.php
@@ -379,10 +379,12 @@ public function matchesDomain(string $domain): bool
 
         // Remove the leading '.' as per spec in RFC 6265.
         // https://tools.ietf.org/html/rfc6265#section-5.2.3
-        $cookieDomain = \ltrim($cookieDomain, '.');
+        $cookieDomain = \ltrim(\strtolower($cookieDomain), '.');
+
+        $domain = \strtolower($domain);
 
         // Domain not set or exact match.
-        if (!$cookieDomain || !\strcasecmp($domain, $cookieDomain)) {
+        if ('' === $cookieDomain || $domain === $cookieDomain) {
             return true;
         }
 
diff --git a/vendor/guzzlehttp/guzzle/src/Handler/CurlMultiHandler.php b/vendor/guzzlehttp/guzzle/src/Handler/CurlMultiHandler.php
index 9e2e4703e..4356d0247 100644
--- a/vendor/guzzlehttp/guzzle/src/Handler/CurlMultiHandler.php
+++ b/vendor/guzzlehttp/guzzle/src/Handler/CurlMultiHandler.php
@@ -19,6 +19,7 @@
  *
  * @final
  */
+#[\AllowDynamicProperties]
 class CurlMultiHandler
 {
     /**
@@ -32,9 +33,9 @@ class CurlMultiHandler
     private $selectTimeout;
 
     /**
-     * @var resource|\CurlMultiHandle|null the currently executing resource in `curl_multi_exec`.
+     * @var int Will be higher than 0 when `curl_multi_exec` is still running.
      */
-    private $active;
+    private $active = 0;
 
     /**
      * @var array Request entry handles, indexed by handle id in `addRequest`.
diff --git a/vendor/guzzlehttp/guzzle/src/Handler/StreamHandler.php b/vendor/guzzlehttp/guzzle/src/Handler/StreamHandler.php
index 70c646be5..543f825a2 100644
--- a/vendor/guzzlehttp/guzzle/src/Handler/StreamHandler.php
+++ b/vendor/guzzlehttp/guzzle/src/Handler/StreamHandler.php
@@ -266,6 +266,10 @@ private function createStream(RequestInterface $request, array $options)
             $methods = \array_flip(\get_class_methods(__CLASS__));
         }
 
+        if (!\in_array($request->getUri()->getScheme(), ['http', 'https'])) {
+            throw new RequestException(\sprintf("The scheme '%s' is not supported.", $request->getUri()->getScheme()), $request);
+        }
+
         // HTTP/1.1 streams using the PHP stream wrapper require a
         // Connection: close header
         if ($request->getProtocolVersion() == '1.1'
@@ -318,7 +322,7 @@ static function () use ($context, $params) {
         return $this->createResource(
             function () use ($uri, &$http_response_header, $contextResource, $context, $options, $request) {
                 $resource = @\fopen((string) $uri, 'r', false, $contextResource);
-                $this->lastHeaders = $http_response_header;
+                $this->lastHeaders = $http_response_header ?? [];
 
                 if (false === $resource) {
                     throw new ConnectException(sprintf('Connection refused for URI %s', $uri), $request, null, $context);
@@ -377,6 +381,9 @@ private function getDefaultContext(RequestInterface $request): array
                 'ignore_errors'    => true,
                 'follow_location'  => 0,
             ],
+            'ssl' => [
+                'peer_name' => $request->getUri()->getHost(),
+            ],
         ];
 
         $body = (string) $request->getBody();
diff --git a/vendor/guzzlehttp/guzzle/src/RedirectMiddleware.php b/vendor/guzzlehttp/guzzle/src/RedirectMiddleware.php
index 1dd38614f..f67d448be 100644
--- a/vendor/guzzlehttp/guzzle/src/RedirectMiddleware.php
+++ b/vendor/guzzlehttp/guzzle/src/RedirectMiddleware.php
@@ -88,6 +88,14 @@ public function checkRedirect(RequestInterface $request, array $options, Respons
         $this->guardMax($request, $response, $options);
         $nextRequest = $this->modifyRequest($request, $options, $response);
 
+        // If authorization is handled by curl, unset it if URI is cross-origin.
+        if (Psr7\UriComparator::isCrossOrigin($request->getUri(), $nextRequest->getUri()) && defined('\CURLOPT_HTTPAUTH')) {
+            unset(
+                $options['curl'][\CURLOPT_HTTPAUTH],
+                $options['curl'][\CURLOPT_USERPWD]
+            );
+        }
+
         if (isset($options['allow_redirects']['on_redirect'])) {
             ($options['allow_redirects']['on_redirect'])(
                 $request,
@@ -132,7 +140,7 @@ static function (ResponseInterface $response) use ($uri, $statusCode) {
     }
 
     /**
-     * Check for too many redirects
+     * Check for too many redirects.
      *
      * @throws TooManyRedirectsException Too many redirects.
      */
@@ -168,7 +176,7 @@ public function modifyRequest(RequestInterface $request, array $options, Respons
             $modify['body'] = '';
         }
 
-        $uri = $this->redirectUri($request, $response, $protocols);
+        $uri = self::redirectUri($request, $response, $protocols);
         if (isset($options['idn_conversion']) && ($options['idn_conversion'] !== false)) {
             $idnOptions = ($options['idn_conversion'] === true) ? \IDNA_DEFAULT : $options['idn_conversion'];
             $uri = Utils::idnUriConvert($uri, $idnOptions);
@@ -188,19 +196,23 @@ public function modifyRequest(RequestInterface $request, array $options, Respons
             $modify['remove_headers'][] = 'Referer';
         }
 
-        // Remove Authorization header if host is different.
-        if ($request->getUri()->getHost() !== $modify['uri']->getHost()) {
+        // Remove Authorization and Cookie headers if URI is cross-origin.
+        if (Psr7\UriComparator::isCrossOrigin($request->getUri(), $modify['uri'])) {
             $modify['remove_headers'][] = 'Authorization';
+            $modify['remove_headers'][] = 'Cookie';
         }
 
         return Psr7\Utils::modifyRequest($request, $modify);
     }
 
     /**
-     * Set the appropriate URL on the request based on the location header
+     * Set the appropriate URL on the request based on the location header.
      */
-    private function redirectUri(RequestInterface $request, ResponseInterface $response, array $protocols): UriInterface
-    {
+    private static function redirectUri(
+        RequestInterface $request,
+        ResponseInterface $response,
+        array $protocols
+    ): UriInterface {
         $location = Psr7\UriResolver::resolve(
             $request->getUri(),
             new Psr7\Uri($response->getHeaderLine('Location'))
diff --git a/vendor/guzzlehttp/guzzle/src/RetryMiddleware.php b/vendor/guzzlehttp/guzzle/src/RetryMiddleware.php
index c210fc47b..0236a9d54 100644
--- a/vendor/guzzlehttp/guzzle/src/RetryMiddleware.php
+++ b/vendor/guzzlehttp/guzzle/src/RetryMiddleware.php
@@ -109,7 +109,7 @@ private function onRejected(RequestInterface $req, array $options): callable
 
     private function doRetry(RequestInterface $request, array $options, ResponseInterface $response = null): PromiseInterface
     {
-        $options['delay'] = ($this->delay)(++$options['retries'], $response);
+        $options['delay'] = ($this->delay)(++$options['retries'], $response, $request);
 
         return $this($request, $options);
     }
diff --git a/vendor/guzzlehttp/guzzle/src/Utils.php b/vendor/guzzlehttp/guzzle/src/Utils.php
index 91591da2e..e355f3212 100644
--- a/vendor/guzzlehttp/guzzle/src/Utils.php
+++ b/vendor/guzzlehttp/guzzle/src/Utils.php
@@ -86,12 +86,15 @@ public static function debugResource($value = null)
     public static function chooseHandler(): callable
     {
         $handler = null;
-        if (\function_exists('curl_multi_exec') && \function_exists('curl_exec')) {
-            $handler = Proxy::wrapSync(new CurlMultiHandler(), new CurlHandler());
-        } elseif (\function_exists('curl_exec')) {
-            $handler = new CurlHandler();
-        } elseif (\function_exists('curl_multi_exec')) {
-            $handler = new CurlMultiHandler();
+
+        if (\defined('CURLOPT_CUSTOMREQUEST')) {
+            if (\function_exists('curl_multi_exec') && \function_exists('curl_exec')) {
+                $handler = Proxy::wrapSync(new CurlMultiHandler(), new CurlHandler());
+            } elseif (\function_exists('curl_exec')) {
+                $handler = new CurlHandler();
+            } elseif (\function_exists('curl_multi_exec')) {
+                $handler = new CurlMultiHandler();
+            }
         }
 
         if (\ini_get('allow_url_fopen')) {
diff --git a/vendor/guzzlehttp/promises/CHANGELOG.md b/vendor/guzzlehttp/promises/CHANGELOG.md
index 235e13bc7..253282eb1 100644
--- a/vendor/guzzlehttp/promises/CHANGELOG.md
+++ b/vendor/guzzlehttp/promises/CHANGELOG.md
@@ -1,5 +1,11 @@
 # CHANGELOG
 
+## 1.5.2 - 2022-08-07
+
+### Changed
+
+- Officially support PHP 8.2
+
 ## 1.5.1 - 2021-10-22
 
 ### Fixed
@@ -12,10 +18,11 @@
 ### Changed
 
 - Call handler when waiting on fulfilled/rejected Promise
+- Officially support PHP 8.1
 
 ### Fixed
 
-- Fix manually settle promises generated with Utils::task
+- Fix manually settle promises generated with `Utils::task`
 
 ## 1.4.1 - 2021-02-18
 
diff --git a/vendor/guzzlehttp/promises/Makefile b/vendor/guzzlehttp/promises/Makefile
deleted file mode 100644
index 8d5b3ef95..000000000
--- a/vendor/guzzlehttp/promises/Makefile
+++ /dev/null
@@ -1,13 +0,0 @@
-all: clean test
-
-test:
-	vendor/bin/phpunit
-
-coverage:
-	vendor/bin/phpunit --coverage-html=artifacts/coverage
-
-view-coverage:
-	open artifacts/coverage/index.html
-
-clean:
-	rm -rf artifacts/*
diff --git a/vendor/guzzlehttp/promises/README.md b/vendor/guzzlehttp/promises/README.md
index c175fec76..1ea667ab9 100644
--- a/vendor/guzzlehttp/promises/README.md
+++ b/vendor/guzzlehttp/promises/README.md
@@ -17,7 +17,7 @@ for a general introduction to promises.
 - [Implementation notes](#implementation-notes)
 
 
-# Features
+## Features
 
 - [Promises/A+](https://promisesaplus.com/) implementation.
 - Promise resolution and chaining is handled iteratively, allowing for
@@ -29,15 +29,14 @@ for a general introduction to promises.
   `GuzzleHttp\Promise\Coroutine::of()`.
 
 
-# Quick start
+## Quick Start
 
 A *promise* represents the eventual result of an asynchronous operation. The
 primary way of interacting with a promise is through its `then` method, which
 registers callbacks to receive either a promise's eventual value or the reason
 why the promise cannot be fulfilled.
 
-
-## Callbacks
+### Callbacks
 
 Callbacks are registered with the `then` method by providing an optional 
 `$onFulfilled` followed by an optional `$onRejected` function.
@@ -60,12 +59,11 @@ $promise->then(
 ```
 
 *Resolving* a promise means that you either fulfill a promise with a *value* or
-reject a promise with a *reason*. Resolving a promises triggers callbacks
-registered with the promises's `then` method. These callbacks are triggered
+reject a promise with a *reason*. Resolving a promise triggers callbacks
+registered with the promise's `then` method. These callbacks are triggered
 only once and in the order in which they were added.
 
-
-## Resolving a promise
+### Resolving a Promise
 
 Promises are fulfilled using the `resolve($value)` method. Resolving a promise
 with any value other than a `GuzzleHttp\Promise\RejectedPromise` will trigger
@@ -92,8 +90,7 @@ $promise
 $promise->resolve('reader.');
 ```
 
-
-## Promise forwarding
+### Promise Forwarding
 
 Promises can be chained one after the other. Each then in the chain is a new
 promise. The return value of a promise is what's forwarded to the next
@@ -123,7 +120,7 @@ $promise->resolve('A');
 $nextPromise->resolve('B');
 ```
 
-## Promise rejection
+### Promise Rejection
 
 When a promise is rejected, the `$onRejected` callbacks are invoked with the
 rejection reason.
@@ -140,7 +137,7 @@ $promise->reject('Error!');
 // Outputs "Error!"
 ```
 
-## Rejection forwarding
+### Rejection Forwarding
 
 If an exception is thrown in an `$onRejected` callback, subsequent
 `$onRejected` callbacks are invoked with the thrown exception as the reason.
@@ -195,7 +192,8 @@ $promise
 $promise->reject('Error!');
 ```
 
-# Synchronous wait
+
+## Synchronous Wait
 
 You can synchronously force promises to complete using a promise's `wait`
 method. When creating a promise, you can provide a wait function that is used
@@ -247,8 +245,7 @@ $promise->wait();
 
 > PHP Fatal error:  Uncaught exception 'GuzzleHttp\Promise\RejectionException' with message 'The promise was rejected with value: foo'
 
-
-## Unwrapping a promise
+### Unwrapping a Promise
 
 When synchronously waiting on a promise, you are joining the state of the
 promise into the current state of execution (i.e., return the value of the
@@ -275,7 +272,7 @@ wait function will be the value delivered to promise B.
 **Note**: when you do not unwrap the promise, no value is returned.
 
 
-# Cancellation
+## Cancellation
 
 You can cancel a promise that has not yet been fulfilled using the `cancel()`
 method of a promise. When creating a promise you can provide an optional
@@ -283,10 +280,9 @@ cancel function that when invoked cancels the action of computing a resolution
 of the promise.
 
 
-# API
+## API
 
-
-## Promise
+### Promise
 
 When creating a promise object, you can provide an optional `$waitFn` and
 `$cancelFn`. `$waitFn` is a function that is invoked with no arguments and is
@@ -349,7 +345,7 @@ A promise has the following methods:
   Rejects the promise with the given `$reason`.
 
 
-## FulfilledPromise
+### FulfilledPromise
 
 A fulfilled promise can be created to represent a promise that has been
 fulfilled.
@@ -366,7 +362,7 @@ $promise->then(function ($value) {
 ```
 
 
-## RejectedPromise
+### RejectedPromise
 
 A rejected promise can be created to represent a promise that has been
 rejected.
@@ -383,7 +379,7 @@ $promise->then(null, function ($reason) {
 ```
 
 
-# Promise interop
+## Promise Interoperability
 
 This library works with foreign promises that have a `then` method. This means
 you can use Guzzle promises with [React promises](https://github.com/reactphp/promise)
@@ -409,7 +405,7 @@ a foreign promise. You will need to wrap a third-party promise with a Guzzle
 promise in order to utilize wait and cancel functions with foreign promises.
 
 
-## Event Loop Integration
+### Event Loop Integration
 
 In order to keep the stack size constant, Guzzle promises are resolved
 asynchronously using a task queue. When waiting on promises synchronously, the
@@ -437,10 +433,9 @@ $loop->addPeriodicTimer(0, [$queue, 'run']);
 *TODO*: Perhaps adding a `futureTick()` on each tick would be faster?
 
 
-# Implementation notes
-
+## Implementation Notes
 
-## Promise resolution and chaining is handled iteratively
+### Promise Resolution and Chaining is Handled Iteratively
 
 By shuffling pending handlers from one owner to another, promises are
 resolved iteratively, allowing for "infinite" then chaining.
@@ -476,8 +471,7 @@ all of its pending handlers to the new promise. When the new promise is
 eventually resolved, all of the pending handlers are delivered the forwarded
 value.
 
-
-## A promise is the deferred.
+### A Promise is the Deferred
 
 Some promise libraries implement promises using a deferred object to represent
 a computation and a promise object to represent the delivery of the result of
@@ -505,7 +499,10 @@ $promise->resolve('foo');
 
 ## Upgrading from Function API
 
-A static API was first introduced in 1.4.0, in order to mitigate problems with functions conflicting between global and local copies of the package. The function API will be removed in 2.0.0. A migration table has been provided here for your convenience:
+A static API was first introduced in 1.4.0, in order to mitigate problems with
+functions conflicting between global and local copies of the package. The
+function API will be removed in 2.0.0. A migration table has been provided here
+for your convenience:
 
 | Original Function | Replacement Method |
 |----------------|----------------|
@@ -536,10 +533,12 @@ A static API was first introduced in 1.4.0, in order to mitigate problems with f
 
 If you discover a security vulnerability within this package, please send an email to security@tidelift.com. All security vulnerabilities will be promptly addressed. Please do not disclose security-related issues publicly until a fix has been announced. Please see [Security Policy](https://github.com/guzzle/promises/security/policy) for more information.
 
+
 ## License
 
 Guzzle is made available under the MIT License (MIT). Please see [License File](LICENSE) for more information.
 
+
 ## For Enterprise
 
 Available as part of the Tidelift Subscription
diff --git a/vendor/guzzlehttp/promises/src/EachPromise.php b/vendor/guzzlehttp/promises/src/EachPromise.php
index 38ecb59b1..280d79950 100644
--- a/vendor/guzzlehttp/promises/src/EachPromise.php
+++ b/vendor/guzzlehttp/promises/src/EachPromise.php
@@ -81,16 +81,8 @@ public function promise()
             $this->iterable->rewind();
             $this->refillPending();
         } catch (\Throwable $e) {
-            /**
-             * @psalm-suppress NullReference
-             * @phpstan-ignore-next-line
-             */
             $this->aggregate->reject($e);
         } catch (\Exception $e) {
-            /**
-             * @psalm-suppress NullReference
-             * @phpstan-ignore-next-line
-             */
             $this->aggregate->reject($e);
         }
 
diff --git a/vendor/guzzlehttp/psr7/CHANGELOG.md b/vendor/guzzlehttp/psr7/CHANGELOG.md
index 740b2877b..83d7d30dd 100644
--- a/vendor/guzzlehttp/psr7/CHANGELOG.md
+++ b/vendor/guzzlehttp/psr7/CHANGELOG.md
@@ -7,6 +7,64 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ## Unreleased
 
+## 2.4.1 - 2022-08-28
+
+### Fixed
+
+- Rewind body before reading in `Message::bodySummary`
+
+## 2.4.0 - 2022-06-20
+
+### Added
+
+- Added provisional PHP 8.2 support
+- Added `UriComparator::isCrossOrigin` method
+
+## 2.3.0 - 2022-06-09
+
+### Fixed
+
+- Added `Header::splitList` method
+- Added `Utils::tryGetContents` method
+- Improved `Stream::getContents` method
+- Updated mimetype mappings
+
+## 2.2.2 - 2022-06-08
+
+### Fixed
+
+- Fix `Message::parseRequestUri` for numeric headers
+- Re-wrap exceptions thrown in `fread` into runtime exceptions
+- Throw an exception when multipart options is misformatted
+
+## 2.2.1 - 2022-03-20
+
+### Fixed
+
+- Correct header value validation
+
+## 2.2.0 - 2022-03-20
+
+### Added
+
+- A more compressive list of mime types
+- Add JsonSerializable to Uri
+- Missing return types
+
+### Fixed
+
+- Bug MultipartStream no `uri` metadata
+- Bug MultipartStream with filename for `data://` streams
+- Fixed new line handling in MultipartStream
+- Reduced RAM usage when copying streams
+- Updated parsing in `Header::normalize()`
+
+## 2.1.1 - 2022-03-20
+
+### Fixed
+
+- Validate header values properly
+
 ## 2.1.0 - 2021-10-06
 
 ### Changed
diff --git a/vendor/guzzlehttp/psr7/README.md b/vendor/guzzlehttp/psr7/README.md
index ed81c927e..eea803a02 100644
--- a/vendor/guzzlehttp/psr7/README.md
+++ b/vendor/guzzlehttp/psr7/README.md
@@ -1,6 +1,6 @@
 # PSR-7 Message Implementation
 
-This repository contains a full [PSR-7](http://www.php-fig.org/psr/psr-7/)
+This repository contains a full [PSR-7](https://www.php-fig.org/psr/psr-7/)
 message implementation, several stream decorators, and some helpful
 functionality like query string parsing.
 
@@ -527,6 +527,17 @@ When fopen fails, PHP normally raises a warning. This function adds an
 error handler that checks for errors and throws an exception instead.
 
 
+## `GuzzleHttp\Psr7\Utils::tryGetContents`
+
+`public static function tryGetContents(resource $stream): string`
+
+Safely gets the contents of a given stream.
+
+When stream_get_contents fails, PHP normally raises a warning. This
+function adds an error handler that checks for errors and throws an
+exception instead.
+
+
 ## `GuzzleHttp\Psr7\Utils::uriFor`
 
 `public static function uriFor(string|UriInterface $uri): UriInterface`
@@ -658,7 +669,7 @@ manually but instead is used indirectly via `Psr\Http\Message\UriInterface::__to
 
 `public static function fromParts(array $parts): UriInterface`
 
-Creates a URI from a hash of [`parse_url`](http://php.net/manual/en/function.parse-url.php) components.
+Creates a URI from a hash of [`parse_url`](https://www.php.net/manual/en/function.parse-url.php) components.
 
 
 ### `GuzzleHttp\Psr7\Uri::withQueryValue`
@@ -683,6 +694,16 @@ associative array of key => value.
 Creates a new URI with a specific query string value removed. Any existing query string values that exactly match the
 provided key are removed.
 
+## Cross-Origin Detection
+
+`GuzzleHttp\Psr7\UriComparator` provides methods to determine if a modified URL should be considered cross-origin.
+
+### `GuzzleHttp\Psr7\UriComparator::isCrossOrigin`
+
+`public static function isCrossOrigin(UriInterface $original, UriInterface $modified): bool`
+
+Determines if a modified URL should be considered cross-origin with respect to an original URL.
+
 ## Reference Resolution
 
 `GuzzleHttp\Psr7\UriResolver` provides methods to resolve a URI reference in the context of a base URI according
@@ -808,14 +829,24 @@ This of course assumes they will be resolved against the same base URI. If this
 equivalence or difference of relative references does not mean anything.
 
 
+## Version Guidance
+
+| Version | Status         | PHP Version      |
+|---------|----------------|------------------|
+| 1.x     | Security fixes | >=5.4,<8.1       |
+| 2.x     | Latest         | ^7.2.5 \|\| ^8.0 |
+
+
 ## Security
 
 If you discover a security vulnerability within this package, please send an email to security@tidelift.com. All security vulnerabilities will be promptly addressed. Please do not disclose security-related issues publicly until a fix has been announced. Please see [Security Policy](https://github.com/guzzle/psr7/security/policy) for more information.
 
+
 ## License
 
 Guzzle is made available under the MIT License (MIT). Please see [License File](LICENSE) for more information.
 
+
 ## For Enterprise
 
 Available as part of the Tidelift Subscription
diff --git a/vendor/guzzlehttp/psr7/composer.json b/vendor/guzzlehttp/psr7/composer.json
index 885aa1da0..cd91040cf 100644
--- a/vendor/guzzlehttp/psr7/composer.json
+++ b/vendor/guzzlehttp/psr7/composer.json
@@ -60,9 +60,9 @@
         "psr/http-message-implementation": "1.0"
     },
     "require-dev": {
-        "bamarni/composer-bin-plugin": "^1.4.1",
+        "bamarni/composer-bin-plugin": "^1.8.1",
         "http-interop/http-factory-tests": "^0.9",
-        "phpunit/phpunit": "^8.5.8 || ^9.3.10"
+        "phpunit/phpunit": "^8.5.29 || ^9.5.23"
     },
     "suggest": {
         "laminas/laminas-httphandlerrunner": "Emit PSR-7 responses"
@@ -78,11 +78,18 @@
         }
     },
     "extra": {
+        "bamarni-bin": {
+            "bin-links": true,
+            "forward-command": false
+        },
         "branch-alias": {
-            "dev-master": "2.1-dev"
+            "dev-master": "2.4-dev"
         }
     },
     "config": {
+        "allow-plugins": {
+            "bamarni/composer-bin-plugin": true
+        },
         "preferred-install": "dist",
         "sort-packages": true
     }
diff --git a/vendor/guzzlehttp/psr7/src/AppendStream.php b/vendor/guzzlehttp/psr7/src/AppendStream.php
index 967925f3f..cbcfaee65 100644
--- a/vendor/guzzlehttp/psr7/src/AppendStream.php
+++ b/vendor/guzzlehttp/psr7/src/AppendStream.php
@@ -191,7 +191,6 @@ public function read($length): string
         $progressToNext = false;
 
         while ($remaining > 0) {
-
             // Progress to the next stream if needed.
             if ($progressToNext || $this->streams[$this->current]->eof()) {
                 $progressToNext = false;
diff --git a/vendor/guzzlehttp/psr7/src/CachingStream.php b/vendor/guzzlehttp/psr7/src/CachingStream.php
index 7a70ee942..f34722cff 100644
--- a/vendor/guzzlehttp/psr7/src/CachingStream.php
+++ b/vendor/guzzlehttp/psr7/src/CachingStream.php
@@ -20,6 +20,11 @@ final class CachingStream implements StreamInterface
     /** @var int Number of bytes to skip reading due to a write on the buffer */
     private $skipReadBytes = 0;
 
+    /**
+     * @var StreamInterface
+     */
+    private $stream;
+
     /**
      * We will treat the buffer object as the body of the stream
      *
diff --git a/vendor/guzzlehttp/psr7/src/DroppingStream.php b/vendor/guzzlehttp/psr7/src/DroppingStream.php
index d78070ae2..6e3d209d0 100644
--- a/vendor/guzzlehttp/psr7/src/DroppingStream.php
+++ b/vendor/guzzlehttp/psr7/src/DroppingStream.php
@@ -17,6 +17,9 @@ final class DroppingStream implements StreamInterface
     /** @var int */
     private $maxLength;
 
+    /** @var StreamInterface */
+    private $stream;
+
     /**
      * @param StreamInterface $stream    Underlying stream to decorate.
      * @param int             $maxLength Maximum size before dropping data.
diff --git a/vendor/guzzlehttp/psr7/src/FnStream.php b/vendor/guzzlehttp/psr7/src/FnStream.php
index c21561843..3a1a9512e 100644
--- a/vendor/guzzlehttp/psr7/src/FnStream.php
+++ b/vendor/guzzlehttp/psr7/src/FnStream.php
@@ -12,6 +12,7 @@
  * Allows for easy testing and extension of a provided stream without needing
  * to create a concrete class for a simple extension point.
  */
+#[\AllowDynamicProperties]
 final class FnStream implements StreamInterface
 {
     private const SLOTS = [
diff --git a/vendor/guzzlehttp/psr7/src/Header.php b/vendor/guzzlehttp/psr7/src/Header.php
index 0e79a71a8..10744ed45 100644
--- a/vendor/guzzlehttp/psr7/src/Header.php
+++ b/vendor/guzzlehttp/psr7/src/Header.php
@@ -19,20 +19,22 @@ public static function parse($header): array
         static $trimmed = "\"'  \n\t\r";
         $params = $matches = [];
 
-        foreach (self::normalize($header) as $val) {
-            $part = [];
-            foreach (preg_split('/;(?=([^"]*"[^"]*")*[^"]*$)/', $val) as $kvp) {
-                if (preg_match_all('/<[^>]+>|[^=]+/', $kvp, $matches)) {
-                    $m = $matches[0];
-                    if (isset($m[1])) {
-                        $part[trim($m[0], $trimmed)] = trim($m[1], $trimmed);
-                    } else {
-                        $part[] = trim($m[0], $trimmed);
+        foreach ((array) $header as $value) {
+            foreach (self::splitList($value) as $val) {
+                $part = [];
+                foreach (preg_split('/;(?=([^"]*"[^"]*")*[^"]*$)/', $val) as $kvp) {
+                    if (preg_match_all('/<[^>]+>|[^=]+/', $kvp, $matches)) {
+                        $m = $matches[0];
+                        if (isset($m[1])) {
+                            $part[trim($m[0], $trimmed)] = trim($m[1], $trimmed);
+                        } else {
+                            $part[] = trim($m[0], $trimmed);
+                        }
                     }
                 }
-            }
-            if ($part) {
-                $params[] = $part;
+                if ($part) {
+                    $params[] = $part;
+                }
             }
         }
 
@@ -44,23 +46,86 @@ public static function parse($header): array
      * headers into an array of headers with no comma separated values.
      *
      * @param string|array $header Header to normalize.
+     *
+     * @deprecated Use self::splitList() instead.
      */
     public static function normalize($header): array
     {
-        if (!is_array($header)) {
-            return array_map('trim', explode(',', $header));
+        $result = [];
+        foreach ((array) $header as $value) {
+            foreach (self::splitList($value) as $parsed) {
+                $result[] = $parsed;
+            }
+        }
+
+        return $result;
+    }
+
+    /**
+     * Splits a HTTP header defined to contain comma-separated list into
+     * each individual value. Empty values will be removed.
+     *
+     * Example headers include 'accept', 'cache-control' and 'if-none-match'.
+     *
+     * This method must not be used to parse headers that are not defined as
+     * a list, such as 'user-agent' or 'set-cookie'.
+     *
+     * @param string|string[] $values Header value as returned by MessageInterface::getHeader()
+     *
+     * @return string[]
+     */
+    public static function splitList($values): array
+    {
+        if (!\is_array($values)) {
+            $values = [$values];
         }
 
         $result = [];
-        foreach ($header as $value) {
-            foreach ((array) $value as $v) {
-                if (strpos($v, ',') === false) {
-                    $result[] = $v;
+        foreach ($values as $value) {
+            if (!\is_string($value)) {
+                throw new \TypeError('$header must either be a string or an array containing strings.');
+            }
+
+            $v = '';
+            $isQuoted = false;
+            $isEscaped = false;
+            for ($i = 0, $max = \strlen($value); $i < $max; $i++) {
+                if ($isEscaped) {
+                    $v .= $value[$i];
+                    $isEscaped = false;
+
                     continue;
                 }
-                foreach (preg_split('/,(?=([^"]*"[^"]*")*[^"]*$)/', $v) as $vv) {
-                    $result[] = trim($vv);
+
+                if (!$isQuoted && $value[$i] === ',') {
+                    $v = \trim($v);
+                    if ($v !== '') {
+                        $result[] = $v;
+                    }
+
+                    $v = '';
+                    continue;
                 }
+
+                if ($isQuoted && $value[$i] === '\\') {
+                    $isEscaped = true;
+                    $v .= $value[$i];
+
+                    continue;
+                }
+                if ($value[$i] === '"') {
+                    $isQuoted = !$isQuoted;
+                    $v .= $value[$i];
+
+                    continue;
+                }
+
+                $v .= $value[$i];
+            }
+
+            $v = \trim($v);
+            if ($v !== '') {
+                $result[] = $v;
             }
         }
 
diff --git a/vendor/guzzlehttp/psr7/src/InflateStream.php b/vendor/guzzlehttp/psr7/src/InflateStream.php
index 8e3cf1717..8e00f1c32 100644
--- a/vendor/guzzlehttp/psr7/src/InflateStream.php
+++ b/vendor/guzzlehttp/psr7/src/InflateStream.php
@@ -21,6 +21,9 @@ final class InflateStream implements StreamInterface
 {
     use StreamDecoratorTrait;
 
+    /** @var StreamInterface */
+    private $stream;
+
     public function __construct(StreamInterface $stream)
     {
         $resource = StreamWrapper::getResource($stream);
diff --git a/vendor/guzzlehttp/psr7/src/LazyOpenStream.php b/vendor/guzzlehttp/psr7/src/LazyOpenStream.php
index 6b6042963..5618331f1 100644
--- a/vendor/guzzlehttp/psr7/src/LazyOpenStream.php
+++ b/vendor/guzzlehttp/psr7/src/LazyOpenStream.php
@@ -10,6 +10,7 @@
  * Lazily reads or writes to a file that is opened only after an IO operation
  * take place on the stream.
  */
+#[\AllowDynamicProperties]
 final class LazyOpenStream implements StreamInterface
 {
     use StreamDecoratorTrait;
diff --git a/vendor/guzzlehttp/psr7/src/LimitStream.php b/vendor/guzzlehttp/psr7/src/LimitStream.php
index 9762d38aa..fb2232557 100644
--- a/vendor/guzzlehttp/psr7/src/LimitStream.php
+++ b/vendor/guzzlehttp/psr7/src/LimitStream.php
@@ -19,6 +19,9 @@ final class LimitStream implements StreamInterface
     /** @var int Limit the number of bytes that can be read */
     private $limit;
 
+    /** @var StreamInterface */
+    private $stream;
+
     /**
      * @param StreamInterface $stream Stream to wrap
      * @param int             $limit  Total number of bytes to allow to be read
diff --git a/vendor/guzzlehttp/psr7/src/Message.php b/vendor/guzzlehttp/psr7/src/Message.php
index 9b825b300..61c1a5dcc 100644
--- a/vendor/guzzlehttp/psr7/src/Message.php
+++ b/vendor/guzzlehttp/psr7/src/Message.php
@@ -67,6 +67,7 @@ public static function bodySummary(MessageInterface $message, int $truncateAt =
             return null;
         }
 
+        $body->rewind();
         $summary = $body->read($truncateAt);
         $body->rewind();
 
@@ -175,6 +176,9 @@ public static function parseMessage(string $message): array
     public static function parseRequestUri(string $path, array $headers): string
     {
         $hostKey = array_filter(array_keys($headers), function ($k) {
+            // Numeric array keys are converted to int by PHP.
+            $k = (string) $k;
+
             return strtolower($k) === 'host';
         });
 
diff --git a/vendor/guzzlehttp/psr7/src/MessageTrait.php b/vendor/guzzlehttp/psr7/src/MessageTrait.php
index 503c280be..d2dc28b60 100644
--- a/vendor/guzzlehttp/psr7/src/MessageTrait.php
+++ b/vendor/guzzlehttp/psr7/src/MessageTrait.php
@@ -145,11 +145,9 @@ private function setHeaders(array $headers): void
     {
         $this->headerNames = $this->headers = [];
         foreach ($headers as $header => $value) {
-            if (is_int($header)) {
-                // Numeric array keys are converted to int by PHP but having a header name '123' is not forbidden by the spec
-                // and also allowed in withHeader(). So we need to cast it to string again for the following assertion to pass.
-                $header = (string) $header;
-            }
+            // Numeric array keys are converted to int by PHP.
+            $header = (string) $header;
+
             $this->assertHeader($header);
             $value = $this->normalizeHeaderValue($value);
             $normalized = strtolower($header);
@@ -171,14 +169,14 @@ private function setHeaders(array $headers): void
     private function normalizeHeaderValue($value): array
     {
         if (!is_array($value)) {
-            return $this->trimHeaderValues([$value]);
+            return $this->trimAndValidateHeaderValues([$value]);
         }
 
         if (count($value) === 0) {
             throw new \InvalidArgumentException('Header value can not be an empty array.');
         }
 
-        return $this->trimHeaderValues($value);
+        return $this->trimAndValidateHeaderValues($value);
     }
 
     /**
@@ -195,7 +193,7 @@ private function normalizeHeaderValue($value): array
      *
      * @see https://tools.ietf.org/html/rfc7230#section-3.2.4
      */
-    private function trimHeaderValues(array $values): array
+    private function trimAndValidateHeaderValues(array $values): array
     {
         return array_map(function ($value) {
             if (!is_scalar($value) && null !== $value) {
@@ -205,7 +203,10 @@ private function trimHeaderValues(array $values): array
                 ));
             }
 
-            return trim((string) $value, " \t");
+            $trimmed = trim((string) $value, " \t");
+            $this->assertValue($trimmed);
+
+            return $trimmed;
         }, array_values($values));
     }
 
@@ -232,4 +233,32 @@ private function assertHeader($header): void
             );
         }
     }
+
+    /**
+     * @see https://tools.ietf.org/html/rfc7230#section-3.2
+     *
+     * field-value    = *( field-content / obs-fold )
+     * field-content  = field-vchar [ 1*( SP / HTAB ) field-vchar ]
+     * field-vchar    = VCHAR / obs-text
+     * VCHAR          = %x21-7E
+     * obs-text       = %x80-FF
+     * obs-fold       = CRLF 1*( SP / HTAB )
+     */
+    private function assertValue(string $value): void
+    {
+        // The regular expression intentionally does not support the obs-fold production, because as
+        // per RFC 7230#3.2.4:
+        //
+        // A sender MUST NOT generate a message that includes
+        // line folding (i.e., that has any field-value that contains a match to
+        // the obs-fold rule) unless the message is intended for packaging
+        // within the message/http media type.
+        //
+        // Clients must not send a request with line folding and a server sending folded headers is
+        // likely very rare. Line folding is a fairly obscure feature of HTTP/1.1 and thus not accepting
+        // folding is not likely to break any legitimate use case.
+        if (! preg_match('/^[\x20\x09\x21-\x7E\x80-\xFF]*$/', $value)) {
+            throw new \InvalidArgumentException(sprintf('"%s" is not valid header value', $value));
+        }
+    }
 }
diff --git a/vendor/guzzlehttp/psr7/src/MimeType.php b/vendor/guzzlehttp/psr7/src/MimeType.php
index dfa94251a..0debbd18c 100644
--- a/vendor/guzzlehttp/psr7/src/MimeType.php
+++ b/vendor/guzzlehttp/psr7/src/MimeType.php
@@ -7,111 +7,1218 @@
 final class MimeType
 {
     private const MIME_TYPES = [
-      '3gp' => 'video/3gpp',
-      '7z' => 'application/x-7z-compressed',
-      'aac' => 'audio/x-aac',
-      'ai' => 'application/postscript',
-      'aif' => 'audio/x-aiff',
-      'asc' => 'text/plain',
-      'asf' => 'video/x-ms-asf',
-      'atom' => 'application/atom+xml',
-      'avi' => 'video/x-msvideo',
-      'bmp' => 'image/bmp',
-      'bz2' => 'application/x-bzip2',
-      'cer' => 'application/pkix-cert',
-      'crl' => 'application/pkix-crl',
-      'crt' => 'application/x-x509-ca-cert',
-      'css' => 'text/css',
-      'csv' => 'text/csv',
-      'cu' => 'application/cu-seeme',
-      'deb' => 'application/x-debian-package',
-      'doc' => 'application/msword',
-      'docx' => 'application/vnd.openxmlformats-officedocument.wordprocessingml.document',
-      'dvi' => 'application/x-dvi',
-      'eot' => 'application/vnd.ms-fontobject',
-      'eps' => 'application/postscript',
-      'epub' => 'application/epub+zip',
-      'etx' => 'text/x-setext',
-      'flac' => 'audio/flac',
-      'flv' => 'video/x-flv',
-      'gif' => 'image/gif',
-      'gz' => 'application/gzip',
-      'htm' => 'text/html',
-      'html' => 'text/html',
-      'ico' => 'image/x-icon',
-      'ics' => 'text/calendar',
-      'ini' => 'text/plain',
-      'iso' => 'application/x-iso9660-image',
-      'jar' => 'application/java-archive',
-      'jpe' => 'image/jpeg',
-      'jpeg' => 'image/jpeg',
-      'jpg' => 'image/jpeg',
-      'js' => 'text/javascript',
-      'json' => 'application/json',
-      'latex' => 'application/x-latex',
-      'log' => 'text/plain',
-      'm4a' => 'audio/mp4',
-      'm4v' => 'video/mp4',
-      'mid' => 'audio/midi',
-      'midi' => 'audio/midi',
-      'mov' => 'video/quicktime',
-      'mkv' => 'video/x-matroska',
-      'mp3' => 'audio/mpeg',
-      'mp4' => 'video/mp4',
-      'mp4a' => 'audio/mp4',
-      'mp4v' => 'video/mp4',
-      'mpe' => 'video/mpeg',
-      'mpeg' => 'video/mpeg',
-      'mpg' => 'video/mpeg',
-      'mpg4' => 'video/mp4',
-      'oga' => 'audio/ogg',
-      'ogg' => 'audio/ogg',
-      'ogv' => 'video/ogg',
-      'ogx' => 'application/ogg',
-      'pbm' => 'image/x-portable-bitmap',
-      'pdf' => 'application/pdf',
-      'pgm' => 'image/x-portable-graymap',
-      'png' => 'image/png',
-      'pnm' => 'image/x-portable-anymap',
-      'ppm' => 'image/x-portable-pixmap',
-      'ppt' => 'application/vnd.ms-powerpoint',
-      'pptx' => 'application/vnd.openxmlformats-officedocument.presentationml.presentation',
-      'ps' => 'application/postscript',
-      'qt' => 'video/quicktime',
-      'rar' => 'application/x-rar-compressed',
-      'ras' => 'image/x-cmu-raster',
-      'rss' => 'application/rss+xml',
-      'rtf' => 'application/rtf',
-      'sgm' => 'text/sgml',
-      'sgml' => 'text/sgml',
-      'svg' => 'image/svg+xml',
-      'swf' => 'application/x-shockwave-flash',
-      'tar' => 'application/x-tar',
-      'tif' => 'image/tiff',
-      'tiff' => 'image/tiff',
-      'torrent' => 'application/x-bittorrent',
-      'ttf' => 'application/x-font-ttf',
-      'txt' => 'text/plain',
-      'wav' => 'audio/x-wav',
-      'webm' => 'video/webm',
-      'webp' => 'image/webp',
-      'wma' => 'audio/x-ms-wma',
-      'wmv' => 'video/x-ms-wmv',
-      'woff' => 'application/x-font-woff',
-      'wsdl' => 'application/wsdl+xml',
-      'xbm' => 'image/x-xbitmap',
-      'xls' => 'application/vnd.ms-excel',
-      'xlsx' => 'application/vnd.openxmlformats-officedocument.spreadsheetml.sheet',
-      'xml' => 'application/xml',
-      'xpm' => 'image/x-xpixmap',
-      'xwd' => 'image/x-xwindowdump',
-      'yaml' => 'text/yaml',
-      'yml' => 'text/yaml',
-      'zip' => 'application/zip',
+        '1km' => 'application/vnd.1000minds.decision-model+xml',
+        '3dml' => 'text/vnd.in3d.3dml',
+        '3ds' => 'image/x-3ds',
+        '3g2' => 'video/3gpp2',
+        '3gp' => 'video/3gp',
+        '3gpp' => 'video/3gpp',
+        '3mf' => 'model/3mf',
+        '7z' => 'application/x-7z-compressed',
+        '7zip' => 'application/x-7z-compressed',
+        '123' => 'application/vnd.lotus-1-2-3',
+        'aab' => 'application/x-authorware-bin',
+        'aac' => 'audio/x-acc',
+        'aam' => 'application/x-authorware-map',
+        'aas' => 'application/x-authorware-seg',
+        'abw' => 'application/x-abiword',
+        'ac' => 'application/vnd.nokia.n-gage.ac+xml',
+        'ac3' => 'audio/ac3',
+        'acc' => 'application/vnd.americandynamics.acc',
+        'ace' => 'application/x-ace-compressed',
+        'acu' => 'application/vnd.acucobol',
+        'acutc' => 'application/vnd.acucorp',
+        'adp' => 'audio/adpcm',
+        'aep' => 'application/vnd.audiograph',
+        'afm' => 'application/x-font-type1',
+        'afp' => 'application/vnd.ibm.modcap',
+        'age' => 'application/vnd.age',
+        'ahead' => 'application/vnd.ahead.space',
+        'ai' => 'application/pdf',
+        'aif' => 'audio/x-aiff',
+        'aifc' => 'audio/x-aiff',
+        'aiff' => 'audio/x-aiff',
+        'air' => 'application/vnd.adobe.air-application-installer-package+zip',
+        'ait' => 'application/vnd.dvb.ait',
+        'ami' => 'application/vnd.amiga.ami',
+        'amr' => 'audio/amr',
+        'apk' => 'application/vnd.android.package-archive',
+        'apng' => 'image/apng',
+        'appcache' => 'text/cache-manifest',
+        'application' => 'application/x-ms-application',
+        'apr' => 'application/vnd.lotus-approach',
+        'arc' => 'application/x-freearc',
+        'arj' => 'application/x-arj',
+        'asc' => 'application/pgp-signature',
+        'asf' => 'video/x-ms-asf',
+        'asm' => 'text/x-asm',
+        'aso' => 'application/vnd.accpac.simply.aso',
+        'asx' => 'video/x-ms-asf',
+        'atc' => 'application/vnd.acucorp',
+        'atom' => 'application/atom+xml',
+        'atomcat' => 'application/atomcat+xml',
+        'atomdeleted' => 'application/atomdeleted+xml',
+        'atomsvc' => 'application/atomsvc+xml',
+        'atx' => 'application/vnd.antix.game-component',
+        'au' => 'audio/x-au',
+        'avci' => 'image/avci',
+        'avcs' => 'image/avcs',
+        'avi' => 'video/x-msvideo',
+        'avif' => 'image/avif',
+        'aw' => 'application/applixware',
+        'azf' => 'application/vnd.airzip.filesecure.azf',
+        'azs' => 'application/vnd.airzip.filesecure.azs',
+        'azv' => 'image/vnd.airzip.accelerator.azv',
+        'azw' => 'application/vnd.amazon.ebook',
+        'b16' => 'image/vnd.pco.b16',
+        'bat' => 'application/x-msdownload',
+        'bcpio' => 'application/x-bcpio',
+        'bdf' => 'application/x-font-bdf',
+        'bdm' => 'application/vnd.syncml.dm+wbxml',
+        'bdoc' => 'application/x-bdoc',
+        'bed' => 'application/vnd.realvnc.bed',
+        'bh2' => 'application/vnd.fujitsu.oasysprs',
+        'bin' => 'application/octet-stream',
+        'blb' => 'application/x-blorb',
+        'blorb' => 'application/x-blorb',
+        'bmi' => 'application/vnd.bmi',
+        'bmml' => 'application/vnd.balsamiq.bmml+xml',
+        'bmp' => 'image/bmp',
+        'book' => 'application/vnd.framemaker',
+        'box' => 'application/vnd.previewsystems.box',
+        'boz' => 'application/x-bzip2',
+        'bpk' => 'application/octet-stream',
+        'bpmn' => 'application/octet-stream',
+        'bsp' => 'model/vnd.valve.source.compiled-map',
+        'btif' => 'image/prs.btif',
+        'buffer' => 'application/octet-stream',
+        'bz' => 'application/x-bzip',
+        'bz2' => 'application/x-bzip2',
+        'c' => 'text/x-c',
+        'c4d' => 'application/vnd.clonk.c4group',
+        'c4f' => 'application/vnd.clonk.c4group',
+        'c4g' => 'application/vnd.clonk.c4group',
+        'c4p' => 'application/vnd.clonk.c4group',
+        'c4u' => 'application/vnd.clonk.c4group',
+        'c11amc' => 'application/vnd.cluetrust.cartomobile-config',
+        'c11amz' => 'application/vnd.cluetrust.cartomobile-config-pkg',
+        'cab' => 'application/vnd.ms-cab-compressed',
+        'caf' => 'audio/x-caf',
+        'cap' => 'application/vnd.tcpdump.pcap',
+        'car' => 'application/vnd.curl.car',
+        'cat' => 'application/vnd.ms-pki.seccat',
+        'cb7' => 'application/x-cbr',
+        'cba' => 'application/x-cbr',
+        'cbr' => 'application/x-cbr',
+        'cbt' => 'application/x-cbr',
+        'cbz' => 'application/x-cbr',
+        'cc' => 'text/x-c',
+        'cco' => 'application/x-cocoa',
+        'cct' => 'application/x-director',
+        'ccxml' => 'application/ccxml+xml',
+        'cdbcmsg' => 'application/vnd.contact.cmsg',
+        'cdf' => 'application/x-netcdf',
+        'cdfx' => 'application/cdfx+xml',
+        'cdkey' => 'application/vnd.mediastation.cdkey',
+        'cdmia' => 'application/cdmi-capability',
+        'cdmic' => 'application/cdmi-container',
+        'cdmid' => 'application/cdmi-domain',
+        'cdmio' => 'application/cdmi-object',
+        'cdmiq' => 'application/cdmi-queue',
+        'cdr' => 'application/cdr',
+        'cdx' => 'chemical/x-cdx',
+        'cdxml' => 'application/vnd.chemdraw+xml',
+        'cdy' => 'application/vnd.cinderella',
+        'cer' => 'application/pkix-cert',
+        'cfs' => 'application/x-cfs-compressed',
+        'cgm' => 'image/cgm',
+        'chat' => 'application/x-chat',
+        'chm' => 'application/vnd.ms-htmlhelp',
+        'chrt' => 'application/vnd.kde.kchart',
+        'cif' => 'chemical/x-cif',
+        'cii' => 'application/vnd.anser-web-certificate-issue-initiation',
+        'cil' => 'application/vnd.ms-artgalry',
+        'cjs' => 'application/node',
+        'cla' => 'application/vnd.claymore',
+        'class' => 'application/octet-stream',
+        'clkk' => 'application/vnd.crick.clicker.keyboard',
+        'clkp' => 'application/vnd.crick.clicker.palette',
+        'clkt' => 'application/vnd.crick.clicker.template',
+        'clkw' => 'application/vnd.crick.clicker.wordbank',
+        'clkx' => 'application/vnd.crick.clicker',
+        'clp' => 'application/x-msclip',
+        'cmc' => 'application/vnd.cosmocaller',
+        'cmdf' => 'chemical/x-cmdf',
+        'cml' => 'chemical/x-cml',
+        'cmp' => 'application/vnd.yellowriver-custom-menu',
+        'cmx' => 'image/x-cmx',
+        'cod' => 'application/vnd.rim.cod',
+        'coffee' => 'text/coffeescript',
+        'com' => 'application/x-msdownload',
+        'conf' => 'text/plain',
+        'cpio' => 'application/x-cpio',
+        'cpl' => 'application/cpl+xml',
+        'cpp' => 'text/x-c',
+        'cpt' => 'application/mac-compactpro',
+        'crd' => 'application/x-mscardfile',
+        'crl' => 'application/pkix-crl',
+        'crt' => 'application/x-x509-ca-cert',
+        'crx' => 'application/x-chrome-extension',
+        'cryptonote' => 'application/vnd.rig.cryptonote',
+        'csh' => 'application/x-csh',
+        'csl' => 'application/vnd.citationstyles.style+xml',
+        'csml' => 'chemical/x-csml',
+        'csp' => 'application/vnd.commonspace',
+        'csr' => 'application/octet-stream',
+        'css' => 'text/css',
+        'cst' => 'application/x-director',
+        'csv' => 'text/csv',
+        'cu' => 'application/cu-seeme',
+        'curl' => 'text/vnd.curl',
+        'cww' => 'application/prs.cww',
+        'cxt' => 'application/x-director',
+        'cxx' => 'text/x-c',
+        'dae' => 'model/vnd.collada+xml',
+        'daf' => 'application/vnd.mobius.daf',
+        'dart' => 'application/vnd.dart',
+        'dataless' => 'application/vnd.fdsn.seed',
+        'davmount' => 'application/davmount+xml',
+        'dbf' => 'application/vnd.dbf',
+        'dbk' => 'application/docbook+xml',
+        'dcr' => 'application/x-director',
+        'dcurl' => 'text/vnd.curl.dcurl',
+        'dd2' => 'application/vnd.oma.dd2+xml',
+        'ddd' => 'application/vnd.fujixerox.ddd',
+        'ddf' => 'application/vnd.syncml.dmddf+xml',
+        'dds' => 'image/vnd.ms-dds',
+        'deb' => 'application/x-debian-package',
+        'def' => 'text/plain',
+        'deploy' => 'application/octet-stream',
+        'der' => 'application/x-x509-ca-cert',
+        'dfac' => 'application/vnd.dreamfactory',
+        'dgc' => 'application/x-dgc-compressed',
+        'dic' => 'text/x-c',
+        'dir' => 'application/x-director',
+        'dis' => 'application/vnd.mobius.dis',
+        'disposition-notification' => 'message/disposition-notification',
+        'dist' => 'application/octet-stream',
+        'distz' => 'application/octet-stream',
+        'djv' => 'image/vnd.djvu',
+        'djvu' => 'image/vnd.djvu',
+        'dll' => 'application/octet-stream',
+        'dmg' => 'application/x-apple-diskimage',
+        'dmn' => 'application/octet-stream',
+        'dmp' => 'application/vnd.tcpdump.pcap',
+        'dms' => 'application/octet-stream',
+        'dna' => 'application/vnd.dna',
+        'doc' => 'application/msword',
+        'docm' => 'application/vnd.ms-word.template.macroEnabled.12',
+        'docx' => 'application/vnd.openxmlformats-officedocument.wordprocessingml.document',
+        'dot' => 'application/msword',
+        'dotm' => 'application/vnd.ms-word.template.macroEnabled.12',
+        'dotx' => 'application/vnd.openxmlformats-officedocument.wordprocessingml.template',
+        'dp' => 'application/vnd.osgi.dp',
+        'dpg' => 'application/vnd.dpgraph',
+        'dra' => 'audio/vnd.dra',
+        'drle' => 'image/dicom-rle',
+        'dsc' => 'text/prs.lines.tag',
+        'dssc' => 'application/dssc+der',
+        'dtb' => 'application/x-dtbook+xml',
+        'dtd' => 'application/xml-dtd',
+        'dts' => 'audio/vnd.dts',
+        'dtshd' => 'audio/vnd.dts.hd',
+        'dump' => 'application/octet-stream',
+        'dvb' => 'video/vnd.dvb.file',
+        'dvi' => 'application/x-dvi',
+        'dwd' => 'application/atsc-dwd+xml',
+        'dwf' => 'model/vnd.dwf',
+        'dwg' => 'image/vnd.dwg',
+        'dxf' => 'image/vnd.dxf',
+        'dxp' => 'application/vnd.spotfire.dxp',
+        'dxr' => 'application/x-director',
+        'ear' => 'application/java-archive',
+        'ecelp4800' => 'audio/vnd.nuera.ecelp4800',
+        'ecelp7470' => 'audio/vnd.nuera.ecelp7470',
+        'ecelp9600' => 'audio/vnd.nuera.ecelp9600',
+        'ecma' => 'application/ecmascript',
+        'edm' => 'application/vnd.novadigm.edm',
+        'edx' => 'application/vnd.novadigm.edx',
+        'efif' => 'application/vnd.picsel',
+        'ei6' => 'application/vnd.pg.osasli',
+        'elc' => 'application/octet-stream',
+        'emf' => 'image/emf',
+        'eml' => 'message/rfc822',
+        'emma' => 'application/emma+xml',
+        'emotionml' => 'application/emotionml+xml',
+        'emz' => 'application/x-msmetafile',
+        'eol' => 'audio/vnd.digital-winds',
+        'eot' => 'application/vnd.ms-fontobject',
+        'eps' => 'application/postscript',
+        'epub' => 'application/epub+zip',
+        'es' => 'application/ecmascript',
+        'es3' => 'application/vnd.eszigno3+xml',
+        'esa' => 'application/vnd.osgi.subsystem',
+        'esf' => 'application/vnd.epson.esf',
+        'et3' => 'application/vnd.eszigno3+xml',
+        'etx' => 'text/x-setext',
+        'eva' => 'application/x-eva',
+        'evy' => 'application/x-envoy',
+        'exe' => 'application/octet-stream',
+        'exi' => 'application/exi',
+        'exp' => 'application/express',
+        'exr' => 'image/aces',
+        'ext' => 'application/vnd.novadigm.ext',
+        'ez' => 'application/andrew-inset',
+        'ez2' => 'application/vnd.ezpix-album',
+        'ez3' => 'application/vnd.ezpix-package',
+        'f' => 'text/x-fortran',
+        'f4v' => 'video/mp4',
+        'f77' => 'text/x-fortran',
+        'f90' => 'text/x-fortran',
+        'fbs' => 'image/vnd.fastbidsheet',
+        'fcdt' => 'application/vnd.adobe.formscentral.fcdt',
+        'fcs' => 'application/vnd.isac.fcs',
+        'fdf' => 'application/vnd.fdf',
+        'fdt' => 'application/fdt+xml',
+        'fe_launch' => 'application/vnd.denovo.fcselayout-link',
+        'fg5' => 'application/vnd.fujitsu.oasysgp',
+        'fgd' => 'application/x-director',
+        'fh' => 'image/x-freehand',
+        'fh4' => 'image/x-freehand',
+        'fh5' => 'image/x-freehand',
+        'fh7' => 'image/x-freehand',
+        'fhc' => 'image/x-freehand',
+        'fig' => 'application/x-xfig',
+        'fits' => 'image/fits',
+        'flac' => 'audio/x-flac',
+        'fli' => 'video/x-fli',
+        'flo' => 'application/vnd.micrografx.flo',
+        'flv' => 'video/x-flv',
+        'flw' => 'application/vnd.kde.kivio',
+        'flx' => 'text/vnd.fmi.flexstor',
+        'fly' => 'text/vnd.fly',
+        'fm' => 'application/vnd.framemaker',
+        'fnc' => 'application/vnd.frogans.fnc',
+        'fo' => 'application/vnd.software602.filler.form+xml',
+        'for' => 'text/x-fortran',
+        'fpx' => 'image/vnd.fpx',
+        'frame' => 'application/vnd.framemaker',
+        'fsc' => 'application/vnd.fsc.weblaunch',
+        'fst' => 'image/vnd.fst',
+        'ftc' => 'application/vnd.fluxtime.clip',
+        'fti' => 'application/vnd.anser-web-funds-transfer-initiation',
+        'fvt' => 'video/vnd.fvt',
+        'fxp' => 'application/vnd.adobe.fxp',
+        'fxpl' => 'application/vnd.adobe.fxp',
+        'fzs' => 'application/vnd.fuzzysheet',
+        'g2w' => 'application/vnd.geoplan',
+        'g3' => 'image/g3fax',
+        'g3w' => 'application/vnd.geospace',
+        'gac' => 'application/vnd.groove-account',
+        'gam' => 'application/x-tads',
+        'gbr' => 'application/rpki-ghostbusters',
+        'gca' => 'application/x-gca-compressed',
+        'gdl' => 'model/vnd.gdl',
+        'gdoc' => 'application/vnd.google-apps.document',
+        'ged' => 'text/vnd.familysearch.gedcom',
+        'geo' => 'application/vnd.dynageo',
+        'geojson' => 'application/geo+json',
+        'gex' => 'application/vnd.geometry-explorer',
+        'ggb' => 'application/vnd.geogebra.file',
+        'ggt' => 'application/vnd.geogebra.tool',
+        'ghf' => 'application/vnd.groove-help',
+        'gif' => 'image/gif',
+        'gim' => 'application/vnd.groove-identity-message',
+        'glb' => 'model/gltf-binary',
+        'gltf' => 'model/gltf+json',
+        'gml' => 'application/gml+xml',
+        'gmx' => 'application/vnd.gmx',
+        'gnumeric' => 'application/x-gnumeric',
+        'gpg' => 'application/gpg-keys',
+        'gph' => 'application/vnd.flographit',
+        'gpx' => 'application/gpx+xml',
+        'gqf' => 'application/vnd.grafeq',
+        'gqs' => 'application/vnd.grafeq',
+        'gram' => 'application/srgs',
+        'gramps' => 'application/x-gramps-xml',
+        'gre' => 'application/vnd.geometry-explorer',
+        'grv' => 'application/vnd.groove-injector',
+        'grxml' => 'application/srgs+xml',
+        'gsf' => 'application/x-font-ghostscript',
+        'gsheet' => 'application/vnd.google-apps.spreadsheet',
+        'gslides' => 'application/vnd.google-apps.presentation',
+        'gtar' => 'application/x-gtar',
+        'gtm' => 'application/vnd.groove-tool-message',
+        'gtw' => 'model/vnd.gtw',
+        'gv' => 'text/vnd.graphviz',
+        'gxf' => 'application/gxf',
+        'gxt' => 'application/vnd.geonext',
+        'gz' => 'application/gzip',
+        'gzip' => 'application/gzip',
+        'h' => 'text/x-c',
+        'h261' => 'video/h261',
+        'h263' => 'video/h263',
+        'h264' => 'video/h264',
+        'hal' => 'application/vnd.hal+xml',
+        'hbci' => 'application/vnd.hbci',
+        'hbs' => 'text/x-handlebars-template',
+        'hdd' => 'application/x-virtualbox-hdd',
+        'hdf' => 'application/x-hdf',
+        'heic' => 'image/heic',
+        'heics' => 'image/heic-sequence',
+        'heif' => 'image/heif',
+        'heifs' => 'image/heif-sequence',
+        'hej2' => 'image/hej2k',
+        'held' => 'application/atsc-held+xml',
+        'hh' => 'text/x-c',
+        'hjson' => 'application/hjson',
+        'hlp' => 'application/winhlp',
+        'hpgl' => 'application/vnd.hp-hpgl',
+        'hpid' => 'application/vnd.hp-hpid',
+        'hps' => 'application/vnd.hp-hps',
+        'hqx' => 'application/mac-binhex40',
+        'hsj2' => 'image/hsj2',
+        'htc' => 'text/x-component',
+        'htke' => 'application/vnd.kenameaapp',
+        'htm' => 'text/html',
+        'html' => 'text/html',
+        'hvd' => 'application/vnd.yamaha.hv-dic',
+        'hvp' => 'application/vnd.yamaha.hv-voice',
+        'hvs' => 'application/vnd.yamaha.hv-script',
+        'i2g' => 'application/vnd.intergeo',
+        'icc' => 'application/vnd.iccprofile',
+        'ice' => 'x-conference/x-cooltalk',
+        'icm' => 'application/vnd.iccprofile',
+        'ico' => 'image/x-icon',
+        'ics' => 'text/calendar',
+        'ief' => 'image/ief',
+        'ifb' => 'text/calendar',
+        'ifm' => 'application/vnd.shana.informed.formdata',
+        'iges' => 'model/iges',
+        'igl' => 'application/vnd.igloader',
+        'igm' => 'application/vnd.insors.igm',
+        'igs' => 'model/iges',
+        'igx' => 'application/vnd.micrografx.igx',
+        'iif' => 'application/vnd.shana.informed.interchange',
+        'img' => 'application/octet-stream',
+        'imp' => 'application/vnd.accpac.simply.imp',
+        'ims' => 'application/vnd.ms-ims',
+        'in' => 'text/plain',
+        'ini' => 'text/plain',
+        'ink' => 'application/inkml+xml',
+        'inkml' => 'application/inkml+xml',
+        'install' => 'application/x-install-instructions',
+        'iota' => 'application/vnd.astraea-software.iota',
+        'ipfix' => 'application/ipfix',
+        'ipk' => 'application/vnd.shana.informed.package',
+        'irm' => 'application/vnd.ibm.rights-management',
+        'irp' => 'application/vnd.irepository.package+xml',
+        'iso' => 'application/x-iso9660-image',
+        'itp' => 'application/vnd.shana.informed.formtemplate',
+        'its' => 'application/its+xml',
+        'ivp' => 'application/vnd.immervision-ivp',
+        'ivu' => 'application/vnd.immervision-ivu',
+        'jad' => 'text/vnd.sun.j2me.app-descriptor',
+        'jade' => 'text/jade',
+        'jam' => 'application/vnd.jam',
+        'jar' => 'application/java-archive',
+        'jardiff' => 'application/x-java-archive-diff',
+        'java' => 'text/x-java-source',
+        'jhc' => 'image/jphc',
+        'jisp' => 'application/vnd.jisp',
+        'jls' => 'image/jls',
+        'jlt' => 'application/vnd.hp-jlyt',
+        'jng' => 'image/x-jng',
+        'jnlp' => 'application/x-java-jnlp-file',
+        'joda' => 'application/vnd.joost.joda-archive',
+        'jp2' => 'image/jp2',
+        'jpe' => 'image/jpeg',
+        'jpeg' => 'image/jpeg',
+        'jpf' => 'image/jpx',
+        'jpg' => 'image/jpeg',
+        'jpg2' => 'image/jp2',
+        'jpgm' => 'video/jpm',
+        'jpgv' => 'video/jpeg',
+        'jph' => 'image/jph',
+        'jpm' => 'video/jpm',
+        'jpx' => 'image/jpx',
+        'js' => 'application/javascript',
+        'json' => 'application/json',
+        'json5' => 'application/json5',
+        'jsonld' => 'application/ld+json',
+        'jsonml' => 'application/jsonml+json',
+        'jsx' => 'text/jsx',
+        'jxr' => 'image/jxr',
+        'jxra' => 'image/jxra',
+        'jxrs' => 'image/jxrs',
+        'jxs' => 'image/jxs',
+        'jxsc' => 'image/jxsc',
+        'jxsi' => 'image/jxsi',
+        'jxss' => 'image/jxss',
+        'kar' => 'audio/midi',
+        'karbon' => 'application/vnd.kde.karbon',
+        'kdb' => 'application/octet-stream',
+        'kdbx' => 'application/x-keepass2',
+        'key' => 'application/x-iwork-keynote-sffkey',
+        'kfo' => 'application/vnd.kde.kformula',
+        'kia' => 'application/vnd.kidspiration',
+        'kml' => 'application/vnd.google-earth.kml+xml',
+        'kmz' => 'application/vnd.google-earth.kmz',
+        'kne' => 'application/vnd.kinar',
+        'knp' => 'application/vnd.kinar',
+        'kon' => 'application/vnd.kde.kontour',
+        'kpr' => 'application/vnd.kde.kpresenter',
+        'kpt' => 'application/vnd.kde.kpresenter',
+        'kpxx' => 'application/vnd.ds-keypoint',
+        'ksp' => 'application/vnd.kde.kspread',
+        'ktr' => 'application/vnd.kahootz',
+        'ktx' => 'image/ktx',
+        'ktx2' => 'image/ktx2',
+        'ktz' => 'application/vnd.kahootz',
+        'kwd' => 'application/vnd.kde.kword',
+        'kwt' => 'application/vnd.kde.kword',
+        'lasxml' => 'application/vnd.las.las+xml',
+        'latex' => 'application/x-latex',
+        'lbd' => 'application/vnd.llamagraphics.life-balance.desktop',
+        'lbe' => 'application/vnd.llamagraphics.life-balance.exchange+xml',
+        'les' => 'application/vnd.hhe.lesson-player',
+        'less' => 'text/less',
+        'lgr' => 'application/lgr+xml',
+        'lha' => 'application/octet-stream',
+        'link66' => 'application/vnd.route66.link66+xml',
+        'list' => 'text/plain',
+        'list3820' => 'application/vnd.ibm.modcap',
+        'listafp' => 'application/vnd.ibm.modcap',
+        'litcoffee' => 'text/coffeescript',
+        'lnk' => 'application/x-ms-shortcut',
+        'log' => 'text/plain',
+        'lostxml' => 'application/lost+xml',
+        'lrf' => 'application/octet-stream',
+        'lrm' => 'application/vnd.ms-lrm',
+        'ltf' => 'application/vnd.frogans.ltf',
+        'lua' => 'text/x-lua',
+        'luac' => 'application/x-lua-bytecode',
+        'lvp' => 'audio/vnd.lucent.voice',
+        'lwp' => 'application/vnd.lotus-wordpro',
+        'lzh' => 'application/octet-stream',
+        'm1v' => 'video/mpeg',
+        'm2a' => 'audio/mpeg',
+        'm2v' => 'video/mpeg',
+        'm3a' => 'audio/mpeg',
+        'm3u' => 'text/plain',
+        'm3u8' => 'application/vnd.apple.mpegurl',
+        'm4a' => 'audio/x-m4a',
+        'm4p' => 'application/mp4',
+        'm4s' => 'video/iso.segment',
+        'm4u' => 'application/vnd.mpegurl',
+        'm4v' => 'video/x-m4v',
+        'm13' => 'application/x-msmediaview',
+        'm14' => 'application/x-msmediaview',
+        'm21' => 'application/mp21',
+        'ma' => 'application/mathematica',
+        'mads' => 'application/mads+xml',
+        'maei' => 'application/mmt-aei+xml',
+        'mag' => 'application/vnd.ecowin.chart',
+        'maker' => 'application/vnd.framemaker',
+        'man' => 'text/troff',
+        'manifest' => 'text/cache-manifest',
+        'map' => 'application/json',
+        'mar' => 'application/octet-stream',
+        'markdown' => 'text/markdown',
+        'mathml' => 'application/mathml+xml',
+        'mb' => 'application/mathematica',
+        'mbk' => 'application/vnd.mobius.mbk',
+        'mbox' => 'application/mbox',
+        'mc1' => 'application/vnd.medcalcdata',
+        'mcd' => 'application/vnd.mcd',
+        'mcurl' => 'text/vnd.curl.mcurl',
+        'md' => 'text/markdown',
+        'mdb' => 'application/x-msaccess',
+        'mdi' => 'image/vnd.ms-modi',
+        'mdx' => 'text/mdx',
+        'me' => 'text/troff',
+        'mesh' => 'model/mesh',
+        'meta4' => 'application/metalink4+xml',
+        'metalink' => 'application/metalink+xml',
+        'mets' => 'application/mets+xml',
+        'mfm' => 'application/vnd.mfmp',
+        'mft' => 'application/rpki-manifest',
+        'mgp' => 'application/vnd.osgeo.mapguide.package',
+        'mgz' => 'application/vnd.proteus.magazine',
+        'mid' => 'audio/midi',
+        'midi' => 'audio/midi',
+        'mie' => 'application/x-mie',
+        'mif' => 'application/vnd.mif',
+        'mime' => 'message/rfc822',
+        'mj2' => 'video/mj2',
+        'mjp2' => 'video/mj2',
+        'mjs' => 'application/javascript',
+        'mk3d' => 'video/x-matroska',
+        'mka' => 'audio/x-matroska',
+        'mkd' => 'text/x-markdown',
+        'mks' => 'video/x-matroska',
+        'mkv' => 'video/x-matroska',
+        'mlp' => 'application/vnd.dolby.mlp',
+        'mmd' => 'application/vnd.chipnuts.karaoke-mmd',
+        'mmf' => 'application/vnd.smaf',
+        'mml' => 'text/mathml',
+        'mmr' => 'image/vnd.fujixerox.edmics-mmr',
+        'mng' => 'video/x-mng',
+        'mny' => 'application/x-msmoney',
+        'mobi' => 'application/x-mobipocket-ebook',
+        'mods' => 'application/mods+xml',
+        'mov' => 'video/quicktime',
+        'movie' => 'video/x-sgi-movie',
+        'mp2' => 'audio/mpeg',
+        'mp2a' => 'audio/mpeg',
+        'mp3' => 'audio/mpeg',
+        'mp4' => 'video/mp4',
+        'mp4a' => 'audio/mp4',
+        'mp4s' => 'application/mp4',
+        'mp4v' => 'video/mp4',
+        'mp21' => 'application/mp21',
+        'mpc' => 'application/vnd.mophun.certificate',
+        'mpd' => 'application/dash+xml',
+        'mpe' => 'video/mpeg',
+        'mpeg' => 'video/mpeg',
+        'mpf' => 'application/media-policy-dataset+xml',
+        'mpg' => 'video/mpeg',
+        'mpg4' => 'video/mp4',
+        'mpga' => 'audio/mpeg',
+        'mpkg' => 'application/vnd.apple.installer+xml',
+        'mpm' => 'application/vnd.blueice.multipass',
+        'mpn' => 'application/vnd.mophun.application',
+        'mpp' => 'application/vnd.ms-project',
+        'mpt' => 'application/vnd.ms-project',
+        'mpy' => 'application/vnd.ibm.minipay',
+        'mqy' => 'application/vnd.mobius.mqy',
+        'mrc' => 'application/marc',
+        'mrcx' => 'application/marcxml+xml',
+        'ms' => 'text/troff',
+        'mscml' => 'application/mediaservercontrol+xml',
+        'mseed' => 'application/vnd.fdsn.mseed',
+        'mseq' => 'application/vnd.mseq',
+        'msf' => 'application/vnd.epson.msf',
+        'msg' => 'application/vnd.ms-outlook',
+        'msh' => 'model/mesh',
+        'msi' => 'application/x-msdownload',
+        'msl' => 'application/vnd.mobius.msl',
+        'msm' => 'application/octet-stream',
+        'msp' => 'application/octet-stream',
+        'msty' => 'application/vnd.muvee.style',
+        'mtl' => 'model/mtl',
+        'mts' => 'model/vnd.mts',
+        'mus' => 'application/vnd.musician',
+        'musd' => 'application/mmt-usd+xml',
+        'musicxml' => 'application/vnd.recordare.musicxml+xml',
+        'mvb' => 'application/x-msmediaview',
+        'mvt' => 'application/vnd.mapbox-vector-tile',
+        'mwf' => 'application/vnd.mfer',
+        'mxf' => 'application/mxf',
+        'mxl' => 'application/vnd.recordare.musicxml',
+        'mxmf' => 'audio/mobile-xmf',
+        'mxml' => 'application/xv+xml',
+        'mxs' => 'application/vnd.triscape.mxs',
+        'mxu' => 'video/vnd.mpegurl',
+        'n-gage' => 'application/vnd.nokia.n-gage.symbian.install',
+        'n3' => 'text/n3',
+        'nb' => 'application/mathematica',
+        'nbp' => 'application/vnd.wolfram.player',
+        'nc' => 'application/x-netcdf',
+        'ncx' => 'application/x-dtbncx+xml',
+        'nfo' => 'text/x-nfo',
+        'ngdat' => 'application/vnd.nokia.n-gage.data',
+        'nitf' => 'application/vnd.nitf',
+        'nlu' => 'application/vnd.neurolanguage.nlu',
+        'nml' => 'application/vnd.enliven',
+        'nnd' => 'application/vnd.noblenet-directory',
+        'nns' => 'application/vnd.noblenet-sealer',
+        'nnw' => 'application/vnd.noblenet-web',
+        'npx' => 'image/vnd.net-fpx',
+        'nq' => 'application/n-quads',
+        'nsc' => 'application/x-conference',
+        'nsf' => 'application/vnd.lotus-notes',
+        'nt' => 'application/n-triples',
+        'ntf' => 'application/vnd.nitf',
+        'numbers' => 'application/x-iwork-numbers-sffnumbers',
+        'nzb' => 'application/x-nzb',
+        'oa2' => 'application/vnd.fujitsu.oasys2',
+        'oa3' => 'application/vnd.fujitsu.oasys3',
+        'oas' => 'application/vnd.fujitsu.oasys',
+        'obd' => 'application/x-msbinder',
+        'obgx' => 'application/vnd.openblox.game+xml',
+        'obj' => 'model/obj',
+        'oda' => 'application/oda',
+        'odb' => 'application/vnd.oasis.opendocument.database',
+        'odc' => 'application/vnd.oasis.opendocument.chart',
+        'odf' => 'application/vnd.oasis.opendocument.formula',
+        'odft' => 'application/vnd.oasis.opendocument.formula-template',
+        'odg' => 'application/vnd.oasis.opendocument.graphics',
+        'odi' => 'application/vnd.oasis.opendocument.image',
+        'odm' => 'application/vnd.oasis.opendocument.text-master',
+        'odp' => 'application/vnd.oasis.opendocument.presentation',
+        'ods' => 'application/vnd.oasis.opendocument.spreadsheet',
+        'odt' => 'application/vnd.oasis.opendocument.text',
+        'oga' => 'audio/ogg',
+        'ogex' => 'model/vnd.opengex',
+        'ogg' => 'audio/ogg',
+        'ogv' => 'video/ogg',
+        'ogx' => 'application/ogg',
+        'omdoc' => 'application/omdoc+xml',
+        'onepkg' => 'application/onenote',
+        'onetmp' => 'application/onenote',
+        'onetoc' => 'application/onenote',
+        'onetoc2' => 'application/onenote',
+        'opf' => 'application/oebps-package+xml',
+        'opml' => 'text/x-opml',
+        'oprc' => 'application/vnd.palm',
+        'opus' => 'audio/ogg',
+        'org' => 'text/x-org',
+        'osf' => 'application/vnd.yamaha.openscoreformat',
+        'osfpvg' => 'application/vnd.yamaha.openscoreformat.osfpvg+xml',
+        'osm' => 'application/vnd.openstreetmap.data+xml',
+        'otc' => 'application/vnd.oasis.opendocument.chart-template',
+        'otf' => 'font/otf',
+        'otg' => 'application/vnd.oasis.opendocument.graphics-template',
+        'oth' => 'application/vnd.oasis.opendocument.text-web',
+        'oti' => 'application/vnd.oasis.opendocument.image-template',
+        'otp' => 'application/vnd.oasis.opendocument.presentation-template',
+        'ots' => 'application/vnd.oasis.opendocument.spreadsheet-template',
+        'ott' => 'application/vnd.oasis.opendocument.text-template',
+        'ova' => 'application/x-virtualbox-ova',
+        'ovf' => 'application/x-virtualbox-ovf',
+        'owl' => 'application/rdf+xml',
+        'oxps' => 'application/oxps',
+        'oxt' => 'application/vnd.openofficeorg.extension',
+        'p' => 'text/x-pascal',
+        'p7a' => 'application/x-pkcs7-signature',
+        'p7b' => 'application/x-pkcs7-certificates',
+        'p7c' => 'application/pkcs7-mime',
+        'p7m' => 'application/pkcs7-mime',
+        'p7r' => 'application/x-pkcs7-certreqresp',
+        'p7s' => 'application/pkcs7-signature',
+        'p8' => 'application/pkcs8',
+        'p10' => 'application/x-pkcs10',
+        'p12' => 'application/x-pkcs12',
+        'pac' => 'application/x-ns-proxy-autoconfig',
+        'pages' => 'application/x-iwork-pages-sffpages',
+        'pas' => 'text/x-pascal',
+        'paw' => 'application/vnd.pawaafile',
+        'pbd' => 'application/vnd.powerbuilder6',
+        'pbm' => 'image/x-portable-bitmap',
+        'pcap' => 'application/vnd.tcpdump.pcap',
+        'pcf' => 'application/x-font-pcf',
+        'pcl' => 'application/vnd.hp-pcl',
+        'pclxl' => 'application/vnd.hp-pclxl',
+        'pct' => 'image/x-pict',
+        'pcurl' => 'application/vnd.curl.pcurl',
+        'pcx' => 'image/x-pcx',
+        'pdb' => 'application/x-pilot',
+        'pde' => 'text/x-processing',
+        'pdf' => 'application/pdf',
+        'pem' => 'application/x-x509-user-cert',
+        'pfa' => 'application/x-font-type1',
+        'pfb' => 'application/x-font-type1',
+        'pfm' => 'application/x-font-type1',
+        'pfr' => 'application/font-tdpfr',
+        'pfx' => 'application/x-pkcs12',
+        'pgm' => 'image/x-portable-graymap',
+        'pgn' => 'application/x-chess-pgn',
+        'pgp' => 'application/pgp',
+        'phar' => 'application/octet-stream',
+        'php' => 'application/x-httpd-php',
+        'php3' => 'application/x-httpd-php',
+        'php4' => 'application/x-httpd-php',
+        'phps' => 'application/x-httpd-php-source',
+        'phtml' => 'application/x-httpd-php',
+        'pic' => 'image/x-pict',
+        'pkg' => 'application/octet-stream',
+        'pki' => 'application/pkixcmp',
+        'pkipath' => 'application/pkix-pkipath',
+        'pkpass' => 'application/vnd.apple.pkpass',
+        'pl' => 'application/x-perl',
+        'plb' => 'application/vnd.3gpp.pic-bw-large',
+        'plc' => 'application/vnd.mobius.plc',
+        'plf' => 'application/vnd.pocketlearn',
+        'pls' => 'application/pls+xml',
+        'pm' => 'application/x-perl',
+        'pml' => 'application/vnd.ctc-posml',
+        'png' => 'image/png',
+        'pnm' => 'image/x-portable-anymap',
+        'portpkg' => 'application/vnd.macports.portpkg',
+        'pot' => 'application/vnd.ms-powerpoint',
+        'potm' => 'application/vnd.ms-powerpoint.presentation.macroEnabled.12',
+        'potx' => 'application/vnd.openxmlformats-officedocument.presentationml.template',
+        'ppa' => 'application/vnd.ms-powerpoint',
+        'ppam' => 'application/vnd.ms-powerpoint.addin.macroEnabled.12',
+        'ppd' => 'application/vnd.cups-ppd',
+        'ppm' => 'image/x-portable-pixmap',
+        'pps' => 'application/vnd.ms-powerpoint',
+        'ppsm' => 'application/vnd.ms-powerpoint.slideshow.macroEnabled.12',
+        'ppsx' => 'application/vnd.openxmlformats-officedocument.presentationml.slideshow',
+        'ppt' => 'application/powerpoint',
+        'pptm' => 'application/vnd.ms-powerpoint.presentation.macroEnabled.12',
+        'pptx' => 'application/vnd.openxmlformats-officedocument.presentationml.presentation',
+        'pqa' => 'application/vnd.palm',
+        'prc' => 'model/prc',
+        'pre' => 'application/vnd.lotus-freelance',
+        'prf' => 'application/pics-rules',
+        'provx' => 'application/provenance+xml',
+        'ps' => 'application/postscript',
+        'psb' => 'application/vnd.3gpp.pic-bw-small',
+        'psd' => 'application/x-photoshop',
+        'psf' => 'application/x-font-linux-psf',
+        'pskcxml' => 'application/pskc+xml',
+        'pti' => 'image/prs.pti',
+        'ptid' => 'application/vnd.pvi.ptid1',
+        'pub' => 'application/x-mspublisher',
+        'pvb' => 'application/vnd.3gpp.pic-bw-var',
+        'pwn' => 'application/vnd.3m.post-it-notes',
+        'pya' => 'audio/vnd.ms-playready.media.pya',
+        'pyv' => 'video/vnd.ms-playready.media.pyv',
+        'qam' => 'application/vnd.epson.quickanime',
+        'qbo' => 'application/vnd.intu.qbo',
+        'qfx' => 'application/vnd.intu.qfx',
+        'qps' => 'application/vnd.publishare-delta-tree',
+        'qt' => 'video/quicktime',
+        'qwd' => 'application/vnd.quark.quarkxpress',
+        'qwt' => 'application/vnd.quark.quarkxpress',
+        'qxb' => 'application/vnd.quark.quarkxpress',
+        'qxd' => 'application/vnd.quark.quarkxpress',
+        'qxl' => 'application/vnd.quark.quarkxpress',
+        'qxt' => 'application/vnd.quark.quarkxpress',
+        'ra' => 'audio/x-realaudio',
+        'ram' => 'audio/x-pn-realaudio',
+        'raml' => 'application/raml+yaml',
+        'rapd' => 'application/route-apd+xml',
+        'rar' => 'application/x-rar',
+        'ras' => 'image/x-cmu-raster',
+        'rcprofile' => 'application/vnd.ipunplugged.rcprofile',
+        'rdf' => 'application/rdf+xml',
+        'rdz' => 'application/vnd.data-vision.rdz',
+        'relo' => 'application/p2p-overlay+xml',
+        'rep' => 'application/vnd.businessobjects',
+        'res' => 'application/x-dtbresource+xml',
+        'rgb' => 'image/x-rgb',
+        'rif' => 'application/reginfo+xml',
+        'rip' => 'audio/vnd.rip',
+        'ris' => 'application/x-research-info-systems',
+        'rl' => 'application/resource-lists+xml',
+        'rlc' => 'image/vnd.fujixerox.edmics-rlc',
+        'rld' => 'application/resource-lists-diff+xml',
+        'rm' => 'audio/x-pn-realaudio',
+        'rmi' => 'audio/midi',
+        'rmp' => 'audio/x-pn-realaudio-plugin',
+        'rms' => 'application/vnd.jcp.javame.midlet-rms',
+        'rmvb' => 'application/vnd.rn-realmedia-vbr',
+        'rnc' => 'application/relax-ng-compact-syntax',
+        'rng' => 'application/xml',
+        'roa' => 'application/rpki-roa',
+        'roff' => 'text/troff',
+        'rp9' => 'application/vnd.cloanto.rp9',
+        'rpm' => 'audio/x-pn-realaudio-plugin',
+        'rpss' => 'application/vnd.nokia.radio-presets',
+        'rpst' => 'application/vnd.nokia.radio-preset',
+        'rq' => 'application/sparql-query',
+        'rs' => 'application/rls-services+xml',
+        'rsa' => 'application/x-pkcs7',
+        'rsat' => 'application/atsc-rsat+xml',
+        'rsd' => 'application/rsd+xml',
+        'rsheet' => 'application/urc-ressheet+xml',
+        'rss' => 'application/rss+xml',
+        'rtf' => 'text/rtf',
+        'rtx' => 'text/richtext',
+        'run' => 'application/x-makeself',
+        'rusd' => 'application/route-usd+xml',
+        'rv' => 'video/vnd.rn-realvideo',
+        's' => 'text/x-asm',
+        's3m' => 'audio/s3m',
+        'saf' => 'application/vnd.yamaha.smaf-audio',
+        'sass' => 'text/x-sass',
+        'sbml' => 'application/sbml+xml',
+        'sc' => 'application/vnd.ibm.secure-container',
+        'scd' => 'application/x-msschedule',
+        'scm' => 'application/vnd.lotus-screencam',
+        'scq' => 'application/scvp-cv-request',
+        'scs' => 'application/scvp-cv-response',
+        'scss' => 'text/x-scss',
+        'scurl' => 'text/vnd.curl.scurl',
+        'sda' => 'application/vnd.stardivision.draw',
+        'sdc' => 'application/vnd.stardivision.calc',
+        'sdd' => 'application/vnd.stardivision.impress',
+        'sdkd' => 'application/vnd.solent.sdkm+xml',
+        'sdkm' => 'application/vnd.solent.sdkm+xml',
+        'sdp' => 'application/sdp',
+        'sdw' => 'application/vnd.stardivision.writer',
+        'sea' => 'application/octet-stream',
+        'see' => 'application/vnd.seemail',
+        'seed' => 'application/vnd.fdsn.seed',
+        'sema' => 'application/vnd.sema',
+        'semd' => 'application/vnd.semd',
+        'semf' => 'application/vnd.semf',
+        'senmlx' => 'application/senml+xml',
+        'sensmlx' => 'application/sensml+xml',
+        'ser' => 'application/java-serialized-object',
+        'setpay' => 'application/set-payment-initiation',
+        'setreg' => 'application/set-registration-initiation',
+        'sfd-hdstx' => 'application/vnd.hydrostatix.sof-data',
+        'sfs' => 'application/vnd.spotfire.sfs',
+        'sfv' => 'text/x-sfv',
+        'sgi' => 'image/sgi',
+        'sgl' => 'application/vnd.stardivision.writer-global',
+        'sgm' => 'text/sgml',
+        'sgml' => 'text/sgml',
+        'sh' => 'application/x-sh',
+        'shar' => 'application/x-shar',
+        'shex' => 'text/shex',
+        'shf' => 'application/shf+xml',
+        'shtml' => 'text/html',
+        'sid' => 'image/x-mrsid-image',
+        'sieve' => 'application/sieve',
+        'sig' => 'application/pgp-signature',
+        'sil' => 'audio/silk',
+        'silo' => 'model/mesh',
+        'sis' => 'application/vnd.symbian.install',
+        'sisx' => 'application/vnd.symbian.install',
+        'sit' => 'application/x-stuffit',
+        'sitx' => 'application/x-stuffitx',
+        'siv' => 'application/sieve',
+        'skd' => 'application/vnd.koan',
+        'skm' => 'application/vnd.koan',
+        'skp' => 'application/vnd.koan',
+        'skt' => 'application/vnd.koan',
+        'sldm' => 'application/vnd.ms-powerpoint.slide.macroenabled.12',
+        'sldx' => 'application/vnd.openxmlformats-officedocument.presentationml.slide',
+        'slim' => 'text/slim',
+        'slm' => 'text/slim',
+        'sls' => 'application/route-s-tsid+xml',
+        'slt' => 'application/vnd.epson.salt',
+        'sm' => 'application/vnd.stepmania.stepchart',
+        'smf' => 'application/vnd.stardivision.math',
+        'smi' => 'application/smil',
+        'smil' => 'application/smil',
+        'smv' => 'video/x-smv',
+        'smzip' => 'application/vnd.stepmania.package',
+        'snd' => 'audio/basic',
+        'snf' => 'application/x-font-snf',
+        'so' => 'application/octet-stream',
+        'spc' => 'application/x-pkcs7-certificates',
+        'spdx' => 'text/spdx',
+        'spf' => 'application/vnd.yamaha.smaf-phrase',
+        'spl' => 'application/x-futuresplash',
+        'spot' => 'text/vnd.in3d.spot',
+        'spp' => 'application/scvp-vp-response',
+        'spq' => 'application/scvp-vp-request',
+        'spx' => 'audio/ogg',
+        'sql' => 'application/x-sql',
+        'src' => 'application/x-wais-source',
+        'srt' => 'application/x-subrip',
+        'sru' => 'application/sru+xml',
+        'srx' => 'application/sparql-results+xml',
+        'ssdl' => 'application/ssdl+xml',
+        'sse' => 'application/vnd.kodak-descriptor',
+        'ssf' => 'application/vnd.epson.ssf',
+        'ssml' => 'application/ssml+xml',
+        'sst' => 'application/octet-stream',
+        'st' => 'application/vnd.sailingtracker.track',
+        'stc' => 'application/vnd.sun.xml.calc.template',
+        'std' => 'application/vnd.sun.xml.draw.template',
+        'stf' => 'application/vnd.wt.stf',
+        'sti' => 'application/vnd.sun.xml.impress.template',
+        'stk' => 'application/hyperstudio',
+        'stl' => 'model/stl',
+        'stpx' => 'model/step+xml',
+        'stpxz' => 'model/step-xml+zip',
+        'stpz' => 'model/step+zip',
+        'str' => 'application/vnd.pg.format',
+        'stw' => 'application/vnd.sun.xml.writer.template',
+        'styl' => 'text/stylus',
+        'stylus' => 'text/stylus',
+        'sub' => 'text/vnd.dvb.subtitle',
+        'sus' => 'application/vnd.sus-calendar',
+        'susp' => 'application/vnd.sus-calendar',
+        'sv4cpio' => 'application/x-sv4cpio',
+        'sv4crc' => 'application/x-sv4crc',
+        'svc' => 'application/vnd.dvb.service',
+        'svd' => 'application/vnd.svd',
+        'svg' => 'image/svg+xml',
+        'svgz' => 'image/svg+xml',
+        'swa' => 'application/x-director',
+        'swf' => 'application/x-shockwave-flash',
+        'swi' => 'application/vnd.aristanetworks.swi',
+        'swidtag' => 'application/swid+xml',
+        'sxc' => 'application/vnd.sun.xml.calc',
+        'sxd' => 'application/vnd.sun.xml.draw',
+        'sxg' => 'application/vnd.sun.xml.writer.global',
+        'sxi' => 'application/vnd.sun.xml.impress',
+        'sxm' => 'application/vnd.sun.xml.math',
+        'sxw' => 'application/vnd.sun.xml.writer',
+        't' => 'text/troff',
+        't3' => 'application/x-t3vm-image',
+        't38' => 'image/t38',
+        'taglet' => 'application/vnd.mynfc',
+        'tao' => 'application/vnd.tao.intent-module-archive',
+        'tap' => 'image/vnd.tencent.tap',
+        'tar' => 'application/x-tar',
+        'tcap' => 'application/vnd.3gpp2.tcap',
+        'tcl' => 'application/x-tcl',
+        'td' => 'application/urc-targetdesc+xml',
+        'teacher' => 'application/vnd.smart.teacher',
+        'tei' => 'application/tei+xml',
+        'teicorpus' => 'application/tei+xml',
+        'tex' => 'application/x-tex',
+        'texi' => 'application/x-texinfo',
+        'texinfo' => 'application/x-texinfo',
+        'text' => 'text/plain',
+        'tfi' => 'application/thraud+xml',
+        'tfm' => 'application/x-tex-tfm',
+        'tfx' => 'image/tiff-fx',
+        'tga' => 'image/x-tga',
+        'tgz' => 'application/x-tar',
+        'thmx' => 'application/vnd.ms-officetheme',
+        'tif' => 'image/tiff',
+        'tiff' => 'image/tiff',
+        'tk' => 'application/x-tcl',
+        'tmo' => 'application/vnd.tmobile-livetv',
+        'toml' => 'application/toml',
+        'torrent' => 'application/x-bittorrent',
+        'tpl' => 'application/vnd.groove-tool-template',
+        'tpt' => 'application/vnd.trid.tpt',
+        'tr' => 'text/troff',
+        'tra' => 'application/vnd.trueapp',
+        'trig' => 'application/trig',
+        'trm' => 'application/x-msterminal',
+        'ts' => 'video/mp2t',
+        'tsd' => 'application/timestamped-data',
+        'tsv' => 'text/tab-separated-values',
+        'ttc' => 'font/collection',
+        'ttf' => 'font/ttf',
+        'ttl' => 'text/turtle',
+        'ttml' => 'application/ttml+xml',
+        'twd' => 'application/vnd.simtech-mindmapper',
+        'twds' => 'application/vnd.simtech-mindmapper',
+        'txd' => 'application/vnd.genomatix.tuxedo',
+        'txf' => 'application/vnd.mobius.txf',
+        'txt' => 'text/plain',
+        'u3d' => 'model/u3d',
+        'u8dsn' => 'message/global-delivery-status',
+        'u8hdr' => 'message/global-headers',
+        'u8mdn' => 'message/global-disposition-notification',
+        'u8msg' => 'message/global',
+        'u32' => 'application/x-authorware-bin',
+        'ubj' => 'application/ubjson',
+        'udeb' => 'application/x-debian-package',
+        'ufd' => 'application/vnd.ufdl',
+        'ufdl' => 'application/vnd.ufdl',
+        'ulx' => 'application/x-glulx',
+        'umj' => 'application/vnd.umajin',
+        'unityweb' => 'application/vnd.unity',
+        'uoml' => 'application/vnd.uoml+xml',
+        'uri' => 'text/uri-list',
+        'uris' => 'text/uri-list',
+        'urls' => 'text/uri-list',
+        'usdz' => 'model/vnd.usdz+zip',
+        'ustar' => 'application/x-ustar',
+        'utz' => 'application/vnd.uiq.theme',
+        'uu' => 'text/x-uuencode',
+        'uva' => 'audio/vnd.dece.audio',
+        'uvd' => 'application/vnd.dece.data',
+        'uvf' => 'application/vnd.dece.data',
+        'uvg' => 'image/vnd.dece.graphic',
+        'uvh' => 'video/vnd.dece.hd',
+        'uvi' => 'image/vnd.dece.graphic',
+        'uvm' => 'video/vnd.dece.mobile',
+        'uvp' => 'video/vnd.dece.pd',
+        'uvs' => 'video/vnd.dece.sd',
+        'uvt' => 'application/vnd.dece.ttml+xml',
+        'uvu' => 'video/vnd.uvvu.mp4',
+        'uvv' => 'video/vnd.dece.video',
+        'uvva' => 'audio/vnd.dece.audio',
+        'uvvd' => 'application/vnd.dece.data',
+        'uvvf' => 'application/vnd.dece.data',
+        'uvvg' => 'image/vnd.dece.graphic',
+        'uvvh' => 'video/vnd.dece.hd',
+        'uvvi' => 'image/vnd.dece.graphic',
+        'uvvm' => 'video/vnd.dece.mobile',
+        'uvvp' => 'video/vnd.dece.pd',
+        'uvvs' => 'video/vnd.dece.sd',
+        'uvvt' => 'application/vnd.dece.ttml+xml',
+        'uvvu' => 'video/vnd.uvvu.mp4',
+        'uvvv' => 'video/vnd.dece.video',
+        'uvvx' => 'application/vnd.dece.unspecified',
+        'uvvz' => 'application/vnd.dece.zip',
+        'uvx' => 'application/vnd.dece.unspecified',
+        'uvz' => 'application/vnd.dece.zip',
+        'vbox' => 'application/x-virtualbox-vbox',
+        'vbox-extpack' => 'application/x-virtualbox-vbox-extpack',
+        'vcard' => 'text/vcard',
+        'vcd' => 'application/x-cdlink',
+        'vcf' => 'text/x-vcard',
+        'vcg' => 'application/vnd.groove-vcard',
+        'vcs' => 'text/x-vcalendar',
+        'vcx' => 'application/vnd.vcx',
+        'vdi' => 'application/x-virtualbox-vdi',
+        'vds' => 'model/vnd.sap.vds',
+        'vhd' => 'application/x-virtualbox-vhd',
+        'vis' => 'application/vnd.visionary',
+        'viv' => 'video/vnd.vivo',
+        'vlc' => 'application/videolan',
+        'vmdk' => 'application/x-virtualbox-vmdk',
+        'vob' => 'video/x-ms-vob',
+        'vor' => 'application/vnd.stardivision.writer',
+        'vox' => 'application/x-authorware-bin',
+        'vrml' => 'model/vrml',
+        'vsd' => 'application/vnd.visio',
+        'vsf' => 'application/vnd.vsf',
+        'vss' => 'application/vnd.visio',
+        'vst' => 'application/vnd.visio',
+        'vsw' => 'application/vnd.visio',
+        'vtf' => 'image/vnd.valve.source.texture',
+        'vtt' => 'text/vtt',
+        'vtu' => 'model/vnd.vtu',
+        'vxml' => 'application/voicexml+xml',
+        'w3d' => 'application/x-director',
+        'wad' => 'application/x-doom',
+        'wadl' => 'application/vnd.sun.wadl+xml',
+        'war' => 'application/java-archive',
+        'wasm' => 'application/wasm',
+        'wav' => 'audio/x-wav',
+        'wax' => 'audio/x-ms-wax',
+        'wbmp' => 'image/vnd.wap.wbmp',
+        'wbs' => 'application/vnd.criticaltools.wbs+xml',
+        'wbxml' => 'application/wbxml',
+        'wcm' => 'application/vnd.ms-works',
+        'wdb' => 'application/vnd.ms-works',
+        'wdp' => 'image/vnd.ms-photo',
+        'weba' => 'audio/webm',
+        'webapp' => 'application/x-web-app-manifest+json',
+        'webm' => 'video/webm',
+        'webmanifest' => 'application/manifest+json',
+        'webp' => 'image/webp',
+        'wg' => 'application/vnd.pmi.widget',
+        'wgt' => 'application/widget',
+        'wif' => 'application/watcherinfo+xml',
+        'wks' => 'application/vnd.ms-works',
+        'wm' => 'video/x-ms-wm',
+        'wma' => 'audio/x-ms-wma',
+        'wmd' => 'application/x-ms-wmd',
+        'wmf' => 'image/wmf',
+        'wml' => 'text/vnd.wap.wml',
+        'wmlc' => 'application/wmlc',
+        'wmls' => 'text/vnd.wap.wmlscript',
+        'wmlsc' => 'application/vnd.wap.wmlscriptc',
+        'wmv' => 'video/x-ms-wmv',
+        'wmx' => 'video/x-ms-wmx',
+        'wmz' => 'application/x-msmetafile',
+        'woff' => 'font/woff',
+        'woff2' => 'font/woff2',
+        'word' => 'application/msword',
+        'wpd' => 'application/vnd.wordperfect',
+        'wpl' => 'application/vnd.ms-wpl',
+        'wps' => 'application/vnd.ms-works',
+        'wqd' => 'application/vnd.wqd',
+        'wri' => 'application/x-mswrite',
+        'wrl' => 'model/vrml',
+        'wsc' => 'message/vnd.wfa.wsc',
+        'wsdl' => 'application/wsdl+xml',
+        'wspolicy' => 'application/wspolicy+xml',
+        'wtb' => 'application/vnd.webturbo',
+        'wvx' => 'video/x-ms-wvx',
+        'x3d' => 'model/x3d+xml',
+        'x3db' => 'model/x3d+fastinfoset',
+        'x3dbz' => 'model/x3d+binary',
+        'x3dv' => 'model/x3d-vrml',
+        'x3dvz' => 'model/x3d+vrml',
+        'x3dz' => 'model/x3d+xml',
+        'x32' => 'application/x-authorware-bin',
+        'x_b' => 'model/vnd.parasolid.transmit.binary',
+        'x_t' => 'model/vnd.parasolid.transmit.text',
+        'xaml' => 'application/xaml+xml',
+        'xap' => 'application/x-silverlight-app',
+        'xar' => 'application/vnd.xara',
+        'xav' => 'application/xcap-att+xml',
+        'xbap' => 'application/x-ms-xbap',
+        'xbd' => 'application/vnd.fujixerox.docuworks.binder',
+        'xbm' => 'image/x-xbitmap',
+        'xca' => 'application/xcap-caps+xml',
+        'xcs' => 'application/calendar+xml',
+        'xdf' => 'application/xcap-diff+xml',
+        'xdm' => 'application/vnd.syncml.dm+xml',
+        'xdp' => 'application/vnd.adobe.xdp+xml',
+        'xdssc' => 'application/dssc+xml',
+        'xdw' => 'application/vnd.fujixerox.docuworks',
+        'xel' => 'application/xcap-el+xml',
+        'xenc' => 'application/xenc+xml',
+        'xer' => 'application/patch-ops-error+xml',
+        'xfdf' => 'application/vnd.adobe.xfdf',
+        'xfdl' => 'application/vnd.xfdl',
+        'xht' => 'application/xhtml+xml',
+        'xhtml' => 'application/xhtml+xml',
+        'xhvml' => 'application/xv+xml',
+        'xif' => 'image/vnd.xiff',
+        'xl' => 'application/excel',
+        'xla' => 'application/vnd.ms-excel',
+        'xlam' => 'application/vnd.ms-excel.addin.macroEnabled.12',
+        'xlc' => 'application/vnd.ms-excel',
+        'xlf' => 'application/xliff+xml',
+        'xlm' => 'application/vnd.ms-excel',
+        'xls' => 'application/vnd.ms-excel',
+        'xlsb' => 'application/vnd.ms-excel.sheet.binary.macroEnabled.12',
+        'xlsm' => 'application/vnd.ms-excel.sheet.macroEnabled.12',
+        'xlsx' => 'application/vnd.openxmlformats-officedocument.spreadsheetml.sheet',
+        'xlt' => 'application/vnd.ms-excel',
+        'xltm' => 'application/vnd.ms-excel.template.macroEnabled.12',
+        'xltx' => 'application/vnd.openxmlformats-officedocument.spreadsheetml.template',
+        'xlw' => 'application/vnd.ms-excel',
+        'xm' => 'audio/xm',
+        'xml' => 'application/xml',
+        'xns' => 'application/xcap-ns+xml',
+        'xo' => 'application/vnd.olpc-sugar',
+        'xop' => 'application/xop+xml',
+        'xpi' => 'application/x-xpinstall',
+        'xpl' => 'application/xproc+xml',
+        'xpm' => 'image/x-xpixmap',
+        'xpr' => 'application/vnd.is-xpr',
+        'xps' => 'application/vnd.ms-xpsdocument',
+        'xpw' => 'application/vnd.intercon.formnet',
+        'xpx' => 'application/vnd.intercon.formnet',
+        'xsd' => 'application/xml',
+        'xsl' => 'application/xml',
+        'xslt' => 'application/xslt+xml',
+        'xsm' => 'application/vnd.syncml+xml',
+        'xspf' => 'application/xspf+xml',
+        'xul' => 'application/vnd.mozilla.xul+xml',
+        'xvm' => 'application/xv+xml',
+        'xvml' => 'application/xv+xml',
+        'xwd' => 'image/x-xwindowdump',
+        'xyz' => 'chemical/x-xyz',
+        'xz' => 'application/x-xz',
+        'yaml' => 'text/yaml',
+        'yang' => 'application/yang',
+        'yin' => 'application/yin+xml',
+        'yml' => 'text/yaml',
+        'ymp' => 'text/x-suse-ymp',
+        'z' => 'application/x-compress',
+        'z1' => 'application/x-zmachine',
+        'z2' => 'application/x-zmachine',
+        'z3' => 'application/x-zmachine',
+        'z4' => 'application/x-zmachine',
+        'z5' => 'application/x-zmachine',
+        'z6' => 'application/x-zmachine',
+        'z7' => 'application/x-zmachine',
+        'z8' => 'application/x-zmachine',
+        'zaz' => 'application/vnd.zzazz.deck+xml',
+        'zip' => 'application/zip',
+        'zir' => 'application/vnd.zul',
+        'zirz' => 'application/vnd.zul',
+        'zmm' => 'application/vnd.handheld-entertainment+xml',
+        'zsh' => 'text/x-scriptzsh',
     ];
 
     /**
      * Determines the mimetype of a file by looking at its extension.
+     *
+     * @link https://raw.githubusercontent.com/jshttp/mime-db/master/db.json
      */
     public static function fromFilename(string $filename): ?string
     {
@@ -121,7 +1228,7 @@ public static function fromFilename(string $filename): ?string
     /**
      * Maps a file extensions to a mimetype.
      *
-     * @link http://svn.apache.org/repos/asf/httpd/httpd/branches/1.3.x/conf/mime.types
+     * @link https://raw.githubusercontent.com/jshttp/mime-db/master/db.json
      */
     public static function fromExtension(string $extension): ?string
     {
diff --git a/vendor/guzzlehttp/psr7/src/MultipartStream.php b/vendor/guzzlehttp/psr7/src/MultipartStream.php
index f76d7c614..3ae2c84a0 100644
--- a/vendor/guzzlehttp/psr7/src/MultipartStream.php
+++ b/vendor/guzzlehttp/psr7/src/MultipartStream.php
@@ -17,6 +17,9 @@ final class MultipartStream implements StreamInterface
     /** @var string */
     private $boundary;
 
+    /** @var StreamInterface */
+    private $stream;
+
     /**
      * @param array  $elements Array of associative arrays, each containing a
      *                         required "name" key mapping to the form field,
@@ -68,6 +71,9 @@ protected function createStream(array $elements = []): StreamInterface
         $stream = new AppendStream();
 
         foreach ($elements as $element) {
+            if (!is_array($element)) {
+                throw new \UnexpectedValueException("An array is expected");
+            }
             $this->addElement($stream, $element);
         }
 
@@ -89,7 +95,7 @@ private function addElement(AppendStream $stream, array $element): void
 
         if (empty($element['filename'])) {
             $uri = $element['contents']->getMetadata('uri');
-            if (substr($uri, 0, 6) !== 'php://') {
+            if ($uri && \is_string($uri) && \substr($uri, 0, 6) !== 'php://' && \substr($uri, 0, 7) !== 'data://') {
                 $element['filename'] = $uri;
             }
         }
diff --git a/vendor/guzzlehttp/psr7/src/NoSeekStream.php b/vendor/guzzlehttp/psr7/src/NoSeekStream.php
index 99e25b9e3..161a224f0 100644
--- a/vendor/guzzlehttp/psr7/src/NoSeekStream.php
+++ b/vendor/guzzlehttp/psr7/src/NoSeekStream.php
@@ -13,6 +13,9 @@ final class NoSeekStream implements StreamInterface
 {
     use StreamDecoratorTrait;
 
+    /** @var StreamInterface */
+    private $stream;
+
     public function seek($offset, $whence = SEEK_SET): void
     {
         throw new \RuntimeException('Cannot seek a NoSeekStream');
diff --git a/vendor/guzzlehttp/psr7/src/Query.php b/vendor/guzzlehttp/psr7/src/Query.php
index 4fd0ca96d..2faab3a88 100644
--- a/vendor/guzzlehttp/psr7/src/Query.php
+++ b/vendor/guzzlehttp/psr7/src/Query.php
@@ -43,7 +43,7 @@ public static function parse(string $str, $urlEncoding = true): array
             $parts = explode('=', $kvp, 2);
             $key = $decoder($parts[0]);
             $value = isset($parts[1]) ? $decoder($parts[1]) : null;
-            if (!isset($result[$key])) {
+            if (!array_key_exists($key, $result)) {
                 $result[$key] = $value;
             } else {
                 if (!is_array($result[$key])) {
diff --git a/vendor/guzzlehttp/psr7/src/ServerRequest.php b/vendor/guzzlehttp/psr7/src/ServerRequest.php
index 6ae3f9beb..43cbb502e 100644
--- a/vendor/guzzlehttp/psr7/src/ServerRequest.php
+++ b/vendor/guzzlehttp/psr7/src/ServerRequest.php
@@ -80,7 +80,7 @@ public function __construct(
     /**
      * Return an UploadedFile instance array.
      *
-     * @param array $files A array which respect $_FILES structure
+     * @param array $files An array which respect $_FILES structure
      *
      * @throws InvalidArgumentException for unrecognized values
      */
diff --git a/vendor/guzzlehttp/psr7/src/Stream.php b/vendor/guzzlehttp/psr7/src/Stream.php
index d389427c6..ecd31861e 100644
--- a/vendor/guzzlehttp/psr7/src/Stream.php
+++ b/vendor/guzzlehttp/psr7/src/Stream.php
@@ -96,13 +96,11 @@ public function getContents(): string
             throw new \RuntimeException('Stream is detached');
         }
 
-        $contents = stream_get_contents($this->stream);
-
-        if ($contents === false) {
-            throw new \RuntimeException('Unable to read stream contents');
+        if (!$this->readable) {
+            throw new \RuntimeException('Cannot read from non-readable stream');
         }
 
-        return $contents;
+        return Utils::tryGetContents($this->stream);
     }
 
     public function close(): void
@@ -229,7 +227,12 @@ public function read($length): string
             return '';
         }
 
-        $string = fread($this->stream, $length);
+        try {
+            $string = fread($this->stream, $length);
+        } catch (\Exception $e) {
+            throw new \RuntimeException('Unable to read from stream', 0, $e);
+        }
+
         if (false === $string) {
             throw new \RuntimeException('Unable to read from stream');
         }
diff --git a/vendor/guzzlehttp/psr7/src/Uri.php b/vendor/guzzlehttp/psr7/src/Uri.php
index 3898f7830..5c6416ae6 100644
--- a/vendor/guzzlehttp/psr7/src/Uri.php
+++ b/vendor/guzzlehttp/psr7/src/Uri.php
@@ -14,7 +14,7 @@
  * @author Tobias Schultze
  * @author Matthew Weier O'Phinney
  */
-class Uri implements UriInterface
+class Uri implements UriInterface, \JsonSerializable
 {
     /**
      * Absolute http and https URIs require a host per RFC 7230 Section 2.7
@@ -525,6 +525,11 @@ public function withFragment($fragment): UriInterface
         return $new;
     }
 
+    public function jsonSerialize(): string
+    {
+        return $this->__toString();
+    }
+
     /**
      * Apply parse_url parts to a URI.
      *
diff --git a/vendor/guzzlehttp/psr7/src/UriComparator.php b/vendor/guzzlehttp/psr7/src/UriComparator.php
new file mode 100644
index 000000000..70c582aa0
--- /dev/null
+++ b/vendor/guzzlehttp/psr7/src/UriComparator.php
@@ -0,0 +1,52 @@
+<?php
+
+declare(strict_types=1);
+
+namespace GuzzleHttp\Psr7;
+
+use Psr\Http\Message\UriInterface;
+
+/**
+ * Provides methods to determine if a modified URL should be considered cross-origin.
+ *
+ * @author Graham Campbell
+ */
+final class UriComparator
+{
+    /**
+     * Determines if a modified URL should be considered cross-origin with
+     * respect to an original URL.
+     */
+    public static function isCrossOrigin(UriInterface $original, UriInterface $modified): bool
+    {
+        if (\strcasecmp($original->getHost(), $modified->getHost()) !== 0) {
+            return true;
+        }
+
+        if ($original->getScheme() !== $modified->getScheme()) {
+            return true;
+        }
+
+        if (self::computePort($original) !== self::computePort($modified)) {
+            return true;
+        }
+
+        return false;
+    }
+
+    private static function computePort(UriInterface $uri): int
+    {
+        $port = $uri->getPort();
+
+        if (null !== $port) {
+            return $port;
+        }
+
+        return 'https' === $uri->getScheme() ? 443 : 80;
+    }
+
+    private function __construct()
+    {
+        // cannot be instantiated
+    }
+}
diff --git a/vendor/guzzlehttp/psr7/src/Utils.php b/vendor/guzzlehttp/psr7/src/Utils.php
index 6cc04ee4f..3a4cf3946 100644
--- a/vendor/guzzlehttp/psr7/src/Utils.php
+++ b/vendor/guzzlehttp/psr7/src/Utils.php
@@ -131,7 +131,7 @@ public static function hash(StreamInterface $stream, string $algo, bool $rawOutp
             hash_update($ctx, $stream->read(1048576));
         }
 
-        $out = hash_final($ctx, (bool) $rawOutput);
+        $out = hash_final($ctx, $rawOutput);
         $stream->seek($pos);
 
         return $out;
@@ -304,7 +304,7 @@ public static function streamFor($resource = '', array $options = []): StreamInt
                 /** @var resource $resource */
                 if ((\stream_get_meta_data($resource)['uri'] ?? '') === 'php://input') {
                     $stream = self::tryFopen('php://temp', 'w+');
-                    fwrite($stream, stream_get_contents($resource));
+                    stream_copy_to_stream($resource, $stream);
                     fseek($stream, 0);
                     $resource = $stream;
                 }
@@ -386,6 +386,53 @@ public static function tryFopen(string $filename, string $mode)
         return $handle;
     }
 
+    /**
+     * Safely gets the contents of a given stream.
+     *
+     * When stream_get_contents fails, PHP normally raises a warning. This
+     * function adds an error handler that checks for errors and throws an
+     * exception instead.
+     *
+     * @param resource $stream
+     *
+     * @throws \RuntimeException if the stream cannot be read
+     */
+    public static function tryGetContents($stream): string
+    {
+        $ex = null;
+        set_error_handler(static function (int $errno, string $errstr) use (&$ex): bool {
+            $ex = new \RuntimeException(sprintf(
+                'Unable to read stream contents: %s',
+                $errstr
+            ));
+
+            return true;
+        });
+
+        try {
+            /** @var string|false $contents */
+            $contents = stream_get_contents($stream);
+
+            if ($contents === false) {
+                $ex = new \RuntimeException('Unable to read stream contents');
+            }
+        } catch (\Throwable $e) {
+            $ex = new \RuntimeException(sprintf(
+                'Unable to read stream contents: %s',
+                $e->getMessage()
+            ), 0, $e);
+        }
+
+        restore_error_handler();
+
+        if ($ex) {
+            /** @var $ex \RuntimeException */
+            throw $ex;
+        }
+
+        return $contents;
+    }
+
     /**
      * Returns a UriInterface for the given value.
      *
diff --git a/vendor/guzzlehttp/psr7/vendor-bin/php-cs-fixer/composer.json b/vendor/guzzlehttp/psr7/vendor-bin/php-cs-fixer/composer.json
deleted file mode 100644
index d69a683b9..000000000
--- a/vendor/guzzlehttp/psr7/vendor-bin/php-cs-fixer/composer.json
+++ /dev/null
@@ -1,9 +0,0 @@
-{
-    "require": {
-        "php": "^7.2.5 || ^8.0",
-        "friendsofphp/php-cs-fixer": "3.2.1"
-    },
-    "config": {
-        "preferred-install": "dist"
-    }
-}
diff --git a/vendor/guzzlehttp/psr7/vendor-bin/phpstan/composer.json b/vendor/guzzlehttp/psr7/vendor-bin/phpstan/composer.json
deleted file mode 100644
index bfbc7273b..000000000
--- a/vendor/guzzlehttp/psr7/vendor-bin/phpstan/composer.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-    "require": {
-        "php": "^7.2.5 || ^8.0",
-        "phpstan/phpstan": "0.12.81",
-        "phpstan/phpstan-deprecation-rules": "0.12.6"
-    },
-    "config": {
-        "preferred-install": "dist"
-    }
-}
diff --git a/vendor/guzzlehttp/psr7/vendor-bin/psalm/composer.json b/vendor/guzzlehttp/psr7/vendor-bin/psalm/composer.json
deleted file mode 100644
index 535a0797d..000000000
--- a/vendor/guzzlehttp/psr7/vendor-bin/psalm/composer.json
+++ /dev/null
@@ -1,9 +0,0 @@
-{
-    "require": {
-        "php": "^7.2.5 || ^8.0",
-        "psalm/phar": "4.6.2"
-    },
-    "config": {
-        "preferred-install": "dist"
-    }
-}
diff --git a/vendor/justinrainbow/json-schema/.php_cs.dist b/vendor/justinrainbow/json-schema/.php_cs.dist
deleted file mode 100644
index a9e7e4ed1..000000000
--- a/vendor/justinrainbow/json-schema/.php_cs.dist
+++ /dev/null
@@ -1,34 +0,0 @@
-<?php
-
-$finder = new PhpCsFixer\Finder();
-$config = new PhpCsFixer\Config('json-schema');
-$finder->in(__DIR__);
-
-/* Based on ^2.1 of php-cs-fixer */
-$config
-    ->setRules(array(
-        // default
-        '@PSR2' => true,
-        '@Symfony' => true,
-        // additionally
-        'array_syntax' => array('syntax' => 'long'),
-        'binary_operator_spaces' => false,
-        'concat_space' => array('spacing' => 'one'),
-        'no_useless_else' => true,
-        'no_useless_return' => true,
-        'ordered_imports' => true,
-        'phpdoc_no_package' => false,
-        'phpdoc_order' => true,
-        'phpdoc_summary' => false,
-        'pre_increment' => false,
-        'increment_style' => false,
-        'simplified_null_return' => false,
-        'trailing_comma_in_multiline_array' => false,
-        'yoda_style' => false,
-        'phpdoc_types_order' => array('null_adjustment' => 'none', 'sort_algorithm' => 'none'),
-        'no_superfluous_phpdoc_tags' => false,
-    ))
-    ->setFinder($finder)
-;
-
-return $config;
diff --git a/vendor/justinrainbow/json-schema/demo/README.md b/vendor/justinrainbow/json-schema/demo/README.md
deleted file mode 100644
index 0309ee89f..000000000
--- a/vendor/justinrainbow/json-schema/demo/README.md
+++ /dev/null
@@ -1,14 +0,0 @@
-## JsonSchema\Validator Demo
-
-This demo script uses the example from the root README.md and provides sample JSON files for testing `JsonSchema\Validator`.
-
-To change or replace the JSON schema document, please edit `/path/to/json-schema/demo/schema.json`.
-
-To change or replace the JSON document that is validated, please edit `/path/to/json-schema/demo/data.json`.
-
-To run the demo, change the path in the following example and run it in your terminal.
-
-```
-cd /path/to/json-schema/demo
-php demo.php // The supplied JSON validates against the schema.
-```
diff --git a/vendor/justinrainbow/json-schema/demo/data.json b/vendor/justinrainbow/json-schema/demo/data.json
deleted file mode 100644
index 69591b710..000000000
--- a/vendor/justinrainbow/json-schema/demo/data.json
+++ /dev/null
@@ -1,3 +0,0 @@
-{
-  "foo":"bar"
-}
diff --git a/vendor/justinrainbow/json-schema/demo/demo.php b/vendor/justinrainbow/json-schema/demo/demo.php
deleted file mode 100644
index 98b518a7b..000000000
--- a/vendor/justinrainbow/json-schema/demo/demo.php
+++ /dev/null
@@ -1,18 +0,0 @@
-<?php
-
-require __DIR__ . '/../vendor/autoload.php';
-
-$data = json_decode(file_get_contents('data.json'));
-
-// Validate
-$validator = new JsonSchema\Validator();
-$validator->check($data, (object) array('$ref' => 'file://' . realpath('schema.json')));
-
-if ($validator->isValid()) {
-    echo "The supplied JSON validates against the schema.\n";
-} else {
-    echo "JSON does not validate. Violations:\n";
-    foreach ($validator->getErrors() as $error) {
-        echo sprintf("[%s] %s\n", $error['property'], $error['message']);
-    }
-}
diff --git a/vendor/justinrainbow/json-schema/demo/schema.json b/vendor/justinrainbow/json-schema/demo/schema.json
deleted file mode 100644
index e6307dc1c..000000000
--- a/vendor/justinrainbow/json-schema/demo/schema.json
+++ /dev/null
@@ -1,3 +0,0 @@
-{
-  "type": "object"
-}
diff --git a/vendor/justinrainbow/json-schema/phpunit.xml.dist b/vendor/justinrainbow/json-schema/phpunit.xml.dist
deleted file mode 100644
index 0136d8edc..000000000
--- a/vendor/justinrainbow/json-schema/phpunit.xml.dist
+++ /dev/null
@@ -1,26 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<phpunit backupGlobals="false"
-         backupStaticAttributes="false"
-         colors="true"
-         convertErrorsToExceptions="true"
-         convertNoticesToExceptions="true"
-         convertWarningsToExceptions="true"
-         processIsolation="false"
-         stopOnFailure="false"
-         syntaxCheck="false"
-         bootstrap="vendor/autoload.php"
-         verbose="true"
->
-    <testsuites>
-        <testsuite name="JSON Schema Test Suite">
-            <directory>tests</directory>
-        </testsuite>
-    </testsuites>
-
-    <filter>
-        <whitelist>
-            <directory>./src/JsonSchema/</directory>
-        </whitelist>
-    </filter>
-</phpunit>
diff --git a/vendor/justinrainbow/json-schema/src/JsonSchema/Constraints/TypeConstraint.php b/vendor/justinrainbow/json-schema/src/JsonSchema/Constraints/TypeConstraint.php
index 0ef328431..efc0abbc4 100644
--- a/vendor/justinrainbow/json-schema/src/JsonSchema/Constraints/TypeConstraint.php
+++ b/vendor/justinrainbow/json-schema/src/JsonSchema/Constraints/TypeConstraint.php
@@ -134,7 +134,7 @@ protected function implodeWith(array $elements, $delimiter = ', ', $listEnd = fa
      */
     protected function validateTypeNameWording($type)
     {
-        if (!isset(self::$wording[$type])) {
+        if (!array_key_exists($type, self::$wording)) {
             throw new StandardUnexpectedValueException(
                 sprintf(
                     'No wording for %s available, expected wordings are: [%s]',
diff --git a/vendor/phpmailer/phpmailer/README.md b/vendor/phpmailer/phpmailer/README.md
index 81b089763..56f971a49 100644
--- a/vendor/phpmailer/phpmailer/README.md
+++ b/vendor/phpmailer/phpmailer/README.md
@@ -1,3 +1,5 @@
+[![SWUbanner](https://raw.githubusercontent.com/vshymanskyy/StandWithUkraine/main/banner2-direct.svg)](https://supportukrainenow.org/)
+
 ![PHPMailer](https://raw.github.com/PHPMailer/PHPMailer/master/examples/images/phpmailer.png)
 
 # PHPMailer – A full-featured email creation and transfer class for PHP
@@ -8,6 +10,7 @@
 [![Total Downloads](https://poser.pugx.org/phpmailer/phpmailer/downloads)](https://packagist.org/packages/phpmailer/phpmailer)
 [![License](https://poser.pugx.org/phpmailer/phpmailer/license.svg)](https://packagist.org/packages/phpmailer/phpmailer)
 [![API Docs](https://github.com/phpmailer/phpmailer/workflows/Docs/badge.svg)](https://phpmailer.github.io/PHPMailer/)
+[![OpenSSF Scorecard](https://api.securityscorecards.dev/projects/github.com/PHPMailer/PHPMailer/badge)](https://api.securityscorecards.dev/projects/github.com/PHPMailer/PHPMailer)
 
 ## Features
 - Probably the world's most popular code for sending email from PHP!
diff --git a/vendor/phpmailer/phpmailer/VERSION b/vendor/phpmailer/phpmailer/VERSION
index 73092f345..653877f1f 100644
--- a/vendor/phpmailer/phpmailer/VERSION
+++ b/vendor/phpmailer/phpmailer/VERSION
@@ -1 +1 @@
-6.5.3
\ No newline at end of file
+6.6.5
\ No newline at end of file
diff --git a/vendor/phpmailer/phpmailer/composer.json b/vendor/phpmailer/phpmailer/composer.json
index 28557f59d..9275fab48 100644
--- a/vendor/phpmailer/phpmailer/composer.json
+++ b/vendor/phpmailer/phpmailer/composer.json
@@ -25,6 +25,11 @@
             "type": "github"
         }
     ],
+    "config": {
+        "allow-plugins": {
+            "dealerdirect/phpcodesniffer-composer-installer": true
+        }
+    },
     "require": {
         "php": ">=5.5.0",
         "ext-ctype": "*",
@@ -34,11 +39,11 @@
     "require-dev": {
         "dealerdirect/phpcodesniffer-composer-installer": "^0.7.0",
         "doctrine/annotations": "^1.2",
-        "php-parallel-lint/php-console-highlighter": "^0.5.0",
-        "php-parallel-lint/php-parallel-lint": "^1.3",
+        "php-parallel-lint/php-console-highlighter": "^1.0.0",
+        "php-parallel-lint/php-parallel-lint": "^1.3.2",
         "phpcompatibility/php-compatibility": "^9.3.5",
         "roave/security-advisories": "dev-latest",
-        "squizlabs/php_codesniffer": "^3.6.0",
+        "squizlabs/php_codesniffer": "^3.6.2",
         "yoast/phpunit-polyfills": "^1.0.0"
     },
     "suggest": {
@@ -46,7 +51,7 @@
         "hayageek/oauth2-yahoo": "Needed for Yahoo XOAUTH2 authentication",
         "league/oauth2-google": "Needed for Google XOAUTH2 authentication",
         "psr/log": "For optional PSR-3 debug logging",
-        "stevenmaguire/oauth2-microsoft": "Needed for Microsoft XOAUTH2 authentication",
+        "thenetworg/oauth2-azure": "Needed for Microsoft XOAUTH2 authentication",
         "symfony/polyfill-mbstring": "To support UTF-8 if the Mbstring PHP extension is not enabled (^1.2)"
     },
     "autoload": {
@@ -65,7 +70,7 @@
         "test": "./vendor/bin/phpunit --no-coverage",
         "coverage": "./vendor/bin/phpunit",
         "lint": [
-            "@php ./vendor/php-parallel-lint/php-parallel-lint/parallel-lint . -e php,phps --exclude vendor --exclude .git --exclude build"
+            "@php ./vendor/php-parallel-lint/php-parallel-lint/parallel-lint . --show-deprecated -e php,phps --exclude vendor --exclude .git --exclude build"
         ]
     }
 }
diff --git a/vendor/phpmailer/phpmailer/get_oauth_token.php b/vendor/phpmailer/phpmailer/get_oauth_token.php
index befdc34a5..ba66f6cae 100644
--- a/vendor/phpmailer/phpmailer/get_oauth_token.php
+++ b/vendor/phpmailer/phpmailer/get_oauth_token.php
@@ -45,13 +45,25 @@
 //@see https://github.com/stevenmaguire/oauth2-microsoft
 use Stevenmaguire\OAuth2\Client\Provider\Microsoft;
 
-if (!isset($_GET['code']) && !isset($_GET['provider'])) {
+if (!isset($_GET['code']) && !isset($_POST['provider'])) {
     ?>
 <html>
-<body>Select Provider:<br>
-<a href='?provider=Google'>Google</a><br>
-<a href='?provider=Yahoo'>Yahoo</a><br>
-<a href='?provider=Microsoft'>Microsoft/Outlook/Hotmail/Live/Office365</a><br>
+<body>
+<form method="post">
+    <h1>Select Provider</h1>
+    <input type="radio" name="provider" value="Google" id="providerGoogle">
+    <label for="providerGoogle">Google</label><br>
+    <input type="radio" name="provider" value="Yahoo" id="providerYahoo">
+    <label for="providerYahoo">Yahoo</label><br>
+    <input type="radio" name="provider" value="Microsoft" id="providerMicrosoft">
+    <label for="providerMicrosoft">Microsoft</label><br>
+    <h1>Enter id and secret</h1>
+    <p>These details are obtained by setting up an app in your provider's developer console.
+    </p>
+    <p>ClientId: <input type="text" name="clientId"><p>
+    <p>ClientSecret: <input type="text" name="clientSecret"></p>
+    <input type="submit" value="Continue">
+</form>
 </body>
 </html>
     <?php
@@ -63,21 +75,25 @@
 session_start();
 
 $providerName = '';
+$clientId = '';
+$clientSecret = '';
 
-if (array_key_exists('provider', $_GET)) {
-    $providerName = $_GET['provider'];
+if (array_key_exists('provider', $_POST)) {
+    $providerName = $_POST['provider'];
+    $clientId = $_POST['clientId'];
+    $clientSecret = $_POST['clientSecret'];
     $_SESSION['provider'] = $providerName;
+    $_SESSION['clientId'] = $clientId;
+    $_SESSION['clientSecret'] = $clientSecret;
 } elseif (array_key_exists('provider', $_SESSION)) {
     $providerName = $_SESSION['provider'];
-}
-if (!in_array($providerName, ['Google', 'Microsoft', 'Yahoo'])) {
-    exit('Only Google, Microsoft and Yahoo OAuth2 providers are currently supported in this script.');
+    $clientId = $_SESSION['clientId'];
+    $clientSecret = $_SESSION['clientSecret'];
 }
 
-//These details are obtained by setting up an app in the Google developer console,
-//or whichever provider you're using.
-$clientId = 'RANDOMCHARS-----duv1n2.apps.googleusercontent.com';
-$clientSecret = 'RANDOMCHARS-----lGyjPcRtvP';
+//If you don't want to use the built-in form, set your client id and secret here
+//$clientId = 'RANDOMCHARS-----duv1n2.apps.googleusercontent.com';
+//$clientSecret = 'RANDOMCHARS-----lGyjPcRtvP';
 
 //If this automatic URL doesn't work, set it yourself manually to the URL of this script
 $redirectUri = (isset($_SERVER['HTTPS']) ? 'https://' : 'http://') . $_SERVER['HTTP_HOST'] . $_SERVER['PHP_SELF'];
diff --git a/vendor/phpmailer/phpmailer/language/phpmailer.lang-ch.php b/vendor/phpmailer/phpmailer/language/phpmailer.lang-ch.php
deleted file mode 100644
index 500c95267..000000000
--- a/vendor/phpmailer/phpmailer/language/phpmailer.lang-ch.php
+++ /dev/null
@@ -1,27 +0,0 @@
-<?php
-
-/**
- * Chinese PHPMailer language file: refer to English translation for definitive list
- * @package PHPMailer
- * @author LiuXin <http://www.80x86.cn/blog/>
- */
-
-$PHPMAILER_LANG['authenticate']         = 'SMTP 错误：身份验证失败。';
-$PHPMAILER_LANG['connect_host']         = 'SMTP 错误: 不能连接SMTP主机。';
-$PHPMAILER_LANG['data_not_accepted']    = 'SMTP 错误: 数据不可接受。';
-//$PHPMAILER_LANG['empty_message']        = 'Message body empty';
-$PHPMAILER_LANG['encoding']             = '未知编码：';
-$PHPMAILER_LANG['execute']              = '不能执行: ';
-$PHPMAILER_LANG['file_access']          = '不能访问文件：';
-$PHPMAILER_LANG['file_open']            = '文件错误：不能打开文件：';
-$PHPMAILER_LANG['from_failed']          = '下面的发送地址邮件发送失败了： ';
-$PHPMAILER_LANG['instantiate']          = '不能实现mail方法。';
-//$PHPMAILER_LANG['invalid_address']      = 'Invalid address: ';
-$PHPMAILER_LANG['mailer_not_supported'] = ' 您所选择的发送邮件的方法并不支持。';
-$PHPMAILER_LANG['provide_address']      = '您必须提供至少一个 收信人的email地址。';
-$PHPMAILER_LANG['recipients_failed']    = 'SMTP 错误： 下面的 收件人失败了： ';
-//$PHPMAILER_LANG['signing']              = 'Signing Error: ';
-//$PHPMAILER_LANG['smtp_connect_failed']  = 'SMTP Connect() failed.';
-//$PHPMAILER_LANG['smtp_error']           = 'SMTP server error: ';
-//$PHPMAILER_LANG['variable_set']         = 'Cannot set or reset variable: ';
-//$PHPMAILER_LANG['extension_missing']    = 'Extension missing: ';
diff --git a/vendor/phpmailer/phpmailer/language/phpmailer.lang-da.php b/vendor/phpmailer/phpmailer/language/phpmailer.lang-da.php
index 1edba1d7a..8b7b38a6e 100644
--- a/vendor/phpmailer/phpmailer/language/phpmailer.lang-da.php
+++ b/vendor/phpmailer/phpmailer/language/phpmailer.lang-da.php
@@ -14,16 +14,22 @@
 $PHPMAILER_LANG['empty_message']        = 'Meddelelsen er uden indhold';
 $PHPMAILER_LANG['encoding']             = 'Ukendt encode-format: ';
 $PHPMAILER_LANG['execute']              = 'Kunne ikke afvikle: ';
+$PHPMAILER_LANG['extension_missing']    = 'Udvidelse mangler: ';
 $PHPMAILER_LANG['file_access']          = 'Kunne ikke tilgå filen: ';
 $PHPMAILER_LANG['file_open']            = 'Fil fejl: Kunne ikke åbne filen: ';
 $PHPMAILER_LANG['from_failed']          = 'Følgende afsenderadresse er forkert: ';
 $PHPMAILER_LANG['instantiate']          = 'Email funktionen kunne ikke initialiseres.';
 $PHPMAILER_LANG['invalid_address']      = 'Udgyldig adresse: ';
+$PHPMAILER_LANG['invalid_header']       = 'Ugyldig header navn eller værdi';
+$PHPMAILER_LANG['invalid_hostentry']    = 'Ugyldig hostentry: ';
+$PHPMAILER_LANG['invalid_host']         = 'Ugyldig vært: ';
 $PHPMAILER_LANG['mailer_not_supported'] = ' mailer understøttes ikke.';
 $PHPMAILER_LANG['provide_address']      = 'Indtast mindst en modtagers email adresse.';
-$PHPMAILER_LANG['recipients_failed']    = 'SMTP fejl: Følgende modtagere er forkerte: ';
+$PHPMAILER_LANG['recipients_failed']    = 'SMTP fejl: Følgende modtagere fejlede: ';
 $PHPMAILER_LANG['signing']              = 'Signeringsfejl: ';
+$PHPMAILER_LANG['smtp_code']            = 'SMTP kode: ';
+$PHPMAILER_LANG['smtp_code_ex']         = 'Yderligere SMTP info: ';
 $PHPMAILER_LANG['smtp_connect_failed']  = 'SMTP Connect() fejlede.';
+$PHPMAILER_LANG['smtp_detail']          = 'Detalje: ';
 $PHPMAILER_LANG['smtp_error']           = 'SMTP server fejl: ';
 $PHPMAILER_LANG['variable_set']         = 'Kunne ikke definere eller nulstille variablen: ';
-$PHPMAILER_LANG['extension_missing']    = 'Udvidelse mangler: ';
diff --git a/vendor/phpmailer/phpmailer/language/phpmailer.lang-el.php b/vendor/phpmailer/phpmailer/language/phpmailer.lang-el.php
index b3d5ca94b..339ee5753 100644
--- a/vendor/phpmailer/phpmailer/language/phpmailer.lang-el.php
+++ b/vendor/phpmailer/phpmailer/language/phpmailer.lang-el.php
@@ -5,22 +5,29 @@
  * @package PHPMailer
  */
 
-$PHPMAILER_LANG['authenticate']         = 'SMTP Σφάλμα: Αδυναμία πιστοποίησης (authentication).';
-$PHPMAILER_LANG['connect_host']         = 'SMTP Σφάλμα: Αδυναμία σύνδεσης στον SMTP-Host.';
-$PHPMAILER_LANG['data_not_accepted']    = 'SMTP Σφάλμα: Τα δεδομένα δεν έγιναν αποδεκτά.';
-$PHPMAILER_LANG['empty_message']        = 'Το E-Mail δεν έχει περιεχόμενο .';
-$PHPMAILER_LANG['encoding']             = 'Αγνωστο Encoding-Format: ';
-$PHPMAILER_LANG['execute']              = 'Αδυναμία εκτέλεσης ακόλουθης εντολής: ';
-$PHPMAILER_LANG['file_access']          = 'Αδυναμία προσπέλασης του αρχείου: ';
-$PHPMAILER_LANG['file_open']            = 'Σφάλμα Αρχείου: Δεν είναι δυνατό το άνοιγμα του ακόλουθου αρχείου: ';
-$PHPMAILER_LANG['from_failed']          = 'Η παρακάτω διεύθυνση αποστολέα δεν είναι σωστή: ';
-$PHPMAILER_LANG['instantiate']          = 'Αδυναμία εκκίνησης Mail function.';
-$PHPMAILER_LANG['invalid_address']      = 'Το μήνυμα δεν εστάλη, η διεύθυνση δεν είναι έγκυρη: ';
+$PHPMAILER_LANG['authenticate']         = 'Σφάλμα SMTP: Αδυναμία πιστοποίησης.';
+$PHPMAILER_LANG['buggy_php']            = 'Η έκδοση PHP που χρησιμοποιείτε παρουσιάζει σφάλμα που μπορεί να έχει ως αποτέλεσμα κατεστραμένα μηνύματα. Για να το διορθώσετε, αλλάξτε τον τρόπο αποστολής σε SMTP, απενεργοποιήστε την επιλογή mail.add_x_header στο αρχείο php.ini, αλλάξτε λειτουργικό σε MacOS ή Linux ή αναβαθμίστε την PHP σε έκδοση 7.0.17+ ή 7.1.3+.';
+$PHPMAILER_LANG['connect_host']         = 'Σφάλμα SMTP: Αδυναμία σύνδεσης με τον φιλοξενητή SMTP.';
+$PHPMAILER_LANG['data_not_accepted']    = 'Σφάλμα SMTP: Μη αποδεκτά δεδομένα.';
+$PHPMAILER_LANG['empty_message']        = 'Η ηλεκτρονική επιστολή δεν έχει περιεχόμενο.';
+$PHPMAILER_LANG['encoding']             = 'Άγνωστη μορφή κωδικοποίησης: ';
+$PHPMAILER_LANG['execute']              = 'Αδυναμία εκτέλεσης: ';
+$PHPMAILER_LANG['extension_missing']    = 'Απουσία επέκτασης: ';
+$PHPMAILER_LANG['file_access']          = 'Αδυναμία πρόσβασης στο αρχείο: ';
+$PHPMAILER_LANG['file_open']            = 'Σφάλμα Αρχείου: Αδυναμία ανοίγματος αρχείου: ';
+$PHPMAILER_LANG['from_failed']          = 'Η ακόλουθη διεύθυνση αποστολέα δεν είναι σωστή: ';
+$PHPMAILER_LANG['instantiate']          = 'Αδυναμία εκκίνησης συνάρτησης Mail.';
+$PHPMAILER_LANG['invalid_address']      = 'Μη έγκυρη διεύθυνση: ';
+$PHPMAILER_LANG['invalid_header']       = 'Μη έγκυρο όνομα κεφαλίδας ή τιμή';
+$PHPMAILER_LANG['invalid_hostentry']    = 'Μη έγκυρη εισαγωγή φιλοξενητή: ';
+$PHPMAILER_LANG['invalid_host']         = 'Μη έγκυρος φιλοξενητής: ';
 $PHPMAILER_LANG['mailer_not_supported'] = ' mailer δεν υποστηρίζεται.';
-$PHPMAILER_LANG['provide_address']      = 'Παρακαλούμε δώστε τουλάχιστον μια e-mail διεύθυνση παραλήπτη.';
-$PHPMAILER_LANG['recipients_failed']    = 'SMTP Σφάλμα: Οι παρακάτω διευθύνσεις παραλήπτη δεν είναι έγκυρες: ';
+$PHPMAILER_LANG['provide_address']      = 'Δώστε τουλάχιστον μια ηλεκτρονική διεύθυνση παραλήπτη.';
+$PHPMAILER_LANG['recipients_failed']    = 'Σφάλμα SMTP: Οι παρακάτω διευθύνσεις παραλήπτη δεν είναι έγκυρες: ';
 $PHPMAILER_LANG['signing']              = 'Σφάλμα υπογραφής: ';
-$PHPMAILER_LANG['smtp_connect_failed']  = 'Αποτυχία σύνδεσης στον SMTP Server.';
-$PHPMAILER_LANG['smtp_error']           = 'Σφάλμα από τον SMTP Server: ';
-$PHPMAILER_LANG['variable_set']         = 'Αδυναμία ορισμού ή αρχικοποίησης μεταβλητής: ';
-//$PHPMAILER_LANG['extension_missing']    = 'Extension missing: ';
+$PHPMAILER_LANG['smtp_code']            = 'Κώδικάς SMTP: ';
+$PHPMAILER_LANG['smtp_code_ex']         = 'Πρόσθετες πληροφορίες SMTP: ';
+$PHPMAILER_LANG['smtp_connect_failed']  = 'Αποτυχία σύνδεσης SMTP.';
+$PHPMAILER_LANG['smtp_detail']          = 'Λεπτομέρεια: ';
+$PHPMAILER_LANG['smtp_error']           = 'Σφάλμα με τον διακομιστή SMTP: ';
+$PHPMAILER_LANG['variable_set']         = 'Αδυναμία ορισμού ή επαναφοράς μεταβλητής: ';
diff --git a/vendor/phpmailer/phpmailer/language/phpmailer.lang-fr.php b/vendor/phpmailer/phpmailer/language/phpmailer.lang-fr.php
index 979e44b51..38a7a8e7e 100644
--- a/vendor/phpmailer/phpmailer/language/phpmailer.lang-fr.php
+++ b/vendor/phpmailer/phpmailer/language/phpmailer.lang-fr.php
@@ -10,7 +10,7 @@
  */
 
 $PHPMAILER_LANG['authenticate']         = 'Erreur SMTP : échec de l’authentification.';
-$PHPMAILER_LANG['buggy_php']            = 'Votre version de PHP est affectée par un bogue qui peut entraîner des messages corrompus. Pour résoudre ce problème, passez à l’envoi par SMTP, désactivez l’option mail.add_x_header dans le fichier php.ini, passez à MacOS ou Linux, ou passez PHP à la version 7.0.17+ ou 7.1.3+.';
+$PHPMAILER_LANG['buggy_php']            = 'Votre version de PHP est affectée par un bug qui peut entraîner des messages corrompus. Pour résoudre ce problème, passez à l’envoi par SMTP, désactivez l’option mail.add_x_header dans le fichier php.ini, passez à MacOS ou Linux, ou passez PHP à la version 7.0.17+ ou 7.1.3+.';
 $PHPMAILER_LANG['connect_host']         = 'Erreur SMTP : impossible de se connecter au serveur SMTP.';
 $PHPMAILER_LANG['data_not_accepted']    = 'Erreur SMTP : données incorrectes.';
 $PHPMAILER_LANG['empty_message']        = 'Corps du message vide.';
diff --git a/vendor/phpmailer/phpmailer/language/phpmailer.lang-mn.php b/vendor/phpmailer/phpmailer/language/phpmailer.lang-mn.php
new file mode 100644
index 000000000..04d262c72
--- /dev/null
+++ b/vendor/phpmailer/phpmailer/language/phpmailer.lang-mn.php
@@ -0,0 +1,27 @@
+<?php
+
+/**
+ * Mongolian PHPMailer language file: refer to English translation for definitive list
+ * @package PHPMailer
+ * @author @wispas
+ */
+
+$PHPMAILER_LANG['authenticate']         = 'Алдаа SMTP: Холбогдож чадсангүй.';
+$PHPMAILER_LANG['connect_host']         = 'Алдаа SMTP: SMTP- сервертэй холбогдож болохгүй байна.';
+$PHPMAILER_LANG['data_not_accepted']    = 'Алдаа SMTP: зөвшөөрөгдсөнгүй.';
+$PHPMAILER_LANG['encoding']             = 'Тодорхойгүй кодчилол: ';
+$PHPMAILER_LANG['execute']              = 'Коммандыг гүйцэтгэх боломжгүй байна: ';
+$PHPMAILER_LANG['file_access']          = 'Файлд хандах боломжгүй байна: ';
+$PHPMAILER_LANG['file_open']            = 'Файлын алдаа: файлыг нээх боломжгүй байна: ';
+$PHPMAILER_LANG['from_failed']          = 'Илгээгчийн хаяг буруу байна: ';
+$PHPMAILER_LANG['instantiate']          = 'Mail () функцийг ажиллуулах боломжгүй байна.';
+$PHPMAILER_LANG['provide_address']      = 'Хүлээн авагчийн имэйл хаягийг оруулна уу.';
+$PHPMAILER_LANG['mailer_not_supported'] = ' — мэйл серверийг дэмжсэнгүй.';
+$PHPMAILER_LANG['recipients_failed']    = 'Алдаа SMTP: ийм хаягийг илгээж чадсангүй: ';
+$PHPMAILER_LANG['empty_message']        = 'Хоосон мессэж';
+$PHPMAILER_LANG['invalid_address']      = 'И-Мэйл буруу форматтай тул илгээх боломжгүй: ';
+$PHPMAILER_LANG['signing']              = 'Гарын үсгийн алдаа: ';
+$PHPMAILER_LANG['smtp_connect_failed']  = 'SMTP сервертэй холбогдоход алдаа гарлаа';
+$PHPMAILER_LANG['smtp_error']           = 'SMTP серверийн алдаа: ';
+$PHPMAILER_LANG['variable_set']         = 'Хувьсагчийг тохируулах эсвэл дахин тохируулах боломжгүй байна: ';
+$PHPMAILER_LANG['extension_missing']    = 'Өргөтгөл байхгүй: ';
diff --git a/vendor/phpmailer/phpmailer/language/phpmailer.lang-pl.php b/vendor/phpmailer/phpmailer/language/phpmailer.lang-pl.php
index 23caa71be..b0469fdb7 100644
--- a/vendor/phpmailer/phpmailer/language/phpmailer.lang-pl.php
+++ b/vendor/phpmailer/phpmailer/language/phpmailer.lang-pl.php
@@ -9,19 +9,18 @@
 $PHPMAILER_LANG['connect_host']         = 'Błąd SMTP: Nie można połączyć się z wybranym hostem.';
 $PHPMAILER_LANG['data_not_accepted']    = 'Błąd SMTP: Dane nie zostały przyjęte.';
 $PHPMAILER_LANG['empty_message']        = 'Wiadomość jest pusta.';
-$PHPMAILER_LANG['encoding']             = 'Nieznany sposób kodowania znaków: ';
+$PHPMAILER_LANG['encoding']             = 'Błędny sposób kodowania znaków: ';
 $PHPMAILER_LANG['execute']              = 'Nie można uruchomić: ';
 $PHPMAILER_LANG['file_access']          = 'Brak dostępu do pliku: ';
 $PHPMAILER_LANG['file_open']            = 'Nie można otworzyć pliku: ';
-$PHPMAILER_LANG['from_failed']          = 'Następujący adres Nadawcy jest nieprawidłowy: ';
+$PHPMAILER_LANG['from_failed']          = 'Następujący adres nadawcy jest nieprawidłowy lub nie istnieje: ';
 $PHPMAILER_LANG['instantiate']          = 'Nie można wywołać funkcji mail(). Sprawdź konfigurację serwera.';
-$PHPMAILER_LANG['invalid_address']      = 'Nie można wysłać wiadomości, ' .
-    'następujący adres Odbiorcy jest nieprawidłowy: ';
-$PHPMAILER_LANG['provide_address']      = 'Należy podać prawidłowy adres email Odbiorcy.';
+$PHPMAILER_LANG['invalid_address']      = 'Nie można wysłać wiadomości, ' . 'następujący adres odbiorcy jest nieprawidłowy lub nie istnieje: ';
+$PHPMAILER_LANG['provide_address']      = 'Należy podać prawidłowy adres email odbiorcy.';
 $PHPMAILER_LANG['mailer_not_supported'] = 'Wybrana metoda wysyłki wiadomości nie jest obsługiwana.';
-$PHPMAILER_LANG['recipients_failed']    = 'Błąd SMTP: Następujący odbiorcy są nieprawidłowi: ';
+$PHPMAILER_LANG['recipients_failed']    = 'Błąd SMTP: Następujący odbiorcy są nieprawidłowi lub nie istnieją: ';
 $PHPMAILER_LANG['signing']              = 'Błąd podpisywania wiadomości: ';
-$PHPMAILER_LANG['smtp_connect_failed']  = 'SMTP Connect() zakończone niepowodzeniem.';
+$PHPMAILER_LANG['smtp_connect_failed']  = 'Wywołanie funkcji SMTP Connect() zostało zakończone niepowodzeniem.';
 $PHPMAILER_LANG['smtp_error']           = 'Błąd SMTP: ';
 $PHPMAILER_LANG['variable_set']         = 'Nie można ustawić lub zmodyfikować zmiennej: ';
 $PHPMAILER_LANG['extension_missing']    = 'Brakujące rozszerzenie: ';
diff --git a/vendor/phpmailer/phpmailer/src/OAuth.php b/vendor/phpmailer/phpmailer/src/OAuth.php
index c93d0be1b..c1d5b7762 100644
--- a/vendor/phpmailer/phpmailer/src/OAuth.php
+++ b/vendor/phpmailer/phpmailer/src/OAuth.php
@@ -33,7 +33,7 @@
  *
  * @author  Marcus Bointon (Synchro/coolbru) <phpmailer@synchromedia.co.uk>
  */
-class OAuth
+class OAuth implements OAuthTokenProvider
 {
     /**
      * An instance of the League OAuth Client Provider.
diff --git a/vendor/phpmailer/phpmailer/src/OAuthTokenProvider.php b/vendor/phpmailer/phpmailer/src/OAuthTokenProvider.php
new file mode 100644
index 000000000..115550743
--- /dev/null
+++ b/vendor/phpmailer/phpmailer/src/OAuthTokenProvider.php
@@ -0,0 +1,44 @@
+<?php
+
+/**
+ * PHPMailer - PHP email creation and transport class.
+ * PHP Version 5.5.
+ *
+ * @see https://github.com/PHPMailer/PHPMailer/ The PHPMailer GitHub project
+ *
+ * @author    Marcus Bointon (Synchro/coolbru) <phpmailer@synchromedia.co.uk>
+ * @author    Jim Jagielski (jimjag) <jimjag@gmail.com>
+ * @author    Andy Prevost (codeworxtech) <codeworxtech@users.sourceforge.net>
+ * @author    Brent R. Matzelle (original founder)
+ * @copyright 2012 - 2020 Marcus Bointon
+ * @copyright 2010 - 2012 Jim Jagielski
+ * @copyright 2004 - 2009 Andy Prevost
+ * @license   http://www.gnu.org/copyleft/lesser.html GNU Lesser General Public License
+ * @note      This program is distributed in the hope that it will be useful - WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.
+ */
+
+namespace PHPMailer\PHPMailer;
+
+/**
+ * OAuthTokenProvider - OAuth2 token provider interface.
+ * Provides base64 encoded OAuth2 auth strings for SMTP authentication.
+ *
+ * @see     OAuth
+ * @see     SMTP::authenticate()
+ *
+ * @author  Peter Scopes (pdscopes)
+ * @author  Marcus Bointon (Synchro/coolbru) <phpmailer@synchromedia.co.uk>
+ */
+interface OAuthTokenProvider
+{
+    /**
+     * Generate a base64-encoded OAuth token ensuring that the access token has not expired.
+     * The string to be base 64 encoded should be in the form:
+     * "user=<user_email_address>\001auth=Bearer <access_token>\001\001"
+     *
+     * @return string
+     */
+    public function getOauth64();
+}
diff --git a/vendor/phpmailer/phpmailer/src/PHPMailer.php b/vendor/phpmailer/phpmailer/src/PHPMailer.php
index 20972c4a4..7e6c88ff1 100644
--- a/vendor/phpmailer/phpmailer/src/PHPMailer.php
+++ b/vendor/phpmailer/phpmailer/src/PHPMailer.php
@@ -350,17 +350,17 @@ class PHPMailer
     public $Password = '';
 
     /**
-     * SMTP auth type.
-     * Options are CRAM-MD5, LOGIN, PLAIN, XOAUTH2, attempted in that order if not specified.
+     * SMTP authentication type. Options are CRAM-MD5, LOGIN, PLAIN, XOAUTH2.
+     * If not specified, the first one from that list that the server supports will be selected.
      *
      * @var string
      */
     public $AuthType = '';
 
     /**
-     * An instance of the PHPMailer OAuth class.
+     * An implementation of the PHPMailer OAuthTokenProvider interface.
      *
-     * @var OAuth
+     * @var OAuthTokenProvider
      */
     protected $oauth;
 
@@ -750,7 +750,7 @@ class PHPMailer
      *
      * @var string
      */
-    const VERSION = '6.5.3';
+    const VERSION = '6.6.5';
 
     /**
      * Error severity: message only, continue processing.
@@ -1066,8 +1066,8 @@ public function addReplyTo($address, $name = '')
      * Addresses that have been added already return false, but do not throw exceptions.
      *
      * @param string $kind    One of 'to', 'cc', 'bcc', or 'ReplyTo'
-     * @param string $address The email address to send, resp. to reply to
-     * @param string $name
+     * @param string $address The email address
+     * @param string $name    An optional username associated with the address
      *
      * @throws Exception
      *
@@ -1075,9 +1075,11 @@ public function addReplyTo($address, $name = '')
      */
     protected function addOrEnqueueAnAddress($kind, $address, $name)
     {
-        $address = trim($address);
-        $name = trim(preg_replace('/[\r\n]+/', '', $name)); //Strip breaks and trim
-        $pos = strrpos($address, '@');
+        $pos = false;
+        if ($address !== null) {
+            $address = trim($address);
+            $pos = strrpos($address, '@');
+        }
         if (false === $pos) {
             //At-sign is missing.
             $error_message = sprintf(
@@ -1094,8 +1096,14 @@ protected function addOrEnqueueAnAddress($kind, $address, $name)
 
             return false;
         }
+        if ($name !== null && is_string($name)) {
+            $name = trim(preg_replace('/[\r\n]+/', '', $name)); //Strip breaks and trim
+        } else {
+            $name = '';
+        }
         $params = [$kind, $address, $name];
         //Enqueue addresses with IDN until we know the PHPMailer::$CharSet.
+        //Domain is assumed to be whatever is after the last @ symbol in the address
         if (static::idnSupported() && $this->has8bitChars(substr($address, ++$pos))) {
             if ('Reply-To' !== $kind) {
                 if (!array_key_exists($address, $this->RecipientsQueue)) {
@@ -1185,6 +1193,7 @@ protected function addAnAddress($kind, $address, $name = '')
      *
      * @param string $addrstr The address list string
      * @param bool   $useimap Whether to use the IMAP extension to parse the list
+     * @param string $charset The charset to use when decoding the address list string.
      *
      * @return array
      */
@@ -1279,7 +1288,7 @@ public static function parseAddresses($addrstr, $useimap = true, $charset = self
      */
     public function setFrom($address, $name = '', $auto = true)
     {
-        $address = trim($address);
+        $address = trim((string)$address);
         $name = trim(preg_replace('/[\r\n]+/', '', $name)); //Strip breaks and trim
         //Don't validate now addresses with IDN. Will be done in send().
         $pos = strrpos($address, '@');
@@ -1546,17 +1555,17 @@ public function preSend()
 
             //Validate From, Sender, and ConfirmReadingTo addresses
             foreach (['From', 'Sender', 'ConfirmReadingTo'] as $address_kind) {
-                $this->$address_kind = trim($this->$address_kind);
-                if (empty($this->$address_kind)) {
+                $this->{$address_kind} = trim($this->{$address_kind});
+                if (empty($this->{$address_kind})) {
                     continue;
                 }
-                $this->$address_kind = $this->punyencodeAddress($this->$address_kind);
-                if (!static::validateAddress($this->$address_kind)) {
+                $this->{$address_kind} = $this->punyencodeAddress($this->{$address_kind});
+                if (!static::validateAddress($this->{$address_kind})) {
                     $error_message = sprintf(
                         '%s (%s): %s',
                         $this->lang('invalid_address'),
                         $address_kind,
-                        $this->$address_kind
+                        $this->{$address_kind}
                     );
                     $this->setError($error_message);
                     $this->edebug($error_message);
@@ -1656,13 +1665,13 @@ public function postSend()
                 default:
                     $sendMethod = $this->Mailer . 'Send';
                     if (method_exists($this, $sendMethod)) {
-                        return $this->$sendMethod($this->MIMEHeader, $this->MIMEBody);
+                        return $this->{$sendMethod}($this->MIMEHeader, $this->MIMEBody);
                     }
 
                     return $this->mailSend($this->MIMEHeader, $this->MIMEBody);
             }
         } catch (Exception $exc) {
-            if ($this->Mailer === 'smtp' && $this->SMTPKeepAlive == true) {
+            if ($this->Mailer === 'smtp' && $this->SMTPKeepAlive == true && $this->smtp->connected()) {
                 $this->smtp->reset();
             }
             $this->setError($exc->getMessage());
@@ -1742,7 +1751,7 @@ protected function sendmailSend($header, $body)
                 fwrite($mail, $header);
                 fwrite($mail, $body);
                 $result = pclose($mail);
-                $addrinfo = static::parseAddresses($toAddr, true, $this->charSet);
+                $addrinfo = static::parseAddresses($toAddr, true, $this->CharSet);
                 $this->doCallback(
                     ($result === 0),
                     [[$addrinfo['address'], $addrinfo['name']]],
@@ -1797,7 +1806,13 @@ protected function sendmailSend($header, $body)
      */
     protected static function isShellSafe($string)
     {
-        //Future-proof
+        //It's not possible to use shell commands safely (which includes the mail() function) without escapeshellarg,
+        //but some hosting providers disable it, creating a security problem that we don't want to have to deal with,
+        //so we don't.
+        if (!function_exists('escapeshellarg') || !function_exists('escapeshellcmd')) {
+            return false;
+        }
+
         if (
             escapeshellcmd($string) !== $string
             || !in_array(escapeshellarg($string), ["'$string'", "\"$string\""])
@@ -1848,7 +1863,7 @@ protected static function fileIsAccessible($path)
         if (!static::isPermittedPath($path)) {
             return false;
         }
-        $readable = file_exists($path);
+        $readable = is_file($path);
         //If not a UNC path (expected to start with \\), check read permission, see #2069
         if (strpos($path, '\\\\') !== 0) {
             $readable = $readable && is_readable($path);
@@ -1876,7 +1891,14 @@ protected function mailSend($header, $body)
         foreach ($this->to as $toaddr) {
             $toArr[] = $this->addrFormat($toaddr);
         }
-        $to = implode(', ', $toArr);
+        $to = trim(implode(', ', $toArr));
+
+        //If there are no To-addresses (e.g. when sending only to BCC-addresses)
+        //the following should be added to get a correct DKIM-signature.
+        //Compare with $this->preSend()
+        if ($to === '') {
+            $to = 'undisclosed-recipients:;';
+        }
 
         $params = null;
         //This sets the SMTP envelope sender which gets turned into a return-path header by the receiver
@@ -1905,7 +1927,7 @@ protected function mailSend($header, $body)
         if ($this->SingleTo && count($toArr) > 1) {
             foreach ($toArr as $toAddr) {
                 $result = $this->mailPassthru($toAddr, $this->Subject, $body, $header, $params);
-                $addrinfo = static::parseAddresses($toAddr, true, $this->charSet);
+                $addrinfo = static::parseAddresses($toAddr, true, $this->CharSet);
                 $this->doCallback(
                     $result,
                     [[$addrinfo['address'], $addrinfo['name']]],
@@ -2079,6 +2101,9 @@ public function smtpConnect($options = null)
         $this->smtp->setDebugLevel($this->SMTPDebug);
         $this->smtp->setDebugOutput($this->Debugoutput);
         $this->smtp->setVerp($this->do_verp);
+        if ($this->Host === null) {
+            $this->Host = 'localhost';
+        }
         $hosts = explode(';', $this->Host);
         $lastexception = null;
 
@@ -2154,7 +2179,8 @@ public function smtpConnect($options = null)
                     }
                     if ($tls) {
                         if (!$this->smtp->startTLS()) {
-                            throw new Exception($this->lang('connect_host'));
+                            $message = $this->getSmtpErrorMessage('connect_host');
+                            throw new Exception($message);
                         }
                         //We must resend EHLO after TLS negotiation
                         $this->smtp->hello($hello);
@@ -2185,6 +2211,11 @@ public function smtpConnect($options = null)
         if ($this->exceptions && null !== $lastexception) {
             throw $lastexception;
         }
+        if ($this->exceptions) {
+            // no exception was thrown, likely $this->smtp->connect() failed
+            $message = $this->getSmtpErrorMessage('connect_host');
+            throw new Exception($message);
+        }
 
         return false;
     }
@@ -2630,16 +2661,15 @@ public function createHeader()
             $result .= $this->headerLine('X-Priority', $this->Priority);
         }
         if ('' === $this->XMailer) {
+            //Empty string for default X-Mailer header
             $result .= $this->headerLine(
                 'X-Mailer',
                 'PHPMailer ' . self::VERSION . ' (https://github.com/PHPMailer/PHPMailer)'
             );
-        } else {
-            $myXmailer = trim($this->XMailer);
-            if ($myXmailer) {
-                $result .= $this->headerLine('X-Mailer', $myXmailer);
-            }
-        }
+        } elseif (is_string($this->XMailer) && trim($this->XMailer) !== '') {
+            //Some string
+            $result .= $this->headerLine('X-Mailer', trim($this->XMailer));
+        } //Other values result in no X-Mailer header
 
         if ('' !== $this->ConfirmReadingTo) {
             $result .= $this->headerLine('Disposition-Notification-To', '<' . $this->ConfirmReadingTo . '>');
@@ -3694,20 +3724,21 @@ public function addStringAttachment(
      * These differ from 'regular' attachments in that they are intended to be
      * displayed inline with the message, not just attached for download.
      * This is used in HTML messages that embed the images
-     * the HTML refers to using the $cid value.
+     * the HTML refers to using the `$cid` value in `img` tags, for example `<img src="cid:mylogo">`.
      * Never use a user-supplied path to a file!
      *
      * @param string $path        Path to the attachment
      * @param string $cid         Content ID of the attachment; Use this to reference
      *                            the content when using an embedded image in HTML
-     * @param string $name        Overrides the attachment name
-     * @param string $encoding    File encoding (see $Encoding)
-     * @param string $type        File MIME type
-     * @param string $disposition Disposition to use
+     * @param string $name        Overrides the attachment filename
+     * @param string $encoding    File encoding (see $Encoding) defaults to `base64`
+     * @param string $type        File MIME type (by default mapped from the `$path` filename's extension)
+     * @param string $disposition Disposition to use: `inline` (default) or `attachment`
+     *                            (unlikely you want this – {@see `addAttachment()`} instead)
      *
+     * @return bool True on successfully adding an attachment
      * @throws Exception
      *
-     * @return bool True on successfully adding an attachment
      */
     public function addEmbeddedImage(
         $path,
@@ -4085,12 +4116,8 @@ public static function isValidHost($host)
             //Is it a valid IPv4 address?
             return filter_var($host, FILTER_VALIDATE_IP, FILTER_FLAG_IPV4) !== false;
         }
-        if (filter_var('http://' . $host, FILTER_VALIDATE_URL) !== false) {
-            //Is it a syntactically valid hostname?
-            return true;
-        }
-
-        return false;
+        //Is it a syntactically valid hostname (when embeded in a URL)?
+        return filter_var('http://' . $host, FILTER_VALIDATE_URL) !== false;
     }
 
     /**
@@ -4121,6 +4148,26 @@ protected function lang($key)
         return $key;
     }
 
+    /**
+     * Build an error message starting with a generic one and adding details if possible.
+     *
+     * @param string $base_key
+     * @return string
+     */
+    private function getSmtpErrorMessage($base_key)
+    {
+        $message = $this->lang($base_key);
+        $error = $this->smtp->getError();
+        if (!empty($error['error'])) {
+            $message .= ' ' . $error['error'];
+            if (!empty($error['detail'])) {
+                $message .= ' ' . $error['detail'];
+            }
+        }
+
+        return $message;
+    }
+
     /**
      * Check if an error occurred.
      *
@@ -4433,6 +4480,7 @@ public static function _mime_types($ext = '')
             'ics' => 'text/calendar',
             'xml' => 'text/xml',
             'xsl' => 'text/xml',
+            'csv' => 'text/csv',
             'wmv' => 'video/x-ms-wmv',
             'mpeg' => 'video/mpeg',
             'mpe' => 'video/mpeg',
@@ -4540,7 +4588,7 @@ public static function mb_pathinfo($path, $options = null)
     public function set($name, $value = '')
     {
         if (property_exists($this, $name)) {
-            $this->$name = $value;
+            $this->{$name} = $value;
 
             return true;
         }
@@ -5021,9 +5069,9 @@ protected function doCallback($isSent, $to, $cc, $bcc, $subject, $body, $from, $
     }
 
     /**
-     * Get the OAuth instance.
+     * Get the OAuthTokenProvider instance.
      *
-     * @return OAuth
+     * @return OAuthTokenProvider
      */
     public function getOAuth()
     {
@@ -5031,9 +5079,9 @@ public function getOAuth()
     }
 
     /**
-     * Set an OAuth instance.
+     * Set an OAuthTokenProvider instance.
      */
-    public function setOAuth(OAuth $oauth)
+    public function setOAuth(OAuthTokenProvider $oauth)
     {
         $this->oauth = $oauth;
     }
diff --git a/vendor/phpmailer/phpmailer/src/POP3.php b/vendor/phpmailer/phpmailer/src/POP3.php
index ea5f9418c..a3c9f4532 100644
--- a/vendor/phpmailer/phpmailer/src/POP3.php
+++ b/vendor/phpmailer/phpmailer/src/POP3.php
@@ -46,7 +46,7 @@ class POP3
      *
      * @var string
      */
-    const VERSION = '6.5.3';
+    const VERSION = '6.6.5';
 
     /**
      * Default POP3 port number.
diff --git a/vendor/phpmailer/phpmailer/src/SMTP.php b/vendor/phpmailer/phpmailer/src/SMTP.php
index 676dba292..312f753ce 100644
--- a/vendor/phpmailer/phpmailer/src/SMTP.php
+++ b/vendor/phpmailer/phpmailer/src/SMTP.php
@@ -35,7 +35,7 @@ class SMTP
      *
      * @var string
      */
-    const VERSION = '6.5.3';
+    const VERSION = '6.6.5';
 
     /**
      * SMTP line break constant.
@@ -187,6 +187,7 @@ class SMTP
         'SendGrid' => '/[\d]{3} Ok: queued as (.*)/',
         'CampaignMonitor' => '/[\d]{3} 2.0.0 OK:([a-zA-Z\d]{48})/',
         'Haraka' => '/[\d]{3} Message Queued \((.*)\)/',
+        'Mailjet' => '/[\d]{3} OK queued as (.*)/',
     ];
 
     /**
@@ -482,7 +483,7 @@ public function startTLS()
      * @param string $username The user name
      * @param string $password The password
      * @param string $authtype The auth type (CRAM-MD5, PLAIN, LOGIN, XOAUTH2)
-     * @param OAuth  $OAuth    An optional OAuth instance for XOAUTH2 authentication
+     * @param OAuthTokenProvider $OAuth An optional OAuthTokenProvider instance for XOAUTH2 authentication
      *
      * @return bool True if successfully authenticated
      */
@@ -681,7 +682,6 @@ public function connected()
      */
     public function close()
     {
-        $this->setError('');
         $this->server_caps = null;
         $this->helo_rply = null;
         if (is_resource($this->smtp_conn)) {
@@ -1036,7 +1036,10 @@ protected function sendCommand($command, $commandstring, $expect)
             return false;
         }
 
-        $this->setError('');
+        //Don't clear the error store when using keepalive
+        if ($command !== 'RSET') {
+            $this->setError('');
+        }
 
         return true;
     }
diff --git a/vendor/solarium/solarium/CHANGELOG.md b/vendor/solarium/solarium/CHANGELOG.md
index 9984b3c19..92caafd56 100644
--- a/vendor/solarium/solarium/CHANGELOG.md
+++ b/vendor/solarium/solarium/CHANGELOG.md
@@ -4,6 +4,80 @@ All notable changes to the Solarium library will be documented in this file.
 The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/)
 and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
+## [6.2.7]
+### Added
+- Core\Client\Adapter\Curl::setProxy() to set proxy (instead of through options)
+- Proxy support for Http adapter with Core\Client\Adapter\Http::setProxy()
+- Authorization token support
+
+### Fixed
+- Plugins unregister event listeners when removed with Client::removePlugin()
+- Workaround for opcache.preload issue in deprected code unless 6.3.0 will be released
+
+### Changed
+- `RequestBuilder`s must set a Content-Type on the `Request` for POST and PUT requests. `Adapter`s no longer set a default.
+
+### Deprecated
+- Setting proxy on the Curl adapter through options, use setProxy() instead
+
+
+## [6.2.6]
+### Fixed
+- An empty array for a multiValued field was wrongly interpreted as an empty child document by the Update request builder in 6.2.5
+
+
+## [6.2.5]
+### Added
+- Results and Documents implement [JsonSerializable](https://www.php.net/manual/en/class.jsonserializable)
+- ParallelExecution dispatches PreExecute, PreExecuteRequest, PostExecuteRequest, PostExecute events. It can be combined with plugins that hook into these events (e.g. PostBigRequest).
+- ParallelExecution support for Server queries
+- Solarium\Client::getVersion()
+
+### Fixed
+- Adding nested child documents through `Document::setField()` and `Document::addField()`
+
+### Changed
+- ParallelExecution doesn't replace an existing cURL adapter on the Client. Timeout and proxy settings are honoured on parallel requests.
+- ParallelExecution sets the 'timeout' and 'connectiontimeout' options from (Connection)TimeoutAware adapters when switching to a cURL adapter
+
+### Removed
+- Solarium\QueryType\Update\Query\Document::setFilterControlCharacters(), extend Update\Query\Query to use a custom request builder & helper if you don't want control characters filtered
+
+### Deprecated
+- Solarium\Client::VERSION
+
+
+## [6.2.4] 
+### Added
+- Symfony 6 support
+- Solr 9 support
+- Unified Highlighter support + improved support for other highlighters
+
+### Fixed
+- Solarium\QueryType\Server\Collections\Query\Action\ClusterStatus::getRoute() always returned NULL even if a route was set
+- Solarium\Component\Highlighting\Highlighting::setMethod() didn't set the correct request parameter
+
+### Changed
+- Solarium\QueryType\Select\Query\Query::setCursormark() and getCursormark() are now setCursorMark() and getCursorMark() with uppercase M
+- Managed resources execute GET requests for the Exists command by default to avoid SOLR-15116 and SOLR-16274. Set the 'useHeadRequest' option to `true` to execute HEAD requests instead.
+
+### Removed
+- Solarium\QueryType\Stream\Expression, use Solarium\QueryType\Stream\ExpressionBuilder instead
+
+
+## [6.2.3]
+### Added
+- Plugin\BufferedAddLite (BufferedAdd without event dispatching)
+- Plugin\BufferedDelete and Plugin\BufferedDeleteLite
+
+### Fixed
+- Local parameter values are now escaped automatically when necessary
+
+
+## [6.2.2]
+### Added
+- PHP 8.1 support
+
 
 ## [6.2.1]
 ### Added
@@ -225,7 +299,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 - `AdapterInterface` does not extend `ConfigurableInterface` anymore
 - `Http` Adapter does not implement `ConfigurableInterface` anymore
 - `Psr18Adapter` does not implement `ConfigurableInterface` anymore
-- Solarium Client now accepts any PSR-15 compatible event dispatcher (previously it had to be symfony's event dispatcher)
+- Solarium Client now accepts any PSR-14 compatible event dispatcher (previously it had to be the Symfony EventDispatcher)
 
 ### Removed
 - Zend2HttpAdapter
diff --git a/vendor/solarium/solarium/README.md b/vendor/solarium/solarium/README.md
index e8d1dd5be..24d13cc28 100644
--- a/vendor/solarium/solarium/README.md
+++ b/vendor/solarium/solarium/README.md
@@ -24,7 +24,7 @@ The preferred way to install Solarium is by using Composer. Solarium is availabl
 [Packagist](https://packagist.org/packages/solarium/solarium).
 
 Example:
-```
+```sh
 composer require solarium/solarium
 ```
 
@@ -53,12 +53,56 @@ setlocale(LC_NUMERIC, $currentLocale);
 PHP 8.0 has made the float to string conversion locale-independent and will always use the `.` decimal separator.
 The workaround is no longer necessary with PHP versions ≥ 8.0.
 
-### Pitfall when upgrading from 3.x or 4.x or 5.x
+### Pitfalls when upgrading from 3.x or 4.x or 5.x
+
+#### Setting a timeout
 
 Setting "timeout" as "option" in the HTTP Client Adapter is deprecated since Solarium 5.2.0 because not all adapters
 could handle it. The adapters which can handle it now implement the `TimeoutAwareInterface` and you need to set the
 timeout using the `setTimeout()` function after creating the adapter instance.
 
+#### `Solarium\Client()` constructor
+
+With Solarium 6 you need to pass an adapter instance and an event dispatcher instance to the `Solarium\Client()`
+constructor as the first and second parameter. An optional options array can now be passed as the third parameter.
+Previous versions used the `Curl` adapter and the Symfony EventDispatcher by default. Solarium 5.2
+already informed you about the deprecation of calling this constructor with the old signature.
+
+Solarium 5:
+```php
+$options = [
+    // ...
+];
+
+$client = new Solarium\Client($options);
+```
+
+Solarium 6:
+```php
+$adapter = new Solarium\Core\Client\Adapter\Curl();
+$eventDispatcher = new Symfony\Component\EventDispatcher\EventDispatcher();
+$options = [
+    // ...
+];
+
+$client = new Solarium\Client($adapter, $eventDispatcher, $options);
+```
+
+The Symfony EventDispatcher is also no longer automatically available for autoloading.
+If you want to keep using it, you can add it to your project's `composer.json`.
+Alternatively you can use any PSR-14 compatible event dispatcher.
+
+```json
+{
+    "require": {
+        "solarium/solarium": "~6.2",
+        "symfony/event-dispatcher": "^4.3 || ^5.0 || ^6.0"
+    }
+}
+```
+
+#### Local parameter names
+
 In order to fix some issues with complex queries using local parameters Solarium 6 distinguishes between query parameters
 and local parameters to be embedded in a query. Solarium 5.2 already informed you about the deprecation of some
 parameter names which are in fact local parameters. Solarium doen't convert them magically anymore.
@@ -66,17 +110,26 @@ Local parameter names now have to be prefixed with `local_` if set as option of
 
 Solarium 5:
 ```php
-$categoriesTerms = new Solarium\Component\Facet\JsonTerms(['key' => 'categories', 'field' => 'cat', 'limit'=>4,'numBuckets'=>true]);
+$categoriesTerms = new Solarium\Component\Facet\JsonTerms([
+    'key' => 'categories',
+    'field' => 'cat',
+    'limit' => 4,
+    'numBuckets' => true,
+]);
 ```
 
 Solarium 6:
 ```php
-$categoriesTerms = new Solarium\Component\Facet\JsonTerms(['local_key' => 'categories', 'field' => 'cat', 'limit'=>4,'numBuckets'=>true]);
+$categoriesTerms = new Solarium\Component\Facet\JsonTerms([
+    'local_key' => 'categories',
+    'field' => 'cat',
+    'limit' => 4,
+    'numBuckets' => true,
+]);
 ```
 
 See https://solr.apache.org/guide/local-parameters-in-queries.html for an introduction about local parameters.
 
-
 ### Pitfall when upgrading from 3.x or 4.x
 
 In the past, the V1 API endpoint `solr` was not added automatically, so most users set it as path on the endpoint.
@@ -131,14 +184,14 @@ You can run the tests in a Windows environment. For all of them to pass, you mus
 * Docs
   http://solarium.readthedocs.io/en/stable/
 
-* Issue tracker   
+* Issue tracker
   http://github.com/solariumphp/solarium/issues
 
-* Contributors    
+* Contributors
   https://github.com/solariumphp/solarium/contributors
 
-* License   
-  See the COPYING file or view online:  
+* License
+  See the COPYING file or view online:
   https://github.com/solariumphp/solarium/blob/master/COPYING
 
 ## Continuous Integration status
diff --git a/vendor/solarium/solarium/composer.json b/vendor/solarium/solarium/composer.json
index ad7f620d5..7e4f4665b 100755
--- a/vendor/solarium/solarium/composer.json
+++ b/vendor/solarium/solarium/composer.json
@@ -17,7 +17,8 @@
         "psr/event-dispatcher": "^1.0",
         "psr/http-client": "^1.0",
         "psr/http-factory": "^1.0",
-        "symfony/event-dispatcher-contracts": "^1.0 || ^2.0"
+        "symfony/event-dispatcher-contracts": "^1.0 || ^2.0 || ^3.0",
+        "composer-runtime-api": ">=2.0"
     },
     "require-dev": {
         "escapestudios/symfony2-coding-standard": "^3.11",
@@ -25,15 +26,18 @@
         "nyholm/psr7": "^1.2",
         "php-http/guzzle7-adapter": "^0.1",
         "phpstan/extension-installer": "^1.0",
-        "phpstan/phpstan": "^0.12",
-        "phpstan/phpstan-phpunit": "^0.12",
+        "phpstan/phpstan": "^1.0",
+        "phpstan/phpstan-phpunit": "^1.0",
         "phpunit/phpunit": "^9.5",
         "roave/security-advisories": "dev-master",
-        "symfony/event-dispatcher": "^4.3 || ^5.0"
+        "symfony/event-dispatcher": "^4.3 || ^5.0 || ^6.0"
     },
     "prefer-stable": true,
     "config": {
-        "sort-packages": true
+        "sort-packages": true,
+        "allow-plugins": {
+            "phpstan/extension-installer": true
+        }
     },
     "autoload": {
         "psr-4": {
diff --git a/vendor/solarium/solarium/src/Client.php b/vendor/solarium/solarium/src/Client.php
index 2179defa9..3543588df 100644
--- a/vendor/solarium/solarium/src/Client.php
+++ b/vendor/solarium/solarium/src/Client.php
@@ -9,6 +9,7 @@
 
 namespace Solarium;
 
+use Composer\InstalledVersions;
 use Solarium\Core\Client\Client as CoreClient;
 
 /**
@@ -40,8 +41,26 @@ class Client extends CoreClient
      * @see checkMinimal()
      *
      * @var string
+     *
+     * @deprecated This class constant will be removed in Solarium 6.3.0. Use Client::getVersion() instead.
+     */
+    const VERSION = '6.2.7-deprecated';
+
+    /**
+     * Returns the version string.
+     *
+     * @return string
      */
-    const VERSION = '6.2.1';
+    public static function getVersion(): string
+    {
+        static $version;
+
+        if (!$version) {
+            $version = InstalledVersions::getPrettyVersion('solarium/solarium');
+        }
+
+        return $version;
+    }
 
     /**
      * Check for an exact version.
@@ -73,7 +92,7 @@ class Client extends CoreClient
      */
     public static function checkExact(string $version): bool
     {
-        return 0 === strpos(self::VERSION, $version);
+        return 0 === strpos(self::getVersion(), $version);
     }
 
     /**
@@ -101,6 +120,6 @@ public static function checkExact(string $version): bool
      */
     public static function checkMinimal(string $version): bool
     {
-        return version_compare(self::VERSION, $version, '>=');
+        return version_compare(self::getVersion(), $version, '>=');
     }
 }
diff --git a/vendor/solarium/solarium/src/Component/Analytics/Analytics.php b/vendor/solarium/solarium/src/Component/Analytics/Analytics.php
index cf0be433e..7d028e2c8 100644
--- a/vendor/solarium/solarium/src/Component/Analytics/Analytics.php
+++ b/vendor/solarium/solarium/src/Component/Analytics/Analytics.php
@@ -181,6 +181,7 @@ public function addGrouping(Grouping $grouping): self
         return $this;
     }
 
+    #[\ReturnTypeWillChange]
     /**
      * {@inheritdoc}
      */
diff --git a/vendor/solarium/solarium/src/Component/Analytics/Facet/Pivot.php b/vendor/solarium/solarium/src/Component/Analytics/Facet/Pivot.php
index 303881523..3d31a2682 100644
--- a/vendor/solarium/solarium/src/Component/Analytics/Facet/Pivot.php
+++ b/vendor/solarium/solarium/src/Component/Analytics/Facet/Pivot.php
@@ -99,6 +99,7 @@ public function setSort($sort): self
         return $this;
     }
 
+    #[\ReturnTypeWillChange]
     /**
      * {@inheritdoc}
      */
diff --git a/vendor/solarium/solarium/src/Component/Analytics/Facet/PivotFacet.php b/vendor/solarium/solarium/src/Component/Analytics/Facet/PivotFacet.php
index ad7b016f3..c576c9c34 100644
--- a/vendor/solarium/solarium/src/Component/Analytics/Facet/PivotFacet.php
+++ b/vendor/solarium/solarium/src/Component/Analytics/Facet/PivotFacet.php
@@ -67,6 +67,7 @@ public function addPivot(Pivot $pivot): self
         return $this;
     }
 
+    #[\ReturnTypeWillChange]
     /**
      * {@inheritdoc}
      */
diff --git a/vendor/solarium/solarium/src/Component/Analytics/Facet/QueryFacet.php b/vendor/solarium/solarium/src/Component/Analytics/Facet/QueryFacet.php
index 67ce6fefc..9c136fc72 100644
--- a/vendor/solarium/solarium/src/Component/Analytics/Facet/QueryFacet.php
+++ b/vendor/solarium/solarium/src/Component/Analytics/Facet/QueryFacet.php
@@ -66,6 +66,7 @@ public function addQuery(string $key, string $query): self
         return $this;
     }
 
+    #[\ReturnTypeWillChange]
     /**
      * {@inheritdoc}
      */
diff --git a/vendor/solarium/solarium/src/Component/Analytics/Facet/RangeFacet.php b/vendor/solarium/solarium/src/Component/Analytics/Facet/RangeFacet.php
index 6f1ea2f3b..3c127e112 100644
--- a/vendor/solarium/solarium/src/Component/Analytics/Facet/RangeFacet.php
+++ b/vendor/solarium/solarium/src/Component/Analytics/Facet/RangeFacet.php
@@ -276,6 +276,7 @@ public function setOthers(array $others): self
         return $this;
     }
 
+    #[\ReturnTypeWillChange]
     /**
      * {@inheritdoc}
      */
diff --git a/vendor/solarium/solarium/src/Component/Analytics/Facet/Sort/Criterion.php b/vendor/solarium/solarium/src/Component/Analytics/Facet/Sort/Criterion.php
index 307ff996e..cc97b0a4d 100644
--- a/vendor/solarium/solarium/src/Component/Analytics/Facet/Sort/Criterion.php
+++ b/vendor/solarium/solarium/src/Component/Analytics/Facet/Sort/Criterion.php
@@ -118,6 +118,7 @@ public function setDirection(string $direction): self
         return $this;
     }
 
+    #[\ReturnTypeWillChange]
     /**
      * {@inheritdoc}
      */
diff --git a/vendor/solarium/solarium/src/Component/Analytics/Facet/Sort/Sort.php b/vendor/solarium/solarium/src/Component/Analytics/Facet/Sort/Sort.php
index 1f3147198..2f1381372 100644
--- a/vendor/solarium/solarium/src/Component/Analytics/Facet/Sort/Sort.php
+++ b/vendor/solarium/solarium/src/Component/Analytics/Facet/Sort/Sort.php
@@ -114,6 +114,7 @@ public function setOffset(?int $offset): self
         return $this;
     }
 
+    #[\ReturnTypeWillChange]
     /**
      * {@inheritdoc}
      */
diff --git a/vendor/solarium/solarium/src/Component/Analytics/Facet/ValueFacet.php b/vendor/solarium/solarium/src/Component/Analytics/Facet/ValueFacet.php
index 9e6784856..6351e288c 100644
--- a/vendor/solarium/solarium/src/Component/Analytics/Facet/ValueFacet.php
+++ b/vendor/solarium/solarium/src/Component/Analytics/Facet/ValueFacet.php
@@ -80,6 +80,7 @@ public function setSort($sort): self
         return $this;
     }
 
+    #[\ReturnTypeWillChange]
     /**
      * {@inheritdoc}
      */
diff --git a/vendor/solarium/solarium/src/Component/Analytics/Grouping.php b/vendor/solarium/solarium/src/Component/Analytics/Grouping.php
index e758e6c05..a4226e099 100644
--- a/vendor/solarium/solarium/src/Component/Analytics/Grouping.php
+++ b/vendor/solarium/solarium/src/Component/Analytics/Grouping.php
@@ -134,6 +134,7 @@ public function addFacet(AbstractFacet $facet): self
         return $this;
     }
 
+    #[\ReturnTypeWillChange]
     /**
      * {@inheritdoc}
      */
diff --git a/vendor/solarium/solarium/src/Component/ComponentTraits/SpellcheckTrait.php b/vendor/solarium/solarium/src/Component/ComponentTraits/SpellcheckTrait.php
index 1fdf4351b..ae17afd8c 100644
--- a/vendor/solarium/solarium/src/Component/ComponentTraits/SpellcheckTrait.php
+++ b/vendor/solarium/solarium/src/Component/ComponentTraits/SpellcheckTrait.php
@@ -147,6 +147,30 @@ public function getOnlyMorePopular(): ?bool
         return $this->getOption('onlymorepopular');
     }
 
+    /**
+     * Set alternativetermcount option.
+     *
+     * The the number of suggestions to return for each query term existing in the index and/or dictionary.
+     *
+     * @param int $count
+     *
+     * @return SpellcheckInterface Provides fluent interface
+     */
+    public function setAlternativeTermCount(int $count): SpellcheckInterface
+    {
+        return $this->setOption('alternativetermcount', $count);
+    }
+
+    /**
+     * Get alternativetermcount option.
+     *
+     * @return int|null
+     */
+    public function getAlternativeTermCount(): ?int
+    {
+        return $this->getOption('alternativetermcount');
+    }
+
     /**
      * Set extendedResults option.
      *
diff --git a/vendor/solarium/solarium/src/Component/DisMax.php b/vendor/solarium/solarium/src/Component/DisMax.php
index 4ecfd3ee9..df0ce681d 100644
--- a/vendor/solarium/solarium/src/Component/DisMax.php
+++ b/vendor/solarium/solarium/src/Component/DisMax.php
@@ -313,11 +313,11 @@ public function addBoostQuery($boostQuery): self
 
         $key = $boostQuery->getKey();
 
-        if (0 === \strlen($key)) {
+        if (null === $key || 0 === \strlen($key)) {
             throw new InvalidArgumentException('A boostquery must have a key value');
         }
 
-        //double add calls for the same BQ are ignored, but non-unique keys cause an exception
+        // double add calls for the same BQ are ignored, but non-unique keys cause an exception
         if (\array_key_exists($key, $this->boostQueries) && $this->boostQueries[$key] !== $boostQuery) {
             throw new InvalidArgumentException('A boostquery must have a unique key value within a query');
         }
diff --git a/vendor/solarium/solarium/src/Component/Facet/FieldValueParametersInterface.php b/vendor/solarium/solarium/src/Component/Facet/FieldValueParametersInterface.php
index 1166b283c..3b0ebc260 100644
--- a/vendor/solarium/solarium/src/Component/Facet/FieldValueParametersInterface.php
+++ b/vendor/solarium/solarium/src/Component/Facet/FieldValueParametersInterface.php
@@ -1,5 +1,12 @@
 <?php
 
+/*
+ * This file is part of the Solarium package.
+ *
+ * For the full copyright and license information, please view the COPYING
+ * file that was distributed with this source code.
+ */
+
 namespace Solarium\Component\Facet;
 
 /**
diff --git a/vendor/solarium/solarium/src/Component/Facet/FieldValueParametersTrait.php b/vendor/solarium/solarium/src/Component/Facet/FieldValueParametersTrait.php
index 3192f2483..d270e105b 100644
--- a/vendor/solarium/solarium/src/Component/Facet/FieldValueParametersTrait.php
+++ b/vendor/solarium/solarium/src/Component/Facet/FieldValueParametersTrait.php
@@ -1,5 +1,12 @@
 <?php
 
+/*
+ * This file is part of the Solarium package.
+ *
+ * For the full copyright and license information, please view the COPYING
+ * file that was distributed with this source code.
+ */
+
 namespace Solarium\Component\Facet;
 
 /**
diff --git a/vendor/solarium/solarium/src/Component/Facet/JsonTerms.php b/vendor/solarium/solarium/src/Component/Facet/JsonTerms.php
index a3ae74db6..f25a5e821 100644
--- a/vendor/solarium/solarium/src/Component/Facet/JsonTerms.php
+++ b/vendor/solarium/solarium/src/Component/Facet/JsonTerms.php
@@ -439,13 +439,13 @@ public function getMethod(): ?string
      *
      * @see setSort() For the possible sort values.
      *
-     * @param string $prelim_sort
+     * @param string $prelimSort
      *
      * @return self Provides fluent interface
      */
-    public function setPrelimSort(string $prelim_sort): self
+    public function setPrelimSort(string $prelimSort): self
     {
-        $this->setOption('prelim_sort', $prelim_sort);
+        $this->setOption('prelim_sort', $prelimSort);
 
         return $this;
     }
diff --git a/vendor/solarium/solarium/src/Component/Facet/MultiQuery.php b/vendor/solarium/solarium/src/Component/Facet/MultiQuery.php
index 522589f63..fa8b4d94f 100644
--- a/vendor/solarium/solarium/src/Component/Facet/MultiQuery.php
+++ b/vendor/solarium/solarium/src/Component/Facet/MultiQuery.php
@@ -87,7 +87,7 @@ public function addQuery($facetQuery): self
 
         $key = $facetQuery->getKey();
 
-        if (0 === \strlen($key)) {
+        if (null === $key || 0 === \strlen($key)) {
             throw new InvalidArgumentException('A facetquery must have a key value');
         }
 
diff --git a/vendor/solarium/solarium/src/Component/Facet/PivotMinCountTrait.php b/vendor/solarium/solarium/src/Component/Facet/PivotMinCountTrait.php
index 437553caa..6eef30129 100644
--- a/vendor/solarium/solarium/src/Component/Facet/PivotMinCountTrait.php
+++ b/vendor/solarium/solarium/src/Component/Facet/PivotMinCountTrait.php
@@ -1,5 +1,12 @@
 <?php
 
+/*
+ * This file is part of the Solarium package.
+ *
+ * For the full copyright and license information, please view the COPYING
+ * file that was distributed with this source code.
+ */
+
 namespace Solarium\Component\Facet;
 
 /**
diff --git a/vendor/solarium/solarium/src/Component/FacetSetTrait.php b/vendor/solarium/solarium/src/Component/FacetSetTrait.php
index 05be61034..42ca36cef 100644
--- a/vendor/solarium/solarium/src/Component/FacetSetTrait.php
+++ b/vendor/solarium/solarium/src/Component/FacetSetTrait.php
@@ -42,11 +42,11 @@ public function addFacet($facet): FacetSetInterface
 
         $key = $facet->getKey();
 
-        if (0 === \strlen($key)) {
+        if (null === $key || 0 === \strlen($key)) {
             throw new InvalidArgumentException('A facet must have a key value');
         }
 
-        //double add calls for the same facet are ignored, but non-unique keys cause an exception
+        // double add calls for the same facet are ignored, but non-unique keys cause an exception
         if (\array_key_exists($key, $this->facets) && $this->facets[$key] !== $facet) {
             throw new InvalidArgumentException('A facet must have a unique key value within a query');
         }
diff --git a/vendor/solarium/solarium/src/Component/Highlighting/Field.php b/vendor/solarium/solarium/src/Component/Highlighting/Field.php
index b7bccdcb9..38e0672a1 100644
--- a/vendor/solarium/solarium/src/Component/Highlighting/Field.php
+++ b/vendor/solarium/solarium/src/Component/Highlighting/Field.php
@@ -16,17 +16,9 @@
  *
  * @see https://solr.apache.org/guide/highlighting.html
  */
-class Field extends Configurable
+class Field extends Configurable implements HighlightingInterface
 {
-    /**
-     * Value for fragmenter option gap.
-     */
-    const FRAGMENTER_GAP = 'gap';
-
-    /**
-     * Value for fragmenter option regex.
-     */
-    const FRAGMENTER_REGEX = 'regex';
+    use HighlightingTrait;
 
     /**
      * Get name option.
@@ -51,260 +43,4 @@ public function setName(string $name): self
 
         return $this;
     }
-
-    /**
-     * Set snippets option.
-     *
-     * Maximum number of snippets per field
-     *
-     * @param int $maximum
-     *
-     * @return self Provides fluent interface
-     */
-    public function setSnippets(int $maximum): self
-    {
-        $this->setOption('snippets', $maximum);
-
-        return $this;
-    }
-
-    /**
-     * Get snippets option.
-     *
-     * @return int|null
-     */
-    public function getSnippets(): ?int
-    {
-        return $this->getOption('snippets');
-    }
-
-    /**
-     * Set fragsize option.
-     *
-     * The size, in characters, of fragments to consider for highlighting
-     *
-     * @param int $size
-     *
-     * @return self Provides fluent interface
-     */
-    public function setFragSize(int $size): self
-    {
-        $this->setOption('fragsize', $size);
-
-        return $this;
-    }
-
-    /**
-     * Get fragsize option.
-     *
-     * @return int|null
-     */
-    public function getFragSize(): ?int
-    {
-        return $this->getOption('fragsize');
-    }
-
-    /**
-     * Set mergeContiguous option.
-     *
-     * Collapse contiguous fragments into a single fragment
-     *
-     * @param bool $merge
-     *
-     * @return self Provides fluent interface
-     */
-    public function setMergeContiguous(bool $merge): self
-    {
-        $this->setOption('mergecontiguous', $merge);
-
-        return $this;
-    }
-
-    /**
-     * Get mergeContiguous option.
-     *
-     * @return bool|null
-     */
-    public function getMergeContiguous(): ?bool
-    {
-        return $this->getOption('mergecontiguous');
-    }
-
-    /**
-     * Set alternatefield option.
-     *
-     * @param string $field
-     *
-     * @return self Provides fluent interface
-     */
-    public function setAlternateField(string $field): self
-    {
-        $this->setOption('alternatefield', $field);
-
-        return $this;
-    }
-
-    /**
-     * Get alternatefield option.
-     *
-     * @return string|null
-     */
-    public function getAlternateField(): ?string
-    {
-        return $this->getOption('alternatefield');
-    }
-
-    /**
-     * Set preserveMulti option.
-     *
-     * @param bool $preservemulti
-     *
-     * @return self Provides fluent interface
-     */
-    public function setPreserveMulti(bool $preservemulti): self
-    {
-        $this->setOption('preservemulti', $preservemulti);
-
-        return $this;
-    }
-
-    /**
-     * Get preserveMulti option.
-     *
-     * @return bool|null
-     */
-    public function getPreserveMulti(): ?bool
-    {
-        return $this->getOption('preservemulti');
-    }
-
-    /**
-     * Set formatter option.
-     *
-     * @param string $formatter
-     *
-     * @return self Provides fluent interface
-     */
-    public function setFormatter(string $formatter = 'simple'): self
-    {
-        $this->setOption('formatter', $formatter);
-
-        return $this;
-    }
-
-    /**
-     * Get formatter option.
-     *
-     * @return string|null
-     */
-    public function getFormatter(): ?string
-    {
-        return $this->getOption('formatter');
-    }
-
-    /**
-     * Set simple prefix option.
-     *
-     * Solr option h1.simple.pre
-     *
-     * @param string $prefix
-     *
-     * @return self Provides fluent interface
-     */
-    public function setSimplePrefix(string $prefix): self
-    {
-        $this->setOption('simpleprefix', $prefix);
-
-        return $this;
-    }
-
-    /**
-     * Get simple prefix option.
-     *
-     * Solr option hl.simple.pre
-     *
-     * @return string|null
-     */
-    public function getSimplePrefix(): ?string
-    {
-        return $this->getOption('simpleprefix');
-    }
-
-    /**
-     * Set simple postfix option.
-     *
-     * Solr option h1.simple.post
-     *
-     * @param string $postfix
-     *
-     * @return self Provides fluent interface
-     */
-    public function setSimplePostfix(string $postfix): self
-    {
-        $this->setOption('simplepostfix', $postfix);
-
-        return $this;
-    }
-
-    /**
-     * Get simple postfix option.
-     *
-     * Solr option hl.simple.post
-     *
-     * @return string|null
-     */
-    public function getSimplePostfix(): ?string
-    {
-        return $this->getOption('simplepostfix');
-    }
-
-    /**
-     * Set fragmenter option.
-     *
-     * Use one of the constants as value.
-     *
-     * @param string $fragmenter
-     *
-     * @return self Provides fluent interface
-     */
-    public function setFragmenter(string $fragmenter): self
-    {
-        $this->setOption('fragmenter', $fragmenter);
-
-        return $this;
-    }
-
-    /**
-     * Get fragmenter option.
-     *
-     * @return string|null
-     */
-    public function getFragmenter(): ?string
-    {
-        return $this->getOption('fragmenter');
-    }
-
-    /**
-     * Set useFastVectorHighlighter option.
-     *
-     * @param bool $use
-     *
-     * @return self Provides fluent interface
-     */
-    public function setUseFastVectorHighlighter(bool $use): self
-    {
-        $this->setOption('usefastvectorhighlighter', $use);
-
-        return $this;
-    }
-
-    /**
-     * Get useFastVectorHighlighter option.
-     *
-     * @return bool|null
-     */
-    public function getUseFastVectorHighlighter(): ?bool
-    {
-        return $this->getOption('usefastvectorhighlighter');
-    }
 }
diff --git a/vendor/solarium/solarium/src/Component/Highlighting/Highlighting.php b/vendor/solarium/solarium/src/Component/Highlighting/Highlighting.php
index abe15ae3f..6242332c0 100644
--- a/vendor/solarium/solarium/src/Component/Highlighting/Highlighting.php
+++ b/vendor/solarium/solarium/src/Component/Highlighting/Highlighting.php
@@ -24,40 +24,11 @@
  *
  * @see https://solr.apache.org/guide/highlighting.html
  */
-class Highlighting extends AbstractComponent implements QueryInterface
+class Highlighting extends AbstractComponent implements HighlightingInterface, QueryInterface
 {
+    use HighlightingTrait;
     use QueryTrait;
 
-    /**
-     * Value for fragmenter option gap.
-     */
-    const FRAGMENTER_GAP = 'gap';
-
-    /**
-     * Value for fragmenter option regex.
-     */
-    const FRAGMENTER_REGEX = 'regex';
-
-    /**
-     * Value for BoundaryScanner type.
-     */
-    const BOUNDARYSCANNER_TYPE_CHARACTER = 'CHARACTER';
-
-    /**
-     * Value for BoundaryScanner type.
-     */
-    const BOUNDARYSCANNER_TYPE_WORD = 'WORD';
-
-    /**
-     * Value for BoundaryScanner type.
-     */
-    const BOUNDARYSCANNER_TYPE_SENTENCE = 'SENTENCE';
-
-    /**
-     * Value for BoundaryScanner type.
-     */
-    const BOUNDARYSCANNER_TYPE_LINE = 'LINE';
-
     /**
      * Array of fields for highlighting.
      *
@@ -230,81 +201,27 @@ public function setFields($fields): self
     }
 
     /**
-     * Set snippets option.
+     * Set the query parser to use for the highlight query.
      *
-     * Maximum number of snippets per field
-     *
-     * @param int $maximum
+     * @param string $parser
      *
      * @return self Provides fluent interface
      */
-    public function setSnippets(int $maximum): self
+    public function setQueryParser(string $parser): self
     {
-        $this->setOption('snippets', $maximum);
+        $this->setOption('queryparser', $parser);
 
         return $this;
     }
 
     /**
-     * Get snippets option.
-     *
-     * @return int|null
-     */
-    public function getSnippets(): ?int
-    {
-        return $this->getOption('snippets');
-    }
-
-    /**
-     * Set fragsize option.
-     *
-     * The size, in characters, of fragments to consider for highlighting
+     * Get the query parser to use for the highlight query.
      *
-     * @param int $size
-     *
-     * @return self Provides fluent interface
-     */
-    public function setFragSize(int $size): self
-    {
-        $this->setOption('fragsize', $size);
-
-        return $this;
-    }
-
-    /**
-     * Get fragsize option.
-     *
-     * @return int|null
-     */
-    public function getFragSize(): ?int
-    {
-        return $this->getOption('fragsize');
-    }
-
-    /**
-     * Set mergeContiguous option.
-     *
-     * Collapse contiguous fragments into a single fragment
-     *
-     * @param bool $merge
-     *
-     * @return self Provides fluent interface
-     */
-    public function setMergeContiguous(bool $merge): self
-    {
-        $this->setOption('mergecontiguous', $merge);
-
-        return $this;
-    }
-
-    /**
-     * Get mergeContiguous option.
-     *
-     * @return bool|null
+     * @return string|null
      */
-    public function getMergeContiguous(): ?bool
+    public function getQueryParser(): ?string
     {
-        return $this->getOption('mergecontiguous');
+        return $this->getOption('queryparser');
     }
 
     /**
@@ -331,650 +248,6 @@ public function getRequireFieldMatch(): ?bool
         return $this->getOption('requirefieldmatch');
     }
 
-    /**
-     * Set maxAnalyzedChars option.
-     *
-     * How many characters into a document to look for suitable snippets
-     *
-     * @param int $chars
-     *
-     * @return self Provides fluent interface
-     */
-    public function setMaxAnalyzedChars(int $chars): self
-    {
-        $this->setOption('maxanalyzedchars', $chars);
-
-        return $this;
-    }
-
-    /**
-     * Get maxAnalyzedChars option.
-     *
-     * @return int|null
-     */
-    public function getMaxAnalyzedChars(): ?int
-    {
-        return $this->getOption('maxanalyzedchars');
-    }
-
-    /**
-     * Set alternatefield option.
-     *
-     * @param string $field
-     *
-     * @return self Provides fluent interface
-     */
-    public function setAlternateField(string $field): self
-    {
-        $this->setOption('alternatefield', $field);
-
-        return $this;
-    }
-
-    /**
-     * Get alternatefield option.
-     *
-     * @return string|null
-     */
-    public function getAlternateField(): ?string
-    {
-        return $this->getOption('alternatefield');
-    }
-
-    /**
-     * Set maxAlternateFieldLength option.
-     *
-     * @param int $length
-     *
-     * @return self Provides fluent interface
-     */
-    public function setMaxAlternateFieldLength(int $length): self
-    {
-        $this->setOption('maxalternatefieldlength', $length);
-
-        return $this;
-    }
-
-    /**
-     * Get maxAlternateFieldLength option.
-     *
-     * @return int|null
-     */
-    public function getMaxAlternateFieldLength(): ?int
-    {
-        return $this->getOption('maxalternatefieldlength');
-    }
-
-    /**
-     * Set preserveMulti option.
-     *
-     * @param bool $preservemulti
-     *
-     * @return self Provides fluent interface
-     */
-    public function setPreserveMulti(bool $preservemulti): self
-    {
-        $this->setOption('preservemulti', $preservemulti);
-
-        return $this;
-    }
-
-    /**
-     * Get preserveMulti option.
-     *
-     * @return bool|null
-     */
-    public function getPreserveMulti(): ?bool
-    {
-        return $this->getOption('preservemulti');
-    }
-
-    /**
-     * Set formatter option.
-     *
-     * @param string $formatter
-     *
-     * @return self Provides fluent interface
-     */
-    public function setFormatter(string $formatter = 'simple'): self
-    {
-        $this->setOption('formatter', $formatter);
-
-        return $this;
-    }
-
-    /**
-     * Get formatter option.
-     *
-     * @return string|null
-     */
-    public function getFormatter(): ?string
-    {
-        return $this->getOption('formatter');
-    }
-
-    /**
-     * Set simple prefix option.
-     *
-     * Solr option h1.simple.pre
-     *
-     * @param string $prefix
-     *
-     * @return self Provides fluent interface
-     */
-    public function setSimplePrefix(string $prefix): self
-    {
-        $this->setOption('simpleprefix', $prefix);
-
-        return $this;
-    }
-
-    /**
-     * Get simple prefix option.
-     *
-     * Solr option hl.simple.pre
-     *
-     * @return string|null
-     */
-    public function getSimplePrefix(): ?string
-    {
-        return $this->getOption('simpleprefix');
-    }
-
-    /**
-     * Set simple postfix option.
-     *
-     * Solr option h1.simple.post
-     *
-     * @param string $postfix
-     *
-     * @return self Provides fluent interface
-     */
-    public function setSimplePostfix(string $postfix): self
-    {
-        $this->setOption('simplepostfix', $postfix);
-
-        return $this;
-    }
-
-    /**
-     * Get simple postfix option.
-     *
-     * Solr option hl.simple.post
-     *
-     * @return string|null
-     */
-    public function getSimplePostfix(): ?string
-    {
-        return $this->getOption('simplepostfix');
-    }
-
-    /**
-     * Set tag prefix option.
-     *
-     * Solr option h1.tag.post
-     *
-     * @param string $prefix
-     *
-     * @return self Provides fluent interface
-     */
-    public function setTagPrefix(string $prefix): self
-    {
-        $this->setOption('tagprefix', $prefix);
-
-        return $this;
-    }
-
-    /**
-     * Get tag prefix option.
-     *
-     * Solr option hl.tag.pre
-     *
-     * @return string|null
-     */
-    public function getTagPrefix(): ?string
-    {
-        return $this->getOption('tagprefix');
-    }
-
-    /**
-     * Set tag postfix option.
-     *
-     * Solr option h1.tag.post
-     *
-     * @param string $postfix
-     *
-     * @return self Provides fluent interface
-     */
-    public function setTagPostfix(string $postfix): self
-    {
-        $this->setOption('tagpostfix', $postfix);
-
-        return $this;
-    }
-
-    /**
-     * Get tag postfix option.
-     *
-     * Solr option hl.tag.post
-     *
-     * @return string|null
-     */
-    public function getTagPostfix(): ?string
-    {
-        return $this->getOption('tagpostfix');
-    }
-
-    /**
-     * Set fragmenter option.
-     *
-     * Use one of the constants as value.
-     *
-     * @param string $fragmenter
-     *
-     * @return self Provides fluent interface
-     */
-    public function setFragmenter(string $fragmenter): self
-    {
-        $this->setOption('fragmenter', $fragmenter);
-
-        return $this;
-    }
-
-    /**
-     * Get fragmenter option.
-     *
-     * @return string|null
-     */
-    public function getFragmenter(): ?string
-    {
-        return $this->getOption('fragmenter');
-    }
-
-    /**
-     * Set fraglistbuilder option.
-     *
-     * @param string $builder
-     *
-     * @return self Provides fluent interface
-     */
-    public function setFragListBuilder(string $builder): self
-    {
-        $this->setOption('fraglistbuilder', $builder);
-
-        return $this;
-    }
-
-    /**
-     * Get fraglistbuilder option.
-     *
-     * @return string|null
-     */
-    public function getFragListBuilder(): ?string
-    {
-        return $this->getOption('fraglistbuilder');
-    }
-
-    /**
-     * Set fragmentsbuilder option.
-     *
-     * @param string $builder
-     *
-     * @return self Provides fluent interface
-     */
-    public function setFragmentsBuilder(string $builder): self
-    {
-        $this->setOption('fragmentsbuilder', $builder);
-
-        return $this;
-    }
-
-    /**
-     * Get fragmentsbuilder option.
-     *
-     * @return string|null
-     */
-    public function getFragmentsBuilder(): ?string
-    {
-        return $this->getOption('fragmentsbuilder');
-    }
-
-    /**
-     * Set useFastVectorHighlighter option.
-     *
-     * @param bool $use
-     *
-     * @return self Provides fluent interface
-     */
-    public function setUseFastVectorHighlighter(bool $use): self
-    {
-        $this->setOption('usefastvectorhighlighter', $use);
-
-        return $this;
-    }
-
-    /**
-     * Get useFastVectorHighlighter option.
-     *
-     * @return bool|null
-     */
-    public function getUseFastVectorHighlighter(): ?bool
-    {
-        return $this->getOption('usefastvectorhighlighter');
-    }
-
-    /**
-     * Set usePhraseHighlighter option.
-     *
-     * @param bool $use
-     *
-     * @return self Provides fluent interface
-     */
-    public function setUsePhraseHighlighter(bool $use): self
-    {
-        $this->setOption('usephrasehighlighter', $use);
-
-        return $this;
-    }
-
-    /**
-     * Get usePhraseHighlighter option.
-     *
-     * @return bool|null
-     */
-    public function getUsePhraseHighlighter(): ?bool
-    {
-        return $this->getOption('usephrasehighlighter');
-    }
-
-    /**
-     * Set HighlightMultiTerm option.
-     *
-     * @param bool $highlight
-     *
-     * @return self Provides fluent interface
-     */
-    public function setHighlightMultiTerm(bool $highlight): self
-    {
-        $this->setOption('highlightmultiterm', $highlight);
-
-        return $this;
-    }
-
-    /**
-     * Get HighlightMultiTerm option.
-     *
-     * @return bool|null
-     */
-    public function getHighlightMultiTerm(): ?bool
-    {
-        return $this->getOption('highlightmultiterm');
-    }
-
-    /**
-     * Set RegexSlop option.
-     *
-     * @param float $slop
-     *
-     * @return self Provides fluent interface
-     */
-    public function setRegexSlop(float $slop): self
-    {
-        $this->setOption('regexslop', $slop);
-
-        return $this;
-    }
-
-    /**
-     * Get RegexSlop option.
-     *
-     * @return float|null
-     */
-    public function getRegexSlop(): ?float
-    {
-        return $this->getOption('regexslop');
-    }
-
-    /**
-     * Set RegexPattern option.
-     *
-     * @param string $pattern
-     *
-     * @return self Provides fluent interface
-     */
-    public function setRegexPattern(string $pattern): self
-    {
-        $this->setOption('regexpattern', $pattern);
-
-        return $this;
-    }
-
-    /**
-     * Get RegexPattern option.
-     *
-     * @return string|null
-     */
-    public function getRegexPattern(): ?string
-    {
-        return $this->getOption('regexpattern');
-    }
-
-    /**
-     * Set RegexMaxAnalyzedChars option.
-     *
-     * @param int $chars
-     *
-     * @return self Provides fluent interface
-     */
-    public function setRegexMaxAnalyzedChars(int $chars): self
-    {
-        $this->setOption('regexmaxanalyzedchars', $chars);
-
-        return $this;
-    }
-
-    /**
-     * Get RegexMaxAnalyzedChars option.
-     *
-     * @return int|null
-     */
-    public function getRegexMaxAnalyzedChars(): ?int
-    {
-        return $this->getOption('regexmaxanalyzedchars');
-    }
-
-    /**
-     * Set phraselimit option.
-     *
-     * @param int $maximum
-     *
-     * @return self Provides fluent interface
-     */
-    public function setPhraseLimit(int $maximum): self
-    {
-        $this->setOption('phraselimit', $maximum);
-
-        return $this;
-    }
-
-    /**
-     * Get phraselimit option.
-     *
-     * @return int|null
-     */
-    public function getPhraseLimit(): ?int
-    {
-        return $this->getOption('phraselimit');
-    }
-
-    /**
-     * Set MultiValuedSeparatorChar option.
-     *
-     * @param string $separator
-     *
-     * @return self Provides fluent interface
-     */
-    public function setMultiValuedSeparatorChar(string $separator): self
-    {
-        $this->setOption('multivaluedseparatorchar', $separator);
-
-        return $this;
-    }
-
-    /**
-     * Get MultiValuedSeparatorChar option.
-     *
-     * @return string|null
-     */
-    public function getMultiValuedSeparatorChar(): ?string
-    {
-        return $this->getOption('multivaluedseparatorchar');
-    }
-
-    /**
-     * Set boundaryscannermaxscan option.
-     *
-     * @param int $maximum
-     *
-     * @return self Provides fluent interface
-     */
-    public function setBoundaryScannerMaxScan(int $maximum): self
-    {
-        $this->setOption('boundaryscannermaxscan', $maximum);
-
-        return $this;
-    }
-
-    /**
-     * Get boundaryscannermaxscan option.
-     *
-     * @return int|null
-     */
-    public function getBoundaryScannerMaxScan(): ?int
-    {
-        return $this->getOption('boundaryscannermaxscan');
-    }
-
-    /**
-     * Set boundaryscannerchars option.
-     *
-     * @param string $chars
-     *
-     * @return self Provides fluent interface
-     */
-    public function setBoundaryScannerChars(string $chars): self
-    {
-        $this->setOption('boundaryscannerchars', $chars);
-
-        return $this;
-    }
-
-    /**
-     * Get boundaryscannerchars option.
-     *
-     * @return string|null
-     */
-    public function getBoundaryScannerChars(): ?string
-    {
-        return $this->getOption('boundaryscannerchars');
-    }
-
-    /**
-     * Set boundaryscannertype option.
-     *
-     * @param string $type
-     *
-     * @return self Provides fluent interface
-     */
-    public function setBoundaryScannerType(string $type): self
-    {
-        $this->setOption('boundaryscannertype', $type);
-
-        return $this;
-    }
-
-    /**
-     * Get boundaryscannertype option.
-     *
-     * @return string|null
-     */
-    public function getBoundaryScannerType(): ?string
-    {
-        return $this->getOption('boundaryscannertype');
-    }
-
-    /**
-     * Set boundaryscannerlanguage option.
-     *
-     * @param string $language
-     *
-     * @return self Provides fluent interface
-     */
-    public function setBoundaryScannerLanguage(string $language): self
-    {
-        $this->setOption('boundaryscannerlanguage', $language);
-
-        return $this;
-    }
-
-    /**
-     * Get boundaryscannerlanguage option.
-     *
-     * @return string|null
-     */
-    public function getBoundaryScannerLanguage(): ?string
-    {
-        return $this->getOption('boundaryscannerlanguage');
-    }
-
-    /**
-     * Set boundaryscannercountry option.
-     *
-     * @param string $country
-     *
-     * @return self Provides fluent interface
-     */
-    public function setBoundaryScannerCountry(string $country): self
-    {
-        $this->setOption('boundaryscannercountry', $country);
-
-        return $this;
-    }
-
-    /**
-     * Get boundaryscannercountry option.
-     *
-     * @return string|null
-     */
-    public function getBoundaryScannerCountry(): ?string
-    {
-        return $this->getOption('boundaryscannercountry');
-    }
-
-    /**
-     * Set method option.
-     *
-     * @param string $method
-     *
-     * @return self Provides fluent interface
-     */
-    public function setMethod(string $method): self
-    {
-        $this->setOption('method', $method);
-
-        return $this;
-    }
-
-    /**
-     * Get method option.
-     *
-     * @return string|null
-     */
-    public function getMethod(): ?string
-    {
-        return $this->getOption('method');
-    }
-
     /**
      * Initialize options.
      *
diff --git a/vendor/solarium/solarium/src/Component/Highlighting/HighlightingInterface.php b/vendor/solarium/solarium/src/Component/Highlighting/HighlightingInterface.php
new file mode 100644
index 000000000..33f853fd8
--- /dev/null
+++ b/vendor/solarium/solarium/src/Component/Highlighting/HighlightingInterface.php
@@ -0,0 +1,936 @@
+<?php
+
+/*
+ * This file is part of the Solarium package.
+ *
+ * For the full copyright and license information, please view the COPYING
+ * file that was distributed with this source code.
+ */
+
+namespace Solarium\Component\Highlighting;
+
+/**
+ * Highlighting interface.
+ */
+interface HighlightingInterface
+{
+    /**
+     * Unified Highlighter.
+     */
+    const METHOD_UNIFIED = 'unified';
+
+    /**
+     * Original Highlighter.
+     */
+    const METHOD_ORIGINAL = 'original';
+
+    /**
+     * FastVector Highlighter.
+     */
+    const METHOD_FASTVECTOR = 'fastVector';
+
+    /**
+     * HTML/XML encoder.
+     */
+    const ENCODER_HTML = 'html';
+
+    /**
+     * Run the stored text through the analysis chain for detecting offsets.
+     */
+    const OFFSETSOURCE_ANALYSIS = 'ANALYSIS';
+
+    /**
+     * Look up offsets from postings.
+     */
+    const OFFSETSOURCE_POSTINGS = 'POSTINGS';
+
+    /**
+     * Look up offsets from postings with "light" term vectors.
+     */
+    const OFFSETSOURCE_POSTINGS_WITH_TERM_VECTORS = 'POSTINGS_WITH_TERM_VECTORS';
+
+    /**
+     * Look up offsets from "full" term vectors.
+     */
+    const OFFSETSOURCE_TERM_VECTORS = 'TERM_VECTORS';
+
+    /**
+     * Value for BoundaryScanner type.
+     */
+    const BOUNDARYSCANNER_TYPE_SEPARATOR = 'SEPARATOR';
+
+    /**
+     * Value for BoundaryScanner type.
+     */
+    const BOUNDARYSCANNER_TYPE_SENTENCE = 'SENTENCE';
+
+    /**
+     * Value for BoundaryScanner type.
+     */
+    const BOUNDARYSCANNER_TYPE_WORD = 'WORD';
+
+    /**
+     * Value for BoundaryScanner type.
+     */
+    const BOUNDARYSCANNER_TYPE_CHARACTER = 'CHARACTER';
+
+    /**
+     * Value for BoundaryScanner type.
+     */
+    const BOUNDARYSCANNER_TYPE_LINE = 'LINE';
+
+    /**
+     * Value for BoundaryScanner type.
+     */
+    const BOUNDARYSCANNER_TYPE_WHOLE = 'WHOLE';
+
+    /**
+     * Simple formatter.
+     */
+    const FORMATTER_SIMPLE = 'simple';
+
+    /**
+     * Gap fragmenter.
+     */
+    const FRAGMENTER_GAP = 'gap';
+
+    /**
+     * Regex fragmenter.
+     */
+    const FRAGMENTER_REGEX = 'regex';
+
+    /**
+     * Use a weighted snippet fragmenting algorithm.
+     */
+    const FRAGLISTBUILDER_WEIGHTED = 'weighted';
+
+    /**
+     * Return the entire field contents as a one snippet.
+     */
+    const FRAGLISTBUILDER_SINGLE = 'single';
+
+    /**
+     * Use a simple snippet fragmenting algorithm.
+     */
+    const FRAGLISTBUILDER_SIMPLE = 'simple';
+
+    /**
+     * Use the default fragments builder.
+     */
+    const FRAGMENTSBUILDER_DEFAULT = 'default';
+
+    /**
+     * Use the pre-configured colored fragments builder.
+     */
+    const FRAGMENTSBUILDER_COLORED = 'colored';
+
+    /**
+     * Use the breakIterator boundary scanner.
+     */
+    const BOUNDARYSCANNER_BREAKITERATOR = 'breakIterator';
+
+    /**
+     * Use the simple boundary scanner.
+     */
+    const BOUNDARYSCANNER_SIMPLE = 'simple';
+
+    /**
+     * Set useFastVectorHighlighter option.
+     *
+     * @param bool $use
+     *
+     * @return self Provides fluent interface
+     *
+     * @deprecated Use {@link setMethod()} for Solr 6.4 and higher
+     */
+    public function setUseFastVectorHighlighter(bool $use): HighlightingInterface;
+
+    /**
+     * Get useFastVectorHighlighter option.
+     *
+     * @return bool|null
+     */
+    public function getUseFastVectorHighlighter(): ?bool;
+
+    /**
+     * Set highlighter method.
+     *
+     * Use one of the METHOD_* constants as value.
+     *
+     * @param string $method
+     *
+     * @return self Provides fluent interface
+     */
+    public function setMethod(string $method): HighlightingInterface;
+
+    /**
+     * Get highlighter method.
+     *
+     * @return string|null
+     */
+    public function getMethod(): ?string;
+
+    /**
+     * Set usePhraseHighlighter option.
+     *
+     * @param bool $use
+     *
+     * @return self Provides fluent interface
+     */
+    public function setUsePhraseHighlighter(bool $use): HighlightingInterface;
+
+    /**
+     * Get usePhraseHighlighter option.
+     *
+     * @return bool|null
+     */
+    public function getUsePhraseHighlighter(): ?bool;
+
+    /**
+     * Set HighlightMultiTerm option.
+     *
+     * @param bool $highlight
+     *
+     * @return self Provides fluent interface
+     */
+    public function setHighlightMultiTerm(bool $highlight): HighlightingInterface;
+
+    /**
+     * Get HighlightMultiTerm option.
+     *
+     * @return bool|null
+     */
+    public function getHighlightMultiTerm(): ?bool;
+
+    /**
+     * Set snippets option.
+     *
+     * Maximum number of snippets per field
+     *
+     * @param int $maximum
+     *
+     * @return self Provides fluent interface
+     */
+    public function setSnippets(int $maximum): HighlightingInterface;
+
+    /**
+     * Get snippets option.
+     *
+     * @return int|null
+     */
+    public function getSnippets(): ?int;
+
+    /**
+     * Set fragsize option.
+     *
+     * The size, in characters, of fragments to consider for highlighting
+     *
+     * @param int $size
+     *
+     * @return self Provides fluent interface
+     */
+    public function setFragSize(int $size): HighlightingInterface;
+
+    /**
+     * Get fragsize option.
+     *
+     * @return int|null
+     */
+    public function getFragSize(): ?int;
+
+    /**
+     * Set tag prefix option.
+     *
+     * Solr option hl.tag.post
+     *
+     * @param string $prefix
+     *
+     * @return self Provides fluent interface
+     */
+    public function setTagPrefix(string $prefix): HighlightingInterface;
+
+    /**
+     * Get tag prefix option.
+     *
+     * Solr option hl.tag.pre
+     *
+     * @return string|null
+     */
+    public function getTagPrefix(): ?string;
+
+    /**
+     * Set tag postfix option.
+     *
+     * Solr option hl.tag.post
+     *
+     * @param string $postfix
+     *
+     * @return self Provides fluent interface
+     */
+    public function setTagPostfix(string $postfix): HighlightingInterface;
+
+    /**
+     * Get tag postfix option.
+     *
+     * Solr option hl.tag.post
+     *
+     * @return string|null
+     */
+    public function getTagPostfix(): ?string;
+
+    /**
+     * Set encoder option.
+     *
+     * Use one of the ENCODER_* constants as value.
+     *
+     * @param string $encoder
+     *
+     * @return self Provides fluent interface
+     */
+    public function setEncoder(string $encoder): HighlightingInterface;
+
+    /**
+     * Get encoder option.
+     *
+     * @return string|null
+     */
+    public function getEncoder(): ?string;
+
+    /**
+     * Set maxAnalyzedChars option.
+     *
+     * How many characters into a document to look for suitable snippets
+     *
+     * @param int $chars
+     *
+     * @return self Provides fluent interface
+     */
+    public function setMaxAnalyzedChars(int $chars): HighlightingInterface;
+
+    /**
+     * Get maxAnalyzedChars option.
+     *
+     * @return int|null
+     */
+    public function getMaxAnalyzedChars(): ?int;
+
+    /**
+     * Set offsetSource option.
+     *
+     * Use one of the OFFSETSOURCE_* constants as value.
+     *
+     * @param string $offsetSource
+     *
+     * @return self Provides fluent interface
+     */
+    public function setOffsetSource(string $offsetSource): HighlightingInterface;
+
+    /**
+     * Get offsetSource option.
+     *
+     * @return string|null
+     */
+    public function getOffsetSource(): ?string;
+
+    /**
+     * Set fragAlignRatio option.
+     *
+     * Influences where the first highlighted text in a passage is positioned.
+     *
+     * @param float $fragAlignRatio
+     *
+     * @return self Provides fluent interface
+     */
+    public function setFragAlignRatio(float $fragAlignRatio): HighlightingInterface;
+
+    /**
+     * Get fragAlignRatio option.
+     *
+     * @return float|null
+     */
+    public function getFragAlignRatio(): ?float;
+
+    /**
+     * Set fragsizeIsMinimum option.
+     *
+     * @param bool $isMinimum
+     *
+     * @return self Provides fluent interface
+     */
+    public function setFragsizeIsMinimum(bool $isMinimum): HighlightingInterface;
+
+    /**
+     * Get fragsizeIsMinimum option.
+     *
+     * @return bool|null
+     */
+    public function getFragsizeIsMinimum(): ?bool;
+
+    /**
+     * Set tag.ellipsis option.
+     *
+     * @param string $ellipsis
+     *
+     * @return self Provides fluent interface
+     */
+    public function setTagEllipsis(string $ellipsis): HighlightingInterface;
+
+    /**
+     * Get tag.ellipsis option.
+     *
+     * @return string|null
+     */
+    public function getTagEllipsis(): ?string;
+
+    /**
+     * Set defaultSummary option.
+     *
+     * @param bool $defaultSummary
+     *
+     * @return self Provides fluent interface
+     */
+    public function setDefaultSummary(bool $defaultSummary): HighlightingInterface;
+
+    /**
+     * Get defaultSummary option.
+     *
+     * @return bool|null
+     */
+    public function getDefaultSummary(): ?bool;
+
+    /**
+     * Set score.k1 option.
+     *
+     * BM25 term frequency normalization parameter 'k1'.
+     *
+     * @param float $k1
+     *
+     * @return self Provides fluent interface
+     */
+    public function setScoreK1(float $k1): HighlightingInterface;
+
+    /**
+     * Get score.k1 option.
+     *
+     * @return float|null
+     */
+    public function getScoreK1(): ?float;
+
+    /**
+     * Set score.b option.
+     *
+     * BM25 length normalization parameter 'b'.
+     *
+     * @param float $b
+     *
+     * @return self Provides fluent interface
+     */
+    public function setScoreB(float $b): HighlightingInterface;
+
+    /**
+     * Get score.b option.
+     *
+     * @return float|null
+     */
+    public function getScoreB(): ?float;
+
+    /**
+     * Set score.pivot option.
+     *
+     * BM25 average passage length in characters.
+     *
+     * @param int $pivot
+     *
+     * @return self Provides fluent interface
+     */
+    public function setScorePivot(int $pivot): HighlightingInterface;
+
+    /**
+     * Get score.pivot option.
+     *
+     * @return int|null
+     */
+    public function getScorePivot(): ?int;
+
+    /**
+     * Set breakIterator boundary scanner language option.
+     *
+     * @param string $language
+     *
+     * @return self Provides fluent interface
+     */
+    public function setBoundaryScannerLanguage(string $language): HighlightingInterface;
+
+    /**
+     * Get breakIterator boundary scanner language option.
+     *
+     * @return string|null
+     */
+    public function getBoundaryScannerLanguage(): ?string;
+
+    /**
+     * Set breakIterator boundary scanner country option.
+     *
+     * @param string $country
+     *
+     * @return self Provides fluent interface
+     */
+    public function setBoundaryScannerCountry(string $country): HighlightingInterface;
+
+    /**
+     * Get breakIterator boundary scanner country option.
+     *
+     * @return string|null
+     */
+    public function getBoundaryScannerCountry(): ?string;
+
+    /**
+     * Set breakIterator boundary scanner variant option.
+     *
+     * @param string $variant
+     *
+     * @return self Provides fluent interface
+     */
+    public function setBoundaryScannerVariant(string $variant): HighlightingInterface;
+
+    /**
+     * Get breakIterator boundary scanner variant option.
+     *
+     * @return string|null
+     */
+    public function getBoundaryScannerVariant(): ?string;
+
+    /**
+     * Set breakIterator boundary scanner type option.
+     *
+     * Use one of the BOUNDARYSCANNER_TYPE_* constants as value.
+     *
+     * @param string $type
+     *
+     * @return self Provides fluent interface
+     */
+    public function setBoundaryScannerType(string $type): HighlightingInterface;
+
+    /**
+     * Get breakIterator boundary scanner type option.
+     *
+     * @return string|null
+     */
+    public function getBoundaryScannerType(): ?string;
+
+    /**
+     * Set breakIterator boundary scanner separator option.
+     *
+     * Indicates which character to break the text on with BOUNDARYSCANNER_TYPE_SEPARATOR.
+     *
+     * @param string $separator
+     *
+     * @return self Provides fluent interface
+     */
+    public function setBoundaryScannerSeparator(string $separator): HighlightingInterface;
+
+    /**
+     * Get breakIterator boundary scanner separator option.
+     *
+     * @return string|null
+     */
+    public function getBoundaryScannerSeparator(): ?string;
+
+    /**
+     * Set weightMatches option.
+     *
+     * Use Lucene's "Weight Matches" API instead of doing SpanQuery conversion.
+     *
+     * @param bool $weightMatches
+     *
+     * @return self Provides fluent interface
+     */
+    public function setWeightMatches(bool $weightMatches): HighlightingInterface;
+
+    /**
+     * Get weightMatches option.
+     *
+     * @return bool|null
+     */
+    public function getWeightMatches(): ?bool;
+
+    /**
+     * Set mergeContiguous option.
+     *
+     * Collapse contiguous fragments into a single fragment.
+     *
+     * @param bool $merge
+     *
+     * @return self Provides fluent interface
+     */
+    public function setMergeContiguous(bool $merge): HighlightingInterface;
+
+    /**
+     * Get mergeContiguous option.
+     *
+     * @return bool|null
+     */
+    public function getMergeContiguous(): ?bool;
+
+    /**
+     * Set maxMultiValuedToExamine option.
+     *
+     * Maximum number of entries in a multi-valued field to examine before stopping.
+     *
+     * @param int $maximum
+     *
+     * @return self Provides fluent interface
+     */
+    public function setMaxMultiValuedToExamine(int $maximum): HighlightingInterface;
+
+    /**
+     * Get maxMultiValuedToExamine option.
+     *
+     * @return int|null
+     */
+    public function getMaxMultiValuedToExamine(): ?int;
+
+    /**
+     * Set maxMultiValuedToMatch option.
+     *
+     * Maximum number of matches in a multi-valued field that are found before stopping.
+     *
+     * @param int $maximum
+     *
+     * @return self Provides fluent interface
+     */
+    public function setMaxMultiValuedToMatch(int $maximum): HighlightingInterface;
+
+    /**
+     * Get maxMultiValuedToMatch option.
+     *
+     * @return int|null
+     */
+    public function getMaxMultiValuedToMatch(): ?int;
+
+    /**
+     * Set alternateField option.
+     *
+     * @param string $field
+     *
+     * @return self Provides fluent interface
+     */
+    public function setAlternateField(string $field): HighlightingInterface;
+
+    /**
+     * Get alternateField option.
+     *
+     * @return string|null
+     */
+    public function getAlternateField(): ?string;
+
+    /**
+     * Set maxAlternateFieldLength option.
+     *
+     * @param int $length
+     *
+     * @return self Provides fluent interface
+     */
+    public function setMaxAlternateFieldLength(int $length): HighlightingInterface;
+
+    /**
+     * Get maxAlternateFieldLength option.
+     *
+     * @return int|null
+     */
+    public function getMaxAlternateFieldLength(): ?int;
+
+    /**
+     * Set highlightAlternate option.
+     *
+     * @param bool $highlight
+     *
+     * @return self Provides fluent interface
+     */
+    public function setHighlightAlternate(bool $highlight): HighlightingInterface;
+
+    /**
+     * Get highlightAlternate option.
+     *
+     * @return bool|null
+     */
+    public function getHighlightAlternate(): ?bool;
+
+    /**
+     * Set formatter option.
+     *
+     * Use one of the FORMATTER_* constants as value.
+     *
+     * @param string $formatter
+     *
+     * @return self Provides fluent interface
+     */
+    public function setFormatter(string $formatter = HighlightingInterface::FORMATTER_SIMPLE): HighlightingInterface;
+
+    /**
+     * Get formatter option.
+     *
+     * @return string|null
+     */
+    public function getFormatter(): ?string;
+
+    /**
+     * Set simple prefix option.
+     *
+     * Solr option hl.simple.pre
+     *
+     * @param string $prefix
+     *
+     * @return self Provides fluent interface
+     */
+    public function setSimplePrefix(string $prefix): HighlightingInterface;
+
+    /**
+     * Get simple prefix option.
+     *
+     * Solr option hl.simple.pre
+     *
+     * @return string|null
+     */
+    public function getSimplePrefix(): ?string;
+
+    /**
+     * Set simple postfix option.
+     *
+     * Solr option hl.simple.post
+     *
+     * @param string $postfix
+     *
+     * @return self Provides fluent interface
+     */
+    public function setSimplePostfix(string $postfix): HighlightingInterface;
+
+    /**
+     * Get simple postfix option.
+     *
+     * Solr option hl.simple.post
+     *
+     * @return string|null
+     */
+    public function getSimplePostfix(): ?string;
+
+    /**
+     * Set fragmenter option.
+     *
+     * Use one of the FRAGMENTER_* constants as value.
+     *
+     * @param string $fragmenter
+     *
+     * @return self Provides fluent interface
+     */
+    public function setFragmenter(string $fragmenter): HighlightingInterface;
+
+    /**
+     * Get fragmenter option.
+     *
+     * @return string|null
+     */
+    public function getFragmenter(): ?string;
+
+    /**
+     * Set regex.slop option.
+     *
+     * @param float $slop
+     *
+     * @return self Provides fluent interface
+     */
+    public function setRegexSlop(float $slop): HighlightingInterface;
+
+    /**
+     * Get regex.slop option.
+     *
+     * @return float|null
+     */
+    public function getRegexSlop(): ?float;
+
+    /**
+     * Set regex.pattern option.
+     *
+     * @param string $pattern
+     *
+     * @return self Provides fluent interface
+     */
+    public function setRegexPattern(string $pattern): HighlightingInterface;
+
+    /**
+     * Get regex.pattern option.
+     *
+     * @return string|null
+     */
+    public function getRegexPattern(): ?string;
+
+    /**
+     * Set regex.maxAnalyzedChars option.
+     *
+     * @param int $chars
+     *
+     * @return self Provides fluent interface
+     */
+    public function setRegexMaxAnalyzedChars(int $chars): HighlightingInterface;
+
+    /**
+     * Get regex.maxAnalyzedChars option.
+     *
+     * @return int|null
+     */
+    public function getRegexMaxAnalyzedChars(): ?int;
+
+    /**
+     * Set preserveMulti option.
+     *
+     * @param bool $preservemulti
+     *
+     * @return self Provides fluent interface
+     */
+    public function setPreserveMulti(bool $preservemulti): HighlightingInterface;
+
+    /**
+     * Get preserveMulti option.
+     *
+     * @return bool|null
+     */
+    public function getPreserveMulti(): ?bool;
+
+    /**
+     * Set payloads option.
+     *
+     * @param bool $payloads
+     *
+     * @return self Provides fluent interface
+     */
+    public function setPayloads(bool $payloads): HighlightingInterface;
+
+    /**
+     * Get payloads option.
+     *
+     * @return bool|null
+     */
+    public function getPayloads(): ?bool;
+
+    /**
+     * Set fragListBuilder option.
+     *
+     * Use one of the FRAGLISTBUILDER_* constants as value.
+     *
+     * @param string $builder
+     *
+     * @return self Provides fluent interface
+     */
+    public function setFragListBuilder(string $builder): HighlightingInterface;
+
+    /**
+     * Get fragListBuilder option.
+     *
+     * @return string|null
+     */
+    public function getFragListBuilder(): ?string;
+
+    /**
+     * Set fragmentsBuilder option.
+     *
+     * Use one of the FRAGMENTSBUILDER_* constants or the name of your own fragments builder as value.
+     *
+     * @param string $builder
+     *
+     * @return self Provides fluent interface
+     */
+    public function setFragmentsBuilder(string $builder): HighlightingInterface;
+
+    /**
+     * Get fragmentsBuilder option.
+     *
+     * @return string|null
+     */
+    public function getFragmentsBuilder(): ?string;
+
+    /**
+     * Set boundaryScanner option.
+     *
+     * Use one of the BOUNDARYSCANNER_* constants as value.
+     *
+     * @param string $scanner
+     *
+     * @return self Provides fluent interface
+     */
+    public function setBoundaryScanner(string $scanner): HighlightingInterface;
+
+    /**
+     * Get boundaryScanner option.
+     *
+     * @return string|null
+     */
+    public function getBoundaryScanner(): ?string;
+
+    /**
+     * Set simple boundary scanner maxScan option.
+     *
+     * @param int $maximum
+     *
+     * @return self Provides fluent interface
+     */
+    public function setBoundaryScannerMaxScan(int $maximum): HighlightingInterface;
+
+    /**
+     * Get simple boundary scanner maxScan option.
+     *
+     * @return int|null
+     */
+    public function getBoundaryScannerMaxScan(): ?int;
+
+    /**
+     * Set simple boundary scanner cgars option.
+     *
+     * @param string $chars
+     *
+     * @return self Provides fluent interface
+     */
+    public function setBoundaryScannerChars(string $chars): HighlightingInterface;
+
+    /**
+     * Get simple boundary scanner cgars option.
+     *
+     * @return string|null
+     */
+    public function getBoundaryScannerChars(): ?string;
+
+    /**
+     * Set phraseLimit option.
+     *
+     * Maximum number of phrases to analyze when searching for the highest-scoring phrase.
+     *
+     * @param int $maximum
+     *
+     * @return self Provides fluent interface
+     */
+    public function setPhraseLimit(int $maximum): HighlightingInterface;
+
+    /**
+     * Get phraseLimit option.
+     *
+     * @return int|null
+     */
+    public function getPhraseLimit(): ?int;
+
+    /**
+     * Set multiValuedSeparatorChar option.
+     *
+     * Text to use to separate one value from the next for a multi-valued field.
+     *
+     * @param string $separator
+     *
+     * @return self Provides fluent interface
+     */
+    public function setMultiValuedSeparatorChar(string $separator): HighlightingInterface;
+
+    /**
+     * Get multiValuedSeparatorChar option.
+     *
+     * @return string|null
+     */
+    public function getMultiValuedSeparatorChar(): ?string;
+}
diff --git a/vendor/solarium/solarium/src/Component/Highlighting/HighlightingTrait.php b/vendor/solarium/solarium/src/Component/Highlighting/HighlightingTrait.php
new file mode 100644
index 000000000..65488dd59
--- /dev/null
+++ b/vendor/solarium/solarium/src/Component/Highlighting/HighlightingTrait.php
@@ -0,0 +1,1184 @@
+<?php
+
+/*
+ * This file is part of the Solarium package.
+ *
+ * For the full copyright and license information, please view the COPYING
+ * file that was distributed with this source code.
+ */
+
+namespace Solarium\Component\Highlighting;
+
+/**
+ * Highlighting trait.
+ */
+trait HighlightingTrait
+{
+    /**
+     * Set useFastVectorHighlighter option.
+     *
+     * @param bool $use
+     *
+     * @return self Provides fluent interface
+     *
+     * @deprecated Use {@link setMethod()} for Solr 6.4 and higher
+     */
+    public function setUseFastVectorHighlighter(bool $use): HighlightingInterface
+    {
+        $this->setOption('usefastvectorhighlighter', $use);
+
+        return $this;
+    }
+
+    /**
+     * Get useFastVectorHighlighter option.
+     *
+     * @return bool|null
+     */
+    public function getUseFastVectorHighlighter(): ?bool
+    {
+        return $this->getOption('usefastvectorhighlighter');
+    }
+
+    /**
+     * Set highlighter method.
+     *
+     * Use one of the METHOD_* constants as value.
+     *
+     * @param string $method
+     *
+     * @return self Provides fluent interface
+     */
+    public function setMethod(string $method): HighlightingInterface
+    {
+        $this->setOption('method', $method);
+
+        return $this;
+    }
+
+    /**
+     * Get highlighter method.
+     *
+     * @return string|null
+     */
+    public function getMethod(): ?string
+    {
+        return $this->getOption('method');
+    }
+
+    /**
+     * Set usePhraseHighlighter option.
+     *
+     * @param bool $use
+     *
+     * @return self Provides fluent interface
+     */
+    public function setUsePhraseHighlighter(bool $use): HighlightingInterface
+    {
+        $this->setOption('usephrasehighlighter', $use);
+
+        return $this;
+    }
+
+    /**
+     * Get usePhraseHighlighter option.
+     *
+     * @return bool|null
+     */
+    public function getUsePhraseHighlighter(): ?bool
+    {
+        return $this->getOption('usephrasehighlighter');
+    }
+
+    /**
+     * Set highlightMultiTerm option.
+     *
+     * @param bool $highlight
+     *
+     * @return self Provides fluent interface
+     */
+    public function setHighlightMultiTerm(bool $highlight): HighlightingInterface
+    {
+        $this->setOption('highlightmultiterm', $highlight);
+
+        return $this;
+    }
+
+    /**
+     * Get highlightMultiTerm option.
+     *
+     * @return bool|null
+     */
+    public function getHighlightMultiTerm(): ?bool
+    {
+        return $this->getOption('highlightmultiterm');
+    }
+
+    /**
+     * Set snippets option.
+     *
+     * Maximum number of snippets per field
+     *
+     * @param int $maximum
+     *
+     * @return self Provides fluent interface
+     */
+    public function setSnippets(int $maximum): HighlightingInterface
+    {
+        $this->setOption('snippets', $maximum);
+
+        return $this;
+    }
+
+    /**
+     * Get snippets option.
+     *
+     * @return int|null
+     */
+    public function getSnippets(): ?int
+    {
+        return $this->getOption('snippets');
+    }
+
+    /**
+     * Set fragsize option.
+     *
+     * The size, in characters, of fragments to consider for highlighting
+     *
+     * @param int $size
+     *
+     * @return self Provides fluent interface
+     */
+    public function setFragSize(int $size): HighlightingInterface
+    {
+        $this->setOption('fragsize', $size);
+
+        return $this;
+    }
+
+    /**
+     * Get fragsize option.
+     *
+     * @return int|null
+     */
+    public function getFragSize(): ?int
+    {
+        return $this->getOption('fragsize');
+    }
+
+    /**
+     * Set tag prefix option.
+     *
+     * Solr option hl.tag.post
+     *
+     * @param string $prefix
+     *
+     * @return self Provides fluent interface
+     */
+    public function setTagPrefix(string $prefix): HighlightingInterface
+    {
+        $this->setOption('tagprefix', $prefix);
+
+        return $this;
+    }
+
+    /**
+     * Get tag prefix option.
+     *
+     * Solr option hl.tag.pre
+     *
+     * @return string|null
+     */
+    public function getTagPrefix(): ?string
+    {
+        return $this->getOption('tagprefix');
+    }
+
+    /**
+     * Set tag postfix option.
+     *
+     * Solr option hl.tag.post
+     *
+     * @param string $postfix
+     *
+     * @return self Provides fluent interface
+     */
+    public function setTagPostfix(string $postfix): HighlightingInterface
+    {
+        $this->setOption('tagpostfix', $postfix);
+
+        return $this;
+    }
+
+    /**
+     * Get tag postfix option.
+     *
+     * Solr option hl.tag.post
+     *
+     * @return string|null
+     */
+    public function getTagPostfix(): ?string
+    {
+        return $this->getOption('tagpostfix');
+    }
+
+    /**
+     * Set encoder option.
+     *
+     * Use one of the ENCODER_* constants as value.
+     *
+     * @param string $encoder
+     *
+     * @return self Provides fluent interface
+     */
+    public function setEncoder(string $encoder): HighlightingInterface
+    {
+        $this->setOption('encoder', $encoder);
+
+        return $this;
+    }
+
+    /**
+     * Get encoder option.
+     *
+     * @return string|null
+     */
+    public function getEncoder(): ?string
+    {
+        return $this->getOption('encoder');
+    }
+
+    /**
+     * Set maxAnalyzedChars option.
+     *
+     * How many characters into a document to look for suitable snippets
+     *
+     * @param int $chars
+     *
+     * @return self Provides fluent interface
+     */
+    public function setMaxAnalyzedChars(int $chars): HighlightingInterface
+    {
+        $this->setOption('maxanalyzedchars', $chars);
+
+        return $this;
+    }
+
+    /**
+     * Get maxAnalyzedChars option.
+     *
+     * @return int|null
+     */
+    public function getMaxAnalyzedChars(): ?int
+    {
+        return $this->getOption('maxanalyzedchars');
+    }
+
+    /**
+     * Set offsetSource option.
+     *
+     * Use one of the OFFSETSOURCE_* constants as value.
+     *
+     * @param string $source
+     *
+     * @return self Provides fluent interface
+     */
+    public function setOffsetSource(string $source): HighlightingInterface
+    {
+        $this->setOption('offsetsource', $source);
+
+        return $this;
+    }
+
+    /**
+     * Get offsetSource option.
+     *
+     * @return string|null
+     */
+    public function getOffsetSource(): ?string
+    {
+        return $this->getOption('offsetsource');
+    }
+
+    /**
+     * Set fragAlignRatio option.
+     *
+     * Influences where the first highlighted text in a passage is positioned.
+     *
+     * @param float $ratio
+     *
+     * @return self Provides fluent interface
+     */
+    public function setFragAlignRatio(float $ratio): HighlightingInterface
+    {
+        $this->setOption('fragalignratio', $ratio);
+
+        return $this;
+    }
+
+    /**
+     * Get fragAlignRatio option.
+     *
+     * @return float|null
+     */
+    public function getFragAlignRatio(): ?float
+    {
+        return $this->getOption('fragalignratio');
+    }
+
+    /**
+     * Set fragsizeIsMinimum option.
+     *
+     * @param bool $isMinimum
+     *
+     * @return self Provides fluent interface
+     */
+    public function setFragsizeIsMinimum(bool $isMinimum): HighlightingInterface
+    {
+        $this->setOption('fragsizeisminimum', $isMinimum);
+
+        return $this;
+    }
+
+    /**
+     * Get fragsizeIsMinimum option.
+     *
+     * @return bool|null
+     */
+    public function getFragsizeIsMinimum(): ?bool
+    {
+        return $this->getOption('fragsizeisminimum');
+    }
+
+    /**
+     * Set tag.ellipsis option.
+     *
+     * @param string $ellipsis
+     *
+     * @return self Provides fluent interface
+     */
+    public function setTagEllipsis(string $ellipsis): HighlightingInterface
+    {
+        $this->setOption('tagellipsis', $ellipsis);
+
+        return $this;
+    }
+
+    /**
+     * Get tag.ellipsis option.
+     *
+     * @return string|null
+     */
+    public function getTagEllipsis(): ?string
+    {
+        return $this->getOption('tagellipsis');
+    }
+
+    /**
+     * Set defaultSummary option.
+     *
+     * @param bool $defaultSummary
+     *
+     * @return self Provides fluent interface
+     */
+    public function setDefaultSummary(bool $defaultSummary): HighlightingInterface
+    {
+        $this->setOption('defaultsummary', $defaultSummary);
+
+        return $this;
+    }
+
+    /**
+     * Get defaultSummary option.
+     *
+     * @return bool|null
+     */
+    public function getDefaultSummary(): ?bool
+    {
+        return $this->getOption('defaultsummary');
+    }
+
+    /**
+     * Set score.k1 option.
+     *
+     * BM25 term frequency normalization parameter 'k1'.
+     *
+     * @param float $k1
+     *
+     * @return self Provides fluent interface
+     */
+    public function setScoreK1(float $k1): HighlightingInterface
+    {
+        $this->setOption('scorek1', $k1);
+
+        return $this;
+    }
+
+    /**
+     * Get score.k1 option.
+     *
+     * @return float|null
+     */
+    public function getScoreK1(): ?float
+    {
+        return $this->getOption('scorek1');
+    }
+
+    /**
+     * Set score.b option.
+     *
+     * BM25 length normalization parameter 'b'.
+     *
+     * @param float $b
+     *
+     * @return self Provides fluent interface
+     */
+    public function setScoreB(float $b): HighlightingInterface
+    {
+        $this->setOption('scoreb', $b);
+
+        return $this;
+    }
+
+    /**
+     * Get score.b option.
+     *
+     * @return float|null
+     */
+    public function getScoreB(): ?float
+    {
+        return $this->getOption('scoreb');
+    }
+
+    /**
+     * Set score.pivot option.
+     *
+     * BM25 average passage length in characters.
+     *
+     * @param int $pivot
+     *
+     * @return self Provides fluent interface
+     */
+    public function setScorePivot(int $pivot): HighlightingInterface
+    {
+        $this->setOption('scorepivot', $pivot);
+
+        return $this;
+    }
+
+    /**
+     * Get score.pivot option.
+     *
+     * @return int|null
+     */
+    public function getScorePivot(): ?int
+    {
+        return $this->getOption('scorepivot');
+    }
+
+    /**
+     * Set breakIterator boundary scanner language option.
+     *
+     * @param string $language
+     *
+     * @return self Provides fluent interface
+     */
+    public function setBoundaryScannerLanguage(string $language): HighlightingInterface
+    {
+        $this->setOption('boundaryscannerlanguage', $language);
+
+        return $this;
+    }
+
+    /**
+     * Get breakIterator boundary scanner language option.
+     *
+     * @return string|null
+     */
+    public function getBoundaryScannerLanguage(): ?string
+    {
+        return $this->getOption('boundaryscannerlanguage');
+    }
+
+    /**
+     * Set breakIterator boundary scanner country option.
+     *
+     * @param string $country
+     *
+     * @return self Provides fluent interface
+     */
+    public function setBoundaryScannerCountry(string $country): HighlightingInterface
+    {
+        $this->setOption('boundaryscannercountry', $country);
+
+        return $this;
+    }
+
+    /**
+     * Get breakIterator boundary scanner country option.
+     *
+     * @return string|null
+     */
+    public function getBoundaryScannerCountry(): ?string
+    {
+        return $this->getOption('boundaryscannercountry');
+    }
+
+    /**
+     * Set breakIterator boundary scanner variant option.
+     *
+     * @param string $variant
+     *
+     * @return self Provides fluent interface
+     */
+    public function setBoundaryScannerVariant(string $variant): HighlightingInterface
+    {
+        $this->setOption('boundaryscannervariant', $variant);
+
+        return $this;
+    }
+
+    /**
+     * Get breakIterator boundary scanner variant option.
+     *
+     * @return string|null
+     */
+    public function getBoundaryScannerVariant(): ?string
+    {
+        return $this->getOption('boundaryscannervariant');
+    }
+
+    /**
+     * Set breakIterator boundary scanner type option.
+     *
+     * Use one of the BOUNDARYSCANNER_TYPE_* constants as value.
+     *
+     * @param string $type
+     *
+     * @return self Provides fluent interface
+     */
+    public function setBoundaryScannerType(string $type): HighlightingInterface
+    {
+        $this->setOption('boundaryscannertype', $type);
+
+        return $this;
+    }
+
+    /**
+     * Get breakIterator boundary scanner type option.
+     *
+     * @return string|null
+     */
+    public function getBoundaryScannerType(): ?string
+    {
+        return $this->getOption('boundaryscannertype');
+    }
+
+    /**
+     * Set breakIterator boundary scanner separator option.
+     *
+     * Indicates which character to break the text on with BOUNDARYSCANNER_TYPE_SEPARATOR.
+     *
+     * @param string $separator
+     *
+     * @return self Provides fluent interface
+     */
+    public function setBoundaryScannerSeparator(string $separator): HighlightingInterface
+    {
+        $this->setOption('boundaryscannerseparator', $separator);
+
+        return $this;
+    }
+
+    /**
+     * Get breakIterator boundary scanner separator option.
+     *
+     * @return string|null
+     */
+    public function getBoundaryScannerSeparator(): ?string
+    {
+        return $this->getOption('boundaryscannerseparator');
+    }
+
+    /**
+     * Set weightMatches option.
+     *
+     * Use Lucene's "Weight Matches" API instead of doing SpanQuery conversion.
+     *
+     * @param bool $weightMatches
+     *
+     * @return self Provides fluent interface
+     */
+    public function setWeightMatches(bool $weightMatches): HighlightingInterface
+    {
+        $this->setOption('weightmatches', $weightMatches);
+
+        return $this;
+    }
+
+    /**
+     * Get weightMatches option.
+     *
+     * @return bool|null
+     */
+    public function getWeightMatches(): ?bool
+    {
+        return $this->getOption('weightmatches');
+    }
+
+    /**
+     * Set mergeContiguous option.
+     *
+     * Collapse contiguous fragments into a single fragment.
+     *
+     * @param bool $merge
+     *
+     * @return self Provides fluent interface
+     */
+    public function setMergeContiguous(bool $merge): HighlightingInterface
+    {
+        $this->setOption('mergecontiguous', $merge);
+
+        return $this;
+    }
+
+    /**
+     * Get mergeContiguous option.
+     *
+     * @return bool|null
+     */
+    public function getMergeContiguous(): ?bool
+    {
+        return $this->getOption('mergecontiguous');
+    }
+
+    /**
+     * Set maxMultiValuedToExamine option.
+     *
+     * Maximum number of entries in a multi-valued field to examine before stopping.
+     *
+     * @param int $maximum
+     *
+     * @return self Provides fluent interface
+     */
+    public function setMaxMultiValuedToExamine(int $maximum): HighlightingInterface
+    {
+        $this->setOption('maxmultivaluedtoexamine', $maximum);
+
+        return $this;
+    }
+
+    /**
+     * Get maxMultiValuedToExamine option.
+     *
+     * @return int|null
+     */
+    public function getMaxMultiValuedToExamine(): ?int
+    {
+        return $this->getOption('maxmultivaluedtoexamine');
+    }
+
+    /**
+     * Set maxMultiValuedToMatch option.
+     *
+     * Maximum number of matches in a multi-valued field that are found before stopping.
+     *
+     * @param int $maximum
+     *
+     * @return self Provides fluent interface
+     */
+    public function setMaxMultiValuedToMatch(int $maximum): HighlightingInterface
+    {
+        $this->setOption('maxmultivaluedtomatch', $maximum);
+
+        return $this;
+    }
+
+    /**
+     * Get maxMultiValuedToMatch option.
+     *
+     * @return int|null
+     */
+    public function getMaxMultiValuedToMatch(): ?int
+    {
+        return $this->getOption('maxmultivaluedtomatch');
+    }
+
+    /**
+     * Set alternateField option.
+     *
+     * @param string $field
+     *
+     * @return self Provides fluent interface
+     */
+    public function setAlternateField(string $field): HighlightingInterface
+    {
+        $this->setOption('alternatefield', $field);
+
+        return $this;
+    }
+
+    /**
+     * Get alternateField option.
+     *
+     * @return string|null
+     */
+    public function getAlternateField(): ?string
+    {
+        return $this->getOption('alternatefield');
+    }
+
+    /**
+     * Set maxAlternateFieldLength option.
+     *
+     * @param int $length
+     *
+     * @return self Provides fluent interface
+     */
+    public function setMaxAlternateFieldLength(int $length): HighlightingInterface
+    {
+        $this->setOption('maxalternatefieldlength', $length);
+
+        return $this;
+    }
+
+    /**
+     * Get maxAlternateFieldLength option.
+     *
+     * @return int|null
+     */
+    public function getMaxAlternateFieldLength(): ?int
+    {
+        return $this->getOption('maxalternatefieldlength');
+    }
+
+    /**
+     * Set highlightAlternate option.
+     *
+     * @param bool $highlight
+     *
+     * @return self Provides fluent interface
+     */
+    public function setHighlightAlternate(bool $highlight): HighlightingInterface
+    {
+        $this->setOption('highlightalternate', $highlight);
+
+        return $this;
+    }
+
+    /**
+     * Get highlightAlternate option.
+     *
+     * @return bool|null
+     */
+    public function getHighlightAlternate(): ?bool
+    {
+        return $this->getOption('highlightalternate');
+    }
+
+    /**
+     * Set formatter option.
+     *
+     * Use one of the FORMATTER_* constants as value.
+     *
+     * @param string $formatter
+     *
+     * @return self Provides fluent interface
+     */
+    public function setFormatter(string $formatter = HighlightingInterface::FORMATTER_SIMPLE): HighlightingInterface
+    {
+        $this->setOption('formatter', $formatter);
+
+        return $this;
+    }
+
+    /**
+     * Get formatter option.
+     *
+     * @return string|null
+     */
+    public function getFormatter(): ?string
+    {
+        return $this->getOption('formatter');
+    }
+
+    /**
+     * Set simple prefix option.
+     *
+     * Solr option hl.simple.pre
+     *
+     * @param string $prefix
+     *
+     * @return self Provides fluent interface
+     */
+    public function setSimplePrefix(string $prefix): HighlightingInterface
+    {
+        $this->setOption('simpleprefix', $prefix);
+
+        return $this;
+    }
+
+    /**
+     * Get simple prefix option.
+     *
+     * Solr option hl.simple.pre
+     *
+     * @return string|null
+     */
+    public function getSimplePrefix(): ?string
+    {
+        return $this->getOption('simpleprefix');
+    }
+
+    /**
+     * Set simple postfix option.
+     *
+     * Solr option hl.simple.post
+     *
+     * @param string $postfix
+     *
+     * @return self Provides fluent interface
+     */
+    public function setSimplePostfix(string $postfix): HighlightingInterface
+    {
+        $this->setOption('simplepostfix', $postfix);
+
+        return $this;
+    }
+
+    /**
+     * Get simple postfix option.
+     *
+     * Solr option hl.simple.post
+     *
+     * @return string|null
+     */
+    public function getSimplePostfix(): ?string
+    {
+        return $this->getOption('simplepostfix');
+    }
+
+    /**
+     * Set fragmenter option.
+     *
+     * Use one of the FRAGMENTER_* constants as value.
+     *
+     * @param string $fragmenter
+     *
+     * @return self Provides fluent interface
+     */
+    public function setFragmenter(string $fragmenter): HighlightingInterface
+    {
+        $this->setOption('fragmenter', $fragmenter);
+
+        return $this;
+    }
+
+    /**
+     * Get fragmenter option.
+     *
+     * @return string|null
+     */
+    public function getFragmenter(): ?string
+    {
+        return $this->getOption('fragmenter');
+    }
+
+    /**
+     * Set regex.slop option.
+     *
+     * @param float $slop
+     *
+     * @return self Provides fluent interface
+     */
+    public function setRegexSlop(float $slop): HighlightingInterface
+    {
+        $this->setOption('regexslop', $slop);
+
+        return $this;
+    }
+
+    /**
+     * Get regex.slop option.
+     *
+     * @return float|null
+     */
+    public function getRegexSlop(): ?float
+    {
+        return $this->getOption('regexslop');
+    }
+
+    /**
+     * Set regex.pattern option.
+     *
+     * @param string $pattern
+     *
+     * @return self Provides fluent interface
+     */
+    public function setRegexPattern(string $pattern): HighlightingInterface
+    {
+        $this->setOption('regexpattern', $pattern);
+
+        return $this;
+    }
+
+    /**
+     * Get regex.pattern option.
+     *
+     * @return string|null
+     */
+    public function getRegexPattern(): ?string
+    {
+        return $this->getOption('regexpattern');
+    }
+
+    /**
+     * Set regex.maxAnalyzedChars option.
+     *
+     * @param int $chars
+     *
+     * @return self Provides fluent interface
+     */
+    public function setRegexMaxAnalyzedChars(int $chars): HighlightingInterface
+    {
+        $this->setOption('regexmaxanalyzedchars', $chars);
+
+        return $this;
+    }
+
+    /**
+     * Get regex.maxAnalyzedChars option.
+     *
+     * @return int|null
+     */
+    public function getRegexMaxAnalyzedChars(): ?int
+    {
+        return $this->getOption('regexmaxanalyzedchars');
+    }
+
+    /**
+     * Set preserveMulti option.
+     *
+     * @param bool $preservemulti
+     *
+     * @return self Provides fluent interface
+     */
+    public function setPreserveMulti(bool $preservemulti): HighlightingInterface
+    {
+        $this->setOption('preservemulti', $preservemulti);
+
+        return $this;
+    }
+
+    /**
+     * Get preserveMulti option.
+     *
+     * @return bool|null
+     */
+    public function getPreserveMulti(): ?bool
+    {
+        return $this->getOption('preservemulti');
+    }
+
+    /**
+     * Set payloads option.
+     *
+     * @param bool $payloads
+     *
+     * @return self Provides fluent interface
+     */
+    public function setPayloads(bool $payloads): HighlightingInterface
+    {
+        $this->setOption('payloads', $payloads);
+
+        return $this;
+    }
+
+    /**
+     * Get payloads option.
+     *
+     * @return bool|null
+     */
+    public function getPayloads(): ?bool
+    {
+        return $this->getOption('payloads');
+    }
+
+    /**
+     * Set fragListBuilder option.
+     *
+     * Use one of the FRAGLISTBUILDER_* constants as value.
+     *
+     * @param string $builder
+     *
+     * @return self Provides fluent interface
+     */
+    public function setFragListBuilder(string $builder): HighlightingInterface
+    {
+        $this->setOption('fraglistbuilder', $builder);
+
+        return $this;
+    }
+
+    /**
+     * Get fragListBuilder option.
+     *
+     * @return string|null
+     */
+    public function getFragListBuilder(): ?string
+    {
+        return $this->getOption('fraglistbuilder');
+    }
+
+    /**
+     * Set fragmentsBuilder option.
+     *
+     * Use one of the FRAGMENTSBUILDER_* constants or the name of your own fragments builder as value.
+     *
+     * @param string $builder
+     *
+     * @return self Provides fluent interface
+     */
+    public function setFragmentsBuilder(string $builder): HighlightingInterface
+    {
+        $this->setOption('fragmentsbuilder', $builder);
+
+        return $this;
+    }
+
+    /**
+     * Get fragmentsBuilder option.
+     *
+     * @return string|null
+     */
+    public function getFragmentsBuilder(): ?string
+    {
+        return $this->getOption('fragmentsbuilder');
+    }
+
+    /**
+     * Set boundaryScanner option.
+     *
+     * Use one of the BOUNDARYSCANNER_* constants as value.
+     *
+     * @param string $scanner
+     *
+     * @return self Provides fluent interface
+     */
+    public function setBoundaryScanner(string $scanner): HighlightingInterface
+    {
+        $this->setOption('boundaryscanner', $scanner);
+
+        return $this;
+    }
+
+    /**
+     * Get boundaryScanner option.
+     *
+     * @return string|null
+     */
+    public function getBoundaryScanner(): ?string
+    {
+        return $this->getOption('boundaryscanner');
+    }
+
+    /**
+     * Set simple boundary scanner maxScan option.
+     *
+     * @param int $maximum
+     *
+     * @return self Provides fluent interface
+     */
+    public function setBoundaryScannerMaxScan(int $maximum): HighlightingInterface
+    {
+        $this->setOption('boundaryscannermaxscan', $maximum);
+
+        return $this;
+    }
+
+    /**
+     * Get simple boundary scanner maxScan option.
+     *
+     * @return int|null
+     */
+    public function getBoundaryScannerMaxScan(): ?int
+    {
+        return $this->getOption('boundaryscannermaxscan');
+    }
+
+    /**
+     * Set simple boundary scanner cgars option.
+     *
+     * @param string $chars
+     *
+     * @return self Provides fluent interface
+     */
+    public function setBoundaryScannerChars(string $chars): HighlightingInterface
+    {
+        $this->setOption('boundaryscannerchars', $chars);
+
+        return $this;
+    }
+
+    /**
+     * Get simple boundary scanner cgars option.
+     *
+     * @return string|null
+     */
+    public function getBoundaryScannerChars(): ?string
+    {
+        return $this->getOption('boundaryscannerchars');
+    }
+
+    /**
+     * Set phraseLimit option.
+     *
+     * Maximum number of phrases to analyze when searching for the highest-scoring phrase.
+     *
+     * @param int $maximum
+     *
+     * @return self Provides fluent interface
+     */
+    public function setPhraseLimit(int $maximum): HighlightingInterface
+    {
+        $this->setOption('phraselimit', $maximum);
+
+        return $this;
+    }
+
+    /**
+     * Get phraseLimit option.
+     *
+     * @return int|null
+     */
+    public function getPhraseLimit(): ?int
+    {
+        return $this->getOption('phraselimit');
+    }
+
+    /**
+     * Set multiValuedSeparatorChar option.
+     *
+     * Text to use to separate one value from the next for a multi-valued field.
+     *
+     * @param string $separator
+     *
+     * @return self Provides fluent interface
+     */
+    public function setMultiValuedSeparatorChar(string $separator): HighlightingInterface
+    {
+        $this->setOption('multivaluedseparatorchar', $separator);
+
+        return $this;
+    }
+
+    /**
+     * Get multiValuedSeparatorChar option.
+     *
+     * @return string|null
+     */
+    public function getMultiValuedSeparatorChar(): ?string
+    {
+        return $this->getOption('multivaluedseparatorchar');
+    }
+}
diff --git a/vendor/solarium/solarium/src/Component/QueryInterface.php b/vendor/solarium/solarium/src/Component/QueryInterface.php
index ced961b99..fe73cbc2b 100644
--- a/vendor/solarium/solarium/src/Component/QueryInterface.php
+++ b/vendor/solarium/solarium/src/Component/QueryInterface.php
@@ -10,7 +10,7 @@
 namespace Solarium\Component;
 
 /**
- * Query Trait.
+ * Query Interface.
  */
 interface QueryInterface
 {
diff --git a/vendor/solarium/solarium/src/Component/RequestBuilder/Analytics.php b/vendor/solarium/solarium/src/Component/RequestBuilder/Analytics.php
index 1bbb5b037..3ee6caef1 100644
--- a/vendor/solarium/solarium/src/Component/RequestBuilder/Analytics.php
+++ b/vendor/solarium/solarium/src/Component/RequestBuilder/Analytics.php
@@ -21,16 +21,6 @@
  */
 class Analytics implements ComponentRequestBuilderInterface
 {
-    /**
-     * Header name.
-     */
-    private const HEADER_NAME = 'Content-Type';
-
-    /**
-     * Content type.
-     */
-    private const HEADER_CONTENT = 'application/x-www-form-urlencoded';
-
     /**
      * {@inheritdoc}
      *
@@ -39,9 +29,10 @@ class Analytics implements ComponentRequestBuilderInterface
     public function buildComponent(ConfigurableInterface $component, Request $request): Request
     {
         $raw = sprintf('analytics=%s', json_encode($component));
-        $header = sprintf('%s: %s', self::HEADER_NAME, self::HEADER_CONTENT);
+        $header = sprintf('Content-Type: %s', Request::CONTENT_TYPE_APPLICATION_X_WWW_FORM_URLENCODED);
 
-        if (Request::METHOD_POST !== $request->getMethod()
+        if (
+            Request::METHOD_POST !== $request->getMethod()
             || (null === $data = $request->getRawData())
         ) {
             return $request
@@ -51,10 +42,11 @@ public function buildComponent(ConfigurableInterface $component, Request $reques
             ;
         }
 
-        if ((null !== $currentHeader = $request->getHeader(self::HEADER_NAME))
-            && false === strpos($currentHeader, self::HEADER_CONTENT)
+        if (
+            (null !== $currentHeader = $request->getHeader('Content-Type'))
+            && false === strpos($currentHeader, Request::CONTENT_TYPE_APPLICATION_X_WWW_FORM_URLENCODED)
         ) {
-            throw new \RuntimeException(sprintf('Unable to build analytics request. required content type is %s while current header is %s', self::HEADER_CONTENT, $header));
+            throw new \RuntimeException(sprintf('Unable to build analytics request. required content type is %s while current header is %s', Request::CONTENT_TYPE_APPLICATION_X_WWW_FORM_URLENCODED, $currentHeader));
         }
 
         // merge raw data currently present in the request
diff --git a/vendor/solarium/solarium/src/Component/RequestBuilder/FacetSet.php b/vendor/solarium/solarium/src/Component/RequestBuilder/FacetSet.php
index 2d176df15..db797d41b 100644
--- a/vendor/solarium/solarium/src/Component/RequestBuilder/FacetSet.php
+++ b/vendor/solarium/solarium/src/Component/RequestBuilder/FacetSet.php
@@ -332,7 +332,7 @@ public function addFacetInterval($request, $facet): void
 
         foreach ($facet->getSet() as $key => $setValue) {
             if (\is_string($key)) {
-                $setValue = $this->renderLocalParams($setValue, ['key' => '"'.$key.'"']);
+                $setValue = $this->renderLocalParams($setValue, ['key' => $key]);
             }
             $request->addParam("f.$field.facet.interval.set", $setValue);
         }
diff --git a/vendor/solarium/solarium/src/Component/RequestBuilder/Highlighting.php b/vendor/solarium/solarium/src/Component/RequestBuilder/Highlighting.php
index 4e39c3bdb..5ab2dad02 100644
--- a/vendor/solarium/solarium/src/Component/RequestBuilder/Highlighting.php
+++ b/vendor/solarium/solarium/src/Component/RequestBuilder/Highlighting.php
@@ -11,6 +11,7 @@
 
 use Solarium\Component\Highlighting\Field as HighlightingField;
 use Solarium\Component\Highlighting\Highlighting as HighlightingComponent;
+use Solarium\Component\Highlighting\HighlightingInterface;
 use Solarium\Core\Client\Request;
 use Solarium\Core\ConfigurableInterface;
 
@@ -31,42 +32,17 @@ public function buildComponent(ConfigurableInterface $component, Request $reques
     {
         // enable highlighting
         $request->addParam('hl', 'true');
+        $request->addParam('hl.useFastVectorHighlighter', $component->getUseFastVectorHighlighter());
+        $request->addParam('hl.method', $component->getMethod());
 
         // set global highlighting params
-        if (\count($component->getFields()) > 0) {
+        if (0 !== \count($component->getFields())) {
             $request->addParam('hl.fl', implode(',', array_keys($component->getFields())));
         }
-        $request->addParam('hl.snippets', $component->getSnippets());
-        $request->addParam('hl.fragsize', $component->getFragSize());
-        $request->addParam('hl.mergeContiguous', $component->getMergeContiguous());
-        $request->addParam('hl.requireFieldMatch', $component->getRequireFieldMatch());
-        $request->addParam('hl.maxAnalyzedChars', $component->getMaxAnalyzedChars());
-        $request->addParam('hl.alternateField', $component->getAlternateField());
-        $request->addParam('hl.maxAlternateFieldLength', $component->getMaxAlternateFieldLength());
-        $request->addParam('hl.preserveMulti', $component->getPreserveMulti());
-        $request->addParam('hl.formatter', $component->getFormatter());
-        $request->addParam('hl.simple.pre', $component->getSimplePrefix());
-        $request->addParam('hl.simple.post', $component->getSimplePostfix());
-        $request->addParam('hl.tag.pre', $component->getTagPrefix());
-        $request->addParam('hl.tag.post', $component->getTagPostfix());
-        $request->addParam('hl.fragmenter', $component->getFragmenter());
-        $request->addParam('hl.fragListBuilder', $component->getFragListBuilder());
-        $request->addParam('hl.fragmentsBuilder', $component->getFragmentsBuilder());
-        $request->addParam('hl.useFastVectorHighlighter', $component->getUseFastVectorHighlighter());
-        $request->addParam('hl.usePhraseHighlighter', $component->getUsePhraseHighlighter());
-        $request->addParam('hl.highlightMultiTerm', $component->getHighlightMultiTerm());
-        $request->addParam('hl.regex.slop', $component->getRegexSlop());
-        $request->addParam('hl.regex.pattern', $component->getRegexPattern());
-        $request->addParam('hl.regex.maxAnalyzedChars', $component->getRegexMaxAnalyzedChars());
         $request->addParam('hl.q', $component->getQuery());
-        $request->addParam('hl.phraseLimit', $component->getPhraseLimit());
-        $request->addParam('hl.multiValuedSeparatorChar', $component->getMultiValuedSeparatorChar());
-        $request->addParam('hl.bs.maxScan', $component->getBoundaryScannerMaxScan());
-        $request->addParam('hl.bs.chars', $component->getBoundaryScannerChars());
-        $request->addParam('hl.bs.type', $component->getBoundaryScannerType());
-        $request->addParam('hl.bs.language', $component->getBoundaryScannerLanguage());
-        $request->addParam('hl.bs.country', $component->getBoundaryScannerCountry());
-        $request->addParam('h1.method', $component->getMethod());
+        $request->addParam('hl.qparser', $component->getQueryParser());
+        $request->addParam('hl.requireFieldMatch', $component->getRequireFieldMatch());
+        $this->addHighlighterParams($component, $request);
 
         // set per-field highlighting params
         foreach ($component->getFields() as $field) {
@@ -82,18 +58,73 @@ public function buildComponent(ConfigurableInterface $component, Request $reques
      * @param HighlightingField $field
      * @param Request           $request
      */
-    protected function addFieldParams($field, $request)
+    protected function addFieldParams(HighlightingField $field, Request $request): void
+    {
+        $prefix = 'f.'.$field->getName().'.';
+        $request->addParam($prefix.'hl.useFastVectorHighlighter', $field->getUseFastVectorHighlighter());
+        $request->addParam($prefix.'hl.method', $field->getMethod());
+        $this->addHighlighterParams($field, $request, $prefix);
+    }
+
+    /**
+     * Add common and specific highlighter options to the request.
+     *
+     * @param HighlightingInterface $hlt
+     * @param Request               $request
+     * @param string                $prefix  Prefix to use for parameter names
+     */
+    protected function addHighlighterParams(HighlightingInterface $hlt, Request $request, string $prefix = ''): void
     {
-        $prefix = 'f.'.$field->getName().'.hl.';
-        $request->addParam($prefix.'snippets', $field->getSnippets());
-        $request->addParam($prefix.'fragsize', $field->getFragSize());
-        $request->addParam($prefix.'mergeContiguous', $field->getMergeContiguous());
-        $request->addParam($prefix.'alternateField', $field->getAlternateField());
-        $request->addParam($prefix.'preserveMulti', $field->getPreserveMulti());
-        $request->addParam($prefix.'formatter', $field->getFormatter());
-        $request->addParam($prefix.'simple.pre', $field->getSimplePrefix());
-        $request->addParam($prefix.'simple.post', $field->getSimplePostfix());
-        $request->addParam($prefix.'fragmenter', $field->getFragmenter());
-        $request->addParam($prefix.'useFastVectorHighlighter', $field->getUseFastVectorHighlighter());
+        // common highlighter params
+        $request->addParam($prefix.'hl.usePhraseHighlighter', $hlt->getUsePhraseHighlighter());
+        $request->addParam($prefix.'hl.highlightMultiTerm', $hlt->getHighlightMultiTerm());
+        $request->addParam($prefix.'hl.snippets', $hlt->getSnippets());
+        $request->addParam($prefix.'hl.fragsize', $hlt->getFragSize());
+        $request->addParam($prefix.'hl.tag.pre', $hlt->getTagPrefix());
+        $request->addParam($prefix.'hl.tag.post', $hlt->getTagPostfix());
+        $request->addParam($prefix.'hl.encoder', $hlt->getEncoder());
+        $request->addParam($prefix.'hl.maxAnalyzedChars', $hlt->getMaxAnalyzedChars());
+
+        // unified highlighter params
+        $request->addParam($prefix.'hl.offsetSource', $hlt->getOffsetSource());
+        $request->addParam($prefix.'hl.fragAlignRatio', $hlt->getFragAlignRatio());
+        $request->addParam($prefix.'hl.fragsizeIsMinimum', $hlt->getFragsizeIsMinimum());
+        $request->addParam($prefix.'hl.tag.ellipsis', $hlt->getTagEllipsis());
+        $request->addParam($prefix.'hl.defaultSummary', $hlt->getDefaultSummary());
+        $request->addParam($prefix.'hl.score.k1', $hlt->getScoreK1());
+        $request->addParam($prefix.'hl.score.b', $hlt->getScoreB());
+        $request->addParam($prefix.'hl.score.pivot', $hlt->getScorePivot());
+        $request->addParam($prefix.'hl.bs.language', $hlt->getBoundaryScannerLanguage());
+        $request->addParam($prefix.'hl.bs.country', $hlt->getBoundaryScannerCountry());
+        $request->addParam($prefix.'hl.bs.variant', $hlt->getBoundaryScannerVariant());
+        $request->addParam($prefix.'hl.bs.type', $hlt->getBoundaryScannerType());
+        $request->addParam($prefix.'hl.bs.separator', $hlt->getBoundaryScannerSeparator());
+        $request->addParam($prefix.'hl.weightMatches', $hlt->getWeightMatches());
+
+        // original highlighter params
+        $request->addParam($prefix.'hl.mergeContiguous', $hlt->getMergeContiguous());
+        $request->addParam($prefix.'hl.maxMultiValuedToExamine', $hlt->getMaxMultiValuedToExamine());
+        $request->addParam($prefix.'hl.maxMultiValuedToMatch', $hlt->getMaxMultiValuedToMatch());
+        $request->addParam($prefix.'hl.alternateField', $hlt->getAlternateField());
+        $request->addParam($prefix.'hl.maxAlternateFieldLength', $hlt->getMaxAlternateFieldLength());
+        $request->addParam($prefix.'hl.highlightAlternate', $hlt->getHighlightAlternate());
+        $request->addParam($prefix.'hl.formatter', $hlt->getFormatter());
+        $request->addParam($prefix.'hl.simple.pre', $hlt->getSimplePrefix());
+        $request->addParam($prefix.'hl.simple.post', $hlt->getSimplePostfix());
+        $request->addParam($prefix.'hl.fragmenter', $hlt->getFragmenter());
+        $request->addParam($prefix.'hl.regex.slop', $hlt->getRegexSlop());
+        $request->addParam($prefix.'hl.regex.pattern', $hlt->getRegexPattern());
+        $request->addParam($prefix.'hl.regex.maxAnalyzedChars', $hlt->getRegexMaxAnalyzedChars());
+        $request->addParam($prefix.'hl.preserveMulti', $hlt->getPreserveMulti());
+        $request->addParam($prefix.'hl.payloads', $hlt->getPayloads());
+
+        // fastvector highlighter params
+        $request->addParam($prefix.'hl.fragListBuilder', $hlt->getFragListBuilder());
+        $request->addParam($prefix.'hl.fragmentsBuilder', $hlt->getFragmentsBuilder());
+        $request->addParam($prefix.'hl.boundaryScanner', $hlt->getBoundaryScanner());
+        $request->addParam($prefix.'hl.bs.maxScan', $hlt->getBoundaryScannerMaxScan());
+        $request->addParam($prefix.'hl.bs.chars', $hlt->getBoundaryScannerChars());
+        $request->addParam($prefix.'hl.phraseLimit', $hlt->getPhraseLimit());
+        $request->addParam($prefix.'hl.multiValuedSeparatorChar', $hlt->getMultiValuedSeparatorChar());
     }
 }
diff --git a/vendor/solarium/solarium/src/Component/RequestBuilder/RequestParamsTrait.php b/vendor/solarium/solarium/src/Component/RequestBuilder/RequestParamsTrait.php
index 2754a88b0..9c75dcec4 100644
--- a/vendor/solarium/solarium/src/Component/RequestBuilder/RequestParamsTrait.php
+++ b/vendor/solarium/solarium/src/Component/RequestBuilder/RequestParamsTrait.php
@@ -157,7 +157,7 @@ public function getQueryString(string $separator = '&'): string
     {
         $queryString = '';
         if (\count($this->params) > 0) {
-            $queryString = http_build_query($this->params, null, $separator);
+            $queryString = http_build_query($this->params, '', $separator);
             $queryString = preg_replace(
                 '/%5B(?:\d|[1-9]\d+)%5D=/',
                 '=',
diff --git a/vendor/solarium/solarium/src/Component/RequestBuilder/Spellcheck.php b/vendor/solarium/solarium/src/Component/RequestBuilder/Spellcheck.php
index 6d8a9aac0..ca805a624 100644
--- a/vendor/solarium/solarium/src/Component/RequestBuilder/Spellcheck.php
+++ b/vendor/solarium/solarium/src/Component/RequestBuilder/Spellcheck.php
@@ -37,6 +37,7 @@ public function buildComponent(ConfigurableInterface $component, Request $reques
         $request->addParam('spellcheck.dictionary', $component->getDictionary());
         $request->addParam('spellcheck.count', $component->getCount());
         $request->addParam('spellcheck.onlyMorePopular', $component->getOnlyMorePopular());
+        $request->addParam('spellcheck.alternativeTermCount', $component->getAlternativeTermCount());
         $request->addParam('spellcheck.extendedResults', $component->getExtendedResults());
         $request->addParam('spellcheck.collate', $component->getCollate());
         $request->addParam('spellcheck.maxCollations', $component->getMaxCollations());
diff --git a/vendor/solarium/solarium/src/Component/Result/Analytics/Facet.php b/vendor/solarium/solarium/src/Component/Result/Analytics/Facet.php
index b9e5eef78..edae58708 100644
--- a/vendor/solarium/solarium/src/Component/Result/Analytics/Facet.php
+++ b/vendor/solarium/solarium/src/Component/Result/Analytics/Facet.php
@@ -107,7 +107,7 @@ public function addChild(self $facet): self
     /**
      * {@inheritdoc}
      */
-    public function getIterator()
+    public function getIterator(): \ArrayIterator
     {
         return new \ArrayIterator($this->results);
     }
@@ -115,7 +115,7 @@ public function getIterator()
     /**
      * {@inheritdoc}
      */
-    public function count()
+    public function count(): int
     {
         return \count($this->results);
     }
diff --git a/vendor/solarium/solarium/src/Component/Result/Analytics/Result.php b/vendor/solarium/solarium/src/Component/Result/Analytics/Result.php
index 096837b40..22e36920e 100644
--- a/vendor/solarium/solarium/src/Component/Result/Analytics/Result.php
+++ b/vendor/solarium/solarium/src/Component/Result/Analytics/Result.php
@@ -75,7 +75,7 @@ public function getResult(string $name): ?Expression
     /**
      * {@inheritdoc}
      */
-    public function getIterator()
+    public function getIterator(): \ArrayIterator
     {
         return new \ArrayIterator($this->results);
     }
@@ -83,7 +83,7 @@ public function getIterator()
     /**
      * {@inheritdoc}
      */
-    public function count()
+    public function count(): int
     {
         return \count($this->results);
     }
diff --git a/vendor/solarium/solarium/src/Component/Result/Debug/Detail.php b/vendor/solarium/solarium/src/Component/Result/Debug/Detail.php
index 0fafa74a3..7262fc4c8 100644
--- a/vendor/solarium/solarium/src/Component/Result/Debug/Detail.php
+++ b/vendor/solarium/solarium/src/Component/Result/Debug/Detail.php
@@ -111,27 +111,59 @@ public function getSubDetails(): ?array
         return $this->subDetails;
     }
 
+    /**
+     * ArrayAccess implementation.
+     *
+     * @param mixed $offset
+     *
+     * @return bool
+     */
     public function offsetExists($offset): bool
     {
         return \in_array($offset, ['match', 'value', 'description']);
     }
 
     #[\ReturnTypeWillChange]
+    /**
+     * ArrayAccess implementation.
+     *
+     * @param mixed $offset
+     *
+     * @return mixed
+     */
     public function offsetGet($offset)
     {
         return $this->{$offset};
     }
 
+    /**
+     * ArrayAccess implementation.
+     *
+     * @param mixed $offset
+     * @param mixed $value
+     */
     public function offsetSet($offset, $value): void
     {
         // Details are immutable.
     }
 
+    /**
+     * ArrayAccess implementation.
+     *
+     * @param mixed $offset
+     */
     public function offsetUnset($offset): void
     {
         // Details are immutable.
     }
 
+    /**
+     * Get a recursive dump of the debug details.
+     *
+     * @param int $depth
+     *
+     * @return string
+     */
     public function debugDump(int $depth = 0): string
     {
         $string = '';
@@ -147,6 +179,9 @@ public function debugDump(int $depth = 0): string
         return $string;
     }
 
+    /**
+     * {@inheritdoc}
+     */
     public function __toString()
     {
         return $this->debugDump();
diff --git a/vendor/solarium/solarium/src/Component/Result/Debug/Document.php b/vendor/solarium/solarium/src/Component/Result/Debug/Document.php
index 23e99d6d4..5ba54804b 100644
--- a/vendor/solarium/solarium/src/Component/Result/Debug/Document.php
+++ b/vendor/solarium/solarium/src/Component/Result/Debug/Document.php
@@ -84,6 +84,9 @@ public function count(): int
         return \count($this->details);
     }
 
+    /**
+     * {@inheritdoc}
+     */
     public function __toString()
     {
         $string = '';
diff --git a/vendor/solarium/solarium/src/Component/Result/FacetSet.php b/vendor/solarium/solarium/src/Component/Result/FacetSet.php
index 57530a9ad..04e30b28c 100644
--- a/vendor/solarium/solarium/src/Component/Result/FacetSet.php
+++ b/vendor/solarium/solarium/src/Component/Result/FacetSet.php
@@ -70,7 +70,7 @@ public function getIterator(): \ArrayIterator
      *
      * @return int
      */
-    public function count()
+    public function count(): int
     {
         return \count($this->facets);
     }
diff --git a/vendor/solarium/solarium/src/Component/Result/MoreLikeThis/MoreLikeThis.php b/vendor/solarium/solarium/src/Component/Result/MoreLikeThis/MoreLikeThis.php
index 1b11fd450..5070825af 100644
--- a/vendor/solarium/solarium/src/Component/Result/MoreLikeThis/MoreLikeThis.php
+++ b/vendor/solarium/solarium/src/Component/Result/MoreLikeThis/MoreLikeThis.php
@@ -104,11 +104,9 @@ public function getInterestingTerm($key): ?array
      *
      * @see getInterestingTerm() for a description of how the terms will be returned for each document key
      *
-     * @return array
-     *
      * @throws UnexpectedValueException
      *
-     * @return array[]
+     * @return array
      */
     public function getInterestingTerms(): array
     {
diff --git a/vendor/solarium/solarium/src/Component/SpellcheckInterface.php b/vendor/solarium/solarium/src/Component/SpellcheckInterface.php
index 16c06a769..aa4372b4c 100644
--- a/vendor/solarium/solarium/src/Component/SpellcheckInterface.php
+++ b/vendor/solarium/solarium/src/Component/SpellcheckInterface.php
@@ -113,6 +113,24 @@ public function setOnlyMorePopular(bool $onlyMorePopular): self;
      */
     public function getOnlyMorePopular(): ?bool;
 
+    /**
+     * Set alternativetermcount option.
+     *
+     * The the number of suggestions to return for each query term existing in the index and/or dictionary.
+     *
+     * @param int $count
+     *
+     * @return self Provides fluent interface
+     */
+    public function setAlternativeTermCount(int $count): self;
+
+    /**
+     * Get alternativetermcount option.
+     *
+     * @return int|null
+     */
+    public function getAlternativeTermCount(): ?int;
+
     /**
      * Set extendedResults option.
      *
diff --git a/vendor/solarium/solarium/src/Component/Stats/Stats.php b/vendor/solarium/solarium/src/Component/Stats/Stats.php
index 115638304..31b198355 100644
--- a/vendor/solarium/solarium/src/Component/Stats/Stats.php
+++ b/vendor/solarium/solarium/src/Component/Stats/Stats.php
@@ -113,7 +113,7 @@ public function addField($field): self
 
         $key = $field->getKey();
 
-        if (0 === \strlen($key)) {
+        if (null === $key || 0 === \strlen($key)) {
             throw new InvalidArgumentException('A field must have a key value');
         }
 
diff --git a/vendor/solarium/solarium/src/Core/Client/Adapter/AdapterHelper.php b/vendor/solarium/solarium/src/Core/Client/Adapter/AdapterHelper.php
index 86155ed49..cb4ddd54e 100644
--- a/vendor/solarium/solarium/src/Core/Client/Adapter/AdapterHelper.php
+++ b/vendor/solarium/solarium/src/Core/Client/Adapter/AdapterHelper.php
@@ -58,7 +58,7 @@ public static function buildUploadBodyFromRequest(Request $request): string
         $baseName = basename($request->getFileUpload());
         $body = "--{$request->getHash()}\r\n";
         $body .= 'Content-Disposition: form-data; name="file"; filename="'.$baseName.'"';
-        $body .= "\r\nContent-Type: application/octet-stream\r\n\r\n";
+        $body .= "\r\nContent-Type: ".Request::CONTENT_TYPE_APPLICATION_OCTET_STREAM."\r\n\r\n";
         $body .= file_get_contents($request->getFileUpload(), 'r');
         $body .= "\r\n--{$request->getHash()}--\r\n";
 
diff --git a/vendor/solarium/solarium/src/Core/Client/Adapter/ConnectionTimeoutAwareInterface.php b/vendor/solarium/solarium/src/Core/Client/Adapter/ConnectionTimeoutAwareInterface.php
index de4799d04..9997bbb16 100644
--- a/vendor/solarium/solarium/src/Core/Client/Adapter/ConnectionTimeoutAwareInterface.php
+++ b/vendor/solarium/solarium/src/Core/Client/Adapter/ConnectionTimeoutAwareInterface.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 /*
  * This file is part of the Solarium package.
  *
@@ -10,14 +12,16 @@
 namespace Solarium\Core\Client\Adapter;
 
 /**
- * Contract for Http Adapters that are aware of connection timeouts.
+ * Contract for Client Adapters that are aware of connection timeouts.
  */
 interface ConnectionTimeoutAwareInterface
 {
     /**
      * @param int|null $timeoutInSeconds
+     *
+     * @return self Provides fluent interface
      */
-    public function setConnectionTimeout(?int $timeoutInSeconds): void;
+    public function setConnectionTimeout(?int $timeoutInSeconds);
 
     /**
      * @return int|null
diff --git a/vendor/solarium/solarium/src/Core/Client/Adapter/ConnectionTimeoutAwareTrait.php b/vendor/solarium/solarium/src/Core/Client/Adapter/ConnectionTimeoutAwareTrait.php
index 80ae9454b..67238b7ff 100644
--- a/vendor/solarium/solarium/src/Core/Client/Adapter/ConnectionTimeoutAwareTrait.php
+++ b/vendor/solarium/solarium/src/Core/Client/Adapter/ConnectionTimeoutAwareTrait.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 /*
  * This file is part of the Solarium package.
  *
@@ -22,9 +24,11 @@ trait ConnectionTimeoutAwareTrait
     /**
      * {@inheritdoc}
      */
-    public function setConnectionTimeout(?int $connectionTimeout): void
+    public function setConnectionTimeout(?int $timeoutInSeconds)
     {
-        $this->connectionTimeout = $connectionTimeout;
+        $this->connectionTimeout = $timeoutInSeconds;
+
+        return $this;
     }
 
     /**
diff --git a/vendor/solarium/solarium/src/Core/Client/Adapter/Curl.php b/vendor/solarium/solarium/src/Core/Client/Adapter/Curl.php
index 7d896c936..c814ff032 100644
--- a/vendor/solarium/solarium/src/Core/Client/Adapter/Curl.php
+++ b/vendor/solarium/solarium/src/Core/Client/Adapter/Curl.php
@@ -22,10 +22,11 @@
  *
  * @author Intervals <info@myintervals.com>
  */
-class Curl extends Configurable implements AdapterInterface, TimeoutAwareInterface, ConnectionTimeoutAwareInterface
+class Curl extends Configurable implements AdapterInterface, TimeoutAwareInterface, ConnectionTimeoutAwareInterface, ProxyAwareInterface
 {
     use TimeoutAwareTrait;
     use ConnectionTimeoutAwareTrait;
+    use ProxyAwareTrait;
 
     /**
      * Execute a Solr request using the cURL Http.
@@ -43,8 +44,8 @@ public function execute(Request $request, Endpoint $endpoint): Response
     /**
      * Get the response for a cURL handle.
      *
-     * @param resource $handle
-     * @param string   $httpResponse
+     * @param resource|\CurlHandle $handle
+     * @param string               $httpResponse
      *
      * @return Response
      */
@@ -76,7 +77,7 @@ public function getResponse($handle, $httpResponse): Response
      *
      * @return resource|\CurlHandle
      */
-    public function createHandle($request, $endpoint)
+    public function createHandle(Request $request, Endpoint $endpoint)
     {
         $uri = AdapterHelper::buildUri($request, $endpoint);
 
@@ -92,18 +93,8 @@ public function createHandle($request, $endpoint)
         curl_setopt($handler, CURLOPT_TIMEOUT, $options['timeout']);
         curl_setopt($handler, CURLOPT_CONNECTTIMEOUT, $options['connection_timeout']);
 
-        if (null !== ($proxy = $this->getOption('proxy'))) {
-            curl_setopt($handler, CURLOPT_PROXY, $proxy);
-        }
-
-        if (!isset($options['headers']['Content-Type'])) {
-            $charset = $request->getParam('ie') ?? 'utf-8';
-
-            if (Request::METHOD_GET === $method) {
-                $options['headers']['Content-Type'] = 'application/x-www-form-urlencoded; charset='.$charset;
-            } else {
-                $options['headers']['Content-Type'] = 'application/xml; charset='.$charset;
-            }
+        if (null !== $options['proxy']) {
+            curl_setopt($handler, CURLOPT_PROXY, $options['proxy']);
         }
 
         // Try endpoint authentication first, fallback to request for backwards compatibility
@@ -115,9 +106,16 @@ public function createHandle($request, $endpoint)
         if (!empty($authData['username']) && !empty($authData['password'])) {
             curl_setopt($handler, CURLOPT_USERPWD, $authData['username'].':'.$authData['password']);
             curl_setopt($handler, CURLOPT_HTTPAUTH, CURLAUTH_BASIC);
+        } elseif (!isset($options['headers']) || !\array_key_exists('Authorization', $options['headers'])) {
+            // According to the specification, only one Authorization header is allowed.
+            // @see https://stackoverflow.com/questions/29282578/multiple-http-authorization-headers
+            $tokenData = $endpoint->getAuthorizationToken();
+            if (!empty($tokenData['tokenname']) && !empty($tokenData['token'])) {
+                $options['headers']['Authorization'] = $tokenData['tokenname'].' '.$tokenData['token'];
+            }
         }
 
-        if (\count($options['headers'])) {
+        if (0 !== \count($options['headers'] ?? [])) {
             $headers = [];
             foreach ($options['headers'] as $key => $value) {
                 $headers[] = $key.': '.$value;
@@ -159,9 +157,9 @@ public function createHandle($request, $endpoint)
     /**
      * Check result of a request.
      *
-     * @param string   $data
-     * @param array    $headers
-     * @param resource $handle
+     * @param string               $data
+     * @param array                $headers
+     * @param resource|\CurlHandle $handle
      *
      * @throws HttpException
      */
@@ -174,6 +172,16 @@ public function check($data, $headers, $handle): void
         }
     }
 
+    public function setOption(string $name, $value): Configurable
+    {
+        if ('proxy' === $name) {
+            trigger_error('Setting proxy as an option is deprecated. Use setProxy() instead.', \E_USER_DEPRECATED);
+            $this->setProxy($value);
+        }
+
+        return parent::setOption($name, $value);
+    }
+
     /**
      * Execute request.
      *
@@ -182,7 +190,7 @@ public function check($data, $headers, $handle): void
      *
      * @return Response
      */
-    protected function getData($request, $endpoint): Response
+    protected function getData(Request $request, Endpoint $endpoint): Response
     {
         $handle = $this->createHandle($request, $endpoint);
         $httpResponse = curl_exec($handle);
@@ -200,10 +208,17 @@ protected function getData($request, $endpoint): Response
     protected function init()
     {
         if (!\function_exists('curl_init')) {
+            // @codeCoverageIgnoreStart
             throw new RuntimeException('cURL is not available, install it to use the CurlHttp adapter');
+            // @codeCoverageIgnoreEnd
         }
 
         parent::init();
+
+        if (isset($this->options['proxy'])) {
+            trigger_error('Setting proxy as an option is deprecated. Use setProxy() instead.', \E_USER_DEPRECATED);
+            $this->setProxy($this->options['proxy']);
+        }
     }
 
     /**
@@ -214,15 +229,16 @@ protected function init()
      *
      * @return array
      */
-    protected function createOptions($request, $endpoint)
+    protected function createOptions(Request $request, Endpoint $endpoint)
     {
         $options = [
             'timeout' => $this->timeout,
             'connection_timeout' => $this->connectionTimeout ?? $this->timeout,
+            'proxy' => $this->proxy,
         ];
         foreach ($request->getHeaders() as $headerLine) {
             list($header, $value) = explode(':', $headerLine);
-            if ($header = trim($header)) {
+            if ('' !== $header = trim($header)) {
                 $options['headers'][$header] = trim($value);
             }
         }
diff --git a/vendor/solarium/solarium/src/Core/Client/Adapter/Http.php b/vendor/solarium/solarium/src/Core/Client/Adapter/Http.php
index d9ac158b0..497015e3c 100644
--- a/vendor/solarium/solarium/src/Core/Client/Adapter/Http.php
+++ b/vendor/solarium/solarium/src/Core/Client/Adapter/Http.php
@@ -17,9 +17,10 @@
 /**
  * Basic HTTP adapter using a stream.
  */
-class Http implements AdapterInterface, TimeoutAwareInterface
+class Http implements AdapterInterface, TimeoutAwareInterface, ProxyAwareInterface
 {
     use TimeoutAwareTrait;
+    use ProxyAwareTrait;
 
     /**
      * Handle Solr communication.
@@ -68,17 +69,26 @@ public function check($data, $headers): void
      *
      * @return resource
      */
-    public function createContext($request, $endpoint)
+    public function createContext(Request $request, Endpoint $endpoint)
     {
         $method = $request->getMethod();
+
+        $httpOptions = [
+            'method' => $method,
+            'timeout' => $this->timeout,
+            'protocol_version' => 1.0,
+            'user_agent' => 'Solarium Http Adapter',
+            'ignore_errors' => true,
+        ];
+
+        if (null !== $this->proxy) {
+            $httpOptions['proxy'] = $this->proxy;
+            $httpOptions['request_fulluri'] = true;
+        }
+
         $context = stream_context_create(
-            ['http' => [
-                    'method' => $method,
-                    'timeout' => $this->timeout,
-                    'protocol_version' => 1.0,
-                    'user_agent' => 'Solarium Http Adapter',
-                    'ignore_errors' => true,
-                ],
+            [
+                'http' => $httpOptions,
             ]
         );
 
@@ -92,6 +102,15 @@ public function createContext($request, $endpoint)
             $request->addHeader(
                 'Authorization: Basic '.base64_encode($authData['username'].':'.$authData['password'])
             );
+        } else {
+            // According to the specification, only one Authorization header is allowed.
+            // @see https://stackoverflow.com/questions/29282578/multiple-http-authorization-headers
+            $tokenData = $endpoint->getAuthorizationToken();
+            if (!empty($tokenData['tokenname']) && !empty($tokenData['token'])) {
+                $request->addHeader(
+                    'Authorization: '.$tokenData['tokenname'].' '.$tokenData['token']
+                );
+            }
         }
 
         if (Request::METHOD_POST === $method) {
@@ -99,7 +118,7 @@ public function createContext($request, $endpoint)
                 $data = AdapterHelper::buildUploadBodyFromRequest($request);
 
                 $contentLength = \strlen($data);
-                $request->addHeader("Content-Length: $contentLength\r\n");
+                $request->addHeader("Content-Length: $contentLength");
                 stream_context_set_option(
                     $context,
                     'http',
@@ -115,9 +134,6 @@ public function createContext($request, $endpoint)
                         'content',
                         $data
                     );
-
-                    $charset = $request->getParam('ie') ?? 'utf-8';
-                    $request->addHeader('Content-Type: text/xml; charset='.$charset);
                 }
             }
         } elseif (Request::METHOD_PUT === $method) {
@@ -129,7 +145,6 @@ public function createContext($request, $endpoint)
                     'content',
                     $data
                 );
-                $request->addHeader('Content-Type: application/json; charset=utf-8');
                 // The stream context automatically adds a "Connection: close" header which fails on Solr 8.5.0
                 $request->addHeader('Connection: Keep-Alive');
             }
@@ -160,7 +175,8 @@ protected function getData($uri, $context)
     {
         $data = @file_get_contents($uri, false, $context);
 
-        // @ see https://www.php.net/manual/en/reserved.variables.httpresponseheader.php
+        // @see https://www.php.net/manual/en/reserved.variables.httpresponseheader.php
+        // @phpstan-ignore-next-line https://github.com/phpstan/phpstan/issues/3213
         return [$data, $http_response_header ?? []];
     }
 }
diff --git a/vendor/solarium/solarium/src/Core/Client/Adapter/ProxyAwareInterface.php b/vendor/solarium/solarium/src/Core/Client/Adapter/ProxyAwareInterface.php
new file mode 100644
index 000000000..d75bd1bdb
--- /dev/null
+++ b/vendor/solarium/solarium/src/Core/Client/Adapter/ProxyAwareInterface.php
@@ -0,0 +1,30 @@
+<?php
+
+declare(strict_types=1);
+
+/*
+ * This file is part of the Solarium package.
+ *
+ * For the full copyright and license information, please view the COPYING
+ * file that was distributed with this source code.
+ */
+
+namespace Solarium\Core\Client\Adapter;
+
+/**
+ * Contract for Client Adapters that are aware of proxy settings.
+ */
+interface ProxyAwareInterface
+{
+    /**
+     * @param mixed|null $proxy
+     *
+     * @return self Provides fluent interface
+     */
+    public function setProxy($proxy);
+
+    /**
+     * @return mixed|null
+     */
+    public function getProxy();
+}
diff --git a/vendor/solarium/solarium/src/Core/Client/Adapter/ProxyAwareTrait.php b/vendor/solarium/solarium/src/Core/Client/Adapter/ProxyAwareTrait.php
new file mode 100644
index 000000000..59a07d515
--- /dev/null
+++ b/vendor/solarium/solarium/src/Core/Client/Adapter/ProxyAwareTrait.php
@@ -0,0 +1,41 @@
+<?php
+
+declare(strict_types=1);
+
+/*
+ * This file is part of the Solarium package.
+ *
+ * For the full copyright and license information, please view the COPYING
+ * file that was distributed with this source code.
+ */
+
+namespace Solarium\Core\Client\Adapter;
+
+/**
+ * @internal
+ */
+trait ProxyAwareTrait
+{
+    /**
+     * @var mixed|null
+     */
+    private $proxy;
+
+    /**
+     * {@inheritdoc}
+     */
+    public function setProxy($proxy)
+    {
+        $this->proxy = $proxy;
+
+        return $this;
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function getProxy()
+    {
+        return $this->proxy;
+    }
+}
diff --git a/vendor/solarium/solarium/src/Core/Client/Adapter/Psr18Adapter.php b/vendor/solarium/solarium/src/Core/Client/Adapter/Psr18Adapter.php
index 011ab02c3..34276d38d 100644
--- a/vendor/solarium/solarium/src/Core/Client/Adapter/Psr18Adapter.php
+++ b/vendor/solarium/solarium/src/Core/Client/Adapter/Psr18Adapter.php
@@ -156,21 +156,11 @@ private function getRequestHeaders(Request $request, Endpoint $endpoint): array
 
         foreach ($request->getHeaders() as $headerLine) {
             list($header, $value) = explode(':', $headerLine);
-            if ($header = trim($header)) {
+            if ('' !== $header = trim($header)) {
                 $headers[$header][] = $value;
             }
         }
 
-        if (!isset($headers['Content-Type'])) {
-            $charset = $request->getParam('ie') ?? 'utf-8';
-
-            if (Request::METHOD_GET === $request->getMethod()) {
-                $headers['Content-Type'] = ['application/x-www-form-urlencoded; charset='.$charset];
-            } else {
-                $headers['Content-Type'] = ['application/xml; charset='.$charset];
-            }
-        }
-
         if (!isset($headers['Authorization'])) {
             // Try endpoint authentication first, fallback to request for backwards compatibility
             $authData = $endpoint->getAuthentication();
@@ -180,6 +170,13 @@ private function getRequestHeaders(Request $request, Endpoint $endpoint): array
 
             if (!empty($authData['username']) && !empty($authData['password'])) {
                 $headers['Authorization'] = ['Basic '.base64_encode($authData['username'].':'.$authData['password'])];
+            } else {
+                // According to the specification, only one Authorization header is allowed.
+                // @see https://stackoverflow.com/questions/29282578/multiple-http-authorization-headers
+                $tokenData = $endpoint->getAuthorizationToken();
+                if (!empty($tokenData['tokenname']) && !empty($tokenData['token'])) {
+                    $headers['Authorization'] = [$tokenData['tokenname'].' '.$tokenData['token']];
+                }
             }
         }
 
diff --git a/vendor/solarium/solarium/src/Core/Client/Adapter/TimeoutAwareInterface.php b/vendor/solarium/solarium/src/Core/Client/Adapter/TimeoutAwareInterface.php
index 7e44ae4f2..b52436ba2 100644
--- a/vendor/solarium/solarium/src/Core/Client/Adapter/TimeoutAwareInterface.php
+++ b/vendor/solarium/solarium/src/Core/Client/Adapter/TimeoutAwareInterface.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 /*
  * This file is part of the Solarium package.
  *
@@ -10,7 +12,7 @@
 namespace Solarium\Core\Client\Adapter;
 
 /**
- * Contract for Http Adapters that are aware of timeouts.
+ * Contract for Client Adapters that are aware of timeouts.
  */
 interface TimeoutAwareInterface
 {
@@ -21,8 +23,10 @@ interface TimeoutAwareInterface
 
     /**
      * @param int $timeoutInSeconds
+     *
+     * @return self Provides fluent interface
      */
-    public function setTimeout(int $timeoutInSeconds): void;
+    public function setTimeout(int $timeoutInSeconds);
 
     /**
      * @return int
diff --git a/vendor/solarium/solarium/src/Core/Client/Adapter/TimeoutAwareTrait.php b/vendor/solarium/solarium/src/Core/Client/Adapter/TimeoutAwareTrait.php
index c1b122f26..b1e88c714 100644
--- a/vendor/solarium/solarium/src/Core/Client/Adapter/TimeoutAwareTrait.php
+++ b/vendor/solarium/solarium/src/Core/Client/Adapter/TimeoutAwareTrait.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 /*
  * This file is part of the Solarium package.
  *
@@ -22,9 +24,11 @@ trait TimeoutAwareTrait
     /**
      * {@inheritdoc}
      */
-    public function setTimeout(int $timeoutInSeconds): void
+    public function setTimeout(int $timeoutInSeconds)
     {
         $this->timeout = $timeoutInSeconds;
+
+        return $this;
     }
 
     /**
diff --git a/vendor/solarium/solarium/src/Core/Client/Client.php b/vendor/solarium/solarium/src/Core/Client/Client.php
index 5a5f31911..e9ff6ba46 100755
--- a/vendor/solarium/solarium/src/Core/Client/Client.php
+++ b/vendor/solarium/solarium/src/Core/Client/Client.php
@@ -30,6 +30,9 @@
 use Solarium\Exception\OutOfBoundsException;
 use Solarium\Exception\UnexpectedValueException;
 use Solarium\Plugin\BufferedAdd\BufferedAdd;
+use Solarium\Plugin\BufferedAdd\BufferedAddLite;
+use Solarium\Plugin\BufferedDelete\BufferedDelete;
+use Solarium\Plugin\BufferedDelete\BufferedDeleteLite;
 use Solarium\Plugin\CustomizeRequest\CustomizeRequest;
 use Solarium\Plugin\Loadbalancer\Loadbalancer;
 use Solarium\Plugin\MinimumScoreFilter\MinimumScoreFilter;
@@ -42,9 +45,9 @@
 use Solarium\QueryType\Extract\Query as ExtractQuery;
 use Solarium\QueryType\Extract\Result as ExtractResult;
 use Solarium\QueryType\Graph\Query as GraphQuery;
-use Solarium\QueryType\ManagedResources\Query\Resources;
-use Solarium\QueryType\ManagedResources\Query\Stopwords;
-use Solarium\QueryType\ManagedResources\Query\Synonyms;
+use Solarium\QueryType\ManagedResources\Query\Resources as ManagedResourcesQuery;
+use Solarium\QueryType\ManagedResources\Query\Stopwords as ManagedStopwordsQuery;
+use Solarium\QueryType\ManagedResources\Query\Synonyms as ManagedSynonymsQuery;
 use Solarium\QueryType\MoreLikeThis\Query as MoreLikeThisQuery;
 use Solarium\QueryType\MoreLikeThis\Result as MoreLikeThisResult;
 use Solarium\QueryType\Ping\Query as PingQuery;
@@ -74,11 +77,12 @@
  * The client is the main interface for usage of the Solarium library.
  * You can use it to get query instances and to execute them.
  * It also allows to register plugins and query types to customize Solarium.
+ * It gives access to the event dispatcher so that you can add listeners.
  * Finally, it also gives access to the adapter, which holds the Solr connection settings.
  *
  * Example usage with default settings:
  * <code>
- * $client = new Solarium\Client;
+ * $client = new Solarium\Client($adapter, $eventDispatcher);
  * $query = $client->createSelect();
  * $result = $client->select($query);
  * </code>
@@ -219,9 +223,9 @@ class Client extends Configurable implements ClientInterface
         self::QUERY_COLLECTIONS => CollectionsQuery::class,
         self::QUERY_CONFIGSETS => ConfigsetsQuery::class,
         self::QUERY_API => ApiQuery::class,
-        self::QUERY_MANAGED_RESOURCES => Resources::class,
-        self::QUERY_MANAGED_STOPWORDS => Stopwords::class,
-        self::QUERY_MANAGED_SYNONYMS => Synonyms::class,
+        self::QUERY_MANAGED_RESOURCES => ManagedResourcesQuery::class,
+        self::QUERY_MANAGED_STOPWORDS => ManagedStopwordsQuery::class,
+        self::QUERY_MANAGED_SYNONYMS => ManagedSynonymsQuery::class,
     ];
 
     /**
@@ -236,6 +240,9 @@ class Client extends Configurable implements ClientInterface
         'customizerequest' => CustomizeRequest::class,
         'parallelexecution' => ParallelExecution::class,
         'bufferedadd' => BufferedAdd::class,
+        'bufferedaddlite' => BufferedAddLite::class,
+        'buffereddelete' => BufferedDelete::class,
+        'buffereddeletelite' => BufferedDeleteLite::class,
         'prefetchiterator' => PrefetchIterator::class,
         'minimumscorefilter' => MinimumScoreFilter::class,
     ];
@@ -345,11 +352,11 @@ public function addEndpoint($endpoint): ClientInterface
 
         $key = $endpoint->getKey();
 
-        if (0 === \strlen($key)) {
+        if (null === $key || 0 === \strlen($key)) {
             throw new InvalidArgumentException('An endpoint must have a key value');
         }
 
-        //double add calls for the same endpoint are ignored, but non-unique keys cause an exception
+        // double add calls for the same endpoint are ignored, but non-unique keys cause an exception
         if (\array_key_exists($key, $this->endpoints) && $this->endpoints[$key] !== $endpoint) {
             throw new InvalidArgumentException('An endpoint must have a unique key');
         }
@@ -706,12 +713,14 @@ public function removePlugin($plugin): ClientInterface
         if (\is_object($plugin)) {
             foreach ($this->pluginInstances as $key => $instance) {
                 if ($instance === $plugin) {
+                    $plugin->deinitPlugin();
                     unset($this->pluginInstances[$key]);
                     break;
                 }
             }
         } else {
             if (isset($this->pluginInstances[$plugin])) {
+                $this->pluginInstances[$plugin]->deinitPlugin();
                 unset($this->pluginInstances[$plugin]);
             }
         }
@@ -824,7 +833,7 @@ public function executeRequest(Request $request, $endpoint = null): Response
         $event = new PreExecuteRequestEvent($request, $endpoint);
         $this->eventDispatcher->dispatch($event);
         if (null !== $event->getResponse()) {
-            $response = $event->getResponse(); //a plugin result overrules the standard execution result
+            $response = $event->getResponse(); // a plugin result overrules the standard execution result
         } else {
             $response = $this->getAdapter()->execute($request, $endpoint);
         }
@@ -1236,7 +1245,7 @@ public function createExtract(array $options = null): ExtractQuery
      *
      * @return \Solarium\Core\Query\AbstractQuery|\Solarium\QueryType\Stream\Query
      */
-    public function createStream(array $options = null)
+    public function createStream(array $options = null): StreamQuery
     {
         // Streaming expressions tend to be very long. Therfore we use the 'postbigrequest' plugin. The plugin needs to
         // be loaded before the request is created.
@@ -1252,7 +1261,7 @@ public function createStream(array $options = null)
      *
      * @return \Solarium\Core\Query\AbstractQuery|\Solarium\QueryType\Graph\Query
      */
-    public function createGraph(array $options = null)
+    public function createGraph(array $options = null): GraphQuery
     {
         // Streaming expressions tend to be very long. Therfore we use the 'postbigrequest' plugin. The plugin needs to
         // be loaded before the request is created.
@@ -1286,75 +1295,75 @@ public function createCoreAdmin(array $options = null): CoreAdminQuery
     }
 
     /**
-     * Create a managed resources query instance.
+     * Create a Collections API query instance.
      *
      * @param mixed $options
      *
-     * @return \Solarium\Core\Query\AbstractQuery|\Solarium\QueryType\ManagedResources\Query\Resources
+     * @return \Solarium\Core\Query\AbstractQuery|\Solarium\QueryType\Server\Collections\Query\Query
      */
-    public function createManagedResources(array $options = null)
+    public function createCollections(array $options = null): CollectionsQuery
     {
-        return $this->createQuery(self::QUERY_MANAGED_RESOURCES, $options);
+        return $this->createQuery(self::QUERY_COLLECTIONS, $options);
     }
 
     /**
-     * Create a managed stopwords query instance.
+     * Create a Configsets API query instance.
      *
      * @param mixed $options
      *
-     * @return \Solarium\Core\Query\AbstractQuery|\Solarium\QueryType\ManagedResources\Query\Stopwords
+     * @return \Solarium\Core\Query\AbstractQuery|\Solarium\QueryType\Server\Configsets\Query\Query
      */
-    public function createManagedStopwords(array $options = null)
+    public function createConfigsets(array $options = null): ConfigsetsQuery
     {
-        return $this->createQuery(self::QUERY_MANAGED_STOPWORDS, $options);
+        return $this->createQuery(self::QUERY_CONFIGSETS, $options);
     }
 
     /**
-     * Create a managed synonyms query instance.
+     * Create an API query instance.
      *
      * @param mixed $options
      *
-     * @return \Solarium\Core\Query\AbstractQuery|\Solarium\QueryType\ManagedResources\Query\Synonyms
+     * @return \Solarium\Core\Query\AbstractQuery|\Solarium\QueryType\Server\Api\Query
      */
-    public function createManagedSynonyms(array $options = null)
+    public function createApi(array $options = null): ApiQuery
     {
-        return $this->createQuery(self::QUERY_MANAGED_SYNONYMS, $options);
+        return $this->createQuery(self::QUERY_API, $options);
     }
 
     /**
-     * Create a Collections API query instance.
+     * Create a managed resources query instance.
      *
      * @param mixed $options
      *
-     * @return \Solarium\Core\Query\AbstractQuery|\Solarium\QueryType\Server\Collections\Query\Query
+     * @return \Solarium\Core\Query\AbstractQuery|\Solarium\QueryType\ManagedResources\Query\Resources
      */
-    public function createCollections(array $options = null): CollectionsQuery
+    public function createManagedResources(array $options = null): ManagedResourcesQuery
     {
-        return $this->createQuery(self::QUERY_COLLECTIONS, $options);
+        return $this->createQuery(self::QUERY_MANAGED_RESOURCES, $options);
     }
 
     /**
-     * Create a Configsets API query instance.
+     * Create a managed stopwords query instance.
      *
      * @param mixed $options
      *
-     * @return \Solarium\Core\Query\AbstractQuery|\Solarium\QueryType\Server\Configsets\Query\Query
+     * @return \Solarium\Core\Query\AbstractQuery|\Solarium\QueryType\ManagedResources\Query\Stopwords
      */
-    public function createConfigsets(array $options = null): ConfigsetsQuery
+    public function createManagedStopwords(array $options = null): ManagedStopwordsQuery
     {
-        return $this->createQuery(self::QUERY_CONFIGSETS, $options);
+        return $this->createQuery(self::QUERY_MANAGED_STOPWORDS, $options);
     }
 
     /**
-     * Create an API query instance.
+     * Create a managed synonyms query instance.
      *
      * @param mixed $options
      *
-     * @return \Solarium\Core\Query\AbstractQuery|\Solarium\QueryType\Server\Api\Query
+     * @return \Solarium\Core\Query\AbstractQuery|\Solarium\QueryType\ManagedResources\Query\Synonyms
      */
-    public function createApi(array $options = null): ApiQuery
+    public function createManagedSynonyms(array $options = null): ManagedSynonymsQuery
     {
-        return $this->createQuery(self::QUERY_API, $options);
+        return $this->createQuery(self::QUERY_MANAGED_SYNONYMS, $options);
     }
 
     /**
diff --git a/vendor/solarium/solarium/src/Core/Client/ClientInterface.php b/vendor/solarium/solarium/src/Core/Client/ClientInterface.php
index 829d288bb..1d51258a4 100644
--- a/vendor/solarium/solarium/src/Core/Client/ClientInterface.php
+++ b/vendor/solarium/solarium/src/Core/Client/ClientInterface.php
@@ -21,6 +21,10 @@
 use Solarium\QueryType\Analysis\Query\Field as AnalysisQueryField;
 use Solarium\QueryType\Extract\Query as ExtractQuery;
 use Solarium\QueryType\Extract\Result as ExtractResult;
+use Solarium\QueryType\Graph\Query as GraphQuery;
+use Solarium\QueryType\ManagedResources\Query\Resources as ManagedResourcesQuery;
+use Solarium\QueryType\ManagedResources\Query\Stopwords as ManagedStopwordsQuery;
+use Solarium\QueryType\ManagedResources\Query\Synonyms as ManagedSynonymsQuery;
 use Solarium\QueryType\MoreLikeThis\Query as MoreLikeThisQuery;
 use Solarium\QueryType\MoreLikeThis\Result as MoreLikeThisResult;
 use Solarium\QueryType\Ping\Query as PingQuery;
@@ -36,6 +40,7 @@
 use Solarium\QueryType\Server\CoreAdmin\Result\Result as CoreAdminResult;
 use Solarium\QueryType\Spellcheck\Query as SpellcheckQuery;
 use Solarium\QueryType\Spellcheck\Result\Result as SpellcheckResult;
+use Solarium\QueryType\Stream\Query as StreamQuery;
 use Solarium\QueryType\Suggester\Query as SuggesterQuery;
 use Solarium\QueryType\Suggester\Result\Result as SuggesterResult;
 use Solarium\QueryType\Terms\Query as TermsQuery;
@@ -48,12 +53,13 @@
  *
  * The client is the main interface for usage of the Solarium library.
  * You can use it to get query instances and to execute them.
- * It also allows to register plugins and querytypes to customize Solarium.
+ * It also allows to register plugins and query types to customize Solarium.
+ * It gives access to the event dispatcher so that you can add listeners.
  * Finally, it also gives access to the adapter, which holds the Solr connection settings.
  *
  * Example usage with default settings:
  * <code>
- * $client = new Solarium\Client;
+ * $client = new Solarium\Client($adapter, $eventDispatcher);
  * $query = $client->createSelect();
  * $result = $client->select($query);
  * </code>
@@ -177,9 +183,9 @@ public function setAdapter(AdapterInterface $adapter): self;
     public function getAdapter(): AdapterInterface;
 
     /**
-     * Register a querytype.
+     * Register a query type.
      *
-     * You can also use this method to override any existing querytype with a new mapping.
+     * You can also use this method to override any existing query type with a new mapping.
      * This requires the availability of the classes through autoloading or a manual
      * require before calling this method.
      *
@@ -191,7 +197,7 @@ public function getAdapter(): AdapterInterface;
     public function registerQueryType(string $type, string $queryClass): self;
 
     /**
-     * Register multiple querytypes.
+     * Register multiple query types.
      *
      * @param array $queryTypes
      *
@@ -200,7 +206,7 @@ public function registerQueryType(string $type, string $queryClass): self;
     public function registerQueryTypes(array $queryTypes): self;
 
     /**
-     * Get all registered querytypes.
+     * Get all registered query types.
      *
      * @return array
      */
@@ -419,8 +425,8 @@ public function moreLikeThis(QueryInterface $query, $endpoint = null): MoreLikeT
      * @internal this is a convenience method that forwards the query to the
      *  execute method, thus allowing for an easy to use and clean API
      *
-     * @param QueryInterface|AnalysisQueryDocument|AnalysisQueryField $query
-     * @param Endpoint|string|null                                    $endpoint
+     * @param QueryInterface|\Solarium\QueryType\Analysis\Query\Document|\Solarium\QueryType\Analysis\Query\Field $query
+     * @param Endpoint|string|null                                                                                $endpoint
      *
      * @return ResultInterface|\Solarium\QueryType\Analysis\Result\Document|\Solarium\QueryType\Analysis\Result\Field
      */
@@ -491,6 +497,19 @@ public function extract(QueryInterface $query, $endpoint = null): ExtractResult;
      */
     public function realtimeGet(QueryInterface $query, $endpoint = null): RealtimeGetResult;
 
+    /**
+     * Execute a CoreAdmin query.
+     *
+     * @internal this is a convenience method that forwards the query to the
+     *  execute method, thus allowing for an easy to use and clean API
+     *
+     * @param QueryInterface|\Solarium\QueryType\Server\CoreAdmin\Query\Query $query
+     * @param Endpoint|string|null                                            $endpoint
+     *
+     * @return ResultInterface|\Solarium\QueryType\Server\CoreAdmin\Result\Result
+     */
+    public function coreAdmin(QueryInterface $query, $endpoint = null): CoreAdminResult;
+
     /**
      * Execute a Collections API query.
      *
@@ -513,23 +532,10 @@ public function collections(QueryInterface $query, $endpoint = null): ResultInte
      * @param QueryInterface|\Solarium\QueryType\Server\Configsets\Query\Query $query
      * @param Endpoint|string|null                                             $endpoint
      *
-     * @return ResultInterface|\Solarium\QueryType\Server\Configssets\Result\ListConfigsetsResult
+     * @return ResultInterface|\Solarium\QueryType\Server\Configsets\Result\ListConfigsetsResult
      */
     public function configsets(QueryInterface $query, $endpoint = null): ResultInterface;
 
-    /**
-     * Execute a CoreAdmin query.
-     *
-     * @internal this is a convenience method that forwards the query to the
-     *  execute method, thus allowing for an easy to use and clean API
-     *
-     * @param QueryInterface|\Solarium\QueryType\Server\CoreAdmin\Query\Query $query
-     * @param Endpoint|string|null                                            $endpoint
-     *
-     * @return ResultInterface|\Solarium\QueryType\Server\CoreAdmin\Result\Result
-     */
-    public function coreAdmin(QueryInterface $query, $endpoint = null): CoreAdminResult;
-
     /**
      * Create a query instance.
      *
@@ -632,6 +638,24 @@ public function createSuggester(array $options = null): SuggesterQuery;
      */
     public function createExtract(array $options = null): ExtractQuery;
 
+    /**
+     * Create a stream query instance.
+     *
+     * @param array $options
+     *
+     * @return \Solarium\QueryType\Stream\Query
+     */
+    public function createStream(array $options = null): StreamQuery;
+
+    /**
+     * Create a graph query instance.
+     *
+     * @param array $options
+     *
+     * @return \Solarium\QueryType\Graph\Query
+     */
+    public function createGraph(array $options = null): GraphQuery;
+
     /**
      * Create a RealtimeGet query instance.
      *
@@ -642,6 +666,8 @@ public function createExtract(array $options = null): ExtractQuery;
     public function createRealtimeGet(array $options = null): RealtimeGetQuery;
 
     /**
+     * Create a CoreAdmin query instance.
+     *
      * @param array $options
      *
      * @return \Solarium\QueryType\Server\CoreAdmin\Query\Query
@@ -649,6 +675,8 @@ public function createRealtimeGet(array $options = null): RealtimeGetQuery;
     public function createCoreAdmin(array $options = null): CoreAdminQuery;
 
     /**
+     * Create a Collections API query instance.
+     *
      * @param array $options
      *
      * @return \Solarium\QueryType\Server\Collections\Query\Query
@@ -656,16 +684,47 @@ public function createCoreAdmin(array $options = null): CoreAdminQuery;
     public function createCollections(array $options = null): CollectionsQuery;
 
     /**
+     * Create a Configsets API query instance.
+     *
      * @param array $options
      *
-     * @return \Solarium\QueryType\Server\Configssets\Query\Query
+     * @return \Solarium\QueryType\Server\Configsets\Query\Query
      */
     public function createConfigsets(array $options = null): ConfigsetsQuery;
 
     /**
+     * Create an API query instance.
+     *
      * @param array $options
      *
      * @return \Solarium\QueryType\Server\Api\Query
      */
     public function createApi(array $options = null): ApiQuery;
+
+    /**
+     * Create a managed resources query instance.
+     *
+     * @param array $options
+     *
+     * @return \Solarium\QueryType\ManagedResources\Query\Resources
+     */
+    public function createManagedResources(array $options = null): ManagedResourcesQuery;
+
+    /**
+     * Create a managed stopwords query instance.
+     *
+     * @param array $options
+     *
+     * @return \Solarium\QueryType\ManagedResources\Query\Stopwords
+     */
+    public function createManagedStopwords(array $options = null): ManagedStopwordsQuery;
+
+    /**
+     * Create a managed synonyms query instance.
+     *
+     * @param array $options
+     *
+     * @return \Solarium\QueryType\ManagedResources\Query\Synonyms
+     */
+    public function createManagedSynonyms(array $options = null): ManagedSynonymsQuery;
 }
diff --git a/vendor/solarium/solarium/src/Core/Client/Endpoint.php b/vendor/solarium/solarium/src/Core/Client/Endpoint.php
index 95010b684..45ed0a099 100644
--- a/vendor/solarium/solarium/src/Core/Client/Endpoint.php
+++ b/vendor/solarium/solarium/src/Core/Client/Endpoint.php
@@ -46,7 +46,7 @@ class Endpoint extends Configurable
      */
     public function __toString()
     {
-        $output = __CLASS__.'::__toString'."\n".'host: '.$this->getHost()."\n".'port: '.$this->getPort()."\n".'path: '.$this->getPath()."\n".'context: '.$this->getContext()."\n".'collection: '.$this->getCollection()."\n".'core: '.$this->getCore()."\n".'authentication: '.print_r($this->getAuthentication(), true);
+        $output = __CLASS__.'::__toString'."\n".'host: '.$this->getHost()."\n".'port: '.$this->getPort()."\n".'path: '.$this->getPath()."\n".'context: '.$this->getContext()."\n".'collection: '.$this->getCollection()."\n".'core: '.$this->getCore()."\n".'authentication: '.print_r($this->getAuthentication() + $this->getAuthorizationToken(), true);
 
         return $output;
     }
@@ -353,8 +353,6 @@ public function getServerUri(): string
     /**
      * Set HTTP basic auth settings.
      *
-     * If one or both values are NULL authentication will be disabled
-     *
      * @param string $username
      * @param string $password
      *
@@ -381,6 +379,37 @@ public function getAuthentication(): array
         ];
     }
 
+    /**
+     * Set authorization token.
+     *
+     * Used for JWT or simple token based authorization.
+     *
+     * @param string $tokenname
+     * @param string $token
+     *
+     * @return self Provides fluent interface
+     */
+    public function setAuthorizationToken(string $tokenname, string $token): self
+    {
+        $this->setOption('tokenname', $tokenname);
+        $this->setOption('token', $token);
+
+        return $this;
+    }
+
+    /**
+     * Get authorization token.
+     *
+     * @return array
+     */
+    public function getAuthorizationToken(): array
+    {
+        return [
+            'tokenname' => $this->getOption('tokenname'),
+            'token' => $this->getOption('token'),
+        ];
+    }
+
     /**
      * If the shard is a leader or not. Only in SolrCloud.
      *
diff --git a/vendor/solarium/solarium/src/Core/Client/Request.php b/vendor/solarium/solarium/src/Core/Client/Request.php
index e839874de..d9fffd7d0 100644
--- a/vendor/solarium/solarium/src/Core/Client/Request.php
+++ b/vendor/solarium/solarium/src/Core/Client/Request.php
@@ -46,6 +46,36 @@ class Request extends Configurable implements RequestParamsInterface
      */
     const METHOD_PUT = 'PUT';
 
+    /**
+     * Content-Type for JSON payloads.
+     */
+    const CONTENT_TYPE_APPLICATION_JSON = 'application/json';
+
+    /**
+     * Content-Type for arbitrary binary data.
+     */
+    const CONTENT_TYPE_APPLICATION_OCTET_STREAM = 'application/octet-stream';
+
+    /**
+     * Content-Type for percent-encoded name-value pairs.
+     */
+    const CONTENT_TYPE_APPLICATION_X_WWW_FORM_URLENCODED = 'application/x-www-form-urlencoded';
+
+    /**
+     * Content-Type for XML payloads.
+     */
+    const CONTENT_TYPE_APPLICATION_XML = 'application/xml';
+
+    /**
+     * Content-Type for multipart data streams.
+     */
+    const CONTENT_TYPE_MULTIPART_FORM_DATA = 'multipart/form-data';
+
+    /**
+     * Content-Type for plaintext payloads.
+     */
+    const CONTENT_TYPE_TEXT_PLAIN = 'text/plain';
+
     /**
      * V1 API.
      */
@@ -88,7 +118,16 @@ class Request extends Configurable implements RequestParamsInterface
      */
     public function __toString()
     {
-        $output = __CLASS__.'::__toString'."\n".'method: '.$this->getMethod()."\n".'header: '.print_r($this->getHeaders(), true).'authentication: '.print_r($this->getAuthentication(), true).'resource: '.$this->getUri()."\n".'resource urldecoded: '.urldecode($this->getUri())."\n".'raw data: '.$this->getRawData()."\n".'file upload: '.$this->getFileUpload()."\n";
+        $output =
+            __CLASS__.'::__toString'."\n"
+            .'method: '.$this->getMethod()."\n"
+            .'header: '.print_r($this->getHeaders(), true)
+            .'authentication: '.print_r($this->getAuthentication(), true)
+            .'resource: '.$this->getUri()."\n"
+            .'resource urldecoded: '.urldecode($this->getUri())."\n"
+            .'raw data: '.$this->getRawData()."\n"
+            .'file upload: '.$this->getFileUpload()."\n"
+        ;
 
         return $output;
     }
@@ -120,7 +159,7 @@ public function getHandler(): ?string
     /**
      * Set request method.
      *
-     * Use one of the constants as value
+     * Use one of the METHOD_* constants as value.
      *
      * @param string $method
      *
@@ -143,6 +182,63 @@ public function getMethod(): ?string
         return $this->getOption('method');
     }
 
+    /**
+     * Set request Content-Type.
+     *
+     * Use one of the CONTENT_TYPE_* constants as value.
+     *
+     * Content-Type parameters can be passed in $params or set with {@see setContentTypeParams()}.
+     *
+     * @param string|null $contentType
+     * @param array|null  $params
+     *
+     * @return self Provides fluent interface
+     */
+    public function setContentType(?string $contentType, ?array $params = null): self
+    {
+        $this->setOption('contenttype', $contentType);
+
+        if (null !== $params) {
+            $this->setOption('contenttypeparams', $params);
+        }
+
+        return $this;
+    }
+
+    /**
+     * Get request Content-Type.
+     *
+     * @return string|null
+     */
+    public function getContentType(): ?string
+    {
+        return $this->getOption('contenttype');
+    }
+
+    /**
+     * Set Content-Type parameters.
+     *
+     * @param array|null $params
+     *
+     * @return self Provides fluent interface
+     */
+    public function setContentTypeParams(?array $params): self
+    {
+        $this->setOption('contenttypeparams', $params);
+
+        return $this;
+    }
+
+    /**
+     * Get Content-Type parameters.
+     *
+     * @return array|null
+     */
+    public function getContentTypeParams(): ?array
+    {
+        return $this->getOption('contenttypeparams');
+    }
+
     /**
      * Get raw POST data.
      *
@@ -206,7 +302,27 @@ public function setFileUpload($filename): self
      */
     public function getHeaders(): array
     {
-        return array_unique($this->headers);
+        $headers = array_unique($this->headers);
+
+        if (
+            null === $this->getHeader('Content-Type')
+            && (null !== $contentType = $this->getContentType())
+        ) {
+            $contentTypeHeader = sprintf('Content-Type: %s', $contentType);
+
+            if (null !== $contentTypeParams = $this->getContentTypeParams()) {
+                foreach ($contentTypeParams as $param => $value) {
+                    $contentTypeHeader .= sprintf('; %s=%s', $param, $value);
+                }
+            } else {
+                $charset = $this->getParam('ie') ?? 'utf-8';
+                $contentTypeHeader .= sprintf('; charset=%s', $charset);
+            }
+
+            $headers[] = $contentTypeHeader;
+        }
+
+        return $headers;
     }
 
     /**
@@ -375,6 +491,8 @@ public function getIsServerRequest(): bool
     /**
      * Set Solr API version.
      *
+     * Use one of the API_* constants as value.
+     *
      * @param string $api
      *
      * @return self Provides fluent interface
@@ -427,6 +545,7 @@ protected function init()
                     if (isset($value['username'], $value['password'])) {
                         $this->setAuthentication($value['username'], $value['password']);
                     }
+                    break;
             }
         }
     }
diff --git a/vendor/solarium/solarium/src/Core/Event/Events.php b/vendor/solarium/solarium/src/Core/Event/Events.php
index 4f5a55139..640e9d580 100644
--- a/vendor/solarium/solarium/src/Core/Event/Events.php
+++ b/vendor/solarium/solarium/src/Core/Event/Events.php
@@ -84,7 +84,7 @@ class Events
     public const PRE_EXECUTE = PreExecute::class;
 
     /**
-     * The postExecute event is thrown just after a all execution is done.
+     * The postExecute event is thrown just after all execution is done.
      *
      * The event listener receives a Query instance and a Result instance.
      *
diff --git a/vendor/solarium/solarium/src/Core/Event/PostCreateQuery.php b/vendor/solarium/solarium/src/Core/Event/PostCreateQuery.php
index 2e71241bc..e839160c1 100644
--- a/vendor/solarium/solarium/src/Core/Event/PostCreateQuery.php
+++ b/vendor/solarium/solarium/src/Core/Event/PostCreateQuery.php
@@ -13,7 +13,7 @@
 use Symfony\Contracts\EventDispatcher\Event;
 
 /**
- * PostCreateQuery event, see Events for details.
+ * PostCreateQuery event, see {@see Events} for details.
  */
 class PostCreateQuery extends Event
 {
diff --git a/vendor/solarium/solarium/src/Core/Event/PostCreateRequest.php b/vendor/solarium/solarium/src/Core/Event/PostCreateRequest.php
index 4804e6b57..163eea21c 100644
--- a/vendor/solarium/solarium/src/Core/Event/PostCreateRequest.php
+++ b/vendor/solarium/solarium/src/Core/Event/PostCreateRequest.php
@@ -14,7 +14,7 @@
 use Symfony\Contracts\EventDispatcher\Event;
 
 /**
- * PostCreateRequest event, see Events for details.
+ * PostCreateRequest event, see {@see Events} for details.
  */
 class PostCreateRequest extends Event
 {
diff --git a/vendor/solarium/solarium/src/Core/Event/PostCreateResult.php b/vendor/solarium/solarium/src/Core/Event/PostCreateResult.php
index a0e8cdbc4..9c770b531 100644
--- a/vendor/solarium/solarium/src/Core/Event/PostCreateResult.php
+++ b/vendor/solarium/solarium/src/Core/Event/PostCreateResult.php
@@ -15,7 +15,7 @@
 use Symfony\Contracts\EventDispatcher\Event;
 
 /**
- * PostCreateResult event, see Events for details.
+ * PostCreateResult event, see {@see Events} for details.
  */
 class PostCreateResult extends Event
 {
diff --git a/vendor/solarium/solarium/src/Core/Event/PostExecute.php b/vendor/solarium/solarium/src/Core/Event/PostExecute.php
index de07a664c..96ecee250 100644
--- a/vendor/solarium/solarium/src/Core/Event/PostExecute.php
+++ b/vendor/solarium/solarium/src/Core/Event/PostExecute.php
@@ -14,7 +14,7 @@
 use Symfony\Contracts\EventDispatcher\Event;
 
 /**
- * PostExecute event, see Events for details.
+ * PostExecute event, see {@see Events} for details.
  */
 class PostExecute extends Event
 {
diff --git a/vendor/solarium/solarium/src/Core/Event/PostExecuteRequest.php b/vendor/solarium/solarium/src/Core/Event/PostExecuteRequest.php
index e29cca9e7..cc75041de 100644
--- a/vendor/solarium/solarium/src/Core/Event/PostExecuteRequest.php
+++ b/vendor/solarium/solarium/src/Core/Event/PostExecuteRequest.php
@@ -15,7 +15,7 @@
 use Symfony\Contracts\EventDispatcher\Event;
 
 /**
- * PostExecuteRequest event, see Events for details.
+ * PostExecuteRequest event, see {@see Events} for details.
  */
 class PostExecuteRequest extends Event
 {
diff --git a/vendor/solarium/solarium/src/Core/Event/PreCreateQuery.php b/vendor/solarium/solarium/src/Core/Event/PreCreateQuery.php
index 4a065a749..2a1be8919 100644
--- a/vendor/solarium/solarium/src/Core/Event/PreCreateQuery.php
+++ b/vendor/solarium/solarium/src/Core/Event/PreCreateQuery.php
@@ -13,7 +13,7 @@
 use Symfony\Contracts\EventDispatcher\Event;
 
 /**
- * PreCreateQuery event, see Events for details.
+ * PreCreateQuery event, see {@see Events} for details.
  */
 class PreCreateQuery extends Event
 {
diff --git a/vendor/solarium/solarium/src/Core/Event/PreCreateRequest.php b/vendor/solarium/solarium/src/Core/Event/PreCreateRequest.php
index f0f907edb..cb986cc17 100644
--- a/vendor/solarium/solarium/src/Core/Event/PreCreateRequest.php
+++ b/vendor/solarium/solarium/src/Core/Event/PreCreateRequest.php
@@ -14,7 +14,7 @@
 use Symfony\Contracts\EventDispatcher\Event;
 
 /**
- * PreCreateRequest event, see Events for details.
+ * PreCreateRequest event, see {@see Events} for details.
  */
 class PreCreateRequest extends Event
 {
diff --git a/vendor/solarium/solarium/src/Core/Event/PreCreateResult.php b/vendor/solarium/solarium/src/Core/Event/PreCreateResult.php
index 9003946d7..cb015ee75 100644
--- a/vendor/solarium/solarium/src/Core/Event/PreCreateResult.php
+++ b/vendor/solarium/solarium/src/Core/Event/PreCreateResult.php
@@ -15,7 +15,7 @@
 use Symfony\Contracts\EventDispatcher\Event;
 
 /**
- * PreCreateResult event, see Events for details.
+ * PreCreateResult event, see {@see Events} for details.
  */
 class PreCreateResult extends Event
 {
diff --git a/vendor/solarium/solarium/src/Core/Event/PreExecute.php b/vendor/solarium/solarium/src/Core/Event/PreExecute.php
index c125588dc..c99604b6d 100644
--- a/vendor/solarium/solarium/src/Core/Event/PreExecute.php
+++ b/vendor/solarium/solarium/src/Core/Event/PreExecute.php
@@ -14,7 +14,7 @@
 use Symfony\Contracts\EventDispatcher\Event;
 
 /**
- * PostExecute event, see Events for details.
+ * PreExecute event, see {@see Events} for details.
  */
 class PreExecute extends Event
 {
diff --git a/vendor/solarium/solarium/src/Core/Event/PreExecuteRequest.php b/vendor/solarium/solarium/src/Core/Event/PreExecuteRequest.php
index 2889d48ab..42691430d 100644
--- a/vendor/solarium/solarium/src/Core/Event/PreExecuteRequest.php
+++ b/vendor/solarium/solarium/src/Core/Event/PreExecuteRequest.php
@@ -15,7 +15,7 @@
 use Symfony\Contracts\EventDispatcher\Event;
 
 /**
- * PreExecuteRequest event, see Events for details.
+ * PreExecuteRequest event, see {@see Events} for details.
  */
 class PreExecuteRequest extends Event
 {
diff --git a/vendor/solarium/solarium/src/Core/Plugin/AbstractPlugin.php b/vendor/solarium/solarium/src/Core/Plugin/AbstractPlugin.php
index 9effcbf34..a6cdde085 100644
--- a/vendor/solarium/solarium/src/Core/Plugin/AbstractPlugin.php
+++ b/vendor/solarium/solarium/src/Core/Plugin/AbstractPlugin.php
@@ -27,7 +27,7 @@ abstract class AbstractPlugin extends Configurable implements PluginInterface
     /**
      * Initialize.
      *
-     * This method is called when the plugin is registered to a client instance
+     * This method is called when the plugin is registered to a client instance.
      *
      * @param ClientInterface $client
      * @param array           $options
@@ -49,4 +49,14 @@ public function initPlugin(ClientInterface $client, array $options)
     protected function initPluginType()
     {
     }
+
+    /**
+     * Plugin cleanup function.
+     *
+     * This is an extension point for plugin implementations.
+     * This method is called if the plugin is removed from a client instance.
+     */
+    public function deinitPlugin()
+    {
+    }
 }
diff --git a/vendor/solarium/solarium/src/Core/Plugin/PluginInterface.php b/vendor/solarium/solarium/src/Core/Plugin/PluginInterface.php
index 45935d7eb..7fcddba1a 100644
--- a/vendor/solarium/solarium/src/Core/Plugin/PluginInterface.php
+++ b/vendor/solarium/solarium/src/Core/Plugin/PluginInterface.php
@@ -20,10 +20,17 @@ interface PluginInterface extends ConfigurableInterface
     /**
      * Initialize.
      *
-     * This method is called when the plugin is registered to a client instance
+     * This method is called when the plugin is registered to a client instance.
      *
      * @param ClientInterface $client
      * @param array           $options
      */
     public function initPlugin(ClientInterface $client, array $options);
+
+    /**
+     * Cleanup.
+     *
+     * This method is called if the plugin is removed from a client instance.
+     */
+    public function deinitPlugin();
 }
diff --git a/vendor/solarium/solarium/src/Core/Query/AbstractDocument.php b/vendor/solarium/solarium/src/Core/Query/AbstractDocument.php
index 27437ec84..654d8e708 100644
--- a/vendor/solarium/solarium/src/Core/Query/AbstractDocument.php
+++ b/vendor/solarium/solarium/src/Core/Query/AbstractDocument.php
@@ -12,7 +12,7 @@
 /**
  * Document base functionality, used by readonly and readwrite documents.
  */
-abstract class AbstractDocument implements DocumentInterface, \IteratorAggregate, \Countable, \ArrayAccess
+abstract class AbstractDocument implements DocumentInterface, \IteratorAggregate, \Countable, \ArrayAccess, \JsonSerializable
 {
     /**
      * All fields in this document.
@@ -132,4 +132,10 @@ public function offsetGet($offset)
     {
         return $this->__get($offset);
     }
+
+    #[\ReturnTypeWillChange]
+    /**
+     * {@inheritdoc}
+     */
+    abstract public function jsonSerialize();
 }
diff --git a/vendor/solarium/solarium/src/Core/Query/AbstractRequestBuilder.php b/vendor/solarium/solarium/src/Core/Query/AbstractRequestBuilder.php
index e62c616dd..52f62a492 100644
--- a/vendor/solarium/solarium/src/Core/Query/AbstractRequestBuilder.php
+++ b/vendor/solarium/solarium/src/Core/Query/AbstractRequestBuilder.php
@@ -70,6 +70,7 @@ public function build(AbstractQuery $query): Request
     public function renderLocalParams(string $value, array $localParams = []): string
     {
         $params = '';
+        $helper = $this->getHelper();
 
         if (0 === strpos($value, '{!')) {
             $params = substr($value, 2, strpos($value, '}') - 2).' ';
@@ -87,7 +88,7 @@ public function renderLocalParams(string $value, array $localParams = []): strin
                 $paramValue = $paramValue ? 'true' : 'false';
             }
 
-            $params .= $paramName.'='.$paramValue.' ';
+            $params .= $paramName.'='.$helper->escapeLocalParamValue($paramValue).' ';
         }
 
         if ('' !== $params = trim($params)) {
diff --git a/vendor/solarium/solarium/src/Core/Query/AbstractResponseParser.php b/vendor/solarium/solarium/src/Core/Query/AbstractResponseParser.php
index 00539aa79..7e97e5a53 100644
--- a/vendor/solarium/solarium/src/Core/Query/AbstractResponseParser.php
+++ b/vendor/solarium/solarium/src/Core/Query/AbstractResponseParser.php
@@ -50,23 +50,6 @@ public function convertToKeyValueArray(array $data): array
         return $result;
     }
 
-    /**
-     * Parses HTTP status code and adds boolean wasSuccessful to result data.
-     * Parses HTTP status message and adds string statusMessage to result data.
-     *
-     * @param array           $data
-     * @param ResultInterface $result
-     *
-     * @return array
-     */
-    protected function parseStatus(array $data, ResultInterface $result): array
-    {
-        $data['wasSuccessful'] = 200 === $result->getResponse()->getStatusCode();
-        $data['statusMessage'] = $result->getResponse()->getStatusMessage();
-
-        return $data;
-    }
-
     /**
      * Parses header data (if available) and adds it to result data.
      *
@@ -90,4 +73,21 @@ public function addHeaderInfo(array $data, array $result): array
 
         return $result;
     }
+
+    /**
+     * Parses HTTP status code and adds boolean wasSuccessful to result data.
+     * Parses HTTP status message and adds string statusMessage to result data.
+     *
+     * @param array           $data
+     * @param ResultInterface $result
+     *
+     * @return array
+     */
+    protected function parseStatus(array $data, ResultInterface $result): array
+    {
+        $data['wasSuccessful'] = 200 === $result->getResponse()->getStatusCode();
+        $data['statusMessage'] = $result->getResponse()->getStatusMessage();
+
+        return $data;
+    }
 }
diff --git a/vendor/solarium/solarium/src/Core/Query/Helper.php b/vendor/solarium/solarium/src/Core/Query/Helper.php
index 46da3dfc1..b795004a6 100644
--- a/vendor/solarium/solarium/src/Core/Query/Helper.php
+++ b/vendor/solarium/solarium/src/Core/Query/Helper.php
@@ -101,6 +101,30 @@ public function escapePhrase(string $input): string
         return '"'.preg_replace('/("|\\\)/', '\\\$1', $input).'"';
     }
 
+    /**
+     * Escape a local parameter value.
+     *
+     * This method wraps the value in single quotes if it contains a space,
+     * a single quote, a double quote, or a right curly bracket. It backslash
+     * escapes single quotes and backslashes within that quoted string.
+     *
+     * A value that doesn't require quoting is returned as is.
+     *
+     * @see https://solr.apache.org/guide/local-parameters-in-queries.html#basic-syntax-of-local-parameters
+     *
+     * @param string $value
+     *
+     * @return string
+     */
+    public function escapeLocalParamValue(string $value): string
+    {
+        if (preg_match('/[ \'"}]/', $value)) {
+            $value = "'".preg_replace("/('|\\\\)/", '\\\$1', $value)."'";
+        }
+
+        return $value;
+    }
+
     /**
      * Format a date to the expected formatting used in Solr.
      *
@@ -153,7 +177,7 @@ public function formatDate($input)
             // Solr seems to require the format PHP erroneously declares as ISO8601.
             /** @noinspection DateTimeConstantsUsageInspection */
             $iso8601 = $input->format(\DateTimeInterface::ISO8601);
-            $iso8601 = strstr($iso8601, '+', true); //strip timezone
+            $iso8601 = strstr($iso8601, '+', true); // strip timezone
             $iso8601 .= 'Z';
 
             return $iso8601;
@@ -329,7 +353,7 @@ public function qparser(string $name, array $params = [], bool $dereferenced = f
                     $value = $value ? 'true' : 'false';
                 }
 
-                $output .= ' '.$key.'='.$value;
+                $output .= ' '.$key.'='.$this->escapeLocalParamValue($value);
             }
         }
         $output .= '}';
@@ -465,6 +489,12 @@ public function cacheControl(bool $useCache, float $cost = null): string
      * Filters control characters that cause issues with servlet containers.
      *
      * Mainly useful to filter data before adding it to a document for the update query.
+     * Removing restricted XML chars:
+     * [#x1-#x8] | [#xB-#xC] | [#xE-#x1F] | [#x7F] | [#x80-#x84] | [#x86-#x9F].
+     * And [#xFDD0-#xFDDF] | [#xFFFE-#xFFFF] | [#xnFFFE-#xnFFFF] where n [1;10]
+     * Remove [#x0], this is not described in XML standard, but it was removed
+     * in previous version.
+     * Inspired by UTF8Utils::checkForIllegalCodepoints.
      *
      * @param string $data
      *
@@ -472,7 +502,19 @@ public function cacheControl(bool $useCache, float $cost = null): string
      */
     public function filterControlCharacters(string $data): string
     {
-        return preg_replace('@[\x00-\x08\x0B\x0C\x0E-\x1F]@', ' ', $data);
+        return preg_replace('/
+          [\\x00-\\x08\\x0B\\x0C\\x0E-\\x1F\\x7F] # U+0000 to U+0008, U+000B, U+000C, U+000E to U+001F and U+007F
+        |
+          \\xC2[\\x80-\\x84\\x86\\x9F] # U+0080 to U+0084, U+0086 to U+009F
+        |
+          \\xED(?:\\xA0[\\x80-\\xFF]|[\\xA1-\\xBE][\\x00-\\xFF]|\\xBF[\\x00-\\xBF]) # U+D800 to U+DFFFF
+        |
+          \\xEF\\xB7[\\x90-\\xAF] # U+FDD0 to U+FDEF
+        |
+          \\xEF\\xBF[\\xBE\\xBF] # U+FFFE and U+FFFF
+        |
+          [\\xF0-\\xF4][\\x8F-\\xBF]\\xBF[\\xBE\\xBF] # U+nFFFE and U+nFFFF (1 <= n <= 10_{16})
+        /x', ' ', $data);
     }
 
     /**
diff --git a/vendor/solarium/solarium/src/Core/Query/LocalParameters/LocalParameters.php b/vendor/solarium/solarium/src/Core/Query/LocalParameters/LocalParameters.php
index 9f6b6d4c7..ec6eae92b 100644
--- a/vendor/solarium/solarium/src/Core/Query/LocalParameters/LocalParameters.php
+++ b/vendor/solarium/solarium/src/Core/Query/LocalParameters/LocalParameters.php
@@ -885,7 +885,11 @@ public function offsetExists($offset): bool
 
     #[\ReturnTypeWillChange]
     /**
-     * {@inheritdoc}
+     * ArrayAccess implementation.
+     *
+     * @param mixed $offset
+     *
+     * @return mixed
      */
     public function offsetGet($offset)
     {
@@ -908,6 +912,23 @@ public function offsetUnset($offset): void
         unset($this->parameters[$offset]);
     }
 
+    /**
+     * Get all local parameters in a key => value format.
+     *
+     * @return array
+     */
+    public function getParameters(): array
+    {
+        $params = [];
+
+        /** @var LocalParameterInterface $parameter */
+        foreach ($this->parameters as $parameter) {
+            $params[$parameter->getType()] = $parameter->getValues();
+        }
+
+        return $params;
+    }
+
     /**
      * @param string $type
      * @param mixed  $value
@@ -1013,21 +1034,4 @@ private function getParameter(string $type): LocalParameterInterface
 
         return $this->parameters[$type];
     }
-
-    /**
-     * Get all local parameters in a key => value format.
-     *
-     * @return array
-     */
-    public function getParameters(): array
-    {
-        $params = [];
-
-        /** @var LocalParameterInterface $parameter */
-        foreach ($this->parameters as $parameter) {
-            $params[$parameter->getType()] = $parameter->getValues();
-        }
-
-        return $params;
-    }
 }
diff --git a/vendor/solarium/solarium/src/Core/Query/Result/Result.php b/vendor/solarium/solarium/src/Core/Query/Result/Result.php
index 9fd180a7e..0014692ab 100644
--- a/vendor/solarium/solarium/src/Core/Query/Result/Result.php
+++ b/vendor/solarium/solarium/src/Core/Query/Result/Result.php
@@ -22,7 +22,7 @@
  * This base class provides access to the response and decoded data. If you need more functionality
  * like resultset parsing use one of the subclasses
  */
-class Result implements ResultInterface
+class Result implements ResultInterface, \JsonSerializable
 {
     /**
      * Response object.
@@ -127,4 +127,13 @@ public function getData(): array
 
         return $this->data;
     }
+
+    #[\ReturnTypeWillChange]
+    /**
+     * {@inheritdoc}
+     */
+    public function jsonSerialize()
+    {
+        return $this->getData();
+    }
 }
diff --git a/vendor/solarium/solarium/src/Exception/ExceptionInterface.php b/vendor/solarium/solarium/src/Exception/ExceptionInterface.php
index 8ca50e187..089d3ccd1 100644
--- a/vendor/solarium/solarium/src/Exception/ExceptionInterface.php
+++ b/vendor/solarium/solarium/src/Exception/ExceptionInterface.php
@@ -14,6 +14,6 @@
  *
  * For background info see http://ralphschindler.com/2010/09/15/exception-best-practices-in-php-5-3
  */
-interface ExceptionInterface
+interface ExceptionInterface extends \Throwable
 {
 }
diff --git a/vendor/solarium/solarium/src/Exception/HttpException.php b/vendor/solarium/solarium/src/Exception/HttpException.php
index 28a4e7d11..bf059cd26 100644
--- a/vendor/solarium/solarium/src/Exception/HttpException.php
+++ b/vendor/solarium/solarium/src/Exception/HttpException.php
@@ -67,7 +67,7 @@ public function __construct(string $statusMessage, int $code = null, string $bod
             $message .= "\n".$body;
         }
 
-        parent::__construct($message, $code);
+        parent::__construct($message, $code ?? 0);
     }
 
     /**
diff --git a/vendor/solarium/solarium/src/Plugin/AbstractBufferedUpdate/AbstractBufferedUpdate.php b/vendor/solarium/solarium/src/Plugin/AbstractBufferedUpdate/AbstractBufferedUpdate.php
new file mode 100644
index 000000000..c6fac7520
--- /dev/null
+++ b/vendor/solarium/solarium/src/Plugin/AbstractBufferedUpdate/AbstractBufferedUpdate.php
@@ -0,0 +1,146 @@
+<?php
+
+/*
+ * This file is part of the Solarium package.
+ *
+ * For the full copyright and license information, please view the COPYING
+ * file that was distributed with this source code.
+ */
+
+namespace Solarium\Plugin\AbstractBufferedUpdate;
+
+use Solarium\Core\Client\Endpoint;
+use Solarium\Core\Plugin\AbstractPlugin;
+use Solarium\QueryType\Update\Query\Query as UpdateQuery;
+use Solarium\QueryType\Update\Result as UpdateResult;
+
+/**
+ * Buffered update plugin base class.
+ */
+abstract class AbstractBufferedUpdate extends AbstractPlugin
+{
+    /**
+     * Default options.
+     *
+     * @var array
+     */
+    protected $options = [
+        'buffersize' => 100,
+    ];
+
+    /**
+     * Update query instance.
+     *
+     * @var UpdateQuery
+     */
+    protected $updateQuery;
+
+    /**
+     * Buffer.
+     *
+     * @var array
+     */
+    protected $buffer = [];
+
+    /**
+     * Set the endpoint for the updates.
+     *
+     * @param Endpoint $endpoint The endpoint to set
+     *
+     * @return self Provides fluent interface
+     */
+    public function setEndpoint(Endpoint $endpoint): self
+    {
+        $this->setOption('endpoint', $endpoint);
+
+        return $this;
+    }
+
+    /**
+     * Return the endpoint.
+     *
+     * @return Endpoint|null
+     */
+    public function getEndpoint(): ?Endpoint
+    {
+        return $this->getOption('endpoint');
+    }
+
+    /**
+     * Set buffer size option.
+     *
+     * @param int $size
+     *
+     * @return self Provides fluent interface
+     */
+    public function setBufferSize(int $size): self
+    {
+        $this->setOption('buffersize', $size);
+
+        return $this;
+    }
+
+    /**
+     * Get buffer size option value.
+     *
+     * @return int|null
+     */
+    public function getBufferSize(): ?int
+    {
+        return $this->getOption('buffersize');
+    }
+
+    /**
+     * Get the current buffer.
+     *
+     * Any previously flushed contents will not be included!
+     *
+     * @return array
+     */
+    public function getBuffer(): array
+    {
+        return $this->buffer;
+    }
+
+    /**
+     * Clear the buffer.
+     *
+     * Any remaining contents in the buffer will not be flushed to Solr!
+     *
+     * @return self Provides fluent interface
+     */
+    public function clear(): self
+    {
+        $this->updateQuery = $this->client->createUpdate();
+        $this->buffer = [];
+
+        return $this;
+    }
+
+    /**
+     * Flush the buffer to Solr.
+     *
+     * @return UpdateResult|false
+     */
+    abstract public function flush();
+
+    /**
+     * Commit changes.
+     *
+     * Any remaining contents in the buffer will also be flushed to Solr.
+     *
+     * @return UpdateResult
+     */
+    abstract public function commit(): UpdateResult;
+
+    /**
+     * Plugin init function.
+     *
+     * This is an extension point for plugin implementations.
+     * Will be called as soon as $this->client and options have been set.
+     */
+    protected function initPluginType(): void
+    {
+        $this->updateQuery = $this->client->createUpdate();
+    }
+}
diff --git a/vendor/solarium/solarium/src/Plugin/AbstractBufferedUpdate/Event/AbstractEvents.php b/vendor/solarium/solarium/src/Plugin/AbstractBufferedUpdate/Event/AbstractEvents.php
new file mode 100644
index 000000000..2d7fb33d1
--- /dev/null
+++ b/vendor/solarium/solarium/src/Plugin/AbstractBufferedUpdate/Event/AbstractEvents.php
@@ -0,0 +1,63 @@
+<?php
+
+declare(strict_types=1);
+
+/*
+ * This file is part of the Solarium package.
+ *
+ * For the full copyright and license information, please view the COPYING
+ * file that was distributed with this source code.
+ */
+
+namespace Solarium\Plugin\AbstractBufferedUpdate\Event;
+
+/**
+ * Event definitions base class.
+ *
+ * @codeCoverageIgnore
+ */
+abstract class AbstractEvents
+{
+    /**
+     * This event is called before a buffer flush.
+     *
+     * The event listener receives the buffer (array).
+     *
+     * @var string
+     */
+    public const PRE_FLUSH = AbstractPreFlush::class;
+
+    /**
+     * This event is called after a buffer flush.
+     *
+     * The event listener receives the Result.
+     *
+     * @var string
+     */
+    public const POST_FLUSH = AbstractPostFlush::class;
+
+    /**
+     * This event is called before a buffer commit.
+     *
+     * The event listener receives the buffer (array).
+     *
+     * @var string
+     */
+    public const PRE_COMMIT = AbstractPreCommit::class;
+
+    /**
+     * This event is called after a buffer commit.
+     *
+     * The event listener receives the Result.
+     *
+     * @var string
+     */
+    public const POST_COMMIT = AbstractPostCommit::class;
+
+    /**
+     * Not instantiable.
+     */
+    final private function __construct()
+    {
+    }
+}
diff --git a/vendor/solarium/solarium/src/Plugin/AbstractBufferedUpdate/Event/AbstractPostCommit.php b/vendor/solarium/solarium/src/Plugin/AbstractBufferedUpdate/Event/AbstractPostCommit.php
new file mode 100644
index 000000000..dc0caedda
--- /dev/null
+++ b/vendor/solarium/solarium/src/Plugin/AbstractBufferedUpdate/Event/AbstractPostCommit.php
@@ -0,0 +1,46 @@
+<?php
+
+declare(strict_types=1);
+
+/*
+ * This file is part of the Solarium package.
+ *
+ * For the full copyright and license information, please view the COPYING
+ * file that was distributed with this source code.
+ */
+
+namespace Solarium\Plugin\AbstractBufferedUpdate\Event;
+
+use Solarium\QueryType\Update\Result;
+use Symfony\Contracts\EventDispatcher\Event;
+
+/**
+ * PostCommit event base class, see {@see AbstractEvents} for details.
+ */
+abstract class AbstractPostCommit extends Event
+{
+    /**
+     * @var Result
+     */
+    protected $result;
+
+    /**
+     * Event constructor.
+     *
+     * @param Result $result
+     */
+    public function __construct(Result $result)
+    {
+        $this->result = $result;
+    }
+
+    /**
+     * Get the result for this event.
+     *
+     * @return Result
+     */
+    public function getResult(): Result
+    {
+        return $this->result;
+    }
+}
diff --git a/vendor/solarium/solarium/src/Plugin/AbstractBufferedUpdate/Event/AbstractPostFlush.php b/vendor/solarium/solarium/src/Plugin/AbstractBufferedUpdate/Event/AbstractPostFlush.php
new file mode 100644
index 000000000..2e5cf7565
--- /dev/null
+++ b/vendor/solarium/solarium/src/Plugin/AbstractBufferedUpdate/Event/AbstractPostFlush.php
@@ -0,0 +1,46 @@
+<?php
+
+declare(strict_types=1);
+
+/*
+ * This file is part of the Solarium package.
+ *
+ * For the full copyright and license information, please view the COPYING
+ * file that was distributed with this source code.
+ */
+
+namespace Solarium\Plugin\AbstractBufferedUpdate\Event;
+
+use Solarium\QueryType\Update\Result;
+use Symfony\Contracts\EventDispatcher\Event;
+
+/**
+ * PostFlush event base class, see {@see AbstractEvents} for details.
+ */
+abstract class AbstractPostFlush extends Event
+{
+    /**
+     * @var Result
+     */
+    protected $result;
+
+    /**
+     * Event constructor.
+     *
+     * @param Result $result
+     */
+    public function __construct(Result $result)
+    {
+        $this->result = $result;
+    }
+
+    /**
+     * Get the result for this event.
+     *
+     * @return Result
+     */
+    public function getResult(): Result
+    {
+        return $this->result;
+    }
+}
diff --git a/vendor/solarium/solarium/src/Plugin/AbstractBufferedUpdate/Event/AbstractPreCommit.php b/vendor/solarium/solarium/src/Plugin/AbstractBufferedUpdate/Event/AbstractPreCommit.php
new file mode 100644
index 000000000..28bc5d14d
--- /dev/null
+++ b/vendor/solarium/solarium/src/Plugin/AbstractBufferedUpdate/Event/AbstractPreCommit.php
@@ -0,0 +1,146 @@
+<?php
+
+declare(strict_types=1);
+
+/*
+ * This file is part of the Solarium package.
+ *
+ * For the full copyright and license information, please view the COPYING
+ * file that was distributed with this source code.
+ */
+
+namespace Solarium\Plugin\AbstractBufferedUpdate\Event;
+
+use Symfony\Contracts\EventDispatcher\Event;
+
+/**
+ * PreCommit event base class, see {@see AbstractEvents} for details.
+ */
+abstract class AbstractPreCommit extends Event
+{
+    /**
+     * @var array
+     */
+    protected $buffer;
+
+    /**
+     * @var bool|null
+     */
+    protected $softCommit;
+
+    /**
+     * @var bool|null
+     */
+    protected $waitSearcher;
+
+    /**
+     * @var bool|null
+     */
+    protected $expungeDeletes;
+
+    /**
+     * Event constructor.
+     *
+     * @param array     $buffer
+     * @param bool|null $softCommit
+     * @param bool|null $waitSearcher
+     * @param bool|null $expungeDeletes
+     */
+    public function __construct(array $buffer, ?bool $softCommit, ?bool $waitSearcher, ?bool $expungeDeletes)
+    {
+        $this->buffer = $buffer;
+        $this->softCommit = $softCommit;
+        $this->waitSearcher = $waitSearcher;
+        $this->expungeDeletes = $expungeDeletes;
+    }
+
+    /**
+     * Get the buffer for this event.
+     *
+     * @return array
+     */
+    public function getBuffer(): array
+    {
+        return $this->buffer;
+    }
+
+    /**
+     * Set the buffer for this event, this way you can alter the buffer before it is committed to Solr.
+     *
+     * @param array $buffer
+     *
+     * @return self Provides fluent interface
+     */
+    public function setBuffer(array $buffer): self
+    {
+        $this->buffer = $buffer;
+
+        return $this;
+    }
+
+    /**
+     * Optionally override the value.
+     *
+     * @param bool|null $softCommit
+     *
+     * @return self Provides fluent interface
+     */
+    public function setSoftCommit(?bool $softCommit): self
+    {
+        $this->softCommit = $softCommit;
+
+        return $this;
+    }
+
+    /**
+     * @return bool|null
+     */
+    public function getSoftCommit(): ?bool
+    {
+        return $this->softCommit;
+    }
+
+    /**
+     * Optionally override the value.
+     *
+     * @param bool|null $waitSearcher
+     *
+     * @return self Provides fluent interface
+     */
+    public function setWaitSearcher(?bool $waitSearcher): self
+    {
+        $this->waitSearcher = $waitSearcher;
+
+        return $this;
+    }
+
+    /**
+     * @return bool|null
+     */
+    public function getWaitSearcher(): ?bool
+    {
+        return $this->waitSearcher;
+    }
+
+    /**
+     * Optionally override the value.
+     *
+     * @param bool|null $expungeDeletes
+     *
+     * @return self Provides fluent interface
+     */
+    public function setExpungeDeletes(?bool $expungeDeletes): self
+    {
+        $this->expungeDeletes = $expungeDeletes;
+
+        return $this;
+    }
+
+    /**
+     * @return bool|null
+     */
+    public function getExpungeDeletes(): ?bool
+    {
+        return $this->expungeDeletes;
+    }
+}
diff --git a/vendor/solarium/solarium/src/Plugin/AbstractBufferedUpdate/Event/AbstractPreFlush.php b/vendor/solarium/solarium/src/Plugin/AbstractBufferedUpdate/Event/AbstractPreFlush.php
new file mode 100644
index 000000000..ee1d3cac7
--- /dev/null
+++ b/vendor/solarium/solarium/src/Plugin/AbstractBufferedUpdate/Event/AbstractPreFlush.php
@@ -0,0 +1,59 @@
+<?php
+
+declare(strict_types=1);
+
+/*
+ * This file is part of the Solarium package.
+ *
+ * For the full copyright and license information, please view the COPYING
+ * file that was distributed with this source code.
+ */
+
+namespace Solarium\Plugin\AbstractBufferedUpdate\Event;
+
+use Symfony\Contracts\EventDispatcher\Event;
+
+/**
+ * PreFlush event base class, see {@see AbstractEvents} for details.
+ */
+abstract class AbstractPreFlush extends Event
+{
+    /**
+     * @var array
+     */
+    protected $buffer;
+
+    /**
+     * Event constructor.
+     *
+     * @param array $buffer
+     */
+    public function __construct(array $buffer)
+    {
+        $this->buffer = $buffer;
+    }
+
+    /**
+     * Get the buffer for this event.
+     *
+     * @return array
+     */
+    public function getBuffer(): array
+    {
+        return $this->buffer;
+    }
+
+    /**
+     * Set the buffer for this event, this way you can alter the buffer before it is flushed to Solr.
+     *
+     * @param array $buffer
+     *
+     * @return self Provides fluent interface
+     */
+    public function setBuffer(array $buffer): self
+    {
+        $this->buffer = $buffer;
+
+        return $this;
+    }
+}
diff --git a/vendor/solarium/solarium/src/Plugin/BufferedAdd/BufferedAdd.php b/vendor/solarium/solarium/src/Plugin/BufferedAdd/BufferedAdd.php
index 3d88cb0a0..42549fe91 100755
--- a/vendor/solarium/solarium/src/Plugin/BufferedAdd/BufferedAdd.php
+++ b/vendor/solarium/solarium/src/Plugin/BufferedAdd/BufferedAdd.php
@@ -9,15 +9,13 @@
 
 namespace Solarium\Plugin\BufferedAdd;
 
-use Solarium\Core\Client\Endpoint;
-use Solarium\Core\Plugin\AbstractPlugin;
 use Solarium\Core\Query\DocumentInterface;
 use Solarium\Plugin\BufferedAdd\Event\AddDocument as AddDocumentEvent;
 use Solarium\Plugin\BufferedAdd\Event\PostCommit as PostCommitEvent;
 use Solarium\Plugin\BufferedAdd\Event\PostFlush as PostFlushEvent;
 use Solarium\Plugin\BufferedAdd\Event\PreCommit as PreCommitEvent;
 use Solarium\Plugin\BufferedAdd\Event\PreFlush as PreFlushEvent;
-use Solarium\QueryType\Update\Query\Query as UpdateQuery;
+use Solarium\QueryType\Update\Query\Command\Add as AddCommand;
 use Solarium\QueryType\Update\Result as UpdateResult;
 
 /**
@@ -25,144 +23,11 @@
  *
  * If you need to add (or update) a big number of documents to Solr it's much more efficient to do so in batches.
  * This plugin makes this as easy as possible.
+ *
+ * You can use the lightweight {@see BufferedAddLite} if you don't need the plugin to dispatch events.
  */
-class BufferedAdd extends AbstractPlugin
+class BufferedAdd extends BufferedAddLite
 {
-    /**
-     * Default options.
-     *
-     * @var array
-     */
-    protected $options = [
-        'buffersize' => 100,
-    ];
-
-    /**
-     * Update query instance.
-     *
-     * @var UpdateQuery
-     */
-    protected $updateQuery;
-
-    /**
-     * Buffered documents.
-     *
-     * @var DocumentInterface[]
-     */
-    protected $buffer = [];
-
-    /**
-     * Set the endpoint for the documents.
-     *
-     * @param Endpoint $endpoint The endpoint to set
-     *
-     * @return self Provides fluent interface
-     */
-    public function setEndpoint(Endpoint $endpoint): self
-    {
-        $this->setOption('endpoint', $endpoint);
-
-        return $this;
-    }
-
-    /**
-     * Return the endpoint.
-     *
-     * @return Endpoint|null
-     */
-    public function getEndpoint(): ?Endpoint
-    {
-        return $this->getOption('endpoint');
-    }
-
-    /**
-     * Set buffer size option.
-     *
-     * @param int $size
-     *
-     * @return self Provides fluent interface
-     */
-    public function setBufferSize(int $size): self
-    {
-        $this->setOption('buffersize', $size);
-
-        return $this;
-    }
-
-    /**
-     * Get buffer size option value.
-     *
-     * @return int|null
-     */
-    public function getBufferSize(): ?int
-    {
-        return $this->getOption('buffersize');
-    }
-
-    /**
-     * Set commitWithin time option.
-     *
-     * @param int $time
-     *
-     * @return self Provides fluent interface
-     */
-    public function setCommitWithin(int $time): self
-    {
-        $this->setOption('commitwithin', $time);
-
-        return $this;
-    }
-
-    /**
-     * Get commitWithin time option value.
-     *
-     * @return int|null
-     */
-    public function getCommitWithin(): ?int
-    {
-        return $this->getOption('commitwithin');
-    }
-
-    /**
-     * Set overwrite boolean option.
-     *
-     * @param bool $value
-     *
-     * @return self Provides fluent interface
-     */
-    public function setOverwrite(bool $value): self
-    {
-        $this->setOption('overwrite', $value);
-
-        return $this;
-    }
-
-    /**
-     * Get overwrite boolean option value.
-     *
-     * @return bool|null
-     */
-    public function getOverwrite(): ?bool
-    {
-        return $this->getOption('overwrite');
-    }
-
-    /**
-     * Create a document object instance and add it to the buffer.
-     *
-     * @param array $fields
-     * @param array $boosts
-     *
-     * @return self Provides fluent interface
-     */
-    public function createDocument(array $fields, array $boosts = []): self
-    {
-        $doc = $this->updateQuery->createDocument($fields, $boosts);
-        $this->addDocument($doc);
-
-        return $this;
-    }
-
     /**
      * Add a document.
      *
@@ -170,7 +35,7 @@ public function createDocument(array $fields, array $boosts = []): self
      *
      * @return self Provides fluent interface
      */
-    public function addDocument(DocumentInterface $document): self
+    public function addDocument(DocumentInterface $document)
     {
         $this->buffer[] = $document;
 
@@ -184,54 +49,13 @@ public function addDocument(DocumentInterface $document): self
         return $this;
     }
 
-    /**
-     * Add multiple documents.
-     *
-     * @param array $documents
-     *
-     * @return self Provides fluent interface
-     */
-    public function addDocuments(array $documents): self
-    {
-        foreach ($documents as $document) {
-            $this->addDocument($document);
-        }
-
-        return $this;
-    }
-
-    /**
-     * Get all documents currently in the buffer.
-     *
-     * Any previously flushed documents will not be included!
-     *
-     * @return DocumentInterface[]
-     */
-    public function getDocuments(): array
-    {
-        return $this->buffer;
-    }
-
-    /**
-     * Clear any buffered documents.
-     *
-     * @return self Provides fluent interface
-     */
-    public function clear(): self
-    {
-        $this->updateQuery = $this->client->createUpdate();
-        $this->buffer = [];
-
-        return $this;
-    }
-
     /**
      * Flush any buffered documents to Solr.
      *
      * @param bool|null $overwrite
      * @param int|null  $commitWithin
      *
-     * @return bool|UpdateResult
+     * @return UpdateResult|false
      */
     public function flush(?bool $overwrite = null, ?int $commitWithin = null)
     {
@@ -246,7 +70,18 @@ public function flush(?bool $overwrite = null, ?int $commitWithin = null)
         $event = new PreFlushEvent($this->buffer, $overwrite, $commitWithin);
         $this->client->getEventDispatcher()->dispatch($event);
 
-        $this->updateQuery->addDocuments($event->getBuffer(), $event->getOverwrite(), $event->getCommitWithin());
+        $command = new AddCommand();
+        $command->setDocuments($event->getBuffer());
+
+        if (null !== $overwrite = $event->getOverwrite()) {
+            $command->setOverwrite($overwrite);
+        }
+
+        if (null !== $commitWithin = $event->getCommitWithin()) {
+            $command->setCommitWithin($commitWithin);
+        }
+
+        $this->updateQuery->add(null, $command);
         $result = $this->client->update($this->updateQuery, $this->getEndpoint());
         $this->clear();
 
@@ -275,7 +110,14 @@ public function commit(?bool $overwrite = null, ?bool $softCommit = null, ?bool
         $event = new PreCommitEvent($this->buffer, $overwrite, $softCommit, $waitSearcher, $expungeDeletes);
         $this->client->getEventDispatcher()->dispatch($event);
 
-        $this->updateQuery->addDocuments($event->getBuffer(), $event->getOverwrite());
+        $command = new AddCommand();
+        $command->setDocuments($event->getBuffer());
+
+        if (null !== $overwrite = $event->getOverwrite()) {
+            $command->setOverwrite($overwrite);
+        }
+
+        $this->updateQuery->add(null, $command);
         $this->updateQuery->addCommit($event->getSoftCommit(), $event->getWaitSearcher(), $event->getExpungeDeletes());
         $result = $this->client->update($this->updateQuery, $this->getEndpoint());
         $this->clear();
@@ -285,15 +127,4 @@ public function commit(?bool $overwrite = null, ?bool $softCommit = null, ?bool
 
         return $result;
     }
-
-    /**
-     * Plugin init function.
-     *
-     * This is an extension point for plugin implementations.
-     * Will be called as soon as $this->client and options have been set.
-     */
-    protected function initPluginType(): void
-    {
-        $this->updateQuery = $this->client->createUpdate();
-    }
 }
diff --git a/vendor/solarium/solarium/src/Plugin/BufferedAdd/BufferedAddLite.php b/vendor/solarium/solarium/src/Plugin/BufferedAdd/BufferedAddLite.php
new file mode 100644
index 000000000..3d02a3e96
--- /dev/null
+++ b/vendor/solarium/solarium/src/Plugin/BufferedAdd/BufferedAddLite.php
@@ -0,0 +1,210 @@
+<?php
+
+/*
+ * This file is part of the Solarium package.
+ *
+ * For the full copyright and license information, please view the COPYING
+ * file that was distributed with this source code.
+ */
+
+namespace Solarium\Plugin\BufferedAdd;
+
+use Solarium\Core\Query\DocumentInterface;
+use Solarium\Plugin\AbstractBufferedUpdate\AbstractBufferedUpdate;
+use Solarium\QueryType\Update\Query\Command\Add as AddCommand;
+use Solarium\QueryType\Update\Result as UpdateResult;
+
+/**
+ * Buffered add lite plugin.
+ *
+ * If you need to add (or update) a big number of documents to Solr it's much more efficient to do so in batches.
+ * This plugin makes this as easy as possible.
+ *
+ * Unlike {@see BufferedAdd}, this plugin doesn't dispatch any events.
+ */
+class BufferedAddLite extends AbstractBufferedUpdate
+{
+    /**
+     * Buffered documents to add.
+     *
+     * @var DocumentInterface[]
+     */
+    protected $buffer = [];
+
+    /**
+     * Set commitWithin time option.
+     *
+     * @param int $time
+     *
+     * @return self Provides fluent interface
+     */
+    public function setCommitWithin(int $time): self
+    {
+        $this->setOption('commitwithin', $time);
+
+        return $this;
+    }
+
+    /**
+     * Get commitWithin time option value.
+     *
+     * @return int|null
+     */
+    public function getCommitWithin(): ?int
+    {
+        return $this->getOption('commitwithin');
+    }
+
+    /**
+     * Set overwrite boolean option.
+     *
+     * @param bool $value
+     *
+     * @return self Provides fluent interface
+     */
+    public function setOverwrite(bool $value): self
+    {
+        $this->setOption('overwrite', $value);
+
+        return $this;
+    }
+
+    /**
+     * Get overwrite boolean option value.
+     *
+     * @return bool|null
+     */
+    public function getOverwrite(): ?bool
+    {
+        return $this->getOption('overwrite');
+    }
+
+    /**
+     * Create a document object instance and add it to the buffer.
+     *
+     * @param array $fields
+     * @param array $boosts
+     *
+     * @return self Provides fluent interface
+     */
+    public function createDocument(array $fields, array $boosts = []): self
+    {
+        $doc = $this->updateQuery->createDocument($fields, $boosts);
+        $this->addDocument($doc);
+
+        return $this;
+    }
+
+    /**
+     * Add a document.
+     *
+     * @param DocumentInterface $document
+     *
+     * @return self Provides fluent interface
+     */
+    public function addDocument(DocumentInterface $document)
+    {
+        $this->buffer[] = $document;
+
+        if (\count($this->buffer) === $this->options['buffersize']) {
+            $this->flush();
+        }
+
+        return $this;
+    }
+
+    /**
+     * Add multiple documents.
+     *
+     * @param DocumentInterface[] $documents
+     *
+     * @return self Provides fluent interface
+     */
+    public function addDocuments(array $documents): self
+    {
+        foreach ($documents as $document) {
+            $this->addDocument($document);
+        }
+
+        return $this;
+    }
+
+    /**
+     * Get all documents currently in the buffer.
+     *
+     * Any previously flushed documents will not be included!
+     *
+     * @return DocumentInterface[]
+     */
+    public function getDocuments(): array
+    {
+        return $this->buffer;
+    }
+
+    /**
+     * Flush any buffered documents to Solr.
+     *
+     * @param bool|null $overwrite
+     * @param int|null  $commitWithin
+     *
+     * @return UpdateResult|false
+     */
+    public function flush(?bool $overwrite = null, ?int $commitWithin = null)
+    {
+        if (0 === \count($this->buffer)) {
+            // nothing to do
+            return false;
+        }
+
+        $overwrite = $overwrite ?? $this->getOverwrite();
+        $commitWithin = $commitWithin ?? $this->getCommitWithin();
+
+        $command = new AddCommand();
+        $command->setDocuments($this->buffer);
+
+        if (null !== $overwrite) {
+            $command->setOverwrite($overwrite);
+        }
+
+        if (null !== $commitWithin) {
+            $command->setCommitWithin($commitWithin);
+        }
+
+        $this->updateQuery->add(null, $command);
+        $result = $this->client->update($this->updateQuery, $this->getEndpoint());
+        $this->clear();
+
+        return $result;
+    }
+
+    /**
+     * Commit changes.
+     *
+     * Any remaining documents in the buffer will also be flushed
+     *
+     * @param bool|null $overwrite
+     * @param bool|null $softCommit
+     * @param bool|null $waitSearcher
+     * @param bool|null $expungeDeletes
+     *
+     * @return UpdateResult
+     */
+    public function commit(?bool $overwrite = null, ?bool $softCommit = null, ?bool $waitSearcher = null, ?bool $expungeDeletes = null): UpdateResult
+    {
+        $overwrite = $overwrite ?? $this->getOverwrite();
+
+        $command = new AddCommand();
+        $command->setDocuments($this->buffer);
+
+        if (null !== $overwrite) {
+            $command->setOverwrite($overwrite);
+        }
+
+        $this->updateQuery->add(null, $command);
+        $this->updateQuery->addCommit($softCommit, $waitSearcher, $expungeDeletes);
+        $result = $this->client->update($this->updateQuery, $this->getEndpoint());
+        $this->clear();
+
+        return $result;
+    }
+}
diff --git a/vendor/solarium/solarium/src/Plugin/BufferedAdd/Event/AddDocument.php b/vendor/solarium/solarium/src/Plugin/BufferedAdd/Event/AddDocument.php
index 363cee657..4dcdde3c3 100644
--- a/vendor/solarium/solarium/src/Plugin/BufferedAdd/Event/AddDocument.php
+++ b/vendor/solarium/solarium/src/Plugin/BufferedAdd/Event/AddDocument.php
@@ -15,7 +15,7 @@
 use Symfony\Contracts\EventDispatcher\Event;
 
 /**
- * AddDocument event, see Events for details.
+ * AddDocument event, see {@see Events} for details.
  */
 class AddDocument extends Event
 {
@@ -35,7 +35,7 @@ public function __construct(DocumentInterface $document)
     }
 
     /**
-     * Get the result for this event.
+     * Get the document for this event.
      *
      * @return DocumentInterface
      */
diff --git a/vendor/solarium/solarium/src/Plugin/BufferedAdd/Event/Events.php b/vendor/solarium/solarium/src/Plugin/BufferedAdd/Event/Events.php
index b4d1e4989..f37fb4cff 100644
--- a/vendor/solarium/solarium/src/Plugin/BufferedAdd/Event/Events.php
+++ b/vendor/solarium/solarium/src/Plugin/BufferedAdd/Event/Events.php
@@ -11,17 +11,28 @@
 
 namespace Solarium\Plugin\BufferedAdd\Event;
 
+use Solarium\Plugin\AbstractBufferedUpdate\Event\AbstractEvents;
+
 /**
  * Event definitions.
  *
  * @codeCoverageIgnore
  */
-class Events
+class Events extends AbstractEvents
 {
+    /**
+     * This event is called when a new document is added to the buffer.
+     *
+     * The event listener receives the Document.
+     *
+     * @var string
+     */
+    public const ADD_DOCUMENT = AddDocument::class;
+
     /**
      * This event is called before a buffer flush.
      *
-     * The event listener receives the buffer (array) .
+     * The event listener receives the buffer (array).
      *
      * @var string
      */
@@ -30,7 +41,7 @@ class Events
     /**
      * This event is called after a buffer flush.
      *
-     * The event listener receives the Result
+     * The event listener receives the Result.
      *
      * @var string
      */
@@ -39,7 +50,7 @@ class Events
     /**
      * This event is called before a buffer commit.
      *
-     * The event listener receives the buffer (array) .
+     * The event listener receives the buffer (array).
      *
      * @var string
      */
@@ -48,25 +59,9 @@ class Events
     /**
      * This event is called after a buffer commit.
      *
-     * The event listener receives the Result
+     * The event listener receives the Result.
      *
      * @var string
      */
     public const POST_COMMIT = PostCommit::class;
-
-    /**
-     * This event is called when a new document is added.
-     *
-     * The event listener receives the Document
-     *
-     * @var string
-     */
-    public const ADD_DOCUMENT = AddDocument::class;
-
-    /**
-     * Not instantiable.
-     */
-    private function __construct()
-    {
-    }
 }
diff --git a/vendor/solarium/solarium/src/Plugin/BufferedAdd/Event/PostCommit.php b/vendor/solarium/solarium/src/Plugin/BufferedAdd/Event/PostCommit.php
index e3ea55baf..15366e06a 100644
--- a/vendor/solarium/solarium/src/Plugin/BufferedAdd/Event/PostCommit.php
+++ b/vendor/solarium/solarium/src/Plugin/BufferedAdd/Event/PostCommit.php
@@ -11,36 +11,11 @@
 
 namespace Solarium\Plugin\BufferedAdd\Event;
 
-use Solarium\QueryType\Update\Result;
-use Symfony\Contracts\EventDispatcher\Event;
+use Solarium\Plugin\AbstractBufferedUpdate\Event\AbstractPostCommit;
 
 /**
- * PostCommit event, see Events for details.
+ * PostCommit event, see {@see Events} for details.
  */
-class PostCommit extends Event
+class PostCommit extends AbstractPostCommit
 {
-    /**
-     * @var Result
-     */
-    protected $result;
-
-    /**
-     * Event constructor.
-     *
-     * @param Result $result
-     */
-    public function __construct(Result $result)
-    {
-        $this->result = $result;
-    }
-
-    /**
-     * Get the result for this event.
-     *
-     * @return Result
-     */
-    public function getResult(): Result
-    {
-        return $this->result;
-    }
 }
diff --git a/vendor/solarium/solarium/src/Plugin/BufferedAdd/Event/PostFlush.php b/vendor/solarium/solarium/src/Plugin/BufferedAdd/Event/PostFlush.php
index 03503e10e..9ecaea888 100644
--- a/vendor/solarium/solarium/src/Plugin/BufferedAdd/Event/PostFlush.php
+++ b/vendor/solarium/solarium/src/Plugin/BufferedAdd/Event/PostFlush.php
@@ -11,36 +11,11 @@
 
 namespace Solarium\Plugin\BufferedAdd\Event;
 
-use Solarium\QueryType\Update\Result;
-use Symfony\Contracts\EventDispatcher\Event;
+use Solarium\Plugin\AbstractBufferedUpdate\Event\AbstractPostFlush;
 
 /**
- * PostFlush event, see Events for details.
+ * PostFlush event, see {@see Events} for details.
  */
-class PostFlush extends Event
+class PostFlush extends AbstractPostFlush
 {
-    /**
-     * @var Result
-     */
-    protected $result;
-
-    /**
-     * Event constructor.
-     *
-     * @param Result $result
-     */
-    public function __construct(Result $result)
-    {
-        $this->result = $result;
-    }
-
-    /**
-     * Get the result for this event.
-     *
-     * @return \Solarium\QueryType\Update\Result
-     */
-    public function getResult(): Result
-    {
-        return $this->result;
-    }
 }
diff --git a/vendor/solarium/solarium/src/Plugin/BufferedAdd/Event/PreCommit.php b/vendor/solarium/solarium/src/Plugin/BufferedAdd/Event/PreCommit.php
index f5bee5abc..d85bbf56b 100644
--- a/vendor/solarium/solarium/src/Plugin/BufferedAdd/Event/PreCommit.php
+++ b/vendor/solarium/solarium/src/Plugin/BufferedAdd/Event/PreCommit.php
@@ -12,12 +12,12 @@
 namespace Solarium\Plugin\BufferedAdd\Event;
 
 use Solarium\Core\Query\DocumentInterface;
-use Symfony\Contracts\EventDispatcher\Event;
+use Solarium\Plugin\AbstractBufferedUpdate\Event\AbstractPreCommit;
 
 /**
- * PreCommit event, see Events for details.
+ * PreCommit event, see {@see Events} for details.
  */
-class PreCommit extends Event
+class PreCommit extends AbstractPreCommit
 {
     /**
      * @var DocumentInterface[]
@@ -29,21 +29,6 @@ class PreCommit extends Event
      */
     protected $overwrite;
 
-    /**
-     * @var bool|null
-     */
-    protected $softCommit;
-
-    /**
-     * @var bool|null
-     */
-    protected $waitSearcher;
-
-    /**
-     * @var bool|null
-     */
-    protected $expungeDeletes;
-
     /**
      * Event constructor.
      *
@@ -55,57 +40,9 @@ class PreCommit extends Event
      */
     public function __construct(array $buffer, ?bool $overwrite, ?bool $softCommit, ?bool $waitSearcher, ?bool $expungeDeletes)
     {
-        $this->buffer = $buffer;
-        $this->overwrite = $overwrite;
-        $this->softCommit = $softCommit;
-        $this->waitSearcher = $waitSearcher;
-        $this->expungeDeletes = $expungeDeletes;
-    }
-
-    /**
-     * Get the buffer for this event.
-     *
-     * @return DocumentInterface[]
-     */
-    public function getBuffer(): array
-    {
-        return $this->buffer;
-    }
+        parent::__construct($buffer, $softCommit, $waitSearcher, $expungeDeletes);
 
-    /**
-     * Set the buffer for this event, this way you can alter the buffer before it is committed to Solr.
-     *
-     * @param DocumentInterface[] $buffer
-     *
-     * @return self Provides fluent interface
-     */
-    public function setBuffer(array $buffer): self
-    {
-        $this->buffer = $buffer;
-
-        return $this;
-    }
-
-    /**
-     * Optionally override the value.
-     *
-     * @param bool|null $expungeDeletes
-     *
-     * @return self Provides fluent interface
-     */
-    public function setExpungeDeletes(?bool $expungeDeletes): self
-    {
-        $this->expungeDeletes = $expungeDeletes;
-
-        return $this;
-    }
-
-    /**
-     * @return bool|null
-     */
-    public function getExpungeDeletes(): ?bool
-    {
-        return $this->expungeDeletes;
+        $this->overwrite = $overwrite;
     }
 
     /**
@@ -129,48 +66,4 @@ public function getOverwrite(): ?bool
     {
         return $this->overwrite;
     }
-
-    /**
-     * Optionally override the value.
-     *
-     * @param bool|null $softCommit
-     *
-     * @return self Provides fluent interface
-     */
-    public function setSoftCommit(?bool $softCommit): self
-    {
-        $this->softCommit = $softCommit;
-
-        return $this;
-    }
-
-    /**
-     * @return bool|null
-     */
-    public function getSoftCommit(): ?bool
-    {
-        return $this->softCommit;
-    }
-
-    /**
-     * Optionally override the value.
-     *
-     * @param bool|null $waitSearcher
-     *
-     * @return self Provides fluent interface
-     */
-    public function setWaitSearcher(?bool $waitSearcher): self
-    {
-        $this->waitSearcher = $waitSearcher;
-
-        return $this;
-    }
-
-    /**
-     * @return bool|null
-     */
-    public function getWaitSearcher(): ?bool
-    {
-        return $this->waitSearcher;
-    }
 }
diff --git a/vendor/solarium/solarium/src/Plugin/BufferedAdd/Event/PreFlush.php b/vendor/solarium/solarium/src/Plugin/BufferedAdd/Event/PreFlush.php
index f1a4e576e..37eda27e1 100644
--- a/vendor/solarium/solarium/src/Plugin/BufferedAdd/Event/PreFlush.php
+++ b/vendor/solarium/solarium/src/Plugin/BufferedAdd/Event/PreFlush.php
@@ -12,12 +12,12 @@
 namespace Solarium\Plugin\BufferedAdd\Event;
 
 use Solarium\Core\Query\DocumentInterface;
-use Symfony\Contracts\EventDispatcher\Event;
+use Solarium\Plugin\AbstractBufferedUpdate\Event\AbstractPreFlush;
 
 /**
- * PreFlush event, see Events for details.
+ * PreFlush event, see {@see Events} for details.
  */
-class PreFlush extends Event
+class PreFlush extends AbstractPreFlush
 {
     /**
      * @var DocumentInterface[]
@@ -43,35 +43,12 @@ class PreFlush extends Event
      */
     public function __construct(array $buffer, ?bool $overwrite, ?int $commitWithin)
     {
-        $this->buffer = $buffer;
+        parent::__construct($buffer);
+
         $this->overwrite = $overwrite;
         $this->commitWithin = $commitWithin;
     }
 
-    /**
-     * Get the buffer for this event.
-     *
-     * @return DocumentInterface[]
-     */
-    public function getBuffer(): array
-    {
-        return $this->buffer;
-    }
-
-    /**
-     * Set the buffer for this event, this way you can alter the buffer before it is committed to Solr.
-     *
-     * @param DocumentInterface[] $buffer
-     *
-     * @return self Provides fluent interface
-     */
-    public function setBuffer(array $buffer): self
-    {
-        $this->buffer = $buffer;
-
-        return $this;
-    }
-
     /**
      * Optionally override the value.
      *
diff --git a/vendor/solarium/solarium/src/Plugin/BufferedDelete/AbstractDelete.php b/vendor/solarium/solarium/src/Plugin/BufferedDelete/AbstractDelete.php
new file mode 100644
index 000000000..4b999f5be
--- /dev/null
+++ b/vendor/solarium/solarium/src/Plugin/BufferedDelete/AbstractDelete.php
@@ -0,0 +1,35 @@
+<?php
+
+/*
+ * This file is part of the Solarium package.
+ *
+ * For the full copyright and license information, please view the COPYING
+ * file that was distributed with this source code.
+ */
+
+namespace Solarium\Plugin\BufferedDelete;
+
+/**
+ * Delete base class.
+ */
+abstract class AbstractDelete
+{
+    /**
+     * Delete by id.
+     */
+    public const TYPE_ID = 'id';
+
+    /**
+     * Delete by query.
+     */
+    public const TYPE_QUERY = 'query';
+
+    /**
+     * Get delete type.
+     *
+     * @return string
+     */
+    abstract public function getType(): string;
+
+    abstract public function __toString(): string;
+}
diff --git a/vendor/solarium/solarium/src/Plugin/BufferedDelete/BufferedDelete.php b/vendor/solarium/solarium/src/Plugin/BufferedDelete/BufferedDelete.php
new file mode 100644
index 000000000..09a3357e3
--- /dev/null
+++ b/vendor/solarium/solarium/src/Plugin/BufferedDelete/BufferedDelete.php
@@ -0,0 +1,127 @@
+<?php
+
+/*
+ * This file is part of the Solarium package.
+ *
+ * For the full copyright and license information, please view the COPYING
+ * file that was distributed with this source code.
+ */
+
+namespace Solarium\Plugin\BufferedDelete;
+
+use Solarium\Plugin\BufferedDelete\Delete\Id as DeleteById;
+use Solarium\Plugin\BufferedDelete\Delete\Query as DeleteQuery;
+use Solarium\Plugin\BufferedDelete\Event\AddDeleteById as AddDeleteByIdEvent;
+use Solarium\Plugin\BufferedDelete\Event\AddDeleteQuery as AddDeleteQueryEvent;
+use Solarium\Plugin\BufferedDelete\Event\PostCommit as PostCommitEvent;
+use Solarium\Plugin\BufferedDelete\Event\PostFlush as PostFlushEvent;
+use Solarium\Plugin\BufferedDelete\Event\PreCommit as PreCommitEvent;
+use Solarium\Plugin\BufferedDelete\Event\PreFlush as PreFlushEvent;
+use Solarium\QueryType\Update\Result as UpdateResult;
+
+/**
+ * Buffered delete plugin.
+ *
+ * If you need to delete a big number of documents in Solr it's much more efficient to do so in batches.
+ * This plugin makes this as easy as possible.
+ *
+ * You can use the lightweight {@see BufferedDeleteLite} if you don't need the plugin to dispatch events.
+ */
+class BufferedDelete extends BufferedDeleteLite
+{
+    /**
+     * Add a document id to delete.
+     *
+     * @param int|string $id
+     *
+     * @return self Provides fluent interface
+     */
+    public function addDeleteById($id)
+    {
+        $delete = new DeleteById($id);
+        $this->buffer[] = $delete;
+
+        $event = new AddDeleteByIdEvent($delete);
+        $this->client->getEventDispatcher()->dispatch($event);
+
+        if (\count($this->buffer) === $this->options['buffersize']) {
+            $this->flush();
+        }
+
+        return $this;
+    }
+
+    /**
+     * Add a query to delete matching documents.
+     *
+     * @param string $query
+     *
+     * @return self Provides fluent interface
+     */
+    public function addDeleteQuery(string $query)
+    {
+        $delete = new DeleteQuery($query);
+        $this->buffer[] = $delete;
+
+        $event = new AddDeleteQueryEvent($delete);
+        $this->client->getEventDispatcher()->dispatch($event);
+
+        if (\count($this->buffer) === $this->options['buffersize']) {
+            $this->flush();
+        }
+
+        return $this;
+    }
+
+    /**
+     * Flush any buffered deletes to Solr.
+     *
+     * @return UpdateResult|false
+     */
+    public function flush()
+    {
+        if (0 === \count($this->buffer)) {
+            // nothing to do
+            return false;
+        }
+
+        $event = new PreFlushEvent($this->buffer);
+        $this->client->getEventDispatcher()->dispatch($event);
+
+        $this->addBufferToQuery($event->getBuffer());
+        $result = $this->client->update($this->updateQuery, $this->getEndpoint());
+        $this->clear();
+
+        $event = new PostFlushEvent($result);
+        $this->client->getEventDispatcher()->dispatch($event);
+
+        return $result;
+    }
+
+    /**
+     * Commit changes.
+     *
+     * Any remaining deletes in the buffer will also be flushed
+     *
+     * @param bool|null $softCommit
+     * @param bool|null $waitSearcher
+     * @param bool|null $expungeDeletes
+     *
+     * @return UpdateResult
+     */
+    public function commit(?bool $softCommit = null, ?bool $waitSearcher = null, ?bool $expungeDeletes = null): UpdateResult
+    {
+        $event = new PreCommitEvent($this->buffer, $softCommit, $waitSearcher, $expungeDeletes);
+        $this->client->getEventDispatcher()->dispatch($event);
+
+        $this->addBufferToQuery($event->getBuffer());
+        $this->updateQuery->addCommit($event->getSoftCommit(), $event->getWaitSearcher(), $event->getExpungeDeletes());
+        $result = $this->client->update($this->updateQuery, $this->getEndpoint());
+        $this->clear();
+
+        $event = new PostCommitEvent($result);
+        $this->client->getEventDispatcher()->dispatch($event);
+
+        return $result;
+    }
+}
diff --git a/vendor/solarium/solarium/src/Plugin/BufferedDelete/BufferedDeleteLite.php b/vendor/solarium/solarium/src/Plugin/BufferedDelete/BufferedDeleteLite.php
new file mode 100644
index 000000000..f48ca7869
--- /dev/null
+++ b/vendor/solarium/solarium/src/Plugin/BufferedDelete/BufferedDeleteLite.php
@@ -0,0 +1,186 @@
+<?php
+
+/*
+ * This file is part of the Solarium package.
+ *
+ * For the full copyright and license information, please view the COPYING
+ * file that was distributed with this source code.
+ */
+
+namespace Solarium\Plugin\BufferedDelete;
+
+use Solarium\Exception\RuntimeException;
+use Solarium\Plugin\AbstractBufferedUpdate\AbstractBufferedUpdate;
+use Solarium\Plugin\BufferedDelete\Delete\Id as DeleteById;
+use Solarium\Plugin\BufferedDelete\Delete\Query as DeleteQuery;
+use Solarium\QueryType\Update\Query\Command\Delete as DeleteCommand;
+use Solarium\QueryType\Update\Result as UpdateResult;
+
+/**
+ * Buffered delete lite plugin.
+ *
+ * If you need to delete a big number of documents in Solr it's much more efficient to do so in batches.
+ * This plugin makes this as easy as possible.
+ *
+ * Unlike {@see BufferedDelete}, this plugin doesn't dispatch any events.
+ */
+class BufferedDeleteLite extends AbstractBufferedUpdate
+{
+    /**
+     * Buffered document ids and/or queries to delete.
+     *
+     * @var AbstractDelete[]
+     */
+    protected $buffer = [];
+
+    /**
+     * Add a document id to delete.
+     *
+     * @param int|string $id
+     *
+     * @return self Provides fluent interface
+     */
+    public function addDeleteById($id)
+    {
+        $this->buffer[] = new DeleteById($id);
+
+        if (\count($this->buffer) === $this->options['buffersize']) {
+            $this->flush();
+        }
+
+        return $this;
+    }
+
+    /**
+     * Add multiple document ids to delete.
+     *
+     * @param (int|string)[] $ids
+     *
+     * @return self Provides fluent interface
+     */
+    public function addDeleteByIds(array $ids): self
+    {
+        foreach ($ids as $id) {
+            $this->addDeleteById($id);
+        }
+
+        return $this;
+    }
+
+    /**
+     * Add a query to delete matching documents.
+     *
+     * @param string $query
+     *
+     * @return self Provides fluent interface
+     */
+    public function addDeleteQuery(string $query)
+    {
+        $this->buffer[] = new DeleteQuery($query);
+
+        if (\count($this->buffer) === $this->options['buffersize']) {
+            $this->flush();
+        }
+
+        return $this;
+    }
+
+    /**
+     * Add multiple queries to delete matching documents.
+     *
+     * @param string[] $queries
+     *
+     * @return self Provides fluent interface
+     */
+    public function addDeleteQueries(array $queries): self
+    {
+        foreach ($queries as $query) {
+            $this->addDeleteQuery($query);
+        }
+
+        return $this;
+    }
+
+    /**
+     * Get all deletes currently in the buffer.
+     *
+     * Any previously flushed deletes will not be included!
+     *
+     * @return AbstractDelete[]
+     */
+    public function getDeletes(): array
+    {
+        return $this->buffer;
+    }
+
+    /**
+     * Flush any buffered deletes to Solr.
+     *
+     * @return UpdateResult|false
+     */
+    public function flush()
+    {
+        if (0 === \count($this->buffer)) {
+            // nothing to do
+            return false;
+        }
+
+        $this->addBufferToQuery($this->buffer);
+        $result = $this->client->update($this->updateQuery, $this->getEndpoint());
+        $this->clear();
+
+        return $result;
+    }
+
+    /**
+     * Commit changes.
+     *
+     * Any remaining deletes in the buffer will also be flushed
+     *
+     * @param bool|null $softCommit
+     * @param bool|null $waitSearcher
+     * @param bool|null $expungeDeletes
+     *
+     * @return UpdateResult
+     */
+    public function commit(?bool $softCommit = null, ?bool $waitSearcher = null, ?bool $expungeDeletes = null): UpdateResult
+    {
+        $this->addBufferToQuery($this->buffer);
+        $this->updateQuery->addCommit($softCommit, $waitSearcher, $expungeDeletes);
+        $result = $this->client->update($this->updateQuery, $this->getEndpoint());
+        $this->clear();
+
+        return $result;
+    }
+
+    /**
+     * Add all deletes from the buffer as commands to the update query.
+     *
+     * @param AbstractDelete[] $buffer
+     */
+    protected function addBufferToQuery(array $buffer): void
+    {
+        $it = new \ArrayIterator($buffer);
+
+        $command = new DeleteCommand();
+
+        while ($it->valid()) {
+            $delete = $it->current();
+
+            switch ($delete->getType()) {
+                case AbstractDelete::TYPE_ID:
+                    $command->addId($delete->getId());
+                    break;
+                case AbstractDelete::TYPE_QUERY:
+                    $command->addQuery($delete->getQuery());
+                    break;
+                default:
+                    throw new RuntimeException('Unsupported delete type in buffer');
+            }
+
+            $it->next();
+        }
+
+        $this->updateQuery->add(null, $command);
+    }
+}
diff --git a/vendor/solarium/solarium/src/Plugin/BufferedDelete/Delete/Id.php b/vendor/solarium/solarium/src/Plugin/BufferedDelete/Delete/Id.php
new file mode 100644
index 000000000..497c47664
--- /dev/null
+++ b/vendor/solarium/solarium/src/Plugin/BufferedDelete/Delete/Id.php
@@ -0,0 +1,75 @@
+<?php
+
+/*
+ * This file is part of the Solarium package.
+ *
+ * For the full copyright and license information, please view the COPYING
+ * file that was distributed with this source code.
+ */
+
+namespace Solarium\Plugin\BufferedDelete\Delete;
+
+use Solarium\Plugin\BufferedDelete\AbstractDelete;
+
+/**
+ * Wrapper class for the id of a document to delete.
+ */
+class Id extends AbstractDelete
+{
+    /**
+     * Document id to delete.
+     *
+     * @var int|string
+     */
+    protected $id;
+
+    /**
+     * Constructor.
+     *
+     * @param int|string $id
+     */
+    public function __construct($id)
+    {
+        $this->id = $id;
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function getType(): string
+    {
+        return AbstractDelete::TYPE_ID;
+    }
+
+    /**
+     * Set document id to delete.
+     *
+     * @param int|string $id
+     *
+     * @return self Provides fluent interface
+     */
+    public function setId($id): self
+    {
+        $this->id = $id;
+
+        return $this;
+    }
+
+    /**
+     * Get document id to delete.
+     *
+     * @return int|string
+     */
+    public function getId()
+    {
+        return $this->id;
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function __toString(): string
+    {
+        return (string) $this->id;
+    }
+}
diff --git a/vendor/solarium/solarium/src/Plugin/BufferedDelete/Delete/Query.php b/vendor/solarium/solarium/src/Plugin/BufferedDelete/Delete/Query.php
new file mode 100644
index 000000000..0f7743fc3
--- /dev/null
+++ b/vendor/solarium/solarium/src/Plugin/BufferedDelete/Delete/Query.php
@@ -0,0 +1,75 @@
+<?php
+
+/*
+ * This file is part of the Solarium package.
+ *
+ * For the full copyright and license information, please view the COPYING
+ * file that was distributed with this source code.
+ */
+
+namespace Solarium\Plugin\BufferedDelete\Delete;
+
+use Solarium\Plugin\BufferedDelete\AbstractDelete;
+
+/**
+ * Wrapper class for a query to delete matching documents.
+ */
+class Query extends AbstractDelete
+{
+    /**
+     * Query to delete matching documents.
+     *
+     * @var string
+     */
+    protected $query;
+
+    /**
+     * Constructor.
+     *
+     * @param string $query
+     */
+    public function __construct(string $query)
+    {
+        $this->query = $query;
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function getType(): string
+    {
+        return AbstractDelete::TYPE_QUERY;
+    }
+
+    /**
+     * Set query to delete matching documents.
+     *
+     * @param string $query
+     *
+     * @return self Provides fluent interface
+     */
+    public function setQuery($query): self
+    {
+        $this->query = $query;
+
+        return $this;
+    }
+
+    /**
+     * Get query to delete matching documents.
+     *
+     * @return string
+     */
+    public function getQuery(): string
+    {
+        return $this->query;
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function __toString(): string
+    {
+        return $this->query;
+    }
+}
diff --git a/vendor/solarium/solarium/src/Plugin/BufferedDelete/Event/AddDeleteById.php b/vendor/solarium/solarium/src/Plugin/BufferedDelete/Event/AddDeleteById.php
new file mode 100644
index 000000000..d9ce4225a
--- /dev/null
+++ b/vendor/solarium/solarium/src/Plugin/BufferedDelete/Event/AddDeleteById.php
@@ -0,0 +1,60 @@
+<?php
+
+declare(strict_types=1);
+
+/*
+ * This file is part of the Solarium package.
+ *
+ * For the full copyright and license information, please view the COPYING
+ * file that was distributed with this source code.
+ */
+
+namespace Solarium\Plugin\BufferedDelete\Event;
+
+use Solarium\Plugin\BufferedDelete\Delete\Id;
+use Symfony\Contracts\EventDispatcher\Event;
+
+/**
+ * AddDeleteById event, see {@see Events} for details.
+ */
+class AddDeleteById extends Event
+{
+    /**
+     * @var Id
+     */
+    protected $id;
+
+    /**
+     * Event constructor.
+     *
+     * @param Id $id
+     */
+    public function __construct(Id $id)
+    {
+        $this->id = $id;
+    }
+
+    /**
+     * Get the id for this event.
+     *
+     * @return int|string
+     */
+    public function getId()
+    {
+        return $this->id->getId();
+    }
+
+    /**
+     * Set the id for this event, this way you can alter the id before it is sent to Solr.
+     *
+     * @param int|string $id
+     *
+     * @return self Provides fluent interface
+     */
+    public function setId($id): self
+    {
+        $this->id->setId($id);
+
+        return $this;
+    }
+}
diff --git a/vendor/solarium/solarium/src/Plugin/BufferedDelete/Event/AddDeleteQuery.php b/vendor/solarium/solarium/src/Plugin/BufferedDelete/Event/AddDeleteQuery.php
new file mode 100644
index 000000000..60ba469c2
--- /dev/null
+++ b/vendor/solarium/solarium/src/Plugin/BufferedDelete/Event/AddDeleteQuery.php
@@ -0,0 +1,60 @@
+<?php
+
+declare(strict_types=1);
+
+/*
+ * This file is part of the Solarium package.
+ *
+ * For the full copyright and license information, please view the COPYING
+ * file that was distributed with this source code.
+ */
+
+namespace Solarium\Plugin\BufferedDelete\Event;
+
+use Solarium\Plugin\BufferedDelete\Delete\Query;
+use Symfony\Contracts\EventDispatcher\Event;
+
+/**
+ * AddDeleteQuery event, see {@see Events} for details.
+ */
+class AddDeleteQuery extends Event
+{
+    /**
+     * @var Query
+     */
+    protected $query;
+
+    /**
+     * Event constructor.
+     *
+     * @param Query $query
+     */
+    public function __construct(Query $query)
+    {
+        $this->query = $query;
+    }
+
+    /**
+     * Get the query for this event.
+     *
+     * @return string
+     */
+    public function getQuery(): string
+    {
+        return $this->query->getQuery();
+    }
+
+    /**
+     * Set the query for this event, this way you can alter the query before it is sent to Solr.
+     *
+     * @param string $query
+     *
+     * @return self Provides fluent interface
+     */
+    public function setQuery(string $query): self
+    {
+        $this->query->setQuery($query);
+
+        return $this;
+    }
+}
diff --git a/vendor/solarium/solarium/src/Plugin/BufferedDelete/Event/Events.php b/vendor/solarium/solarium/src/Plugin/BufferedDelete/Event/Events.php
new file mode 100644
index 000000000..9ccc4c23b
--- /dev/null
+++ b/vendor/solarium/solarium/src/Plugin/BufferedDelete/Event/Events.php
@@ -0,0 +1,76 @@
+<?php
+
+declare(strict_types=1);
+
+/*
+ * This file is part of the Solarium package.
+ *
+ * For the full copyright and license information, please view the COPYING
+ * file that was distributed with this source code.
+ */
+
+namespace Solarium\Plugin\BufferedDelete\Event;
+
+use Solarium\Plugin\AbstractBufferedUpdate\Event\AbstractEvents;
+
+/**
+ * Event definitions.
+ *
+ * @codeCoverageIgnore
+ */
+class Events extends AbstractEvents
+{
+    /**
+     * This event is called when a new document id to delete is added to the buffer.
+     *
+     * The event listener receives the Id.
+     *
+     * @var string
+     */
+    public const ADD_DELETE_BY_ID = AddDeleteById::class;
+
+    /**
+     * This event is called when a new query to delete matching documents is added to the buffer.
+     *
+     * The event listener receives the Query.
+     *
+     * @var string
+     */
+    public const ADD_DELETE_QUERY = AddDeleteQuery::class;
+
+    /**
+     * This event is called before a buffer flush.
+     *
+     * The event listener receives the buffer (array).
+     *
+     * @var string
+     */
+    public const PRE_FLUSH = PreFlush::class;
+
+    /**
+     * This event is called after a buffer flush.
+     *
+     * The event listener receives the Result.
+     *
+     * @var string
+     */
+    public const POST_FLUSH = PostFlush::class;
+
+    /**
+     * This event is called before a buffer commit.
+     *
+     * The event listener receives the buffer (array).
+     *
+     * @var string
+     */
+    public const PRE_COMMIT = PreCommit::class;
+
+    /**
+     * This event is called after a buffer commit.
+     *
+     * The event listener receives the Result.
+     *
+     * @var string
+     */
+    public const POST_COMMIT = PostCommit::class;
+}
diff --git a/vendor/solarium/solarium/src/Plugin/BufferedDelete/Event/PostCommit.php b/vendor/solarium/solarium/src/Plugin/BufferedDelete/Event/PostCommit.php
new file mode 100644
index 000000000..fa40d06d3
--- /dev/null
+++ b/vendor/solarium/solarium/src/Plugin/BufferedDelete/Event/PostCommit.php
@@ -0,0 +1,21 @@
+<?php
+
+declare(strict_types=1);
+
+/*
+ * This file is part of the Solarium package.
+ *
+ * For the full copyright and license information, please view the COPYING
+ * file that was distributed with this source code.
+ */
+
+namespace Solarium\Plugin\BufferedDelete\Event;
+
+use Solarium\Plugin\AbstractBufferedUpdate\Event\AbstractPostCommit;
+
+/**
+ * PostCommit event, see {@see Events} for details.
+ */
+class PostCommit extends AbstractPostCommit
+{
+}
diff --git a/vendor/solarium/solarium/src/Plugin/BufferedDelete/Event/PostFlush.php b/vendor/solarium/solarium/src/Plugin/BufferedDelete/Event/PostFlush.php
new file mode 100644
index 000000000..b365e90f2
--- /dev/null
+++ b/vendor/solarium/solarium/src/Plugin/BufferedDelete/Event/PostFlush.php
@@ -0,0 +1,21 @@
+<?php
+
+declare(strict_types=1);
+
+/*
+ * This file is part of the Solarium package.
+ *
+ * For the full copyright and license information, please view the COPYING
+ * file that was distributed with this source code.
+ */
+
+namespace Solarium\Plugin\BufferedDelete\Event;
+
+use Solarium\Plugin\AbstractBufferedUpdate\Event\AbstractPostFlush;
+
+/**
+ * PostFlush event, see {@see Events} for details.
+ */
+class PostFlush extends AbstractPostFlush
+{
+}
diff --git a/vendor/solarium/solarium/src/Plugin/BufferedDelete/Event/PreCommit.php b/vendor/solarium/solarium/src/Plugin/BufferedDelete/Event/PreCommit.php
new file mode 100644
index 000000000..90bf20c12
--- /dev/null
+++ b/vendor/solarium/solarium/src/Plugin/BufferedDelete/Event/PreCommit.php
@@ -0,0 +1,26 @@
+<?php
+
+declare(strict_types=1);
+
+/*
+ * This file is part of the Solarium package.
+ *
+ * For the full copyright and license information, please view the COPYING
+ * file that was distributed with this source code.
+ */
+
+namespace Solarium\Plugin\BufferedDelete\Event;
+
+use Solarium\Plugin\AbstractBufferedUpdate\Event\AbstractPreCommit;
+use Solarium\Plugin\BufferedDelete\AbstractDelete;
+
+/**
+ * PreCommit event, see {@see Events} for details.
+ */
+class PreCommit extends AbstractPreCommit
+{
+    /**
+     * @var AbstractDelete[]
+     */
+    protected $buffer;
+}
diff --git a/vendor/solarium/solarium/src/Plugin/BufferedDelete/Event/PreFlush.php b/vendor/solarium/solarium/src/Plugin/BufferedDelete/Event/PreFlush.php
new file mode 100644
index 000000000..05626de98
--- /dev/null
+++ b/vendor/solarium/solarium/src/Plugin/BufferedDelete/Event/PreFlush.php
@@ -0,0 +1,26 @@
+<?php
+
+declare(strict_types=1);
+
+/*
+ * This file is part of the Solarium package.
+ *
+ * For the full copyright and license information, please view the COPYING
+ * file that was distributed with this source code.
+ */
+
+namespace Solarium\Plugin\BufferedDelete\Event;
+
+use Solarium\Plugin\AbstractBufferedUpdate\Event\AbstractPreFlush;
+use Solarium\Plugin\BufferedDelete\AbstractDelete;
+
+/**
+ * PreFlush event, see {@see Events} for details.
+ */
+class PreFlush extends AbstractPreFlush
+{
+    /**
+     * @var AbstractDelete[]
+     */
+    protected $buffer;
+}
diff --git a/vendor/solarium/solarium/src/Plugin/CustomizeRequest/CustomizeRequest.php b/vendor/solarium/solarium/src/Plugin/CustomizeRequest/CustomizeRequest.php
index 53fe56b10..5b8f6e9fe 100644
--- a/vendor/solarium/solarium/src/Plugin/CustomizeRequest/CustomizeRequest.php
+++ b/vendor/solarium/solarium/src/Plugin/CustomizeRequest/CustomizeRequest.php
@@ -81,13 +81,13 @@ public function addCustomization($customization): self
         $key = $customization->getKey();
 
         // check for non-empty key
-        if (0 === \strlen($key)) {
+        if (null === $key || 0 === \strlen($key)) {
             throw new InvalidArgumentException('A Customization must have a key value');
         }
 
         // check for a unique key
         if (\array_key_exists($key, $this->customizations)) {
-            //double add calls for the same customization are ignored, others cause an exception
+            // double add calls for the same customization are ignored, others cause an exception
             if ($this->customizations[$key] !== $customization) {
                 throw new InvalidArgumentException('A Customization must have a unique key value');
             }
@@ -252,7 +252,7 @@ protected function init()
     /**
      * Plugin init function.
      *
-     * Register event listeners
+     * Register event listeners.
      */
     protected function initPluginType()
     {
@@ -261,4 +261,17 @@ protected function initPluginType()
             $dispatcher->addListener(Events::POST_CREATE_REQUEST, [$this, 'postCreateRequest']);
         }
     }
+
+    /**
+     * Plugin cleanup function.
+     *
+     * Unregister event listeners.
+     */
+    public function deinitPlugin()
+    {
+        $dispatcher = $this->client->getEventDispatcher();
+        if (is_subclass_of($dispatcher, '\Symfony\Component\EventDispatcher\EventDispatcherInterface')) {
+            $dispatcher->removeListener(Events::POST_CREATE_REQUEST, [$this, 'postCreateRequest']);
+        }
+    }
 }
diff --git a/vendor/solarium/solarium/src/Plugin/Loadbalancer/Event/EndpointFailure.php b/vendor/solarium/solarium/src/Plugin/Loadbalancer/Event/EndpointFailure.php
index 5002ddef7..8d21a15c7 100644
--- a/vendor/solarium/solarium/src/Plugin/Loadbalancer/Event/EndpointFailure.php
+++ b/vendor/solarium/solarium/src/Plugin/Loadbalancer/Event/EndpointFailure.php
@@ -14,7 +14,7 @@
 use Symfony\Contracts\EventDispatcher\Event;
 
 /**
- * EndpointFailure event, see Events for details.
+ * EndpointFailure event, see {@see Events} for details.
  */
 class EndpointFailure extends Event
 {
diff --git a/vendor/solarium/solarium/src/Plugin/Loadbalancer/Loadbalancer.php b/vendor/solarium/solarium/src/Plugin/Loadbalancer/Loadbalancer.php
index 62f9338ae..dc5f70694 100755
--- a/vendor/solarium/solarium/src/Plugin/Loadbalancer/Loadbalancer.php
+++ b/vendor/solarium/solarium/src/Plugin/Loadbalancer/Loadbalancer.php
@@ -550,7 +550,7 @@ protected function init()
     /**
      * Plugin init function.
      *
-     * Register event listeners
+     * Register event listeners.
      */
     protected function initPluginType()
     {
@@ -561,4 +561,18 @@ protected function initPluginType()
             $dispatcher->addListener(Events::PRE_CREATE_REQUEST, [$this, 'preCreateRequest']);
         }
     }
+
+    /**
+     * Plugin cleanup function.
+     *
+     * Unregister event listeners.
+     */
+    public function deinitPlugin()
+    {
+        $dispatcher = $this->client->getEventDispatcher();
+        if (is_subclass_of($dispatcher, '\Symfony\Component\EventDispatcher\EventDispatcherInterface')) {
+            $dispatcher->removeListener(Events::PRE_EXECUTE_REQUEST, [$this, 'preExecuteRequest']);
+            $dispatcher->removeListener(Events::PRE_CREATE_REQUEST, [$this, 'preCreateRequest']);
+        }
+    }
 }
diff --git a/vendor/solarium/solarium/src/Plugin/MinimumScoreFilter/Document.php b/vendor/solarium/solarium/src/Plugin/MinimumScoreFilter/Document.php
index 98deefcad..f615a4022 100644
--- a/vendor/solarium/solarium/src/Plugin/MinimumScoreFilter/Document.php
+++ b/vendor/solarium/solarium/src/Plugin/MinimumScoreFilter/Document.php
@@ -18,7 +18,7 @@
  *
  * Decorates the original document with a filter indicator
  */
-class Document implements DocumentInterface, \IteratorAggregate, \Countable, \ArrayAccess
+class Document implements DocumentInterface, \IteratorAggregate, \Countable, \ArrayAccess, \JsonSerializable
 {
     /**
      * Original document.
@@ -60,7 +60,7 @@ public function __call(string $name, array $arguments)
     }
 
     /**
-     * Forward all other calls to the original document.
+     * Forward get call to the original document.
      *
      * @param string $name
      *
@@ -184,4 +184,13 @@ public function getFields(): array
     {
         return $this->document->getFields();
     }
+
+    #[\ReturnTypeWillChange]
+    /**
+     * {@inheritdoc}
+     */
+    public function jsonSerialize()
+    {
+        return $this->document;
+    }
 }
diff --git a/vendor/solarium/solarium/src/Plugin/MinimumScoreFilter/MinimumScoreFilter.php b/vendor/solarium/solarium/src/Plugin/MinimumScoreFilter/MinimumScoreFilter.php
index 04d7b67d9..b7585e6ae 100644
--- a/vendor/solarium/solarium/src/Plugin/MinimumScoreFilter/MinimumScoreFilter.php
+++ b/vendor/solarium/solarium/src/Plugin/MinimumScoreFilter/MinimumScoreFilter.php
@@ -26,7 +26,7 @@ class MinimumScoreFilter extends AbstractPlugin
     /**
      * Plugin init function.
      *
-     * Register event listeners
+     * Register query type.
      */
     protected function initPluginType()
     {
diff --git a/vendor/solarium/solarium/src/Plugin/ParallelExecution/Event/ExecuteEnd.php b/vendor/solarium/solarium/src/Plugin/ParallelExecution/Event/ExecuteEnd.php
index 79a0aaba6..5b5029401 100644
--- a/vendor/solarium/solarium/src/Plugin/ParallelExecution/Event/ExecuteEnd.php
+++ b/vendor/solarium/solarium/src/Plugin/ParallelExecution/Event/ExecuteEnd.php
@@ -12,9 +12,7 @@
 use Symfony\Contracts\EventDispatcher\Event;
 
 /**
- * ExecuteEnd event, see Events for details.
- *
- * @codeCoverageIgnore
+ * ExecuteEnd event, see {@see Events} for details.
  */
 class ExecuteEnd extends Event
 {
diff --git a/vendor/solarium/solarium/src/Plugin/ParallelExecution/Event/ExecuteStart.php b/vendor/solarium/solarium/src/Plugin/ParallelExecution/Event/ExecuteStart.php
index b1d31e3ca..384c2d5c2 100644
--- a/vendor/solarium/solarium/src/Plugin/ParallelExecution/Event/ExecuteStart.php
+++ b/vendor/solarium/solarium/src/Plugin/ParallelExecution/Event/ExecuteStart.php
@@ -12,9 +12,7 @@
 use Symfony\Contracts\EventDispatcher\Event;
 
 /**
- * ExecuteStart event, see Events for details.
- *
- * @codeCoverageIgnore
+ * ExecuteStart event, see {@see Events} for details.
  */
 class ExecuteStart extends Event
 {
diff --git a/vendor/solarium/solarium/src/Plugin/ParallelExecution/ParallelExecution.php b/vendor/solarium/solarium/src/Plugin/ParallelExecution/ParallelExecution.php
index b491242b5..b44ec3be7 100755
--- a/vendor/solarium/solarium/src/Plugin/ParallelExecution/ParallelExecution.php
+++ b/vendor/solarium/solarium/src/Plugin/ParallelExecution/ParallelExecution.php
@@ -9,10 +9,16 @@
 
 namespace Solarium\Plugin\ParallelExecution;
 
-use Solarium\Component\QueryInterface;
+use Solarium\Core\Client\Adapter\ConnectionTimeoutAwareInterface;
 use Solarium\Core\Client\Adapter\Curl;
+use Solarium\Core\Client\Adapter\TimeoutAwareInterface;
 use Solarium\Core\Client\Endpoint;
+use Solarium\Core\Event\PostExecute as PostExecuteEvent;
+use Solarium\Core\Event\PostExecuteRequest as PostExecuteRequestEvent;
+use Solarium\Core\Event\PreExecute as PreExecuteEvent;
+use Solarium\Core\Event\PreExecuteRequest as PreExecuteRequestEvent;
 use Solarium\Core\Plugin\AbstractPlugin;
+use Solarium\Core\Query\QueryInterface;
 use Solarium\Exception\HttpException;
 use Solarium\Exception\RuntimeException;
 use Solarium\Plugin\ParallelExecution\Event\ExecuteEnd as ExecuteEndEvent;
@@ -26,8 +32,6 @@
  *
  * While query execution is parallel, the results only become available as soon as all requests have finished. So the
  * time of the slowest query will be the effective execution time for all queries.
- *
- * @codeCoverageIgnoreStart
  */
 class ParallelExecution extends AbstractPlugin
 {
@@ -96,8 +100,6 @@ public function clearQueries(): self
         return $this;
     }
 
-    // @codeCoverageIgnoreStart
-
     /**
      * Execute queries parallelly.
      *
@@ -112,12 +114,34 @@ public function execute(): array
         if (!($adapter instanceof Curl)) {
             throw new RuntimeException('Parallel execution requires the CurlAdapter');
         }
+
         $multiHandle = curl_multi_init();
+
+        $requests = [];
+        $endpoints = [];
         $handles = [];
+        $overrideResponses = [];
+        $overrideResults = [];
+
         foreach ($this->queries as $key => $data) {
-            $request = $this->client->createRequest($data['query']);
-            $endpoint = $this->client->getEndpoint($data['endpoint']);
-            $handle = $adapter->createHandle($request, $endpoint);
+            $event = new PreExecuteEvent($data['query']);
+            $this->client->getEventDispatcher()->dispatch($event);
+            if (null !== $result = $event->getResult()) {
+                $overrideResults[$key] = $result;
+                continue;
+            }
+
+            $requests[$key] = $this->client->createRequest($data['query']);
+            $endpoints[$key] = $this->client->getEndpoint($data['endpoint']);
+
+            $event = new PreExecuteRequestEvent($requests[$key], $endpoints[$key]);
+            $this->client->getEventDispatcher()->dispatch($event);
+            if (null !== $response = $event->getResponse()) {
+                $overrideResponses[$key] = $response;
+                continue;
+            }
+
+            $handle = $adapter->createHandle($requests[$key], $endpoints[$key]);
             curl_multi_add_handle($multiHandle, $handle);
             $handles[$key] = $handle;
         }
@@ -133,7 +157,9 @@ public function execute(): array
         $timeout = $this->getOption('curlmultiselecttimeout');
         while ($active && CURLM_OK === $mrc) {
             if (-1 === curl_multi_select($multiHandle, $timeout)) {
+                // @codeCoverageIgnoreStart
                 usleep(100);
+                // @codeCoverageIgnoreEnd
             }
 
             do {
@@ -146,13 +172,27 @@ public function execute(): array
 
         // get the results
         $results = [];
-        foreach ($handles as $key => $handle) {
-            try {
-                curl_multi_remove_handle($multiHandle, $handle);
-                $response = $adapter->getResponse($handle, curl_multi_getcontent($handle));
-                $results[$key] = $this->client->createResult($this->queries[$key]['query'], $response);
-            } catch (HttpException $e) {
-                $results[$key] = $e;
+
+        foreach ($this->queries as $key => $data) {
+            if (isset($overrideResults[$key])) {
+                $results[$key] = $overrideResults[$key];
+            } elseif (isset($overrideResponses[$key])) {
+                $results[$key] = $this->client->createResult($data['query'], $overrideResponses[$key]);
+            } else {
+                try {
+                    curl_multi_remove_handle($multiHandle, $handles[$key]);
+                    $response = $adapter->getResponse($handles[$key], curl_multi_getcontent($handles[$key]));
+
+                    $event = new PostExecuteRequestEvent($requests[$key], $endpoints[$key], $response);
+                    $this->client->getEventDispatcher()->dispatch($event);
+
+                    $results[$key] = $this->client->createResult($data['query'], $response);
+
+                    $event = new PostExecuteEvent($data['query'], $results[$key]);
+                    $this->client->getEventDispatcher()->dispatch($event);
+                } catch (HttpException $e) {
+                    $results[$key] = $e;
+                }
             }
         }
 
@@ -161,15 +201,26 @@ public function execute(): array
         return $results;
     }
 
-    /*
-     * @codeCoverageIgnoreEnd
-     */
-
     /**
-     * Set cURL adapter (the only type that supports ParallelExecution).
+     * Set cURL adapter (the only type that supports ParallelExecution)
+     * if $this->client uses another adapter.
      */
     protected function initPluginType()
     {
-        $this->client->setAdapter(new Curl());
+        $adapter = $this->client->getAdapter();
+
+        if (!($adapter instanceof Curl)) {
+            $curlAdapter = new Curl();
+
+            if ($adapter instanceof TimeoutAwareInterface) {
+                $curlAdapter->setTimeout($adapter->getTimeout());
+            }
+
+            if ($adapter instanceof ConnectionTimeoutAwareInterface) {
+                $curlAdapter->setConnectionTimeout($adapter->getConnectionTimeout());
+            }
+
+            $this->client->setAdapter($curlAdapter);
+        }
     }
 }
diff --git a/vendor/solarium/solarium/src/Plugin/PostBigExtractRequest.php b/vendor/solarium/solarium/src/Plugin/PostBigExtractRequest.php
index 5fe13d4cd..f03485d20 100644
--- a/vendor/solarium/solarium/src/Plugin/PostBigExtractRequest.php
+++ b/vendor/solarium/solarium/src/Plugin/PostBigExtractRequest.php
@@ -10,6 +10,7 @@
 namespace Solarium\Plugin;
 
 use Solarium\Core\Client\Adapter\AdapterHelper;
+use Solarium\Core\Client\Request;
 use Solarium\Core\Event\Events;
 use Solarium\Core\Event\PostCreateRequest as PostCreateRequestEvent;
 use Solarium\Core\Plugin\AbstractPlugin;
@@ -79,35 +80,35 @@ public function postCreateRequest(PostCreateRequestEvent $event): self
 
                 foreach ($request->getParams() as $key => $value) {
                     if (is_iterable($value)) {
-                        foreach ($value as $array_key => $array_val) {
-                            if (\is_string($array_val)) {
-                                $additional_body_header = "\r\nContent-Type: text/plain;charset={$charset}";
+                        foreach ($value as $arrayVal) {
+                            if (\is_string($arrayVal)) {
+                                $additionalBodyHeader = sprintf("\r\nContent-Type: %s;charset=%s", Request::CONTENT_TYPE_TEXT_PLAIN, $charset);
                             } else {
-                                $additional_body_header = '';
+                                $additionalBodyHeader = '';
                             }
                             $body .= "--{$request->getHash()}\r\n";
                             $body .= "Content-Disposition: form-data; name=\"{$key}\"";
-                            $body .= $additional_body_header;
+                            $body .= $additionalBodyHeader;
                             $body .= "\r\n\r\n";
-                            $body .= $array_val;
+                            $body .= $arrayVal;
                             $body .= "\r\n";
                         }
                     } else {
                         if (\is_string($value)) {
-                            $additional_body_header = "\r\nContent-Type: text/plain;charset={$charset}";
+                            $additionalBodyHeader = sprintf("\r\nContent-Type: %s;charset=%s", Request::CONTENT_TYPE_TEXT_PLAIN, $charset);
                         } else {
-                            $additional_body_header = '';
+                            $additionalBodyHeader = '';
                         }
                         $body .= "--{$request->getHash()}\r\n";
                         $body .= "Content-Disposition: form-data; name=\"{$key}\"";
-                        $body .= $additional_body_header;
+                        $body .= $additionalBodyHeader;
                         $body .= "\r\n\r\n";
                         $body .= $value;
                         $body .= "\r\n";
                     }
                 }
 
-                $body .= AdapterHelper::buildUploadBodyFromRequest($request); //must be the last automatically include closing boundary
+                $body .= AdapterHelper::buildUploadBodyFromRequest($request); // must be the last automatically include closing boundary
 
                 $request->setRawData($body);
                 $request->setOption('file', null); // this prevent solarium from call AdapterHelper::buildUploadBodyFromRequest for setting body request
@@ -121,11 +122,22 @@ public function postCreateRequest(PostCreateRequestEvent $event): self
     /**
      * Plugin init function.
      *
-     * Register event listeners
+     * Register event listeners.
      */
     protected function initPluginType()
     {
         $dispatcher = $this->client->getEventDispatcher();
         $dispatcher->addListener(Events::POST_CREATE_REQUEST, [$this, 'postCreateRequest']);
     }
+
+    /**
+     * Plugin cleanup function.
+     *
+     * Unregister event listeners.
+     */
+    public function deinitPlugin()
+    {
+        $dispatcher = $this->client->getEventDispatcher();
+        $dispatcher->removeListener(Events::POST_CREATE_REQUEST, [$this, 'postCreateRequest']);
+    }
 }
diff --git a/vendor/solarium/solarium/src/Plugin/PostBigRequest.php b/vendor/solarium/solarium/src/Plugin/PostBigRequest.php
index 3716aec24..f79cb7142 100644
--- a/vendor/solarium/solarium/src/Plugin/PostBigRequest.php
+++ b/vendor/solarium/solarium/src/Plugin/PostBigRequest.php
@@ -69,18 +69,20 @@ public function getMaxQueryStringLength(): ?int
     public function preExecuteRequest($event): self
     {
         // We need to accept event proxies or decorators.
-        /* @var PreExecuteRequest $event */
+        /** @var PreExecuteRequest $event */
         $request = $event->getRequest();
         $queryString = $request->getQueryString();
 
-        if (Request::METHOD_GET === $request->getMethod() &&
-            \strlen($queryString) > $this->getMaxQueryStringLength()) {
+        if (
+            Request::METHOD_GET === $request->getMethod()
+            && \strlen($queryString) > $this->getMaxQueryStringLength()
+        ) {
             $charset = $request->getParam('ie') ?? 'utf-8';
 
             $request->setMethod(Request::METHOD_POST);
+            $request->setContentType(Request::CONTENT_TYPE_APPLICATION_X_WWW_FORM_URLENCODED, ['charset' => $charset]);
             $request->setRawData($queryString);
             $request->clearParams();
-            $request->addHeader('Content-Type: application/x-www-form-urlencoded; charset='.$charset);
         }
 
         return $this;
@@ -89,7 +91,7 @@ public function preExecuteRequest($event): self
     /**
      * Plugin init function.
      *
-     * Register event listeners
+     * Register event listeners.
      */
     protected function initPluginType()
     {
@@ -99,4 +101,17 @@ protected function initPluginType()
             $dispatcher->addListener(Events::PRE_EXECUTE_REQUEST, [$this, 'preExecuteRequest'], 10);
         }
     }
+
+    /**
+     * Plugin cleanup function.
+     *
+     * Unregister event listeners.
+     */
+    public function deinitPlugin()
+    {
+        $dispatcher = $this->client->getEventDispatcher();
+        if (is_subclass_of($dispatcher, '\Symfony\Component\EventDispatcher\EventDispatcherInterface')) {
+            $dispatcher->removeListener(Events::PRE_EXECUTE_REQUEST, [$this, 'preExecuteRequest']);
+        }
+    }
 }
diff --git a/vendor/solarium/solarium/src/Plugin/PrefetchIterator.php b/vendor/solarium/solarium/src/Plugin/PrefetchIterator.php
index 82c576ac8..77ce77d6f 100644
--- a/vendor/solarium/solarium/src/Plugin/PrefetchIterator.php
+++ b/vendor/solarium/solarium/src/Plugin/PrefetchIterator.php
@@ -240,14 +240,14 @@ public function valid(): bool
      */
     protected function fetchNext(): self
     {
-        if (null === $this->cursormark && null !== $this->query->getCursormark()) {
+        if (null === $this->cursormark && null !== $this->query->getCursorMark()) {
             $this->cursormark = '*';
         }
 
         if (null === $this->cursormark) {
             $this->query->setStart($this->start)->setRows($this->getPrefetch());
         } else {
-            $this->query->setCursormark($this->cursormark)->setRows($this->getPrefetch());
+            $this->query->setCursorMark($this->cursormark)->setRows($this->getPrefetch());
         }
 
         $this->result = $this->client->execute($this->query, $this->getOption('endpoint'));
diff --git a/vendor/solarium/solarium/src/QueryType/Analysis/RequestBuilder/Document.php b/vendor/solarium/solarium/src/QueryType/Analysis/RequestBuilder/Document.php
index c12ed9a87..5a5770a4b 100644
--- a/vendor/solarium/solarium/src/QueryType/Analysis/RequestBuilder/Document.php
+++ b/vendor/solarium/solarium/src/QueryType/Analysis/RequestBuilder/Document.php
@@ -32,6 +32,7 @@ public function build(AbstractQuery $query): Request
         $request = parent::build($query);
         $request->setRawData($this->getRawData($query));
         $request->setMethod(Request::METHOD_POST);
+        $request->setContentType(Request::CONTENT_TYPE_APPLICATION_XML);
 
         return $request;
     }
@@ -78,6 +79,8 @@ public function getRawData(QueryDocument $query): string
      */
     protected function buildFieldXml(string $name, string $value): string
     {
-        return '<field name="'.$name.'">'.$this->getHelper()->escapeXMLCharacterData($value).'</field>';
+        $helper = $this->getHelper();
+
+        return '<field name="'.$name.'">'.$helper->escapeXMLCharacterData($helper->filterControlCharacters($value)).'</field>';
     }
 }
diff --git a/vendor/solarium/solarium/src/QueryType/Analysis/ResponseParser/Field.php b/vendor/solarium/solarium/src/QueryType/Analysis/ResponseParser/Field.php
index 02470badd..b3d5fe94a 100644
--- a/vendor/solarium/solarium/src/QueryType/Analysis/ResponseParser/Field.php
+++ b/vendor/solarium/solarium/src/QueryType/Analysis/ResponseParser/Field.php
@@ -10,7 +10,7 @@
 namespace Solarium\QueryType\Analysis\ResponseParser;
 
 use Solarium\Core\Query\AbstractResponseParser as ResponseParserAbstract;
-use Solarium\Core\Query\ResponseParserInterface as ResponseParserInterface;
+use Solarium\Core\Query\ResponseParserInterface;
 use Solarium\Core\Query\Result\ResultInterface;
 use Solarium\QueryType\Analysis\Result as AnalysisResult;
 use Solarium\QueryType\Analysis\Result\Item;
diff --git a/vendor/solarium/solarium/src/QueryType/Extract/RequestBuilder.php b/vendor/solarium/solarium/src/QueryType/Extract/RequestBuilder.php
index 0af33f8fe..1fba0d978 100644
--- a/vendor/solarium/solarium/src/QueryType/Extract/RequestBuilder.php
+++ b/vendor/solarium/solarium/src/QueryType/Extract/RequestBuilder.php
@@ -32,7 +32,6 @@ class RequestBuilder extends BaseRequestBuilder
     public function build(AbstractQuery $query): Request
     {
         $request = parent::build($query);
-        $request->setMethod(Request::METHOD_POST);
 
         // add common options to request
         $request->addParam('commit', $query->getCommit());
@@ -50,7 +49,7 @@ public function build(AbstractQuery $query): Request
 
         // add document settings to request
         /** @var \Solarium\QueryType\Update\Query\Document $doc */
-        if (null !== ($doc = $query->getDocument())) {
+        if (null !== $doc = $query->getDocument()) {
             if (null !== $doc->getBoost()) {
                 throw new RuntimeException('Extract does not support document-level boosts, use field boosts instead.');
             }
@@ -78,9 +77,14 @@ public function build(AbstractQuery $query): Request
             $request->addParam('stream.url', $file);
             $request->setMethod(Request::METHOD_GET);
         } elseif (is_readable($file)) {
+            $resourceName = basename($query->getFile());
+            if (0 !== strcasecmp('UTF-8', $charset = $request->getParam('ie') ?? 'UTF-8')) {
+                $resourceName = iconv('UTF-8', $charset, $resourceName);
+            }
             $request->setFileUpload($file);
-            $request->addParam('resource.name', basename($query->getFile()));
-            $request->addHeader('Content-Type: multipart/form-data; boundary='.$request->getHash());
+            $request->addParam('resource.name', $resourceName);
+            $request->setMethod(Request::METHOD_POST);
+            $request->setContentType(Request::CONTENT_TYPE_MULTIPART_FORM_DATA, ['boundary' => $request->getHash()]);
         } else {
             throw new RuntimeException(sprintf('Extract query file path/url invalid or not available: %s', $file));
         }
diff --git a/vendor/solarium/solarium/src/QueryType/ManagedResources/Query/AbstractQuery.php b/vendor/solarium/solarium/src/QueryType/ManagedResources/Query/AbstractQuery.php
index 413fa897c..061612ab3 100644
--- a/vendor/solarium/solarium/src/QueryType/ManagedResources/Query/AbstractQuery.php
+++ b/vendor/solarium/solarium/src/QueryType/ManagedResources/Query/AbstractQuery.php
@@ -17,6 +17,9 @@
 use Solarium\QueryType\ManagedResources\RequestBuilder\Resource as RequestBuilder;
 use Solarium\QueryType\ManagedResources\Result\Command as CommandResult;
 
+/**
+ * Query base class.
+ */
 abstract class AbstractQuery extends BaseQuery implements Status4xxNoExceptionInterface
 {
     /**
diff --git a/vendor/solarium/solarium/src/QueryType/ManagedResources/Query/Command/Exists.php b/vendor/solarium/solarium/src/QueryType/ManagedResources/Query/Command/Exists.php
index 39410636c..6b1ba08ea 100644
--- a/vendor/solarium/solarium/src/QueryType/ManagedResources/Query/Command/Exists.php
+++ b/vendor/solarium/solarium/src/QueryType/ManagedResources/Query/Command/Exists.php
@@ -18,6 +18,15 @@
  */
 class Exists extends AbstractCommand
 {
+    /**
+     * Default options.
+     *
+     * @var array
+     */
+    protected $options = [
+        'useHeadRequest' => false,
+    ];
+
     /**
      * Name of the child resource to be checked if exists.
      *
@@ -42,14 +51,12 @@ public function getType(): string
      */
     public function getRequestMethod(): string
     {
-        $method = Request::METHOD_HEAD;
-
-        // there's a bug since Solr 8.7 with HEAD requests if a term is set (SOLR-15116)
-        if (null !== $this->getTerm()) {
-            $method = Request::METHOD_GET;
+        if ($this->options['useHeadRequest']) {
+            return Request::METHOD_HEAD;
         }
 
-        return $method;
+        // use GET by default to avoid SOLR-15116 and SOLR-16274
+        return Request::METHOD_GET;
     }
 
     /**
@@ -87,4 +94,33 @@ public function removeTerm(): self
 
         return $this;
     }
+
+    /**
+     * Use a HEAD request to check if a resource or child resource exists?
+     *
+     * @return bool
+     */
+    public function getUseHeadRequest(): bool
+    {
+        return $this->getOption('useHeadRequest');
+    }
+
+    /**
+     * Use a HEAD request to check if a resource or child resource exists?
+     *
+     * Solarium defaults to GET requests because multiple Solr versions have bugs in the
+     * handling of HEAD requests. Only set this to true if you know that your Solr version
+     * isn't affected by {@link https://issues.apache.org/jira/browse/SOLR-15116 SOLR-15116}
+     * or {@link https://issues.apache.org/jira/browse/SOLR-16274 SOLR-16274}.
+     *
+     * @param bool $useHeadRequest
+     *
+     * @return self
+     */
+    public function setUseHeadRequest(bool $useHeadRequest): self
+    {
+        $this->setOption('useHeadRequest', $useHeadRequest);
+
+        return $this;
+    }
 }
diff --git a/vendor/solarium/solarium/src/QueryType/ManagedResources/Query/Command/Stopwords/Create.php b/vendor/solarium/solarium/src/QueryType/ManagedResources/Query/Command/Stopwords/Create.php
index 36ae1b456..d94a13ee6 100644
--- a/vendor/solarium/solarium/src/QueryType/ManagedResources/Query/Command/Stopwords/Create.php
+++ b/vendor/solarium/solarium/src/QueryType/ManagedResources/Query/Command/Stopwords/Create.php
@@ -18,6 +18,8 @@ class Create extends AbstractCreate
 {
     /**
      * Returns the raw data to be sent to Solr.
+     *
+     * @return string
      */
     public function getRawData(): string
     {
diff --git a/vendor/solarium/solarium/src/QueryType/ManagedResources/Query/Command/Synonyms/Create.php b/vendor/solarium/solarium/src/QueryType/ManagedResources/Query/Command/Synonyms/Create.php
index 16a4640b1..9d72df7eb 100644
--- a/vendor/solarium/solarium/src/QueryType/ManagedResources/Query/Command/Synonyms/Create.php
+++ b/vendor/solarium/solarium/src/QueryType/ManagedResources/Query/Command/Synonyms/Create.php
@@ -18,6 +18,8 @@ class Create extends AbstractCreate
 {
     /**
      * Returns the raw data to be sent to Solr.
+     *
+     * @return string
      */
     public function getRawData(): string
     {
diff --git a/vendor/solarium/solarium/src/QueryType/ManagedResources/RequestBuilder/Resource.php b/vendor/solarium/solarium/src/QueryType/ManagedResources/RequestBuilder/Resource.php
index 77451e228..81f80c87d 100644
--- a/vendor/solarium/solarium/src/QueryType/ManagedResources/RequestBuilder/Resource.php
+++ b/vendor/solarium/solarium/src/QueryType/ManagedResources/RequestBuilder/Resource.php
@@ -40,7 +40,7 @@ public function build(AbstractQuery $query): Request
         // reserved characters in a REST resource name need to be encoded twice to make it through the servlet (SOLR-6853)
         $request->setHandler($query->getHandler().rawurlencode(rawurlencode($query->getName())));
         if (null !== $query->getCommand()) {
-            $request->addHeader('Content-Type: application/json; charset=utf-8');
+            $request->setContentType(Request::CONTENT_TYPE_APPLICATION_JSON);
             $this->buildCommand($request, $query->getCommand());
         } else {
             // Lists one or all items.
diff --git a/vendor/solarium/solarium/src/QueryType/MoreLikeThis/RequestBuilder.php b/vendor/solarium/solarium/src/QueryType/MoreLikeThis/RequestBuilder.php
index dfea39e1c..2b3fa8fb7 100644
--- a/vendor/solarium/solarium/src/QueryType/MoreLikeThis/RequestBuilder.php
+++ b/vendor/solarium/solarium/src/QueryType/MoreLikeThis/RequestBuilder.php
@@ -48,12 +48,10 @@ public function build(AbstractQuery $query): Request
 
         // convert query to stream if necessary
         if (true === $query->getQueryStream()) {
-            $charset = $request->getParam('ie') ?? 'utf-8';
-
             $request->removeParam('q');
             $request->setRawData($query->getQuery());
             $request->setMethod(Request::METHOD_POST);
-            $request->addHeader('Content-Type: text/plain; charset='.$charset);
+            $request->setContentType(Request::CONTENT_TYPE_TEXT_PLAIN);
         }
 
         return $request;
diff --git a/vendor/solarium/solarium/src/QueryType/Select/Query/Query.php b/vendor/solarium/solarium/src/QueryType/Select/Query/Query.php
index c1ad44568..89eac6c12 100644
--- a/vendor/solarium/solarium/src/QueryType/Select/Query/Query.php
+++ b/vendor/solarium/solarium/src/QueryType/Select/Query/Query.php
@@ -556,11 +556,11 @@ public function addFilterQuery($filterQuery): self
 
         $key = $filterQuery->getKey();
 
-        if (0 === \strlen($key)) {
+        if (null === $key || 0 === \strlen($key)) {
             throw new InvalidArgumentException('A filterquery must have a key value');
         }
 
-        //double add calls for the same FQ are ignored, but non-unique keys cause an exception
+        // double add calls for the same FQ are ignored, but non-unique keys cause an exception
         if (\array_key_exists($key, $this->filterQueries) && $this->filterQueries[$key] !== $filterQuery) {
             throw new InvalidArgumentException('A filterquery must have a unique key value within a query');
         }
@@ -786,7 +786,7 @@ public function setTags(array $tags): self
      *
      * @return self Provides fluent interface
      */
-    public function setCursormark(string $cursormark): self
+    public function setCursorMark(string $cursormark): self
     {
         $this->setOption('cursormark', $cursormark);
 
@@ -798,7 +798,7 @@ public function setCursormark(string $cursormark): self
      *
      * @return string|null
      */
-    public function getCursormark(): ?string
+    public function getCursorMark(): ?string
     {
         return $this->getOption('cursormark');
     }
@@ -808,7 +808,7 @@ public function getCursormark(): ?string
      *
      * @return self Provides fluent interface
      */
-    public function clearCursormark(): self
+    public function clearCursorMark(): self
     {
         $this->setOption('cursormark', null);
 
@@ -875,9 +875,6 @@ protected function init()
                 case 'component':
                     $this->createComponents($value);
                     break;
-                case 'cursormark':
-                    $this->setCursormark($value);
-                    break;
             }
         }
     }
diff --git a/vendor/solarium/solarium/src/QueryType/Select/RequestBuilder.php b/vendor/solarium/solarium/src/QueryType/Select/RequestBuilder.php
index 35a2e3170..d3d6a5a1d 100644
--- a/vendor/solarium/solarium/src/QueryType/Select/RequestBuilder.php
+++ b/vendor/solarium/solarium/src/QueryType/Select/RequestBuilder.php
@@ -44,7 +44,7 @@ public function build(AbstractQuery $query): Request
         $request->addParam('fl', implode(',', $query->getFields()));
         $request->addParam('q.op', $query->getQueryDefaultOperator());
         $request->addParam('df', $query->getQueryDefaultField());
-        $request->addParam('cursorMark', $query->getCursormark());
+        $request->addParam('cursorMark', $query->getCursorMark());
         $request->addParam('sow', $query->getSplitOnWhitespace());
 
         // add sort fields to request
diff --git a/vendor/solarium/solarium/src/QueryType/Select/Result/Document.php b/vendor/solarium/solarium/src/QueryType/Select/Result/Document.php
index cecc55c56..39d5bd056 100644
--- a/vendor/solarium/solarium/src/QueryType/Select/Result/Document.php
+++ b/vendor/solarium/solarium/src/QueryType/Select/Result/Document.php
@@ -52,4 +52,13 @@ public function __set($name, $value): void
     {
         throw new RuntimeException('A readonly document cannot be altered');
     }
+
+    #[\ReturnTypeWillChange]
+    /**
+     * {@inheritdoc}
+     */
+    public function jsonSerialize()
+    {
+        return $this->getFields();
+    }
 }
diff --git a/vendor/solarium/solarium/src/QueryType/Server/Api/Query.php b/vendor/solarium/solarium/src/QueryType/Server/Api/Query.php
index 8a2c8f165..0751ce28d 100644
--- a/vendor/solarium/solarium/src/QueryType/Server/Api/Query.php
+++ b/vendor/solarium/solarium/src/QueryType/Server/Api/Query.php
@@ -14,7 +14,6 @@
 use Solarium\Core\Query\AbstractQuery;
 use Solarium\Core\Query\RequestBuilderInterface;
 use Solarium\Core\Query\ResponseParserInterface;
-use Solarium\Core\Query\Result\QueryType;
 
 /**
  * V2 API query.
@@ -29,7 +28,7 @@ class Query extends AbstractQuery
     protected $options = [
         'version' => Request::API_V1,
         'method' => Request::METHOD_GET,
-        'resultclass' => QueryType::class,
+        'resultclass' => Result::class,
     ];
 
     /**
@@ -115,21 +114,30 @@ public function getAccept(): ?string
     }
 
     /**
-     * Set contenttype option.
+     * Set request Content-Type.
      *
-     * @param string $contentType
+     * Use one of the Request::CONTENT_TYPE_* constants as value.
+     *
+     * Content-Type parameters can be passed in $params or set with {@see setContentTypeParams()}.
+     *
+     * @param string|null $contentType
+     * @param array|null  $params
      *
      * @return self Provides fluent interface
      */
-    public function setContentType(string $contentType): self
+    public function setContentType(?string $contentType, ?array $params = null): self
     {
         $this->setOption('contenttype', $contentType);
 
+        if (null !== $params) {
+            $this->setOption('contenttypeparams', $params);
+        }
+
         return $this;
     }
 
     /**
-     * Get contenttype option.
+     * Get request Content-Type.
      *
      * @return string|null
      */
@@ -138,6 +146,30 @@ public function getContentType(): ?string
         return $this->getOption('contenttype');
     }
 
+    /**
+     * Set Content-Type parameters.
+     *
+     * @param array|null $params
+     *
+     * @return self Provides fluent interface
+     */
+    public function setContentTypeParams(?array $params): self
+    {
+        $this->setOption('contenttypeparams', $params);
+
+        return $this;
+    }
+
+    /**
+     * Get Content-Type parameters.
+     *
+     * @return array|null
+     */
+    public function getContentTypeParams(): ?array
+    {
+        return $this->getOption('contenttypeparams');
+    }
+
     /**
      * Set rawdata option.
      *
diff --git a/vendor/solarium/solarium/src/QueryType/Server/Api/RequestBuilder.php b/vendor/solarium/solarium/src/QueryType/Server/Api/RequestBuilder.php
index 48324b0c6..e4b2527d4 100644
--- a/vendor/solarium/solarium/src/QueryType/Server/Api/RequestBuilder.php
+++ b/vendor/solarium/solarium/src/QueryType/Server/Api/RequestBuilder.php
@@ -31,16 +31,24 @@ public function build(AbstractQuery $query): Request
     {
         $request = parent::build($query);
 
-        $request->setMethod($query->getMethod());
+        $method = $query->getMethod();
+
+        $request->setMethod($method);
         $request->setApi($query->getVersion());
         $request->setIsServerRequest(true);
 
+        if (null !== $contentType = $query->getContentType()) {
+            $request->setContentType($query->getContentType());
+        } elseif (Request::METHOD_POST === $method) {
+            $request->setContentType(Request::CONTENT_TYPE_APPLICATION_JSON);
+        } elseif (Request::METHOD_PUT === $method) {
+            $request->setContentType(Request::CONTENT_TYPE_APPLICATION_OCTET_STREAM);
+        }
+        $request->setContentTypeParams($query->getContentTypeParams());
+
         if ($accept = $query->getAccept()) {
             $request->addHeader('Accept: '.$accept);
         }
-        if ($contentType = $query->getContentType()) {
-            $request->addHeader('Content-Type: '.$contentType);
-        }
         if ($rawData = $query->getRawData()) {
             $request->setRawData($rawData);
         }
diff --git a/vendor/solarium/solarium/src/QueryType/Server/Api/ResponseParser.php b/vendor/solarium/solarium/src/QueryType/Server/Api/ResponseParser.php
index 2b0183468..671765432 100644
--- a/vendor/solarium/solarium/src/QueryType/Server/Api/ResponseParser.php
+++ b/vendor/solarium/solarium/src/QueryType/Server/Api/ResponseParser.php
@@ -29,6 +29,7 @@ class ResponseParser extends ResponseParserAbstract implements ResponseParserInt
     public function parse(ResultInterface $result): array
     {
         $data = $result->getData();
+        $data = $this->parseStatus($data, $result);
         $data = $this->addHeaderInfo($data, $data);
 
         return $data;
diff --git a/vendor/solarium/solarium/src/QueryType/Stream/Expression.php b/vendor/solarium/solarium/src/QueryType/Server/Api/Result.php
similarity index 58%
rename from vendor/solarium/solarium/src/QueryType/Stream/Expression.php
rename to vendor/solarium/solarium/src/QueryType/Server/Api/Result.php
index 8f7d5ea10..b733a6010 100644
--- a/vendor/solarium/solarium/src/QueryType/Stream/Expression.php
+++ b/vendor/solarium/solarium/src/QueryType/Server/Api/Result.php
@@ -7,11 +7,13 @@
  * file that was distributed with this source code.
  */
 
-namespace Solarium\QueryType\Stream;
+namespace Solarium\QueryType\Server\Api;
+
+use Solarium\QueryType\Server\Query\AbstractResult;
 
 /**
- * @deprecated use ExpressionBuilder instead
+ * API result.
  */
-class Expression extends ExpressionBuilder
+class Result extends AbstractResult
 {
 }
diff --git a/vendor/solarium/solarium/src/QueryType/Server/Collections/Query/Action/ClusterStatus.php b/vendor/solarium/solarium/src/QueryType/Server/Collections/Query/Action/ClusterStatus.php
index 9458f95fb..95a927c13 100644
--- a/vendor/solarium/solarium/src/QueryType/Server/Collections/Query/Action/ClusterStatus.php
+++ b/vendor/solarium/solarium/src/QueryType/Server/Collections/Query/Action/ClusterStatus.php
@@ -97,11 +97,11 @@ public function setRoute(string $route): self
     /**
      * Get route.
      *
-     * @return string
+     * @return string|null
      */
-    public function getRoute(): string
+    public function getRoute(): ?string
     {
-        return $this->getOption('route');
+        return $this->getOption('_route_');
     }
 
     /**
diff --git a/vendor/solarium/solarium/src/QueryType/Server/Collections/Query/Action/Create.php b/vendor/solarium/solarium/src/QueryType/Server/Collections/Query/Action/Create.php
index 9fec19abb..7a40cae79 100644
--- a/vendor/solarium/solarium/src/QueryType/Server/Collections/Query/Action/Create.php
+++ b/vendor/solarium/solarium/src/QueryType/Server/Collections/Query/Action/Create.php
@@ -12,7 +12,6 @@
 use Solarium\QueryType\Server\Collections\Query\Query as CollectionsQuery;
 use Solarium\QueryType\Server\Collections\Result\CreateResult;
 use Solarium\QueryType\Server\Query\Action\AbstractAsyncAction;
-use Solarium\QueryType\Server\Query\Action\AsyncActionInterface;
 use Solarium\QueryType\Server\Query\Action\NameParameterTrait;
 
 /**
@@ -294,20 +293,6 @@ public function setAutoAddReplicas(bool $autoAddReplicas): self
         return $this;
     }
 
-    /**
-     * Request ID to track this action which will be processed asynchronously.
-     *
-     * @param string $id
-     *
-     * @return self Provides fluent interface
-     */
-    public function setAsync(string $id): AsyncActionInterface
-    {
-        $this->setOption('async', $id);
-
-        return $this;
-    }
-
     /**
      * Replica placement rules.
      *
diff --git a/vendor/solarium/solarium/src/QueryType/Server/Configsets/RequestBuilder.php b/vendor/solarium/solarium/src/QueryType/Server/Configsets/RequestBuilder.php
index 692ceb50c..d16bf5241 100644
--- a/vendor/solarium/solarium/src/QueryType/Server/Configsets/RequestBuilder.php
+++ b/vendor/solarium/solarium/src/QueryType/Server/Configsets/RequestBuilder.php
@@ -34,7 +34,7 @@ public function build(AbstractQuery $query): Request
         if ($action instanceof Upload) {
             $request->setMethod(Request::METHOD_POST);
             $request->setFileUpload($action->getFile());
-            $request->addHeader('Content-Type: multipart/form-data; boundary='.$request->getHash());
+            $request->setContentType(Request::CONTENT_TYPE_MULTIPART_FORM_DATA, ['boundary' => $request->getHash()]);
         }
 
         return $request;
diff --git a/vendor/solarium/solarium/src/QueryType/Server/CoreAdmin/Query/Action/CoreActionInterface.php b/vendor/solarium/solarium/src/QueryType/Server/CoreAdmin/Query/Action/CoreActionInterface.php
index d5088de78..8216386e0 100644
--- a/vendor/solarium/solarium/src/QueryType/Server/CoreAdmin/Query/Action/CoreActionInterface.php
+++ b/vendor/solarium/solarium/src/QueryType/Server/CoreAdmin/Query/Action/CoreActionInterface.php
@@ -17,7 +17,7 @@
 interface CoreActionInterface extends ActionInterface
 {
     /**
-     * Set the core name that should be reloaded.
+     * Set the core name for the action.
      *
      * @param string $core
      *
diff --git a/vendor/solarium/solarium/src/QueryType/Server/CoreAdmin/Query/Action/CoreActionTrait.php b/vendor/solarium/solarium/src/QueryType/Server/CoreAdmin/Query/Action/CoreActionTrait.php
index abd0eaf48..8c47bf46b 100644
--- a/vendor/solarium/solarium/src/QueryType/Server/CoreAdmin/Query/Action/CoreActionTrait.php
+++ b/vendor/solarium/solarium/src/QueryType/Server/CoreAdmin/Query/Action/CoreActionTrait.php
@@ -15,7 +15,7 @@
 trait CoreActionTrait
 {
     /**
-     * Set the core name that should be reloaded.
+     * Set the core name for the action.
      *
      * @param string $core
      *
diff --git a/vendor/solarium/solarium/src/QueryType/Server/CoreAdmin/Query/Action/Create.php b/vendor/solarium/solarium/src/QueryType/Server/CoreAdmin/Query/Action/Create.php
index 07f22c568..99622540b 100644
--- a/vendor/solarium/solarium/src/QueryType/Server/CoreAdmin/Query/Action/Create.php
+++ b/vendor/solarium/solarium/src/QueryType/Server/CoreAdmin/Query/Action/Create.php
@@ -30,7 +30,7 @@ public function getType(): string
     }
 
     /**
-     * Set the core name that should be reloaded.
+     * Set the core name that should be created.
      *
      * @param string $core
      *
@@ -45,7 +45,7 @@ public function setCore(string $core): CoreActionInterface
     }
 
     /**
-     * Get the related core name.
+     * Get the core name that should be created.
      *
      * @return string|null
      */
diff --git a/vendor/solarium/solarium/src/QueryType/Server/Query/AbstractResult.php b/vendor/solarium/solarium/src/QueryType/Server/Query/AbstractResult.php
index fa0834601..9d4833f68 100644
--- a/vendor/solarium/solarium/src/QueryType/Server/Query/AbstractResult.php
+++ b/vendor/solarium/solarium/src/QueryType/Server/Query/AbstractResult.php
@@ -12,7 +12,7 @@
 use Solarium\Core\Query\Result\QueryType as BaseResult;
 
 /**
- * Collections result object.
+ * Abstract Server result object.
  */
 abstract class AbstractResult extends BaseResult
 {
diff --git a/vendor/solarium/solarium/src/QueryType/Stream/RequestBuilder.php b/vendor/solarium/solarium/src/QueryType/Stream/RequestBuilder.php
index 8ccdacde5..497f20822 100644
--- a/vendor/solarium/solarium/src/QueryType/Stream/RequestBuilder.php
+++ b/vendor/solarium/solarium/src/QueryType/Stream/RequestBuilder.php
@@ -27,13 +27,11 @@ class RequestBuilder implements RequestBuilderInterface
      */
     public function build(AbstractQuery $query): Request
     {
-        $charset = $query->getInputEncoding('ie') ?? 'utf-8';
-
         $request = new Request();
         $request->setHandler($query->getHandler());
+        $request->setContentType(Request::CONTENT_TYPE_TEXT_PLAIN);
         $request->addParam('expr', $query->getExpression());
         $request->addParams($query->getParams());
-        $request->addHeader('Content-Type: text/plain; charset='.$charset);
 
         return $request;
     }
diff --git a/vendor/solarium/solarium/src/QueryType/Stream/ResponseParser.php b/vendor/solarium/solarium/src/QueryType/Stream/ResponseParser.php
index c35ae0718..ed6b61eba 100644
--- a/vendor/solarium/solarium/src/QueryType/Stream/ResponseParser.php
+++ b/vendor/solarium/solarium/src/QueryType/Stream/ResponseParser.php
@@ -11,7 +11,7 @@
 
 use Solarium\Core\Query\AbstractResponseParser as ResponseParserAbstract;
 use Solarium\Core\Query\DocumentInterface;
-use Solarium\Core\Query\ResponseParserInterface as ResponseParserInterface;
+use Solarium\Core\Query\ResponseParserInterface;
 use Solarium\Core\Query\Result\ResultInterface;
 use Solarium\Exception\RuntimeException;
 use Solarium\Exception\StreamException;
diff --git a/vendor/solarium/solarium/src/QueryType/Suggester/ResponseParser.php b/vendor/solarium/solarium/src/QueryType/Suggester/ResponseParser.php
index b69a7b1d8..ddd8b3515 100644
--- a/vendor/solarium/solarium/src/QueryType/Suggester/ResponseParser.php
+++ b/vendor/solarium/solarium/src/QueryType/Suggester/ResponseParser.php
@@ -10,7 +10,7 @@
 namespace Solarium\QueryType\Suggester;
 
 use Solarium\Core\Query\AbstractResponseParser as ResponseParserAbstract;
-use Solarium\Core\Query\ResponseParserInterface as ResponseParserInterface;
+use Solarium\Core\Query\ResponseParserInterface;
 use Solarium\Core\Query\Result\ResultInterface;
 use Solarium\QueryType\Suggester\Result\Result;
 
diff --git a/vendor/solarium/solarium/src/QueryType/Update/Query/Command/Add.php b/vendor/solarium/solarium/src/QueryType/Update/Query/Command/Add.php
index 275602a58..e7c2896af 100644
--- a/vendor/solarium/solarium/src/QueryType/Update/Query/Command/Add.php
+++ b/vendor/solarium/solarium/src/QueryType/Update/Query/Command/Add.php
@@ -81,6 +81,22 @@ public function addDocuments($documents): self
         return $this;
     }
 
+    /**
+     * Set documents.
+     *
+     * This overwrite any previously added documents.
+     *
+     * @param DocumentInterface[] $documents
+     *
+     * @return self Provides fluent interface
+     */
+    public function setDocuments(array $documents): self
+    {
+        $this->documents = $documents;
+
+        return $this;
+    }
+
     /**
      * Get all documents.
      *
@@ -91,6 +107,18 @@ public function getDocuments(): array
         return $this->documents;
     }
 
+    /**
+     * Clear all documents.
+     *
+     * @return self Provides fluent interface
+     */
+    public function clear(): self
+    {
+        $this->documents = [];
+
+        return $this;
+    }
+
     /**
      * Set overwrite option.
      *
diff --git a/vendor/solarium/solarium/src/QueryType/Update/Query/Command/Delete.php b/vendor/solarium/solarium/src/QueryType/Update/Query/Command/Delete.php
index d04f301f7..18eefd58b 100644
--- a/vendor/solarium/solarium/src/QueryType/Update/Query/Command/Delete.php
+++ b/vendor/solarium/solarium/src/QueryType/Update/Query/Command/Delete.php
@@ -70,6 +70,16 @@ public function addIds(array $ids): self
         return $this;
     }
 
+    /**
+     * Get all ids of this delete command.
+     *
+     * @return array
+     */
+    public function getIds(): array
+    {
+        return $this->ids;
+    }
+
     /**
      * Add a single query to the delete command.
      *
@@ -109,13 +119,16 @@ public function getQueries(): array
     }
 
     /**
-     * Get all qids of this delete command.
+     * Clear all ids and queries.
      *
-     * @return array
+     * @return self Provides fluent interface
      */
-    public function getIds(): array
+    public function clear(): self
     {
-        return $this->ids;
+        $this->ids = [];
+        $this->queries = [];
+
+        return $this;
     }
 
     /**
diff --git a/vendor/solarium/solarium/src/QueryType/Update/Query/Command/RawXml.php b/vendor/solarium/solarium/src/QueryType/Update/Query/Command/RawXml.php
index 7f2c921d4..acd7068c1 100644
--- a/vendor/solarium/solarium/src/QueryType/Update/Query/Command/RawXml.php
+++ b/vendor/solarium/solarium/src/QueryType/Update/Query/Command/RawXml.php
@@ -106,6 +106,18 @@ public function getCommands(): array
         return $this->commands;
     }
 
+    /**
+     * Clear all XML command strings.
+     *
+     * @return self Provides fluent interface
+     */
+    public function clear(): self
+    {
+        $this->commands = [];
+
+        return $this;
+    }
+
     /**
      * Build XML command strings based on options.
      */
diff --git a/vendor/solarium/solarium/src/QueryType/Update/Query/Document.php b/vendor/solarium/solarium/src/QueryType/Update/Query/Document.php
index ca3fa9cc7..89e38d659 100644
--- a/vendor/solarium/solarium/src/QueryType/Update/Query/Document.php
+++ b/vendor/solarium/solarium/src/QueryType/Update/Query/Document.php
@@ -10,7 +10,6 @@
 namespace Solarium\QueryType\Update\Query;
 
 use Solarium\Core\Query\AbstractDocument;
-use Solarium\Core\Query\Helper;
 use Solarium\Exception\RuntimeException;
 
 /**
@@ -26,7 +25,7 @@
  * stored. You will lose that data because it is impossible to retrieve it from
  * Solr. Always update from the original data source.
  *
- * Atomic updates are also support, using the field modifiers.
+ * Atomic updates are also supported, using the field modifiers.
  */
 class Document extends AbstractDocument
 {
@@ -39,13 +38,6 @@ class Document extends AbstractDocument
      */
     const MODIFIER_SET = 'set';
 
-    /**
-     * Directive to increment a numeric value by a specific amount. Must be specified as a single numeric value.
-     *
-     * @var string
-     */
-    const MODIFIER_INC = 'inc';
-
     /**
      * Directive to add the specified values to a multiValued field. May be specified as a single value, or as a list.
      *
@@ -77,6 +69,13 @@ class Document extends AbstractDocument
      */
     const MODIFIER_REMOVEREGEX = 'removeregex';
 
+    /**
+     * Directive to increment a numeric value by a specific amount. Must be specified as a single numeric value.
+     *
+     * @var string
+     */
+    const MODIFIER_INC = 'inc';
+
     /**
      * This value has the same effect as not setting a version.
      *
@@ -139,15 +138,6 @@ class Document extends AbstractDocument
      */
     protected $version;
 
-    /**
-     * Helper instance.
-     *
-     * @var Helper
-     */
-    protected $helper;
-
-    protected $filterControlCharacters = true;
-
     /**
      * Constructor.
      *
@@ -167,8 +157,8 @@ public function __construct(array $fields = [], array $boosts = [], array $modif
      * object, by field name.
      *
      * If you supply NULL as the value the field will be removed
-     * If you supply an array a multivalue field will be created.
-     * In all cases any existing (multi)value will be overwritten.
+     * If you supply a numerically indexed array of values a multivalue field will be created.
+     * In all cases any existing (multi)value or child document(s) will be overwritten.
      *
      * @param string $name
      * @param mixed  $value
@@ -196,6 +186,9 @@ public function __unset($name): void
      * If a field already has a value it will be converted
      * to a multivalue field.
      *
+     * If the value is a nested child document, the field will
+     * always be converted to a multivalue field.
+     *
      * @param string      $key
      * @param mixed       $value
      * @param float|null  $boost
@@ -206,21 +199,24 @@ public function __unset($name): void
     public function addField(string $key, $value, ?float $boost = null, ?string $modifier = null): self
     {
         if (!isset($this->fields[$key])) {
+            // convert nested child document to array
+            if (\is_array($value) && !is_numeric(array_key_first($value))) {
+                $value = [$value];
+            }
+
             $this->setField($key, $value, $boost, $modifier);
         } else {
-            // convert single value to array if needed
-            if (!\is_array($this->fields[$key])) {
+            // convert single value or child document to array if needed
+            if (!\is_array($this->fields[$key]) || !is_numeric(array_key_first($this->fields[$key]))) {
                 $this->fields[$key] = [$this->fields[$key]];
             }
 
-            if ($this->filterControlCharacters && \is_string($value)) {
-                $value = $this->getHelper()->filterControlCharacters($value);
-            }
-
             $this->fields[$key][] = $value;
+
             if (null !== $boost) {
                 $this->setFieldBoost($key, $boost);
             }
+
             if (null !== $modifier) {
                 $this->setFieldModifier($key, $modifier);
             }
@@ -232,9 +228,9 @@ public function addField(string $key, $value, ?float $boost = null, ?string $mod
     /**
      * Set a field value.
      *
-     * If you supply NULL as the value the field will be removed
-     * If you supply an array a multivalue field will be created.
-     * In all cases any existing (multi)value will be overwritten.
+     * If you supply NULL as the value and no modifier the field will be removed
+     * If you supply a numerically indexed array of values a multivalue field will be created.
+     * In all cases any existing (multi)value or child document(s) will be overwritten.
      *
      * @param string      $key
      * @param mixed       $value
@@ -248,23 +244,12 @@ public function setField(string $key, $value, ?float $boost = null, ?string $mod
         if (null === $value && null === $modifier) {
             $this->removeField($key);
         } else {
-            if (\is_array($value)) {
-                $this->fields[$key] = [];
-
-                foreach ($value as $v) {
-                    $this->addField($key, $v);
-                }
-            } else {
-                if ($this->filterControlCharacters && \is_string($value)) {
-                    $value = $this->getHelper()->filterControlCharacters($value);
-                }
-
-                $this->fields[$key] = $value;
-            }
+            $this->fields[$key] = $value;
 
             if (null !== $boost) {
                 $this->setFieldBoost($key, $boost);
             }
+
             if (null !== $modifier) {
                 $this->setFieldModifier($key, $modifier);
             }
@@ -432,7 +417,7 @@ public function setKey(string $key, $value = null): self
      */
     public function setFieldModifier(string $key, string $modifier = null): self
     {
-        if (!\in_array($modifier, [self::MODIFIER_ADD, self::MODIFIER_ADD_DISTINCT, self::MODIFIER_REMOVE, self::MODIFIER_REMOVEREGEX, self::MODIFIER_INC, self::MODIFIER_SET], true)) {
+        if (!\in_array($modifier, [self::MODIFIER_SET, self::MODIFIER_ADD, self::MODIFIER_ADD_DISTINCT, self::MODIFIER_REMOVE, self::MODIFIER_REMOVEREGEX, self::MODIFIER_INC], true)) {
             throw new RuntimeException('Attempt to set an atomic update modifier that is not supported');
         }
         $this->modifiers[$key] = $modifier;
@@ -494,43 +479,21 @@ public function getVersion(): ?int
         return $this->version;
     }
 
+    #[\ReturnTypeWillChange]
     /**
-     * Get a helper instance.
-     *
-     * Uses lazy loading: the helper is instantiated on first use
-     *
-     * @return Helper
-     */
-    public function getHelper(): Helper
-    {
-        if (null === $this->helper) {
-            $this->helper = new Helper();
-        }
-
-        return $this->helper;
-    }
-
-    /**
-     * Whether values should be filtered for control characters automatically.
-     *
-     * @param bool $filterControlCharacters
-     *
-     * @return self
+     * {@inheritdoc}
      */
-    public function setFilterControlCharacters(bool $filterControlCharacters): self
+    public function jsonSerialize()
     {
-        $this->filterControlCharacters = $filterControlCharacters;
+        $fields = $this->getFields();
 
-        return $this;
-    }
+        foreach ($this->modifiers as $key => $modifier) {
+            // isset($fields[$key]) wouldn't let you set a field to null
+            if (\array_key_exists($key, $fields)) {
+                $fields[$key] = [$modifier => $fields[$key]];
+            }
+        }
 
-    /**
-     * Returns whether values should be filtered automatically or control characters.
-     *
-     * @return bool
-     */
-    public function getFilterControlCharacters(): bool
-    {
-        return $this->filterControlCharacters;
+        return $fields;
     }
 }
diff --git a/vendor/solarium/solarium/src/QueryType/Update/RequestBuilder.php b/vendor/solarium/solarium/src/QueryType/Update/RequestBuilder.php
index 2df09c7c4..e6bfcdde6 100644
--- a/vendor/solarium/solarium/src/QueryType/Update/RequestBuilder.php
+++ b/vendor/solarium/solarium/src/QueryType/Update/RequestBuilder.php
@@ -38,6 +38,7 @@ public function build(AbstractQuery $query): Request
     {
         $request = parent::build($query);
         $request->setMethod(Request::METHOD_POST);
+        $request->setContentType(Request::CONTENT_TYPE_APPLICATION_XML);
         $request->setRawData($this->getRawData($query));
 
         return $request;
@@ -111,8 +112,7 @@ public function buildAddXml(Add $command): string
                 $xml .= $this->buildFieldsXml($name, $boost, $value, $modifier);
             }
 
-            $version = $doc->getVersion();
-            if (null !== $version) {
+            if (null !== $version = $doc->getVersion()) {
                 $xml .= $this->buildFieldXml('_version_', null, $version);
             }
 
@@ -204,7 +204,7 @@ public function buildRawXmlXml(RawXml $command): string
 
         foreach ($command->getCommands() as $raw) {
             // unwrap grouped commands, they must be consolidated in a single <update>
-            if (false !== ($pos = strpos($raw, '<update'))) {
+            if (false !== $pos = strpos($raw, '<update')) {
                 $start = strpos($raw, '>', $pos) + 1;
                 $raw = substr($raw, $start, strrpos($raw, '</update>') - $start);
             }
@@ -229,6 +229,8 @@ public function buildRawXmlXml(RawXml $command): string
      */
     protected function buildFieldXml(string $name, ?float $boost, $value, ?string $modifier = null): string
     {
+        $helper = $this->getHelper();
+
         $xml = '<field name="'.$name.'"';
         $xml .= $this->attrib('boost', $boost);
         $xml .= $this->attrib('update', $modifier);
@@ -239,9 +241,9 @@ protected function buildFieldXml(string $name, ?float $boost, $value, ?string $m
         } elseif (true === $value) {
             $value = 'true';
         } elseif ($value instanceof \DateTimeInterface) {
-            $value = $this->getHelper()->formatDate($value);
+            $value = $helper->formatDate($value);
         } else {
-            $value = $this->getHelper()->escapeXMLCharacterData($value);
+            $value = $helper->escapeXMLCharacterData($helper->filterControlCharacters($value));
         }
 
         $xml .= '>'.$value.'</field>';
@@ -268,32 +270,50 @@ private function buildFieldsXml(string $key, ?float $boost, $value, ?string $mod
         }
 
         if (\is_array($value)) {
-            $nestedXml = '';
-            foreach ($value as $multival) {
-                if (\is_array($multival) && '_childDocuments_' === $key) {
-                    $xml .= '<doc>';
-                    foreach ($multival as $k => $v) {
-                        $xml .= $this->buildFieldsXml($k, $boost, $v, $modifier);
-                    }
-                    $xml .= '</doc>';
-                } elseif (\is_array($multival)) {
-                    $nestedXml .= '<doc';
-                    $nestedXml .= $this->attrib('update', $modifier);
-                    $nestedXml .= '>';
-                    foreach ($multival as $k => $v) {
-                        $nestedXml .= $this->buildFieldsXml($k, $boost, $v, null);
+            if (empty($value)) {
+                return '';
+            } elseif (is_numeric(array_key_first($value))) {
+                $nestedXml = '';
+
+                foreach ($value as $multival) {
+                    if (\is_array($multival) && '_childDocuments_' === $key) {
+                        $xml .= '<doc>';
+                        foreach ($multival as $k => $v) {
+                            $xml .= $this->buildFieldsXml($k, $boost, $v, $modifier);
+                        }
+                        $xml .= '</doc>';
+                    } elseif (\is_array($multival)) {
+                        $nestedXml .= '<doc';
+                        $nestedXml .= $this->attrib('update', $modifier);
+                        $nestedXml .= '>';
+                        foreach ($multival as $k => $v) {
+                            $nestedXml .= $this->buildFieldsXml($k, $boost, $v, null);
+                        }
+                        $nestedXml .= '</doc>';
+                    } else {
+                        if (!empty($nestedXml)) {
+                            $xml .= '<field name="'.$key.'">'.$nestedXml.'</field>';
+                            $nestedXml = '';
+                        }
+                        $xml .= $this->buildFieldXml($key, $boost, $multival, $modifier);
                     }
-                    $nestedXml .= '</doc>';
-                } else {
-                    if (!empty($nestedXml)) {
-                        $xml .= '<field name="'.$key.'">'.$nestedXml.'</field>';
-                        $nestedXml = '';
-                    }
-                    $xml .= $this->buildFieldXml($key, $boost, $multival, $modifier);
                 }
-            }
-            if (!empty($nestedXml) && '_childDocuments_' !== $key) {
-                $xml .= '<field name="'.$key.'">'.$nestedXml.'</field>';
+
+                if (!empty($nestedXml) && '_childDocuments_' !== $key) {
+                    $xml .= '<field name="'.$key.'">'.$nestedXml.'</field>';
+                }
+            } else {
+                $xml .= '<doc';
+                if ('_childDocuments_' !== $key) {
+                    // labelled single nested child documents can't be indexed in XML, but
+                    // we aim for forward compatibility with the proposed syntax in SOLR-16183
+                    $xml .= ' name="'.$key.'"';
+                }
+                $xml .= '>';
+                foreach ($value as $k => $v) {
+                    $xml .= $this->buildFieldsXml($k, $boost, $v, null);
+                }
+                $xml .= '</doc>';
             }
         } else {
             $xml .= $this->buildFieldXml($key, $boost, $value, $modifier);
diff --git a/vendor/symfony/deprecation-contracts/LICENSE b/vendor/symfony/deprecation-contracts/LICENSE
index ad85e1737..406242ff2 100644
--- a/vendor/symfony/deprecation-contracts/LICENSE
+++ b/vendor/symfony/deprecation-contracts/LICENSE
@@ -1,4 +1,4 @@
-Copyright (c) 2020-2021 Fabien Potencier
+Copyright (c) 2020-2022 Fabien Potencier
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal
diff --git a/vendor/symfony/event-dispatcher-contracts/LICENSE b/vendor/symfony/event-dispatcher-contracts/LICENSE
index 235841453..74cdc2dbf 100644
--- a/vendor/symfony/event-dispatcher-contracts/LICENSE
+++ b/vendor/symfony/event-dispatcher-contracts/LICENSE
@@ -1,4 +1,4 @@
-Copyright (c) 2018-2021 Fabien Potencier
+Copyright (c) 2018-2022 Fabien Potencier
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal
diff --git a/vendor/symfony/event-dispatcher/Debug/TraceableEventDispatcher.php b/vendor/symfony/event-dispatcher/Debug/TraceableEventDispatcher.php
index e1d2007fd..acfbf619c 100644
--- a/vendor/symfony/event-dispatcher/Debug/TraceableEventDispatcher.php
+++ b/vendor/symfony/event-dispatcher/Debug/TraceableEventDispatcher.php
@@ -75,7 +75,7 @@ public function removeListener(string $eventName, $listener)
     {
         if (isset($this->wrappedListeners[$eventName])) {
             foreach ($this->wrappedListeners[$eventName] as $index => $wrappedListener) {
-                if ($wrappedListener->getWrappedListener() === $listener) {
+                if ($wrappedListener->getWrappedListener() === $listener || ($listener instanceof \Closure && $wrappedListener->getWrappedListener() == $listener)) {
                     $listener = $wrappedListener;
                     unset($this->wrappedListeners[$eventName][$index]);
                     break;
@@ -110,8 +110,8 @@ public function getListenerPriority(string $eventName, $listener)
         // we might have wrapped listeners for the event (if called while dispatching)
         // in that case get the priority by wrapper
         if (isset($this->wrappedListeners[$eventName])) {
-            foreach ($this->wrappedListeners[$eventName] as $index => $wrappedListener) {
-                if ($wrappedListener->getWrappedListener() === $listener) {
+            foreach ($this->wrappedListeners[$eventName] as $wrappedListener) {
+                if ($wrappedListener->getWrappedListener() === $listener || ($listener instanceof \Closure && $wrappedListener->getWrappedListener() == $listener)) {
                     return $this->dispatcher->getListenerPriority($eventName, $wrappedListener);
                 }
             }
diff --git a/vendor/symfony/event-dispatcher/EventDispatcher.php b/vendor/symfony/event-dispatcher/EventDispatcher.php
index c479a7544..8fe8fb5c2 100644
--- a/vendor/symfony/event-dispatcher/EventDispatcher.php
+++ b/vendor/symfony/event-dispatcher/EventDispatcher.php
@@ -108,7 +108,7 @@ public function getListenerPriority(string $eventName, $listener)
                     $v[0] = $v[0]();
                     $v[1] = $v[1] ?? '__invoke';
                 }
-                if ($v === $listener) {
+                if ($v === $listener || ($listener instanceof \Closure && $v == $listener)) {
                     return $priority;
                 }
             }
@@ -164,7 +164,7 @@ public function removeListener(string $eventName, $listener)
                     $v[0] = $v[0]();
                     $v[1] = $v[1] ?? '__invoke';
                 }
-                if ($v === $listener) {
+                if ($v === $listener || ($listener instanceof \Closure && $v == $listener)) {
                     unset($listeners[$k], $this->sorted[$eventName], $this->optimized[$eventName]);
                 }
             }
diff --git a/vendor/symfony/event-dispatcher/LICENSE b/vendor/symfony/event-dispatcher/LICENSE
index 9ff2d0d63..88bf75bb4 100644
--- a/vendor/symfony/event-dispatcher/LICENSE
+++ b/vendor/symfony/event-dispatcher/LICENSE
@@ -1,4 +1,4 @@
-Copyright (c) 2004-2021 Fabien Potencier
+Copyright (c) 2004-2022 Fabien Potencier
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal
diff --git a/vendor/symfony/polyfill-php80/Php80.php b/vendor/symfony/polyfill-php80/Php80.php
index 5fef51184..362dd1a95 100644
--- a/vendor/symfony/polyfill-php80/Php80.php
+++ b/vendor/symfony/polyfill-php80/Php80.php
@@ -100,6 +100,16 @@ public static function str_starts_with(string $haystack, string $needle): bool
 
     public static function str_ends_with(string $haystack, string $needle): bool
     {
-        return '' === $needle || ('' !== $haystack && 0 === substr_compare($haystack, $needle, -\strlen($needle)));
+        if ('' === $needle || $needle === $haystack) {
+            return true;
+        }
+
+        if ('' === $haystack) {
+            return false;
+        }
+
+        $needleLength = \strlen($needle);
+
+        return $needleLength <= \strlen($haystack) && 0 === substr_compare($haystack, $needle, -$needleLength);
     }
 }
diff --git a/vendor/symfony/polyfill-php80/PhpToken.php b/vendor/symfony/polyfill-php80/PhpToken.php
new file mode 100644
index 000000000..fe6e69105
--- /dev/null
+++ b/vendor/symfony/polyfill-php80/PhpToken.php
@@ -0,0 +1,103 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Symfony\Polyfill\Php80;
+
+/**
+ * @author Fedonyuk Anton <info@ensostudio.ru>
+ *
+ * @internal
+ */
+class PhpToken implements \Stringable
+{
+    /**
+     * @var int
+     */
+    public $id;
+
+    /**
+     * @var string
+     */
+    public $text;
+
+    /**
+     * @var int
+     */
+    public $line;
+
+    /**
+     * @var int
+     */
+    public $pos;
+
+    public function __construct(int $id, string $text, int $line = -1, int $position = -1)
+    {
+        $this->id = $id;
+        $this->text = $text;
+        $this->line = $line;
+        $this->pos = $position;
+    }
+
+    public function getTokenName(): ?string
+    {
+        if ('UNKNOWN' === $name = token_name($this->id)) {
+            $name = \strlen($this->text) > 1 || \ord($this->text) < 32 ? null : $this->text;
+        }
+
+        return $name;
+    }
+
+    /**
+     * @param int|string|array $kind
+     */
+    public function is($kind): bool
+    {
+        foreach ((array) $kind as $value) {
+            if (\in_array($value, [$this->id, $this->text], true)) {
+                return true;
+            }
+        }
+
+        return false;
+    }
+
+    public function isIgnorable(): bool
+    {
+        return \in_array($this->id, [\T_WHITESPACE, \T_COMMENT, \T_DOC_COMMENT, \T_OPEN_TAG], true);
+    }
+
+    public function __toString(): string
+    {
+        return (string) $this->text;
+    }
+
+    /**
+     * @return static[]
+     */
+    public static function tokenize(string $code, int $flags = 0): array
+    {
+        $line = 1;
+        $position = 0;
+        $tokens = token_get_all($code, $flags);
+        foreach ($tokens as $index => $token) {
+            if (\is_string($token)) {
+                $id = \ord($token);
+                $text = $token;
+            } else {
+                [$id, $text, $line] = $token;
+            }
+            $tokens[$index] = new static($id, $text, $line, $position);
+            $position += \strlen($text);
+        }
+
+        return $tokens;
+    }
+}
diff --git a/vendor/symfony/polyfill-php80/README.md b/vendor/symfony/polyfill-php80/README.md
index 10b8ee49a..3816c559d 100644
--- a/vendor/symfony/polyfill-php80/README.md
+++ b/vendor/symfony/polyfill-php80/README.md
@@ -3,12 +3,13 @@ Symfony Polyfill / Php80
 
 This component provides features added to PHP 8.0 core:
 
-- `Stringable` interface
+- [`Stringable`](https://php.net/stringable) interface
 - [`fdiv`](https://php.net/fdiv)
-- `ValueError` class
-- `UnhandledMatchError` class
+- [`ValueError`](https://php.net/valueerror) class
+- [`UnhandledMatchError`](https://php.net/unhandledmatcherror) class
 - `FILTER_VALIDATE_BOOL` constant
 - [`get_debug_type`](https://php.net/get_debug_type)
+- [`PhpToken`](https://php.net/phptoken) class
 - [`preg_last_error_msg`](https://php.net/preg_last_error_msg)
 - [`str_contains`](https://php.net/str_contains)
 - [`str_starts_with`](https://php.net/str_starts_with)
diff --git a/vendor/symfony/polyfill-php80/Resources/stubs/PhpToken.php b/vendor/symfony/polyfill-php80/Resources/stubs/PhpToken.php
new file mode 100644
index 000000000..72f10812b
--- /dev/null
+++ b/vendor/symfony/polyfill-php80/Resources/stubs/PhpToken.php
@@ -0,0 +1,7 @@
+<?php
+
+if (\PHP_VERSION_ID < 80000 && \extension_loaded('tokenizer')) {
+    class PhpToken extends Symfony\Polyfill\Php80\PhpToken
+    {
+    }
+}
diff --git a/vendor/symfony/polyfill-php80/composer.json b/vendor/symfony/polyfill-php80/composer.json
index 5fe679db3..cd3e9b65f 100644
--- a/vendor/symfony/polyfill-php80/composer.json
+++ b/vendor/symfony/polyfill-php80/composer.json
@@ -30,7 +30,7 @@
     "minimum-stability": "dev",
     "extra": {
         "branch-alias": {
-            "dev-main": "1.23-dev"
+            "dev-main": "1.26-dev"
         },
         "thanks": {
             "name": "symfony/polyfill",

From 3eb73917061b415d7cc0a847cbb647071c22aaf0 Mon Sep 17 00:00:00 2001
From: Mehmood Asghar <mah0001@gmail.com>
Date: Tue, 18 Oct 2022 13:40:34 -0400
Subject: [PATCH 76/79] Update README.md

---
 README.md | 24 ++++++++++++++++++++++--
 1 file changed, 22 insertions(+), 2 deletions(-)

diff --git a/README.md b/README.md
index 5c68c3c61..ba4d1e57b 100644
--- a/README.md
+++ b/README.md
@@ -11,14 +11,34 @@ NADA is an open source microdata cataloging system, compliant with the Data Docu
 * MySQL or Microsoft SQL Server database
 * Apache, IIS or NGINX
 
+### Documentation
+
+User and admin guide - https://ihsn.github.io/nada-documentation/
+
+
 ### Installation
 
-Please see the [NADA installation guide](https://nada.readthedocs.io/en/v5.0/installation-guide.html).
+System requirements and steps for installation - [NADA installation guide](https://ihsn.github.io/nada-documentation/installation-guide/).
 
 
 ### Upgrading from older versions of NADA
 
-Please see the [NADA upgrade guide](https://nada.readthedocs.io/en/v5.0/upgrade-from-4.4-to-5.html).
+Documentation for upgrading from various versions - [NADA upgrade guide](https://ihsn.github.io/nada-documentation/installation-guide/upgrade/).
+
+### Schema guide
+
+NADA supports multiple data types that include `Microdata` (DDI CodeBook 2.5), `Document`, `Table`, `Geospatial`, `Timeseries`, `Visualization` and `Image`. For all data types, documentation is available in the draft guide (https://mah0001.github.io/schema-guide/). See our demo catalog show casing all support data types - https://nada-demo.ihsn.org/index.php/catalog/
+
+### API documentation
+
+The API documentation is available in OpenAPI/Swagger format here -  https://ihsn.github.io/nada-api-redoc/catalog-admin/
+
+For Getting started with the API, read the `Administrator Guide` section which covers both using the web interface and the API - https://ihsn.github.io/nada-documentation/getting-started/#publishing-a-document
+
+### API Client tools
+
+* R package - https://github.com/mah0001/nadar
+* Python package - https://pypi.org/project/pynada/
 
 
 ## Versioning

From 63409efc899bbdbd67c7c4fae923e27f30186fb9 Mon Sep 17 00:00:00 2001
From: Mehmood Asghar <mah0001@gmail.com>
Date: Mon, 24 Oct 2022 09:15:42 -0400
Subject: [PATCH 77/79] Fix for api endpoint datasets/generate_pdf

---
 api-documentation/catalog-admin/swagger.yaml |  2 +-
 application/controllers/api/Datasets.php     | 34 +++++---------------
 2 files changed, 9 insertions(+), 27 deletions(-)

diff --git a/api-documentation/catalog-admin/swagger.yaml b/api-documentation/catalog-admin/swagger.yaml
index cab5cb618..d420dbadb 100644
--- a/api-documentation/catalog-admin/swagger.yaml
+++ b/api-documentation/catalog-admin/swagger.yaml
@@ -1416,7 +1416,7 @@ paths:
           - ApiKeyAuth: []
   
   /datasets/generate_pdf/{datasetIDNo}:
-      put:
+      post:
         tags:
           - Survey
         summary: Generate PDF
diff --git a/application/controllers/api/Datasets.php b/application/controllers/api/Datasets.php
index 96faf767c..3b73df476 100644
--- a/application/controllers/api/Datasets.php
+++ b/application/controllers/api/Datasets.php
@@ -2016,43 +2016,25 @@ function generate_pdf_post($idno=null)
 			$log_threshold= $this->config->item("log_threshold");
 			$this->config->set_item("log_threshold",0);	//disable logging temporarily
 			
-			$report_link='';		
 			$params=array('codepage'=>$pdf_options['report_lang']);
 
 			$this->load->library('pdf_report',$params);// e.g. 'codepage' = 'zh-CN';
 			$this->load->library('DDI_Browser','','DDI_Browser');
 				
-			//get ddi file path from db
-			$ddi_file=$this->Catalog_model->get_survey_ddi_path($sid);
 			$survey_folder=$this->Catalog_model->get_survey_path_full($sid);
 			
-			if ($ddi_file===FALSE || !file_exists($ddi_file)){
-				throw new Exception('FILE_NOT_FOUND: '. $ddi_file);
-			}
-		
 			//output report file name
 			$report_file=unix_path($survey_folder.'/ddi-documentation-'.$this->config->item("language").'-'.$sid.'.pdf');
 						
-			if ($report_link=='')
-			{			
-				//change error logging to 0	
-				$log_threshold= $this->config->item("log_threshold");
-				$this->config->set_item("log_threshold",0);
-
-				$start_time=date("H:i:s",date("U"));
-
-				//write PDF report to a file
-				$this->pdf_report->generate($report_file,$ddi_file,$pdf_options);
-				$end_time=date("H:i:s",date("U"));
-				
-				//log
-				$this->db_logger->write_log('survey','report generated '.$start_time.' -  '. $end_time,'ddi-report',$sid);
+			//change error logging to 0	
+			$log_threshold= $this->config->item("log_threshold");
+			$this->config->set_item("log_threshold",0);
 
-				//reset threshold level			
-				$this->config->set_item("log_threshold",$log_threshold);
-				
-				$report_link=$report_file;
-			}
+			//write PDF report to a file
+			$this->pdf_report->generate($sid,$report_file,$pdf_options);			
+			
+			//reset threshold level			
+			$this->config->set_item("log_threshold",$log_threshold);
 			
 			$response=array(
 				'status'=>  'success',

From 670ce18b29a1d92169596ae498cf39759a302631 Mon Sep 17 00:00:00 2001
From: ch-ricardor <ca.ricardor@gmail.com>
Date: Wed, 16 Nov 2022 11:13:23 +0100
Subject: [PATCH 78/79] Chunk Uploader merge

---
 application/libraries/Chunked_uploader.php | 10 ----------
 1 file changed, 10 deletions(-)

diff --git a/application/libraries/Chunked_uploader.php b/application/libraries/Chunked_uploader.php
index 4880a2c75..a5d658bd1 100644
--- a/application/libraries/Chunked_uploader.php
+++ b/application/libraries/Chunked_uploader.php
@@ -359,21 +359,11 @@ public function __construct()
 		// clean the filename for security
 		$this->_name = preg_replace('/[^\w\._]+/', '_', $name);
 		// attempt to get the content-type from $_SERVER array
-<<<<<<< HEAD
-		$this->_content_type = (isset($_SERVER["HTTP_CONTENT_TYPE"]))
-				? $_SERVER["HTTP_CONTENT_TYPE"]
-				: (
-					 (isset($_SERVER["CONTENT_TYPE"]))
-						? $_SERVER["CONTENT_TYPE"]
-						: ''
-				   );
-=======
 		$this->_content_type = (isset($_SERVER["HTTP_CONTENT_TYPE"])) ? $_SERVER["HTTP_CONTENT_TYPE"]: '';
 		
 		if ($this->_content_type==''){
 			$this->_content_type=(isset($_SERVER["CONTENT_TYPE"])) ? $_SERVER["CONTENT_TYPE"]: '';
 		}
->>>>>>> 98c5587e4833f56a75e39c8fa7fd5be5b9471044
 	}
 
 	/**

From fe0e145ee47af709590cc7e6885f435eef69dc7a Mon Sep 17 00:00:00 2001
From: ch-ricardor <ca.ricardor@gmail.com>
Date: Fri, 18 Nov 2022 11:50:26 +0100
Subject: [PATCH 79/79] Batch Upload Add Study Bootstrap Clean uploaded files

---
 application/controllers/admin/Catalog.php     | 42 +++++++++----
 .../views/catalog/ddi_batch_import.php        | 59 ++++++++++++++-----
 application/views/catalog/ddi_upload_form.php | 20 +++++--
 application/views/catalog/edit_study.php      | 19 +++---
 application/views/catalog/index.php           | 18 +++++-
 5 files changed, 115 insertions(+), 43 deletions(-)

diff --git a/application/controllers/admin/Catalog.php b/application/controllers/admin/Catalog.php
index f452149a4..f86f50548 100644
--- a/application/controllers/admin/Catalog.php
+++ b/application/controllers/admin/Catalog.php
@@ -64,12 +64,16 @@ public function __construct()
 	 */
 	function index()
 	{
+		// @TODO: Confirm Cleaning of Erros and Messages from previous Forms
+		$this->session->unset_userdata('error');
+		$this->session->unset_userdata('message');
+
 		$this->template->set_template('admin5');
 		//css files
 		$inline_styles=$this->load->view('catalog/catalog_style',NULL, TRUE);
-    
-    $this->template->add_css($inline_styles,'embed');
-    
+
+		$this->template->add_css($inline_styles,'embed');
+
 		//js files
 		$this->template->add_js('var site_url="'.site_url().'";','embed');
 		$this->template->add_js('javascript/catalog_admin.js');
@@ -317,7 +321,6 @@ function upload()
 		if ($this->form_validation->run() == FALSE) {
 
 			$this->template->set_template('admin');
-
 			$content=$this->load->view('catalog/ddi_upload_form', array('active_repo'=>$this->active_repo),true);
 			$this->template->write('content', $content,true);
 	  		$this->template->render();
@@ -328,6 +331,7 @@ function upload()
 
 			if (!empty($new_survey)){
 				// RRE Clear Errors
+				// @TODO: Review if messages should be unset too
 				$this->session->unset_userdata('error');
 				//redirect('admin/catalog/edit/'.$result['sid'],'refresh');
 				redirect('admin/catalog/edit/'.$new_survey,'refresh');
@@ -389,6 +393,7 @@ function add_study()
 		}
 
 		// Uploads the xml File
+		// @TODO: review if the file should reamin in the directory after the process is executed
 		$temp_upload_folder=$this->get_temp_upload_folder();
 
 		//upload class configurations for DDI
@@ -399,7 +404,7 @@ function add_study()
 
 		$this->load->library('upload', $config);
 
-
+		// @TODO: Review ONLY XML file is in this reference, RDF files ? or XML RDF pair?
 		$ddi_upload_result=$this->upload->do_upload('userfile');
 
 		$uploaded_ddi_path=NULL;
@@ -434,7 +439,7 @@ function add_study()
 			'overwrite'=>$overwrite
 		);
 
-		try{
+		try {
 			//import ddi
 			$result=$this->ddi2_import->import($params);
 
@@ -448,27 +453,38 @@ function add_study()
 			return $result['sid'];
 		}
 		// @TODO: Find how to replicate this error
-		catch(ValidationException $e){
+		catch (ValidationException $e){
 			$error_output=array(
 				'status'=>'failed',
 				'message'=>$e->getMessage(),
 				'errors'=>$e->GetValidationErrors()
 			);
 
-			$error_str='Validation Error<br/><pre class="error-pre">'.print_r($e->GetValidationErrors(),true).'</pre>';
+// RRE  @TODO: Multiple errors in the xml validation
+			// $error_str='Validation Error<br/><pre class="error-pre">'.print_r($e->GetValidationErrors(),true).'</pre>';
+			$arr_errors=$e->GetValidationErrors();
+			$error_str='Validation Error<br/><pre class="error-pre">';
+			foreach ($arr_errors as $key_error) {
+				$error_str.=$key_error['message'].'<br>';
+			}
+			$error_str.='</pre>';
 			$this->session->set_flashdata('error', $error_str);
 			//redirect('admin/catalog/add_study','refresh');return;
 			//redirect('admin/catalog/upload','refresh');
 
-			// @TODO: Find how to replicate this error
-return;
+			return NULL;
 		}
-		catch(Exception $e){
+		catch (Exception $e){
 			$this->session->set_flashdata('error', $e->getMessage());
 			//redirect('admin/catalog/add_study','refresh');return;
 			//redirect('admin/catalog/upload','refresh');
 			return NULL;
 		}
+		finally {
+			// @TODO: Review if this is OK.
+			unlink($ddi_path);
+
+		}
 	}
 
 
@@ -556,7 +572,7 @@ private function __replace_ddi($sid,$new_ddi_file)
 		 if ($new_idno!==$this->sanitize_filename($new_idno)){
 			 throw new Exception(t('IDNO_INVALID_FORMAT').': '.$new_idno);
 		 }
- 
+
 		 //check if the study already exists, find the sid		
 		$new_ddi_sid=$this->dataset_manager->find_by_idno($new_idno);
 
@@ -801,6 +817,8 @@ function batch_import()
 
 		if (!file_exists($import_folder) ){
 			// @TODO: Review datasets directory does not exist either
+			// @TODO: Review if this default should set config->item('ddi_import_folder')
+			//	The next calls to config->item('ddi_import_folder') will fail if this is not set.
 			// $import_folder="/datasets";
 			$import_folder="/datafiles/tmp";
 		}
diff --git a/application/views/catalog/ddi_batch_import.php b/application/views/catalog/ddi_batch_import.php
index 33c9a890b..1b830d015 100644
--- a/application/views/catalog/ddi_batch_import.php
+++ b/application/views/catalog/ddi_batch_import.php
@@ -27,15 +27,33 @@
 
 <div class="container-fluid">
 
-<?php $error=$this->session->flashdata('error');?>
-<?php echo ($error!="") ? '<div class="alert alert-danger">'.$error.'</div>' : '';?>
+<?php $error=$this->session->flashdata('error'); ?>
+<?php if ($error!=""):?>
+        <div class="alert alert-danger alert-dismissible">
+                <button type="button" class="close" data-dismiss="alert" aria-label="Close">
+                        <span aria-hidden="true">×</span>
+                </button><?php echo $error;?>
+        </div>
+<?php endif;?>
+
+<?php $message=$this->session->flashdata('message');?>
+<?php if ($message!=""):?>
+        <div class="alert alert-success alert-dismissible">
+                <button type="button" class="close" data-dismiss="alert" aria-label="Close">
+                        <span aria-hidden="true">×</span>
+                </button><?php echo $message;?>
+        </div>
+<?php endif;?>
 
 <h1 class="page-title"><?php echo t('batch_import_title');?> <span class="label label-default"><?php echo $repositories_list[$active_repository];?></span></h1>
 <div>
 
 <?php if ( count($files)==0 || $files===false) :?>
-    <div class="alert alert-warning">
-		<?php echo sprintf(t('import_ddi_no_files_found'),$this->config->item('ddi_import_folder'));?>
+    <div class="alert alert-warning alert-dismissible">
+	<button type="button" class="close" data-dismiss="alert" aria-label="Close">
+		<span aria-hidden="true">×</span>
+	</button>
+	<?php echo sprintf(t('import_ddi_no_files_found'),$this->config->item('ddi_import_folder'));?>
     </div>
     <?php echo $batch_uploader;?>
     <?php return; ?>
@@ -58,7 +76,7 @@
 <div class="note" id="batch-import-box" style="display:none;" >
 <!--    <div id="batch-import-processing" style="padding:5px;border-bottom:1px solid gainsboro;margin-bottom:10px;">Processing survey...</div>
 -->
-    <div id="batch-import-processing" class="alert alert-info">Processing survey...</div>
+    <div id="batch-import-processing" class="alert alert-info alert-dismissible">Processing survey...</div>
     <div id="batch-import-log" ></div>
 </div>
 
@@ -73,7 +91,7 @@
 
 <div class="uploader-body state-hidden"><?php echo $batch_uploader;?></div>
 
-<table class="table table-striped" width="100%" cellspacing="0" cellpadding="0"> 
+<table class="table table-striped" width="100%" cellspacing="0" cellpadding="0">
 <tr align="left" class="header">
 	<th><input type="checkbox" value="-1" id="chk_toggle"/></th>
     <th><?php echo t('name');?></th>
@@ -94,7 +112,7 @@
 
 </div>
 <script language="javascript">
-//translations	
+//translations
 var i18n=
 {
 'cancel_import_process':"<?php echo t('cancel_import_process');?>",
@@ -146,7 +164,10 @@
 			this.import_single(this.queue[this.queue_idx++].id);
 		}
 		else{
-			$("#batch-import-processing").html(i18n.import_completed);
+			html='<button type="button" class="close" data-dismiss="alert" aria-label="Close">';
+			html+='<span aria-hidden="true">×</span></button>';
+			html+=i18n.import_completed;
+			$("#batch-import-processing").html(html);
 			this.isprocessing=false;
 		}
 
@@ -174,12 +195,18 @@ function func_data(data){
 			 if (data.success){
 				obj.queue[obj.queue_idx-1].status=data.success;
 				// $("#batch-import-log").append('<div class="log" style="color:green;">#' + (obj.queue_idx) + ': '  + obj.queue[obj.queue_idx-1].name + ' - ' + data.success+ '</div>');
-				$("#batch-import-log").append('<div class="alert alert-success">#' + (obj.queue_idx) + ': '  + obj.queue[obj.queue_idx-1].name + ' - ' + data.success+ '</div>');
+				$("#batch-import-log").append('<div class="alert alert-success alert-dismissible">' +
+					'<button type="button" class="close" data-dismiss="alert" aria-label="Close">' +
+					'<span aria-hidden="true">×</span></button>' +
+					'#' + (obj.queue_idx) + ': '  + obj.queue[obj.queue_idx-1].name + ' - ' + data.success+ '</div>');
 			 }
 			 else{
 			 	obj.queue[obj.queue_idx-1].status=data.error;
 				//$("#batch-import-log").append('<div class="log" style="color:red">#' + (obj.queue_idx) + ': '  +  obj.queue[obj.queue_idx-1].name + ' - ' + data.error+ '</div>');
-				$("#batch-import-log").append('<div class="alert alert-danger">#' + (obj.queue_idx) + ': '  +  obj.queue[obj.queue_idx-1].name + ' - ' + data.error+ '</div>');
+				$("#batch-import-log").append('<div class="alert alert-danger alert-dismissible">' +
+					'<button type="button" class="close" data-dismiss="alert" aria-label="Close">' +
+					'<span aria-hidden="true">×</span></button>' +
+					'#' + (obj.queue_idx) + ': '  +  obj.queue[obj.queue_idx-1].name + ' - ' + data.error+ '</div>');
 			 }
 			 obj.process_queue();
 		}//end-func
@@ -196,18 +223,18 @@ function func_data(data){
 //checkbox select/deselect
 jQuery(document).ready(function(){
 	$("#chk_toggle").click(
-			function (e) 
+			function (e)
 			{
-				$('.chk').each(function(){ 
-                    this.checked = (e.target).checked; 
-                }); 
+				$('.chk').each(function(){
+                    this.checked = (e.target).checked;
+                });
 			}
 	);
-	
+
 	$(".batch-uploader").click(function(e){
 		$(".uploader-body").toggleClass("state-hidden");
 	});
-	
+
 });
 
 </script>
diff --git a/application/views/catalog/ddi_upload_form.php b/application/views/catalog/ddi_upload_form.php
index ad75e6832..a71d2c386 100644
--- a/application/views/catalog/ddi_upload_form.php
+++ b/application/views/catalog/ddi_upload_form.php
@@ -24,11 +24,23 @@
 <div class="container-fluid content-container ddi-upload">
 <?php //include 'catalog_page_links.php'; ?>
 
-<?php $error=$this->session->flashdata('error');?>
-<?php echo ($error!="") ? '<div class="alert alert-danger">'.$error.'</div>' : '';?>
+<?php $error=$this->session->flashdata('error'); ?>
+<?php if ($error!=""):?>
+        <div class="alert alert-danger alert-dismissible">
+                <button type="button" class="close" data-dismiss="alert" aria-label="Close">
+                        <span aria-hidden="true">×</span>
+                </button><?php echo $error;?>
+        </div>
+<?php endif;?>
 
 <?php $message=$this->session->flashdata('message');?>
-<?php echo ($message!="") ? '<div class="success">'.$message.'</div>' : '';?>
+<?php if ($message!=""):?>
+        <div class="alert alert-success alert-dismissible">
+                <button type="button" class="close" data-dismiss="alert" aria-label="Close">
+                        <span aria-hidden="true">×</span>
+                </button><?php echo $message;?>
+        </div>
+<?php endif;?>
 
 <?php echo validation_errors(); ?>
 
@@ -69,7 +81,7 @@
   <h2 style="margin:0px;margin-bottom:15px;"><?php echo t('Create new study');?> </h2>
 
 
-  <form class="form"  method="get" action="<?php echo site_url('admin/catalog/create');?>">    
+  <form class="form"  method="get" action="<?php echo site_url('admin/catalog/create');?>">
 
     <div class="form-group">
       <label for="exampleInputEmail1">Select data type</label>
diff --git a/application/views/catalog/edit_study.php b/application/views/catalog/edit_study.php
index 6ae35a347..d144d6bb1 100644
--- a/application/views/catalog/edit_study.php
+++ b/application/views/catalog/edit_study.php
@@ -52,8 +52,8 @@ function toggle(element){
 		//study publish/unpublish
 		$(document.body).on("click","#survey .publish, .survey-publish .publish", function(){
 			var studyid=$(this).attr("data-sid");
-			if ($(this).attr("data-value")==0){				
-				$this=this;				
+			if ($(this).attr("data-value")==0){
+				$this=this;
 				$.post(CI.base_url+'/admin/catalog/publish/'+studyid+'/1?ajax=1', {submit:"submit"}, function( data ) {
 					$($this).attr("data-value",1);
 					$($this).html("<?php echo t('published');?>");
@@ -65,7 +65,7 @@ function toggle(element){
 				});
 			}
 			else{
-				$this=this;	
+				$this=this;
 				$.post(CI.base_url+'/admin/catalog/publish/'+studyid+'/0?ajax=1', {submit:"submit"}, function( data ) {
 					$($this).html("<?php echo t('draft');?>");
 					$($this).attr("data-value",0);
@@ -617,13 +617,16 @@ function set_data_access_display(el)
 
 <div class="container-fluid study-edit-page">
 
-
-<?php $error=$this->session->flashdata('error');?>
-<?php echo ($error!="") ? '<div class="error">'.$error.'</div>' : '';?>
+<?php if ($error!=""):?>
+	<div class="alert alert-danger alert-dismissible">
+		<button type="button" class="close" data-dismiss="alert" aria-label="Close"><span aria-hidden="true">&times;</span></button>
+		<?php echo $error;?>
+	</div>
+<?php endif;?>
 
 <?php $message=$this->session->flashdata('message');?>
 <?php if ($message!=""):?>
-	<div style="margin-top:15px;" class="success alert alert-success alert-dismissible">
+	<div class="alert alert-success alert-dismissible">
 		<button type="button" class="close" data-dismiss="alert" aria-label="Close"><span aria-hidden="true">&times;</span></button>
 		<?php echo $message;?>
 	</div>
@@ -637,7 +640,7 @@ function set_data_access_display(el)
 
 <div class="row">
 <div class="col-md-12 edit-page-header">
-		
+
 	<div class="col-md-11">
 		<h1 class="study-title"><?php echo $title; ?></h1>
 	</div>
diff --git a/application/views/catalog/index.php b/application/views/catalog/index.php
index a7291ac52..36997effb 100644
--- a/application/views/catalog/index.php
+++ b/application/views/catalog/index.php
@@ -11,11 +11,23 @@
 <div class="container-fluid">
 <?php //$this->load->view('catalog/catalog_page_links');?>
 
-<?php $error=$this->session->flashdata('error');?>
-<?php echo ($error!="") ? '<div class="alert alert-danger">'.$error.'</div>' : '';?>
+<?php $error=$this->session->flashdata('error'); ?>
+<?php if ($error!=""):?>
+	<div class="alert alert-danger alert-dismissible">
+		<button type="button" class="close" data-dismiss="alert" aria-label="Close">
+			<span aria-hidden="true">×</span>
+		</button><?php echo $error;?>
+	</div>
+<?php endif;?>
 
 <?php $message=$this->session->flashdata('message');?>
-<?php echo ($message!="") ? '<div class="alert alert-success">'.$message.'</div>' : '';?>
+<?php if ($message!=""):?>
+	<div class="alert alert-success alert-dismissible">
+		<button type="button" class="close" data-dismiss="alert" aria-label="Close">
+			<span aria-hidden="true">×</span>
+		</button><?php echo $message;?>
+	</div>
+<?php endif;?>
 
 <h1 class="page-title">
 	<?php echo t('catalog_maintenance');?>