[freeside-commits] freeside/rt/lib/RT/URI freeside.pm,1.7,1.8

[Ivan,,,]

Update of /home/cvs/cvsroot/freeside/rt/lib/RT/URI
In directory wavetail.420.am:/tmp/cvs-serv10307

Modified Files:
	freeside.pm 
Log Message:
generate a stack backtrace for mystery freeside link resolution problems

Index: freeside.pm
===================================================================
RCS file: /home/cvs/cvsroot/freeside/rt/lib/RT/URI/freeside.pm,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -w -d -r1.7 -r1.8
--- freeside.pm	12 Feb 2010 01:35:33 -0000	1.7
+++ freeside.pm	25 Mar 2010 21:22:29 -0000	1.8
@@ -26,10 +26,10 @@
 # END LICENSE BLOCK
 package RT::URI::freeside;
 
-use RT::URI::base;
+use base qw( RT::URI::base );
 use strict;
-use vars qw(@ISA $IntegrationType $URL);
- at ISA = qw/RT::URI::base/;
+use vars qw( $IntegrationType $URL );
+use Carp qw( cluck );
 
 
 =head1 NAME
@@ -196,10 +196,18 @@
     my ($table, $pkey);
 
     my $uriprefix = $self->_FreesideURIPrefix;
-    if ($uri =~ /^$uriprefix\/(\w+)\/(\d+)$/) {
+    if ($uri =~ /^$uriprefix\/(\w+)\/(\d*)$/) {
+
       $table = $1;
       $pkey = $2;
+
+      unless ( $pkey ) {
+        cluck "bad URL $uri";
+        return(undef);
+      }
+
       $self->{'scheme'} = $self->Scheme;
+
     } else {
       return(undef);
     }