diff --git a/backup/moodle2/backup_game_stepslib.php b/backup/moodle2/backup_game_stepslib.php index d08ed5f..023fc10 100644 --- a/backup/moodle2/backup_game_stepslib.php +++ b/backup/moodle2/backup_game_stepslib.php @@ -94,7 +94,7 @@ class backup_game_activity_structure_step extends backup_activity_structure_step $crosss = new backup_nested_element('game_crosss'); $cross = new backup_nested_element('game_cross', array('id'), array( - 'cols', 'rows', 'words', 'wordsall', 'createscore', 'createtries', + 'usedcols', 'usedrows', 'words', 'wordsall', 'createscore', 'createtries', 'createtimelimit', 'createconnectors', 'createfilleds', 'createspaces', 'triesplay')); $cryptexs = new backup_nested_element('game_cryptexs'); diff --git a/cross/cross_class.php b/cross/cross_class.php index 7511f27..039892c 100644 --- a/cross/cross_class.php +++ b/cross/cross_class.php @@ -461,8 +461,8 @@ class Cross $crossm = new stdClass(); $crossm->datebegin = time(); $crossm->time = $time; - $crossm->cols = $cols; - $crossm->rows = $rows; + $crossm->usedcols = $cols; + $crossm->usedrows = $rows; $crossm->words = count( $this->mbestcrosspos); $crossm->wordsall = count( $this->minputanswers); @@ -774,8 +774,8 @@ class Cross $this->mLegendh = array(); $this->mLegendv = array(); - $sret = "CrosswordWidth = {$crossm->cols};\n"; - $sret .= "CrosswordHeight = {$crossm->rows};\n"; + $sret = "CrosswordWidth = {$crossm->usedcols};\n"; + $sret .= "CrosswordHeight = {$crossm->usedrows};\n"; $sret .= "Words=".count( $crossd).";\n"; $swordlength = ""; diff --git a/cross/crossdb_class.php b/cross/crossdb_class.php index fc338ef..c78c6eb 100644 --- a/cross/crossdb_class.php +++ b/cross/crossdb_class.php @@ -122,8 +122,8 @@ class CrossDB extends Cross { $loadfromdb = ( $g == ""); $this->mmincol = $this->mminrow = 0; - $this->mmaxcol = $crossrec->cols; - $this->mmaxrow = $crossrec->rows; + $this->mmaxcol = $crossrec->usedcols; + $this->mmaxrow = $crossrec->usedrows; if ($g == "") { $g = str_repeat( ' ', $this->mmaxcol * $this->mmaxrow); diff --git a/db/install.xml b/db/install.xml index e024864..64dd341 100755 --- a/db/install.xml +++ b/db/install.xml @@ -1,8 +1,7 @@ + xsi:noNamespaceSchemaLocation="../../../lib/xmldb/xmldb.xsd"> @@ -140,8 +139,8 @@
- - + +