Report not avail, files size of database if RDBSM.

diff --git a/htdocs/cgi-bin/stats.cgi b/htdocs/cgi-bin/stats.cgi
index 5ea154ebb610e5d2751843f03a74dd2f34edb763..7718bb95e0926ceeed5c2b90847d4ae59ec54838 100755 (executable)
--- a/htdocs/cgi-bin/stats.cgi
+++ b/htdocs/cgi-bin/stats.cgi
@@ -50,11 +50,6 @@ Settings::dbFile($sss->param('database'));
     Settings::getConfiguration($db);
     Settings::getTheme();
 ###
-
-my @stat = stat Settings::dbFile();
-Settings::getConfiguration($db);
-Settings::getTheme();
-
 my $today = DateTime->now;
 $today->set_time_zone(&Settings::timezone);
 
@@ -141,7 +136,9 @@ my $hardware_status = "<b>Host: </b>$hst<br>".join("\t", map { defined ? $_ : ''
 
 my $prc = 'ps -eo size,pid,user,command --sort -size | awk \'{ hr=$1/1024 ; printf("%13.2f Mb ",hr) } { for ( x=4 ; x<=NF ; x++ ) { printf("%s ",$x) } print "" }\'';
 my $processes = `$prc | sort -u -r -`;
-my $dbSize = (uc format_bytes($stat[7], bs => 1000));
+my @stat = stat Settings::dbFile();
+my $dbSize =  "Not Avail";
+   $dbSize = (uc format_bytes($stat[7], bs => 1000)) if !Settings::isProgressDB();
 #Strip kernel 0 processes reported
 $processes =~ s/\s*0.00.*//gd;
 #trim reduce prefixed spacing
@@ -152,14 +149,14 @@ my $IPPublic  = `curl -s https://www.ifconfig.me`;
 my $IPPrivate = `hostname -I`; $IPPrivate =~ s/\s/<br>/g;
 
 my $tbl = qq(<table class="tbl" border="1px"><tr class="r0"><td colspan="5" style="text-align:centered"><b>* Personal Log Data Statistics *</b></td></tr>
-          <tr class="r1"><td>LifeLog App. Version:</td><td>).&Settings::release.qq(</td></tr>
+          <tr class="r1"><td>LifeLog App. Version:</td><td>).Settings::release().qq(</td></tr>
              <tr class="r0"><td>Number of Records:</td><td>$log_rc</td></tr>
           <tr class="r1"><td>No. of Records This Year:</td><td>$log_this_year_rc</td></tr>
           <tr class="r0"><td>No. of RTF Documents:</td><td>$notes_rc</td></tr>
           <tr class="r1"><td># Sum of Expenses For Year $year</td><td>$expense</td></tr>
           <tr class="r0"><td># Sum of Income For Year $year</td><td>$income</td></tr>
           <tr class="r1"><td>Gross For Year $year</td><td>$gross</td></tr>
-          <tr class="r0"><td>$Settings::DBFILE</td><td>$dbSize</td></tr>
+          <tr class="r0"><td>$dbname<td>$dbSize</td></tr>
           <tr class="r1"><td>Public IP</td><td>$IPPublic</td></tr>
           <tr class="r0"><td>Private IP</td><td>$IPPrivate</td></tr>
 </table>);

diff --git a/htdocs/cgi-bin/system/modules/Settings.pm b/htdocs/cgi-bin/system/modules/Settings.pm
index 9ecae9dd1cfb32f2a7e14c472a5af071b2b89a5b..6b33eeb45968f6f3dfefb41488863073b7a02dc4 100644 (file)
--- a/htdocs/cgi-bin/system/modules/Settings.pm
+++ b/htdocs/cgi-bin/system/modules/Settings.pm
@@ -39,7 +39,7 @@ our $COMPRESS_ENC = 0; #HTTP Compressed encoding.
 our $DBI_SOURCE   = "DBI:SQLite:";
 our $DSN;
 our $DBFILE;
-our $IS_PG_DB=0;
+our $IS_PG_DB     = 0;
 
 
 #Annons here, variables that could be overiden in  code or database, per need.
@@ -153,7 +153,7 @@ sub selLogIDCount {
 }
 
 sub selStartOfYear {
-    if($IS_PG_DB){return "date>= date_trunc('year', now());"}
+    if($IS_PG_DB){return "date>= date_trunc('year', now())"}
     return "date>=date('now','start of year')"
 }