From c255f68934855e1b39c6fc6715486899fc4edb63 Mon Sep 17 00:00:00 2001
From: Neil Blakey-Milner <nbm@knowledgetree.com>
Date: Wed, 25 Jan 2006 14:10:49 +0000
Subject: [PATCH] KTS220 - fix metadata search to use metadata version ID instead of document ID.

---
 lib/browse/Criteria.inc | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/lib/browse/Criteria.inc b/lib/browse/Criteria.inc
index bfa885b..59082cc 100644
--- a/lib/browse/Criteria.inc
+++ b/lib/browse/Criteria.inc
@@ -396,9 +396,9 @@ class GenericMetadataCriterion extends BrowseCriterion {
         global $default;
         $sQuery = "SELECT DFL.value as value " .
               "FROM $default->document_fields_link_table AS DFL " .
-              "WHERE DFL.document_id = ? " .
+              "WHERE DFL.metadata_version_id = ? " .
               "AND DFL.document_field_id = ?";
-        $aParams = array($oDocument->getID(), $this->getID());
+        $aParams = array($oDocument->getMetadataVersionId(), $this->getID());
 
         $res = DBUtil::getOneResultKey(array($sQuery, $aParams), 'value');
         if (PEAR::isError($res)) {
@@ -453,7 +453,7 @@ class GenericMetadataCriterion extends BrowseCriterion {
 
     function searchJoinSQL () {
         global $default;
-        return "LEFT JOIN $default->document_fields_link_table AS $this->sSearchTable ON $this->sSearchTable.document_id = D.id";
+        return "LEFT JOIN $default->document_fields_link_table AS $this->sSearchTable ON $this->sSearchTable.metadata_version_id = D.metadata_version_id";
     }
 }
 
--
libgit2 0.21.4