bkruse: branch asterisknow r1892 - in /branches/asterisknow/config: scripts/ ...

[SVN commits to the Asterisk-GUI project]

Author: bkruse
Date: Tue Dec  4 12:35:22 2007
New Revision: 1892

URL: http://svn.digium.com/view/asterisk-gui?view=rev&rev=1892
Log:
Get rid of zapscan, update ztscan to output to the
correct config file for reading (going to take a little
bit of a re-work for the pages (namely 1.html))

Modified:
    branches/asterisknow/config/scripts/astman.js
    branches/asterisknow/config/setup/1.html

Modified: branches/asterisknow/config/scripts/astman.js
URL: http://svn.digium.com/view/asterisk-gui/branches/asterisknow/config/scripts/astman.js?view=diff&rev=1892&r1=1891&r2=1892
==============================================================================
--- branches/asterisknow/config/scripts/astman.js (original)
+++ branches/asterisknow/config/scripts/astman.js Tue Dec  4 12:35:22 2007
@@ -32,11 +32,9 @@
 var asterisk_menusRecord_path = asterisk_Sounds_path + "record/";
 var asterisk_guiSysInfo = "sh " + asterisk_scriptsFolder + "gui_sysinfo" ;
 var asterisk_guiSysInfo_output = "./sysinfo_output.html";
-var asterisk_guiZapscan = "zapscan.bin" ;
-var asterisk_guiZtscan = "ztscan";
+var asterisk_guiZtscan = "ztscan > /etc/asterisk/ztscan.conf";
 var asterisk_guiMisdn = "misdn-init";
 var asterisk_guiMisdn_scan = "misdn-init scan > /var/lib/asterisk/static-http/config/scan.html";
-
 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 

Modified: branches/asterisknow/config/setup/1.html
URL: http://svn.digium.com/view/asterisk-gui/branches/asterisknow/config/setup/1.html?view=diff&rev=1892&r1=1891&r2=1892
==============================================================================
--- branches/asterisknow/config/setup/1.html (original)
+++ branches/asterisknow/config/setup/1.html Tue Dec  4 12:35:22 2007
@@ -157,7 +157,7 @@
 }
 
 function scan_zapteldevices(){
-	parent.astmanEngine.run_tool(asterisk_guiZapscan, onSuccess=function(){ config2json('zapscan.conf',1,zapscan_conf_loaded); });
+	parent.astmanEngine.run_tool(asterisk_guiZtscan, onSuccess=function(){ config2json('ztscan.conf',1,zapscan_conf_loaded); });
 	return;
 }