Index: /trunk/PS-IPP-PSFTP/lib/PS/IPP/PSFTP/Parser.pm
===================================================================
--- /trunk/PS-IPP-PSFTP/lib/PS/IPP/PSFTP/Parser.pm	(revision 5334)
+++ /trunk/PS-IPP-PSFTP/lib/PS/IPP/PSFTP/Parser.pm	(revision 5335)
@@ -1,5 +1,5 @@
 # Copyright (C) 2005  Joshua Hoblitt
 #
-# $Id: Parser.pm,v 1.3 2005-10-08 02:09:05 jhoblitt Exp $
+# $Id: Parser.pm,v 1.4 2005-10-14 23:31:39 jhoblitt Exp $
 
 package PS::IPP::PSFTP::Parser;
@@ -12,6 +12,6 @@
 use vars qw( @FIELDS @REQUIRED_FIELDS );
 
-@FIELDS = qw( date time id type attributes size md5 url );
-@REQUIRED_FIELDS = qw( date time id type size md5 url );
+@FIELDS = qw( date time file_id type attributes size md5 url );
+@REQUIRED_FIELDS = qw( date time file_id type size md5 url );
 
 sub new
@@ -110,5 +110,5 @@
 use vars qw( @FIELDS );
 
-@FIELDS = qw( stamp id type attributes size md5 url );
+@FIELDS = qw( stamp file_id type attributes size md5 url );
 
 __PACKAGE__->mk_accessors( @FIELDS );
Index: /trunk/PS-IPP-PSFTP/t/02_parse.t
===================================================================
--- /trunk/PS-IPP-PSFTP/t/02_parse.t	(revision 5334)
+++ /trunk/PS-IPP-PSFTP/t/02_parse.t	(revision 5335)
@@ -3,5 +3,5 @@
 # Copyright (C) 2005  Joshua Hoblitt
 #
-# $Id: 02_parse.t,v 1.4 2005-10-08 01:56:05 jhoblitt Exp $
+# $Id: 02_parse.t,v 1.5 2005-10-14 23:30:48 jhoblitt Exp $
 
 use strict;
@@ -32,5 +32,5 @@
     my $item = pop @items;
     is($item->stamp,   "2005-08-06T19:30:01",           "correct time stamp");
-    is($item->id,      "telescope_2005-08-06T19:30:01", "correct id");
+    is($item->file_id, "telescope_2005-08-06T19:30:01", "correct file id");
     is($item->type,    "metadata",                      "correct type");
     is($item->size,    8640,                            "correct size");
@@ -44,5 +44,5 @@
     my $item = pop @items;
     is($item->stamp,   "2005-08-06T19:40:01",           "correct time stamp");
-    is($item->id,      "telescope_2005-08-06T19:40:01", "correct id");
+    is($item->file_id, "telescope_2005-08-06T19:40:01", "correct file id");
     is($item->type,    "metadata",                      "correct type");
     is($item->size,    8640,                            "correct size");
@@ -55,5 +55,5 @@
     my $item = pop @items;
     is($item->stamp,   "2005-08-06T19:50:01",           "correct time stamp");
-    is($item->id,      "telescope_2005-08-06T19:50:01", "correct id");
+    is($item->file_id, "telescope_2005-08-06T19:50:01", "correct file id");
     is($item->type,    "metadata",                      "correct type");
     is($item->size,    8640,                            "correct size");
@@ -77,5 +77,5 @@
     my $item = pop @items;
     is($item->stamp,   "2005-08-06T19:30:01",           "correct time stamp");
-    is($item->id,      "telescope_2005-08-06T19:30:01", "correct id");
+    is($item->file_id, "telescope_2005-08-06T19:30:01", "correct file id");
     is($item->type,    "metadata",                      "correct type");
     is($item->size,    8640,                            "correct size");