openguides-commits October 2005

openguides-commits@lists.openguides.org

1 participants
29 discussions

by svnadmin＠urchin.earth.li

Author: earle Date: 2005-10-09 22:26:12 +0100 (Sun, 09 Oct 2005) New Revision: 682 Modified: trunk/lib/OpenGuides/Template.pm Log: of course I missed some more whitespace needing fixing Modified: trunk/lib/OpenGuides/Template.pm =================================================================== --- trunk/lib/OpenGuides/Template.pm 2005-10-09 21:25:24 UTC (rev 681) +++ trunk/lib/OpenGuides/Template.pm 2005-10-09 21:26:12 UTC (rev 682) @@ -111,8 +111,8 @@ my $custom_template_path = $config->custom_template_path || ""; my $tt = Template->new( { INCLUDE_PATH => "$custom_template_path:$template_path" } ); - my $script_name = $config->script_name; - my $script_url = $config->script_url; + my $script_name = $config->script_name; + my $script_url = $config->script_url; my $default_city = $config->default_city; # Check cookie to see if we need to set the formatting_rules_link. @@ -126,8 +126,8 @@ if (( $formatting_rules_node ) and !( $formatting_rules_link )){ $formatting_rules_link = $script_url . $script_name . "?" . uri_escape($args{wiki}->formatter->node_name_to_node_param($formatting_rules_node)); + } } - } my $enable_page_deletion = 0; if ( $config->enable_page_deletion

17 years, 5 months

r681 - trunk/lib

by svnadmin＠urchin.earth.li

Author: earle Date: 2005-10-09 22:25:24 +0100 (Sun, 09 Oct 2005) New Revision: 681 Modified: trunk/lib/OpenGuides.pm Log: fix lots of whitespace issues in this file too Modified: trunk/lib/OpenGuides.pm =================================================================== --- trunk/lib/OpenGuides.pm 2005-10-09 20:59:59 UTC (rev 680) +++ trunk/lib/OpenGuides.pm 2005-10-09 21:25:24 UTC (rev 681) @@ -114,21 +114,21 @@ # Print node to STDOUT. $guide->display_node( - id => "Calthorpe Arms", - version => 2, + id => "Calthorpe Arms", + version => 2, ); # Or return output as a string (useful for writing tests). $guide->display_node( - id => "Calthorpe Arms", - return_output => 1, + id => "Calthorpe Arms", + return_output => 1, ); # Or return the hash of variables that will be passed to the template # (not including those set additionally by OpenGuides::Template). $guide->display_node( - id => "Calthorpe Arms", - return_tt_vars => 1, + id => "Calthorpe Arms", + return_tt_vars => 1, ); If C<version> is omitted then the latest version will be displayed. @@ -173,17 +173,18 @@ my %metadata_vars = OpenGuides::Template->extract_metadata_vars( wiki => $wiki, config => $config, - metadata => $node_data{metadata} ); + metadata => $node_data{metadata} + ); %tt_vars = ( - %tt_vars, - %metadata_vars, - content => $content, - last_modified => $modified, - version => $node_data{version}, - node => $id, - language => $config->default_language, - oldid => $oldid, + %tt_vars, + %metadata_vars, + content => $content, + last_modified => $modified, + version => $node_data{version}, + node => $id, + language => $config->default_language, + oldid => $oldid, ); if ( $raw =~ /^#REDIRECT\s+(.+?)\s*$/ ) { @@ -231,18 +232,18 @@ @rc = map { { - name => CGI->escapeHTML($_->{name}), - last_modified => CGI->escapeHTML($_->{last_modified}), - version => CGI->escapeHTML($_->{version}), - comment => CGI->escapeHTML($_->{metadata}{comment}[0]), - username => CGI->escapeHTML($_->{metadata}{username}[0]), - host => CGI->escapeHTML($_->{metadata}{host}[0]), - username_param => CGI->escape($_->{metadata}{username}[0]), - edit_type => CGI->escapeHTML($_->{metadata}{edit_type}[0]), - url => $config->script_name . "?" - . CGI->escape($wiki->formatter->node_name_to_node_param($_->{name})), - } - } @rc; + name => CGI->escapeHTML($_->{name}), + last_modified => CGI->escapeHTML($_->{last_modified}), + version => CGI->escapeHTML($_->{version}), + comment => CGI->escapeHTML($_->{metadata}{comment}[0]), + username => CGI->escapeHTML($_->{metadata}{username}[0]), + host => CGI->escapeHTML($_->{metadata}{host}[0]), + username_param => CGI->escape($_->{metadata}{username}[0]), + edit_type => CGI->escapeHTML($_->{metadata}{edit_type}[0]), + url => $config->script_name . "?" + . CGI->escape($wiki->formatter->node_name_to_node_param($_->{name})), + } + } @rc; if ( scalar @rc ) { $recent_changes{since} = \@rc; } @@ -254,33 +255,32 @@ my @rc = $self->{wiki}->list_recent_changes( %criteria ); @rc = map { - { - name => CGI->escapeHTML($_->{name}), - last_modified => CGI->escapeHTML($_->{last_modified}), - version => CGI->escapeHTML($_->{version}), - comment => CGI->escapeHTML($_->{metadata}{comment}[0]), - username => CGI->escapeHTML($_->{metadata}{username}[0]), - host => CGI->escapeHTML($_->{metadata}{host}[0]), - username_param => CGI->escape($_->{metadata}{username}[0]), - edit_type => CGI->escapeHTML($_->{metadata}{edit_type}[0]), - url => $config->script_name . "?" - . CGI->escape($wiki->formatter->node_name_to_node_param($_->{name})), - } - } @rc; + { + name => CGI->escapeHTML($_->{name}), + last_modified => CGI->escapeHTML($_->{last_modified}), + version => CGI->escapeHTML($_->{version}), + comment => CGI->escapeHTML($_->{metadata}{comment}[0]), + username => CGI->escapeHTML($_->{metadata}{username}[0]), + host => CGI->escapeHTML($_->{metadata}{host}[0]), + username_param => CGI->escape($_->{metadata}{username}[0]), + edit_type => CGI->escapeHTML($_->{metadata}{edit_type}[0]), + url => $config->script_name . "?" + . CGI->escape($wiki->formatter->node_name_to_node_param($_->{name})), + } + } @rc; if ( scalar @rc ) { $recent_changes{$days->[1]} = \@rc; + } } - } } $tt_vars{recent_changes} = \%recent_changes; my %processing_args = ( - id => $id, - template => "recent_changes.tt", - tt_vars => \%tt_vars, - ); + id => $id, + template => "recent_changes.tt", + tt_vars => \%tt_vars, + ); if ( !$since && $self->get_cookie("track_recent_changes_views") ) { - my $cookie = - OpenGuides::CGI->make_recent_changes_cookie(config => $config ); + my $cookie = OpenGuides::CGI->make_recent_changes_cookie(config => $config ); $processing_args{cookies} = $cookie; $tt_vars{last_viewed} = OpenGuides::CGI->get_last_recent_changes_visit_from_cookie( config => $config ); } @@ -293,29 +293,32 @@ last_n_changes => 10, metadata_was => { edit_type => "Normal edit" }, ); - @recent = map { {name => CGI->escapeHTML($_->{name}), - last_modified => CGI->escapeHTML($_->{last_modified}), - version => CGI->escapeHTML($_->{version}), - comment => CGI->escapeHTML($_->{metadata}{comment}[0]), - username => CGI->escapeHTML($_->{metadata}{username}[0]), - url => $config->script_name . "?" - . CGI->escape($wiki->formatter->node_name_to_node_param($_->{name})) } - } @recent; + @recent = map { + { + name => CGI->escapeHTML($_->{name}), + last_modified => CGI->escapeHTML($_->{last_modified}), + version => CGI->escapeHTML($_->{version}), + comment => CGI->escapeHTML($_->{metadata}{comment}[0]), + username => CGI->escapeHTML($_->{metadata}{username}[0]), + url => $config->script_name . "?" + . CGI->escape($wiki->formatter->node_name_to_node_param($_->{name})) + } + } @recent; $tt_vars{recent_changes} = \@recent; return %tt_vars if $args{return_tt_vars}; my $output = $self->process_template( - id => $id, - template => "home_node.tt", - tt_vars => \%tt_vars, + id => $id, + template => "home_node.tt", + tt_vars => \%tt_vars, ); return $output if $return_output; print $output; } else { return %tt_vars if $args{return_tt_vars}; my $output = $self->process_template( - id => $id, - template => "node.tt", - tt_vars => \%tt_vars, + id => $id, + template => "node.tt", + tt_vars => \%tt_vars, ); return $output if $return_output; print $output; @@ -325,26 +328,26 @@ =item B<display_diffs> $guide->display_diffs( - id => "Home Page", - version => 6, - other_version => 5, + id => "Home Page", + version => 6, + other_version => 5, ); # Or return output as a string (useful for writing tests). my $output = $guide->display_diffs( - id => "Home Page", - version => 6, - other_version => 5, - return_output => 1, + id => "Home Page", + version => 6, + other_version => 5, + return_output => 1, ); # Or return the hash of variables that will be passed to the template # (not including those set additionally by OpenGuides::Template). my %vars = $guide->display_diffs( - id => "Home Page", - version => 6, - other_version => 5, - return_tt_vars => 1, + id => "Home Page", + version => 6, + other_version => 5, + return_tt_vars => 1, ); =cut @@ -352,18 +355,18 @@ sub display_diffs { my ($self, %args) = @_; my %diff_vars = $self->differ->differences( - node => $args{id}, - left_version => $args{version}, - right_version => $args{other_version}, + node => $args{id}, + left_version => $args{version}, + right_version => $args{other_version}, ); $diff_vars{not_deletable} = 1; - $diff_vars{not_editable} = 1; - $diff_vars{deter_robots} = 1; + $diff_vars{not_editable} = 1; + $diff_vars{deter_robots} = 1; return %diff_vars if $args{return_tt_vars}; my $output = $self->process_template( - id => $args{id}, - template => "differences.tt", - tt_vars => \%diff_vars + id => $args{id}, + template => "differences.tt", + tt_vars => \%diff_vars ); return $output if $args{return_output}; print $output; @@ -372,8 +375,8 @@ =item B<find_within_distance> $guide->find_within_distance( - id => $node, - metres => $q->param("distance_in_metres") + id => $node, + metres => $q->param("distance_in_metres") ); =cut @@ -406,9 +409,11 @@ my @backlinks = $wiki->list_backlinks( node => $args{id} ); my @results = map { - { url => CGI->escape($formatter->node_name_to_node_param($_)), - title => CGI->escapeHTML($_) - } } sort @backlinks; + { + url => CGI->escape($formatter->node_name_to_node_param($_)), + title => CGI->escapeHTML($_) + } + } sort @backlinks; my %tt_vars = ( results => \@results, num_results => scalar @results, not_deletable => 1, @@ -416,11 +421,11 @@ not_editable => 1 ); return %tt_vars if $args{return_tt_vars}; my $output = OpenGuides::Template->output( - node => $args{id}, - wiki => $wiki, - config => $self->config, - template=>"backlink_results.tt", - vars => \%tt_vars, + node => $args{id}, + wiki => $wiki, + config => $self->config, + template=>"backlink_results.tt", + vars => \%tt_vars, ); return $output if $args{return_output}; print $output; @@ -429,22 +434,22 @@ =item B<show_index> $guide->show_index( - type => "category", - value => "pubs", + type => "category", + value => "pubs", ); # RDF version. $guide->show_index( - type => "locale", - value => "Holborn", - format => "rdf", + type => "locale", + value => "Holborn", + format => "rdf", ); # Or return output as a string (useful for writing tests). $guide->show_index( - type => "category", - value => "pubs", - return_output => 1, + type => "category", + value => "pubs", + return_output => 1, ); =cut @@ -464,67 +469,64 @@ type => $args{type}, # for RDF version value => $args{value}, # for RDF version name => CGI->escapeHTML("Fuzzy Title Match on '$args{value}'") - }; - $tt_vars{not_editable} = 1; + }; + $tt_vars{not_editable} = 1; } else { @selnodes = $wiki->list_nodes_by_metadata( metadata_type => $args{type}, - metadata_value => $args{value}, + metadata_value => $args{value}, ignore_case => 1 ); - my $name = ucfirst($args{type}) . " $args{value}" ; + my $name = ucfirst($args{type}) . " $args{value}"; my $url = $self->config->script_name . "?" . ucfirst( $args{type} ) . "_" . uri_escape( - $formatter->node_name_to_node_param($args{value}) + $formatter->node_name_to_node_param($args{value}) ); $tt_vars{criterion} = { type => $args{type}, value => $args{value}, # for RDF version name => CGI->escapeHTML( $name ), - url => $url + url => $url }; - $tt_vars{not_editable} = 1; + $tt_vars{not_editable} = 1; } } else { @selnodes = $wiki->list_all_nodes(); } - my @nodes = map { { name => $_, - node_data => { $wiki->retrieve_node( name => $_ ) }, - param => $formatter->node_name_to_node_param($_) } - } sort @selnodes; + my @nodes = map { + { + name => $_, + node_data => { $wiki->retrieve_node( name => $_ ) }, + param => $formatter->node_name_to_node_param($_) } + } sort @selnodes; $tt_vars{nodes} = \@nodes; my ($template, %conf); - if ( $args{format} ) - { - if ( $args{format} eq "rdf" ) - { - $template = "rdf_index.tt"; - $conf{content_type} = "text/plain"; - } - elsif ( $args{format} eq "plain" ) - { - $template = "plain_index.tt"; - $conf{content_type} = "text/plain"; - } + if ( $args{format} ) { + if ( $args{format} eq "rdf" ) { + $template = "rdf_index.tt"; + $conf{content_type} = "text/plain"; + } + elsif ( $args{format} eq "plain" ) { + $template = "plain_index.tt"; + $conf{content_type} = "text/plain"; + } + } else { + $template = "site_index.tt"; } - else - { - $template = "site_index.tt"; - } %conf = ( - %conf, - node => "$args{type} index", # KLUDGE - template => $template, - tt_vars => \%tt_vars, - ); + %conf, + node => "$args{type} index", # KLUDGE + template => $template, + tt_vars => \%tt_vars, + ); my $output = $self->process_template( %conf ); return $output if $args{return_output}; @@ -537,15 +539,15 @@ # Or return output as a string (useful for writing tests). $guide->list_all_versions ( - id => "Home Page", - return_output => 1, + id => "Home Page", + return_output => 1, ); # Or return the hash of variables that will be passed to the template # (not including those set additionally by OpenGuides::Template). $guide->list_all_versions ( - id => "Home Page", - return_tt_vars => 1, + id => "Home Page", + return_tt_vars => 1, ); =cut @@ -559,27 +561,29 @@ my @history; for my $version ( 1 .. $curr_version ) { my %node_data = $self->wiki->retrieve_node( name => $node, - version => $version ); + version => $version ); # $node_data{version} will be zero if this version was deleted. - push @history, { + push @history, { version => CGI->escapeHTML( $version ), - modified => CGI->escapeHTML( $node_data{last_modified} ), + modified => CGI->escapeHTML( $node_data{last_modified} ), username => CGI->escapeHTML( $node_data{metadata}{username}[0] ), comment => CGI->escapeHTML( $node_data{metadata}{comment}[0] ), } if $node_data{version}; } @history = reverse @history; - my %tt_vars = ( node => $node, - version => $curr_version, - not_deletable => 1, - not_editable => 1, - deter_robots => 1, - history => \@history ); + my %tt_vars = ( + node => $node, + version => $curr_version, + not_deletable => 1, + not_editable => 1, + deter_robots => 1, + history => \@history + ); return %tt_vars if $args{return_tt_vars}; my $output = $self->process_template( - id => $node, - template => "node_history.tt", - tt_vars => \%tt_vars, + id => $node, + template => "node_history.tt", + tt_vars => \%tt_vars, ); return $output if $return_output; print $output; @@ -589,16 +593,16 @@ # Last ten non-minor edits to Hammersmith pages. $guide->display_rss( - items => 10, - ignore_minor_edits => 1, - locale => "Hammersmith", + items => 10, + ignore_minor_edits => 1, + locale => "Hammersmith", ); # All edits bob has made to pub pages in the last week. $guide->display_rss( - days => 7, - username => "bob", - category => "Pubs", + days => 7, + username => "bob", + category => "Pubs", ); As with other methods, the C<return_output> parameter can be used to @@ -618,9 +622,9 @@ my $category = $args{category} || ""; my $locale = $args{locale} || ""; my %criteria = ( - items => $items, - days => $days, - ignore_minor_edits => $ignore_minor_edits, + items => $items, + days => $days, + ignore_minor_edits => $ignore_minor_edits, ); my %filter; $filter{username} = $username if $username; @@ -630,8 +634,10 @@ $criteria{filter_on_metadata} = \%filter; } - my $rdf_writer = OpenGuides::RDF->new( wiki => $self->wiki, - config => $self->config ); + my $rdf_writer = OpenGuides::RDF->new( + wiki => $self->wiki, + config => $self->config + ); my $output = "Content-Type: text/plain\n"; $output .= "Last-Modified: " . $rdf_writer->rss_timestamp( %criteria ) . "\n\n"; $output .= $rdf_writer->make_recentchanges_rss( %criteria ); @@ -642,8 +648,8 @@ =item B<commit_node> $guide->commit_node( - id => $node, - cgi_obj => $q, + id => $node, + cgi_obj => $q, ); As with other methods, parameters C<return_tt_vars> and @@ -707,23 +713,25 @@ foreach my $type (qw(Category Locale)) { my $lctype = lc($type); foreach my $index (@{$metadata{$lctype}}) { - $index =~ s/(.*)/\u$1/; - my $node = $type . " " . $index; - # Uppercase the node name before checking for existence - $node =~ s/ (\S+)/ \u$1/g; - unless ( $wiki->node_exists($node) ) { - my $category = $type eq "Category" ? "Category" : "Locales"; - $wiki->write_node( $node, - "\@INDEX_LINK [[$node]]", - undef, - { username => "Auto Create", - comment => "Auto created $lctype stub page", - category => $category - } - ); + $index =~ s/(.*)/\u$1/; + my $node = $type . " " . $index; + # Uppercase the node name before checking for existence + $node =~ s/ (\S+)/ \u$1/g; + unless ( $wiki->node_exists($node) ) { + my $category = $type eq "Category" ? "Category" : "Locales"; + $wiki->write_node( + $node, + "\@INDEX_LINK [[$node]]", + undef, + { + username => "Auto Create", + comment => "Auto created $lctype stub page", + category => $category + } + ); + } } } - } foreach my $var ( qw( username comment edit_type ) ) { $metadata{$var} = $q->param($var) || ""; @@ -776,9 +784,9 @@ =item B<delete_node> $guide->delete_node( - id => "FAQ", - version => 15, - password => "beer", + id => "FAQ", + version => 15, + password => "beer", ); C<version> is optional - if it isn't supplied then all versions of the @@ -801,9 +809,9 @@ my $return_output = $args{return_output} || 0; my %tt_vars = ( - not_editable => 1, - not_deletable => 1, - deter_robots => 1, + not_editable => 1, + not_deletable => 1, + deter_robots => 1, ); $tt_vars{delete_version} = $args{version} || ""; @@ -813,36 +821,36 @@ if ($password ne $self->config->admin_pass) { return %tt_vars if $return_tt_vars; my $output = $self->process_template( - id => $node, - template => "delete_password_wrong.tt", - tt_vars => \%tt_vars, - ); + id => $node, + template => "delete_password_wrong.tt", + tt_vars => \%tt_vars, + ); return $output if $return_output; print $output; } else { $self->wiki->delete_node( - name => $node, - version => $args{version}, + name => $node, + version => $args{version}, ); # Check whether any versions of this node remain. my %check = $self->wiki->retrieve_node( name => $node ); $tt_vars{other_versions_remain} = 1 if $check{version}; return %tt_vars if $return_tt_vars; my $output = $self->process_template( - id => $node, - template => "delete_done.tt", - tt_vars => \%tt_vars, - ); + id => $node, + template => "delete_done.tt", + tt_vars => \%tt_vars, + ); return $output if $return_output; print $output; } } else { return %tt_vars if $return_tt_vars; my $output = $self->process_template( - id => $node, - template => "delete_confirm.tt", - tt_vars => \%tt_vars, - ); + id => $node, + template => "delete_confirm.tt", + tt_vars => \%tt_vars, + ); return $output if $return_output; print $output; } @@ -851,13 +859,13 @@ sub process_template { my ($self, %args) = @_; my %output_conf = ( - wiki => $self->wiki, - config => $self->config, - node => $args{id}, - template => $args{template}, - vars => $args{tt_vars}, - cookies => $args{cookies}, - ); + wiki => $self->wiki, + config => $self->config, + node => $args{id}, + template => $args{template}, + vars => $args{tt_vars}, + cookies => $args{cookies}, + ); if ( $args{content_type} ) { $output_conf{content_type} = ""; my $output = "Content-Type: $args{content_type}\n\n"

