Changeset 457

Timestamp:

10/18/08 15:14:23 (3 years ago)

Author:

nick

Message:

Add store->list_metadata_names, which will tell you all the different metadata types (names)

Location:

wiki-toolkit/trunk

Files:

• Changes (modified) (1 diff)
• lib/Wiki/Toolkit/Store/Database.pm (modified) (3 diffs)
• t/061_list_metadata_by_type.t (modified) (7 diffs)

wiki-toolkit/trunk/Changes

@@ -2 +2 @@
         Complete support for store->list_metadata_by_type, which
           returns a list of all the metadata values
+        Add store->list_metadata_names, which will tell you all the
+          different metadata types (names)
 
 0.76    13 July 2008

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

@@ -1950 +1950 @@
 }
 
-=item B<list_metadata_by_type>
-
-    List all the currently defined values of the given type of metadata.
-
-    Will only return data from the latest moderated version of each node
-
-    # List all of the different metadata values with the type 'category'
-    my @categories = $wiki->list_metadata_by_type('category');
-
-=cut
-
-sub list_metadata_by_type {
-    my ($self, $type) = @_;
-
-    return undef unless $type;
+
+# Internal function only, used when querying latest metadata
+sub _current_node_id_versions {
+    my ($self) = @_;
+
     my $dbh = $self->dbh;
 
-    # Ideally we'd do this as one big query
-    # However, this would need a temporary table on many
-    #  database engines, so we cheat and do it as two
     my $nv_sql = 
        "SELECT node_id, MAX(version) ".
@@ -1984 +1971 @@
         push @nv_where, $where;
     }
+    return @nv_where;
+}
+
+=item B<list_metadata_by_type>
+
+    List all the currently defined values of the given type of metadata.
+
+    Will only return data from the latest moderated version of each node
+
+    # List all of the different metadata values with the type 'category'
+    my @categories = $wiki->list_metadata_by_type('category');
+
+=cut
+sub list_metadata_by_type {
+    my ($self, $type) = @_;
+
+    return undef unless $type;
+    my $dbh = $self->dbh;
+
+    # Ideally we'd do this as one big query
+    # However, this would need a temporary table on many
+    #  database engines, so we cheat and do it as two
+    my @nv_where = $self->_current_node_id_versions();
 
     # Now the metadata bit
@@ -1993 +2003 @@
        join(" OR ", @nv_where).
        ")";
-    $sth = $dbh->prepare( $sql );
+    my $sth = $dbh->prepare( $sql );
     $sth->execute($type);
 
     my $values = $sth->fetchall_arrayref([0]);
     return ( map { $self->charset_decode( $_->[0] ) } (@$values) );
+}
+
+
+=item B<list_metadata_names>
+
+    List all the currently defined kinds of metadata, eg Locale, Postcode
+
+    Will only return data from the latest moderated version of each node
+
+    # List all of the different kinds of metadata
+    my @metadata_types = $wiki->list_metadata_names()
+
+=cut
+sub list_metadata_names {
+    my ($self) = @_;
+
+    my $dbh = $self->dbh;
+
+    # Ideally we'd do this as one big query
+    # However, this would need a temporary table on many
+    #  database engines, so we cheat and do it as two
+    my @nv_where = $self->_current_node_id_versions();
+
+    # Now the metadata bit
+    my $sql = 
+       "SELECT DISTINCT metadata_type ".
+       "FROM metadata ".
+       "WHERE (".
+       join(" OR ", @nv_where).
+       ")";
+    my $sth = $dbh->prepare( $sql );
+    $sth->execute();
+
+    my $types = $sth->fetchall_arrayref([0]);
+    return ( map { $self->charset_decode( $_->[0] ) } (@$types) );
 }
 

wiki-toolkit/trunk/t/061_list_metadata_by_type.t

@@ -6 +6 @@
     plan skip_all => "no backends configured";
 } else {
-    plan tests => ( 6 * scalar @Wiki::Toolkit::TestLib::wiki_info );
+    plan tests => ( 9 * scalar @Wiki::Toolkit::TestLib::wiki_info );
 }
 
@@ -33 +33 @@
     $wiki->write_node( "Cafe Roma", "A cafe unmod", $node{"checksum"},
         { category => [ "Cafe", "Oxford", "Unmoderated", "NotSeen" ],
-          latitude => "51.759", longitude => "-1.270" }
+          latitude => "51.759", longitude => "-1.270",
+          locale => [ "Oxford" ] },
     );
 
@@ -39 +40 @@
     my @md;
 
+
     # With nothing, get back undef
     is($wiki->store->list_metadata_by_type(), undef, "Needs a type given");
+
 
     # Postcode should be easy
@@ -47 +50 @@
        "Correct metadata listing" );
 
+
     # Latitude also
     @md = $wiki->store->list_metadata_by_type("latitude");
     is_deeply( [sort @md], [ "51.759", "51.911" ],
        "Correct metadata listing" );
+
 
     # For category, will not see unmoderated versio
@@ -57 +62 @@
                            "Oxford", "Restaurant", "Thai Food" ],
        "Correct metadata listing" );
+
+    @md = $wiki->store->list_metadata_names();
+    is_deeply( [sort @md], [ "category", "latitude", "longitude", "postcode" ],
+       "Correct metadata names" );
+
 
     # Now moderate that one, see it come in
@@ -65 +75 @@
        "Correct metadata listing" );
 
+    @md = $wiki->store->list_metadata_names();
+    is_deeply( [sort @md], [ "category", "latitude", "locale",
+                             "longitude", "postcode" ],
+       "Correct metadata names" );
+
+
     # And un-moderate another, see its go away
     $wiki->store->dbh->do("UPDATE content SET moderated = 'f' WHERE version = 2");
@@ -71 +87 @@
                            "Oxford", "Restaurant", "Thai Food" ],
        "Correct metadata listing" );
+
+    @md = $wiki->store->list_metadata_names();
+    is_deeply( [sort @md], [ "category", "latitude", "longitude", "postcode" ],
+       "Correct metadata names" );
 }