Index: /trunk/webapps/mergelogs.bash
===================================================================
--- /trunk/webapps/mergelogs.bash	(revision 637)
+++ /trunk/webapps/mergelogs.bash	(revision 638)
@@ -1,18 +1,18 @@
 # Merge log files and sort by timestamp
-# Invoke from 'trunk' folder
-# TODO: Add error handling - missing files, not executed from 'trunk', ... 
+# Invoke from 'webapps' folder
+# TODO: Add error handling - missing files, not executed from 'webapps', ... 
 
 # 1. Runs a python program named "extract_caddetails" 
 # to extract CAD DETAIL lines from incident_script.xml
 # and creates an output file "caddetails.csv" 
-PYTHONPATH=webapps/unifiedlogger.zip  python -m extract_caddetails
+PYTHONPATH=unifiedlogger.zip  python -m extract_caddetails
 
 # 2. Define a variable for the directory containing the data files
-dir="webapps/dynamicdata"
+dir="dynamicdata"
 
 # 3. Merge three files: unified log, cad details, and evaluation ratings
 # then sort them by timestamp (reverse chronological).  
 # Final result placed in "unifiedlog_final.csv"
-cat $dir/unifiedlog.csv $dir/caddetails.csv $dir/evalratings.csv | sort > $dir/unifiedlog_final.csv
+cat $dir/unifiedlog.csv $dir/caddetails.csv $dir/evalratings.csv ../../../web2py/samplelogfile.txt | sort > $dir/unifiedlog_final.csv
 
 # 4. Next, launch the webserver and browse to localhost:8080/unifiedlogdisplay.html 
Index: /trunk/webapps/mergelogs.bat
===================================================================
--- /trunk/webapps/mergelogs.bat	(revision 554)
+++ /trunk/webapps/mergelogs.bat	(revision 638)
@@ -7,4 +7,4 @@
 set dir="webapps\dynamicdata"
 REM 2. Merge the unified log with cad details and evaluation ratings
-type %dir%\unifiedlog.csv %dir%\caddetails.csv %dir%\ratings.csv | sort > %dir%\unifiedlog_final.csv
+type %dir%\unifiedlog.csv %dir%\caddetails.csv %dir%\evalratings.csv w:\web2py\samplelogfile.txt | sort > %dir%\unifiedlog_final.csv
 
Index: /trunk/webapps/dynamicdata/unifiedlog_final.csv
===================================================================
--- /trunk/webapps/dynamicdata/unifiedlog_final.csv	(revision 551)
+++ /trunk/webapps/dynamicdata/unifiedlog_final.csv	(revision 638)
@@ -1,3 +1,3 @@
-00:01:00, CAD Log, Incident #187, Detail: STALLED DOT SB SR-55 AT I-405
+00:00:00, CAD Log, Incident #181, Detail: ENRT FROM NB 405 AT JEFFREY
 00:01:18, Activity Log,,021 10-98 Assignment Completed 75-1
 00:01:18, Activity Log,,021 10-98 Let's get pizza. 75-1
@@ -13,122 +13,53 @@
 00:01:18, CMS Activated,N SR-55  5.38 Baker Street, 'BBBBB:::::'
 00:01:53, CMS Activated,N SR-73 24.91 North of Jamboree, 'LINES ON ROAD:::::'
-00:02:00, Evaluation, ATMS, Average
-00:02:00, Evaluation, CAD, Best
 00:02:28, CMS Updated, N SR-73 24.91 North of Jamboree, 'SNOW ON ROAD:::::'
-00:03:00, CAD Log, Incident #187, Detail: CELLULAR 911 RPT DOT HT  2ND VEH OVER THE SIDE  UNVERIFIED
+00:03:00, CAD Log, Incident #181, Detail: 14-13 10-97 1125  EMS 10-97  HAY TRK VS 2 VEH  #1 2 3 LNS BLCKD REQ ADDL UNITS
 00:03:13, CAD Log, Incident #187, Jose Trainee: SEND ICE CREAM
-00:03:30, CAD Log, Incident #187, Detail: DUPLICATE CALL
 00:03:33, CMS Deactivated, N SR-73 24.91 North of Jamboree