17 years, 5 months

r680 - trunk/lib/OpenGuides

by svnadmin＠urchin.earth.li

Author: earle Date: 2005-10-09 21:59:59 +0100 (Sun, 09 Oct 2005) New Revision: 680 Modified: trunk/lib/OpenGuides/Template.pm Log: indenting was totally buggered in this file, correcting everything to consistent 4-space Modified: trunk/lib/OpenGuides/Template.pm =================================================================== --- trunk/lib/OpenGuides/Template.pm 2005-10-09 20:32:05 UTC (rev 679) +++ trunk/lib/OpenGuides/Template.pm 2005-10-09 20:59:59 UTC (rev 680) @@ -126,8 +126,8 @@ if (( $formatting_rules_node ) and !( $formatting_rules_link )){ $formatting_rules_link = $script_url . $script_name . "?" . uri_escape($args{wiki}->formatter->node_name_to_node_param($formatting_rules_node)); - } } + } my $enable_page_deletion = 0; if ( $config->enable_page_deletion @@ -137,21 +137,22 @@ $enable_page_deletion = 1; } - my $tt_vars = { site_name => $config->site_name, - cgi_url => $script_name, - full_cgi_url => $script_url . $script_name, - contact_email => $config->contact_email, - stylesheet => $config->stylesheet_url, - home_link => $script_url . $script_name, - home_name => $config->home_name, - navbar_on_home_page => $config->navbar_on_home_page, - omit_help_links => $omit_help_links, - formatting_rules_link => $formatting_rules_link, - formatting_rules_node => $formatting_rules_node, - openguides_version => $OpenGuides::VERSION, - enable_page_deletion => $enable_page_deletion, - language => $config->default_language, - default_city => $default_city, + my $tt_vars = { + site_name => $config->site_name, + cgi_url => $script_name, + full_cgi_url => $script_url . $script_name, + contact_email => $config->contact_email, + stylesheet => $config->stylesheet_url, + home_link => $script_url . $script_name, + home_name => $config->home_name, + navbar_on_home_page => $config->navbar_on_home_page, + omit_help_links => $omit_help_links, + formatting_rules_link => $formatting_rules_link, + formatting_rules_node => $formatting_rules_node, + openguides_version => $OpenGuides::VERSION, + enable_page_deletion => $enable_page_deletion, + language => $config->default_language, + default_city => $default_city, }; if ($args{node}) { @@ -170,11 +171,12 @@ # vile hack my %field_vars = OpenGuides::Template->extract_metadata_vars( - wiki => $args{wiki}, - config => $config, - set_coord_field_vars => 1, - metadata => {}, - ); + wiki => $args{wiki}, + config => $config, + set_coord_field_vars => 1, + metadata => {}, + ); + $tt_vars = { %field_vars, %$tt_vars }; my $output; @@ -193,25 +195,28 @@ my %node_data = $wiki->retrieve_node( "Home Page" ); my %metadata_vars = OpenGuides::Template->extract_metadata_vars( - wiki => $wiki, - config => $config, - metadata => $node_data{metadata} ); + wiki => $wiki, + config => $config, + metadata => $node_data{metadata} + ); # -- or -- my %metadata_vars = OpenGuides::Template->extract_metadata_vars( - wiki => $wiki, - config => $config, - cgi_obj => $q ); + wiki => $wiki, + config => $config, + cgi_obj => $q + ); # -- then -- - print OpenGuides::Template->output( wiki => $wiki, - config => $config, - template => "node.tt", - vars => { foo => "bar", - %metadata_vars } - ); + print OpenGuides::Template->output( + wiki => $wiki, + config => $config, + template => "node.tt", + vars => { foo => "bar", + %metadata_vars } + ); Picks out things like categories, locales, phone number etc from EITHER the metadata hash returned by L<CGI::Wiki> OR the query @@ -246,11 +251,11 @@ @catlist = @{ $metadata{category} || [] }; @loclist = @{ $metadata{locale} || [] }; } else { - my $categories_text = $q->param('categories'); - my $locales_text = $q->param('locales'); - @catlist = sort map { s/^\s+//; s/\s+$//; $_; } # trim lead/trail space + my $categories_text = $q->param('categories'); + my $locales_text = $q->param('locales'); + @catlist = sort map { s/^\s+//; s/\s+$//; $_; } # trim lead/trail space split("\r\n", $categories_text); - @loclist = sort map { s/^\s+//; s/\s+$//; $_; } # trim lead/trail space + @loclist = sort map { s/^\s+//; s/\s+$//; $_; } # trim lead/trail space split("\r\n", $locales_text); } @@ -270,18 +275,19 @@ if ( $website ) { $formatted_website_text = $class->format_website_text( formatter => $formatter, - text => $website ); + text => $website + ); } my $hours_text = $args{metadata} ? $metadata{opening_hours_text}[0] - : $q->param("hours_text"); + : $q->param("hours_text"); my %vars = ( categories => \@categories, - locales => \@locales, - category => \@catlist, + locales => \@locales, + category => \@catlist, locale => \@loclist, - formatted_website_text => $formatted_website_text, - hours_text => $hours_text + formatted_website_text => $formatted_website_text, + hours_text => $hours_text ); if ( $args{metadata} ) { @@ -293,38 +299,38 @@ my $geo_handler = $config->geo_handler; if ( $geo_handler == 1 ) { %vars = ( - %vars, - coord_field_1 => "os_x", - coord_field_2 => "os_y", - dist_field => "os_dist", - coord_field_1_name => "OS X coordinate", - coord_field_2_name => "OS Y coordinate", - coord_field_1_value => $metadata{os_x}[0], - coord_field_2_value => $metadata{os_y}[0], + %vars, + coord_field_1 => "os_x", + coord_field_2 => "os_y", + dist_field => "os_dist", + coord_field_1_name => "OS X coordinate", + coord_field_2_name => "OS Y coordinate", + coord_field_1_value => $metadata{os_x}[0], + coord_field_2_value => $metadata{os_y}[0], ); - } elsif ( $geo_handler == 2 ) { + } elsif ( $geo_handler == 2 ) { %vars = ( - %vars, - coord_field_1 => "osie_x", - coord_field_2 => "osie_y", - dist_field => "osie_dist", - coord_field_1_name =>"Irish National Grid X coordinate", - coord_field_2_name =>"Irish National Grid Y coordinate", - coord_field_1_value => $metadata{osie_x}[0], - coord_field_2_value => $metadata{osie_y}[0], + %vars, + coord_field_1 => "osie_x", + coord_field_2 => "osie_y", + dist_field => "osie_dist", + coord_field_1_name =>"Irish National Grid X coordinate", + coord_field_2_name =>"Irish National Grid Y coordinate", + coord_field_1_value => $metadata{osie_x}[0], + coord_field_2_value => $metadata{osie_y}[0], ); - } else { + } else { %vars = ( - %vars, - coord_field_1 => "latitude", - coord_field_2 => "longitude", - dist_field => "latlong_dist", - coord_field_1_name => "Latitude (decimal)", - coord_field_2_name => "Longitude (decimal)", - coord_field_1_value => $metadata{latitude}[0], - coord_field_2_value => $metadata{longitude}[0], + %vars, + coord_field_1 => "latitude", + coord_field_2 => "longitude", + dist_field => "latlong_dist", + coord_field_1_name => "Latitude (decimal)", + coord_field_2_name => "Longitude (decimal)", + coord_field_1_value => $metadata{latitude}[0], + coord_field_2_value => $metadata{longitude}[0], ); - } + } } else { foreach my $var ( qw( phone fax address postcode map_link website) ) { $vars{$var} = $q->param($var); @@ -332,11 +338,11 @@ my $geo_handler = $config->geo_handler; if ( $geo_handler == 1 ) { - require Geography::NationalGrid::GB; - my $os_x = $q->param("os_x"); - my $os_y = $q->param("os_y"); - my $lat = $q->param("latitude"); - my $long = $q->param("longitude"); + require Geography::NationalGrid::GB; + my $os_x = $q->param("os_x"); + my $os_y = $q->param("os_y"); + my $lat = $q->param("latitude"); + my $long = $q->param("longitude"); # Trim whitespace - trailing whitespace buggers up the # integerification by postgres and it's an easy mistake to @@ -344,87 +350,89 @@ $os_x =~ s/\s+//g; $os_y =~ s/\s+//g; - # If we were sent x and y, work out lat/long; and vice versa. - if ( $os_x && $os_y ) { - my $point = Geography::NationalGrid::GB->new( Easting =>$os_x, - Northing=>$os_y); + # If we were sent x and y, work out lat/long; and vice versa. + if ( $os_x && $os_y ) { + my $point = Geography::NationalGrid::GB->new( Easting =>$os_x, + Northing=>$os_y); $lat = sprintf("%.6f", $point->latitude); $long = sprintf("%.6f", $point->longitude); - } elsif ( $lat && $long ) { - my $point = Geography::NationalGrid::GB->new(Latitude =>$lat, - Longitude=>$long); + } elsif ( $lat && $long ) { + my $point = Geography::NationalGrid::GB->new(Latitude => $lat, + Longitude => $long); $os_x = $point->easting; $os_y = $point->northing; - } + } + if ( $os_x && $os_y ) { - %vars = ( - %vars, - latitude => $lat, - longitude => $long, - os_x => $os_x, - os_y => $os_y, - ); - } + %vars = ( + %vars, + latitude => $lat, + longitude => $long, + os_x => $os_x, + os_y => $os_y, + ); + } if ( $args{set_coord_field_vars} ) { %vars = ( - %vars, - coord_field_1 => "os_x", - coord_field_2 => "os_y", - dist_field => "os_dist", - coord_field_1_name => "OS X coordinate", - coord_field_2_name => "OS Y coordinate", - coord_field_1_value => $os_x, - coord_field_2_value => $os_y, + %vars, + coord_field_1 => "os_x", + coord_field_2 => "os_y", + dist_field => "os_dist", + coord_field_1_name => "OS X coordinate", + coord_field_2_name => "OS Y coordinate", + coord_field_1_value => $os_x, + coord_field_2_value => $os_y, ); - } - } elsif ( $geo_handler == 2 ) { - require Geography::NationalGrid::IE; - my $osie_x = $q->param("osie_x"); - my $osie_y = $q->param("osie_y"); - my $lat = $q->param("latitude"); - my $long = $q->param("longitude"); + } + } elsif ( $geo_handler == 2 ) { + require Geography::NationalGrid::IE; + my $osie_x = $q->param("osie_x"); + my $osie_y = $q->param("osie_y"); + my $lat = $q->param("latitude"); + my $long = $q->param("longitude"); # Trim whitespace. $osie_x =~ s/\s+//g; $osie_y =~ s/\s+//g; - # If we were sent x and y, work out lat/long; and vice versa. - if ( $osie_x && $osie_y ) { - my $point = Geography::NationalGrid::IE->new(Easting=>$osie_x, - Northing=>$osie_y); + # If we were sent x and y, work out lat/long; and vice versa. + if ( $osie_x && $osie_y ) { + my $point = Geography::NationalGrid::IE->new(Easting=>$osie_x, + Northing=>$osie_y); $lat = sprintf("%.6f", $point->latitude); - $long = sprintf("%.6f", $point->longitude); - } elsif ( $lat && $long ) { - my $point = Geography::NationalGrid::GB->new(Latitude =>$lat, - Longitude=>$long); + $long = sprintf("%.6f", $point->longitude); + } elsif ( $lat && $long ) { + my $point = Geography::NationalGrid::GB->new(Latitude => $lat, + Longitude => $long); $osie_x = $point->easting; $osie_y = $point->northing; - } - if ( $osie_x && $osie_y ) { - %vars = ( - %vars, - latitude => $lat, - longitude => $long, - osie_x => $osie_x, - osie_y => $osie_y, - ); - } + } + if ( $osie_x && $osie_y ) { + %vars = ( + %vars, + latitude => $lat, + longitude => $long, + osie_x => $osie_x, + osie_y => $osie_y, + ); + } if ( $args{set_coord_field_vars} ) { %vars = ( - %vars, - coord_field_1 => "osie_x", - coord_field_2 => "osie_y", - dist_field => "osie_dist", - coord_field_1_name => "Irish National Grid X coordinate", - coord_field_2_name => "Irish National Grid Y coordinate", - coord_field_1_value => $osie_x, - coord_field_2_value => $osie_y, + %vars, + coord_field_1 => "osie_x", + coord_field_2 => "osie_y", + dist_field => "osie_dist", + coord_field_1_name => "Irish National Grid X coordinate", + coord_field_2_name => "Irish National Grid Y coordinate", + coord_field_1_value => $osie_x, + coord_field_2_value => $osie_y, ); - } - } elsif ( $geo_handler == 3 ) { - require Geo::Coordinates::UTM; - my $lat = $q->param("latitude"); - my $long = $q->param("longitude"); + } + } elsif ( $geo_handler == 3 ) { + require Geo::Coordinates::UTM; + my $lat = $q->param("latitude"); + my $long = $q->param("longitude"); + if ( $lat && $long ) { # Trim whitespace. $lat =~ s/\s+//g; @@ -434,26 +442,27 @@ $lat, $long ); $easting =~ s/\..*//; # chop off decimal places $northing =~ s/\..*//; # - metre accuracy enough - %vars = ( %vars, - latitude => $lat, - longitude => $long, - easting => $easting, - northing => $northing, - ); - } - if ( $args{set_coord_field_vars} ) { %vars = ( - %vars, - coord_field_1 => "latitude", - coord_field_2 => "longitude", - dist_field => "latlong_dist", - coord_field_1_name => "Latitude (decimal)", - coord_field_2_name => "Longitude (decimal)", - coord_field_1_value => $lat, - coord_field_2_value => $long, + %vars, + latitude => $lat, + longitude => $long, + easting => $easting, + northing => $northing, ); - } - } + } + if ( $args{set_coord_field_vars} ) { + %vars = ( + %vars, + coord_field_1 => "latitude", + coord_field_2 => "longitude", + dist_field => "latlong_dist", + coord_field_1_name => "Latitude (decimal)", + coord_field_2_name => "Longitude (decimal)", + coord_field_1_value => $lat, + coord_field_2_value => $long, + ); + } + } } # Check whether we need to munge lat and long.

17 years, 5 months

r679 - in trunk: . lib/OpenGuides

by svnadmin＠urchin.earth.li

Author: earle Date: 2005-10-09 21:32:05 +0100 (Sun, 09 Oct 2005) New Revision: 679 Modified: trunk/Changes trunk/lib/OpenGuides/RDF.pm Log: Add missing address field to RDF output Modified: trunk/Changes =================================================================== --- trunk/Changes 2005-10-05 04:05:16 UTC (rev 678) +++ trunk/Changes 2005-10-09 20:32:05 UTC (rev 679) @@ -1,4 +1,5 @@ 0.51 + Add "address" field that had got missed out from the RDF. Replace underscores in node names in redirection message with spaces. Redirection message now links to a rendered version of the old page rather than the editing view. Modified: trunk/lib/OpenGuides/RDF.pm =================================================================== --- trunk/lib/OpenGuides/RDF.pm 2005-10-05 04:05:16 UTC (rev 678) +++ trunk/lib/OpenGuides/RDF.pm 2005-10-09 20:32:05 UTC (rev 679) @@ -65,6 +65,7 @@ my $fax = $node_data{metadata}{fax}[0] || ''; my $website = $node_data{metadata}{website}[0] || ''; my $opening_hours_text = $node_data{metadata}{opening_hours_text}[0] || ''; + my $address = $node_data{metadata}{address}[0] || ''; my $postcode = $node_data{metadata}{postcode}[0] || ''; my $city = $node_data{metadata}{city}[0] || $self->{default_city}; my $country = $node_data{metadata}{country}[0] || $self->{default_country}; @@ -91,7 +92,7 @@ my ($is_geospatial, $objType); - if ($latitude || $longitude || $postcode || @locales) { + if ($os_x || $os_y || $latitude || $longitude || $address || $postcode || @locales) { $is_geospatial = 1; $objType = 'geo:SpatialThing'; } else { @@ -140,30 +141,34 @@ }; $rdf .= "\n \n\n" if $catrefs; $rdf .= " <dc:subject>$_</dc:subject>\n" foreach @{$catrefs}; - $rdf .= "\n \n\n" if $is_geospatial; - $rdf .= " <city>$city</city>\n" if $city && $is_geospatial; - $rdf .= " <postalCode>$postcode</postalCode>\n" if $postcode && $is_geospatial; - $rdf .= " <country>$country</country>\n" if $country && $is_geospatial; + + if ($is_geospatial) + { + $rdf .= "\n \n\n" if $is_geospatial; + $rdf .= " <city>$city</city>\n" if $city; + $rdf .= " <postalCode>$postcode</postalCode>\n" if $postcode; + $rdf .= " <country>$country</country>\n" if $country; - $rdf .= qq{ + $rdf .= qq{ <foaf:based_near> <wn:Neighborhood> <foaf:name>$_</foaf:name> </wn:Neighborhood> </foaf:based_near>\n} foreach @locales; - if ( $latitude && $longitude ) { - $rdf .= qq{ + if ( $latitude && $longitude ) { + $rdf .= qq{ <geo:lat>$latitude</geo:lat> <geo:long>$longitude</geo:long>\n}; - } + } - if ( $os_x && $os_y ) { - $rdf .= qq{ + if ( $os_x && $os_y ) { + $rdf .= qq{ <os:x>$os_x</os:x> <os:y>$os_y</os:y>}; + } } - + $rdf .= "\n\n \n\n" if ($phone || $fax || $website || $opening_hours_text); $rdf .= " <phone>$phone</phone>\n" if $phone; $rdf .= " <fax>$fax</fax>\n" if $fax;

17 years, 5 months

r678 - in trunk: . lib templates

by svnadmin＠urchin.earth.li

Author: earle Date: 2005-10-05 05:05:16 +0100 (Wed, 05 Oct 2005) New Revision: 678 Modified: trunk/Changes trunk/lib/OpenGuides.pm trunk/templates/node.tt trunk/wiki.cgi Log: Change the behaviour of the "redirected" message to link to a rendered version of the old page, not the editing view. Modified: trunk/Changes =================================================================== --- trunk/Changes 2005-10-05 03:10:22 UTC (rev 677) +++ trunk/Changes 2005-10-05 04:05:16 UTC (rev 678) @@ -1,6 +1,8 @@ 0.51 Replace underscores in node names in redirection message with spaces. - + Redirection message now links to a rendered version of the old page + rather than the editing view. + 0.50 2 October 2005 Remove rogue ampersand that had crept into the RSS feed. Modified: trunk/lib/OpenGuides.pm =================================================================== --- trunk/lib/OpenGuides.pm 2005-10-05 03:10:22 UTC (rev 677) +++ trunk/lib/OpenGuides.pm 2005-10-05 04:05:16 UTC (rev 678) @@ -143,6 +143,7 @@ my $wiki = $self->wiki; my $config = $self->config; my $oldid = $args{oldid} || ''; + my $do_redirect = $args{redirect} || 1; my %tt_vars; @@ -160,46 +161,57 @@ my $current_version = $current_data{version}; undef $version if ($version && $version == $current_version); my %criteria = ( name => $id ); - $criteria{version} = $version if $version;#retrieve_node default is current + $criteria{version} = $version if $version; # retrieve_node default is current my %node_data = $wiki->retrieve_node( %criteria ); - my $raw = $node_data{content}; - if ( $raw =~ /^#REDIRECT\s+(.+?)\s*$/ ) { - my $redirect = $1; - # Strip off enclosing [[ ]] in case this is an extended link. - $redirect =~ s/^\[\[//; - $redirect =~ s/\]\]\s*$//; - # See if this is a valid node, if not then just show the page as-is. - # Avoid loops by not generating redirects to the same node or the - # previous node. - if ( $wiki->node_exists($redirect) && $redirect ne $id && $redirect ne $oldid ) { - my $output = $self->redirect_to_node($redirect, $id); - return $output if $return_output; - print $output; - exit 0; - } - } + my $raw = $node_data{content}; my $content = $wiki->format($raw); my $modified = $node_data{last_modified}; my %metadata = %{$node_data{metadata}}; my %metadata_vars = OpenGuides::Template->extract_metadata_vars( wiki => $wiki, - config => $config, + config => $config, metadata => $node_data{metadata} ); %tt_vars = ( %tt_vars, - %metadata_vars, - content => $content, - last_modified => $modified, - version => $node_data{version}, + %metadata_vars, + content => $content, + last_modified => $modified, + version => $node_data{version}, node => $id, language => $config->default_language, oldid => $oldid, ); + if ( $raw =~ /^#REDIRECT\s+(.+?)\s*$/ ) { + my $redirect = $1; + # Strip off enclosing [[ ]] in case this is an extended link. + $redirect =~ s/^\[\[//; + $redirect =~ s/\]\]\s*$//; + + # Don't redirect if the parameter "redirect" is given as 0. + if ($do_redirect == 0) { + return %tt_vars if $args{return_tt_vars}; + $tt_vars{current} = 1; + my $output = $self->process_template( + id => $id, + template => "node.tt", + tt_vars => \%tt_vars, + ); + return $output if $return_output; + print $output; + } elsif ( $wiki->node_exists($redirect) && $redirect ne $id && $redirect ne $oldid ) { + # Avoid loops by not generating redirects to the same node or the previous node. + my $output = $self->redirect_to_node($redirect, $id); + return $output if $return_output; + print $output; + exit 0; + } + } + # We've undef'ed $version above if this is the current version. $tt_vars{current} = 1 unless $version; @@ -838,12 +850,13 @@ sub process_template { my ($self, %args) = @_; - my %output_conf = ( wiki => $self->wiki, + my %output_conf = ( + wiki => $self->wiki, config => $self->config, node => $args{id}, template => $args{template}, vars => $args{tt_vars}, - cookies => $args{cookies}, + cookies => $args{cookies}, ); if ( $args{content_type} ) { $output_conf{content_type} = ""; @@ -869,7 +882,7 @@ $redir_param .= 'id=' if $oldid; $redir_param .= $id; $redir_param .= ";oldid=$oldid" if $oldid; - + return CGI->redirect( $redir_param ); } Modified: trunk/templates/node.tt =================================================================== --- trunk/templates/node.tt 2005-10-05 03:10:22 UTC (rev 677) +++ trunk/templates/node.tt 2005-10-05 04:05:16 UTC (rev 678) @@ -5,7 +5,7 @@ [% INCLUDE navbar.tt %] <div id="maincontent"> [% IF oldid %] -<div id="redirect_message">(redirected from <a href="[% full_cgi_url %]?action=edit&id=[% oldid %]">[% oldid.replace('_', ' ') %]</a></div> +<div id="redirect_message">(redirected from <a href="[% full_cgi_url %]?id=[% oldid %];redirect=0">[% oldid.replace('_', ' ') %]</a></div> [% END %] [% IF current %] Modified: trunk/wiki.cgi =================================================================== --- trunk/wiki.cgi 2005-10-05 03:10:22 UTC (rev 677) +++ trunk/wiki.cgi 2005-10-05 04:05:16 UTC (rev 678) @@ -124,7 +124,7 @@ } else { my $redirect; - if ($q->param("redirect") && ($q->param("redirect") == 0)) { + if ((defined $q->param("redirect")) && ($q->param("redirect") == 0)) { $redirect = 0; } else { $redirect = 1; @@ -134,11 +134,10 @@ id => $node, version => $version, oldid => $oldid, - redirect => $redirect; - ); - + redirect => $redirect, + ); + } } - } } };

17 years, 5 months

r677 - trunk

by svnadmin＠urchin.earth.li

Author: earle Date: 2005-10-05 04:10:22 +0100 (Wed, 05 Oct 2005) New Revision: 677 Modified: trunk/wiki.cgi Log: replace tabstops with four spaces each Modified: trunk/wiki.cgi =================================================================== --- trunk/wiki.cgi 2005-10-05 02:56:36 UTC (rev 676) +++ trunk/wiki.cgi 2005-10-05 03:10:22 UTC (rev 677) @@ -114,7 +114,7 @@ display_node_rdf( node => $node ); } else { my $version = $q->param("version"); - my $other_ver = $q->param("diffversion"); + my $other_ver = $q->param("diffversion"); if ( $other_ver ) { $guide->display_diffs( id => $node, @@ -122,14 +122,23 @@ other_version => $other_ver, ); } else { + my $redirect; + + if ($q->param("redirect") && ($q->param("redirect") == 0)) { + $redirect = 0; + } else { + $redirect = 1; + } + $guide->display_node( - id => $node, - version => $version, - oldid => $oldid, + id => $node, + version => $version, + oldid => $oldid, + redirect => $redirect; ); - } } + } } }; @@ -161,14 +170,14 @@ : { host => $host }; my @nodes = $wiki->list_recent_changes( %criteria ); @nodes = map { {name => $q->escapeHTML($_->{name}), - last_modified => $q->escapeHTML($_->{last_modified}), - comment => $q->escapeHTML($_->{metadata}{comment}[0]), - url => "$script_name?" + last_modified => $q->escapeHTML($_->{last_modified}), + comment => $q->escapeHTML($_->{metadata}{comment}[0]), + url => "$script_name?" . $q->escape($formatter->node_name_to_node_param($_->{name})) } } @nodes; my %tt_vars = ( last_five_nodes => \@nodes, - username => $username, - username_param => $wiki->formatter->node_name_to_node_param($username), + username => $username, + username_param => $wiki->formatter->node_name_to_node_param($username), host => $host, ); process_template("userstats.tt", "", \%tt_vars); @@ -182,8 +191,8 @@ my %tt_metadata_vars = OpenGuides::Template->extract_metadata_vars( wiki => $wiki, - config => $config, - cgi_obj => $q, + config => $config, + cgi_obj => $q, set_coord_field_vars => 1, ); foreach my $var ( qw( username comment edit_type ) ) { @@ -197,7 +206,7 @@ preview_html => $wiki->format($content), preview_above_edit_box => get_cookie( "preview_above_edit_box" ), checksum => $q->escapeHTML($checksum) - ); + ); process_template("edit_form.tt", $node, \%tt_vars); } else { my %node_data = $wiki->retrieve_node($node); @@ -234,12 +243,12 @@ my %metadata_vars = OpenGuides::Template->extract_metadata_vars( wiki => $wiki, config => $config, - metadata => $node_data{metadata} ); + metadata => $node_data{metadata} ); my %tt_vars = ( content => $q->escapeHTML($content), checksum => $q->escapeHTML($checksum), %metadata_vars, - username => $username, + username => $username, edit_type => $edit_type, deter_robots => 1, ); @@ -256,7 +265,7 @@ sub display_node_rdf { my %args = @_; my $rdf_writer = OpenGuides::RDF->new( wiki => $wiki, - config => $config ); + config => $config ); print "Content-type: text/plain\n\n"; print $rdf_writer->emit_rdfxml( node => $args{node} ); exit 0; @@ -266,10 +275,10 @@ my ($template, $node, $vars, $conf, $omit_header) = @_; my %output_conf = ( wiki => $wiki, - config => $config, + config => $config, node => $node, - template => $template, - vars => $vars + template => $template, + vars => $vars ); $output_conf{content_type} = "" if $omit_header; # defaults otherwise print OpenGuides::Template->output( %output_conf ); @@ -283,7 +292,7 @@ my @sorted = sort keys %finds; my @results = map { { url => $q->escape($formatter->node_name_to_node_param($_)), - title => $q->escapeHTML($_) + title => $q->escapeHTML($_) } } @sorted; my %tt_vars = ( results => \@results, num_results => scalar @results, @@ -301,13 +310,13 @@ } foreach my $node_name (sort { $backlinks_count{$b} <=> $backlinks_count{$a} } @dangling) { my $node_param = - uri_escape($formatter->node_name_to_node_param($node_name)); + uri_escape($formatter->node_name_to_node_param($node_name)); push @wanted, { name => $q->escapeHTML($node_name), edit_link => $script_url . uri_escape($script_name) . "?action=edit;id=$node_param", backlink_link => $script_url . uri_escape($script_name) - . "?action=show_backlinks;id=$node_param", + . "?action=show_backlinks;id=$node_param", backlinks_count => $backlinks_count{$node_name} }; }

17 years, 5 months

r676 - trunk/lib

by svnadmin＠urchin.earth.li

Author: earle Date: 2005-10-05 03:56:36 +0100 (Wed, 05 Oct 2005) New Revision: 676 Modified: trunk/lib/OpenGuides.pm Log: Replace some errant tabstops with four spaces each; this should normalise the indenting in this file. Modified: trunk/lib/OpenGuides.pm =================================================================== --- trunk/lib/OpenGuides.pm 2005-10-05 02:39:57 UTC (rev 675) +++ trunk/lib/OpenGuides.pm 2005-10-05 02:56:36 UTC (rev 676) @@ -186,15 +186,15 @@ my %metadata_vars = OpenGuides::Template->extract_metadata_vars( wiki => $wiki, - config => $config, + config => $config, metadata => $node_data{metadata} ); %tt_vars = ( %tt_vars, - %metadata_vars, - content => $content, - last_modified => $modified, - version => $node_data{version}, + %metadata_vars, + content => $content, + last_modified => $modified, + version => $node_data{version}, node => $id, language => $config->default_language, oldid => $oldid, @@ -229,11 +229,11 @@ edit_type => CGI->escapeHTML($_->{metadata}{edit_type}[0]), url => $config->script_name . "?" . CGI->escape($wiki->formatter->node_name_to_node_param($_->{name})), - } + } } @rc; if ( scalar @rc ) { $recent_changes{since} = \@rc; - } + } } else { for my $days ( [0, 1], [1, 7], [7, 14], [14, 30] ) { my %criteria = ( between_days => $days ); @@ -253,12 +253,12 @@ edit_type => CGI->escapeHTML($_->{metadata}{edit_type}[0]), url => $config->script_name . "?" . CGI->escape($wiki->formatter->node_name_to_node_param($_->{name})), - } + } } @rc; if ( scalar @rc ) { $recent_changes{$days->[1]} = \@rc; - } - } + } + } } $tt_vars{recent_changes} = \%recent_changes; my %processing_args = ( @@ -267,7 +267,7 @@ tt_vars => \%tt_vars, ); if ( !$since && $self->get_cookie("track_recent_changes_views") ) { - my $cookie = + my $cookie = OpenGuides::CGI->make_recent_changes_cookie(config => $config ); $processing_args{cookies} = $cookie; $tt_vars{last_viewed} = OpenGuides::CGI->get_last_recent_changes_visit_from_cookie( config => $config ); @@ -342,7 +342,7 @@ my %diff_vars = $self->differ->differences( node => $args{id}, left_version => $args{version}, - right_version => $args{other_version}, + right_version => $args{other_version}, ); $diff_vars{not_deletable} = 1; $diff_vars{not_editable} = 1; @@ -395,7 +395,7 @@ my @backlinks = $wiki->list_backlinks( node => $args{id} ); my @results = map { { url => CGI->escape($formatter->node_name_to_node_param($_)), - title => CGI->escapeHTML($_) + title => CGI->escapeHTML($_) } } sort @backlinks; my %tt_vars = ( results => \@results, num_results => scalar @results, @@ -452,12 +452,12 @@ type => $args{type}, # for RDF version value => $args{value}, # for RDF version name => CGI->escapeHTML("Fuzzy Title Match on '$args{value}'") - }; - $tt_vars{not_editable} = 1; + }; + $tt_vars{not_editable} = 1; } else { @selnodes = $wiki->list_nodes_by_metadata( metadata_type => $args{type}, - metadata_value => $args{value}, + metadata_value => $args{value}, ignore_case => 1 ); my $name = ucfirst($args{type}) . " $args{value}" ; @@ -472,9 +472,9 @@ type => $args{type}, value => $args{value}, # for RDF version name => CGI->escapeHTML( $name ), - url => $url + url => $url }; - $tt_vars{not_editable} = 1; + $tt_vars{not_editable} = 1; } } else { @selnodes = $wiki->list_all_nodes(); @@ -482,8 +482,8 @@ my @nodes = map { { name => $_, node_data => { $wiki->retrieve_node( name => $_ ) }, - param => $formatter->node_name_to_node_param($_) } - } sort @selnodes; + param => $formatter->node_name_to_node_param($_) } + } sort @selnodes; $tt_vars{nodes} = \@nodes; @@ -493,7 +493,7 @@ { if ( $args{format} eq "rdf" ) { - $template = "rdf_index.tt"; + $template = "rdf_index.tt"; $conf{content_type} = "text/plain"; } elsif ( $args{format} eq "plain" ) @@ -547,22 +547,22 @@ my @history; for my $version ( 1 .. $curr_version ) { my %node_data = $self->wiki->retrieve_node( name => $node, - version => $version ); + version => $version ); # $node_data{version} will be zero if this version was deleted. - push @history, { + push @history, { version => CGI->escapeHTML( $version ), - modified => CGI->escapeHTML( $node_data{last_modified} ), + modified => CGI->escapeHTML( $node_data{last_modified} ), username => CGI->escapeHTML( $node_data{metadata}{username}[0] ), comment => CGI->escapeHTML( $node_data{metadata}{comment}[0] ), } if $node_data{version}; } @history = reverse @history; my %tt_vars = ( node => $node, - version => $curr_version, + version => $curr_version, not_deletable => 1, not_editable => 1, deter_robots => 1, - history => \@history ); + history => \@history ); return %tt_vars if $args{return_tt_vars}; my $output = $self->process_template( id => $node, @@ -619,7 +619,7 @@ } my $rdf_writer = OpenGuides::RDF->new( wiki => $self->wiki, - config => $self->config ); + config => $self->config ); my $output = "Content-Type: text/plain\n"; $output .= "Last-Modified: " . $rdf_writer->rss_timestamp( %criteria ) . "\n\n"; $output .= $rdf_writer->make_recentchanges_rss( %criteria ); @@ -679,7 +679,7 @@ my %metadata = OpenGuides::Template->extract_metadata_vars( wiki => $wiki, config => $config, - cgi_obj => $q + cgi_obj => $q ); $metadata{opening_hours_text} = $q->param("hours_text") || ""; @@ -695,24 +695,24 @@ foreach my $type (qw(Category Locale)) { my $lctype = lc($type); foreach my $index (@{$metadata{$lctype}}) { - $index =~ s/(.*)/\u$1/; - my $node = $type . " " . $index; - # Uppercase the node name before checking for existence - $node =~ s/ (\S+)/ \u$1/g; - unless ( $wiki->node_exists($node) ) { - my $category = $type eq "Category" ? "Category" : "Locales"; - $wiki->write_node( $node, - "\@INDEX_LINK [[$node]]", - undef, - { username => "Auto Create", - comment => "Auto created $lctype stub page", - category => $category - } - ); - } - } + $index =~ s/(.*)/\u$1/; + my $node = $type . " " . $index; + # Uppercase the node name before checking for existence + $node =~ s/ (\S+)/ \u$1/g; + unless ( $wiki->node_exists($node) ) { + my $category = $type eq "Category" ? "Category" : "Locales"; + $wiki->write_node( $node, + "\@INDEX_LINK [[$node]]", + undef, + { username => "Auto Create", + comment => "Auto created $lctype stub page", + category => $category + } + ); + } } - + } + foreach my $var ( qw( username comment edit_type ) ) { $metadata{$var} = $q->param($var) || ""; } @@ -839,10 +839,10 @@ sub process_template { my ($self, %args) = @_; my %output_conf = ( wiki => $self->wiki, - config => $self->config, - node => $args{id}, - template => $args{template}, - vars => $args{tt_vars}, + config => $self->config, + node => $args{id}, + template => $args{template}, + vars => $args{tt_vars}, cookies => $args{cookies}, ); if ( $args{content_type} ) {

17 years, 5 months

r675 - in trunk: . templates

by svnadmin＠urchin.earth.li

Author: earle Date: 2005-10-05 03:39:57 +0100 (Wed, 05 Oct 2005) New Revision: 675 Modified: trunk/Changes trunk/templates/node.tt Log: Replace underscores in node names in redirection message with spaces. Modified: trunk/Changes =================================================================== --- trunk/Changes 2005-10-02 18:37:40 UTC (rev 674) +++ trunk/Changes 2005-10-05 02:39:57 UTC (rev 675) @@ -1,3 +1,6 @@ +0.51 + Replace underscores in node names in redirection message with spaces. + 0.50 2 October 2005 Remove rogue ampersand that had crept into the RSS feed. Modified: trunk/templates/node.tt =================================================================== --- trunk/templates/node.tt 2005-10-02 18:37:40 UTC (rev 674) +++ trunk/templates/node.tt 2005-10-05 02:39:57 UTC (rev 675) @@ -5,7 +5,7 @@ [% INCLUDE navbar.tt %] <div id="maincontent"> [% IF oldid %] -<div id="redirect_message">(redirected from <a href="[% full_cgi_url %]?action=edit&id=[% oldid %]">[% oldid %]</a></div> +<div id="redirect_message">(redirected from <a href="[% full_cgi_url %]?action=edit&id=[% oldid %]">[% oldid.replace('_', ' ') %]</a></div> [% END %] [% IF current %]

17 years, 5 months

r674 - in trunk: . lib

by svnadmin＠urchin.earth.li

Author: dom Date: 2005-10-02 19:37:40 +0100 (Sun, 02 Oct 2005) New Revision: 674 Modified: trunk/Changes trunk/PREREQUISITES trunk/lib/OpenGuides.pm trunk/wiki.cgi Log: Release. Modified: trunk/Changes =================================================================== --- trunk/Changes 2005-09-01 22:03:37 UTC (rev 673) +++ trunk/Changes 2005-10-02 18:37:40 UTC (rev 674) @@ -1,7 +1,9 @@ +0.50 2 October 2005 + Remove rogue ampersand that had crept into the RSS feed. + 0.49 24 July 2005 Add updated prerequisite on CGI::Wiki::Plugin::RSS::ModWiki (fixes a test failure) - Remove rogue ampersand that had crept into the RSS feed. 0.48 24 July 2005 RDF enhancements: Modified: trunk/PREREQUISITES =================================================================== --- trunk/PREREQUISITES 2005-09-01 22:03:37 UTC (rev 673) +++ trunk/PREREQUISITES 2005-10-02 18:37:40 UTC (rev 674) @@ -1,4 +1,4 @@ -Modules required by OpenGuides 0.49 +Modules required by OpenGuides 0.50 =================================== Algorithm::Diff (version 0.13 or later) Modified: trunk/lib/OpenGuides.pm =================================================================== --- trunk/lib/OpenGuides.pm 2005-09-01 22:03:37 UTC (rev 673) +++ trunk/lib/OpenGuides.pm 2005-10-02 18:37:40 UTC (rev 674) @@ -13,7 +13,7 @@ use vars qw( $VERSION ); -$VERSION = '0.49'; +$VERSION = '0.50'; =head1 NAME Modified: trunk/wiki.cgi =================================================================== --- trunk/wiki.cgi 2005-09-01 22:03:37 UTC (rev 673) +++ trunk/wiki.cgi 2005-10-02 18:37:40 UTC (rev 674) @@ -4,7 +4,7 @@ use warnings; use vars qw( $VERSION ); -$VERSION = '0.49'; +$VERSION = '0.50'; use CGI qw/:standard/; use CGI::Carp qw(croak);

17 years, 5 months

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

openguides-commits October 2005