openguides-commits November 2005

openguides-commits@lists.openguides.org

1 participants
24 discussions

by svnadmin＠urchin.earth.li

Author: earle Date: 2005-11-30 22:41:41 +0000 (Wed, 30 Nov 2005) New Revision: 726 Modified: trunk/lib/OpenGuides/RDF.pm trunk/t/21_rdf.t Log: fixes #50 Modified: trunk/lib/OpenGuides/RDF.pm =================================================================== --- trunk/lib/OpenGuides/RDF.pm 2005-11-30 21:10:38 UTC (rev 725) +++ trunk/lib/OpenGuides/RDF.pm 2005-11-30 22:41:41 UTC (rev 726) @@ -133,7 +133,7 @@ <dc:title>} . $self->{site_name} . qq{: $node_name</dc:title> <dc:date>$timestamp</dc:date> <dcterms:modified>$timestamp</dcterms:modified> - <dc:contributor>$username</dc:contributor> + <dc:contributor foaf:nick="$username" /> <dc:source rdf:resource="$version_indpt_url" /> <wiki:version>$version</wiki:version> <foaf:topic rdf:resource="#obj" /> Modified: trunk/t/21_rdf.t =================================================================== --- trunk/t/21_rdf.t 2005-11-30 21:10:38 UTC (rev 725) +++ trunk/t/21_rdf.t 2005-11-30 22:41:41 UTC (rev 726) @@ -83,7 +83,7 @@ qr|<dc:title>CGI::Wiki Test Site: Calthorpe Arms</dc:title>|, "sets the title correctly" ); - like( $rdfxml, qr|<dc:contributor>Kake</dc:contributor>|, + like( $rdfxml, qr|<dc:contributor foaf:nick="Kake" />|, "last username to edit used as contributor" ); like( $rdfxml, qr|<wiki:version>1</wiki:version>|, "version picked up" );

18 years

r725 - trunk/templates

by svnadmin＠urchin.earth.li

Author: earle Date: 2005-11-30 21:10:38 +0000 (Wed, 30 Nov 2005) New Revision: 725 Modified: trunk/templates/openguides_information_boxes.tt Log: more accurate summary Modified: trunk/templates/openguides_information_boxes.tt =================================================================== --- trunk/templates/openguides_information_boxes.tt 2005-11-30 21:04:48 UTC (rev 724) +++ trunk/templates/openguides_information_boxes.tt 2005-11-30 21:10:38 UTC (rev 725) @@ -1,6 +1,6 @@ <fieldset> <legend>OpenGuides information</legend> - <table summary="Fields for entering information about the changes being made to this page"> + <table summary="Fields for entering additional information summarising the node and the change being made to it"> <tr> <td colspan="2"><label for="summary">One-line summary of this node:</label></td> </tr>

18 years

r724 - trunk/t

by svnadmin＠urchin.earth.li

Author: earle Date: 2005-11-30 21:04:48 +0000 (Wed, 30 Nov 2005) New Revision: 724 Modified: trunk/t/21_rdf.t Log: remove warning in test Modified: trunk/t/21_rdf.t =================================================================== --- trunk/t/21_rdf.t 2005-11-30 21:01:46 UTC (rev 723) +++ trunk/t/21_rdf.t 2005-11-30 21:04:48 UTC (rev 724) @@ -150,7 +150,7 @@ } ); - my $rdfxml = $rdf_writer->emit_rdfxml( node => "Nonesuch Stores" ); + $rdfxml = $rdf_writer->emit_rdfxml( node => "Nonesuch Stores" ); like( $rdfxml, qr|<geo:SpatialThing rdf:ID="obj" dc:title="Nonesuch Stores">|, "having opening hours marks node as geospatial" );

18 years

r723 - trunk/templates

by svnadmin＠urchin.earth.li

Author: earle Date: 2005-11-30 21:01:46 +0000 (Wed, 30 Nov 2005) New Revision: 723 Modified: trunk/templates/edit_form.tt trunk/templates/openguides_information_boxes.tt Log: Moving summary field to openguides info boxes template. Fixes #61. Modified: trunk/templates/edit_form.tt =================================================================== --- trunk/templates/edit_form.tt 2005-11-29 07:19:46 UTC (rev 722) +++ trunk/templates/edit_form.tt 2005-11-30 21:01:46 UTC (rev 723) @@ -59,12 +59,6 @@ <legend>Metadata (optional)</legend> <table summary="Form for entering metadata about the subject of this node"> <tr> - <td class="label" colspan="2"><label for="summary">One-line summary of this node:</label></td> - </tr> - <tr> - <td colspan="2"><input type="text" size="50" id="summary" name="summary" value="[% summary %]" /></td> - </tr> - <tr> <td class="label"><label for="phone">Phone:</label></td> <td><input type="text" size="50" id="phone" name="phone" value="[% phone %]" /></td> </tr> Modified: trunk/templates/openguides_information_boxes.tt =================================================================== --- trunk/templates/openguides_information_boxes.tt 2005-11-29 07:19:46 UTC (rev 722) +++ trunk/templates/openguides_information_boxes.tt 2005-11-30 21:01:46 UTC (rev 723) @@ -2,6 +2,12 @@ <legend>OpenGuides information</legend> <table summary="Fields for entering information about the changes being made to this page"> <tr> + <td colspan="2"><label for="summary">One-line summary of this node:</label></td> + </tr> + <tr> + <td colspan="2"><input type="text" size="50" id="summary" name="summary" value="[% summary %]" /></td> + </tr> + <tr> <td> <strong><label for="username">Your username</label> (<a href="preferences.cgi">set</a>)</strong> </td> @@ -24,3 +30,5 @@ </tr> </table> </fieldset> + +

18 years

r722 - trunk

by svnadmin＠urchin.earth.li

Author: earle Date: 2005-11-29 07:19:46 +0000 (Tue, 29 Nov 2005) New Revision: 722 Modified: trunk/Changes Log: mention change in [721] for #51 Modified: trunk/Changes =================================================================== --- trunk/Changes 2005-11-29 07:18:17 UTC (rev 721) +++ trunk/Changes 2005-11-29 07:19:46 UTC (rev 722) @@ -4,6 +4,7 @@ to reflect this. Rename OpenGuides::SuperSearch to OpenGuides::Search. Use corrent content-type (application/rdf+xml) for all RDF output. + Things with opening hours are marked as geospatial in RDF. Fix missing bracket in node.tt. Add custom_node template just below main content in node.tt.

18 years

r721 - in trunk: lib/OpenGuides t

by svnadmin＠urchin.earth.li

Author: earle Date: 2005-11-29 07:18:17 +0000 (Tue, 29 Nov 2005) New Revision: 721 Modified: trunk/lib/OpenGuides/RDF.pm trunk/t/21_rdf.t Log: fixes #51 Modified: trunk/lib/OpenGuides/RDF.pm =================================================================== --- trunk/lib/OpenGuides/RDF.pm 2005-11-29 07:09:54 UTC (rev 720) +++ trunk/lib/OpenGuides/RDF.pm 2005-11-29 07:18:17 UTC (rev 721) @@ -95,7 +95,7 @@ my ($is_geospatial, $objType); - if ($os_x || $os_y || $latitude || $longitude || $address || $postcode || @locales) { + if ($os_x || $os_y || $latitude || $longitude || $address || $postcode || @locales || $opening_hours_text) { $is_geospatial = 1; $objType = 'geo:SpatialThing'; } else { @@ -114,7 +114,6 @@ my $url = $self->{make_node_url}->( $node_name, $version ); my $version_indpt_url = $self->{make_node_url}->( $node_name ); - my $rdf = qq{<?xml version="1.0"?> <rdf:RDF xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" Modified: trunk/t/21_rdf.t =================================================================== --- trunk/t/21_rdf.t 2005-11-29 07:09:54 UTC (rev 720) +++ trunk/t/21_rdf.t 2005-11-29 07:18:17 UTC (rev 721) @@ -5,7 +5,7 @@ use OpenGuides::Utils; use OpenGuides::Test; use URI::Escape; -use Test::More tests => 26; +use Test::More tests => 27; eval { require DBD::SQLite; }; my $have_sqlite = $@ ? 0 : 1; @@ -140,4 +140,19 @@ like( $redirect_rdf, qr|<owl:sameAs rdf:resource="/\?id=Calthorpe_Arms;format=rdf#obj" />|, "redirecting node gets owl:sameAs to target" ); + $wiki->write_node( "Nonesuch Stores", + "A metaphysical wonderland", + undef, + { + comment => "Yup.", + username => "Nobody", + opening_hours_text => "Open All Hours", + } + ); + + my $rdfxml = $rdf_writer->emit_rdfxml( node => "Nonesuch Stores" ); + + like( $rdfxml, qr|<geo:SpatialThing rdf:ID="obj" dc:title="Nonesuch Stores">|, + "having opening hours marks node as geospatial" ); + }

18 years

r720 - trunk/t

by svnadmin＠urchin.earth.li

Author: earle Date: 2005-11-29 07:09:54 +0000 (Tue, 29 Nov 2005) New Revision: 720 Modified: trunk/t/21_rdf.t Log: finish fixing whitespace Modified: trunk/t/21_rdf.t =================================================================== --- trunk/t/21_rdf.t 2005-11-29 07:07:03 UTC (rev 719) +++ trunk/t/21_rdf.t 2005-11-29 07:09:54 UTC (rev 720) @@ -12,7 +12,7 @@ SKIP: { skip "DBD::SQLite not installed - no database to test with", 24 - unless $have_sqlite; + unless $have_sqlite; CGI::Wiki::Setup::SQLite::setup( { dbname => "t/node.db" } ); my $config = OpenGuides::Config->new( @@ -67,32 +67,31 @@ like( $rdfxml, qr|<\?xml version="1.0"\?>|, "RDF is encoding-neutral" ); like( $rdfxml, qr|<foaf:name>Bloomsbury</foaf:name>|, - "finds the first locale" ); + "finds the first locale" ); like( $rdfxml, qr|<foaf:name>St Pancras</foaf:name>|, - "finds the second locale" ); + "finds the second locale" ); like( $rdfxml, qr|<phone>test phone number</phone>|, - "picks up phone number" ); + "picks up phone number" ); like( $rdfxml, qr|<chefmoz:Hours>test hours</chefmoz:Hours>|, - "picks up opening hours text" ); + "picks up opening hours text" ); like( $rdfxml, qr|<foaf:homepage rdf:resource="test website" />|, "picks up website" ); like( $rdfxml, - qr|<dc:title>CGI::Wiki Test Site: Calthorpe Arms</dc:title>|, - "sets the title correctly" ); + qr|<dc:title>CGI::Wiki Test Site: Calthorpe Arms</dc:title>|, + "sets the title correctly" ); like( $rdfxml, qr|<dc:contributor>Kake</dc:contributor>|, - "last username to edit used as contributor" ); + "last username to edit used as contributor" ); like( $rdfxml, qr|<wiki:version>1</wiki:version>|, "version picked up" ); - like( $rdfxml, qr|<rdf:Description rdf:about="">|, - "sets the 'about' correctly" ); + like( $rdfxml, qr|<rdf:Description rdf:about="">|, "sets the 'about' correctly" ); like( $rdfxml, qr|<dc:source rdf:resource="http://wiki.example.com/mywiki.cgi\?Calthorpe_Arms" />|, - "set the dc:source with the version-independent uri" ); + "set the dc:source with the version-independent uri" ); like( $rdfxml, qr|<country>United Kingdom</country>|, "country" ). like( $rdfxml, qr|<city>London</city>|, "city" ). @@ -110,10 +109,10 @@ $config->default_country( "" ); my $guide = OpenGuides->new( config => $config ); OpenGuides::Test->write_data( - guide => $guide, - node => "Star Tavern", - latitude => 51.498, - longitude => -0.154, + guide => $guide, + node => "Star Tavern", + latitude => 51.498, + longitude => -0.154, ); $rdf_writer = OpenGuides::RDF->new( wiki => $guide->wiki, config => $config ); $rdfxml = $rdf_writer->emit_rdfxml( node => "Star Tavern" ); @@ -122,11 +121,9 @@ # Now test that there's a nice failsafe where a node doesn't exist. $rdfxml = eval { $rdf_writer->emit_rdfxml( node => "I Do Not Exist" ); }; - is( $@, "", - "->emit_rdfxml doesn't die when called on a nonexistent node" ); + is( $@, "", "->emit_rdfxml doesn't die when called on a nonexistent node" ); - like( $rdfxml, qr|<wiki:version>0</wiki:version>|, - "...and wiki:version is 0" ); + like( $rdfxml, qr|<wiki:version>0</wiki:version>|, "...and wiki:version is 0" ); # Test the data for a node that redirects. $wiki->write_node( "Calthorpe Arms Pub", @@ -141,6 +138,6 @@ my $redirect_rdf = $rdf_writer->emit_rdfxml( node => "Calthorpe Arms Pub" ); like( $redirect_rdf, qr|<owl:sameAs rdf:resource="/\?id=Calthorpe_Arms;format=rdf#obj" />|, - "redirecting node gets owl:sameAs to target" ); + "redirecting node gets owl:sameAs to target" ); }

18 years

r719 - trunk/t

by svnadmin＠urchin.earth.li

Author: earle Date: 2005-11-29 07:07:03 +0000 (Tue, 29 Nov 2005) New Revision: 719 Modified: trunk/t/21_rdf.t Log: fix whitespace Modified: trunk/t/21_rdf.t =================================================================== --- trunk/t/21_rdf.t 2005-11-29 06:22:42 UTC (rev 718) +++ trunk/t/21_rdf.t 2005-11-29 07:07:03 UTC (rev 719) @@ -16,16 +16,16 @@ CGI::Wiki::Setup::SQLite::setup( { dbname => "t/node.db" } ); my $config = OpenGuides::Config->new( - vars => { - dbtype => "sqlite", - dbname => "t/node.db", - indexing_directory => "t/indexes", - script_url => "http://wiki.example.com/", - script_name => "mywiki.cgi", - site_name => "CGI::Wiki Test Site", - default_city => "London", - default_country => "United Kingdom", - } + vars => { + dbtype => "sqlite", + dbname => "t/node.db", + indexing_directory => "t/indexes", + script_url => "http://wiki.example.com/", + script_name => "mywiki.cgi", + site_name => "CGI::Wiki Test Site", + default_city => "London", + default_country => "United Kingdom", + } ); eval { require CGI::Wiki::Search::Plucene; }; if ( $@ ) { $config->use_plucene ( 0 ) }; @@ -46,20 +46,20 @@ # Test the data for a node that exists. $wiki->write_node( "Calthorpe Arms", - "CAMRA-approved pub near King's Cross", - undef, - { - comment => "Stub page, please update!", - username => "Kake", - postcode => "WC1X 8JR", - locale => [ "Bloomsbury", "St Pancras" ], - phone => "test phone number", - website => "test website", - opening_hours_text => "test hours", - latitude => "51.524193", - longitude => "-0.114436", - summary => "a nice pub", - } + "CAMRA-approved pub near King's Cross", + undef, + { + comment => "Stub page, please update!", + username => "Kake", + postcode => "WC1X 8JR", + locale => [ "Bloomsbury", "St Pancras" ], + phone => "test phone number", + website => "test website", + opening_hours_text => "test hours", + latitude => "51.524193", + longitude => "-0.114436", + summary => "a nice pub", + } ); my $rdfxml = $rdf_writer->emit_rdfxml( node => "Calthorpe Arms" ); @@ -67,24 +67,24 @@ like( $rdfxml, qr|<\?xml version="1.0"\?>|, "RDF is encoding-neutral" ); like( $rdfxml, qr|<foaf:name>Bloomsbury</foaf:name>|, - "finds the first locale" ); + "finds the first locale" ); like( $rdfxml, qr|<foaf:name>St Pancras</foaf:name>|, "finds the second locale" ); like( $rdfxml, qr|<phone>test phone number</phone>|, - "picks up phone number" ); + "picks up phone number" ); like( $rdfxml, qr|<chefmoz:Hours>test hours</chefmoz:Hours>|, - "picks up opening hours text" ); + "picks up opening hours text" ); like( $rdfxml, qr|<foaf:homepage rdf:resource="test website" />|, "picks up website" ); like( $rdfxml, - qr|<dc:title>CGI::Wiki Test Site: Calthorpe Arms</dc:title>|, - "sets the title correctly" ); + qr|<dc:title>CGI::Wiki Test Site: Calthorpe Arms</dc:title>|, + "sets the title correctly" ); like( $rdfxml, qr|<dc:contributor>Kake</dc:contributor>|, - "last username to edit used as contributor" ); + "last username to edit used as contributor" ); like( $rdfxml, qr|<wiki:version>1</wiki:version>|, "version picked up" ); @@ -92,7 +92,7 @@ "sets the 'about' correctly" ); like( $rdfxml, qr|<dc:source rdf:resource="http://wiki.example.com/mywiki.cgi\?Calthorpe_Arms" />|, - "set the dc:source with the version-independent uri" ); + "set the dc:source with the version-independent uri" ); like( $rdfxml, qr|<country>United Kingdom</country>|, "country" ). like( $rdfxml, qr|<city>London</city>|, "city" ). @@ -130,17 +130,17 @@ # Test the data for a node that redirects. $wiki->write_node( "Calthorpe Arms Pub", - "#REDIRECT [[Calthorpe Arms]]", - undef, - { - comment => "Created as redirect to Calthorpe Arms page.", - username => "Earle", - } + "#REDIRECT [[Calthorpe Arms]]", + undef, + { + comment => "Created as redirect to Calthorpe Arms page.", + username => "Earle", + } ); my $redirect_rdf = $rdf_writer->emit_rdfxml( node => "Calthorpe Arms Pub" ); like( $redirect_rdf, qr|<owl:sameAs rdf:resource="/\?id=Calthorpe_Arms;format=rdf#obj" />|, - "redirecting node gets owl:sameAs to target" ); + "redirecting node gets owl:sameAs to target" ); }

18 years

r718 - in trunk: . lib lib/OpenGuides t

by svnadmin＠urchin.earth.li

Author: earle Date: 2005-11-29 06:22:42 +0000 (Tue, 29 Nov 2005) New Revision: 718 Modified: trunk/Build.PL trunk/Changes trunk/PREREQUISITES trunk/lib/OpenGuides.pm trunk/lib/OpenGuides/RDF.pm trunk/lib/OpenGuides/Template.pm trunk/t/53_show_index.t trunk/wiki.cgi Log: fixes #28 Modified: trunk/Build.PL =================================================================== --- trunk/Build.PL 2005-11-24 20:12:31 UTC (rev 717) +++ trunk/Build.PL 2005-11-29 06:22:42 UTC (rev 718) @@ -222,7 +222,7 @@ 'CGI::Wiki::Plugin::Categoriser' => 0, '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, 'Config::Tiny' => 0, @@ -234,6 +234,7 @@ 'LWP::Simple' => 0, 'Parse::RecDescent' => 0, $search_module => 0, + 'POSIX' => 0, 'Template' => 0, 'Test::MockObject' => '0.07', # earlier doesn't use 'mock' 'Time::Piece' => 0, Modified: trunk/Changes =================================================================== --- trunk/Changes 2005-11-24 20:12:31 UTC (rev 717) +++ trunk/Changes 2005-11-29 06:22:42 UTC (rev 718) @@ -3,6 +3,7 @@ have customisations to your templates, you may need to make changes 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. Modified: trunk/PREREQUISITES =================================================================== --- trunk/PREREQUISITES 2005-11-24 20:12:31 UTC (rev 717) +++ trunk/PREREQUISITES 2005-11-29 06:22:42 UTC (rev 718) @@ -10,7 +10,7 @@ CGI::Wiki::Plugin::Categoriser 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 Config::Tiny @@ -39,6 +39,7 @@ -- or -- Search::InvertedIndex ) +POSIX Template Test::MockObject (version 0.07 or later) Time::Piece Modified: trunk/lib/OpenGuides/RDF.pm =================================================================== --- trunk/lib/OpenGuides/RDF.pm 2005-11-24 20:12:31 UTC (rev 717) +++ trunk/lib/OpenGuides/RDF.pm 2005-11-29 06:22:42 UTC (rev 718) @@ -256,11 +256,11 @@ config => $config ); # 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 ); @@ -287,7 +287,7 @@ locale => "Islington" } ); - 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" ); B<Note:> Some of the fields emitted by the RDF/XML generator are taken @@ -323,7 +323,7 @@ =item B<make_recentchanges_rss> # 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 ); @@ -335,7 +335,7 @@ filter_on_metadata => { username => "bob" }, ); - 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 ); Modified: trunk/lib/OpenGuides/Template.pm =================================================================== --- trunk/lib/OpenGuides/Template.pm 2005-11-24 20:12:31 UTC (rev 717) +++ trunk/lib/OpenGuides/Template.pm 2005-11-29 06:22:42 UTC (rev 718) @@ -166,7 +166,13 @@ 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} ); } # vile hack Modified: trunk/lib/OpenGuides.pm =================================================================== --- trunk/lib/OpenGuides.pm 2005-11-24 20:12:31 UTC (rev 717) +++ trunk/lib/OpenGuides.pm 2005-11-29 06:22:42 UTC (rev 718) @@ -13,7 +13,7 @@ use vars qw( $VERSION ); -$VERSION = '0.51'; +$VERSION = '0.52'; =head1 NAME @@ -537,7 +537,7 @@ if ( $args{format} ) { 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" ) { $template = "plain_index.tt"; @@ -665,7 +665,7 @@ config => $self->config, 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 ); return $output if $return_output; @@ -894,12 +894,9 @@ cookies => $args{cookies}, ); 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 ); } sub redirect_to_node { Modified: trunk/t/53_show_index.t =================================================================== --- trunk/t/53_show_index.t 2005-11-24 20:12:31 UTC (rev 717) +++ trunk/t/53_show_index.t 2005-11-29 06:22:42 UTC (rev 718) @@ -50,6 +50,6 @@ return_output => 1, 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" ); } Modified: trunk/wiki.cgi =================================================================== --- trunk/wiki.cgi 2005-11-24 20:12:31 UTC (rev 717) +++ trunk/wiki.cgi 2005-11-29 06:22:42 UTC (rev 718) @@ -276,7 +276,7 @@ my %args = @_; 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; }

18 years

r717 - in trunk: . lib lib/OpenGuides t

by svnadmin＠urchin.earth.li

Author: earle Date: 2005-11-24 20:12:31 +0000 (Thu, 24 Nov 2005) New Revision: 717 Modified: trunk/Build.PL trunk/README.CSS trunk/lib/OpenGuides.pm trunk/lib/OpenGuides/Utils.pm trunk/t/31_search.t trunk/t/32_search_simple_metadata.t trunk/t/33_search_advanced_search.t trunk/t/33_search_advanced_search_utm.t trunk/t/34_search_paging.t trunk/t/35_search_two_searches.t trunk/t/36_search_order.t trunk/t/37_search_summaries.t trunk/t/38_search_params.t trunk/t/39_search_form.t Log: Sorry, I screwed up the last commit - tests pass now. This fixes bug #17. Modified: trunk/Build.PL =================================================================== --- trunk/Build.PL 2005-11-24 20:01:09 UTC (rev 716) +++ trunk/Build.PL 2005-11-24 20:12:31 UTC (rev 717) @@ -256,7 +256,7 @@ # Tell OpenGuides::Build which additional scripts and templates to install. $build->{config}{__extra_scripts} = - [ "wiki.conf", "preferences.cgi", "supersearch.cgi", + [ "wiki.conf", "preferences.cgi", "search.cgi", "newpage.cgi" ]; $build->{config}{__templates} = [ "backlink_results.tt", @@ -282,7 +282,7 @@ "recent_changes.tt", "search_results.tt", "site_index.tt", - "supersearch.tt", + "search.tt", "userstats.tt", "wanted_pages.tt" ]; Modified: trunk/README.CSS =================================================================== --- trunk/README.CSS 2005-11-24 20:01:09 UTC (rev 716) +++ trunk/README.CSS 2005-11-24 20:12:31 UTC (rev 717) @@ -30,7 +30,7 @@ input.form_button Used in: differences.tt, edit_form.tt, footer.tt, navbar.tt, newpage.tt, - node.tt, preferences.tt, supersearch.tt + node.tt, preferences.tt, search.tt Purpose: A standard form button label.hidden @@ -85,7 +85,7 @@ Purpose: User who made a change div.hit_summary - Used in: supersearch.tt + Used in: search.tt Purpose: One-line summary of individual search result. IDs @@ -101,7 +101,7 @@ delete_password_wrong.tt, edit_conflict.tt, edit_form.tt, home_node.tt, newpage.tt, node.tt, preferences.tt, recent_changes.tt, search_results.tt, site_index.tt, - supersearch.tt, userstats.tt, wanted_pages.tt + search.tt, userstats.tt, wanted_pages.tt Purpose: Defines the main textual content of the page content includes the navbar and footer; maincontent does not @@ -219,11 +219,11 @@ Purpose: An input field for the search at the bottom of the page input#search_lower - Used in: supersearch.tt + Used in: search.tt Purpose: An iput field for the lower search in the main search page input#search_upper - Used in: supersearch.tt + Used in: search.tt Purpose: An input field for the upper search in the main search page input#show_minor Modified: trunk/lib/OpenGuides/Utils.pm =================================================================== --- trunk/lib/OpenGuides/Utils.pm 2005-11-24 20:01:09 UTC (rev 716) +++ trunk/lib/OpenGuides/Utils.pm 2005-11-24 20:12:31 UTC (rev 717) @@ -111,7 +111,7 @@ # Make formatter. my $script_name = $config->script_name; - my $search_url = $config->script_url . "supersearch.cgi"; + my $search_url = $config->script_url . "search.cgi"; my %macros = ( '@SEARCHBOX' => Modified: trunk/lib/OpenGuides.pm =================================================================== --- trunk/lib/OpenGuides.pm 2005-11-24 20:01:09 UTC (rev 716) +++ trunk/lib/OpenGuides.pm 2005-11-24 20:12:31 UTC (rev 717) @@ -415,7 +415,7 @@ my $lat = $data{metadata}{latitude}[0]; my $long = $data{metadata}{longitude}[0]; my $script_url = $self->config->script_url; - print CGI->redirect( $script_url . "supersearch.cgi?lat=$lat;long=$long;distance_in_metres=$metres" ); + print CGI->redirect( $script_url . "search.cgi?lat=$lat;long=$long;distance_in_metres=$metres" ); } =item B<show_backlinks> Modified: trunk/t/31_search.t =================================================================== --- trunk/t/31_search.t 2005-11-24 20:01:09 UTC (rev 716) +++ trunk/t/31_search.t 2005-11-24 20:12:31 UTC (rev 717) @@ -1,6 +1,6 @@ use strict; use CGI::Wiki::Setup::SQLite; -use OpenGuides::SuperSearch; +use OpenGuides::Search; use OpenGuides::Test; use Test::More; @@ -23,8 +23,8 @@ eval { require CGI::Wiki::Search::Plucene; }; if ( $@ ) { $config->use_plucene( 0 ) }; - my $search = OpenGuides::SuperSearch->new( config => $config ); - isa_ok( $search, "OpenGuides::SuperSearch" ); + my $search = OpenGuides::Search->new( config => $config ); + isa_ok( $search, "OpenGuides::Search" ); my $output = $search->run( return_output => 1 ); unlike( $output, qr/no items matched/i, Modified: trunk/t/32_search_simple_metadata.t =================================================================== --- trunk/t/32_search_simple_metadata.t 2005-11-24 20:01:09 UTC (rev 716) +++ trunk/t/32_search_simple_metadata.t 2005-11-24 20:12:31 UTC (rev 717) @@ -1,7 +1,7 @@ use strict; use CGI::Wiki::Setup::SQLite; use OpenGuides::Config; -use OpenGuides::SuperSearch; +use OpenGuides::Search; use Test::More tests => 10; eval { require DBD::SQLite; }; @@ -32,7 +32,7 @@ eval { require CGI::Wiki::Search::Plucene; }; if ( $@ ) { $config->use_plucene( 0 ) }; - my $search = OpenGuides::SuperSearch->new( config => $config ); + my $search = OpenGuides::Search->new( config => $config ); # Add some data. We write it twice to avoid hitting the redirect. my $wiki = $search->{wiki}; # white boxiness Modified: trunk/t/33_search_advanced_search.t =================================================================== --- trunk/t/33_search_advanced_search.t 2005-11-24 20:01:09 UTC (rev 716) +++ trunk/t/33_search_advanced_search.t 2005-11-24 20:12:31 UTC (rev 717) @@ -2,7 +2,7 @@ use CGI::Wiki::Plugin::Locator::Grid; # use directly to help debug use CGI::Wiki::Setup::SQLite; use OpenGuides::Config; -use OpenGuides::SuperSearch; +use OpenGuides::Search; use OpenGuides::Test; use Test::More; @@ -41,7 +41,7 @@ geo_handler => 1, } ); -my $search = OpenGuides::SuperSearch->new( config => $config ); +my $search = OpenGuides::Search->new( config => $config ); my $guide = OpenGuides->new( config => $config ); # Write some data. Modified: trunk/t/33_search_advanced_search_utm.t =================================================================== --- trunk/t/33_search_advanced_search_utm.t 2005-11-24 20:01:09 UTC (rev 716) +++ trunk/t/33_search_advanced_search_utm.t 2005-11-24 20:12:31 UTC (rev 717) @@ -1,7 +1,7 @@ use strict; use CGI::Wiki::Setup::SQLite; use OpenGuides::Config; -use OpenGuides::SuperSearch; +use OpenGuides::Search; use OpenGuides::Test; use Test::More; @@ -41,7 +41,7 @@ ellipsoid => "Airy", } ); -my $search = OpenGuides::SuperSearch->new( config => $config ); +my $search = OpenGuides::Search->new( config => $config ); my $guide = OpenGuides->new( config => $config ); # Write some data. Modified: trunk/t/34_search_paging.t =================================================================== --- trunk/t/34_search_paging.t 2005-11-24 20:01:09 UTC (rev 716) +++ trunk/t/34_search_paging.t 2005-11-24 20:12:31 UTC (rev 717) @@ -1,7 +1,7 @@ use strict; use CGI::Wiki::Setup::SQLite; use OpenGuides::Config; -use OpenGuides::SuperSearch; +use OpenGuides::Search; use OpenGuides::Test; use Test::More; @@ -24,7 +24,7 @@ my $config = OpenGuides::Test->make_basic_config; $config->use_plucene( 1 ); -my $search = OpenGuides::SuperSearch->new( config => $config ); +my $search = OpenGuides::Search->new( config => $config ); my $guide = OpenGuides->new( config => $config ); # Test with OS co-ords. @@ -51,11 +51,11 @@ os_y => 177500, }, ); - like( $output, qr/supersearch.cgi\?.*os_x=523500.*Next.*results/s, + like( $output, qr/search.cgi\?.*os_x=523500.*Next.*results/s, "os_x retained in next page link" ); - like( $output, qr/supersearch.cgi\?.*os_y=177500.*Next.*results/s, + like( $output, qr/search.cgi\?.*os_y=177500.*Next.*results/s, "os_y retained in next page link" ); - like( $output, qr/supersearch.cgi\?.*os_dist=1500.*Next.*results/s, + like( $output, qr/search.cgi\?.*os_dist=1500.*Next.*results/s, "os_dist retained in next page link" ); } @@ -67,7 +67,7 @@ # We must create a new search object after changing the geo_handler # in order to force it to create a fresh locator. $config->geo_handler( 2 ); - my $search = OpenGuides::SuperSearch->new( config => $config ); + my $search = OpenGuides::Search->new( config => $config ); foreach my $i ( 1 .. 30 ) { OpenGuides::Test->write_data( @@ -86,11 +86,11 @@ osie_y => 200000, }, ); - like( $output, qr/supersearch.cgi\?.*osie_x=100000.*Next.*results/s, + like( $output, qr/search.cgi\?.*osie_x=100000.*Next.*results/s, "osie_x retained in next page link" ); - like( $output, qr/supersearch.cgi\?.*osie_y=200000.*Next.*results/s, + like( $output, qr/search.cgi\?.*osie_y=200000.*Next.*results/s, "osie_y retained in next page link" ); - like( $output, qr/supersearch.cgi\?.*osie_dist=1500.*Next.*results/s, + like( $output, qr/search.cgi\?.*osie_dist=1500.*Next.*results/s, "osie_dist retained in next page link" ); } @@ -102,7 +102,7 @@ # We must create a new search object after changing the geo_handler # in order to force it to create a fresh locator. $config->geo_handler( 3 ); - my $search = OpenGuides::SuperSearch->new( config => $config ); + my $search = OpenGuides::Search->new( config => $config ); foreach my $i ( 1 .. 30 ) { OpenGuides::Test->write_data( @@ -121,10 +121,10 @@ longitude => -0.12, }, ); - like( $output, qr/supersearch.cgi\?.*latitude=51.5.*Next.*results/s, + like( $output, qr/search.cgi\?.*latitude=51.5.*Next.*results/s, "latitude retained in next page link" ); - like( $output, qr/supersearch.cgi\?.*longitude=-0.12.*Next.*results/s, + like( $output, qr/search.cgi\?.*longitude=-0.12.*Next.*results/s, "longitude retained in next page link" ); - like( $output, qr/supersearch.cgi\?.*latlong_dist=1500.*Next.*results/s, + like( $output, qr/search.cgi\?.*latlong_dist=1500.*Next.*results/s, "latlong_dist retained in next page link" ); } Modified: trunk/t/35_search_two_searches.t =================================================================== --- trunk/t/35_search_two_searches.t 2005-11-24 20:01:09 UTC (rev 716) +++ trunk/t/35_search_two_searches.t 2005-11-24 20:12:31 UTC (rev 717) @@ -1,7 +1,7 @@ use strict; use CGI::Wiki::Setup::SQLite; use OpenGuides::Config; -use OpenGuides::SuperSearch; +use OpenGuides::Search; use Test::More; eval { require DBD::SQLite; }; @@ -52,7 +52,7 @@ eval { require CGI::Wiki::Search::Plucene; }; if ( $@ ) { $config->use_plucene( 0 ) }; -my $search = OpenGuides::SuperSearch->new( config => $config ); +my $search = OpenGuides::Search->new( config => $config ); # Write some data. my $wiki = $search->{wiki}; @@ -105,7 +105,7 @@ # Now with Irish National Grid. $config->geo_handler( 2 ); -$search = OpenGuides::SuperSearch->new( config => $config ); +$search = OpenGuides::Search->new( config => $config ); $search->run( return_output => 1, vars => { osie_x => 100000, osie_y => 200000, osie_dist => 100 }, @@ -120,7 +120,7 @@ # Now with UTM. $config->geo_handler( 3 ); $config->ellipsoid( "Airy" ); -$search = OpenGuides::SuperSearch->new( config => $config ); +$search = OpenGuides::Search->new( config => $config ); $search->run( return_output => 1, vars => { latitude => 10, longitude => 0, latlong_dist => 1000 }, Modified: trunk/t/36_search_order.t =================================================================== --- trunk/t/36_search_order.t 2005-11-24 20:01:09 UTC (rev 716) +++ trunk/t/36_search_order.t 2005-11-24 20:12:31 UTC (rev 717) @@ -1,7 +1,7 @@ use strict; use CGI::Wiki::Setup::SQLite; use OpenGuides::Config; -use OpenGuides::SuperSearch; +use OpenGuides::Search; use Test::More; eval { require DBD::SQLite; }; @@ -36,8 +36,8 @@ } ); -my $search = OpenGuides::SuperSearch->new( config => $config ); -isa_ok( $search, "OpenGuides::SuperSearch" ); +my $search = OpenGuides::Search->new( config => $config ); +isa_ok( $search, "OpenGuides::Search" ); # Write some data. my $wiki = $search->{wiki}; Modified: trunk/t/37_search_summaries.t =================================================================== --- trunk/t/37_search_summaries.t 2005-11-24 20:01:09 UTC (rev 716) +++ trunk/t/37_search_summaries.t 2005-11-24 20:12:31 UTC (rev 717) @@ -1,7 +1,7 @@ use strict; use CGI::Wiki::Setup::SQLite; use OpenGuides::Config; -use OpenGuides::SuperSearch; +use OpenGuides::Search; use Test::More; eval { require DBD::SQLite; }; @@ -31,8 +31,8 @@ eval { require CGI::Wiki::Search::Plucene; }; if ( $@ ) { $config->use_plucene( 0 ) }; - my $search = OpenGuides::SuperSearch->new( config => $config ); - isa_ok( $search, "OpenGuides::SuperSearch" ); + my $search = OpenGuides::Search->new( config => $config ); + isa_ok( $search, "OpenGuides::Search" ); my $wiki = $search->wiki; $wiki->write_node( "Pub Crawls", "The basic premise of the pub crawl is to visit a succession of pubs, rather than spending the entire evening or day in a single establishment. London offers an excellent choice of themes for your pub crawl.", undef, { category => "Pubs" } ) or die "Can't write node"; Modified: trunk/t/38_search_params.t =================================================================== --- trunk/t/38_search_params.t 2005-11-24 20:01:09 UTC (rev 716) +++ trunk/t/38_search_params.t 2005-11-24 20:12:31 UTC (rev 717) @@ -2,7 +2,7 @@ use CGI; use CGI::Wiki::Setup::SQLite; use OpenGuides::Config; -use OpenGuides::SuperSearch; +use OpenGuides::Search; use Test::More; eval { require DBD::SQLite; }; @@ -59,7 +59,7 @@ $q->param( -name => "osie_dist", -value => 600 ); $q->param( -name => "latlong_dist", -value => 700 ); my %vars = $q->Vars(); -my $search = OpenGuides::SuperSearch->new( config => $config ); +my $search = OpenGuides::Search->new( config => $config ); $search->run( vars => \%vars, return_output => 1 ); is( $search->{distance_in_metres}, 500, "os_dist picked up when OS co-ords given and using British grid" ); @@ -73,7 +73,7 @@ $q->param( -name => "osie_dist", -value => 600 ); $q->param( -name => "latlong_dist", -value => 700 ); %vars = $q->Vars(); -$search = OpenGuides::SuperSearch->new( config => $config ); +$search = OpenGuides::Search->new( config => $config ); $search->run( vars => \%vars, return_output => 1 ); ok( !defined $search->{distance_in_metres}, "OSIE co-ords ignored when using British grid" ); @@ -85,7 +85,7 @@ $q->param( -name => "osie_dist", -value => 600 ); $q->param( -name => "latlong_dist", -value => 700 ); %vars = $q->Vars(); -$search = OpenGuides::SuperSearch->new( config => $config ); +$search = OpenGuides::Search->new( config => $config ); $search->run( vars => \%vars, return_output => 1 ); is( $search->{distance_in_metres}, 700, "latlong_dist picked up when lat/long given and using British grid" ); @@ -103,7 +103,7 @@ $q->param( -name => "osie_dist", -value => 600 ); $q->param( -name => "latlong_dist", -value => 700 ); %vars = $q->Vars(); -$search = OpenGuides::SuperSearch->new( config => $config ); +$search = OpenGuides::Search->new( config => $config ); $search->run( vars => \%vars, return_output => 1 ); is( $search->{distance_in_metres}, 600, "osie_dist picked up when OS co-ords given and using Irish grid" ); @@ -117,7 +117,7 @@ $q->param( -name => "osie_dist", -value => 600 ); $q->param( -name => "latlong_dist", -value => 700 ); %vars = $q->Vars(); -$search = OpenGuides::SuperSearch->new( config => $config ); +$search = OpenGuides::Search->new( config => $config ); $search->run( vars => \%vars, return_output => 1 ); ok( !defined $search->{distance_in_metres}, "OS co-ords ignored when using Irish grid" ); @@ -129,7 +129,7 @@ $q->param( -name => "osie_dist", -value => 600 ); $q->param( -name => "latlong_dist", -value => 700 ); %vars = $q->Vars(); -$search = OpenGuides::SuperSearch->new( config => $config ); +$search = OpenGuides::Search->new( config => $config ); $search->run( vars => \%vars, return_output => 1 ); is( $search->{distance_in_metres}, 700, "latlong_dist picked up when lat/long given and using Irish grid" ); @@ -148,7 +148,7 @@ $q->param( -name => "osie_dist", -value => 600 ); $q->param( -name => "latlong_dist", -value => 700 ); %vars = $q->Vars(); -$search = OpenGuides::SuperSearch->new( config => $config ); +$search = OpenGuides::Search->new( config => $config ); $search->run( vars => \%vars, return_output => 1 ); ok( !defined $search->{distance_in_metres}, "OS co-ords ignored when using UTM" ); @@ -160,7 +160,7 @@ $q->param( -name => "osie_dist", -value => 600 ); $q->param( -name => "latlong_dist", -value => 700 ); %vars = $q->Vars(); -$search = OpenGuides::SuperSearch->new( config => $config ); +$search = OpenGuides::Search->new( config => $config ); $search->run( vars => \%vars, return_output => 1 ); ok( !defined $search->{distance_in_metres}, "OSIE co-ords ignored when using UTM" ); @@ -172,7 +172,7 @@ $q->param( -name => "osie_dist", -value => 600 ); $q->param( -name => "latlong_dist", -value => 700 ); %vars = $q->Vars(); -$search = OpenGuides::SuperSearch->new( config => $config ); +$search = OpenGuides::Search->new( config => $config ); $search->run( vars => \%vars, return_output => 1 ); is( $search->{distance_in_metres}, 700, "latlong_dist picked up when lat/long given and using UTM" ); Modified: trunk/t/39_search_form.t =================================================================== --- trunk/t/39_search_form.t 2005-11-24 20:01:09 UTC (rev 716) +++ trunk/t/39_search_form.t 2005-11-24 20:12:31 UTC (rev 717) @@ -1,6 +1,6 @@ use strict; use CGI::Wiki::Setup::SQLite; -use OpenGuides::SuperSearch; +use OpenGuides::Search; use OpenGuides::Test; use Test::More; @@ -45,7 +45,7 @@ $config->use_plucene( 1 ); # British National Grid guides should have os and latlong search fields. -my $search = OpenGuides::SuperSearch->new( config => $config ); +my $search = OpenGuides::Search->new( config => $config ); my $output = $search->run( return_output => 1 ); # Strip Content-Type header to stop Test::HTML::Content getting confused. $output =~ s/^Content-Type.*[\r\n]+//m; @@ -71,7 +71,7 @@ # Irish National Grid guides should have osie and latlong. $config->geo_handler( 2 ); -$search = OpenGuides::SuperSearch->new( config => $config ); +$search = OpenGuides::Search->new( config => $config ); $output = $search->run( return_output => 1 ); $output =~ s/^Content-Type.*[\r\n]+//m; @@ -97,7 +97,7 @@ # UTM guides should have latitude/longitude/latlong_dist only. $config->geo_handler( 3 ); $config->ellipsoid( "Airy" ); -$search = OpenGuides::SuperSearch->new( config => $config ); +$search = OpenGuides::Search->new( config => $config ); $output = $search->run( return_output => 1 ); $output =~ s/^Content-Type.*[\r\n]+//m;

18 years

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

openguides-commits November 2005