From c628f7d41f4b6cb846e48dc8b7cad294e6ac8d3f Mon Sep 17 00:00:00 2001
From: Michael Wiebusch <m.wiebusch@gsi.de>
Date: Thu, 15 Jan 2015 15:47:54 +0100
Subject: [PATCH] has settings is now a real package, settings methods are
 properly inherited

---
 user_interface/{settings_subs.pm => has_settings.pm} | 8 ++++++--
 user_interface/table_control.pm                      | 4 +++-
 2 files changed, 9 insertions(+), 3 deletions(-)
 rename user_interface/{settings_subs.pm => has_settings.pm} (93%)

diff --git a/user_interface/settings_subs.pm b/user_interface/has_settings.pm
similarity index 93%
rename from user_interface/settings_subs.pm
rename to user_interface/has_settings.pm
index 89f6108..5205402 100644
--- a/user_interface/settings_subs.pm
+++ b/user_interface/has_settings.pm
@@ -1,7 +1,10 @@
+package has_settings;
 
 use Storable qw(lock_store lock_retrieve);
 require misc_subs;
 
+
+
 sub load_settings {
   my $self=shift;
   my $settings_file = $self->{settings_file};
@@ -22,7 +25,8 @@ sub save_settings {
   
   $self->{settings} = { %{$self->{settings}}, %options};
   lock_store($self->{settings},$settings_file);
-  return $self->{settings}
+  print "settings were saved!\n";
+  return $self->{settings};
 }
 
 sub reset_settings {
@@ -61,7 +65,7 @@ span.dropt:hover span {margin: 20px 0 0 170px; background: #ffffff; z-index:6;}
 </style>
 
   
-<form action="'.__PACKAGE__.'.pl" method="get" target="_self">
+<form action="'.ref($self).'.pl" method="get" target="_self">
   <input type="text" name="sub" value="save_settings" class="hidden"><br>
   <table>
   ';
diff --git a/user_interface/table_control.pm b/user_interface/table_control.pm
index 8a151be..58c0a6e 100644
--- a/user_interface/table_control.pm
+++ b/user_interface/table_control.pm
@@ -12,7 +12,9 @@ use SVG;
 
 use CGI;
 
-require settings_subs;
+use has_settings;
+our @ISA = qw/has_settings/; # assimilate the methods of the has_settings class
+
 require misc_subs;
 
 
-- 
2.43.0