User: sits
Date: 08/08/05 03:35:35
Modified: lib/Codestriker/Action ViewTopicProperties.pm ViewTopic.pm
ViewTopicInfo.pm EditComment.pm SubmitNewTopic.pm
SubmitNewComment.pm ListTopicsRSS.pm ListTopics.pm
CreateTopic.pm
lib/Codestriker/Http UrlBuilder.pm
lib/Codestriker/TopicListeners BugTracking.pm Email.pm
Log:
Use named arguments to the url_builder->view_url() method. Also make the
links from the edit comment pages linked back to the code point in question
correctly.
Index: ViewTopicProperties.pm
===================================================================
RCS file:
/cvsroot/codestriker/codestriker/lib/Codestriker/Action/ViewTopicProperties.pm,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- ViewTopicProperties.pm 14 Mar 2008 01:30:52 -0000 1.16
+++ ViewTopicProperties.pm 5 Aug 2008 10:35:34 -0000 1.17
@@ -67,7 +67,7 @@
my @projectids = ($topic->{project_id});
$vars->{'view_topic_url'} =
- $url_builder->view_url($topicid, -1, $mode);
+ $url_builder->view_url(topicid => $topicid, mode => $mode);
$vars->{'view_topicinfo_url'} =
$url_builder->view_topicinfo_url($topicid);
$vars->{'view_comments_url'} = $url_builder->view_comments_url($topicid);
Index: ViewTopic.pm
===================================================================
RCS file:
/cvsroot/codestriker/codestriker/lib/Codestriker/Action/ViewTopic.pm,v
retrieving revision 1.64
retrieving revision 1.65
diff -u -r1.64 -r1.65
--- ViewTopic.pm 4 Aug 2008 11:22:55 -0000 1.64
+++ ViewTopic.pm 5 Aug 2008 10:35:34 -0000 1.65
@@ -150,16 +150,9 @@
# Obtain the links for the different viewing modes.
$vars->{'coloured_mode_url'} =
- $url_builder->view_url($topicid, -1, $Codestriker::COLOURED_MODE,
$fview);
+ $url_builder->view_url(topicid => $topicid, mode =>
$Codestriker::COLOURED_MODE, fview => $fview);
$vars->{'coloured_mono_mode_url'} =
- $url_builder->view_url($topicid, -1,
- $Codestriker::COLOURED_MONO_MODE, $fview);
- $vars->{'br_normal_mode_url'} =
- $url_builder->view_url($topicid, -1, $mode,
- $Codestriker::LINE_BREAK_NORMAL_MODE, $fview);
- $vars->{'br_assist_mode_url'} =
- $url_builder->view_url($topicid, -1, $mode,
- $Codestriker::LINE_BREAK_ASSIST_MODE, $fview);
+ $url_builder->view_url(topicid => $topicid, mode =>
$Codestriker::COLOURED_MONO_MODE, fview => $fview);
# Set template variables relating to coloured mode.
if ($mode == $Codestriker::COLOURED_MODE) {
@@ -175,14 +168,14 @@
$vars->{'tabwidth'} = $tabwidth;
$vars->{'newtabwidth'} = $newtabwidth;
$vars->{'change_tabwidth_url'} =
- $url_builder->view_url_extended($topicid, -1, $mode, $newtabwidth,
- "", "", 0, $fview);
+ $url_builder->view_url(topicid => $topicid, mode => $mode, tabwidth =>
$newtabwidth,
+ fview => $fview);
# Set the display all, display single URLs.
$vars->{'display_all_files_url'} =
- $url_builder->view_url($topicid, -1, $mode, -1);
+ $url_builder->view_url(topicid => $topicid, mode => $mode);
$vars->{'display_single_file_url'} =
- $url_builder->view_url($topicid, -1, $mode, 0);
+ $url_builder->view_url(topicid => $topicid, mode => $mode);
$vars->{'fview'} = $fview;
# Setup the filetable template variable for displaying the table of
@@ -200,7 +193,7 @@
$total_new_changes += $1;
}
$filerow->{href_filename_url} =
- $url_builder->view_url($topicid, -1, $mode, $i) .
+ $url_builder->view_url(topicid => $topicid, mode => $mode, fview =>
$i) .
"#" . $filename;
$filerow->{binary} = $binary[$i];
@@ -273,13 +266,13 @@
# Create the next/previous file URL links.
if ($filenumber > 0) {
$delta->{previous_file_url} =
- $url_builder->view_url($topicid, -1, $mode,
- $filenumber-1) . "#" .
$filenames[$filenumber-1];
+ $url_builder->view_url(topicid => $topicid, mode => $mode,
+ fview => $filenumber-1)
. "#" . $filenames[$filenumber-1];
}
if ($filenumber < $#filenames) {
$delta->{next_file_url} =
- $url_builder->view_url($topicid, -1, $mode,
- $filenumber+1) . "#" .
$filenames[$filenumber+1];
+ $url_builder->view_url(topicid => $topicid, mode => $mode,
+ fview => $filenumber+1)
. "#" . $filenames[$filenumber+1];
}
$current_filename = $delta->{filename};
@@ -351,7 +344,7 @@
my $obsoleted_topic = Codestriker::Model::Topic->new($id);
my $entry = {};
$entry->{title} = $obsoleted_topic->{title};
- $entry->{view_url} = $url_builder->view_url($id, -1);
+ $entry->{view_url} = $url_builder->view_url(topicid => $id);
push @obsoleted_topics, $entry;
}
$vars->{'obsoleted_topics'} = [EMAIL PROTECTED];
@@ -362,7 +355,7 @@
my $superseeded_topic = Codestriker::Model::Topic->new($id);
my $entry = {};
$entry->{title} = $superseeded_topic->{title};
- $entry->{view_url} = $url_builder->view_url($id, -1);
+ $entry->{view_url} = $url_builder->view_url(topicid => $id);
push @obsoleted_by, $entry;
}
$vars->{'obsoleted_by'} = [EMAIL PROTECTED];
Index: ViewTopicInfo.pm
===================================================================
RCS file:
/cvsroot/codestriker/codestriker/lib/Codestriker/Action/ViewTopicInfo.pm,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- ViewTopicInfo.pm 14 Mar 2008 01:30:52 -0000 1.13
+++ ViewTopicInfo.pm 5 Aug 2008 10:35:34 -0000 1.14
@@ -122,7 +122,7 @@
my @projectids = ($topic->{project_id});
$vars->{'view_topic_url'} =
- $url_builder->view_url($topicid, -1, $mode);
+ $url_builder->view_url(topicid => $topicid, mode => $mode);
$vars->{'view_topicinfo_url'} =
$url_builder->view_topicinfo_url($topicid);
$vars->{'view_comments_url'} = $url_builder->view_comments_url($topicid);
Index: EditComment.pm
===================================================================
RCS file:
/cvsroot/codestriker/codestriker/lib/Codestriker/Action/EditComment.pm,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- EditComment.pm 17 Jun 2008 07:23:25 -0000 1.16
+++ EditComment.pm 5 Aug 2008 10:35:34 -0000 1.17
@@ -58,7 +58,9 @@
$url_builder, $fview,
$tabwidth, 1, 0);
- my $view_topic_url = $url_builder->view_url($topicid, $line, $mode);
+ my $view_topic_url = $url_builder->view_url(topicid => $topicid, mode =>
$mode,
+ fview => $fn, filenumber =>
$fn,
+ new => $new, line => $line);
my $view_comments_url = $url_builder->view_comments_url($topicid);
$vars->{'view_topic_url'} = $view_topic_url;
Index: SubmitNewTopic.pm
===================================================================
RCS file:
/cvsroot/codestriker/codestriker/lib/Codestriker/Action/SubmitNewTopic.pm,v
retrieving revision 1.33
retrieving revision 1.34
diff -u -r1.33 -r1.34
--- SubmitNewTopic.pm 14 Mar 2008 01:30:52 -0000 1.33
+++ SubmitNewTopic.pm 5 Aug 2008 10:35:34 -0000 1.34
@@ -348,8 +348,7 @@
$feedback = Codestriker::TopicListeners::Manager::topic_create($topic);
# Obtain a URL builder object and determine the URL to the topic.
- my $topic_url = $url_builder->view_url_extended($topicid, -1, "", "", "",
- $query->url(), 0);
+ my $topic_url = $url_builder->view_url(topicid => $topicid);
# Indicate to the user that the topic has been created and an email has
# been sent.
Index: SubmitNewComment.pm
===================================================================
RCS file:
/cvsroot/codestriker/codestriker/lib/Codestriker/Action/SubmitNewComment.pm,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- SubmitNewComment.pm 14 Mar 2008 01:30:52 -0000 1.13
+++ SubmitNewComment.pm 5 Aug 2008 10:35:34 -0000 1.14
@@ -103,7 +103,8 @@
load_anchor=>$anchor,
reload=>$reload, cache=>0);
- my $view_topic_url = $url_builder->view_url($topicid, $line, $mode);
+ my $view_topic_url = $url_builder->view_url(topicid => $topicid, mode
=> $mode, fview => $fn,
+ filenumber => $fn, new =>
$new, line => $line);
my $view_comments_url = $url_builder->view_comments_url($topicid);
my $vars = {};
Index: ListTopicsRSS.pm
===================================================================
RCS file:
/cvsroot/codestriker/codestriker/lib/Codestriker/Action/ListTopicsRSS.pm,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- ListTopicsRSS.pm 26 May 2006 05:42:48 -0000 1.4
+++ ListTopicsRSS.pm 5 Aug 2008 10:35:34 -0000 1.5
@@ -78,8 +78,7 @@
# do the easy stuff first, 1 to 1 mapping into the template.
my $link =
- $url_builder->view_url($topic->{topicid}, -1, $mode,
- $Codestriker::default_topic_br_mode);
+ $url_builder->view_url(topicid => $topic->{topicid}, mode => $mode);
my $comment_link = $url_builder->view_comments_url($topic->{topicid});
Index: ListTopics.pm
===================================================================
RCS file:
/cvsroot/codestriker/codestriker/lib/Codestriker/Action/ListTopics.pm,v
retrieving revision 1.33
retrieving revision 1.34
diff -u -r1.33 -r1.34
--- ListTopics.pm 23 Jun 2008 22:40:18 -0000 1.33
+++ ListTopics.pm 5 Aug 2008 10:35:34 -0000 1.34
@@ -133,7 +133,7 @@
my $template_topic = {};
$template_topic->{'view_topic_url'} =
- $url_builder->view_url($topic->{topicid}, -1, $mode);
+ $url_builder->view_url(topicid => $topic->{topicid}, mode => $mode);
$template_topic->{'description'} = $topic->{description};
Index: CreateTopic.pm
===================================================================
RCS file:
/cvsroot/codestriker/codestriker/lib/Codestriker/Action/CreateTopic.pm,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -r1.29 -r1.30
--- CreateTopic.pm 15 Jan 2006 21:20:05 -0000 1.29
+++ CreateTopic.pm 5 Aug 2008 10:35:34 -0000 1.30
@@ -103,8 +103,7 @@
my $topic = Codestriker::Model::Topic->new($topicid);
my $obsoleted_topic = {};
$obsoleted_topic->{title} = $topic->{title};
- $obsoleted_topic->{view_url} =
- $url_builder->view_url($topicid, -1);
+ $obsoleted_topic->{view_url} = $url_builder->view_url(topicid =>
$topicid);
push @obsoleted_topics, $obsoleted_topic;
}
}
Index: UrlBuilder.pm
===================================================================
RCS file:
/cvsroot/codestriker/codestriker/lib/Codestriker/Http/UrlBuilder.pm,v
retrieving revision 1.32
retrieving revision 1.33
diff -u -r1.32 -r1.33
--- UrlBuilder.pm 21 Jun 2008 10:55:56 -0000 1.32
+++ UrlBuilder.pm 5 Aug 2008 10:35:34 -0000 1.33
@@ -21,6 +21,15 @@
my ($type, $query) = @_;
my $self = {};
$self->{query} = $query;
+
+ # Determine default settings.
+ $self->{default_topic_create_mode} =
+ defined $Codestriker::default_topic_create_mode ?
+ $Codestriker::default_topic_create_mode :
$Codestriker::COLOURED_MODE;
+
+ $self->{default_file_to_view} =
+ defined $Codestriker::default_file_to_view ?
+ $Codestriker::default_file_to_view : -1;
# Determine what prefix is required when using relative URLs.
# Unfortunately, Netcsape 4.x does things differently to everyone
@@ -50,28 +59,18 @@
return bless $self, $type;
}
-# Create the URL for viewing a topic with a specified tabwidth.
-sub view_url_extended {
- my ($self, $topic, $line, $mode, $tabwidth, $email, $prefix,
- $updated, $fview) = @_;
-
- return ($prefix ne "" ? $prefix : $self->{query}->url()) .
- "?topic=$topic&action=view" .
- ($updated ? "&updated=$updated" : "") .
- ((defined $tabwidth && $tabwidth ne "") ? "&tabwidth=$tabwidth" : "") .
- ((defined $mode && $mode ne "") ? "&mode=$mode" : "") .
- ((defined $fview && $fview ne "") ? "&fview=$fview" : "") .
- ((defined $email && $email ne "") ? "&email=$email" : "") .
- ($line != -1 ? "#${line}" : "");
-}
-
# Create the URL for viewing a topic.
sub view_url {
- my ($self, $topic, $line, $mode, $fview) = @_;
- if (!(defined $mode)) { $mode = $Codestriker::default_topic_create_mode;
}
- if (!(defined $fview)) { $fview = $Codestriker::default_file_to_view; }
- return $self->view_url_extended($topic, $line, $mode, "", "", "",
- undef, $fview);
+ my ($self, %args) = @_;
+
+ return (defined $args{prefix} ? $args{prefix} : $self->{query}->url()) .
+ "?topic=$args{topicid}&action=view" .
+ (defined $args{updated} ? "&updated=$args{updated}" : "") .
+ (defined $args{tabwidth} ? "&tabwidth=$args{tabwidth}"
: "") .
+ "&mode=" . (defined $args{mode} ? $args{mode} :
$self->{default_topic_create_mode}) .
+ "&fview=" . (defined $args{fview} ? $args{fview} :
$self->{default_file_to_view}) .
+ (defined $args{email} ? "&email=$args{email}" : "") .
+ (defined $args{filenumber} ? "#" .
"$args{filenumber}|$args{line}|$args{new}" : "");
}
# Create the URL for downloading the topic text.
Index: BugTracking.pm
===================================================================
RCS file:
/cvsroot/codestriker/codestriker/lib/Codestriker/TopicListeners/BugTracking.pm,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- BugTracking.pm 28 Feb 2008 23:17:00 -0000 1.7
+++ BugTracking.pm 5 Aug 2008 10:35:34 -0000 1.8
@@ -56,8 +56,7 @@
my $query = new CGI;
my $url_builder = Codestriker::Http::UrlBuilder->new($query);
my $topic_url =
- $url_builder->view_url_extended($topic->{topicid}, -1, "", "", "",
- $query->url(), 0);
+ $url_builder->view_url(topicid => $topic->{topicid});
my $bug_db_connection =
Codestriker::BugDB::BugDBConnectionFactory->getBugDBConnection();
@@ -113,9 +112,7 @@
my $newstate = $topic->{topic_state};
my $query = new CGI;
my $url_builder = Codestriker::Http::UrlBuilder->new($query);
- my $topic_url =
- $url_builder->view_url_extended($topic->{topicid}, -1, "", "", "",
- $query->url(), 0);
+ my $topic_url = $url_builder->view_url(topicid => $topic->{topicid});
my $bug_db_connection =
Codestriker::BugDB::BugDBConnectionFactory->getBugDBConnection();
Index: Email.pm
===================================================================
RCS file:
/cvsroot/codestriker/codestriker/lib/Codestriker/TopicListeners/Email.pm,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -r1.27 -r1.28
--- Email.pm 4 Aug 2008 11:22:56 -0000 1.27
+++ Email.pm 5 Aug 2008 10:35:34 -0000 1.28
@@ -61,8 +61,7 @@
my @obsolete_topic_urls = ();
foreach my $obsolete_topic (@{$topic->{obsoleted_topics}}) {
push @obsolete_topic_urls,
- $url_builder->view_url_extended($obsolete_topic, -1, "", "", "",
- $query->url(), 0);
+ $url_builder->view_url(topicid => $obsolete_topic);
}
my $obsolete_text = "";
if ($#obsolete_topic_urls >= 0) {
-------------------------------------------------------------------------
This SF.Net email is sponsored by the Moblin Your Move Developer's challenge
Build the coolest Linux based applications with Moblin SDK & win great prizes
Grand prize is a trip for two to an Open Source event anywhere in the world
http://moblin-contest.org/redirect.php?banner_id=100&url=/
_______________________________________________
Codestriker-commits mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/codestriker-commits
