[svn-commits] eliel: branch group/data_api_gsoc2009 r253996 - in /team/group/data_api_gsoc2...

[SVN commits to the Digium repositories]

Author: eliel
Date: Tue Mar 23 12:26:36 2010
New Revision: 253996

URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=253996
Log:
Merged revisions 253755,253758,253800,253872 via svnmerge from 
https://origsvn.digium.com/svn/asterisk/trunk

................
  r253755 | tilghman | 2010-03-22 14:58:48 -0400 (Mon, 22 Mar 2010) | 4 lines
  
  Return the list for later manipulation.  This fixes an issue with the update procedure.
  
  Debugging with mmichelson.
................
  r253758 | tilghman | 2010-03-22 15:05:27 -0400 (Mon, 22 Mar 2010) | 2 lines
  
  Update query should be an UPDATE, not a SELECT.
................
  r253800 | mnicholson | 2010-03-22 15:52:52 -0400 (Mon, 22 Mar 2010) | 11 lines
  
  Merged revisions 253799 via svnmerge from 
  https://origsvn.digium.com/svn/asterisk/branches/1.4
  
  ........
    r253799 | mnicholson | 2010-03-22 14:50:00 -0500 (Mon, 22 Mar 2010) | 4 lines
    
    Unconditionally copy the caller's account code to the called party.
    
    (related to issue #16331)
  ........
................
  r253872 | mmichelson | 2010-03-22 16:32:15 -0400 (Mon, 22 Mar 2010) | 8 lines
  
  Initialize channels prior to loading "preload" modules.
  
  We can have bad results when a module, upon being loaded, attempts
  to reference the channels container if the container hasn't yet
  been initialized. I saw this happen by trying to preload pbx_config.so
  and having a hint defined which referenced a non-existent SIP peer.
................

Modified:
    team/group/data_api_gsoc2009/   (props changed)
    team/group/data_api_gsoc2009/contrib/scripts/dbsep.cgi
    team/group/data_api_gsoc2009/main/asterisk.c
    team/group/data_api_gsoc2009/main/features.c

Propchange: team/group/data_api_gsoc2009/
------------------------------------------------------------------------------
Binary property 'branch-1.4-merged' - no diff available.

Propchange: team/group/data_api_gsoc2009/
------------------------------------------------------------------------------
--- svnmerge-integrated (original)
+++ svnmerge-integrated Tue Mar 23 12:26:36 2010
@@ -1,1 +1,1 @@
-/trunk:1-253752
+/trunk:1-253916

Modified: team/group/data_api_gsoc2009/contrib/scripts/dbsep.cgi
URL: http://svnview.digium.com/svn/asterisk/team/group/data_api_gsoc2009/contrib/scripts/dbsep.cgi?view=diff&rev=253996&r1=253995&r2=253996
==============================================================================
--- team/group/data_api_gsoc2009/contrib/scripts/dbsep.cgi (original)
+++ team/group/data_api_gsoc2009/contrib/scripts/dbsep.cgi Tue Mar 23 12:26:36 2010
@@ -99,7 +99,7 @@
 		}
 		$get{$name}++;
 	}
-	$sql = "SELECT " . join(",", cgi_to_where_clause($cgi, \%cfg, \%get)) . " FROM $table WHERE " . join(" AND ", @get);
+	$sql = "UPDATE $table SET " . join(",", cgi_to_where_clause($cgi, \%cfg, \%get)) . " WHERE " . join(" AND ", @get);
 	$dbh = DBI->connect($cfg{dsn}, $cfg{dbuser}, $cfg{dbpass});
 	$affected = $dbh->do($sql);
 	$dbh->disconnect();
@@ -239,7 +239,7 @@
 			push @param, "$name='$value'";
 		}
 	}
-	return join(" AND ", @param);
+	return @param;
 }
 
 sub throw_error {

Modified: team/group/data_api_gsoc2009/main/asterisk.c
URL: http://svnview.digium.com/svn/asterisk/team/group/data_api_gsoc2009/main/asterisk.c?view=diff&rev=253996&r1=253995&r2=253996
==============================================================================
--- team/group/data_api_gsoc2009/main/asterisk.c (original)
+++ team/group/data_api_gsoc2009/main/asterisk.c Tue Mar 23 12:26:36 2010
@@ -3609,6 +3609,8 @@
 		exit(1);
 	}
 
+	ast_channels_init();
+
 	if ((moduleresult = load_modules(1))) {		/* Load modules, pre-load only */
 		printf("%s", term_quit());
 		exit(moduleresult == -2 ? 2 : 1);
@@ -3620,8 +3622,6 @@
 	}
 
 	ast_http_init();		/* Start the HTTP server, if needed */
-
-	ast_channels_init();
 
 	if (init_manager()) {
 		printf("%s", term_quit());

Modified: team/group/data_api_gsoc2009/main/features.c
URL: http://svnview.digium.com/svn/asterisk/team/group/data_api_gsoc2009/main/features.c?view=diff&rev=253996&r1=253995&r2=253996
==============================================================================
--- team/group/data_api_gsoc2009/main/features.c (original)
+++ team/group/data_api_gsoc2009/main/features.c Tue Mar 23 12:26:36 2010
@@ -3033,9 +3033,7 @@
 			if (peer_cdr && !ast_strlen_zero(peer_cdr->userfield)) {
 				ast_copy_string(bridge_cdr->userfield, peer_cdr->userfield, sizeof(bridge_cdr->userfield));
 			}
-			if (peer_cdr && ast_strlen_zero(peer->accountcode)) {
-				ast_cdr_setaccount(peer, chan->accountcode);
-			}
+			ast_cdr_setaccount(peer, chan->accountcode);
 
 		} else {
 			/* better yet, in a xfer situation, find out why the chan cdr got zapped (pun unintentional) */