mirror/Part-DB.Part-DB-server
1
0
Fork 1
mirror of https://github.com/Part-DB/Part-DB-server.git synced 2025-07-02 06:24:34 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Allow to extract ranges from paramaters

Browse source
This commit is contained in:
Jan Böhmer 2023-07-15 01:41:29 +02:00
parent f9fdae9de9
commit 94a26ae75a
2 changed files with 202 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

44
src/Services/InfoProviderSystem/DTOs/ParameterDTO.php
View file

@ -38,27 +38,59 @@ class ParameterDTO
}
/**
* This function tries to decide on the value, if it is a numerical value (which is then stored in one of the value_*) fields) or a text value (which is stored in value_text).
* It is possible to give ranges like 1...2 here, which will be parsed as value_min: 1.0, value_max: 2.0.
* @param string $name
* @param string|float $value
* @param string|null $unit
* @param string|null $symbol
* @param string|null $group
* @return self
*/
public static function parseValueField(string $name, string|float $value, ?string $unit = null, ?string $symbol = null, ?string $group = null): self
{
if (is_float($value) || is_numeric($value)) {
return new self($name, value_typ: (float) $value, unit: $unit, symbol: $symbol, group: $group);
}
//Try to parse as range
if (str_contains($value, '...')) {
$parts = explode('...', $value);
if (count($parts) === 2) {
//Ensure that both parts are numerical
if (is_numeric($parts[0]) && is_numeric($parts[1])) {
return new self($name, value_min: (float) $parts[0], value_max: (float) $parts[1], unit: $unit, symbol: $symbol, group: $group);
}
}
}
return new self($name, value_text: $value, unit: $unit, symbol: $symbol, group: $group);
}
/**
* This function tries to decide on the value, if it is a numerical value (which is then stored in one of the value_*) fields) or a text value (which is stored in value_text).
* It also tries to extract the unit from the value field (so 3kg will be parsed as value_typ: 3.0, unit: kg).
* Ranges like 1...2 will be parsed as value_min: 1.0, value_max: 2.0.
* @param string $name
* @param string|float $value
* @param string|null $symbol
* @param string|null $group
* @return self
*/
public static function parseValueIncludingUnit(string $name, string|float $value, ?string $symbol = null, ?string $group = null): self
{
if (is_float($value) || is_numeric($value)) {
return new self($name, value_typ: (float) $value, symbol: $symbol, group: $group);
}
//Try to extract unit from value
$unit = null;
if (preg_match('/^(?<value>[0-9.]+)\s*(?<unit>[a-zA-Z]+)$/', $value, $matches)) {
if (is_string($value) && preg_match('/^(?<value>[0-9.]+)\s*(?<unit>[°a-zA-Z_]+\s?\w{0,4})$/u', $value, $matches)) {
$value = $matches['value'];
$unit = $matches['unit'];
return self::parseValueField(name: $name, value: $value, unit: $unit, symbol: $symbol, group: $group);
}
return new self($name, value_text: $value, unit: $unit, symbol: $symbol, group: $group);
//Otherwise we assume that no unit is given
return self::parseValueField(name: $name, value: $value, unit: null, symbol: $symbol, group: $group);
}
}