This commit was manufactured by cvs2svn to create branch

[freeside.git] / httemplate / misc / process / link.cgi

diff --git a/httemplate/misc/process/link.cgi b/httemplate/misc/process/link.cgi
index 32a5360..c3d79e2 100755 (executable)
--- a/httemplate/misc/process/link.cgi
+++ b/httemplate/misc/process/link.cgi
@@ -1,5 +1,7 @@
 <%
 
+my $DEBUG = 0;
+
 $cgi->param('pkgnum') =~ /^(\d+)$/;
 my $pkgnum = $1;
 $cgi->param('svcpart') =~ /^(\d+)$/;
@@ -16,11 +18,31 @@ unless ( $svcnum ) {
   if ( $cgi->param('link_field2') =~ /^(\w+)$/ ) {
     $search{$1} = $cgi->param('link_value2');
   }
-  my $svc_x = ( grep { $_->cust_svc->svcpart == $svcpart } 
-                  qsearch( $svcdb, \%search )
-              )[0];
+
+  my @svc_x = ( sort { ($a->cust_svc->pkgnum > 0) <=> ($b->cust_svc->pkgnum > 0)
+                       or ($b->cust_svc->svcpart == $svcpart)
+                            <=> ($a->cust_svc->svcpart == $svcpart)
+                     }
+                     qsearch( $svcdb, \%search )
+              );
+
+  if ( $DEBUG ) {
+    warn scalar(@svc_x). " candidate accounts found for linking ".
+         "(svcpart $svcpart):\n";
+    foreach my $svc_x ( @svc_x ) {
+      warn "  ". $svc_x->email.
+           " (svcnum ". $svc_x->svcnum. ",".
+           " pkgnum ".  $svc_x->cust_svc->pkgnum. ",".
+           " svcpart ". $svc_x->cust_svc->svcpart. ")\n";
+    }
+  }
+
+  my $svc_x = $svc_x[0];
+
   eidiot("$link_field not found!") unless $svc_x;
+
   $svcnum = $svc_x->svcnum;
+
 }
 
 my $old = qsearchs('cust_svc',{'svcnum'=>$svcnum});