Merge pull request #487 from tainacan/feature/383

Feature/383
This commit is contained in:
Vinícius Nunes Medeiros 2021-02-12 09:39:15 -03:00 committed by GitHub
commit 8dfa7b5f43
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
6 changed files with 840 additions and 837 deletions

View File

@ -248,7 +248,7 @@ class REST_Background_Processes_Controller extends REST_Controller {
if ( !isset($body['status']) || ($body['status'] != 'open' && $body['status'] != 'closed') ) {
return new \WP_REST_Response([
'error_message' => __('Status must be informed', 'tainacan' ),
'session_id' => $session_id
'session_id' => $id
], 400);
}

View File

@ -108,12 +108,13 @@ abstract class Background_Process extends \Tainacan_WP_Background_Process {
$this->table,
[
'data' => maybe_serialize($this->data),
'progress_value' => 0,
'user_id' => get_current_user_id(),
'priority' => $priority,
'action' => $this->action,
'name' => $this->get_name(),
'queued_on' => date('Y-m-d H:i:s'),
'status' => 'waiting'
'status' => 'waiting'
]
);
$this->ID = $wpdb->insert_id;
@ -310,7 +311,7 @@ abstract class Background_Process extends \Tainacan_WP_Background_Process {
$this->close( $batch->key, 'errored' );
$this->debug('Batch closed due to captured error');
$this->unlock_process();
});
$task = $batch;

View File

