X-Git-Url: https://git.gag.com/?a=blobdiff_plain;f=perl%2FAmanda%2FLogfile.swg;h=a7adac64a32af0925b99edd378afba63515de4ef;hb=2627875b7d18858bc1f9f7652811e4d8c15a23eb;hp=ea621e4b56475b2c0f834417d515b98be3e64fe2;hpb=94a044f90357edefa6f4ae9f0b1d5885b0e34aee;p=debian%2Famanda

diff --git a/perl/Amanda/Logfile.swg b/perl/Amanda/Logfile.swg
index ea621e4..a7adac6 100644
--- a/perl/Amanda/Logfile.swg
+++ b/perl/Amanda/Logfile.swg
@@ -14,13 +14,15 @@
  * along with this library; if not, write to the Free Software Foundation,
  * Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA.
  *
- * Contact information: Zmanda Inc., 505 N Mathlida Ave, Suite 120
- * Sunnyvale, CA 94085, USA, or: http://www.zmanda.com
+ * Contact information: Zmanda Inc., 465 S Mathlida Ave, Suite 300
+ * Sunnyvale, CA 94086, USA, or: http://www.zmanda.com
  */
 
 %module "Amanda::Logfile"
 %include "amglue/amglue.swg"
 %include "exception.i"
+%include "amglue/dumpspecs.swg"
+%import "Amanda/Cmdline.swg"
 
 %{
 #include <glib.h>
@@ -36,7 +38,7 @@ Amanda::Logfile - manage Amanda trace logs
 
 =head1 SYNOPSIS
 
-  use Amanda::Logfile qw(:logtype_t); # XXX change
+  use Amanda::Logfile qw(:logtype_t);
   use Amanda::Config qw( :getconf config_dir_relative );
 
   for my $logfile (Amanda::Logfile::find_log()) {
@@ -51,7 +53,7 @@ Amanda::Logfile - manage Amanda trace logs
     }
     Amanda::Logfile::close_logfile($log);
 
-    my @dumps = Amanda::Logfile::search_logfile("TapeLabel-001", "19780615", $logfile);
+    my @dumps = Amanda::Logfile::search_logfile("TapeLabel-001", "19780615", $logfile, 1);
 
     my @matching = Amanda::Logfile::dumps_match([@dumps], "myhost", "/usr", undef, undef, 0);
     for my $dump (@matching) {
@@ -106,24 +108,33 @@ Instance variables are:
 
 =over
 
-=item C<$timestamp>
+=item C<timestamp>
 
-=item C<$hostname>
+=item C<hostname>
 
-=item C<$diskname>
+=item C<diskname>
 
-=item C<$level>
+=item C<level>
 
-=item C<$label>
+=item C<label>
 
-=item C<$filenum>
+=item C<filenum>
 
-=item C<$status>
+=item C<status>
 
-=item C<$partnum>
+=item C<partnum>
+
+=item C<sec>
+
+=item C<kb>
 
 =back
 
+Note that the format for these variables are based on that found in the
+logfiles.  In particular, C<partnum> is a string, usually with a slash (C</>)
+in it.  Also, C<timestamp> is the timestamp for the run in which the client
+dump took place, and not for the timestamp of the logfile.
+
 =head1 HIGHER-LEVEL FUNCTIONS
 
 Functions in this section extract information from logfiles.
@@ -150,6 +161,8 @@ C<$level> is given as a string, since it is a match expression.
 
 All of these functions can be imported by name.
 
+=back
+
 =cut
 %}
 
@@ -245,6 +258,8 @@ typedef struct {
     off_t filenum;
     char *status;
     char *partnum;
+    double sec;
+    size_t kb;
     %mutable;
 } find_result_t;
 
@@ -362,3 +377,7 @@ find_result_t *search_logfile_wrap(char *label, char *datestamp,
 
 find_result_t *dumps_match(find_result_t *output_find, char *hostname,
 			   char *diskname, char *datestamp, char *level, int ok);
+
+find_result_t *dumps_match_dumpspecs(find_result_t *output_find,
+    amglue_dumpspec_list *dumpspecs,
+    gboolean ok);