OpenPKG CVS Repository
http://cvs.openpkg.org/
____________________________________________________________________________
Server: cvs.openpkg.org Name: Ralf S. Engelschall
Root: /v/openpkg/cvs Email: [EMAIL PROTECTED]
Module: openpkg-src Date: 23-Mar-2008 11:30:34
Branch: HEAD Handle: 2008032310303300
Modified files:
openpkg-src/asterisk asterisk.spec asterisk.txt
Log:
place ODBC/SQLite based database side-by-side to the Berkeley-DB based
AstDB
Summary:
Revision Changes Path
1.66 +4 -4 openpkg-src/asterisk/asterisk.spec
1.39 +6 -6 openpkg-src/asterisk/asterisk.txt
____________________________________________________________________________
patch -p0 <<'@@ .'
Index: openpkg-src/asterisk/asterisk.spec
============================================================================
$ cvs diff -u -r1.65 -r1.66 asterisk.spec
--- openpkg-src/asterisk/asterisk.spec 23 Mar 2008 09:46:28 -0000
1.65
+++ openpkg-src/asterisk/asterisk.spec 23 Mar 2008 10:30:33 -0000
1.66
@@ -458,14 +458,14 @@
( echo "[asterisk-sqlite]"
echo "Description = Asterisk SQLite Database"
echo "Driver = SQLite3"
- echo "Database =
$RPM_INSTALL_PREFIX/var/asterisk/run/asterisk.db"
+ echo "Database =
$RPM_INSTALL_PREFIX/var/asterisk/db/astdb.sqlite"
echo "Timeout = 2000"
) | $RPM_INSTALL_PREFIX/bin/odbcinst -i -s -l -n "asterisk-sqlite"
-r >/dev/null 2>&1 || true
fi
if [ ! -f $RPM_INSTALL_PREFIX/var/asterisk/run/asterisk.db ]; then
( umask 007
echo "CREATE TABLE map (key TEXT, val TEXT);" |
$RPM_INSTALL_PREFIX/bin/isql "asterisk-sqlite" -b
- chown %{l_rusr}:%{l_rgrp}
$RPM_INSTALL_PREFIX/var/asterisk/run/asterisk.db >/dev/null 2>&1 || true
+ chown %{l_rusr}:%{l_rgrp}
$RPM_INSTALL_PREFIX/var/asterisk/db/astdb.sqlite >/dev/null 2>&1 || true
) || exit $?
fi
%endif
@@ -479,7 +479,7 @@
%if "%{with_odbc}" == "yes"
# before erase, optionally unlink from ODBC and destroy database
$RPM_INSTALL_PREFIX/bin/odbcinst -u -s -l -n "asterisk-sqlite"
>/dev/null 2>&1 || true
- rm -f $RPM_INSTALL_PREFIX/var/asterisk/run/asterisk.db >/dev/null 2>&1
|| true
+ rm -f $RPM_INSTALL_PREFIX/var/asterisk/db/astdb.sqlite >/dev/null 2>&1
|| true
%endif
# before erase, stop service and remove log files
[ $1 -eq 0 ] || exit 0
@@ -488,6 +488,6 @@
rm -f $RPM_INSTALL_PREFIX/var/asterisk/log/cdr-*/* >/dev/null 2>&1 ||
true
rm -f $RPM_INSTALL_PREFIX/var/asterisk/run/* >/dev/null 2>&1 ||
true
rm -f $RPM_INSTALL_PREFIX/var/asterisk/spool/*/* >/dev/null 2>&1 ||
true
- rm -f $RPM_INSTALL_PREFIX/var/asterisk/spool/astdb >/dev/null 2>&1 ||
true
+ rm -f $RPM_INSTALL_PREFIX/var/asterisk/db/* >/dev/null 2>&1 ||
true
exit 0
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/asterisk/asterisk.txt
============================================================================
$ cvs diff -u -r1.38 -r1.39 asterisk.txt
--- openpkg-src/asterisk/asterisk.txt 22 Mar 2008 20:11:32 -0000 1.38
+++ openpkg-src/asterisk/asterisk.txt 23 Mar 2008 10:30:33 -0000 1.39
@@ -710,18 +710,18 @@
;; func_odbc.conf -- Asterisk ODBC dialplan function configuration
;;
-; Set(<variable_name>=${ODBC_SQL(SELECT [...])})
-; Set(ODBC_SQL(UPDATE [...]))
+; Set(<variable_name>=${ASTDB_SQL(SELECT [...])})
+; Set(ASTDB_SQL(UPDATE [...]))
[SQL]
-prefix = ODBC
+prefix = ASTDB
dsn = asterisk-sqlite
readsql = ${ARG1}
writesql = ${ARG1}
-; Set(<variable_name>=${ODBC_MAP(<key>)})
-; Set(ODBC_MAP(<key>)=<value>)
+; Set(<variable_name>=${ASTDB_MAP(<key>)})
+; Set(ASTDB_MAP(<key>)=<value>)
[MAP]
-prefix = ODBC
+prefix = ASTDB
dsn = asterisk-sqlite
readsql = SELECT val FROM map WHERE key='${SQL_ESC(${ARG1})}'
writesql = UPDATE map SET val='${SQL_ESC(${VAL1})}' WHERE
key='${SQL_ESC(${ARG1})}'
@@ .
______________________________________________________________________
OpenPKG http://openpkg.org
CVS Repository Commit List openpkg-cvs@openpkg.org
