tmdinosaurcenter
/
tainacan
mirror of https://github.com/tainacan/tainacan
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Separates Colleciton not set error from empty value warning in CSV importer.

This commit is contained in:
mateuswetah 2024-07-01 15:31:25 -03:00
parent f8d7e16f80
commit 6f8989637a
1 changed files with 85 additions and 76 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
src/classes/importer/class-tainacan-csv.php
View File

@ -697,6 +697,7 @@ class CSV extends Importer {
remove_action( 'post_updated', 'wp_save_post_revision' ); remove_action( 'post_updated', 'wp_save_post_revision' );
$collections = $this->get_collections(); $collections = $this->get_collections();
$collection_definition = isset($collections[$collection_index]) ? $collections[$collection_index] : false; $collection_definition = isset($collections[$collection_index]) ? $collections[$collection_index] : false;
if ( !$collection_definition || !is_array($collection_definition) || !isset($collection_definition['id']) || !isset($collection_definition['mapping']) ) { if ( !$collection_definition || !is_array($collection_definition) || !isset($collection_definition['id']) || !isset($collection_definition['mapping']) ) {
$this->add_error_log('Collection misconfigured'); $this->add_error_log('Collection misconfigured');
return false; return false;
@ -712,7 +713,7 @@ class CSV extends Importer {
$Tainacan_Metadata = \Tainacan\Repositories\Metadata::get_instance(); $Tainacan_Metadata = \Tainacan\Repositories\Metadata::get_instance();
$Tainacan_Item_Metadata = \Tainacan\Repositories\Item_Metadata::get_instance(); $Tainacan_Item_Metadata = \Tainacan\Repositories\Item_Metadata::get_instance();
$Tainacan_Items = \Tainacan\Repositories\Items::get_instance(); $Tainacan_Items = \Tainacan\Repositories\Items::get_instance();
$special_columns = false;
$itemMetadataArray = []; $itemMetadataArray = [];
@ -731,7 +732,7 @@ class CSV extends Importer {
$item = new Entities\Item(); $item = new Entities\Item();
} }
if( is_numeric($this->get_transient('item_id')) ) { if ( is_numeric($this->get_transient('item_id')) ) {
if ( $item instanceof Entities\Item && $item->get_id() == $this->get_transient('item_id') ) { if ( $item instanceof Entities\Item && $item->get_id() == $this->get_transient('item_id') ) {
if ( ! $item->can_edit() ) { if ( ! $item->can_edit() ) {
$this->add_error_log("You don't have permission to edit item:" . $item->get_id() ); $this->add_error_log("You don't have permission to edit item:" . $item->get_id() );
@ -748,12 +749,12 @@ class CSV extends Importer {
} }
if( $this->get_transient('item_id') && $item instanceof Entities\Item && is_numeric($item->get_id()) && $item->get_id() > 0 && $this->get_transient('item_action') == 'ignore' ){ if ( $this->get_transient('item_id') && $item instanceof Entities\Item && is_numeric($item->get_id()) && $item->get_id() > 0 && $this->get_transient('item_action') == 'ignore' ){
$this->add_log('Ignoring repeated Item'); $this->add_log('Ignoring repeated Item');
return $item; return $item;
} }
if( is_array( $processed_item ) ) { if ( is_array( $processed_item ) ) {
foreach ( $processed_item as $metadatum_source => $values ) { foreach ( $processed_item as $metadatum_source => $values ) {
if ($metadatum_source == 'special_document' || if ($metadatum_source == 'special_document' ||
@ -820,7 +821,17 @@ class CSV extends Importer {
} }
} }
if( (!empty( $itemMetadataArray ) || $special_columns) && $collection instanceof Entities\Collection ) { if ( !( $collection instanceof Entities\Collection ) ) {
$this->add_error_log( 'Collection not set');
return false;
}
if ( ( empty( $itemMetadataArray ) && !$special_columns ) ) {
$this->add_log( 'Found one empty value' );
return false;
}
$item->set_collection( $collection ); $item->set_collection( $collection );
if ( !$updating_item ) { if ( !$updating_item ) {
if( $item->validate() ) { if( $item->validate() ) {
@ -833,8 +844,10 @@ class CSV extends Importer {
} else { } else {
$insertedItem = $item; $insertedItem = $item;
} }
global $wpdb; global $wpdb;
$wpdb->query( 'SET autocommit = 0;' ); $wpdb->query( 'SET autocommit = 0;' );
foreach ( $itemMetadataArray as $itemMetadata ) { foreach ( $itemMetadataArray as $itemMetadata ) {
if($itemMetadata instanceof Entities\Item_Metadata_Entity ) { if($itemMetadata instanceof Entities\Item_Metadata_Entity ) {
$itemMetadata->set_item( $insertedItem ); // *I told you $itemMetadata->set_item( $insertedItem ); // *I told you
@ -881,7 +894,7 @@ class CSV extends Importer {
$insertedItem->set_status('publish' ); $insertedItem->set_status('publish' );
} }
if($insertedItem->validate()) { if ( $insertedItem->validate() ) {
$insertedItem = $Tainacan_Items->update( $insertedItem ); $insertedItem = $Tainacan_Items->update( $insertedItem );
$this->after_inserted_item( $insertedItem, $collection_index ); $this->after_inserted_item( $insertedItem, $collection_index );
} else { } else {
@ -891,10 +904,6 @@ class CSV extends Importer {
return false; return false;
} }
return $insertedItem; return $insertedItem;
} else {
$this->add_error_log( 'Collection not set');
return false;
}
} }
private function is_assoc(array $arr) { private function is_assoc(array $arr) {