[PerlWikiBot] SF.net SVN: perlwikibot: [18] trunk/includes

[<rot...@us...>]

Revision: 18
          http://svn.sourceforge.net/perlwikibot/?rev=18&view=rev
Author:   rotemliss
Date:     2006-09-16 04:06:13 -0700 (Sat, 16 Sep 2006)

Log Message:
-----------
Code style - properly getting parameters.

Modified Paths:
--------------
    trunk/includes/functions.pm
    trunk/includes/http.pm

Modified: trunk/includes/functions.pm
===================================================================
--- trunk/includes/functions.pm	2006-09-16 10:54:41 UTC (rev 17)
+++ trunk/includes/functions.pm	2006-09-16 11:06:13 UTC (rev 18)
@@ -101,8 +101,7 @@
 sub getPageLastEdit
 {
 	# Get parameters
-	my $xmlFile = $_[0];
-	my $title = $_[1];
+	my ($xmlFile, $title) = @_;
 	utf8::decode($title);
 	
 	# Get the pages
@@ -188,7 +187,7 @@
 sub getPageContents
 {
 	# Get parameters
-	my $title = $_[0];
+	my ($title) = @_;
 	
 	http::getPage($title, "raw"); # Return
 }
@@ -197,9 +196,7 @@
 sub editPage
 {
 	# Get parameters
-	my $title = $_[0];
-	my $text = $_[1];
-	my $editSummary = $_[2];
+	my ($title, $text, $editSummary) = @_;
 	
 	print "Editing page $title...\n";
 	
@@ -253,7 +250,7 @@
 sub replaceInPage
 {
 	# Get parameters
-	my $title = $_[0];
+	my ($title) = @_;
 	
 	if ($configure::sendPages == 1 || $configure::sendPages == 2)
 	{
@@ -303,8 +300,7 @@
 sub refreshPage
 {
 	# Get parameters
-	my $server = $_[0];
-	my $title = $_[1];
+	my ($server, $title) = @_;
 	
 	editPage($title, getPageContents($title), "Refreshing page");
 }
@@ -313,10 +309,7 @@
 sub movePage
 {
 	# Get parameters
-	my $server = $_[0];
-	my $title = $_[1];
-	my $newTitle = $_[2];
-	my $moveReason = $_[3];
+	my ($server, $title, $newTitle, $moveReason) = @_;
 	
 	print "Moving page $title to $newTitle...\n";
 	
@@ -352,9 +345,7 @@
 sub deletePage
 {
 	# Get parameters
-	my $server = $_[0];
-	my $title = $_[1];
-	my $deleteReason = $_[2];
+	my ($server, $title, $reason) = @_;
 	
 	print "Deleting page $title...\n";
 	
@@ -371,7 +362,7 @@
 		{
 			http::postPage($title, "delete",
 				[
-					wpReason => $deleteReason,
+					wpReason => $reason,
 					wpEditToken => $editToken
 				],
 			);

Modified: trunk/includes/http.pm
===================================================================
--- trunk/includes/http.pm	2006-09-16 10:54:41 UTC (rev 17)
+++ trunk/includes/http.pm	2006-09-16 11:06:13 UTC (rev 18)
@@ -21,9 +21,7 @@
 sub buildPageURL
 {
 	# Get parameters
-	my $title = $_[0];
-	my $action = $_[1];
-	my $get = $_[2];
+	my ($title, $action, $get) = @_;
 	
 	# Initial URL: server, script path and title
 	my $server = $configure::servers{$ARGV[0]};
@@ -49,9 +47,7 @@
 sub getPage
 {
 	# Get parameters
-	my $title = $_[0];
-	my $action = $_[1];
-	my $get = $_[2];
+	my ($title, $action, $get) = @_;
 	
 	my $url = buildPageURL($title, $action, $get);
 	
@@ -60,7 +56,7 @@
 	{
 		$result = $browser->get($url);
 	}
-	while ((!$result->is_success) && ($result->status_line ne "302 Moved Temporarily"));
+	while (!$result->is_success && $result->status_line =~ /302[\s\w]+/);
 	
 	$result->content; # Return
 }
@@ -69,10 +65,7 @@
 sub postPage
 {
 	# Get parameters
-	my $title = $_[0];
-	my $action = $_[1];
-	my $post = $_[2];
-	my $get = $_[3];
+	my ($title, $action, $post, $get) = @_;
 	
 	my $url = buildPageURL($title, $action, $get);
 	
@@ -81,7 +74,7 @@
 	{
 		$result = $browser->post($url, $post);
 	}
-	while ((!$result->is_success) && (!$result->status_line =~ /302[\s\w]+/));
+	while (!$result->is_success && !$result->status_line =~ /302[\s\w]+/);
 	
 	$result->content; # Return
 }


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.