[Astpp-commit] SF.net SVN: astpp:[2287] trunk/modules/ASTPP/lib/ASTPP.pm

Revision: 2287
          http://astpp.svn.sourceforge.net/astpp/?rev=2287&view=rev
Author:   darrenkw
Date:     2009-10-09 14:57:38 +0000 (Fri, 09 Oct 2009)

Log Message:
-----------
Add some sql finish statements.

Modified Paths:
--------------
    trunk/modules/ASTPP/lib/ASTPP.pm

Modified: trunk/modules/ASTPP/lib/ASTPP.pm
===================================================================
--- trunk/modules/ASTPP/lib/ASTPP.pm	2009-10-08 05:07:10 UTC (rev 2286)
+++ trunk/modules/ASTPP/lib/ASTPP.pm	2009-10-09 14:57:38 UTC (rev 2287)
@@ -258,7 +258,7 @@
 		. " AND prefix IN (NULL,'') OR ip = " . $self->{_astpp_db}->quote($arg{ip_address});
 	$tmp .= " AND " . $self->{_astpp_db}->quote($arg{destination}) . " RLIKE prefix" if $arg{destination};
 	$tmp .= " ORDER BY LENGTH(prefix) DESC LIMIT 1";
-	print STDERR $tmp;
+	print STDERR $tmp . "\n";
 	$sql = $self->{_astpp_db}->prepare($tmp);
 	$sql->execute;
 	my $anidata = $sql->fetchrow_hashref;
@@ -289,7 +289,7 @@
 	$arg{xml} .= "<section name=\"dialplan\" description=\"ASTPP Dynamic Routing\">\n";
 	if ($arg{DID} > 0) {
 		$arg{xml} .= "<context name=\"public\">\n";
-	} elsif ($arg{IP} ne "") {
+	} elsif ($arg{IP} ne "" || $arg{ip} > 0) {
 		$arg{xml} .= "<context name=\"public\">\n";
 	} else {
 		$arg{xml} .= "<context name=\"default\">\n";
@@ -519,10 +519,12 @@
     my $sql = $self->{_freeswitch_db}->prepare($tmp);
     if ( !$sql->execute ) {
 	print "$tmp failed";
+	$sql->finish;
 	return (1,"SIP Device Creation Failed!");
     }
     else {
 	my $directory_id = $sql->{'mysql_insertid'};
+	$sql->finish;
 	my $tmp = "INSERT INTO directory_vars (directory_id,var_name,var_value) VALUES ("
 		. $self->{_freeswitch_db}->quote($directory_id) . ","
 		. "'accountcode',"
@@ -544,7 +546,6 @@
 		. $self->{_freeswitch_db}->quote($arg{password}) . ")";
 	print STDERR $tmp . "\n";
 	$self->{_freeswitch_db}->do($tmp);
-
 	return (0, "SIP Device Added!" . "Username:" . " " . $sipid . " " . "Password:" . " " . $arg{password}, $sipid);
     }
 }
@@ -1106,6 +1107,7 @@
 		. ")";
 	my $sql = $self->{_astpp_db}->prepare($tmp);
 	$sql->execute;
+	$sql->finish;
 	return $arg{sort_order}++;
 }
 
@@ -1181,6 +1183,7 @@
 		$sql->execute;
 
 		$arg{sort_order}++;
+	$sql->finish;
 	}
 	return $arg{sort_order};
 }


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.