Subversion Repositories camp_sysinfo_client_3

Rev

Rev 75 | Rev 85 | Go to most recent revision | Show entire file | Ignore whitespace | Details | Blame | Last modification | View Log | RSS feed

Rev 75 Rev 76
Line 150... Line 150...
150
# and appears to be working correctly.
150
# and appears to be working correctly.
151
 
151
 
152
 
152
 
153
# Following are global variables overridden if configuration file exists
153
# Following are global variables overridden if configuration file exists
154
 
154
 
155
my $TESTING = 0; # level's 0 (none) to 3 defined and increase verbosity while decreasing functionality
155
my $TESTING = 0; # level's 0 (none) to 4 defined and increase verbosity while decreasing functionality
156
our $VERSION = '3.2.1';
156
our $VERSION = '3.2.1';
157
 
157
 
158
my $indentLevel = 2; # number of spaces to indent per level in XML or YAML
158
my $indentLevel = 2; # number of spaces to indent per level in XML or YAML
159
 
159
 
160
$indentLevel = 3 if $TESTING;
160
$indentLevel = 3 if $TESTING;
Line 270... Line 270...
270
            while ( my ( $gkey, $value ) = each %$globals ) { 
270
            while ( my ( $gkey, $value ) = each %$globals ) { 
271
               $key->{$gkey} = $value; 
271
               $key->{$gkey} = $value; 
272
            }
272
            }
273
            # do variable substitution for any values which need it
273
            # do variable substitution for any values which need it
274
            foreach my $thisOne ( keys %{$key} ) {
274
            foreach my $thisOne ( keys %{$key} ) {
275
               print "$thisOne\n" if $TESTING > 3;;
275
               print "$thisOne\n" if $TESTING > 3;
276
               if ( $key->{$thisOne} =~ m/(\$configuration\{'hostname'\})|(\$reportDate)|(\$configuration\{'clientName'\})|(\$configuration\{'serialNumber'\})/ ) {
276
               if ( $key->{$thisOne} =~ m/(\$configuration\{'hostname'\})|(\$reportDate)|(\$configuration\{'clientName'\})|(\$configuration\{'serialNumber'\})/ ) {
277
                  $key->{$thisOne} = eval "\"$key->{$thisOne}\"";
277
                  $key->{$thisOne} = eval "\"$key->{$thisOne}\"";
278
               }
278
               }
279
            }
279
            }
280
            
280
            
Line 516... Line 516...
516
# oops, no client name (required) so tell them and exit
516
# oops, no client name (required) so tell them and exit
517
die "No client name defined in $configurationFile" unless $configuration{'clientName'};
517
die "No client name defined in $configurationFile" unless $configuration{'clientName'};
518
 
518
 
519
$TESTING = $configuration{'TESTING'} if defined $configuration{'TESTING'};
519
$TESTING = $configuration{'TESTING'} if defined $configuration{'TESTING'};
520
 
520
 
-
 
521
print "Testing => $TESTING\n" if $TESTING;
-
 
522
 
-
 
523
 
521
my $System; # hash reference that will store all info we are going to send to the server
524
my $System; # hash reference that will store all info we are going to send to the server
522
# some defaults.
525
# some defaults.
523
$$System{'report'}{'version'} = $DATA_VERSION;
526
$$System{'report'}{'version'} = $DATA_VERSION;
524
$$System{'report'}{'date'} = $reportDate;
527
$$System{'report'}{'date'} = $reportDate;
525
$$System{'report'}{'client'} = $configuration{'clientName'};
528
$$System{'report'}{'client'} = $configuration{'clientName'};