+00:04:00, CAD Log, Incident #181, Detail: 14-7 ENRT FROM SB 405 AT BROOKHURST 14-21 ENRT FROM 55 AT MACARTHUR
 00:04:04, CAD Log, Simulation Paused.
-00:04:30, CAD Log, Incident #187, Detail: DUPLICATE CALL
-00:05:00, CAD Log, Incident #187, Detail: DOT HIT BY VEH  VEH OVER SIDE.2ND VEH LANDED NB 405 BELOW  LG COLLISION OCCUR. REQ 2 1141 CODE 2 UNITS ASSIST
-00:05:30, CAD Log, Incident #187, Detail: DUPLICATE CALL
-00:06:00, CAD Log, Incident #187, Detail: 14-17 14-9 ENRT ASSIST 1183 1125
-00:06:30, CAD Log, Incident #187, Detail: DUPLICATE CALL
-00:07:00, CAD Log, Incident #187, Detail: DOT DRIVER UNINJURED  #2 3 LNS BLCKD SB 55.14-14 MVNG TO 405 ASSESS DMG
-00:10:00, CAD Log, Incident #188, Detail: 9-9 ENRT FRM I405 @ IRVINE CTR
-00:12:00, CAD Log, Incident #187, Detail: 14-14 1097  MULTIPLE 1144 NB 405 AT 55 OVERPASS  6 VEH TCBLOCKING 3 INSIDE LNS NB 405. DRVR AND PSSNGR IN VEH 1144  2 OTHER FATALS  MULT INJR  REQ CRNR AND SIGALERT
-00:12:30, CAD Log, Incident #187, Detail: 1039 CRNR
-00:13:00, CAD Log, Incident #187, Detail: 14-17 1097  PARAMEDICS 1097. 1184 SB 55 FOR DOT 1125
-00:14:00, CAD Log, Incident #187, Detail: REQ MAIT  REQ 14-S UNIT  REQ TMT
-00:14:00, CAD Log, Incident #188, Detail: 9-9  FD  PARAMEDICS 1097.  TC SEMI W/TOMATOES AND VEH ON NB-5 #3 4 5 LNSTRCK ON FIRE  REQ CT CLNUP  UNITS 1184
-00:17:00, CAD Log, Incident #187, Detail: 14-9 1097  ASSIST 1184
-00:18:00, CAD Log, Incident #187, Detail: TRAFFIC BACKING SB 55 REQ TMT MEDIUM DUTY 1185
-00:19:00, CAD Log, Incident #187, Detail: 4 1144'S  2 1180'S  4 1181'S
-00:20:00, CAD Log, Incident #188, Detail: 9-15 9-19 ENRT FOR 1184
-00:21:00, CAD Log, Incident #187, Detail: 1039 SABLAN TOWING
-00:22:00, CAD Log, Incident #187, Detail: 14-S3 1097 NB 405 @ 55MAIT ETA 15
-00:24:00, CAD Log, Incident #188, Detail: 1141 1097  TRCK STLL FIRE  2 1180 IN VEH  UNK IN TRCK
-00:25:00, CAD Log, Incident #188, Detail: REQUEST 1185 BIG RIG AND 1185 ROT  ISSUE SIG ALERT
-00:27:00, CAD Log, Incident #187, Detail: CRNR 1097  INJURED TRANSPORTED
-00:30:00, CAD Log, Incident #188, Detail: 9-15 1097  ADVS PD TO DIRECT TRAFFIC OFF AT LAKE FOREST 
-00:31:00, CAD Log, Incident #188, Detail: 1039 COLLEGE OAK BIG RIG  CYCLE TOW FOR ROT
-00:32:00, CAD Log, Incident #188, Detail: 9-19 1097 ASSISTNG 1184
-00:35:00, CAD Log, Incident #187, Detail: MAIT 1097 STARTING INVESTIGATION SB SR55
-00:37:00, CAD Log, Incident #187, Detail: MED DUTY 1185 1097  AWAIT FINISH MAIT BEFORE TOW VEH
-00:38:00, CAD Log, Incident #188, Detail: 1039 PD  SENDING 2 UNITS ASST 1184
-00:40:00, CAD Log, Incident #187, Detail: CRNR CONFIRMED FOUR FATAL  PREP TO TRANSPORT
-00:42:00, CAD Log, Incident #188, Detail: 1180S TRANSPORTED
-00:43:00, CAD Log, Incident #188, Detail: 9-9 FIRE OUT
-00:44:00, CAD Log, Incident #188, Detail: LAKE FOREST ONRAMP CLOSED  DIRECTING TRAFFIC OFF LAKE FOREST OFFRAMP
-00:47:00, CAD Log, Incident #187, Detail: MAIT FINISHED W/ INVESTIGATION SB SR-55 AT I-405  PREP DOT TRCK FOR TOW
-00:48:00, CAD Log, Incident #188, Detail: 1 1144 IN TRCK  REQ CRNR
-00:50:00, CAD Log, Incident #188, Detail: 9-9 1039 CRNR  ETA 15
-00:51:00, CAD Log, Incident #188, Detail: CT 1097  STRTNG CLNUP OF TOMATOES
-00:53:00, CAD Log, Incident #188, Detail: 1185 ROT 1097
-00:54:00, CAD Log, Incident #187, Detail: MAIT STARTING INVESTIGATION NB 405 TO TAKE 30 MIN
-00:55:00, CAD Log, Incident #187, Detail: CLNUP NRLY FNSHD DOT RDY TO BE TWD  SB SR-55 LNS OPN IN 5
-00:56:00, CAD Log, Incident #188, Detail: WTNSSES  JOHN/BETTY JONES SAW TOMATO TRUCK LOSE CONTROL  FLIP OVER  VEH HIT  TRCK IMM CAUGHT FIRE
-00:59:00, CAD Log, Incident #188, Detail: BIG RIG 1185 1097
-01:02:00, CAD Log, Incident #187, Detail: 14-17 1097 DOT TRCK TWD  SB SR-55 OPN
-01:03:00, CAD Log, Incident #187, Detail: MAIT PARTIAL CMPLT  PICS TKN  NEED MSRMNTS  INTERVIEWS
-01:05:00, CAD Log, Incident #188, Detail: CT #3 LN ALMOST CLEARED OF TOMATOES
-01:07:00, CAD Log, Incident #188, Detail: CRNR 1097
-01:08:00, CAD Log, Incident #187, Detail: REQ 6 ROT 1185
-01:09:00, CAD Log, Incident #188, Detail: VEH TOWED  #3 LN CLEARED  OPENING
-01:10:00, CAD Log, Incident #187, Detail: MAIT NEARLY COMPLETE  FINISHING INTERVIEWS  TOW ETA 10
-01:12:00, CAD Log, Incident #188, Detail: 1144 CNFRMD  #3 LN OPN  FULL OPNNG 20 MIN
-01:15:00, CAD Log, Incident #188, Detail: CT NRLY FNSHD CLNUP  TRCK BEING PRPRD FOR 1185
-01:16:30, CAD Log, Incident #187, Detail: MAIT FINISHED INVESTIGATION 1098  START CLEANUP WHEN 1185S ARRIVE
-01:19:00, CAD Log, Incident #187, Detail: 1185 1097 PARTIAL OPENING IN 15
-01:20:00, CAD Log, Incident #188, Detail: CT 98 TOMATOES  LNS OPN IN 10
-01:23:00, CAD Log, Incident #189, Detail: CELLULAR 911 RPT SUICIDE BMBR AT I-405 @ JEFFREY  UNVERIFIED1039 IRV PD  PD ENRT  28-24 ENRT FROM I-405 @ IRVINE CNTR.
-01:24:00, CAD Log, Incident #188, Detail: TRCK TWD  FD SPRYNG LNS  LNS OPN IN 5
-01:25:00, CAD Log, Incident #189, Detail: 28-24 1097  PD 1097
-01:29:00, CAD Log, Incident #189, Detail: 28-19 ENRT FROM I-5 AT SND CYN  28-13 ENRT FROM I-5 AT 133SHUT DWN NB I-405 AT SND CYN OFFR
-01:30:00, CAD Log, Incident #187, Detail: OPN #2 3 LNS  FULL OPN IN 5
-01:31:00, CAD Log, Incident #188, Detail: ALL LNS CLR  9-15 OPENING LAKE FOREST ONRAMP9-9 9-15 9-19 1098
-01:31:00, CAD Log, Incident #189, Detail: 28-11 ENRT FROM I405 AT BRISTOL  28-07 ENRT FROM SR55 AT DYER28-11 28-07 TO SHT DWN SB I405 AT CULVER OFFR
-01:32:00, CAD Log, Incident #189, Detail: PD CLOSING JEFFREY AND UNIV DR  SENDING NEGOTIATOR  REQ SIGALERT
-01:35:00, CAD Log, Incident #187, Detail: VEH TWD  LNS OPN  14-S  14-9  14-14 1098
-01:36:00, CAD Log, Incident #189, Detail: 28-13 1097  10-23 28-19 B4 CLOSING NB LNS  1039 DOT FOR SIGN TRUCKS
-01:37:00, CAD Log, Incident #189, Detail: 28-11 1097  CLSNG DWN SB LNS AT CULVER DR OFFR
-01:38:00, CAD Log, Incident #189, Detail: 28-13  28-19 SHUTTING DWN NB 405 LNS AT SAND CYN ST OFFR
-01:40:00, CAD Log, Incident #189, Detail: 28-07 1097 ASSTNG 28-11 CLSNG SB LNS AT CULVER OFFR
-01:41:00, CAD Log, Incident #189, Detail: 28-S4 1097 I5 JEFFREY AVE ASSIST
-01:43:00, CAD Log, Incident #189, Detail: PD STTNG DETOURS  SB TRFFC OFF AT CULVER AVE  NB TRFFC OFF AT SAND CYN
-01:44:00, CAD Log, Incident #189, Detail: NEGOTIATOR 1097
-01:45:00, CAD Log, Incident #189, Detail: NB LNS SHUT DOWN
-01:46:00, CAD Log, Incident #189, Detail: SUSP WON'T ALLOW NEGOTIATOR NEAR HIM
-01:47:00, CAD Log, Incident #189, Detail: 28-07 SB LNS SHUT DOWN
-01:50:00, CAD Log, Incident #189, Detail: SUSP IS CALMING DOWN.  BOMB SQD 1097
-01:53:00, CAD Log, Incident #190, Detail: 9-22 ENRT FROM 57 @ CHAPMAN
-01:58:00, CAD Log, Incident #190, Detail: 9-22 1097 2 VEH TC  VEH VS TANKER TRK  BLKNG #3 4UNID LIQUID LEAKING FROM TNKR  NEED TO CLOSE NB LANES  REQ UNITS
-01:59:00, CAD Log, Incident #190, Detail: 9-23  9-26 ENRT TO ASSIST 9-22
-02:00:00, CAD Log, Incident #190, Detail: 1141  FD 1097  TRCK DRVR 1180 UNCONCIOUS  2 1181S  LIQUID LEAKING INTO #2 LN. #2 3 4 BLKD AT THIS TIME
-02:01:00, CAD Log, Incident #189, Detail: NEGOTIATOR MAKING PROGRESS  SUSP MAY SURRENDER
-02:01:00, CAD Log, Incident #190, Detail: DONT HAVE TO SHUT THE FWY  LIQUID ID'D AS MILK.  #1 LN WILL REMAIN OPEN.ATTEMPTING TO CONTROL THE LEAK. REQ BIG RIG AND ROT 1185
-02:04:00, CAD Log, Incident #190, Detail: 9-23 1097  REQ TMT  TRAFFIC BACKING
-02:06:00, CAD Log, Incident #189, Detail: MAN TRIED TO DETONATE THE DEVICE  BOMB DIDNT ACTIVATE  PD APPRHNDNG
-02:08:00, CAD Log, Incident #189, Detail: SUSP IN CUSTODY  BOMB SQD INSPECTING BOMB
-02:11:00, CAD Log, Incident #190, Detail: PREPARING TO TRANSPORT VICTIMS  #1 LN OPN
-02:13:00, CAD Log, Incident #190, Detail: 9-26 1097 VICTIMS TRANSPORTED
-02:14:00, CAD Log, Incident #189, Detail: CODE A  BOMB DEFUSED  LNS BEING OPENED
-02:15:00, CAD Log, Incident #190, Detail: HOLE IN TANKER PLUGGED  FD WASHING DOWN RDWY
-02:16:00, CAD Log, Incident #189, Detail: SB LNS OPN 28-11 28-07 1098
-02:17:00, CAD Log, Incident #189, Detail: NB LNS OPN 28-13 28-19 1098
-02:17:00, CAD Log, Incident #191, Detail: 911 CELLULAR CALL  RV FIRE SB-73 AT BEAR St  UNVERIFIED
-02:18:00, CAD Log, Incident #189, Detail: 28-24  28-S4 1098 PD OPNNG OVRPASS
-02:19:00, CAD Log, Incident #191, Detail: 17-14 ENRT FROM 405 AT EUCLID
-02:20:00, CAD Log, Incident #190, Detail: 1185 ROT 1097
-02:21:00, CAD Log, Incident #190, Detail: BIG RIG 1185 1097  ONCE FD IS DONE  WILL START CLEANUP
-02:23:00, CAD Log, Incident #190, Detail: FD DONE  OPENING #2  STARTING CLEANUP
-02:24:00, CAD Log, Incident #191, Detail: RV ON FIRE ON RS  2 1181S  PARAMEDICS 1097  REQ UNIT TO ASSIST
-02:25:00, CAD Log, Incident #191, Detail: 17-16 ENRT FROM S-405 @ EUCLID TO ASSIST 17-14
-02:26:00, CAD Log, Incident #191, Detail: FD 1097  CLOSING RT LN  REQ TMT  TRAFFIC ADVISORY
-02:27:00, CAD Log, Incident #190, Detail: #2 LN OPN  FULL CLNUP IN 20
-02:29:00, CAD Log, Incident #191, Detail: 17-14 1097
-02:32:00, CAD Log, Incident #190, Detail: VEH READY TO BE TOWED  TRCK AND TNKR BEING UPRIGHTED
-02:33:00, CAD Log, Incident #191, Detail: VICTIMS TRANSPORTED  PASSERS BY RESCUED VICTIMS
-02:35:00, CAD Log, Incident #191, Detail: FIRE IS OUT  FD INVESTIGATING CAUSE OF FIRE
-02:37:00, CAD Log, Incident #190, Detail: VEH TOWED  TNKR UPRGHT  FULL OPENING IN 10
-02:39:00, CAD Log, Incident #191, Detail: REQ FLAT BED 1185  FD 98 IN 15
-02:41:00, CAD Log, Incident #191, Detail: 1039 1185 ENRT  ETA 10
-02:42:00, CAD Log, Incident #190, Detail: TANKER READY FOR TOW  FINISHING CLEANUP
-02:46:00, CAD Log, Incident #190, Detail: TANKER TOWED  RDWY CLR  OPENING LANES
-02:48:00, CAD Log, Incident #191, Detail: 1185 1097  INVESTIGATION NEARLY COMPLETE
-02:49:00, CAD Log, Incident #190, Detail: LNS OPN  9-22  9-23  9-26 10-98
-02:51:00, CAD Log, Incident #191, Detail: FD INVESTIGATION COMPLETE  SPRAYING RS  FIRE CAUSED BY KITCHEN FIRE
-02:54:00, CAD Log, Incident #191, Detail: RV READY FOR 1185  LN OPN IN 10
-02:58:00, CAD Log, Incident #191, Detail: RV TOWED  LANES OPEN IN 5
-03:01:00, CAD Log, Incident #191, Detail: 17-14  17-16 1098. LN OPN
+00:05:00, CAD Log, Incident #181, Detail: 1144 IN HAY TRK  2 1181S  REQ CORONERREQ DOT TO REMOVE HAY SPILLED IN SB LANES
+00:07:00, CAD Log, Incident #181, Detail: 14-7 REQ 1185 BIG RIG AND 2 ROT 1185
+00:09:00, CAD Log, Incident #181, Detail: 10-39 COLLEGE OAK FOR BIG RIG AND CYCLE FOR ROT
+00:11:00, CAD Log, Incident #181, Detail: 14-21 1097 PROV 1184 TRF BACKING QUICKLY
+00:12:00, CAD Log, Incident #181, Detail: VEH KNOCKED HAY BALES ONTO VON KARMAN AVENUE ADV CITY
+00:15:00, CAD Log, Incident #181, Detail: 1181 TRANSPORTED REQ ETA FOR CORONERETA FOR CORONER 10
+00:18:00, CAD Log, Incident #181, Detail: 14-13 1185 1097  #3 LN WILL OPEN 5-10
+00:20:00, CAD Log, Incident #181, Detail: DOT 1097 TO REMOVE BALES
+00:23:00, CAD Log, Incident #181, Detail: CORONER 1097
+00:24:00, Evaluation, FACILITATOR, 'anything will do'
+00:24:00, Evaluation, FACILITATOR, 'snoopy says go'
+00:24:00, Evaluation, FACILITATOR, 'we all scream for ice cream'
+00:24:00, Evaluation, RADIO, 'Forgot  pizza toppings'
+00:24:00, Evaluation, RADIO, 'Had trouble finding phone number'
+00:24:00, Evaluation, RADIO, Poor
+00:25:00, CAD Log, Incident #181, Detail: #3 LN CLEARED OPENING NOW
+00:25:00, Evaluation, ACTIVITY_LOG, 'User prefers mushrooms over peppers'
+00:25:00, Evaluation, FACILITATOR, 'When out at night, where white'
+00:28:00, CAD Log, Incident #181, Detail: CORONER CONFIRMED 1144  VEHS READY FOR TOW  HAY NEARLY CLEARED  ALL LANES OPEN IN 15
+00:30:00, CAD Log, Incident #181, Detail: WTNSSES  JOHN/BETTY JONES SAW HAY TRUCK LOSE CONTROL  FLIP OVER  2 VEH HIT
+00:32:00, CAD Log, Incident #181, Detail: HAY TRK READY FOR TOW  2 VEHS TOWED  DOT CLEARED HAY BALES  LANES OPEN IN 10
+00:35:00, Evaluation, ACTIVITY_LOG, 'every good boy does fine'
+00:36:00, CAD Log, Incident #181, Detail: LANES OPEN IN 5
+00:36:00, Evaluation, FACILITATOR, 'Prefer chocolate ice cream in the cone'
+00:36:00, Evaluation, FACILITATOR, 'Put cones on heads'
+00:41:00, CAD Log, Incident #181, Detail: 14-13 14-7 14-21 1098  TRK TOWED  ALL LNS CLR
+01:38:00, Evaluation, CMS, Worst
+01:43:00, Evaluation, ACTIVITY_LOG, Best
+01:43:00, Evaluation, ACTIVITY_LOG, Worst
+01:44:00, Evaluation, ACTIVITY_LOG, Good
+01:46:00, Evaluation, ACTIVITY_LOG, Average
+01:53:00, Evaluation, ATMS, Good
+01:53:00, Evaluation, CAD, Best
+01:53:00, Evaluation, CAD, Poor
+0:24:41 LCS new closure: Sue TraineeT133AA.1, 133EB, Lane, Special Event
+0:24:41 LCS new closure: Sue Trainee, T1AC.1, 1SB, Full, AC Paving
+0:24:41 LCS new closure: User, T5AD.1, 5NB, Lane, Drainage Inspection
+0:24:41 LCS status update: Sue Trainee, T73AA, 1097, Marjie 
+0:24:41 LCS status update: T1AB, 1022, JeNnY 
+0:24:41 LCS status update: T22AA, 1022, Joel 
+0:24:41 LCS status update: T22AB, 1022, april may 
+0:24:41 LCS status update: T22AB, 1098, APRIL MAY 
+09:03 LCS status update: T22AA, 1098, JOEL 
+09:31:46 LCS status update: T1AB, 1097, Jenny 
+09:36:26 LCS status update: T1AB, 1098, JENNY 
