From 0fb6a497105f0c6d4f2a9d80a559a4c9b262f598 Mon Sep 17 00:00:00 2001 From: Metabox Date: Sun, 21 Jul 2019 07:31:28 +1000 Subject: [PATCH] < tag addopted. --- htdocs/cgi-bin/config.cgi | 3 ++ htdocs/cgi-bin/main.cgi | 64 ++++++++++++++++++++++-------------- htdocs/cgi-bin/wsrc/main.css | 3 +- htdocs/cgi-bin/wsrc/main.js | 12 ++----- 4 files changed, 48 insertions(+), 34 deletions(-) diff --git a/htdocs/cgi-bin/config.cgi b/htdocs/cgi-bin/config.cgi index 5b77584..3db4f28 100755 --- a/htdocs/cgi-bin/config.cgi +++ b/htdocs/cgi-bin/config.cgi @@ -363,6 +363,9 @@ my $prc_hdr = $PRC_WIDTH-2; <<TITLE<{Title Text}>

+ <<LIST<{List of items delimited by new line to terminate item or with '~' otherwise.}> +

+

<<IMG<{url to image}>

diff --git a/htdocs/cgi-bin/main.cgi b/htdocs/cgi-bin/main.cgi index efbd4a3..f4dcf16 100755 --- a/htdocs/cgi-bin/main.cgi +++ b/htdocs/cgi-bin/main.cgi @@ -319,7 +319,7 @@ while ( my @row = $st->fetchrow_array() ) { my $ct = $hshCats{ $row[1] }; my $dt = DateTime::Format::SQLite->parse_datetime( $row[2] ); my $log = $row[3]; - my $amm = camm(sprintf "%.2f", $row[4]); + my $am = &cam(sprintf "%.2f", $row[4]); my $rtf = $row[4]; #Apostrophe in the log value is doubled to avoid SQL errors. @@ -331,8 +331,8 @@ while ( my @row = $st->fetchrow_array() ) { if ( !$dt ) { $dt = $today; } - if ( !$amm ) { - $amm = "0.00"; + if ( !$am ) { + $am = "0.00"; } if ( $tbl_rc_prev == 0 ) { $tbl_rc_prev = $id; @@ -420,6 +420,7 @@ while ( my @row = $st->fetchrow_array() ) { } $log = join( '', @chnks ); } + while ( $log =~ /<', $idx ) - 4; @@ -447,10 +448,23 @@ while ( my @row = $st->fetchrow_array() ) { my $len = index( $log, '>', $idx ) - 7; my $lst = substr( $log, $idx + 7, $len - $idx ); my $sub = ""; - my @arr = split(/\n/, $lst); + my @arr = split(/\n|\\n/, $lst); + my $ml = ""; foreach my $ln (@arr) { $ln =~ s/^\s*//g; - $sub .= "

  • $ln
    • " if length($ln)>0; + if($ln =~ /~$/){ + $ln =~ s/~$/
    /g; + $ml .= $ln.' '; + }else{ + if($ml) { + $ml .= $ln if length($ln)>0; + $sub .= "
  • $ml
    • \n"; + $ml = ""; + } + else{ + $sub .= "
  • $ln
    • " if length($ln)>0; + } + } } $sub = "
      $sub
    "; @@ -463,19 +477,10 @@ while ( my @row = $st->fetchrow_array() ) { $log =~ s/\\n/
    /gs; if ( $CID_EVENT == $row[1] ) { - $log = "$log"; + $log = "$log";$tagged = 1; } elsif ( 1 == $row[1] ) { - $log ="$log"; - } - - my ( $dty, $dtf ) = $dt->ymd; - my $dth = $dt->hms; - if ( $DATE_UNI == 1 ) { - $dtf = $dty; - } - else { - $dtf = $lang->time2str( "%d %b %Y", $dt->epoch, $TIME_ZONE); + $log ="$log";$tagged = 1; } #Tagged preserve originally stored entry in hidden numbered field. @@ -483,17 +488,28 @@ while ( my @row = $st->fetchrow_array() ) { $log_orig =~ s//>/g; $log_orig =~ s/\n/ /g; + $log_orig =~ s/\\n/ /g; $log_orig =~ s/\t/ /g; $log_orig =~ s/\"/"/g; $log_orig =~ s/\'/'/g; $tags .= qq(\n); } + my ( $dty, $dtf ) = $dt->ymd; + my $dth = $dt->hms; + if ( $DATE_UNI == 1 ) { + $dtf = $dty; + } + else { + $dtf = $lang->time2str( "%d %b %Y", $dt->epoch, $TIME_ZONE); + } + + $tbl .= qq( $dtf $dth $log - $amm + $am $ct @@ -722,7 +738,7 @@ sub processSubmit { my $log = $cgi->param('log'); my $cat = $cgi->param('ec') ; #Used to be cat v.1.3, tag id and name should be kept same. - my $amm = $cgi->param('am'); + my $am = $cgi->param('am'); my $edit_mode = $cgi->param('submit_is_edit'); my $view_mode = $cgi->param('submit_is_view'); @@ -747,7 +763,7 @@ sub processSubmit { LOG='" . $log . "', AMMOUNT='" - . $amm + . $am . "' WHERE rowid=" . $edit_mode . ";"; my $st = $db->prepare($stm); @@ -794,7 +810,7 @@ sub processSubmit { } $st = $db->prepare('INSERT INTO LOG VALUES (?,?,?,?,?)'); - $st->execute( $cat, $date, $log, $amm, $rtf ); + $st->execute( $cat, $date, $log, $am, $rtf ); # # After Insert renumeration check # @@ -1008,11 +1024,11 @@ sub getConfiguration { } } -sub camm { - my $amm = sprintf("%.2f", shift @_); +sub cam { + my $am = sprintf("%.2f", shift @_); # Add one comma each time through the do-nothing loop - 1 while $amm =~ s/^(-?\d+)(\d\d\d)/$1,$2/; -return $amm; + 1 while $am =~ s/^(-?\d+)(\d\d\d)/$1,$2/; +return $am; } sub quill { diff --git a/htdocs/cgi-bin/wsrc/main.css b/htdocs/cgi-bin/wsrc/main.css index b20cbe2..c07d03b 100644 --- a/htdocs/cgi-bin/wsrc/main.css +++ b/htdocs/cgi-bin/wsrc/main.css @@ -201,7 +201,8 @@ img { } #editor-container { - height: 480px; + height: 140px; + max-height: 480px; border-top: 1px solid gray; border-right: 1px solid gray; background-color: #e6ffff; diff --git a/htdocs/cgi-bin/wsrc/main.js b/htdocs/cgi-bin/wsrc/main.js index 6ce971b..5b1bd16 100644 --- a/htdocs/cgi-bin/wsrc/main.js +++ b/htdocs/cgi-bin/wsrc/main.js @@ -237,7 +237,7 @@ function fix0(v) { } -function decodeHTML(txt) { +function decodeToHTMLText(txt) { txt = txt.replace("/</g", "<"); txt = txt.replace("/>/g", ">"); @@ -251,13 +251,7 @@ function decodeHTML(txt) { return txt; } -function decodeToText(log) { - - if (log.children.length > 0) { - log = log.children(0); - } - - var txt = log.html(); +function decodeToText(txt) { txt = txt.replace(//gi, "\n"); return txt; } @@ -271,7 +265,7 @@ function edit(row) { var log = $("#v" + row); //log $("html, body").animate({ scrollTop: 0 }, "slow"); if (tag.length) { - $("#el").val(decodeHTML(tag.val())); + $("#el").val(decodeToHTMLText(tag.val())); } else { $("#el").val(decodeToText(log)); -- 2.34.1