[Umts-tools-commits] r642 - in umts-tools/trunk: . src/UMTS/GUI src/UMTS/Phonebook

[sharky at cartier.jerryweb.org]

Author: sharky
Date: 2006-07-21 12:45:59 +0100 (Fri, 21 Jul 2006)
New Revision: 642

Modified:
   umts-tools/trunk/ChangeLog
   umts-tools/trunk/configure.ac
   umts-tools/trunk/src/UMTS/GUI/Phonebook_View.pm
   umts-tools/trunk/src/UMTS/Phonebook/Entry.pm
   umts-tools/trunk/src/UMTS/Phonebook/Entry.t
Log:
simplify phonebook file format (backwards compatible)


Modified: umts-tools/trunk/ChangeLog
===================================================================
--- umts-tools/trunk/ChangeLog	2006-07-21 11:43:29 UTC (rev 641)
+++ umts-tools/trunk/ChangeLog	2006-07-21 11:45:59 UTC (rev 642)
@@ -1,3 +1,6 @@
+umts-tools 0.9.4pre1
+ * UMTS::Phonebook:Entry : simplify phonebook format
+
 umts-tools 0.9.3
  * UMTS::DataLog::Packet : add support for SMS reassembly
  * umts-multipart.pl : allow different encoding for page and objects

Modified: umts-tools/trunk/configure.ac
===================================================================
--- umts-tools/trunk/configure.ac	2006-07-21 11:43:29 UTC (rev 641)
+++ umts-tools/trunk/configure.ac	2006-07-21 11:45:59 UTC (rev 642)
@@ -5,7 +5,7 @@
 PERLMOD=UMTS
 
 dnl version number
-VERSION=0.9.3
+VERSION=0.9.4pre1
 
 dnl
 AM_INIT_AUTOMAKE($PACKAGE, $VERSION)

Modified: umts-tools/trunk/src/UMTS/GUI/Phonebook_View.pm
===================================================================
--- umts-tools/trunk/src/UMTS/GUI/Phonebook_View.pm	2006-07-21 11:43:29 UTC (rev 641)
+++ umts-tools/trunk/src/UMTS/GUI/Phonebook_View.pm	2006-07-21 11:45:59 UTC (rev 642)
@@ -54,8 +54,6 @@
     'name' => 'text',
     'number' => 'text',
     'index' => 'int',
-    'type' => 'int',
-    'group' => 'text',
   );
 
   # allown column sorting  
@@ -152,7 +150,7 @@
   @{$self->{list}->{data}} = ();
   foreach my $entry (@pbook)
   {
-    push @{$self->{list}->{data}}, [ $entry->{name} , $entry->{value}, $entry->{index}, $entry->{type}, $entry->{group} ];
+    push @{$self->{list}->{data}}, [ $entry->{name} , $entry->{value}, $entry->{index} ];
   } 
 
   if ($self->{bookcache})  

Modified: umts-tools/trunk/src/UMTS/Phonebook/Entry.pm
===================================================================
--- umts-tools/trunk/src/UMTS/Phonebook/Entry.pm	2006-07-21 11:43:29 UTC (rev 641)
+++ umts-tools/trunk/src/UMTS/Phonebook/Entry.pm	2006-07-21 11:45:59 UTC (rev 642)
@@ -25,6 +25,8 @@
 use UMTS::Core;
 use Encode ();
 
+use constant NUMBER_TYPE_INT => 145;
+use constant NUMBER_TYPE_NAT => 129;
 
 sub new
 {
@@ -35,8 +37,6 @@
     value => '',
     book => '',
     index => 0,
-    group => '',
-    type => '',
     @params
  };
   
@@ -51,7 +51,7 @@
 sub dump
 {
   my $self = shift;
-  return "$self->{name};$self->{value};$self->{book};$self->{index};$self->{group};$self->{type};\n";
+  return "$self->{name};$self->{value};$self->{book};$self->{index}\n";
 }
 
 
@@ -102,8 +102,8 @@
     
     # if necessary, do encoding conversion
     my $name = $term->{charset} ? Encode::decode($term->{charset}, $3) : $3;
-    
-    return $class->new(name => $name, value => $1, book => $book, index => $index, type => $2);
+    # $2 is the type of number 
+    return $class->new(name => $name, value => $1, book => $book, index => $index);
   }
 
   #return $1;
@@ -123,7 +123,7 @@
     return;
   
   my $entry = $class->new;
-  ($entry->{name}, $entry->{value}, $entry->{book}, $entry->{index}, $entry->{group}, $entry->{type}) = split /;/, $line;
+  ($entry->{name}, $entry->{value}, $entry->{book}, $entry->{index}) = split /;/, $line;
   return $entry;
 }
 
@@ -138,8 +138,9 @@
 
   # if necessary, do encoding conversion
   my $name = $term->{charset} ? Encode::encode($term->{charset}, $self->{name}) : $self->{name};
-    
-  $term->send("AT+CPBW=$self->{index},\"$self->{value}\",$self->{type},\"$name\"" . CR);
+  
+  my $type =  ($self->{value} =~ /^\+/) ? NUMBER_TYPE_INT : NUMBER_TYPE_NAT;
+  $term->send("AT+CPBW=$self->{index},\"$self->{value}\",$type,\"$name\"" . CR);
   my $resp = $term->waitfor;
 
   if ($resp ne "OK")

Modified: umts-tools/trunk/src/UMTS/Phonebook/Entry.t
===================================================================
--- umts-tools/trunk/src/UMTS/Phonebook/Entry.t	2006-07-21 11:43:29 UTC (rev 641)
+++ umts-tools/trunk/src/UMTS/Phonebook/Entry.t	2006-07-21 11:45:59 UTC (rev 642)
@@ -1,33 +1,25 @@
-use Test::Simple tests => 2;
+use Test::Simple tests => 6;
 use UMTS::Log;
 use UMTS::Phonebook::Entry;
+use UMTS::Test::NetPacket;
 
 my $log = UMTS::Log->new;
 
-# check Entry properties
 sub checkEntry
 {
   my ($a, $b) = @_;
-  
-  #print "\n--- a ---\n". Dumper($a);
-  #print "\n--- b ---\n" . Dumper($b);
-  
-  foreach my $prop qw(name number)
-  {
-    my $ok = ( (!defined($a->{$prop}) and !defined($b->{$prop})) or
-               (defined($a->{$prop}) and defined($b->{$prop}) and
-                 ($a->{$prop} eq $b->{$prop}) ) );
-		 
-    ok($ok, "property '$prop' matches ($a->{$prop})");
-    $ok or
-      print "mismatch : `$a->{$prop}` vs `$b->{$prop}`\n";
-  }
-
+  checkProps($a, $b, 'UMTS::PhoneBook::Entry', qw(name value book index));
 }
 
 my $entry = UMTS::Phonebook::Entry->new;
 ok( (defined($entry) and ref($entry) eq 'UMTS::Phonebook::Entry'), 'new() works' );
 
+$entry->{name} = 'Foo Bar/M';
+$entry->{value} = '+33612345678';
+$entry->{index} = 699;
+$entry->{book} = 'SM';
+
 my $entry2 = UMTS::Phonebook::Entry->parse('Foo Bar/M;+33612345678;SM;699;;145');
 ok( (defined($entry2) and ref($entry2) eq 'UMTS::Phonebook::Entry'), 'parse() works' );
+checkEntry($entry, $entry2);