Changeset 1081

Timestamp:

06/16/07 20:45:04 (18 months ago)

Author:

ilmari

Message:

List all contributors in RDF version of nodes (fixes #106)

Location:

trunk

Files:

• Changes (modified) (1 diff)
• lib/OpenGuides/RDF.pm (modified) (3 diffs)
• t/21_rdf.t (modified) (4 diffs)
• templates/node_rdf.tt (modified) (1 diff)

trunk/Changes

@@ -20 +20 @@
           someone tries to view a nonexistent node.
         Validate input geodata (#22)
+        List all contributors in RDF version of nodes (#106).
 
 0.60    13 May 2007

trunk/lib/OpenGuides/RDF.pm

@@ -83 +83 @@
 
     foreach my $var ( qw( phone fax website opening_hours_text address
-                          postcode city country latitude longitude username
+                          postcode city country latitude longitude
                           os_x os_y summary ) ) {
         my $val = $metadata{$var}[0] || $defaults{$var} || "";
@@ -134 +134 @@
     }
 
-    $tt_vars{user_id} = $tt_vars{username};
-    $tt_vars{user_id} =~ s/\s/_/g;
-    
     $tt_vars{node_uri} = $self->{make_node_url}->( $node_name );
     $tt_vars{node_uri_with_version}
@@ -158 +155 @@
     }
 
+    my @revisions = $wiki->list_node_all_versions(
+                                                   name => $node_name,
+                                                   with_content => 0,
+                                                   with_metadata => 1,
+                                                 );
+
+    # We want all users who have edited the page listed as contributors,
+    # but only once each
+    foreach my $rev ( @revisions ) {
+        my $username = $rev->{metadata}{username};
+        next unless defined $username && length $username;
+
+        my $user_id = $username;
+        $user_id =~ s/\s+/_/g;
+        
+        $tt_vars{contributors}{$username} ||=
+            {
+              username => encode_entities_numeric($username),
+              user_id  => encode_entities_numeric($user_id),
+            };
+    }
+
     # OK, we've set all our template variables; now process the template.
     my $template_path = $config->template_path;

trunk/t/21_rdf.t

@@ -16 +16 @@
 }
 
-plan tests => 27;
+plan tests => 28;
 
 Wiki::Toolkit::Setup::SQLite::setup( { dbname => "t/node.db" } );
@@ -25 +25 @@
 $config->default_city( "London" );
 $config->default_country( "United Kingdom" );
+$config->geo_handler( 3 );
 
 eval { require Wiki::Toolkit::Search::Plucene; };
@@ -45 +46 @@
 
 # Test the data for a node that exists.
+OpenGuides::Test->write_data(
+        guide              => $guide,
+        node               => "Calthorpe Arms",
+        content            => "CAMRA-approved pub near King's Cross",
+        comment            => "Stub page, please update!",
+        username           => "Anonymous",
+        postcode           => "WC1X 8JR",
+        locales            => "Bloomsbury\r\nSt Pancras",
+        phone              => "test phone number",
+        website            => "test website",
+        hours_text         => "test hours",
+        latitude           => "51.524193",
+        longitude          => "-0.114436",
+        summary            => "a really nice pub",
+);
+
 OpenGuides::Test->write_data(
         guide              => $guide,
@@ -84 +101 @@
 like( $rdfxml, qr|<foaf:Person rdf:ID="Kake">|,
     "last username to edit used as contributor" );
+like( $rdfxml, qr|<foaf:Person rdf:ID="Anonymous">|,
+    "... as well as previous usernames" );
 
-like( $rdfxml, qr|<wiki:version>1</wiki:version>|, "version picked up" );
+like( $rdfxml, qr|<wiki:version>2</wiki:version>|, "version picked up" );
 
 like( $rdfxml, qr|<rdf:Description rdf:about="">|, "sets the 'about' correctly" );

trunk/templates/node_rdf.tt

@@ -19 +19 @@
     <dcterms:modified>[% timestamp %]</dcterms:modified>
 
+    [% FOREACH contributor = contributors.values %] 
     <dc:contributor>
-      <foaf:Person rdf:ID="[% user_id %]">
-        <foaf:nick>[% username %]</foaf:nick>
+      <foaf:Person rdf:ID="[% contributor.user_id %]">
+        <foaf:nick>[% contributor.username %]</foaf:nick>
       </foaf:Person>
     </dc:contributor>
+    [% END %]
 
     <dc:source rdf:resource="[% node_uri %]" />