bkruse: trunk r1667 - in /trunk: config/ config/scripts/ scripts/

[SVN commits to the Asterisk-GUI project]

Author: bkruse
Date: Tue Oct  9 17:08:49 2007
New Revision: 1667

URL: http://svn.digium.com/view/asterisk-gui?view=rev&rev=1667
Log:
set the loadzone for zaptel.conf properly, and use editzap to take applyzap.conf and write to /etc/zaptel.conf

Modified:
    trunk/config/digital.html
    trunk/config/scripts/astman.js
    trunk/scripts/editzap.sh

Modified: trunk/config/digital.html
URL: http://svn.digium.com/view/asterisk-gui/trunk/config/digital.html?view=diff&rev=1667&r1=1666&r2=1667
==============================================================================
--- trunk/config/digital.html (original)
+++ trunk/config/digital.html Tue Oct  9 17:08:49 2007
@@ -69,14 +69,6 @@
 
 <script>
 var SPANS = {};
-
-var framing_and_coding = {
-	"ESF/B8ZS": "esf,b8zs",
-	"D4/AMI": "d4,ami",
-	"CAS/AMI": "cas,ami",
-	"CCS/HDB3": "ccs,hdb3",
-	"CCS/CRC4/HDB3": "ccs,crc4,hdb3"
-};
 
 function hide_mymenu(){
 	document.getElementById('mymenu').style.display="none"; 
@@ -294,7 +286,7 @@
 			firstpart = "span";
 			/* XXX Timing source for card is being set to zero? */
 			/* LBO is being set to 0 */
-			secondpart = k + "," + "0,0," + SPANS[k]['fac'].toLowerCase().replace("/", ",");
+			secondpart = k + "," + SPANS[k]['syncsrc']  + "," + SPANS[k]['lbo'] + "," + SPANS[k]['fac'].toLowerCase().replace("/", ",");
 			uri += build_action('append', c, context, firstpart, secondpart ); c++;
 			tmp2 = (totalchans)? ",":"";
 
@@ -316,11 +308,13 @@
 
 	uri += build_action('append', c, context, 'bchan', bchanstring); c++;
 	uri += build_action('append', c, context, 'dchan', dchanstring); c++;
-	uri += build_action('append', c, context, 'loadzone', _$(editspan_loadzone).value); c++;
+	uri += build_action('append', c, context, 'loadzone', _$('editspan_loadzone').value); c++;
 	uri += build_action('append', c, context, 'defaultzone', 'us'); c++;
 
 	makerequest('u', "applyzap.conf", uri , function(t) {
-		
+		parent.astmanEngine.run_tool(asterisk_guiEditZap + " applysettings", function(t) { /* anything we need to do here? */ return true; });	
+		/* to run ztcfg and apply settings, you can do this call, but replace applysettings with ztcfg.
+			You can then read /var/lib/asterisk/static-http/config/ztcfg_output.html to look at ztcfg errors */
 	});
 
 }

Modified: trunk/config/scripts/astman.js
URL: http://svn.digium.com/view/asterisk-gui/trunk/config/scripts/astman.js?view=diff&rev=1667&r1=1666&r2=1667
==============================================================================
--- trunk/config/scripts/astman.js (original)
+++ trunk/config/scripts/astman.js Tue Oct  9 17:08:49 2007
@@ -34,6 +34,7 @@
 var asterisk_guiSysInfo_output = "./sysinfo_output.html";
 var asterisk_guiZapscan = "/sbin/zapscan.bin" ;
 var asterisk_guiZtscan = "/sbin/ztscan";
+var asterisk_guiEditZap = "sh " + asterisk_scriptsFolder + "editzap.sh";
 var asterisk_rawmanPath = "../../rawman" ;
 var asterisk_guiConfigFile = "guipreferences.conf"; // will be created in asterisk_configfolder, if the file does not exist 
 var asterisk_configfolder = "/etc/asterisk/";

Modified: trunk/scripts/editzap.sh
URL: http://svn.digium.com/view/asterisk-gui/trunk/scripts/editzap.sh?view=diff&rev=1667&r1=1666&r2=1667
==============================================================================
--- trunk/scripts/editzap.sh (original)
+++ trunk/scripts/editzap.sh Tue Oct  9 17:08:49 2007
@@ -8,6 +8,7 @@
 
 ZAPCONF="/etc/zaptel.conf"
 ZTCFG_OUTPUT="/var/lib/asterisk/static-http/config/ztcfg_output.html"
+FILENAME="/etc/asterisk/applyzap.conf"
 
 case ${1} in
 	changemodes)
@@ -29,8 +30,9 @@
 		;;
 	applysettings)	
 		# Split based on ||| delimeter, and apply to zaptel.
-		FILENAME="/etc/asterisk/applyzap.conf"
 		grep -v "\[general\]" ${FILENAME} | grep -v "\;" > ${ZAPCONF} 
+		;;
+	ztcfg)
 		ztcfg -vv 2> $ZTCFG_OUTPUT
 		;;
 esac