[Astlinux-commits] SF.net SVN: astlinux:[6578] branches/1.0/package/phoneprov-tools

[<abe...@us...>]

Revision: 6578
          http://sourceforge.net/p/astlinux/code/6578
Author:   abelbeck
Date:     2014-07-02 17:56:21 +0000 (Wed, 02 Jul 2014)
Log Message:
-----------
phoneprov-tools, add template option 'sql_enable' which defaults to 'yes', use table 'phoneprov_build' and then later rename it to 'phoneprov' so it is not half-baked on slow systems

Modified Paths:
--------------
    branches/1.0/package/phoneprov-tools/phoneprov-build
    branches/1.0/package/phoneprov-tools/phoneprov-massdeployment
    branches/1.0/package/phoneprov-tools/templates/gxp1400.conf
    branches/1.0/package/phoneprov-tools/templates/snom320.conf
    branches/1.0/package/phoneprov-tools/templates/spa942-no-reg.conf
    branches/1.0/package/phoneprov-tools/templates/yealink-2line.conf
    branches/1.0/package/phoneprov-tools/templates/yealink.conf

Modified: branches/1.0/package/phoneprov-tools/phoneprov-build
===================================================================
--- branches/1.0/package/phoneprov-tools/phoneprov-build	2014-07-01 19:56:13 UTC (rev 6577)
+++ branches/1.0/package/phoneprov-tools/phoneprov-build	2014-07-02 17:56:21 UTC (rev 6578)
@@ -157,8 +157,8 @@
 sql_init()
 {
   sqlite3 -batch "$ASTERISK_ODBC_SQLITE3" <<EOF
-DROP TABLE IF EXISTS 'phoneprov';
-CREATE TABLE 'phoneprov' (
+DROP TABLE IF EXISTS 'phoneprov_build';
+CREATE TABLE 'phoneprov_build' (
   'id' INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL,
   'ext' TEXT DEFAULT '',
   'cid_name' TEXT DEFAULT '',
@@ -178,7 +178,7 @@
   for i in 1 2 3 4 5 6; do
     # Only add unique extensions
     if [ "$i" = "1" -o "${EXT[$i]}" != "$ext" ]; then
-      echo "INSERT INTO 'phoneprov' (
+      echo "INSERT INTO 'phoneprov_build' (
 'ext',
 'cid_name',
 'account',
@@ -373,6 +373,12 @@
 if [ -z "$sip_file" ]; then
   sip_file="astlinux-phoneprov-sip.conf"
 fi
+sql_enable="$(extract_var sql_enable)"
+if [ -z "$sql_enable" ]; then
+  sql_enable="yes"
+else
+  sql_enable="$(echo "$sql_enable" | tr '[:upper:]' '[:lower:]')"
+fi
 
 # Special case to initialize dialplan and sip output files
 if [ "$ext" = "init" -o "$ext" = "init-dialplan" -o "$ext" = "init-sip" ]; then
@@ -416,7 +422,9 @@
   fi
 
   # Initialize SQL table entry
-  sql_init
+  if [ "$sql_enable" = "yes" ]; then
+    sql_init
+  fi
   exit 0
 fi
 
@@ -481,6 +489,8 @@
 fi
 
 # Add SQL table entry
-sql_add
+if [ "$sql_enable" = "yes" ]; then
+  sql_add
+fi
 
 exit 0

Modified: branches/1.0/package/phoneprov-tools/phoneprov-massdeployment
===================================================================
--- branches/1.0/package/phoneprov-tools/phoneprov-massdeployment	2014-07-01 19:56:13 UTC (rev 6577)
+++ branches/1.0/package/phoneprov-tools/phoneprov-massdeployment	2014-07-02 17:56:21 UTC (rev 6578)
@@ -80,6 +80,27 @@
   fi
 }
 
+sql_apply() {
+  local ASTERISK_ODBC_SQLITE3 phoneprov_build
+
+  ASTERISK_ODBC_SQLITE3="/mnt/kd/asterisk-odbc.sqlite3"
+
+  phoneprov_build=$(sqlite3 -batch "$ASTERISK_ODBC_SQLITE3" <<EOF
+SELECT count(*) FROM sqlite_master WHERE type='table' AND name='phoneprov_build';
+EOF
+  )
+  if [ "$phoneprov_build" = "1" ]; then
+    sqlite3 -batch "$ASTERISK_ODBC_SQLITE3" <<EOF
+DROP TABLE IF EXISTS 'phoneprov';
+ALTER TABLE 'phoneprov_build' RENAME TO 'phoneprov';
+EOF
+  else
+    sqlite3 -batch "$ASTERISK_ODBC_SQLITE3" <<EOF
+DROP TABLE IF EXISTS 'phoneprov';
+EOF
+  fi
+}
+
 ARGS="$(getopt --name phoneprov-massdeployment \
                --long auto-pass,only-pass,force-overwrite,help,if-name:,partial,auto-reload,only-reload \
                --options aAfhi:prR \
@@ -201,6 +222,8 @@
   exit $result
 fi
 
+sql_apply
+
 echo "Done"
 
 if [ $auto_reload -eq 1 ]; then

Modified: branches/1.0/package/phoneprov-tools/templates/gxp1400.conf
===================================================================
--- branches/1.0/package/phoneprov-tools/templates/gxp1400.conf	2014-07-01 19:56:13 UTC (rev 6577)
+++ branches/1.0/package/phoneprov-tools/templates/gxp1400.conf	2014-07-02 17:56:21 UTC (rev 6578)
@@ -35,6 +35,8 @@
 #sip_path=/mnt/kd/asterisk/includes
 sip_file=astlinux-phoneprov-sip.conf
 
+sql_enable=yes
+
 # Dialplan File entries:
 # Exten-intern
 [dialplan]

Modified: branches/1.0/package/phoneprov-tools/templates/snom320.conf
===================================================================
--- branches/1.0/package/phoneprov-tools/templates/snom320.conf	2014-07-01 19:56:13 UTC (rev 6577)
+++ branches/1.0/package/phoneprov-tools/templates/snom320.conf	2014-07-02 17:56:21 UTC (rev 6578)
@@ -27,6 +27,8 @@
 #sip_path=/mnt/kd/asterisk/includes
 sip_file=astlinux-phoneprov-sip.conf
 
+sql_enable=yes
+
 # Dialplan File entries
 [dialplan]
 exten => @EXT@,1,Dial(SIP/@ACCOUNT@)

Modified: branches/1.0/package/phoneprov-tools/templates/spa942-no-reg.conf
===================================================================
--- branches/1.0/package/phoneprov-tools/templates/spa942-no-reg.conf	2014-07-01 19:56:13 UTC (rev 6577)
+++ branches/1.0/package/phoneprov-tools/templates/spa942-no-reg.conf	2014-07-02 17:56:21 UTC (rev 6578)
@@ -28,6 +28,8 @@
 #sip_path=/mnt/kd/asterisk/includes
 sip_file=astlinux-phoneprov-sip.conf
 
+sql_enable=yes
+
 # Dialplan File entries
 [dialplan]
 exten => @EXT@,1,Dial(SIP/@ACCOUNT@)

Modified: branches/1.0/package/phoneprov-tools/templates/yealink-2line.conf
===================================================================
--- branches/1.0/package/phoneprov-tools/templates/yealink-2line.conf	2014-07-01 19:56:13 UTC (rev 6577)
+++ branches/1.0/package/phoneprov-tools/templates/yealink-2line.conf	2014-07-02 17:56:21 UTC (rev 6578)
@@ -29,6 +29,8 @@
 #sip_path=/mnt/kd/asterisk/includes
 sip_file=astlinux-phoneprov-sip.conf
 
+sql_enable=yes
+
 # Dialplan File entries
 [dialplan]
 exten => @EXT1@,1,Dial(SIP/@ACCOUNT1@)

Modified: branches/1.0/package/phoneprov-tools/templates/yealink.conf
===================================================================
--- branches/1.0/package/phoneprov-tools/templates/yealink.conf	2014-07-01 19:56:13 UTC (rev 6577)
+++ branches/1.0/package/phoneprov-tools/templates/yealink.conf	2014-07-02 17:56:21 UTC (rev 6578)
@@ -29,6 +29,8 @@
 #sip_path=/mnt/kd/asterisk/includes
 sip_file=astlinux-phoneprov-sip.conf
 
+sql_enable=yes
+
 # Dialplan File entries
 [dialplan]
 exten => @EXT@,1,Dial(SIP/@ACCOUNT@)

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