Commit eeb8a24e authored by François Agneray's avatar François Agneray
Browse files

Change raw by row

parent 90b57e37
...@@ -4,5 +4,5 @@ set -e ...@@ -4,5 +4,5 @@ set -e
curl -d '{"label":"Test","dbname":"anis_test","dbtype":"pdo_pgsql","dbhost":"db","dbport":5432,"dblogin":"anis","dbpassword":"anis"}' -H "Content-Type: application/json" -X POST http://localhost/metadata/default/database curl -d '{"label":"Test","dbname":"anis_test","dbtype":"pdo_pgsql","dbhost":"db","dbport":5432,"dblogin":"anis","dbpassword":"anis"}' -H "Content-Type: application/json" -X POST http://localhost/metadata/default/database
curl -d '{"name":"anis_project","label":"Anis Project Test","description":"Project used for testing","link":"http://project.com","manager":"M. Durand","id_database":1}' -H "Content-Type: application/json" -X POST http://localhost/metadata/default/project curl -d '{"name":"anis_project","label":"Anis Project Test","description":"Project used for testing","link":"http://project.com","manager":"M. Durand","id_database":1}' -H "Content-Type: application/json" -X POST http://localhost/metadata/default/project
curl -d '{"name":"obs_cat","table_ref":"obs_cat","label":"ObsCat dataset","description":"ObsCat","display":"10","count":"10000","vo":false,"data_path":"/mnt/mount","selectable_raw":true,"project_name":"anis_project","id_dataset_family":1}' -H "Content-Type: application/json" -X POST http://localhost/metadata/default/dataset curl -d '{"name":"obs_cat","table_ref":"obs_cat","label":"ObsCat dataset","description":"ObsCat","display":"10","count":"10000","vo":false,"data_path":"/mnt/mount","selectable_row":true,"project_name":"anis_project","id_dataset_family":1}' -H "Content-Type: application/json" -X POST http://localhost/metadata/default/dataset
curl -d '{"name":"observations","table_ref":"observations_info","label":"Observations dataset","description":"Observations","display":"20","count":"177454","vo":false,"data_path":"/mnt/mount","selectable_raw":false,"project_name":"anis_project","id_dataset_family":1}' -H "Content-Type: application/json" -X POST http://localhost/metadata/default/dataset curl -d '{"name":"observations","table_ref":"observations_info","label":"Observations dataset","description":"Observations","display":"20","count":"177454","vo":false,"data_path":"/mnt/mount","selectable_row":false,"project_name":"anis_project","id_dataset_family":1}' -H "Content-Type: application/json" -X POST http://localhost/metadata/default/dataset
...@@ -108,7 +108,7 @@ final class DatasetAction ...@@ -108,7 +108,7 @@ final class DatasetAction
'count', 'count',
'vo', 'vo',
'data_path', 'data_path',
'selectable_raw', 'selectable_row',
'id_dataset_family' 'id_dataset_family'
); );
foreach ($fields as $a) { foreach ($fields as $a) {
...@@ -166,7 +166,7 @@ final class DatasetAction ...@@ -166,7 +166,7 @@ final class DatasetAction
$dataset->setCount($parsedBody['count']); $dataset->setCount($parsedBody['count']);
$dataset->setVo($parsedBody['vo']); $dataset->setVo($parsedBody['vo']);
$dataset->setDataPath($parsedBody['data_path']); $dataset->setDataPath($parsedBody['data_path']);
$dataset->setSelectableRaw($parsedBody['selectable_raw']); $dataset->setSelectableRow($parsedBody['selectable_row']);
$this->memf->getMetaEntityManager()->flush(); $this->memf->getMetaEntityManager()->flush();
} }
......
...@@ -128,7 +128,7 @@ final class DatasetListAction ...@@ -128,7 +128,7 @@ final class DatasetListAction
'count', 'count',
'vo', 'vo',
'data_path', 'data_path',
'selectable_raw', 'selectable_row',
'project_name', 'project_name',
'id_dataset_family' 'id_dataset_family'
); );
...@@ -192,7 +192,7 @@ final class DatasetListAction ...@@ -192,7 +192,7 @@ final class DatasetListAction
$dataset->setCount($parsedBody['count']); $dataset->setCount($parsedBody['count']);
$dataset->setVo($parsedBody['vo']); $dataset->setVo($parsedBody['vo']);
$dataset->setDataPath($parsedBody['data_path']); $dataset->setDataPath($parsedBody['data_path']);
$dataset->setSelectableRaw($parsedBody['selectable_raw']); $dataset->setSelectableRow($parsedBody['selectable_row']);
$dataset->setProject($project); $dataset->setProject($project);
$dataset->setDatasetFamily($family); $dataset->setDatasetFamily($family);
......
...@@ -78,9 +78,9 @@ class Dataset implements \JsonSerializable ...@@ -78,9 +78,9 @@ class Dataset implements \JsonSerializable
/** /**
* @var bool * @var bool
* *
* @Column(type="boolean", name="selectable_raw", nullable=false) * @Column(type="boolean", name="selectable_row", nullable=false)
*/ */
protected $selectableRaw; protected $selectableRow;
/** /**
* @var Anis\Entity\Project * @var Anis\Entity\Project
...@@ -200,14 +200,14 @@ class Dataset implements \JsonSerializable ...@@ -200,14 +200,14 @@ class Dataset implements \JsonSerializable
$this->dataPath = $dataPath; $this->dataPath = $dataPath;
} }
public function getSelectableRaw() public function getSelectableRow()
{ {
return $this->selectableRaw; return $this->selectableRow;
} }
public function setSelectableRaw($selectableRaw) public function setSelectableRow($selectableRow)
{ {
$this->selectableRaw = $selectableRaw; $this->selectableRow = $selectableRow;
} }
public function getProject() public function getProject()
...@@ -261,7 +261,7 @@ class Dataset implements \JsonSerializable ...@@ -261,7 +261,7 @@ class Dataset implements \JsonSerializable
'count' => $this->getCount(), 'count' => $this->getCount(),
'vo' => $this->getVo(), 'vo' => $this->getVo(),
'data_path' => $this->getDataPath(), 'data_path' => $this->getDataPath(),
'selectable_raw' => $this->getSelectableRaw(), 'selectable_row' => $this->getSelectableRow(),
'project_name' => $this->getProject()->getName(), 'project_name' => $this->getProject()->getName(),
'id_dataset_family' => $this->getDatasetFamily()->getId() 'id_dataset_family' => $this->getDatasetFamily()->getId()
]; ];
......
...@@ -69,7 +69,7 @@ final class DatasetActionTest extends AbstractActionMetaTestCase ...@@ -69,7 +69,7 @@ final class DatasetActionTest extends AbstractActionMetaTestCase
'count' => 100582, 'count' => 100582,
'vo' => true, 'vo' => true,
'data_path' => '/tmp/data', 'data_path' => '/tmp/data',
'selectable_raw' => false, 'selectable_row' => false,
'project_name' => 'corot', 'project_name' => 'corot',
'id_dataset_family' => 1 'id_dataset_family' => 1
))); )));
...@@ -172,7 +172,7 @@ final class DatasetActionTest extends AbstractActionMetaTestCase ...@@ -172,7 +172,7 @@ final class DatasetActionTest extends AbstractActionMetaTestCase
'count' => 100583, 'count' => 100583,
'vo' => true, 'vo' => true,
'data_path' => '/tmp/data', 'data_path' => '/tmp/data',
'selectable_raw' => false, 'selectable_row' => false,
'project_name' => 'corot', 'project_name' => 'corot',
'id_dataset_family' => 1 'id_dataset_family' => 1
); );
......
...@@ -61,7 +61,7 @@ final class DatasetListActionTest extends AbstractActionMetaTestCase ...@@ -61,7 +61,7 @@ final class DatasetListActionTest extends AbstractActionMetaTestCase
'count' => 100582, 'count' => 100582,
'vo' => true, 'vo' => true,
'data_path' => '/tmp/data', 'data_path' => '/tmp/data',
'selectable_raw' => false, 'selectable_row' => false,
'project_name' => 'corot', 'project_name' => 'corot',
'id_dataset_family' => 1 'id_dataset_family' => 1
), ),
...@@ -74,7 +74,7 @@ final class DatasetListActionTest extends AbstractActionMetaTestCase ...@@ -74,7 +74,7 @@ final class DatasetListActionTest extends AbstractActionMetaTestCase
'count' => 784512, 'count' => 784512,
'vo' => false, 'vo' => false,
'data_path' => '/tmp/data', 'data_path' => '/tmp/data',
'selectable_raw' => false, 'selectable_row' => false,
'project_name' => 'vuds', 'project_name' => 'vuds',
'id_dataset_family' => 2 'id_dataset_family' => 2
) )
...@@ -181,7 +181,7 @@ final class DatasetListActionTest extends AbstractActionMetaTestCase ...@@ -181,7 +181,7 @@ final class DatasetListActionTest extends AbstractActionMetaTestCase
'count' => 987456, 'count' => 987456,
'vo' => true, 'vo' => true,
'data_path' => '/tmp/data', 'data_path' => '/tmp/data',
'selectable_raw' => true, 'selectable_row' => true,
'project_name' => 'corot', 'project_name' => 'corot',
'id_dataset_family' => 1 'id_dataset_family' => 1
); );
......
...@@ -87,7 +87,7 @@ dataset: ...@@ -87,7 +87,7 @@ dataset:
count: 100582 count: 100582
vo: true vo: true
data_path: '/tmp/data' data_path: '/tmp/data'
selectable_raw: false selectable_row: false
project_name: 'corot' project_name: 'corot'
id_dataset_family: 1 id_dataset_family: 1
- -
...@@ -99,7 +99,7 @@ dataset: ...@@ -99,7 +99,7 @@ dataset:
count: 784512 count: 784512
vo: false vo: false
data_path: '/tmp/data' data_path: '/tmp/data'
selectable_raw: false selectable_row: false
project_name: 'vuds' project_name: 'vuds'
id_dataset_family: 2 id_dataset_family: 2
file: file:
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment