refactoring and add descriptive string arg to print_dict

src/main.rs

@@ -38,6 +38,11 @@ enum LogFormat {
     OpenStack,
 }
 
+fn view_double_and_triple_dicts(double_dict:&HashMap<String, i32>, triple_dict:&HashMap<String, i32>) {
+    packages::parser::print_dict("double", double_dict);
+    packages::parser::print_dict("triple", triple_dict);
+}
+
 fn main() {
     let args = Args::parse();
 
@@ -57,8 +62,13 @@ fn main() {
         None => panic!("no log format specified"),
     };
 
-    packages::parser::print_dict(&double_dict);
-    packages::parser::print_dict(&triple_dict);
+    view_double_and_triple_dicts(&double_dict, &triple_dict);
+
+    let (format_string_re, censored_regexps) = match log_format {
+        Some(Linux) => (packages::parser::regex_generator(packages::parser::linux_format()), packages::parser::linux_censored_regexps()),
+        Some(OpenStack) => (packages::parser::regex_generator(packages::parser::openstack_format()), packages::parser::openstack_censored_regexps()),
+        None => panic!("no log format specified"),
+    };
 
     const CUTOFF : i32 = 72;
     // let's say that the cutoff is 72 for Linux2k.log.
@@ -78,13 +88,8 @@ fn main() {
             }
         }
     }
-    packages::parser::print_dict(&two_grams);
+    packages::parser::print_dict("inverted", &two_grams);
 
-    let (format_string_re, censored_regexps) = match log_format {
-        Some(Linux) => (packages::parser::regex_generator(packages::parser::linux_format()), packages::parser::linux_censored_regexps()),
-        Some(OpenStack) => (packages::parser::regex_generator(packages::parser::openstack_format()), packages::parser::openstack_censored_regexps()),
-        None => panic!("no log format specified"),
-    };
     //let sample_string = "Jun 23 23:30:05 combo sshd(pam_unix)[26190]: authentication failure; logname= uid=0 euid=0 tty=NODEVssh ruser= rhost=218.22.3.51  user=root authentication".to_string();
     let sample_string_tokens = packages::parser::token_splitter(args.to_parse, 
                                                                 &format_string_re,

src/packages/parser.rs

@@ -284,10 +284,10 @@ pub fn reverse_dict(d: &HashMap<String, i32>) -> (BTreeSet<i32>, HashMap<i32, Ve
     return (val_set, reverse_d);
 }
 
-pub fn print_dict(d: &HashMap<String, i32>) {
+pub fn print_dict(s: &str, d: &HashMap<String, i32>) {
     let (val_set, reverse_d) = reverse_dict(d);
 
-    println!("printing dict");
+    println!("printing dict: {}", s);
     for val in &val_set {
         println!("{}: {:?}", val, reverse_d.get(val).unwrap());
     }