diff --git a/mongo_operations b/mongo_operations index 9e420b39b84205991fb291db4f3bd212f10794d1..9014865a095b6889777ad4623acb362a7a9ae26d 100755 --- a/mongo_operations +++ b/mongo_operations @@ -111,4 +111,4 @@ db.Configuration.updateMany( { } , { $set: { 'defautTileLayer': DBRef("TileLayer // Reset duplicates db.Element.updateMany({moderationState: 4}, {$set: {moderationState: 0, isDuplicateNode: false}, $unset: { potentialDuplicates: 1} }) -db.MigrationState.updateMany({}, { $set: { migrationsIndex: 0}}) \ No newline at end of file +db.MigrationState.updateMany({}, { $set: { migrationIndex: 0}}) \ No newline at end of file diff --git a/src/Biopen/CoreBundle/Command/MigrationCommand.php b/src/Biopen/CoreBundle/Command/MigrationCommand.php index e9a262e2caecdb845a15337aa60675be3750b3df..074fc6cc1e839bad7ff86ce6e26aa2fb7739fd88 100644 --- a/src/Biopen/CoreBundle/Command/MigrationCommand.php +++ b/src/Biopen/CoreBundle/Command/MigrationCommand.php @@ -20,12 +20,12 @@ class MigrationCommand extends GoGoAbstractCommand // ----------------------------------------------------------------- public $migrations = [ // v2.4.6 - "db.TileLayer.updateMany({'name':'cartodb'}, {\$set: {'attribution':'© <a href=\'http://www.openstreetmap.org/copyright\'>OpenStreetMap</a> © <a href=\'http://cartodb.com/attributions\'>CartoDB</a>'}})", - "db.TileLayer.updateMany({'name':'hydda'}, {\$set: {'attribution':'Tiles courtesy of <a href=\'http://openstreetmap.se/\' target=\'_blank\'>OpenStreetMap Sweden</a> — Map data © <a href=\'http://www.openstreetmap.org/copyright\'>OpenStreetMap</a>'}})", - "db.TileLayer.updateMany({'name':'wikimedia'}, {\$set: {'attribution':'<a href=\'https://wikimediafoundation.org/wiki/Maps_Terms_of_Use\'>Wikimedia</a> | Map data © <a href=\'https://www.openstreetmap.org/copyright\'>OpenStreetMap contributors</a>'}})", - "db.TileLayer.updateMany({'name':'lyrk'}, {\$set: {'attribution':'© Lyrk | Map data © <a href=\'http://www.openstreetmap.org/copyright\'>OpenStreetMap</a>'}})", - "db.TileLayer.updateMany({'name':'osmfr'}, {\$set: {'attribution':'© Openstreetmap France | © <a href=\'http://www.openstreetmap.org/copyright\'>OpenStreetMap</a>'}})", - "db.TileLayer.updateMany({'name':'stamenWaterColor'}, {\$set: {'attribution':'Map tiles by <a href=\'http://stamen.com\'>Stamen Design</a>, <a href=\'http://creativecommons.org/licenses/by/3.0\'>CC BY 3.0</a> — Map data © <a href=\'http://www.openstreetmap.org/copyright\'>OpenStreetMap</a>'}})", + 'db.TileLayer.updateMany({name:"cartodb"}, {$set: {attribution:"© <a href=\"http://www.openstreetmap.org/copyright\">OpenStreetMap</a> © <a href=\"http://cartodb.com/attributions\">CartoDB</a>"}})', + 'db.TileLayer.updateMany({name:"hydda"}, {$set: {attribution:"Tiles courtesy of <a href=\"http://openstreetmap.se/\" target=\"_blank\">OpenStreetMap Sweden</a> — Map data © <a href=\"http://www.openstreetmap.org/copyright\">OpenStreetMap</a>"}})', + 'db.TileLayer.updateMany({name:"wikimedia"}, {$set: {attribution:"<a href=\"https://wikimediafoundation.org/wiki/Maps_Terms_of_Use\">Wikimedia</a> | Map data © <a href=\"https://www.openstreetmap.org/copyright\">OpenStreetMap contributors</a>"}})', + 'db.TileLayer.updateMany({name:"lyrk"}, {$set: {attribution:"© Lyrk | Map data © <a href=\"http://www.openstreetmap.org/copyright\">OpenStreetMap</a>"}})', + 'db.TileLayer.updateMany({name:"osmfr"}, {$set: {attribution:"© Openstreetmap France | © <a href=\"http://www.openstreetmap.org/copyright\">OpenStreetMap</a>"}})', + 'db.TileLayer.updateMany({name:"stamenWaterColor"}, {$set: {attribution:"Map tiles by <a href=\"http://stamen.com\">Stamen Design</a>, <a href=\"http://creativecommons.org/licenses/by/3.0\">CC BY 3.0</a> — Map data © <a href=\"http://www.openstreetmap.org/copyright\">OpenStreetMap</a>"}})', ]; public $commands = [ @@ -76,9 +76,9 @@ class MigrationCommand extends GoGoAbstractCommand $migrationsToRun = array_slice($this->migrations, $migrationState->getMigrationIndex()); $migrationsToRun = array_unique($migrationsToRun); foreach($dbs as $db) { - $this->log("run migration on project " . $db); foreach($migrationsToRun as $migration) { - $this->runCommand($db, $migration); + $this->log("run migration " . $migration . " on project " . $db); + $this->runMongoCommand($db, $migration); } } $this->log(count($migrationsToRun) . " migrations performed"); @@ -129,9 +129,9 @@ class MigrationCommand extends GoGoAbstractCommand $em->flush(); } - private function runCommand($db, $command) + private function runMongoCommand($db, $command) { - $process = new Process("mongo {$db} --eval \"{$command}\""); + $process = new Process("mongo {$db} --eval '{$command}'"); return $process->run(); } } \ No newline at end of file