bkruse: trunk r1327 - in /trunk: ./ config/cdr.html

[SVN commits to the Asterisk-GUI project]

Author: bkruse
Date: Mon Aug 13 16:00:20 2007
New Revision: 1327

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

........
r1326 | bkruse | 2007-08-13 15:50:59 -0500 (Mon, 13 Aug 2007) | 1 line

Fixes for the CDR viewer so that NO cdr records from the GUI system calls are placed inside the viewer (eg no calls that originate from the context asterisk_guitools)
........

Modified:
    trunk/   (props changed)
    trunk/config/cdr.html

Propchange: trunk/
------------------------------------------------------------------------------
--- branch-1.4-merged (original)
+++ branch-1.4-merged Mon Aug 13 16:00:20 2007
@@ -1,1 +1,1 @@
-/branches/1.4:1-1291,1293,1298-1300
+/branches/1.4:1-1291,1293,1298-1300,1326

Modified: trunk/config/cdr.html
URL: http://svn.digium.com/view/asterisk-gui/trunk/config/cdr.html?view=diff&rev=1327&r1=1326&r2=1327
==============================================================================
--- trunk/config/cdr.html (original)
+++ trunk/config/cdr.html Mon Aug 13 16:00:20 2007
@@ -123,13 +123,23 @@
 			var r = records[i+offset];
 			
 			for(var j=-1;j<r.length;j++) {
+	
+				if(r[(j + 4)])	
+					var dest_context = (r[j + 4].toString().replace(/^[\"]{1}/, "").replace(/[\"]{1}$/, "")) ? r[j + 4].toString().replace(/^[\"]{1}/, "").replace(/[\"]{1}$/, "") : 'none';
+				if(dest_context == "asterisk_guitools") {
+					j += fields.length-3;
+					/* go to next cdr record, which is exact 21 csvs away, so count the csv field names, and subtract 3, since we only added 4, and started with -1 */
+					continue;
+				} 
 				var td = document.createElement("td");
-				if (j < 0)
+				if (j < 0) {
 					var l = offset+i+1;
-				else
+				} else {
 					var l = r[j].toString().replace(/^[\"]{1}/, "").replace(/[\"]{1}$/, "");
+				}
 				td.appendChild(document.createTextNode(l));
 				tr.appendChild(td);
+
 			}
 
 			d.appendChild(tr);