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