From 506ab0340c5497fbdb19147879e93930b178435f Mon Sep 17 00:00:00 2001 From: Metabox Date: Fri, 17 May 2019 12:42:54 +1000 Subject: [PATCH] .. --- htdocs/cgi-bin/tempCodeRunnerFile.cgi | 119 +++++++++++++++----------- 1 file changed, 70 insertions(+), 49 deletions(-) diff --git a/htdocs/cgi-bin/tempCodeRunnerFile.cgi b/htdocs/cgi-bin/tempCodeRunnerFile.cgi index e9c0866..2299039 100644 --- a/htdocs/cgi-bin/tempCodeRunnerFile.cgi +++ b/htdocs/cgi-bin/tempCodeRunnerFile.cgi @@ -6,57 +6,77 @@ use strict; use warnings; - my $fh; - my $inData = 0; - open($fh, '<', '/home/will/dev/LifeLog/htdocs/cgi-bin/main.cnf' ) or die "Can't open main.cnf: $!"; - my %vars = {}; - while (my $line = <$fh>) { - chomp $line; - - my @tick = split("`",$line); - - if(scalar(@tick)==2){ - my %hsh = $tick[0] =~ m[(\S+)\s*=\s*(\S+)]g; - if(scalar(%hsh)==1){ - for my $key (keys %hsh) { - my %nash = $key =~ m[(\S+)\s*\|\s*(\S+)]g; - if(scalar(%nash)==1){ - for my $id (keys %nash) { - my $name = $nash{$id}; - my $value = $hsh{$key}; - if($vars{$id}){ - print "4Corrupt Entry -> $line\n"; - } - else{ - $vars{$id}=$name; - print "[$id]->$name:$value -> $tick[1]\n"; - $inData = 1; - } - } - } - else{ - print "3Corrupt Entry -> $line\n"; - } - } - } - else{ - print "2Corrupt Entry -> $line\n"; - } +my $fh; +my $inData = 0; +open( $fh, "<:perlio", '/home/will/dev/LifeLog/htdocs/cgi-bin/main.cnf' ) + or die "Can't open main.cnf: $!"; +read $fh, my $content, -s $fh; +my @lines = split '\n', $content; +my %vars = (); +my $table_type = 0; +foreach my $line (@lines) { + + #chomp $line; + + my @tick = split( "`", $line ); + + if( index( $line, '< $line\n"; + } + else { + $vars{$id} = $name; + print "CNF->[$id]->$name:$value -> $tick[1]\n"; + $inData = 1; + } + } + } + else { + print "3Corrupt Entry -> $line\n"; + } + } + } + else { + if($table_type==0){ + print "2Corrupt Entry -> $line\n"; } - elsif($inData && length($line)>0){ - if(scalar(@tick)==1){ - print "Corrupt Entry, no description supplied -> $line\n"; - } - else{ - print "1Corrupt Entry -> $line\n"; - } + else{ + my @pair = $tick[0] =~ m[(\S+)\s*\|\s*(\S+)]g; + if ( scalar(@pair)==2 ) { + my $id = $pair[0]; + my $name = $pair[1]; + print "CAT-> [$id]->$name [[ $tick[1] ]]\n"; + } + else { + print "3Corrupt Entry -> $line\n"; + } } - - - - + } + } + elsif ( $inData && length($line) > 0 ) { + if ( scalar(@tick) == 1 ) { + print "Corrupt Entry, no description supplied -> $line\n"; + } + else { + print "1Corrupt Entry -> $line\n"; + } } - close $fh; + +} +close $fh; =comment @@ -84,6 +104,7 @@ unless($resp->is_success) { my $log = "Test < reached.<\n"; =cut + =comment if($log =~ /< My name is Cutie! -=cut \ No newline at end of file +=cut -- 2.34.1