From: Michael Wiebusch <m.wiebusch@gsi.de>
Date: Thu, 15 Jan 2015 17:48:02 +0000 (+0100)
Subject: reeeeally tidied up the whole require shit
X-Git-Url: https://jspc29.x-matter.uni-frankfurt.de/git/?a=commitdiff_plain;h=bf95294e8602410d58903101f561fe121d827dc8;p=coral.git

reeeeally tidied up the whole require shit
---

diff --git a/user_interface/coral_scanner.pm b/user_interface/coral_scanner.pm
index 904c6d2..5cf8c72 100644
--- a/user_interface/coral_scanner.pm
+++ b/user_interface/coral_scanner.pm
@@ -12,14 +12,14 @@ use SVG;
 
 use CGI ':standard';
 
-require settings_subs;
+use settings_subs;
 # our @ISA = qw/has_settings/; # assimilate the methods of the has_settings class
 
 
-#use pmt_ro;
-#use table_control;
+use pmt_ro;
+use table_control;
 
-require misc_subs;
+use misc_subs;
 
 ## methods
 
@@ -53,8 +53,8 @@ sub new {
   };
   bless($self, $class);
   
-  #$self->{pmt_ro} = pmt_ro->new();
-  #$self->{pmt_control} = table_control->new();
+  $self->{pmt_ro} = pmt_ro->new();
+  $self->{pmt_control} = table_control->new();
   
   return $self;
 }
@@ -89,7 +89,7 @@ sub main_html {
   
   print "<p id='show_pmt_ro_settings' class='quasibutton' >pmt_ro settings</p>";
   print "<div id='pmt_ro_settings_container' class='stylishBox hidden_by_default'>";
-  $self->settings_form();
+  $self->{pmt_ro}->settings_form();
   print "</div>";
   
   
diff --git a/user_interface/misc_subs.pm b/user_interface/misc_subs.pm
index faee1a2..18c951d 100644
--- a/user_interface/misc_subs.pm
+++ b/user_interface/misc_subs.pm
@@ -1,5 +1,18 @@
+package misc_subs;
 
 
+BEGIN {
+  require Exporter;
+  # set the version for version checking
+  our $VERSION = 1.00;
+  # Inherit from Exporter to export functions and variables
+  our @ISA = qw(Exporter);
+  # Functions and variables which are exported by default
+  our @EXPORT = qw(printHeader min max echo require_run test);
+  # Functions and variables which can be optionally exported
+  #our @EXPORT_OK = qw($Var1 %Hashit func3);
+}
+
 sub test {
   my $self = shift;
   my %options = @_;
diff --git a/user_interface/pmt_ro.pm b/user_interface/pmt_ro.pm
index 73a4858..653d4ef 100644
--- a/user_interface/pmt_ro.pm
+++ b/user_interface/pmt_ro.pm
@@ -9,8 +9,8 @@ use POSIX;
 use FileHandle;
 use regio;
 
-require settings_subs;
-require misc_subs;
+use settings_subs;
+use misc_subs;
 
 ## methods
 
diff --git a/user_interface/settings_subs.pm b/user_interface/settings_subs.pm
index 0660130..8763611 100644
--- a/user_interface/settings_subs.pm
+++ b/user_interface/settings_subs.pm
@@ -1,8 +1,21 @@
-
+package settings_subs;
 use Storable qw(lock_store lock_retrieve);
-require misc_subs;
+use misc_subs;
+
 
 
+BEGIN {
+  require Exporter;
+  # set the version for version checking
+  our $VERSION = 1.00;
+  # Inherit from Exporter to export functions and variables
+  our @ISA = qw(Exporter);
+  # Functions and variables which are exported by default
+  our @EXPORT = qw(load_settings save_settings reset_settings settings_form);
+  # Functions and variables which can be optionally exported
+  #our @EXPORT_OK = qw($Var1 %Hashit func3);
+}
+
 
 sub load_settings {
   my $self=shift;
diff --git a/user_interface/table_control.pm b/user_interface/table_control.pm
index c81be48..6bbae0d 100644
--- a/user_interface/table_control.pm
+++ b/user_interface/table_control.pm
@@ -14,8 +14,8 @@ use CGI;
 
 # use has_settings;
 # our @ISA = qw/has_settings/; # assimilate the methods of the has_settings class
-require settings_subs;
-require misc_subs;
+use settings_subs;
+use misc_subs;
 
 
 ## methods