From 11b054f1a90b826c4fd354dba5f4a487306d2f36 Mon Sep 17 00:00:00 2001
From: Oliver Gorwits <oliver@cpan.org>
Date: Sat, 19 Oct 2013 19:44:01 +0100
Subject: [PATCH] Decode more entPhysicalEntry columns as UTF-8 (closes #37)

---
 Netdisco/Changes                           | 1 +
 Netdisco/lib/App/Netdisco/Core/Discover.pm | 6 +++---
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/Netdisco/Changes b/Netdisco/Changes
index cd40de5b..e6e22bfb 100644
--- a/Netdisco/Changes
+++ b/Netdisco/Changes
@@ -9,6 +9,7 @@
   * Remove scary message from Auth::Extensible (closes #38)
   * Return first port neighbor match, if multiple devices claim the IP (closes #42)
   * Should handle empty ports preferences (closes #39)
+  * Decode more entPhysicalEntry columns as UTF-8 (closes #37)
 
 2.018000 - 2013-10-08
 
diff --git a/Netdisco/lib/App/Netdisco/Core/Discover.pm b/Netdisco/lib/App/Netdisco/Core/Discover.pm
index 8355603b..059653ab 100644
--- a/Netdisco/lib/App/Netdisco/Core/Discover.pm
+++ b/Netdisco/lib/App/Netdisco/Core/Discover.pm
@@ -572,16 +572,16 @@ sub store_modules {
           index  => $e_index->{$entry},
           type   => $e_type->{$entry},
           parent => $e_parent->{$entry},
-          name   => $e_name->{$entry},
+          name   => Encode::decode('UTF-8', $e_name->{$entry}),
           class  => $e_class->{$entry},
           pos    => $e_pos->{$entry},
           hw_ver => Encode::decode('UTF-8', $e_hwver->{$entry}),
           fw_ver => Encode::decode('UTF-8', $e_fwver->{$entry}),
           sw_ver => Encode::decode('UTF-8', $e_swver->{$entry}),
           model  => Encode::decode('UTF-8', $e_model->{$entry}),
-          serial => $e_serial->{$entry},
+          serial => Encode::decode('UTF-8', $e_serial->{$entry}),
           fru    => $e_fru->{$entry},
-          description => $e_descr->{$entry},
+          description => Encode::decode('UTF-8', $e_descr->{$entry}),
           last_discover => \'now()',
       };
   }