From f8ea166ae2db7196bdc17ae4f5491d1d94ba32a8 Mon Sep 17 00:00:00 2001
From: Scott Klum <scott.klum@gmail.com>
Date: Sat, 9 Feb 2013 09:34:28 -0500
Subject: [PATCH] removed metadata output loop, using flat() instead

---
 sdk/plugins/output.cpp | 12 +++---------
 1 file changed, 3 insertions(+), 9 deletions(-)

diff --git a/sdk/plugins/output.cpp b/sdk/plugins/output.cpp
index 64e3e2e..c5fc1c0 100644
--- a/sdk/plugins/output.cpp
+++ b/sdk/plugins/output.cpp
@@ -156,7 +156,7 @@ BR_REGISTER(Output, mtxOutput)
 /*!
  * \ingroup outputs
  * \brief Rank retrieval output.
- * \author Josh Klontz \cite jklontz
+ * \author Josh Klontz \cite jklontz Scott Klum \cite sklum
  */
 class rrOutput : public MatrixOutput
 {
@@ -182,14 +182,8 @@ class rrOutput : public MatrixOutput
             foreach (const Pair &pair, Common::Sort(OpenCVUtils::matrixToVector(data.row(i)), !invert).mid(0, limit)) {
                 if (pair.first < threshold) break;
                 QString output;
-                output.append((index ? QString::number(pair.second) : targetFiles[pair.second].name) +
-                              (score ? "=" + QString::number(pair.first) : ""));
-                if (metadata) {
-                    foreach (const QString &key, targetFiles[pair.second].localKeys()) {
-                        const QString value = targetFiles[pair.second].getString(key, "");
-                        output.append("," + key + "=" + value);
-                    }
-                }
+                if (metadata) output.append(targetFiles[pair.second].flat());
+                else output.append((index ? QString::number(pair.second) : targetFiles[pair.second].name) + (score ? "=" + QString::number(pair.first) : ""));
                 files.append(output);
             }
             lines.append(files.join(flat ? "\n" : ","));
--
libgit2 0.21.4