modified paths for log-parser scripts

diff --git a/README b/README
index e005d9c..ae4c44f 100644 (file)
--- a/README
+++ b/README
@@ -29,7 +29,7 @@ Contributions from:
 autorun/
        - scripts and Python programs for automatic deploy and run
          of BitTorrent clients
-       - check autorun/README
+       - see autorun/README
 
 ppf/
        - scripts, Python programs and SQL files for parsing, storing
@@ -43,7 +43,7 @@ instrumentation/
        - updates/modifications are usually geared towards enabling
          verbose message output (BitTorrent protocol information) from
          original client
-       - see instrumentation/README
+       - see instrumentation/*/README
 
 old/
        - old scripts and programs from related work

diff --git a/ppf/README b/ppf/README
index ab7d1de..6f085dc 100644 (file)
--- a/ppf/README
+++ b/ppf/README
@@ -18,17 +18,18 @@ log-parser/ - parsers for Tribler and Libtorrent logs
         - StatusParser.py      - parses status messages
         - run_sample           - starts StatusParser for a given status log and 
                                  database file
-        - run_sample_verbose   - starts LogParser for a given verbose log and 
+        - run_sample_verbose- starts LogParser for a given verbose log and 
                                  database file
-        - make_db              - creates an SQLite database file 
+        - make_db                  - creates an SQLite database file 
         - merge_status_msg.sh  - script that merges status messages output by 
                                  Tribler in two different files, into a single file 
                                                                 
     - libtorrent/  
-            - LogParser.py     - parses verbose messages
+            - LogParser.py         - parses verbose messages
             - StatusParser.py  - parses status messages
-            - run_sample       - creates a database file and fills it with test 
-                                 data; starts LogParser and StatusParser
+            - run_sample       - creates a database file and fills it with test 
+                                               data; starts LogParser and StatusParser
+            - README
 
 log-samples/ - verbose and status log samples for Tribler and libtorrent
 

diff --git a/ppf/log-parser/libtorrent/run_sample b/ppf/log-parser/libtorrent/run_sample
index e62c3a2..e0973c9 100755 (executable)
--- a/ppf/log-parser/libtorrent/run_sample
+++ b/ppf/log-parser/libtorrent/run_sample
@@ -7,14 +7,14 @@ rm -f $DB_NAME
 
 # create database
 pushd . &> /dev/null
-cd ../../auto/db && ./db_init ../../log-parser/libtorrent/$DB_NAME
+cd ../../db && ./db_init ../../log-parser/libtorrent/$DB_NAME
 popd &> /dev/null
 
 # fill database with test data
-PYTHONPATH=../../auto/db/ python ../../auto/db/DatabaseAccess.py $DB_NAME
+PYTHONPATH=../../db/ python ../../db/DatabaseAccess.py $DB_NAME
 
 # fill status information
-PYTHONPATH=../../auto/db/ python StatusParser.py -i 1 -f ../../log-samples/libtorrent/libtorrent-status.sample.log $DB_NAME
+PYTHONPATH=../../db/ python StatusParser.py -i 1 -f ../../log-samples/libtorrent/libtorrent-status.sample.log $DB_NAME
 
 # fill logging information
-PYTHONPATH=../../auto/db/ python LogParser.py -i 1 -f ../../log-samples/libtorrent/141.85.224.222_50200.log $DB_NAME
+PYTHONPATH=../../db/ python LogParser.py -i 1 -f ../../log-samples/libtorrent/141.85.224.222_50200.log $DB_NAME

diff --git a/ppf/log-parser/tribler/run_sample b/ppf/log-parser/tribler/run_sample
index 01e9840..785506e 100755 (executable)
--- a/ppf/log-parser/tribler/run_sample
+++ b/ppf/log-parser/tribler/run_sample
@@ -4,7 +4,7 @@ if test $# -lt 2
        then
                echo "Usage: $0 <log_filename> <db_name>"
 else
-       PYTHONPATH=PYTHONPATH:../../auto/db/ python StatusParser.py -i 1 -f $1 $2; 
+       PYTHONPATH=PYTHONPATH:../../db/ python StatusParser.py -i 1 -f $1 $2; 
 fi
 
 

diff --git a/ppf/log-parser/tribler/run_sample_verbose b/ppf/log-parser/tribler/run_sample_verbose
index 199d120..e1174ab 100755 (executable)
--- a/ppf/log-parser/tribler/run_sample_verbose
+++ b/ppf/log-parser/tribler/run_sample_verbose
@@ -4,6 +4,6 @@ if test $# -lt 2
        then
                echo "Usage: $0 <log_filename> <db_name>"
 else
-       PYTHONPATH=PYTHONPATH:../../auto/db/ python LogParser.py -i 1 -f $1 $2; 
+       PYTHONPATH=PYTHONPATH:../../db/ python LogParser.py -i 1 -f $1 $2; 
 fi