Changeset 718

Timestamp:

11/29/05 06:22:42 (3 years ago)

Author:

earle

Message:

fixes #28

Location:

trunk

Files:

• Build.PL (modified) (2 diffs)
• Changes (modified) (1 diff)
• PREREQUISITES (modified) (2 diffs)
• lib/OpenGuides.pm (modified) (4 diffs)
• lib/OpenGuides/RDF.pm (modified) (4 diffs)
• lib/OpenGuides/Template.pm (modified) (1 diff)
• t/53_show_index.t (modified) (1 diff)
• wiki.cgi (modified) (1 diff)

trunk/Build.PL

@@ -223 +223 @@
         'CGI::Wiki::Plugin::Diff'         => '0.07',  # earlier buggy
         'CGI::Wiki::Plugin::Locator::Grid'=> '0.02',  # cope with sqlite 3
-        'CGI::Wiki::Plugin::RSS::ModWiki' => '0.081', # supports DOAP metadata
+        'CGI::Wiki::Plugin::RSS::ModWiki' => '0.09',  # fixes date formatting bug
         'CGI::Wiki::Plugin::RSS::Reader'  => '1.3',   # earlier versions don't support RSS 2.0
         'Class::Accessor'                 => 0,
@@ -235 +235 @@
         'Parse::RecDescent'               => 0,
         $search_module                    => 0,
+        'POSIX'                           => 0,
         'Template'                        => 0,
         'Test::MockObject'                => '0.07', # earlier doesn't use 'mock'

trunk/Changes

@@ -4 +4 @@
           to reflect this.
         Rename OpenGuides::SuperSearch to OpenGuides::Search.
+        Use corrent content-type (application/rdf+xml) for all RDF output.
         Fix missing bracket in node.tt.
         Add custom_node template just below main content in node.tt.

trunk/PREREQUISITES

@@ -11 +11 @@
 CGI::Wiki::Plugin::Diff (version 0.07 or later)
 CGI::Wiki::Plugin::Locator::Grid (version 0.02 or later)
-CGI::Wiki::Plugin::RSS::ModWiki (version 0.081 or later)
+CGI::Wiki::Plugin::RSS::ModWiki (version 0.09 or later)
 CGI::Wiki::Plugin::RSS::Reader (version 1.3 or later)
 Class::Accessor
@@ -40 +40 @@
   Search::InvertedIndex
 )
+POSIX
 Template
 Test::MockObject (version 0.07 or later)

trunk/lib/OpenGuides.pm

@@ -14 +14 @@
 use vars qw( $VERSION );
 
-$VERSION = '0.51';
+$VERSION = '0.52';
 
 =head1 NAME
@@ -538 +538 @@
         if ( $args{format} eq "rdf" ) {
             $template = "rdf_index.tt";
-            $conf{content_type} = "text/plain";
+            $conf{content_type} = "application/rdf+xml";
         }
         elsif ( $args{format} eq "plain" ) {
@@ -666 +666 @@
                                              og_version => $VERSION,
                                          );
-    my $output = "Content-Type: text/plain\n";
+    my $output = "Content-Type: application/rdf+xml\n";
     $output .= "Last-Modified: " . $rdf_writer->rss_timestamp( %criteria ) . "\n\n";
     $output .= $rdf_writer->make_recentchanges_rss( %criteria );
@@ -895 +895 @@
                       );
     if ( $args{content_type} ) {
-        $output_conf{content_type} = "";
-        my $output = "Content-Type: $args{content_type}\n\n"
-                     . OpenGuides::Template->output( %output_conf );
-    } else {
-        return OpenGuides::Template->output( %output_conf );
-    }
+        $output_conf{content_type} = $args{content_type};
+    }
+    return OpenGuides::Template->output( %output_conf );
 }
 

trunk/lib/OpenGuides/RDF.pm

@@ -257 +257 @@
 
     # RDF version of a node.
-    print "Content-Type: text/plain\n\n";
+    print "Content-Type: application/rdf+xml\n\n";
     print $rdf_writer->emit_rdfxml( node => "Masala Zone, N1 0NU" );
 
     # Ten most recent changes.
-    print "Content-Type: text/plain\n";
+    print "Content-Type: application/rdf+xml\n";
     print "Last-Modified: " . $self->rss_timestamp( items => 10 ) . "\n\n";
     print $rdf_writer->make_recentchanges_rss( items => 10 );
@@ -288 +288 @@
     );
 
-    print "Content-Type: text/plain\n\n";
+    print "Content-Type: application/rdf+xml\n\n";
     print $rdf_writer->emit_rdfxml( node => "Masala Zone, N1 0NU" );
 
@@ -324 +324 @@
 
     # Ten most recent changes.
-    print "Content-Type: text/plain\n";
+    print "Content-Type: application/rdf+xml\n";
     print "Last-Modified: " . $rdf_writer->rss_timestamp( items => 10 ) . "\n\n";
     print $rdf_writer->make_recentchanges_rss( items => 10 );
@@ -336 +336 @@
                );
 
-    print "Content-Type: text/plain\n";
+    print "Content-Type: application/rdf+xml\n";
     print "Last-Modified: " . $rdf_writer->rss_timestamp( %args ) . "\n\n";
     print $rdf_writer->make_recentchanges_rss( %args );

trunk/lib/OpenGuides/Template.pm

@@ -167 +167 @@
     my $header = "";
     unless ( defined $args{content_type} and $args{content_type} eq "" ) {
-        $header = CGI::header( -cookie => $args{cookies} );
+        my $content_type;
+        if ($args{content_type}) {
+            $content_type = $args{content_type};
+        } else {
+            $content_type = "text/html";
+        }
+        $header = CGI::header( -type => $content_type, -cookie => $args{cookies} );
     }
 

trunk/t/53_show_index.t

@@ -51 +51 @@
                                   format        => "rdf"
                                 );
-    like( $output, qr|Content-Type: text/plain|,
-          "RDF output gets content-type of text/plain" );
+    like( $output, qr|Content-Type: application/rdf\+xml|,
+          "RDF output gets content-type of application/rdf+xml" );
 }

trunk/wiki.cgi

@@ -277 +277 @@
     my $rdf_writer = OpenGuides::RDF->new( wiki      => $wiki,
                        config => $config );
-    print "Content-type: text/plain\n\n";
+    print "Content-type: application/rdf+xml\n\n";
     print $rdf_writer->emit_rdfxml( node => $args{node} );
     exit 0;