X-Git-Url: http://git.rot13.org/?p=BackupPC.git;a=blobdiff_plain;f=lib%2FBackupPC%2FXfer%2FBackupPCd.pm;h=e6dd5b054acd84ba4322720085def31771ba72d2;hp=e4e4b3cd17f9a65421311b6c881d1d854b1ce719;hb=5b79f9a3c01bca16dd4d211e76fc53daa549e421;hpb=5b3e6091d542c2e7445d5dd511cdf6e20aec8b8d

diff --git a/lib/BackupPC/Xfer/BackupPCd.pm b/lib/BackupPC/Xfer/BackupPCd.pm
index e4e4b3c..e6dd5b0 100644
--- a/lib/BackupPC/Xfer/BackupPCd.pm
+++ b/lib/BackupPC/Xfer/BackupPCd.pm
@@ -11,7 +11,7 @@
 #   Craig Barratt  <cbarratt@users.sourceforge.net>
 #
 # COPYRIGHT
-#   Copyright (C) 2006  Craig Barratt
+#   Copyright (C) 2006-2007  Craig Barratt
 #
 #   This program is free software; you can redistribute it and/or modify
 #   it under the terms of the GNU General Public License as published by
@@ -29,7 +29,7 @@
 #
 #========================================================================
 #
-# Version 3.0.0alpha, released 23 Jan 2006.
+# Version 3.1.0, released 25 Nov 2007.
 #
 # See http://backuppc.sourceforge.net.
 #
@@ -38,6 +38,7 @@
 package BackupPC::Xfer::BackupPCd;
 
 use strict;
+use base qw(BackupPC::Xfer::Protocol);
 
 sub new
 {
@@ -71,20 +72,6 @@ sub new
     return $t;
 }
 
-sub args
-{
-    my($t, $args) = @_;
-
-    foreach my $arg ( keys(%$args) ) {
-	$t->{$arg} = $args->{$arg};
-    }
-}
-
-sub useTar
-{
-    return 0;
-}
-
 sub start
 {
     my($t) = @_;
@@ -117,8 +104,9 @@ sub start
             #
             # TODO: fix this message - just refer to the backup, not time?
             #
-            $incrDate = $bpc->timeStamp($t->{lastFull} - 3600, 1);
-            $logMsg = "incr backup started back to $incrDate for directory"
+            $incrDate = $bpc->timeStamp($t->{incrBaseTime} - 3600, 1);
+            $logMsg = "incr backup started back to $incrDate"
+                    . " (backup #$t->{incrBaseBkupNum}) for directory"
                     . " $t->{shareName}";
             $incrFlag = 1;
         }
@@ -220,47 +208,4 @@ sub run
     }
 }
 
-sub abort
-{
-    my($t, $reason) = @_;
-
-    # TODO
-    return 1;
-}
-
-sub errStr
-{
-    my($t) = @_;
-
-    return $t->{_errStr};
-}
-
-sub xferPid
-{
-    my($t) = @_;
-
-    return ();
-}
-
-#
-# Returns a hash ref giving various status information about
-# the transfer.
-#
-sub getStats
-{
-    my($t) = @_;
-
-    return { map { $_ => $t->{$_} }
-            qw(byteCnt fileCnt xferErrCnt xferBadShareCnt xferBadFileCnt
-               xferOK hostAbort hostError lastOutputLine)
-    };
-}
-
-sub getBadFiles
-{
-    my($t) = @_;
-
-    return @{$t->{badFiles}};
-}
-
 1;