duckduckgo
/
zeroclickinfo-goodies
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Conversions: Add case sensitivity. Fix ambiguity collisions (#4406) 

* Check in work.

* Fix casing ambiguity.

* Fix ambiguity selection.

* break out of outer loop.

* fix YAML
master
PJ Hampton 2017-08-08 21:37:13 +01:00 committed by Zaahir Moolla
parent d17dde90b6
commit 27c5c308de
3 changed files with 105 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
lib/DDG/Goodie/Conversions.pm
View File

@ -329,13 +329,19 @@ handle query => sub {
sub get_matches {
my @input_matches = @_;
my @output_matches = ();
OUTER:
foreach my $match (@input_matches) {
foreach my $type (@types) {
if (($type->{'symbols'} && grep { $_ eq $match } @{$type->{'symbols'}})
|| ($type->{'symbols'} && grep { $_ eq lc $match } @{$type->{'symbols'}})
|| lc $match eq lc $type->{'unit'}
|| grep { $_ eq lc $match } @{$type->{'aliases'}} ) {
if ($type->{'symbols'} && grep { $_ eq $match } @{$type->{'symbols'}}) {
push(@output_matches,{
type => $type->{'type'},
factor => $type->{'factor'},
unit => $type->{'unit'},
can_be_negative => $type->{'can_be_negative'} || '0'
});
next OUTER;
} elsif(lc $match eq lc $type->{'unit'} || grep { $_ eq lc $match } @{$type->{'aliases'}}) {
push(@output_matches,{
type => $type->{'type'},
factor => $type->{'factor'},
@ -346,6 +352,7 @@ sub get_matches {
}
}
return @output_matches;
}

66
share/goodie/conversions/triggers.yml
View File

@ -1219,49 +1219,49 @@ aliases:
- watts
type: power
unit: watt
symbols: [w]
symbols: [w, W]
---
aliases:
- kilowatt
- kilowatts
type: power
unit: kilowatt
symbols: [kw]
symbols: [kw, kW]
---
aliases:
- megawatt
- megawatts
type: power
unit: megawatt
symbols: [mw]
symbols: [mw, mW]
---
aliases:
- gigawatt
- gigawatts
type: power
unit: gigawatt
symbols: [gw]
symbols: [gw, gW]
---
aliases:
- terawatt
- terawatts
type: power
unit: terawatt
symbols: [tw]
symbols: [tw, tW]
---
aliases:
- petawatt
- petawatts
type: power
unit: petawatt
symbols: [pw]
symbols: [pw, pW]
---
aliases:
- exawatt
- exawatts
type: power
unit: exawatt
symbols: [ew]
symbols: [ew, eW]
---
aliases:
- metric horsepowers
@ -1508,100 +1508,100 @@ unit: rankine
symbols: [°Ra]
---
aliases:
- b
- bit
- bits
type: digital
unit: b
symbols: [b]
---
aliases:
- B
- byte
- bytes
type: digital
unit: B
symbols: [B]
---
aliases:
- kilobit
- kilobits
type: digital
unit: kbit
symbols: [Kb]
---
aliases:
- megabit
- megabits
type: digital
unit: mbit
symbols: [Mb]
---
aliases:
- gigabit
- gigabits
type: digital
unit: gbit
symbols: [Gb]
---
aliases:
- terrabit
- terrabits
type: digital
unit: tbit
symbols: [Tb]
---
aliases:
- KB
- KBs
- kilobyte
- kilobytes
type: digital
unit: KB
symbols: [KB]
---
aliases:
- MB
- MBs
- megabyte
- megabytes
type: digital
unit: MB
symbols: [MB]
---
aliases:
- GB
- GBs
- gigabyte
- gigabytes
type: digital
unit: GB
symbols: [GB]
---
aliases:
- TB
- TBs
- terabyte
- terabytes
type: digital
unit: TB
symbols: [TB]
---
aliases:
- PB
- PBs
- petabyte
- petabytes
type: digital
unit: PB
symbols: [PB]
---
aliases:
- kibibit
- kibibits
- kibit
- kibits
- kib
type: digital
unit: kibibit
symbols: [Ki]
---
aliases:
- mebibit
- mebibits
- mebit
- mebits
- Mibit
- mibit
type: digital
unit: mebibit
symbols: [Mi]
---
aliases:
- gibibit
@ -1611,6 +1611,7 @@ aliases:
- Gibit
type: digital
unit: gibibit
symbols: [Gi]
---
aliases:
- tebibit
@ -1618,6 +1619,7 @@ aliases:
- tibit
type: digital
unit: tebibit
symbols: [Ti]
---
aliases:
- pebibit
@ -1625,22 +1627,34 @@ aliases:
- pibit
type: digital
unit: pebibit
symbols: [Pi]
---
aliases:
- kib
- kibibytes
- kibi byte
- kibi bytes
- KiB
type: digital
unit: kibibyte
symbols: [KiB]
---
aliases:
- mib
- mebibytes
- mebi byte
- mebi bytes
- MiB
type: digital
unit: mebibyte
symbols: [MiB]
---
aliases:
- gib
- gibibytes
- gibi byte
- gibi bytes
type: digital
unit: gibibyte
symbols: [GiB]
---
aliases:
- gibibyte
@ -1652,13 +1666,14 @@ type: digital
unit: gibibyte
---
aliases:
- tib
- tibibyte
- tibibytes
- tibi byte
- tibi bytes
- TiB
type: digital
unit: tibibyte
unit: tebibyte
symbols: [TiB]
---
aliases:
- pebibyte
@ -1667,6 +1682,7 @@ aliases:
- pebi bytes
type: digital
unit: pebibyte
symbols: [PiB]
---
aliases:
- litre

53
t/Conversions.t
View File

@ -2555,7 +2555,58 @@ ddg_goodie_test(
})
),
# natural language queries
# case sensitivity
'1 Gb to GB' => test_zci(
'', structured_answer => make_answer({
raw_input => '1',
from_unit => 'gbit',
to_unit => 'GB',
physical_quantity => 'digital'
})
),
'1 GB to Gb' => test_zci(
'', structured_answer => make_answer({
raw_input => '1',
from_unit => 'GB',
to_unit => 'gbit',
physical_quantity => 'digital'
})
),
'1 gb to Gb' => test_zci(
'', structured_answer => make_answer({
raw_input => '1',
from_unit => 'GB',
to_unit => 'gbit',
physical_quantity => 'digital'
})
),
'1 bytes to TiB' => test_zci(
'', structured_answer => make_answer({
raw_input => '1',
from_unit => 'B',
to_unit => 'tebibyte',
physical_quantity => 'digital'
})
),
'1 bytes to tib' => test_zci(
'', structured_answer => make_answer({
raw_input => '1',
from_unit => 'B',
to_unit => 'tebibyte',
physical_quantity => 'digital'
})
),
'10 bytes to Ti' => test_zci(
'', structured_answer => make_answer({
raw_input => '10',
from_unit => 'B',
to_unit => 'tebibit',
physical_quantity => 'digital'
})
),
# natural language queries
'unit converter' => test_zci(
'', structured_answer => make_answer_with_base({
physical_quantity => 'length',