Index: trunk/src/scriptbuilder/structures/MyScriptHandler.java
===================================================================
--- trunk/src/scriptbuilder/structures/MyScriptHandler.java	(revision 38)
+++ trunk/src/scriptbuilder/structures/MyScriptHandler.java	(revision 41)
@@ -236,4 +236,6 @@
     private ScriptIncident currInc = null;
 
+    private CadData cad = null;
+
     /**
      * Constructor. Initializes incident map.
@@ -258,5 +260,5 @@
         return new Vector<ScriptIncident>(incidentMap.values());
     }
-    
+
     /**
      * Get the list of units that have been parsed from the script file.
@@ -276,5 +278,5 @@
     {
         //System.out.println("STUB: Start the document");
-        
+
     }
 
@@ -294,21 +296,5 @@
     public void startElement(String uri, String localName, String qName, Attributes attributes)
     {
-        /*System.out.println("Start_element;");
-         String t = "";
-         for (int i = 0; i < sublevels; i++)
-         {
-         t += "\t";
-         }
-         System.out.println(t + "New element " + qName);
-         if (attributes.getLength() > 0)
-         {
-         System.out.println(t + "Attributes:");
-         for (int i = 0; i < attributes.getLength(); i++)
-         {
-         System.out.print(t + "" + (i + 1) + ". " + attributes.getQName(i));
-         System.out.println(": '" + attributes.getValue(i) + "\'");
-         }
-         }
-         sublevels++;*/
+
         docPosition.push(ELEMENT.byName(qName));
 
@@ -466,4 +452,9 @@
                 trackedEvent = eventMap.get(docPosition.peek());
             }
+            else if (qName.equals(ELEMENT.SCRIPT_EVENT.tag))
+            {
+                cad = new CadData();
+            }
+
             else if (qName.equals(ELEMENT.TMC_SCRIPT.tag))
             {
@@ -477,5 +468,5 @@
                 }
                 script.title = TMCTitle;
-                
+
             }
             else if (qName.equals(ELEMENT.TMT_RADIO.tag))
@@ -625,4 +616,57 @@
                 currInc.addNewEvent(newEvent, (int) currentEventTime);
             }
+            else if (currentElement == ELEMENT.AGY && docPosition.peek() == ELEMENT.GENERAL)
+            {
+                cad.Agy = pcData.remove(currentElement);
+            }
+            else if (currentElement == ELEMENT.ADDRESS && docPosition.peek() == ELEMENT.LOCATION)
+            {
+                cad.Location_Address = pcData.remove(currentElement);
+            }
+            else if (currentElement == ELEMENT.AREA && docPosition.peek() == ELEMENT.LOCATION)
+            {
+                cad.Location_Area = pcData.remove(currentElement);
+            }
+            else if (currentElement == ELEMENT.BEAT && docPosition.peek() == ELEMENT.LOCATION)
+            {
+                cad.Location_Beat = pcData.remove(currentElement);
+            }
+            else if (currentElement == ELEMENT.CITY && docPosition.peek() == ELEMENT.LOCATION)
+            {
+                cad.Location_City = pcData.remove(currentElement);
+            }
+            else if (currentElement == ELEMENT.EMS && docPosition.peek() == ELEMENT.LOCATION)
+            {
+                cad.Location_Ems = pcData.remove(currentElement);
+            }
+            else if (currentElement == ELEMENT.FIRE && docPosition.peek() == ELEMENT.LOCATION)
+            {
+                cad.Location_Fire = pcData.remove(currentElement);
+            }
+            else if (currentElement == ELEMENT.LAW && docPosition.peek() == ELEMENT.LOCATION)
+            {
+                cad.Location_Law = pcData.remove(currentElement);
+            }
+            else if (currentElement == ELEMENT.LOC && docPosition.peek() == ELEMENT.LOCATION)
+            {
+                cad.Location_Loc = pcData.remove(currentElement);
+            }
+            else if (currentElement == ELEMENT.Type && docPosition.peek() == ELEMENT.HEADER_INFO)
+            {
+                cad.Header_Type = pcData.remove(currentElement);
+            }
+            else if (currentElement == ELEMENT.Beat && docPosition.peek() == ELEMENT.HEADER_INFO)
+            {
+                cad.Header_Beat = pcData.remove(currentElement);
+            }
+            else if (currentElement == ELEMENT.TruncLoc && docPosition.peek() == ELEMENT.HEADER_INFO)
+            {
+                cad.Header_TruncLoc = pcData.remove(currentElement);
+            }
+            else if (currentElement == ELEMENT.FullLoc && docPosition.peek() == ELEMENT.HEADER_INFO)
+            {
+                cad.Header_FullLoc = pcData.remove(currentElement);
+            }
+
             else if (currentElement == ELEMENT.AUDIO)
             {
@@ -721,4 +765,15 @@
                 }
             }
+            else if (currentElement == ELEMENT.LOCATION_INFO)
+            {
+                Location_Info locInfo = new Location_Info();
+                
+                locInfo.Location_ID = LocationInfoID;
+                locInfo.Direction = pcData.remove(ELEMENT.Direction);
+                locInfo.Location_type = pcData.remove(ELEMENT.Location_type);
+                locInfo.Route = pcData.remove(ELEMENT.Route);
+                locInfo.Postmile = pcData.remove(ELEMENT.Postmile);
+                cad.locInfo.add(locInfo);                
+            }
             else if (currentElement == ELEMENT.MAINTENANCE_RADIO)
             {
@@ -727,4 +782,8 @@
                 currInc.addNewEvent(newEvent, (int) currentEventTime);
             }
+            else if (currentElement == ELEMENT.MASTER_INC_NUM)
+            {
+                cad.Master_Inc_Num = pcData.remove(currentElement);
+            }
             else if (currentElement == ELEMENT.PARAMICS)
             {
@@ -747,4 +806,8 @@
 
                 currInc.addNewEvent(newEvent, (int) currentEventTime);
+            }
+            else if (currentElement == ELEMENT.SCRIPT_EVENT)
+            {
+                currInc.insertCadData(currentEventTime, cad);
             }
             else if (currentElement == ELEMENT.STUDENT)
@@ -759,4 +822,9 @@
             {
                 currInc.description = pcData.remove(ELEMENT.TEXT);
+                cad.General_Text = currInc.description;
+            }
+            else if (currentElement == ELEMENT.TITLE && docPosition.peek() == ELEMENT.GENERAL_INFO)
+            {
+                cad.General_Title = pcData.remove(ELEMENT.TITLE);
             }
             else if (currentElement == ELEMENT.TMT_RADIO)
@@ -779,4 +847,12 @@
                 ((TowEvent) newEvent).towPubNum = TowPubNum;
                 currInc.addNewEvent(newEvent, (int) currentEventTime);
+            }
+            else if (currentElement == ELEMENT.TYPE && docPosition.peek() == ELEMENT.ADDITIONAL_INFO)
+            {
+                cad.Info_Type = pcData.remove(currentElement);
+            }
+            else if (currentElement == ELEMENT.TYPE_CODE && docPosition.peek() == ELEMENT.ADDITIONAL_INFO)
+            {
+                cad.Info_Type_Code = pcData.remove(currentElement);
             }
             else if (currentElement == ELEMENT.UNIT)