Fixed problems with object representation functions.

git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@727109 13f79535-47bb-0310-9956-ffa450edef68

3 files changed, 13 insertions, 10 deletions

diff --git a/qpid/python/qmf/console.py b/qpid/python/qmf/console.py
index bba0386d6a..0009726fe7 100644
--- a/qpid/python/qmf/console.py
+++ b/qpid/python/qmf/console.py
@@ -1022,7 +1022,7 @@ class Object(object):
         if result != u"":
           result += u":"
         try:
-          valstr = unicode(value)
+          valstr = unicode(self._session._displayValue(value, property.type))
         except:
           valstr = u"<undecodable>"
         result += valstr
@@ -1044,7 +1044,9 @@ class Object(object):
       self.statistics = newer.getStatistics()
 
   def __repr__(self):
-    return self.getIndex().encode("utf8")
+    key = self.getClassKey()
+    return key.getPackageName() + ":" + key.getClassName() +\
+        "[" + self.getObjectId().__repr__() + "] " + self.getIndex().encode("utf8")
 
   def __getattr__(self, name):
     for method in self._schema.getMethods():
@@ -1607,10 +1609,10 @@ class DebugConsole(Console):
     print "delAgent:", agent
 
   def objectProps(self, broker, record):
-    print "objectProps:", record.getClassKey()
+    print "objectProps:", record
 
   def objectStats(self, broker, record):
-    print "objectStats:", record.getClassKey()
+    print "objectStats:", record
 
   def event(self, broker, event):
     print "event:", event
diff --git a/qpid/ruby/lib/qpid/datatypes.rb b/qpid/ruby/lib/qpid/datatypes.rb
index f49ed0fd5f..96afe58dee 100644
--- a/qpid/ruby/lib/qpid/datatypes.rb
+++ b/qpid/ruby/lib/qpid/datatypes.rb
@@ -347,7 +347,7 @@ module Qpid
     def self.format(s)
       # Python format !LHHHHL
       # big-endian, ulong, ushort x 4, ulong
-      "%08x-%04x-%04x-%04x-%04x%08x" % bytes.unpack("NnnnnN")
+      "%08x-%04x-%04x-%04x-%04x%08x" % s.unpack("NnnnnN")
     end
   end
 end
diff --git a/qpid/ruby/lib/qpid/qmf.rb b/qpid/ruby/lib/qpid/qmf.rb
index 865e795c24..d2e2651653 100644
--- a/qpid/ruby/lib/qpid/qmf.rb
+++ b/qpid/ruby/lib/qpid/qmf.rb
@@ -644,7 +644,7 @@ module Qpid::Qmf
       when 11: return value ? 'T' : 'F'
       when 12: return value.to_s
       when 13: return value.to_s
-      when 14: return Qpid::UUID::format(hash)
+      when 14: return Qpid::UUID::format(value)
       when 15: return value.to_s
       when 16: return value.to_s
       when 17: return value.to_s
@@ -954,7 +954,7 @@ module Qpid::Qmf
       @properties.select { |property, value|
         property.index
       }.collect { |property,value|
-        value.to_s }.join(":")
+        @session.display_value(value, property.type) }.join(":")
     end
 
     # Replace properties and/or statistics with a newly received update
@@ -967,7 +967,8 @@ module Qpid::Qmf
     end
 
     def to_s
-      index
+      key = klass_key
+      key[0] + ":" + key[1] + "[" + @object_id.to_s() + "] " + index
     end
 
     # This must be defined because ruby has this (deprecated) method built in.
@@ -1580,11 +1581,11 @@ module Qpid::Qmf
     end
 
     def object_props(broker, record)
-      puts "objectProps #{record.klass_key}"
+      puts "objectProps #{record}"
     end
 
     def object_stats(broker, record)
-      puts "objectStats #{record.klass_key}"
+      puts "objectStats #{record}"
     end
 
     def event(broker, event)