bkruse: branch asterisknow r1666 - in /branches/asterisknow: ./ config/ tools/

[SVN commits to the Asterisk-GUI project]

Author: bkruse
Date: Tue Oct  9 16:52:08 2007
New Revision: 1666

URL: http://svn.digium.com/view/asterisk-gui?view=rev&rev=1666
Log:
Merged revisions 1664 via svnmerge from 
https://origsvn.digium.com/svn/asterisk-gui/branches/1.4

........
r1664 | bkruse | 2007-10-09 16:51:19 -0500 (Tue, 09 Oct 2007) | 2 lines

Change digital to output the lbo number, not the string. Removed random alert in timerules.html

........

Modified:
    branches/asterisknow/   (props changed)
    branches/asterisknow/config/timerules.html
    branches/asterisknow/tools/ztscan.c

Propchange: branches/asterisknow/
------------------------------------------------------------------------------
Binary property 'svnmerge-integrated' - no diff available.

Modified: branches/asterisknow/config/timerules.html
URL: http://svn.digium.com/view/asterisk-gui/branches/asterisknow/config/timerules.html?view=diff&rev=1666&r1=1665&r2=1666
==============================================================================
--- branches/asterisknow/config/timerules.html (original)
+++ branches/asterisknow/config/timerules.html Tue Oct  9 16:52:08 2007
@@ -446,7 +446,6 @@
 	_$('endtime_minute').selectedIndex = tm;
 
 	var find_index = function(el,val){
-		alert("el is " + el + " val is " + val);
 		for(var t=0; t< el.options.length; t++){
 			if( el.options[t].value == val){ el.selectedIndex = t; return; }
 		}

Modified: branches/asterisknow/tools/ztscan.c
URL: http://svn.digium.com/view/asterisk-gui/branches/asterisknow/tools/ztscan.c?view=diff&rev=1666&r1=1665&r2=1666
==============================================================================
--- branches/asterisknow/tools/ztscan.c (original)
+++ branches/asterisknow/tools/ztscan.c Tue Oct  9 16:52:08 2007
@@ -57,17 +57,6 @@
 static void trim(char *buf);
 char *facs[] = { "esf,b8zs", "d4,ami", "cas,ami", "ccs,hdb3", "ccs,crc4,hdb3", 0};
 static ZT_SPANINFO s[ZT_MAX_SPANS];
-
-static const char *lbostr[] = {
-"0 db (CSU)/0-133 feet (DSX-1)",
-"133-266 feet (DSX-1)",
-"266-399 feet (DSX-1)",
-"399-533 feet (DSX-1)",
-"533-655 feet (DSX-1)",
-"-7.5db (CSU)",
-"-15db (CSU)",
-"-22.5db (CSU)"
-};
 
 /* Done. Lets get to work! */
 
@@ -273,7 +262,7 @@
 			}
 #ifdef ZT_SPANINFO_HAS_LINECONFIG
 			snprintf(fac, sizeof(fac), "%3s/%4s", ( s[x].lineconfig & ZT_CONFIG_D4 ? "D4" : s[x].lineconfig & ZT_CONFIG_ESF ? "ESF" : s[x].lineconfig & ZT_CONFIG_CCS ? "CCS" : "CAS" ), ( s[x].lineconfig & ZT_CONFIG_AMI ? "AMI" : s[x].lineconfig & ZT_CONFIG_B8ZS ? "B8ZS" : s[x].lineconfig & ZT_CONFIG_HDB3 ? "HDB3" : "???" ));
-			snprintf(lbos, sizeof(lbos), "%s", lbostr[s[x].lbo]);
+			snprintf(lbos, sizeof(lbos), "%s", s[x].lbo);
 			if(!strncmp(ret, "OK", 2)) {
 				printf("Span %d has Alarm: %s\n", x, ret);
 				fprintf(conf, "\n[%d]\nactive=yes\nalarms=%s\ndescription=%s\nname=%s\ntotchans=%d\nusedchans=%d\nfac=%s\nlbo=%s\nsyncsrc=%d\n", x, ret, s[x].desc, s[x].name, s[x].totalchans, s[x].numchans, fac, lbos, s[x].syncsrc);