[netdisco-cvs] netdisco netdisco, 1.174, 1.175 netdisco.pm, 1.103, 1.104 ChangeLog, 1.97, 1.98

[Max B. <max...@us...>]

Update of /cvsroot/netdisco/netdisco
In directory fdv4jf1.ch3.sourceforge.com:/tmp/cvs-serv25988

Modified Files:
	netdisco netdisco.pm ChangeLog 
Log Message:
up version number to 1.1-cvs, fix bug in port-sort for cisco ports w/ three levels of numbers

Index: netdisco.pm
===================================================================
RCS file: /cvsroot/netdisco/netdisco/netdisco.pm,v
retrieving revision 1.103
retrieving revision 1.104
diff -C2 -d -r1.103 -r1.104
*** netdisco.pm	15 Oct 2009 14:10:38 -0000	1.103
--- netdisco.pm	5 Nov 2009 23:38:23 -0000	1.104
***************
*** 133,137 ****
  =cut
  
! $VERSION = '1.0';
  
  =back
--- 133,137 ----
  =cut
  
! $VERSION = '1.1-cvs';
  
  =back
***************
*** 1009,1021 ****
      my $wordcharword   = qr{^([^:\/.]+)[\ :\/\.]+([^:\/.]+)(\d+)?$}; #port-channel45
      my $ciscofast      = qr{^
!                             # Word Number (Gigabit0)
!                             (\D+)(\d+)
!                             # Groups of symbol float (/5.5/5.5/5.5)
!                             (?:                     # group, don't capture to $1 
!                               # /5.5
!                               [:\/\.]+([\d\.]+)     # capture float
!                             )+
!                               # Optional dash (-Bearer Channel)
!                             (-.*)?
                              $}x;
  
--- 1009,1018 ----
      my $wordcharword   = qr{^([^:\/.]+)[\ :\/\.]+([^:\/.]+)(\d+)?$}; #port-channel45
      my $ciscofast      = qr{^
!                             # Word Number slash (Gigabit0/)
!                             (\D+)(\d+)[\/:]
!                             # Groups of symbol float (/5.5/5.5/5.5), separated by slash or colon
!                             ([\/:\.\d]+)
!                             # Optional dash (-Bearer Channel)
!                             (-.*)? 
                              $}x;
  
***************
*** 1029,1033 ****
          @a = ($1);
      } elsif ($aval =~ $ciscofast) {
!         @a = ($1,$2,$3,$4,$5,$6);
      } elsif ($aval =~ $wordcharword) {
          @a = ($1,$2,$3);
--- 1026,1031 ----
          @a = ($1);
      } elsif ($aval =~ $ciscofast) {
!         @a = ($1,$2);
!         push @a, split(/[:\/]/,$3), $4;
      } elsif ($aval =~ $wordcharword) {
          @a = ($1,$2,$3);
***************
*** 1043,1047 ****
          @b = ($1);
      } elsif ($bval =~ $ciscofast) {
!         @b = ($1,$2,$3,$4,$5,$6);
      } elsif ($bval =~ $wordcharword) {
          @b = ($1,$2,$3);
--- 1041,1046 ----
          @b = ($1);
      } elsif ($bval =~ $ciscofast) {
!         @b = ($1,$2);
!         push @b, split(/[:\/]/,$3),$4;
      } elsif ($bval =~ $wordcharword) {
          @b = ($1,$2,$3);

Index: netdisco
===================================================================
RCS file: /cvsroot/netdisco/netdisco/netdisco,v
retrieving revision 1.174
retrieving revision 1.175
diff -C2 -d -r1.174 -r1.175
*** netdisco	15 Oct 2009 14:10:38 -0000	1.174
--- netdisco	5 Nov 2009 23:38:23 -0000	1.175
***************
*** 42,46 ****
              $New_Only $VERSION $DaemonMode $nprocs $controller/;
  
! $VERSION = '1.0';
  %Discovered = ();
  %Discovered_Alias = ();
--- 42,46 ----
              $New_Only $VERSION $DaemonMode $nprocs $controller/;
  
! $VERSION = '1.1-cvs';
  %Discovered = ();
  %Discovered_Alias = ();

Index: ChangeLog
===================================================================
RCS file: /cvsroot/netdisco/netdisco/ChangeLog,v
retrieving revision 1.97
retrieving revision 1.98
diff -C2 -d -r1.97 -r1.98
*** ChangeLog	15 Oct 2009 14:10:38 -0000	1.97
--- ChangeLog	5 Nov 2009 23:38:23 -0000	1.98
***************
*** 3,6 ****
--- 3,10 ----
  # $Id$
  
+ 1.1 ()
+ Bugfixes:
+     * []        Fix sort_port() for ports like "GigabitEthernet2/2/3" -maxb
+ 
  1.0 (2009-10-15)
  Features: