ppf/new: Add/update top level scripts according to top.py methods.

Top level scripts, to be run using the python interpreter, are
enhance_swarm_description.py, parse_swarm.py and parse_session.py.

diff --git a/ppf/new/enhance_swarm_description.py b/ppf/new/enhance_swarm_description.py
new file mode 100644 (file)
index 0000000..e3f62ac
--- /dev/null
+++ b/ppf/new/enhance_swarm_description.py
@@ -0,0 +1,33 @@
+"""
+Enhance swarm description file.
+
+Add swarm and session information to database. Add session id to each
+session entry in the swarm description file based on database entries.
+
+2011, Razvan Deaconescu, razvan.deaconescu@cs.pub.ro
+"""
+
+import sys
+
+import config
+import storage
+import top
+
+# TODO: Define default values for swarm description and access config files.
+
+def main():
+    """Sample usage:
+    python enhance_swarm_description.py -s /path/to/swarm-description-file -a /path/to/access-config-file
+    """
+    # Arguments are swarm description file and access config file.
+    # TODO: Parse arguments.
+    swarm_description = config.SwarmDescription.load(swarm_description_file)
+    access_config = config.AccessConfig.load(access_config_file)
+    swarm_writer = get_swarm_writer(access_config)
+
+    # Enhance swarm description with session id. Store enhanced file.
+    top.enhance_swarm_description(swarm_description, swarm_writer)
+    swarm_description.store(swarm_description_file)
+
+if __name__ == "__main__":
+    sys.exit(main())

diff --git a/ppf/new/parse_session.py b/ppf/new/parse_session.py
index 7d003fc..96b539b 100644 (file)
--- a/ppf/new/parse_session.py
+++ b/ppf/new/parse_session.py
@@ -4,17 +4,28 @@ Parse session compressed file.
 2011, Razvan Deaconescu, razvan.deaconescu@cs.pub.ro
 """
 
+import sys
+
+import config
+import storage
+import top
+
 # TODO: Define default values for session and access config files.
 
 def main():
+    """Sample usage:
+    python parse_session.py -s /path/to/swarm-description-file -a /path/to/access-config-file session-id
     """
-    Sample usage:
-    python parse_session.py -s /path/to/session-config-file -a /path/to/access-config-file /path/to/session-compressed-log-file
-    """
 
-    # TODO: Parse arguments and pass them to parse_store_session_archive().
-    parse_store_session_archive("/path/to/session-compressed-log-file",
-            "/path/to/session-config-file", "/path/to/access-config-file");
+    # Arguments are swarm description file, access config file and section id.
+    # TODO: Parse arguments.
+    swarm_description = config.SwarmDescription.load(swarm_description_file)
+    session_entry = swarm_description.get_session_entry(section_id)
+
+    access_config = config.AccessConfig.load(access_config_file)
+    swarm_writer = get_swarm_writer(access_config)
+
+    top.parse_session(session_entry, swarm_writer)
 
 if __name__ == "__main__":
     sys.exit(main())

diff --git a/ppf/new/parse_swarm.py b/ppf/new/parse_swarm.py
index 78b4423..e51c805 100644 (file)
--- a/ppf/new/parse_swarm.py
+++ b/ppf/new/parse_swarm.py
@@ -1,19 +1,36 @@
 """
-Parse swarm set of compressed file.
+Parse a complete swarm set of compressed file.
+
+Use information provied by the swarm description file. Storage is handled
+through the help of the access configuration file.
 
 2011, Razvan Deaconescu, razvan.deaconescu@cs.pub.ro
 """
 
+import sys
+
+import config
+import storage
+import top
+
 # TODO: Define default values for swarm and access config files.
 
 def main():
+    """Sample usage:
+    python parse_swarm.py -s /path/to/swarm-description-file -a /path/to/access-config-file
     """
-    Sample usage:
-    python parse_swarm.py -s /path/to/swarm-config-file -a /path/to/access-config-file
-    """
+    # Arguments are swarm description file and access config file.
+    # TODO: Parse arguments.
+    swarm_description = config.SwarmDescription.load(swarm_description_file)
+    access_config = config.AccessConfig.load(access_config_file)
+    swarm_writer = get_swarm_writer(access_config)
+
+    # Enhance swarm description with session id. Store enhanced file.
+    top.enhance_swarm_description(swarm_description, swarm_writer)
+    swarm_description.store(swarm_description_file)
 
-    # TODO: Parse arguments and pass them to parse_swarm
-    parse_swarm("/path/to/swarm-config-file", "/path/to/access-config-file");
+    # Do actual parsing.
+    top.parse_swarm(swarm_description, swarm_writer)
 
 if __name__ == "__main__":
     sys.exit(main())