@ -9,9 +9,9 @@ class Background_Importer extends Background_Process {
*/
protected $action = 'import';
/**
* @var int
*/
/**
* @var int
*/
private $finish_status = 1;
public function __construct() {
@ -20,11 +20,11 @@ class Background_Importer extends Background_Process {
}
/**
* @param $status
*/
* @param $status
*/
private function set_finish_status( $status ){
$this->finish_status = $status;
}
$this->finish_status = $status;
}
function task($batch) {
@ -41,10 +41,10 @@ class Background_Importer extends Background_Process {
$this->write_log($key, $object->get_log());
$this->write_error_log($key, $object->get_error_log());
$batch->progress_label = $object->get_progress_label();
$batch->progress_value = $object->get_progress_value();
$batch->progress_label = $object->get_progress_label();
$batch->progress_value = $object->get_progress_value();
$batch->data = $object->_to_Array(true);
$batch->data = $object->_to_Array(true);
if (true === $object->get_abort()) {
throw new \Exception('Process aborted by Importer');

View File

@ -5,14 +5,14 @@ use Tainacan\Entities;
abstract class Importer {
/**
* The ID for this importer session
*
* When creating a new importer session via API, an id is returned and used to access this
* importer instance. This is temporarily stored in the database and discarded after the bg process is triggered
*
* @var identifier
*/
/**
* The ID for this importer session
*
* When creating a new importer session via API, an id is returned and used to access this
* importer instance. This is temporarily stored in the database and discarded after the bg process is triggered
*
* @var identifier
*/
private $id;
/**
@ -136,7 +136,7 @@ abstract class Importer {
'tmp_file'
];
public function __construct($attributess = array()) {
public function __construct($attributess = array()) {
$this->id = uniqid();
@ -181,41 +181,41 @@ abstract class Importer {
/////////////////////
// Getters and setters
/**
* @return string
*/
public function get_id(){
return $this->id;
}
/**
* @return string
*/
public function get_id(){
return $this->id;
}
/**
* Set URL
* @param $url string
* @return bool
*/
public function set_url($url)
{
if(!empty($url) && !is_array($url))
{
$this->url = rtrim(trim($url), "/");
return true;
}
/**
* Set URL
* @param $url string
* @return bool
*/
public function set_url($url)
{
if(!empty($url) && !is_array($url))
{
$this->url = rtrim(trim($url), "/");
return true;
}
return false;
}
return false;
}
/**
* @return string or bool
*/
public function get_url()
{
if(!empty($this->url))
{
return $this->url;
}
/**
* @return string or bool
*/
public function get_url()
{
if(!empty($this->url))
{
return $this->url;
}
return false;
}
return false;
}
public function get_current_step() {
return $this->current_step;
@ -250,12 +250,12 @@ abstract class Importer {
}
public function get_tmp_file(){
return $this->tmp_file;
}
return $this->tmp_file;
}
public function set_tmp_file($filepath){
$this->tmp_file = $filepath;
}
$this->tmp_file = $filepath;
}
public function get_collections() {
return $this->collections;
@ -266,13 +266,13 @@ abstract class Importer {
}
/**
* Gets the options for this importer, including default values for options
* that were not set yet.
* @return array Importer options
*/
public function get_options() {
return array_merge($this->default_options, $this->options);
}
* Gets the options for this importer, including default values for options
* that were not set yet.
* @return array Importer options
*/
public function get_options() {
return array_merge($this->default_options, $this->options);
}
/**
* Set the options array
@ -294,13 +294,13 @@ abstract class Importer {
}
public function set_steps($steps) {
$this->steps = $steps;
}
public function set_steps($steps) {
$this->steps = $steps;
}
public function get_steps() {
return $this->steps;
}
return $this->steps;
}
private function get_transients() {
@ -323,33 +323,33 @@ abstract class Importer {
// Utilities
/**
* @param $file File to be managed by importer
* @return bool
*/
public function add_file( $file ){
$new_file = $this->upload_file( $file );
if ( is_numeric( $new_file ) ) {
/**
* @param $file File to be managed by importer
* @return bool
*/
public function add_file( $file ){
$new_file = $this->upload_file( $file );
if ( is_numeric( $new_file ) ) {
$this->tmp_file = get_attached_file( $new_file );
return true;
} else {
return false;
}
}
} else {
return false;
}
}
/**
* log the actions from importer
*
* @param $type
* @param $messagelog
*/
public function add_log($message ){
$this->log[] = $message;
}
/**
* log the actions from importer
*
* @param $type
* @param $messagelog
*/
public function add_log($message ){
$this->log[] = $message;
}
public function add_error_log($message ){
$this->error_log[] = $message;
}
$this->error_log[] = $message;
}
public function add_collection(array $collection) {
if (isset($collection['id'])) {
@ -367,17 +367,17 @@ abstract class Importer {
}
}
/**
* internal function to upload the file
*
* @param $path_file
* @return array $response
*/
private function upload_file( $file_array ){
//$name = basename( $path_file );
//$file_array['name'] = $name;
//$file_array['tmp_name'] = $path_file;
//$file_array['size'] = filesize( $path_file );
/**
* internal function to upload the file
*
* @param $path_file
* @return array $response
*/
private function upload_file( $file_array ){
//$name = basename( $path_file );
//$file_array['name'] = $name;
//$file_array['tmp_name'] = $path_file;
//$file_array['size'] = filesize( $path_file );
if ( !function_exists('media_handle_upload') ) {
require_once(ABSPATH . "wp-admin" . '/includes/image.php');
@ -386,36 +386,36 @@ abstract class Importer {
}
//var_dump(media_handle_sideload( $file_array, 0 )); die;
return media_handle_sideload( $file_array, 0 );
}
}
/**
* get the content form url and creates a file
*
* @param $url
* @return array
*/
public function fetch_from_remote( $url ){
$tmp = wp_remote_get( $url );
if( !is_wp_error($tmp) && isset( $tmp['body'] ) ){
$file = fopen( $this->get_id().'.txt', 'w' );
fwrite( $file, $tmp['body'] );
fclose( $file );
return $this->add_file( $this->get_id().'.txt' );
}
}
/**
* get the content form url and creates a file
*
* @param $url
* @return array
*/
public function fetch_from_remote( $url ){
$tmp = wp_remote_get( $url );
if( !is_wp_error($tmp) && isset( $tmp['body'] ) ){
$file = fopen( $this->get_id().'.txt', 'w' );
fwrite( $file, $tmp['body'] );
fclose( $file );
return $this->add_file( $this->get_id().'.txt' );
}
}
/**
* Gets one option from the options array.
*
* Checks if option exist or if it have a default value. Otherwise return an empty string
*
* @param string $key the desired option
* @return mixed the option value, the default value or an empty string
*/
public function get_option($key) {
$options = $this->get_options();
return isset($options[$key]) ? $options[$key] : '';
}
/**
* Gets one option from the options array.
*
* Checks if option exist or if it have a default value. Otherwise return an empty string
*
* @param string $key the desired option
* @return mixed the option value, the default value or an empty string
*/
public function get_option($key) {
$options = $this->get_options();
return isset($options[$key]) ? $options[$key] : '';
}
/**
* Adds a new method accepeted by the importer
@ -464,15 +464,15 @@ abstract class Importer {
return null;
}
public function is_finished()
{
if($this->current_step >= count($this->steps))
{
return true;
}
public function is_finished()
{
if($this->current_step >= count($this->steps))
{
return true;
}
return false;
}
return false;
}
/**
* Cancel Scheduled abortion at the end of run()
@ -628,26 +628,26 @@ abstract class Importer {
// Abstract methods
/**
* get the metadata of file/url to allow mapping
* should return an array
*
* Used when $manual_mapping is set to true, to build the mapping interface
*
* @return array $metadata_source the metadata from the source
*/
public function get_source_metadata() {}
/**
* get the metadata of file/url to allow mapping
* should return an array
*
* Used when $manual_mapping is set to true, to build the mapping interface
*
* @return array $metadata_source the metadata from the source
*/
public function get_source_metadata() {}
/**
* get values for a single item
*
* @param $index
* @return array with metadatum_source's as the index and values for the
* item
*
* Ex: [ 'Metadatum1' => 'value1', 'Metadatum2' => [ 'value2','value3' ]
*/
abstract public function process_item( $index, $collection_id );
/**
* get values for a single item
*
* @param $index
* @return array with metadatum_source's as the index and values for the
* item
*
* Ex: [ 'Metadatum1' => 'value1', 'Metadatum2' => [ 'value2','value3' ]
*/
abstract public function process_item( $index, $collection_id );
@ -679,11 +679,11 @@ abstract class Importer {
////////////////////////////////////////
// Core methods
/**
* process an item from the collections queue
*
*/
public function process_collections() {
/**
* process an item from the collections queue
*
*/
public function process_collections() {
$current_collection = $this->get_current_collection();
$collections = $this->get_collections();
@ -705,7 +705,7 @@ abstract class Importer {
}
return $this->next_item();
}
}
protected function next_item() {
@ -718,8 +718,8 @@ abstract class Importer {
$this->set_current_collection_item($current_collection_item);
if( $this->get_transient('change_total') ){
$collection['total_items'] = $this->get_transient('change_total');
}
$collection['total_items'] = $this->get_transient('change_total');
}
if ($current_collection_item >= $collection['total_items']) {
return $this->next_collection();
@ -763,23 +763,23 @@ abstract class Importer {
return false;
}
/**
* insert processed item from source to Tainacan
*
* @param array $processed_item Associative array with metadatum source's as index with
* its value or values
* @param integet $collection_index The index in the $this->collections array of the collection the item is beeing inserted into
*
* @return Tainacan\Entities\Item Item inserted
*/
public function insert( $processed_item, $collection_index ) {
/**
* insert processed item from source to Tainacan
*
* @param array $processed_item Associative array with metadatum source's as index with
* its value or values
* @param integet $collection_index The index in the $this->collections array of the collection the item is beeing inserted into
*
* @return Tainacan\Entities\Item Item inserted
*/
public function insert( $processed_item, $collection_index ) {
remove_action( 'post_updated', 'wp_save_post_revision' );
$collections = $this->get_collections();
$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']) ) {
$this->add_error_log('Collection misconfigured');
return false;
return false;
}
$collection = \Tainacan\Repositories\Collections::get_instance()->fetch($collection_definition['id']);
@ -790,96 +790,96 @@ abstract class Importer {
}
$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->disable_logs();
$Tainacan_Metadata->disable_logs();
$Tainacan_Item_Metadata->disable_logs();
$item = new Entities\Item( ( $this->get_transient('item_id') ) ? $this->get_transient('item_id') : 0 );
$item = new Entities\Item( ( $this->get_transient('item_id') ) ? $this->get_transient('item_id') : 0 );
$itemMetadataArray = [];
if( is_array( $processed_item ) ){
foreach ( $processed_item as $metadatum_source => $values ){
$tainacan_metadatum_id = array_search( $metadatum_source, $collection_definition['mapping'] );
$metadatum = $Tainacan_Metadata->fetch( $tainacan_metadatum_id );
if( is_array( $processed_item ) ){
foreach ( $processed_item as $metadatum_source => $values ){
$tainacan_metadatum_id = array_search( $metadatum_source, $collection_definition['mapping'] );
$metadatum = $Tainacan_Metadata->fetch( $tainacan_metadatum_id );
if( $metadatum instanceof Entities\Metadatum ){
$singleItemMetadata = new Entities\Item_Metadata_Entity( $item, $metadatum); // *empty item will be replaced by inserted in the next foreach
$singleItemMetadata->set_value( $values );
$itemMetadataArray[] = $singleItemMetadata;
} else {
if( $metadatum instanceof Entities\Metadatum ){
$singleItemMetadata = new Entities\Item_Metadata_Entity( $item, $metadatum); // *empty item will be replaced by inserted in the next foreach
$singleItemMetadata->set_value( $values );
$itemMetadataArray[] = $singleItemMetadata;
} else {
$this->add_error_log('Metadata ' . $metadatum_source . ' not found');
}
}
}
}
}
if( !empty( $itemMetadataArray ) && $collection instanceof Entities\Collection ){
if( !empty( $itemMetadataArray ) && $collection instanceof Entities\Collection ){
$item->set_collection( $collection );
if( $item->validate() ){
if( $item->validate() ){
$insertedItem = $Tainacan_Items->insert( $item );
} else {
$this->add_error_log( 'Error inserting item' );
$this->add_error_log( $item->get_errors() );
return false;
}
} else {
$this->add_error_log( 'Error inserting item' );
$this->add_error_log( $item->get_errors() );
return false;
}
foreach ( $itemMetadataArray as $itemMetadata ) {
$itemMetadata->set_item( $insertedItem ); // *I told you
foreach ( $itemMetadataArray as $itemMetadata ) {
$itemMetadata->set_item( $insertedItem ); // *I told you
if( $itemMetadata->validate() ){
if( $itemMetadata->validate() ){
$result = $Tainacan_Item_Metadata->insert( $itemMetadata );
} else {
$this->add_error_log('Error saving value for ' . $itemMetadata->get_metadatum()->get_name());
$this->add_error_log($itemMetadata->get_errors());
continue;
}
} else {
$this->add_error_log('Error saving value for ' . $itemMetadata->get_metadatum()->get_name());
$this->add_error_log($itemMetadata->get_errors());
continue;
}
//if( $result ){
// $values = ( is_array( $itemMetadata->get_value() ) ) ? implode( PHP_EOL, $itemMetadata->get_value() ) : $itemMetadata->get_value();
// $this->add_log( 'Item ' . $insertedItem->get_id() .
// ' has inserted the values: ' . $values . ' on metadata: ' . $itemMetadata->get_metadatum()->get_name() );
//} else {
// $this->add_error_log( 'Item ' . $insertedItem->get_id() . ' has an error' );
//}
//if( $result ){
// $values = ( is_array( $itemMetadata->get_value() ) ) ? implode( PHP_EOL, $itemMetadata->get_value() ) : $itemMetadata->get_value();
// $this->add_log( 'Item ' . $insertedItem->get_id() .
// ' has inserted the values: ' . $values . ' on metadata: ' . $itemMetadata->get_metadatum()->get_name() );
//} else {
// $this->add_error_log( 'Item ' . $insertedItem->get_id() . ' has an error' );
//}
}
$insertedItem->set_status('publish' );
if($insertedItem->validate()) {
if($insertedItem->validate()) {
$insertedItem = $Tainacan_Items->update( $insertedItem );
$this->after_inserted_item( $insertedItem, $collection_index );
} else {
$this->add_error_log( 'Error publishing Item' );
$this->add_error_log( $insertedItem->get_errors() );
return false;
} else {
$this->add_error_log( 'Error publishing Item' );
$this->add_error_log( $insertedItem->get_errors() );
return false;
}
return $insertedItem;
return $insertedItem;
} else {
$this->add_error_log( 'Collection not set');
return false;
}
} else {
$this->add_error_log( 'Collection not set');
return false;
}
}
/**
* allow importers executes process after item is insertes
* @param array $insertedItem Associative array with inserted item
* @param integer $collection_index The index in the $this->collections array of the collection the item is beeing inserted into
* @param integer $collection_index The index in the $this->collections array of the collection the item is beeing inserted into
*
*/
public function after_inserted_item($insertedItem, $collection_index){}
/**
* runs one iteration
*/
public function run(){
/**
* runs one iteration
*/
public function run(){
if ($this->is_finished()) {
return false;
@ -911,41 +911,41 @@ abstract class Importer {
}
return $return;
}
}
/**
* @param $metadata_description
* @param $collection_id
* @return bool
* @throws \Exception
*/
public function create_new_metadata( $metadata_description, $collection_id, $parent_id = null){
$taxonomy_repo = \Tainacan\Repositories\Taxonomies::get_instance();
$metadata_repo = \Tainacan\Repositories\Metadata::get_instance();
/**
* @param $metadata_description
* @param $collection_id
* @return bool
* @throws \Exception
*/
public function create_new_metadata( $metadata_description, $collection_id, $parent_id = null){
$taxonomy_repo = \Tainacan\Repositories\Taxonomies::get_instance();
$metadata_repo = \Tainacan\Repositories\Metadata::get_instance();
if(is_array($metadata_description)) {
$parent_metadata_description = key($metadata_description);
$parent_compound = $this->create_new_metadata($parent_metadata_description, $collection_id);
if($parent_compound == false) return false;
$children_mapping = [];
foreach($metadata_description[$parent_metadata_description] as $children_metadata_description) {
$children_compound = $this->create_new_metadata($children_metadata_description, $collection_id, $parent_compound->get_id());
if ( $children_compound == false )
return false;
$children_mapping[$children_compound->get_id()] = $children_metadata_description;
}
return [$parent_compound, $children_mapping];
}
$properties = array_filter( explode('|', $metadata_description) );
if(is_array($metadata_description)) {
$parent_metadata_description = key($metadata_description);
$parent_compound = $this->create_new_metadata($parent_metadata_description, $collection_id);
if($parent_compound == false) return false;
$children_mapping = [];
foreach($metadata_description[$parent_metadata_description] as $children_metadata_description) {
$children_compound = $this->create_new_metadata($children_metadata_description, $collection_id, $parent_compound->get_id());
if ( $children_compound == false )
return false;
$children_mapping[$children_compound->get_id()] = $children_metadata_description;
}
return [$parent_compound, $children_mapping];
}
$properties = array_filter( explode('|', $metadata_description) );
if( is_array($properties) && count($properties) < 2 ){
$properties[1] = 'text';
} else if( !$properties ){
return false;
}
if( is_array($properties) && count($properties) < 2 ){
$properties[1] = 'text';
} else if( !$properties ){
return false;
}
$name = $properties[0];
$type = $properties[1];
$name = $properties[0];
$type = $properties[1];
$supported_types = \Tainacan\Repositories\Metadata::get_instance()->fetch_metadata_types('NAME');
$supported_types = array_map('strtolower', $supported_types);
@ -956,89 +956,89 @@ abstract class Importer {
$type = 'text';
}
$newMetadatum = new Entities\Metadatum();
$newMetadatum->set_name($name);
$newMetadatum = new Entities\Metadatum();
$newMetadatum->set_name($name);
$type = ucfirst($type);
$newMetadatum->set_metadata_type('Tainacan\Metadata_Types\\'.$type);
$newMetadatum->set_collection_id( (isset($collection_id)) ? $collection_id : 'default');
$newMetadatum->set_status('auto-draft');
if($newMetadatum->validate()) {
$newMetadatum = $metadata_repo->insert( $newMetadatum );
} else {
$this->add_log('Error creating metadata ' . $name . ' in collection ' . $collection_id);
$this->add_log($newMetadatum->get_errors());
return false;
}
$newMetadatum->set_status('publish');
$type = ucfirst($type);
$newMetadatum->set_metadata_type('Tainacan\Metadata_Types\\'.$type);
$newMetadatum->set_collection_id( (isset($collection_id)) ? $collection_id : 'default');
$newMetadatum->set_status('auto-draft');
if($newMetadatum->validate()) {
$newMetadatum = $metadata_repo->insert( $newMetadatum );
} else {
$this->add_log('Error creating metadata ' . $name . ' in collection ' . $collection_id);
$this->add_log($newMetadatum->get_errors());
return false;
}
$newMetadatum->set_status('publish');
if( strcmp(strtolower($type), "taxonomy") === 0 ){
$taxonomy = new Entities\Taxonomy();
$taxonomy->set_name($name);
$taxonomy->set_status('publish');
$taxonomy->set_allow_insert('yes');
if( strcmp(strtolower($type), "taxonomy") === 0 ){
$taxonomy = new Entities\Taxonomy();
$taxonomy->set_name($name);
$taxonomy->set_status('publish');
$taxonomy->set_allow_insert('yes');
if( $taxonomy->validate() ){
$inserted_tax = $taxonomy_repo->insert( $taxonomy );
if(is_array($properties) && in_array( 'multiple', $properties) ){
$newMetadatum->set_metadata_type_options([
'taxonomy_id' => $inserted_tax->get_id(),
'allow_new_terms' => 'yes',
'input_type' => 'tainacan-taxonomy-checkbox'
]);
} else {
$newMetadatum->set_metadata_type_options([
'taxonomy_id' => $inserted_tax->get_id(),
'allow_new_terms' => 'no',
'input_type' => 'tainacan-taxonomy-radio'
]);
}
}
}
if( $taxonomy->validate() ){
$inserted_tax = $taxonomy_repo->insert( $taxonomy );
if(is_array($properties) && in_array( 'multiple', $properties) ){
$newMetadatum->set_metadata_type_options([
'taxonomy_id' => $inserted_tax->get_id(),
'allow_new_terms' => 'yes',
'input_type' => 'tainacan-taxonomy-checkbox'
]);
} else {
$newMetadatum->set_metadata_type_options([
'taxonomy_id' => $inserted_tax->get_id(),
'allow_new_terms' => 'no',
'input_type' => 'tainacan-taxonomy-radio'
]);
}
}
}
/*Properties of metadatum*/
if( is_array($properties) && in_array( 'required', $properties)){
$newMetadatum->set_required('yes');
}
/*Properties of metadatum*/
if( is_array($properties) && in_array( 'required', $properties)){
$newMetadatum->set_required('yes');
}
if(is_array($properties) && in_array( 'multiple', $properties) ){
$newMetadatum->set_multiple('yes');
}
if(is_array($properties) && in_array( 'multiple', $properties) ){
$newMetadatum->set_multiple('yes');
}
if( is_array($properties) && in_array( 'display_yes', $properties) ){
$newMetadatum->set_display('yes');
} else if(is_array($properties) && in_array( 'display_no', $properties) ){
$newMetadatum->set_display('no');
} else if(is_array($properties) && in_array( 'display_never', $properties) ){
$newMetadatum->set_display('never');
}
if( is_array($properties) && in_array( 'display_yes', $properties) ){
$newMetadatum->set_display('yes');
} else if(is_array($properties) && in_array( 'display_no', $properties) ){
$newMetadatum->set_display('no');
} else if(is_array($properties) && in_array( 'display_never', $properties) ){
$newMetadatum->set_display('never');
}
if( is_array($properties) && in_array( 'status_public', $properties) ){
$newMetadatum->set_status('publish');
} else if( is_array($properties) && in_array( 'status_private', $properties) ){
$newMetadatum->set_status('private');
}
if( is_array($properties) && in_array( 'status_public', $properties) ){
$newMetadatum->set_status('publish');
} else if( is_array($properties) && in_array( 'status_private', $properties) ){
$newMetadatum->set_status('private');
}
if( is_array($properties) && in_array( 'collection_key_yes', $properties) ){
$newMetadatum->set_collection_key('yes');
} else if( is_array($properties) && in_array( 'collection_key_no', $properties) ){
$newMetadatum->set_collection_key('no');
}
if( is_array($properties) && in_array( 'collection_key_yes', $properties) ){
$newMetadatum->set_collection_key('yes');
} else if( is_array($properties) && in_array( 'collection_key_no', $properties) ){
$newMetadatum->set_collection_key('no');
}
if(isset($parent_id) && $parent_id != null) {
$newMetadatum->set_parent($parent_id);
}
if(isset($parent_id) && $parent_id != null) {
$newMetadatum->set_parent($parent_id);
}
if($newMetadatum->validate()){
$inserted_metadata = $metadata_repo->insert( $newMetadatum );
if($newMetadatum->validate()){
$inserted_metadata = $metadata_repo->insert( $newMetadatum );
$this->add_log('Metadata created: ' . $inserted_metadata->get_name());
return $inserted_metadata;
} else {
$this->add_log('Error creating metadata ' . $name . ' in collection ' . $collection_id);
$this->add_log($newMetadatum->get_errors());
$this->add_log('Metadata created: ' . $inserted_metadata->get_name());
return $inserted_metadata;
} else {
$this->add_log('Error creating metadata ' . $name . ' in collection ' . $collection_id);
$this->add_log($newMetadatum->get_errors());
return false;
}
}
return false;
}
}
}

View File

@ -169,6 +169,7 @@
session_write_close();
if ( $this->is_process_running() ) {
$this->debug('process already running. To die...');
// Background process already running.
wp_die();
}
@ -219,6 +220,7 @@
* in a background process.
*/
protected function is_process_running() {
$this->debug('Checking if process ' . $this->identifier . ' is running:');
if ( get_site_transient( $this->identifier . '_process_lock' ) ) {
// Process already running.
$this->debug('process already running');
@ -236,10 +238,10 @@
* defined in the time_exceeded() method.
*/
protected function lock_process() {
$this->debug('locking process');
$this->debug('locking process: ' . $this->identifier);
$this->start_time = time(); // Set start time of current process.
$lock_duration = ( property_exists( $this, 'queue_lock_time' ) ) ? $this->queue_lock_time : 60; // 1 minute
$max_execution_time = ini_get('max_execution_time');
$lock_duration = ( property_exists( $this, 'queue_lock_time' ) ) ? $this->queue_lock_time : ( empty($max_execution_time) ? 60 : $max_execution_time ); // 1 minute
$lock_duration = apply_filters( $this->identifier . '_queue_lock_time', $lock_duration );
set_site_transient( $this->identifier . '_process_lock', microtime(), $lock_duration );

File diff suppressed because it is too large Load Diff