L-electron-Rare/moodle
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

MDL-22245 backup - keep subplugin branches connected all the time. Thanks for spotting it David!

Browse Source
This commit is contained in:
Eloy Lafuente
2010-07-07 17:26:34 +00:00
parent f11f8ba27b
commit f2e34ee52b
3 changed files with 13 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files
backup/moodle2/backup_stepslib.php
+4 -7
View File
@@ -106,6 +106,7 @@ abstract class backup_activity_structure_step extends backup_structure_step {
// Arrived here, subplugin is correct, let's create the optigroup
$optigroupname = $subplugintype . '_' . $element->get_name() . '_subplugin';
$optigroup = new backup_optigroup($optigroupname, null, $multiple);
$element->add_child($optigroup); // Add optigroup to stay connected since beginning
// Get all the optigroup_elements, looking across al the subplugin dirs
$elements = array();
@@ -115,15 +116,11 @@ abstract class backup_activity_structure_step extends backup_structure_step {
$backupfile = $subpluginsdir . '/backup/moodle2/' . $classname . '.class.php';
if (file_exists($backupfile)) {
require_once($backupfile);
$backupsubplugin = new $classname($subplugintype, $name);
// Add subplugin returned structure to optigroup (must be optigroup_element instance)
if ($subpluginstructure = $backupsubplugin->define_subplugin_structure($element->get_name())) {
$optigroup->add_child($subpluginstructure);
}
$backupsubplugin = new $classname($subplugintype, $name, $optigroup);
// Add subplugin returned structure to optigroup
$backupsubplugin->define_subplugin_structure($element->get_name());
}
}
// Finished, add optigroup to element
$element->add_child($optigroup);
}
/**
backup/moodle2/backup_subplugin.class.php
+7 -5
View File
@@ -32,10 +32,12 @@ abstract class backup_subplugin {
protected $subplugintype;
protected $subpluginname;
protected $connectionpoint;
protected $optigroup; // Optigroup, parent of all optigroup elements
public function __construct($subplugintype, $subpluginname) {
public function __construct($subplugintype, $subpluginname, $optigroup) {
$this->subplugintype = $subplugintype;
$this->subpluginname = $subpluginname;
$this->optigroup = $optigroup;
$this->connectionpoint = '';
}
@@ -46,10 +48,8 @@ abstract class backup_subplugin {
$methodname = 'define_' . $connectionpoint . '_subplugin_structure';
if (method_exists($this, $methodname)) {
return $this->$methodname();
$this->$methodname();
}
return false;
}
/**
@@ -60,7 +60,9 @@ abstract class backup_subplugin {
// Something exclusive for this backup_subplugin_element (backup_optigroup_element)
// because it hasn't XML representation
$name = 'optigroup_' . $this->subplugintype . '_' . $this->subpluginname . '_' . $this->connectionpoint;
return new backup_subplugin_element($name, $final_elements, $conditionparam, $conditionvalue);
$optigroup_element = new backup_subplugin_element($name, $final_elements, $conditionparam, $conditionvalue);
$this->optigroup->add_child($optigroup_element); // Add optigroup_element to stay connected since beginning
return $optigroup_element;
}
/**
mod/assignment/type/offline/backup/moodle2/backup_assignment_offline_subplugin.class.php
+2 -2
View File
@@ -81,7 +81,7 @@ class backup_assignment_offline_subplugin extends backup_subplugin {
$subplugin->add_child($assassoff);
$assassoff->add_child($config);
$config->set_source_table('config', array());
$config->set_source_table('config', array('id' => '/assignment/id'));
return $subplugin; // And we return the root subplugin element
}
@@ -105,7 +105,7 @@ class backup_assignment_offline_subplugin extends backup_subplugin {
$subplugin->add_child($asssuboff);
$asssuboff->add_child($config);
$config->set_source_table('config', array());
$config->set_source_table('config', array('id' => backup::VAR_PARENTID));
return $subplugin; // And we return the root subplugin element
}