Changeset 300 for wiki-toolkit/trunk/lib/Wiki/Toolkit/Store/Database.pm

Timestamp:

05/18/06 18:31:30 (6 years ago)

Author:

nick

Message:

Finish list_node_all_versions support and tests

Files:

• wiki-toolkit/trunk/lib/Wiki/Toolkit/Store/Database.pm (modified) (2 diffs)

wiki-toolkit/trunk/lib/Wiki/Toolkit/Store/Database.pm

@@ -1454 +1454 @@
                 $sql .= ", metadata_type, metadata_value ";
         }
-        $sql .= " FROM node INNER JOIN content ON (id = node_id) ";
+        $sql .= " FROM node INNER JOIN content ON (id = content.node_id) ";
         if($with_metadata) {
-                $sql .= " LEFT OUTER JOIN metadata ON (id = node_id AND content.version = metadata.version) ";
+                $sql .= " LEFT OUTER JOIN metadata ON (id = metadata.node_id AND content.version = metadata.version) ";
         }
         $sql .= " WHERE id = ? ORDER BY content.version DESC";
@@ -1493 +1493 @@
                 if($with_metadata) {
                         my ($m_type,$m_value) = @results[$i,($i+1)];
-                        $data{'metadata'}->{$m_type} = $m_value;
+                        unless($data{'metadata'}) { $data{'metadata'} = {}; }
+                        if($m_type) {
+                                $data{'metadata'}->{$m_type} = $m_value;
+                        }
                 }