perlwikibot-svn

[PerlWikiBot] SF.net SVN: perlwikibot: [24] trunk/includes/actions.pm

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

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

Log Message:
-----------
Fixes, now OK.

Modified Paths:
--------------
    trunk/includes/actions.pm

Modified: trunk/includes/actions.pm
===================================================================
--- trunk/includes/actions.pm	2006-09-16 13:26:26 UTC (rev 23)
+++ trunk/includes/actions.pm	2006-09-16 13:28:27 UTC (rev 24)
@@ -28,18 +28,18 @@
 	}
 
 	# Get the edit page contents
-	my $editPage = http::getPage( $title, "edit" );
+	my $page = http::getPage( $title, "edit" );
 
 	# Get the start time
-	$editPage =~ /<input type='hidden' value="([0-9]{14})" name="wpStarttime" \/>/;
+	$page =~ /<input type='hidden' value="([0-9]{14})" name="wpStarttime" \/>/;
 	my $startTime = $1;
 
 	# Get the edit time
-	$editPage =~ /<input type='hidden' value="([0-9]{14})" name="wpEdittime" \/>/;
+	$page =~ /<input type='hidden' value="([0-9]{14})" name="wpEdittime" \/>/;
 	my $editTime = $1;
 
 	# Get edit token
-	$editPage =~ /<input type='hidden' value="([0-9a-f]{32})" name="wpEditToken" \/>/;
+	$page =~ /<input type='hidden' value="([0-9a-f]{32})" name="wpEditToken" \/>/;
 	my $editToken = $1;
 
 	# Send page
@@ -80,10 +80,10 @@
 	print "Moving page $title to $newTitle...\n";
 
 	# Get the delete page contents
-	my $movePage = http::getPage( "Special:Movepage/$title" );
+	my $page = http::getPage( "Special:Movepage/$title" );
 
 	# Get edit token
-	$editPage =~ /<input type='hidden' name='wpEditToken' value="([0-9,a-f]{32})" \/>/;
+	$page =~ /<input type='hidden' name='wpEditToken' value="([0-9,a-f]{32})" \/>/;
 	my $editToken = $1;
 
 	# Send page
@@ -112,10 +112,10 @@
 	print "Deleting page $title...\n";
 
 	# Get the delete page contents
-	my $deletePage = http::getPage( $title, "delete" );
+	my $page = http::getPage( $title, "delete" );
 
 	# Get edit token
-	$editPage =~ /<input type='hidden' name='wpEditToken' value="([0-9,a-f]{32})" \/>/;
+	$page =~ /<input type='hidden' name='wpEditToken' value="([0-9,a-f]{32})" \/>/;
 	my $editToken = $1;
 
 	# Send page


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

[PerlWikiBot] SF.net SVN: perlwikibot: [33] trunk/includes/actions.pm

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

Revision: 33
          http://svn.sourceforge.net/perlwikibot/?rev=33&view=rev
Author:   rotemliss
Date:     2006-09-26 10:53:23 -0700 (Tue, 26 Sep 2006)

Log Message:
-----------
Ignore prefix when refreshing.

Modified Paths:
--------------
    trunk/includes/actions.pm

Modified: trunk/includes/actions.pm
===================================================================
--- trunk/includes/actions.pm	2006-09-26 17:45:37 UTC (rev 32)
+++ trunk/includes/actions.pm	2006-09-26 17:53:23 UTC (rev 33)
@@ -8,10 +8,13 @@
 # Get the contents of a page
 sub getEditPage {
 	# Get parameters
-	my ( $title ) = @_;
+	my ( $title, $ignorePrefix ) = @_;
+	if ( !defined( $ignorePrefix ) ) {
+		$ignorePrefix = 0;
+	}
 
 	my ( $page, $text );
-	if ( $configure::sendPages == 2 ) {
+	if ( $configure::sendPages == 2 && $ignorePrefix == 0 ) {
 		# Add prefix
 		my $serverPrefix = $configure::serverPrefixes{ $ARGV[0] };
 		my $prefixedTitle = $serverPrefix.$title;
@@ -51,12 +54,15 @@
 # Edit page
 sub editPage {
 	# Get parameters
-	my ( $title, $summary, $text, $startTime, $editTime, $editToken ) = @_;
+	my ( $title, $summary, $text, $startTime, $editTime, $editToken, $ignorePrefix ) = @_;
+	if ( !defined( $ignorePrefix ) ) {
+		$ignorePrefix = 0;
+	}
 
 	print "Editing page $title...\n";
 
 	# Add prefix if necessary
-	if ( $configure::sendPages == 2 ) {
+	if ( $configure::sendPages == 2 && $ignorePrefix == 0 ) {
 		my $serverPrefix = $configure::serverPrefixes{ $ARGV[0] };
 		$title = $serverPrefix.$title;
 	}
@@ -87,8 +93,8 @@
 	# Get parameters
 	my ( $title ) = @_;
 
-	# Null edit
-	editPage( $title, "Refreshing page", getEditPage( $title ) );
+	# Null edit, ignore prefix
+	editPage( $title, "Refreshing page", getEditPage( $title ), 1 );
 }
 
 # Move page


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

[PerlWikiBot] SF.net SVN: perlwikibot: [34] trunk/includes/actions.pm

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

Revision: 34
          http://svn.sourceforge.net/perlwikibot/?rev=34&view=rev
Author:   rotemliss
Date:     2007-03-03 04:08:10 -0800 (Sat, 03 Mar 2007)

Log Message:
-----------
Typos.

Modified Paths:
--------------
    trunk/includes/actions.pm

Modified: trunk/includes/actions.pm
===================================================================
--- trunk/includes/actions.pm	2006-09-26 17:53:23 UTC (rev 33)
+++ trunk/includes/actions.pm	2007-03-03 12:08:10 UTC (rev 34)
@@ -84,7 +84,7 @@
 		}
 		print "\tDone!\n";
 	} else {
-		print "Error!\nThis may be a protected page you don't have permission to edit, or it has deleted since the dump file you use created.\n";
+		print "Error!\nThis may be a protected page you don't have permission to edit, or it was deleted since the dump file you use created.\n";
 	}
 }
 
@@ -125,7 +125,7 @@
 		}
 		print "\tDone!\n";
 	} else {
-		print "Error!\nYou may not have the permission to move pages, or there may already a page (which is not just a redirection) under the new title.\n";
+		print "Error!\nYou may not have the permission to move pages, or there may already be a page (which is not just a redirection) under the new title.\n";
 	}
 }
 
@@ -155,7 +155,7 @@
 		}
 		print "\tDone!\n";
 	} else {
-		print "Error!\nYou may not have the permission to delete pages, or the page is already deleted.\n";
+		print "Error!\nYou may not have the permission to delete pages, or the page was already deleted.\n";
 	}
 }
 


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