From e922ec9c68171c424d25c5fba6fb4056f6fcc19c Mon Sep 17 00:00:00 2001
From: Oliver Gorwits <oliver@cpan.org>
Date: Tue, 25 Mar 2014 21:18:49 +0000
Subject: [PATCH] Store device model and serial via UTF8 conversion

---
 Netdisco/Changes                           | 1 +
 Netdisco/lib/App/Netdisco/Core/Discover.pm | 5 ++++-
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/Netdisco/Changes b/Netdisco/Changes
index d04d33f4..54b18765 100644
--- a/Netdisco/Changes
+++ b/Netdisco/Changes
@@ -19,6 +19,7 @@
   * Suggest installation of perl-core RPM (arguably Red Hat's bug not ours!)
   * FATAL warnings considered harmful
   * Only show STP blocked icon if port is UP
+  * Store device model and serial via UTF8 conversion
 
 2.024004 - 2014-03-04
 
diff --git a/Netdisco/lib/App/Netdisco/Core/Discover.pm b/Netdisco/lib/App/Netdisco/Core/Discover.pm
index 4eba23f9..eb72e3a7 100644
--- a/Netdisco/lib/App/Netdisco/Core/Discover.pm
+++ b/Netdisco/lib/App/Netdisco/Core/Discover.pm
@@ -154,7 +154,7 @@ sub store_device {
   my @properties = qw/
     snmp_ver
     description uptime contact name location
-    layers ports mac serial model
+    layers ports mac
     ps1_type ps2_type ps1_status ps2_status
     fan slots
     vendor os os_ver
@@ -164,6 +164,9 @@ sub store_device {
       $device->$property( $snmp->$property );
   }
 
+  $device->model(  Encode::decode('UTF-8', $snmp->model)  );
+  $device->serial( Encode::decode('UTF-8', $snmp->serial) );
+
   $device->snmp_class( $snmp->device_type );
   $device->last_discover(\'now()');