simplify code by combining similar (debug) functions

git-svn-id: http://svn.cactuscode.org/flesh/trunk@4569 17b73243-c579-4c4c-a9d2-2d5706c11dac

1 files changed, 8 insertions, 7 deletions

diff --git a/lib/sbin/CST b/lib/sbin/CST
index 08021f5c..8aa35b7d 100644
--- a/lib/sbin/CST
+++ b/lib/sbin/CST
@@ -6,7 +6,7 @@
 #  @desc
 #             Parses the the configuration files for thorns.
 #  @enddesc
-#  @version   $Header: /mnt/data2/cvs2svn/cvs-repositories/Cactus/lib/sbin/CST,v 1.78 2009-09-11 14:36:10 knarf Exp $
+#  @version   $Header: /mnt/data2/cvs2svn/cvs-repositories/Cactus/lib/sbin/CST,v 1.79 2009-09-11 16:07:35 knarf Exp $
 #@@*/
 
 # Global parameter to track the number of errors from the CST
@@ -88,7 +88,8 @@ print "Parsing configuration files...\n";
 $configuration_database = &CreateConfigurationDatabase($config_dir, %thorns);
 
 #$debug_configuration = 1;
-&print_configuration_database($configuration_database) if($debug_configuration);
+&print_database("configuration", $configuration_database) if($debug_configuration);
+&save_database("configuration", $configuration_database) if($debug_configuration);
 
 # Restrict the rest of this to thorns with source
 
@@ -99,8 +100,8 @@ print "Parsing interface files...\n";
 %interface_database = &create_interface_database(scalar(keys %system_database), %system_database, %source_thorns);
 
 #$debug_interface = 1;
-&print_interface_database(%interface_database) if($debug_interface);
-&save_interface_database(%interface_database) if ($debug_interface);
+&print_database("interface", %interface_database) if($debug_interface);
+&save_database("interface", %interface_database) if ($debug_interface);
 
 # Parse the parameter.ccl files
 print "Parsing parameter files...\n";
@@ -123,13 +124,13 @@ print "Checking consistency...\n";
 $err_msg = &CheckCrossConsistency(\%interface_database,\%parameter_database);
 
 #$debug_interface = 1;
-&print_interface_database(%interface_database) if($debug_interface);
+&print_database("interface", %interface_database) if($debug_interface);
 
 #$debug_parameters=1;
-&print_parameter_database(%parameter_database ) if($debug_parameters);
+&print_database("parameter", %parameter_database ) if($debug_parameters);
 
 #$debug_schedule = 1;
-&print_schedule_database(%schedule_database) if($debug_schedule);
+&print_database("schedule", %schedule_database) if($debug_schedule);
 
 # Create all the bindings
 print "Creating Thorn-Flesh bindings...\n";