From ffd05b42f1d93c11a9262200282c61cd051e1487 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tino=20V=C3=A1zquez?= <tinova79@gmail.com>
Date: Tue, 22 Jun 2010 18:58:17 +0200
Subject: [PATCH] feature #200: Addded username to Image dump

---
 src/image/Image.cc                    | 3 ++-
 src/image/ImagePool.cc                | 7 +++++--
 src/rm/RequestManagerImagePoolInfo.cc | 2 +-
 3 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/src/image/Image.cc b/src/image/Image.cc
index 6c82927bfe..f0ce16a328 100644
--- a/src/image/Image.cc
+++ b/src/image/Image.cc
@@ -263,7 +263,7 @@ int Image::dump(ostringstream& oss, int num, char **values, char **names)
         (!values[SOURCE]) ||
         (!values[STATE]) ||
         (!values[RUNNING_VMS]) ||
-        (num != LIMIT ))
+        (num != LIMIT + 1))
     {
         return -1;
     }
@@ -272,6 +272,7 @@ int Image::dump(ostringstream& oss, int num, char **values, char **names)
         "<IMAGE>" <<
             "<ID>"             << values[OID]         << "</ID>"          <<
             "<UID>"            << values[UID]         << "</UID>"         <<
+            "<USERNAME>"       << values[LIMIT]       << "</USERNAME>"    <<
             "<NAME>"           << values[NAME]        << "</NAME>"        <<
             "<TYPE>"           << values[TYPE]        << "</TYPE>"        <<
             "<PUBLIC>"         << values[PUBLIC]      << "</PUBLIC>"      <<
diff --git a/src/image/ImagePool.cc b/src/image/ImagePool.cc
index cd53daf15d..c9a034ce23 100644
--- a/src/image/ImagePool.cc
+++ b/src/image/ImagePool.cc
@@ -260,8 +260,11 @@ int ImagePool::dump(ostringstream& oss, const string& where)
     set_callback(static_cast<Callbackable::Callback>(&ImagePool::dump_cb),
                   static_cast<void *>(&oss));
                   
-    cmd << "SELECT * FROM " << Image::table;
-
+    cmd << "SELECT " << Image::table << ".*, user_pool.user_name FROM "  
+           << Image::table << 
+           " LEFT OUTER JOIN (SELECT oid, user_name FROM user_pool) "
+           << "AS user_pool ON " << Image::table << ".uid = user_pool.oid";
+     
     if ( !where.empty() )
     {
         cmd << " WHERE " << where;
diff --git a/src/rm/RequestManagerImagePoolInfo.cc b/src/rm/RequestManagerImagePoolInfo.cc
index a673af1365..e1880b4fc7 100755
--- a/src/rm/RequestManagerImagePoolInfo.cc
+++ b/src/rm/RequestManagerImagePoolInfo.cc
@@ -121,7 +121,7 @@ error_filter_flag:
     goto error_common;
 
 error_dump:
-    oss << "Error getting virtual network pool"; 
+    oss << "Error getting image pool"; 
     goto error_common;
 
 error_common: