Changeset 1328


Ignore:
Timestamp:
Apr 12, 2012, 3:45:15 PM (10 years ago)
Author:
bob
Message:

merge 0.66 release branch

Location:
trunk
Files:
22 edited

Legend:

Unmodified
Added
Removed
  • trunk

  • trunk/Build.PL

    r1311 r1328  
    298298        'File::Spec::Functions'               => 0,
    299299        'File::Temp'                          => 0,
    300                 'Geo::Coordinates::UTM'               => 0,
    301300        'HTML::Entities'                      => 0,
    302301        'LWP::Simple'                         => 0,
     
    312311        'Net::Netmask'                        => 0,
    313312        'List::Util'                          => 0,
     313        'Geo::Coordinates::UTM'               => 0,
     314        'Geo::Coordinates::OSGB'              => 0,
     315        'Geo::Coordinates::ITM'               => 0,
    314316        },
    315317    build_requires => {
     
    357359                      "differences.tt",
    358360                      "display_metadata.tt",
     361                      "metadata.tt",
    359362                      "edit_form.tt",
    360363                      "edit_form_actions.tt",
  • trunk/Changes

    r1318 r1328  
    44<http://dev.openguides.org/log/trunk>.
    55
    6 0.66    ?
     60.66    12 April 2012
    77        All templates now have access to the "username" TT variable.
    88        Node name parameters in URLs are now accepted with spaces instead of
  • trunk/MANIFEST

    r1315 r1328  
    4747templates/map_index.tt
    4848templates/missing_metadata.tt
     49templates/metadata.tt
    4950templates/moderate_confirm.tt
    5051templates/moderate_password_wrong.tt
  • trunk/lib/OpenGuides.pm

    r1317 r1328  
    1515use vars qw( $VERSION );
    1616
    17 $VERSION = '0.65';
     17$VERSION = '0.66';
    1818
    1919=head1 NAME
     
    23392339=head1 COPYRIGHT
    23402340
    2341      Copyright (C) 2003-2010 The OpenGuides Project.  All Rights Reserved.
     2341     Copyright (C) 2003-2012 The OpenGuides Project.  All Rights Reserved.
    23422342
    23432343The OpenGuides distribution is free software; you can redistribute it
  • trunk/lib/OpenGuides/CGI.pm

    r1315 r1328  
    22use strict;
    33use vars qw( $VERSION );
    4 $VERSION = '0.09';
     4$VERSION = '0.10';
    55
    66use Carp qw( croak );
     
    444444=head1 COPYRIGHT
    445445
    446      Copyright (C) 2003-2008 The OpenGuides Project.  All Rights Reserved.
     446     Copyright (C) 2003-2012 The OpenGuides Project.  All Rights Reserved.
    447447
    448448This module is free software; you can redistribute it and/or modify it
  • trunk/lib/OpenGuides/Search.pm

    r1306 r1328  
    11package OpenGuides::Search;
    22use strict;
    3 our $VERSION = '0.13';
     3our $VERSION = '0.14';
    44
    55use CGI qw( :standard );
     
    828828=head1 COPYRIGHT
    829829
    830      Copyright (C) 2003-2008 The OpenGuides Project.  All Rights Reserved.
     830     Copyright (C) 2003-2012 The OpenGuides Project.  All Rights Reserved.
    831831
    832832The OpenGuides distribution is free software; you can redistribute it
  • trunk/lib/OpenGuides/Template.pm

    r1314 r1328  
    33use strict;
    44use vars qw( $VERSION );
    5 $VERSION = '0.15';
     5$VERSION = '0.16';
    66
    77use Carp qw( croak );
     
    650650=head1 COPYRIGHT
    651651
    652   Copyright (C) 2003-2009 The OpenGuides Project.  All Rights Reserved.
     652  Copyright (C) 2003-2012 The OpenGuides Project.  All Rights Reserved.
    653653
    654654This module is free software; you can redistribute it and/or modify it
  • trunk/t/25_write_geo_data.t

    r1306 r1328  
    1515if ( $@ ) {
    1616    plan skip_all => "Plucene not installed";
    17 }
    18 
    19 # Strictly speaking we don't need to skip _all_ tests if we don't have
    20 # the modules below.  Revisit this when not in a hurry.
    21 # We only actually need the former two for the National Grid tests and the
    22 # latter for the UTM tests.
    23 eval { require Geo::Coordinates::OSGB; };
    24 if ( $@ ) {
    25     plan skip_all => "Geo::Coordinates::OSGB not installed";
    26 }
    27 
    28 eval { require Geo::Coordinates::ITM; };
    29 if ( $@ ) {
    30     plan skip_all => "Geo::Coordinates::ITM not installed";
    31 }
    32 
    33 eval { require Geo::Coordinates::UTM; };
    34 if ( $@ ) {
    35     plan skip_all => "Geo::Coordinates::UTM not installed";
    3617}
    3718
  • trunk/t/26_geo_data_search_form.t

    r1306 r1328  
    1919if ( $@ ) {
    2020    plan skip_all => "Test::HTML::Content not installed";
    21 }
    22 
    23 # Strictly speaking we don't need to skip _all_ tests if we don't have
    24 # the modules below.  Revisit this when not in a hurry.
    25 # We only actually need the former two for the National Grid tests and the
    26 # latter for the UTM tests.
    27 eval { require Geo::Coordinates::OSGB; };
    28 if ( $@ ) {
    29     plan skip_all => "Geo::Coordinates::OSGB not installed";
    30 }
    31 
    32 eval { require Geo::Coordinates::ITM; };
    33 if ( $@ ) {
    34     plan skip_all => "Geo::Coordinates::ITM not installed";
    35 }
    36 
    37 eval { require Geo::Coordinates::UTM; };
    38 if ( $@ ) {
    39     plan skip_all => "Geo::Coordinates::UTM not installed";
    4021}
    4122
  • trunk/t/27_geo_data_edit_form.t

    r1306 r1328  
    1919if ( $@ ) {
    2020    plan skip_all => "Test::HTML::Content not installed";
    21 }
    22 
    23 # Strictly speaking we don't need to skip _all_ tests if we don't have
    24 # the modules below.  Revisit this when not in a hurry.
    25 # We only actually need the former two for the National Grid tests and the
    26 # latter for the UTM tests.
    27 eval { require Geo::Coordinates::OSGB; };
    28 if ( $@ ) {
    29     plan skip_all => "Geo::Coordinates::OSGB not installed";
    30 }
    31 
    32 eval { require Geo::Coordinates::ITM; };
    33 if ( $@ ) {
    34     plan skip_all => "Geo::Coordinates::ITM not installed";
    35 }
    36 
    37 eval { require Geo::Coordinates::UTM; };
    38 if ( $@ ) {
    39     plan skip_all => "Geo::Coordinates::UTM not installed";
    4021}
    4122
  • trunk/t/33_search_advanced_search.t

    r1306 r1328  
    1818}
    1919
    20 eval { require Geo::Coordinates::OSGB; };
    21 if ( $@ ) {
    22     plan skip_all => "Geo::Coordinates::OSGB not installed";
    23 }
    2420
    2521plan tests => 8;
  • trunk/t/33_search_advanced_search_utm.t

    r1273 r1328  
    1515if ( $@ ) {
    1616    plan skip_all => "Plucene not installed";
    17 }
    18 
    19 eval { require Geo::Coordinates::UTM; };
    20 if ( $@ ) {
    21     plan skip_all => "Geo::Coordinates::UTM not installed";
    2217}
    2318
  • trunk/t/34_search_paging.t

    r1316 r1328  
    2929
    3030# Test with OS co-ords.
    31 eval { require Geo::Coordinates::OSGB; };
    32 SKIP: {
    33     skip "Geo::Coordinates::OSGB not installed", 6 if $@;
    3431    $config->geo_handler( 1 );
    3532
     
    6562    like( $output, qr/search.cgi\?.*os_dist=1500.*Previous.*results/s,
    6663          "os_dist retained in previous page link" );
    67 }
    6864
    6965# Test with OSIE co-ords.
    70 eval { require Geo::Coordinates::ITM; };
    71 SKIP: {
    72     skip "Geo::Coordinates::ITM not installed", 6 if $@;
    7366
    7467    # We must create a new search object after changing the geo_handler
     
    107100    like( $output, qr/search.cgi\?.*osie_dist=1500.*Previous.*results/s,
    108101          "osie_dist retained in previous page link" );
    109 }
    110102
    111103# Test with UTM.
    112 eval { require Geo::Coordinates::UTM; };
    113 SKIP: {
    114     skip "Geo::Coordinates::UTM not installed", 6 if $@;
    115104
    116105    # We must create a new search object after changing the geo_handler
     
    149138    like( $output, qr/search.cgi\?.*latlong_dist=1500.*Previous.*results/s,
    150139          "latlong_dist retained in previous page link" );
    151 }
  • trunk/t/35_search_two_searches.t

    r1306 r1328  
    1717}
    1818
    19 # Strictly speaking we don't need to skip _all_ tests if we don't have
    20 # the modules below.  Revisit this when not in a hurry.
    21 # We only actually need the former two for the National Grid tests and the
    22 # latter for the UTM tests.
    23 eval { require Geo::Coordinates::OSGB; };
    24 if ( $@ ) {
    25     plan skip_all => "Geo::Coordinates::OSGB not installed";
    26 }
    27 
    28 eval { require Geo::Coordinates::ITM; };
    29 if ( $@ ) {
    30     plan skip_all => "Geo::Coordinates::ITM not installed";
    31 }
    32 
    33 eval { require Geo::Coordinates::UTM; };
    34 if ( $@ ) {
    35     plan skip_all => "Geo::Coordinates::UTM not installed";
    36 }
    3719
    3820plan tests => 10;
  • trunk/t/38_search_params.t

    r1306 r1328  
    1616if ( $@ ) {
    1717    plan skip_all => "Plucene not installed";
    18 }
    19 
    20 # Strictly speaking we don't need to skip _all_ tests if we don't have
    21 # the modules below.  Revisit this when not in a hurry.
    22 # We only actually need the former two for the National Grid tests and the
    23 # latter for the UTM tests.
    24 eval { require Geo::Coordinates::OSGB; };
    25 if ( $@ ) {
    26     plan skip_all => "Geo::Coordinates::OSGB not installed";
    27 }
    28 
    29 eval { require Geo::Coordinates::ITM; };
    30 if ( $@ ) {
    31     plan skip_all => "Geo::Coordinates::ITM not installed";
    32 }
    33 
    34 eval { require Geo::Coordinates::UTM; };
    35 if ( $@ ) {
    36     plan skip_all => "Geo::Coordinates::UTM not installed";
    3718}
    3819
  • trunk/t/39_search_form.t

    r1306 r1328  
    1919if ( $@ ) {
    2020    plan skip_all => "Test::HTML::Content not installed";
    21 }
    22 
    23 # Strictly speaking we don't need to skip _all_ tests if we don't have
    24 # the modules below.  Revisit this when not in a hurry.
    25 # We only actually need the former two for the National Grid tests and the
    26 # latter for the UTM tests.
    27 eval { require Geo::Coordinates::OSGB; };
    28 if ( $@ ) {
    29     plan skip_all => "Geo::Coordinates::OSGB not installed";
    30 }
    31 
    32 eval { require Geo::Coordinates::ITM; };
    33 if ( $@ ) {
    34     plan skip_all => "Geo::Coordinates::ITM not installed";
    35 }
    36 
    37 eval { require Geo::Coordinates::UTM; };
    38 if ( $@ ) {
    39     plan skip_all => "Geo::Coordinates::UTM not installed";
    4021}
    4122
  • trunk/t/62_bug_trailing_whitespace.t

    r1306 r1328  
    2222my $guide = OpenGuides->new( config => $config );
    2323
    24 SKIP: {
    25     eval { require Geo::Coordinates::OSGB; };
    26     skip "Geo::Coordinates::OSGB not installed", 2 if $@;
    27 
    2824    my $q = CGI->new( "" );
    2925    $q->param( -name => "os_x", -value => " 123456 " );
     
    4137        "leading and trailing spaces stripped from os_x when processed" );
    4238    is( $metadata_vars{os_y}, "654321", "...and os_y" );
    43 }
    4439
    45 SKIP: {
    46     eval { require Geo::Coordinates::ITM; };
    47     skip "Geo::Coordinates::ITM not installed", 2 if $@;
     40
    4841
    4942    $config->geo_handler( 2 );
     
    6356        "leading and trailing spaces stripped from osie_x when processed" );
    6457    is( $metadata_vars{osie_y}, "200000", "...and osie_y" );
    65 }
    66 
    67 SKIP: {
    68     eval { require Geo::Coordinates::UTM; };
    69     skip "Geo::Coordinates::UTM not installed", 2 if $@;
    7058
    7159    $config->geo_handler( 3 );
     
    8573        "leading and trailing spaces stripped from latitude when processed" );
    8674    is( $metadata_vars{longitude}, "-0.215293", "...and longitude" );
    87 }
    8875
    8976OpenGuides::Test->write_data(
  • trunk/t/66_bug_latlong_representation.t

    r1273 r1328  
    1414}
    1515
    16 eval { require Geo::Coordinates::UTM; };
    17 if ( $@ ) {
    18     plan skip_all => "Geo::Coordinates::UTM not installed";
    19 }
    2016
    2117plan tests => 4;
  • trunk/t/69_bug_zero_geo.t

    r1273 r1328  
    7575is( @{$details{metadata}->{osie_x}}[0], 0, "Zero osie_x saved" );
    7676is( @{$details{metadata}->{osie_y}}[0], 0, "Zero osie_y saved" );
    77 
    7877$config->{geo_handler} = 3;
    7978
  • trunk/t/91_username_in_templates.t

    r1312 r1328  
    2828                              return_output => 1,
    2929                            );
    30 
     30# Make sure the tmp directory exists
     31eval {
     32    mkdir cwd . "/t/templates/tmp";
     33};
    3134# Write a custom banner template that includes the username.
    3235eval {
  • trunk/wiki.cgi

    r1315 r1328  
    55use sigtrap die => 'normal-signals';
    66use vars qw( $VERSION );
    7 $VERSION = '0.65';
     7$VERSION = '0.66';
    88
    99use CGI qw/:standard/;
Note: See TracChangeset for help on using the changeset viewer.