Changeset 299

Timestamp:

05/18/06 18:19:44 (6 years ago)

Author:

nick

Message:

Improve the node versions listing code and tests

Location:

wiki-toolkit/trunk

Files:

• lib/Wiki/Toolkit/Store/Database.pm (modified) (2 diffs)
• t/025_list_node_all_versions.t (modified) (2 diffs)

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

@@ -1464 +1464 @@
     $sth->execute( $node_id );
 
+        # Need to hold onto the last row by hash ref, so we don't trash
+        #  it every time
+        my %first_data;
+        my $dataref = \%first_data;
+
         # Haul out the data
         my @versions;
         while(my @results = $sth->fetchrow_array) {
-                # TODO: Support metadata multi-rows
-                my %data;
+                my %data = %$dataref;
+
+                # Is it the same version as last time?
+                if(%data && $data{'version'} != $results[2]) {
+                        # New version
+                        push @versions, $dataref;
+                        %data = ();
+                } else {
+                        # Same version as last time, must be more metadata
+                }
+
+                # Grab the core data (will be the same on multi-row for metadata)
                 @data{ qw( node_id name version last_modified ) } = @results;
 
@@ -1477 +1492 @@
                 }
                 if($with_metadata) {
-                        warn("Not supported properly yet");
+                        my ($m_type,$m_value) = @results[$i,($i+1)];
+                        $data{'metadata'}->{$m_type} = $m_value;
                 }
 
-                push @versions, \%data;
+                # Save where we've got to
+                $dataref = \%data;
+        }
+
+        # Handle final row saving
+        if($dataref) {
+                push @versions, $dataref;
         }
 

wiki-toolkit/trunk/t/025_list_node_all_versions.t

@@ -6 +6 @@
     plan skip_all => "no backends configured";
 } else {
-    plan tests => ( 9 * scalar @Wiki::Toolkit::TestLib::wiki_info );
+    plan tests => ( 22 * scalar @Wiki::Toolkit::TestLib::wiki_info );
 }
 
@@ -45 +45 @@
 
         # Fetch with content too
+        @all_versions = $wiki->list_node_all_versions(
+                                                                name => "Cheese",
+                                                                with_content => 1
+        );
+
+        is( scalar @all_versions, 4, "list_node_all_versions gives the right number back" );
+
+        # Check them
+        is( $all_versions[0]->{'version'}, 4, "right ordering" );
+        is( $all_versions[1]->{'version'}, 3, "right ordering" );
+        is( $all_versions[2]->{'version'}, 2, "right ordering" );
+        is( $all_versions[3]->{'version'}, 1, "right ordering" );
+        is( $all_versions[0]->{'name'}, "Cheese", "right node" );
+        is( $all_versions[1]->{'name'}, "Cheese", "right node" );
+        is( $all_versions[2]->{'name'}, "Cheese", "right node" );
+        is( $all_versions[3]->{'name'}, "Cheese", "right node" );
+        is( $all_versions[0]->{'content'}, "Content v4", "right node" );
+        is( $all_versions[1]->{'content'}, "Content v3", "right node" );
+        is( $all_versions[2]->{'content'}, "Content v2", "right node" );
+        is( $all_versions[3]->{'content'}, "content", "right node" );
 
         # With metadata