From: Metabox <redacted>
Date: Sat, 3 Aug 2019 18:19:45 +0000 (+1000)
Subject: Latest dev.  First working, store|load.
X-Git-Url: https://lifelog.hopto.org/gitweb/?a=commitdiff_plain;h=8770de7e63f5b101e02a4a8df81616fd1a6fd61a;p=LifeLog.git

Latest dev.  First working, store|load.
---

diff --git a/htdocs/cgi-bin/json.cgi b/htdocs/cgi-bin/json.cgi
index b33b87b..d4b0c76 100755
--- a/htdocs/cgi-bin/json.cgi
+++ b/htdocs/cgi-bin/json.cgi
@@ -52,13 +52,22 @@ my $action   = $cgi->param('action');
 my $lid      = $cgi->param('id');
 my $doc      = $cgi->param('doc');
 my $error    = "";
+my ($response, $json) = 'Session Expired';
+
+my $lang  = Date::Language->new($LANGUAGE);
+my $today = DateTime->now;
+$today->set_time_zone($TIME_ZONE);
 
 if ($AUTHORITY) {
     $userid = $password = $AUTHORITY;
     $dbname = 'data_' . $userid . '_log.db';
 }
-elsif ( !$userid || !$dbname ) {
-   print $cgi->redirect("login_ctr.cgi?CGISESSID=$sid");
+elsif ( !$userid || !$dbname ) {   
+
+    &defaultJSON;
+    print $cgi->header( -expires => "+0s", -charset => "UTF-8" );
+    print $json;
+
    exit;
 }
 
@@ -70,10 +79,6 @@ my $db = DBI->connect( $dsn, $userid, $password, { RaiseError => 1 } );
 #&authenticate;
 
 
-my $lang  = Date::Language->new($LANGUAGE);
-my $today = DateTime->now;
-$today->set_time_zone($TIME_ZONE);
-
 my $strp = DateTime::Format::Strptime->new(
     pattern   => '%F %T',
     locale    => 'en_AU',
@@ -81,7 +86,6 @@ my $strp = DateTime::Format::Strptime->new(
     on_error  => 'croak',
 );
 
-my ($response, $json) = 'Feature Under Development!';
 
 ###############
 &processSubmit;
@@ -97,7 +101,7 @@ else{
 print $cgi->header( -expires => "+0s", -charset => "UTF-8" );
 print $json;
 
-#$db->disconnect();
+$db->disconnect();
 undef($session);
 exit;
 
@@ -140,7 +144,13 @@ sub processSubmit {
         elsif($action eq 'load'){
            $st = $db->prepare("SELECT DOC FROM NOTES WHERE LID = '$lid';"); 
            $st -> execute();
-           $doc = ($st->fetchrow_array())[0];
+           my @arr = $st->fetchrow_array();
+           if(!@arr){
+               $st = $db->prepare("SELECT DOC FROM NOTES WHERE LID = '0';"); 
+               $st -> execute();
+               @arr = $st->fetchrow_array();
+           }
+           $doc = $arr[0];
            $response = uncompress($doc);
         }
         else{