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

[SVN commits to the Digium repositories]

Author: eliel
Date: Mon Mar 22 13:15:27 2010
New Revision: 253753

URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=253753
Log:
Merged revisions 253712 via svnmerge from 
https://origsvn.digium.com/svn/asterisk/trunk

........
  r253712 | tilghman | 2010-03-22 12:59:35 -0400 (Mon, 22 Mar 2010) | 2 lines
  
  Accomodate equal signs in DSNs and add documentation, based upon mmichelson's feedback.
........

Modified:
    team/group/data_api_gsoc2009/   (props changed)
    team/group/data_api_gsoc2009/configs/dbsep.conf.sample
    team/group/data_api_gsoc2009/contrib/scripts/dbsep.cgi

Propchange: team/group/data_api_gsoc2009/
------------------------------------------------------------------------------
--- svnmerge-integrated (original)
+++ svnmerge-integrated Mon Mar 22 13:15:27 2010
@@ -1,1 +1,1 @@
-/trunk:1-253707
+/trunk:1-253752

Modified: team/group/data_api_gsoc2009/configs/dbsep.conf.sample
URL: http://svnview.digium.com/svn/asterisk/team/group/data_api_gsoc2009/configs/dbsep.conf.sample?view=diff&rev=253753&r1=253752&r2=253753
==============================================================================
--- team/group/data_api_gsoc2009/configs/dbsep.conf.sample (original)
+++ team/group/data_api_gsoc2009/configs/dbsep.conf.sample Mon Mar 22 13:15:27 2010
@@ -22,6 +22,7 @@
 #
 
 # The Data Source Name, as specified by the Perl DBI module.
+# Typically, this will be along the lines of 'DBI:mysql:astdbname[:dbhostname]' or 'DBI:Pg:dbname=astdbname;hostname=dbhostname'
 dsn=somedsn
 
 # Connected database user

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=253753&r1=253752&r2=253753
==============================================================================
--- team/group/data_api_gsoc2009/contrib/scripts/dbsep.cgi (original)
+++ team/group/data_api_gsoc2009/contrib/scripts/dbsep.cgi Mon Mar 22 13:15:27 2010
@@ -36,8 +36,8 @@
 	chomp;
 	next if (m/^[#;]/);
 	next if (m/^\s*$/);
-	my ($name,$value) = split '=';
-	$cfg{lc($name)} = $value;
+	my ($name, at value) = split '=';
+	$cfg{lc($name)} = join('=', @value);
 }
 close CFG;