stv0g/vzlogger
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

added prototype backward compability

Browse source
This commit is contained in:
Steffen Vogel 2010-10-10 19:56:19 +02:00
parent b938015300
commit b3bda8226b
3 changed files with 15 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
backend/lib/Controller/DataController.php
View file

@ -70,7 +70,16 @@ class DataController extends Controller {
public function run($operation, array $identifiers = array()) {
$ec = new EntityController($this->view, $this->em);
$identifiers[0] = $ec->get($identifiers[0]);
if (count($identifiers) == 2) { // prototype: backend/data/uuid/port.json
$identifiers[0] = $ec->filter(array(
'cuuid' => $identifiers[0],
'port' => $identifiers[1]
));
}
elseif (count($identifiers) == 1) { // assume UUID
$identifiers[0] = $ec->get($identifiers[0]);
}
return parent::run($operation, $identifiers);
}

6
backend/lib/Definition/EntityDefinition.json
View file

@ -47,7 +47,7 @@
{
"name" : "power",
"required" : ["title", "resolution"],
"optional" : ["description", "details:", "owner:", "address:", "tolerance"],
"optional" : ["description", "details:", "owner:", "address:", "tolerance", "port", "cuuid"],
"icon" : "", // TODO look for an icon
"unit" : "kW/h",
"interpreter" : "Volkszaehler\\Interpreter\\MeterInterpreter",
@ -57,7 +57,7 @@
{
"name" : "gas",
"required" : ["title", "resolution"],
"optional" : ["description", "details:", "owner:", "address:", "tolerance"],
"optional" : ["description", "details:", "owner:", "address:", "tolerance", "port", "cuuid"],
"icon" : "", // TODO look for an icon
"unit" : "m³/h",
"interpreter" : "Volkszaehler\\Interpreter\\MeterInterpreter",
@ -67,7 +67,7 @@
{
"name" : "water",
"required" : ["title", "resolution"],
"optional" : ["description", "details:", "owner:", "address:", "tolerance"],
"optional" : ["description", "details:", "owner:", "address:", "tolerance", "port", "cuuid"],
"icon" : "", // TODO look for an icon
"unit" : "m³/h",
"interpreter" : "Volkszaehler\\Interpreter\\MeterInterpreter",

3
backend/lib/Definition/PropertyDefinition.json
View file

@ -300,7 +300,8 @@
{
"name" : "cuuid",
"type" : "string",
"max" : 37,
"max" : 36,
"pattern" : "/^[0-9a-zA-Z]{8}-[0-9a-zA-Z]{4}-[0-9a-zA-Z]{4}-[0-9a-zA-Z]{4}-[0-9a-zA-Z]{12}$/",
"translation" : { "de" : "Cotroller UUID" }
},
{