From e7e0cc77306fd3be18f56b00e02489db7ba23eb7 Mon Sep 17 00:00:00 2001 From: Will Budic Date: Wed, 15 Jan 2025 17:52:40 +1100 Subject: [PATCH] Release 3.3.2 --- system/modules/CNFDateTime.pm | 13 +- system/modules/CNFJSON.pm | 7 +- system/modules/CNFMeta.pm | 18 ++- system/modules/CNFNode.pm | 15 ++- system/modules/CNFParser.2.2.pm | 2 +- system/modules/CNFParser.2.4.pm | 2 +- system/modules/CNFParser.pm | 113 ++++++++++-------- system/modules/CNFSQL.pm | 7 +- system/modules/CNFtoJSON.pm | 15 ++- system/modules/ClassicAppSettings.pm | 4 +- system/modules/DataProcessorPlugin.pm | 4 +- .../modules/DataProcessorWorldCitiesPlugin.pm | 4 +- system/modules/DatabaseCentralPlugin.pm | 10 +- system/modules/HTMLIndexProcessorPlugin.pm | 7 +- system/modules/HTMLProcessorPlugin.pm | 4 +- system/modules/MarkdownPlugin.pm | 2 +- system/modules/RSSFeedsPlugin.pm | 4 +- system/modules/Settings.pm | 15 ++- system/modules/TestManagerOld.pm | 2 +- tests/testInclude.pl | 1 + tests/testTree.pl | 2 - vscode_local_extensions/extensions.json | 2 +- 22 files changed, 154 insertions(+), 99 deletions(-) diff --git a/system/modules/CNFDateTime.pm b/system/modules/CNFDateTime.pm index e8cc8fc..a0ed26f 100644 --- a/system/modules/CNFDateTime.pm +++ b/system/modules/CNFDateTime.pm @@ -20,8 +20,8 @@ use constant{ DEFAULT_TIME_ZONE => 'UTC' }; -# CNFDateTime instances begin with now, can be epoch zero that is $NULL, or _toCNFDateParsed(), they are never new. -# epoch attibute if not been given will be setting it to now or current time and date. +# CNFDateTime instances begin with now, can be epoch zero that is $NULL, or _toCNFDate() parsed, they are never new. +# epoch attribute if not been given will be setting it to now or current time and date. # TZ attribute if not given will use DEFAULT_TIME_ZONE. Avoid to pass only fat arrow type arguments. # my $now = CNFDateTime->now(TZ=>$my_zoneh); # <- wrong translates to array of arguments and $my_zone might be undef. # my $now = CNFDateTime->now({TZ=>$my_zone}); # <- proper way set with a hash even if $my_zone might be undef. @@ -72,7 +72,7 @@ sub toSchlong($self){ return $self->{long} if exists $self->{long}; $self->{long} = $self->datetime() -> strftime(FORMAT_SCHLONG) } -## Force the daylights out of this instance during initialisation, usefull for debugging. +## Force the daylights out of this instance during initialization, useful for debugging. sub stamp($self){ $self -> {timestamp} = $self->datetime() -> strftime(FORMAT_NANO); return $self; @@ -91,12 +91,13 @@ sub _listAvailableTZ($country){ 1; =begin copyright -Programed by : Will Budic +Programed by : Will Budić EContactHash : 990MWWLWM8C2MI8K (https://github.com/wbudic/EContactHash.md) -Source : https://github.com/wbudic/PerlCNF.git +Source : git clone git://lifelog.hopto.org/PerlCNF + : https://github.com/wbudic/PerlCNF.git Documentation : Specifications_For_CNF_ReadMe.md This source file is copied and usually placed in a local directory, outside of its repository project. - So it could not be the actual or current version, can vary or has been modiefied for what ever purpose in another project. + So it could not be the actual or current version, can vary or has been modified for what ever purpose in another project. Please leave source of origin in this file for future references. Open Source Code License -> https://github.com/wbudic/PerlCNF/blob/master/ISC_License.md =cut copyright diff --git a/system/modules/CNFJSON.pm b/system/modules/CNFJSON.pm index 51e944e..72b0f24 100644 --- a/system/modules/CNFJSON.pm +++ b/system/modules/CNFJSON.pm @@ -133,12 +133,13 @@ sub jsonToCNFNode { 1; =begin copyright -Programed by : Will Budic +Programed by : Will Budić EContactHash : 990MWWLWM8C2MI8K (https://github.com/wbudic/EContactHash.md) -Source : https://github.com/wbudic/PerlCNF.git +Source : git clone git://lifelog.hopto.org/PerlCNF + : https://github.com/wbudic/PerlCNF.git Documentation : Specifications_For_CNF_ReadMe.md This source file is copied and usually placed in a local directory, outside of its repository project. - So it could not be the actual or current version, can vary or has been modiefied for what ever purpose in another project. + So it could not be the actual or current version, can vary or has been modified for what ever purpose in another project. Please leave source of origin in this file for future references. Open Source Code License -> https://github.com/wbudic/PerlCNF/blob/master/ISC_License.md =cut copyright \ No newline at end of file diff --git a/system/modules/CNFMeta.pm b/system/modules/CNFMeta.pm index fb5722a..16496b2 100644 --- a/system/modules/CNFMeta.pm +++ b/system/modules/CNFMeta.pm @@ -1,7 +1,7 @@ # Meta flags that can be set for some CNF instructions. -# Programed by : Will Budic +# Programed by : Will Budić # Notice - This source file is copied and usually placed in a local directory, outside of its project. -# So it could not be the actual or current version, can vary or has been modiefied for what ever purpose in another project. +# So it could not be the actual or current version, can vary or has been modified for what ever purpose in another project. # Please leave source of origin in this file for future references. # Source of Origin : https://github.com/wbudic/PerlCNF.git # Documentation : Specifications_For_CNF_ReadMe.md @@ -247,4 +247,16 @@ sub _zero_prefix ($times, $val) { } } -1; \ No newline at end of file +1; + +=begin copyright +Programed by : Will Budić +EContactHash : 990MWWLWM8C2MI8K (https://github.com/wbudic/EContactHash.md) +Source : git clone git://lifelog.hopto.org/PerlCNF + : https://github.com/wbudic/PerlCNF.git +Documentation : Specifications_For_CNF_ReadMe.md + This source file is copied and usually placed in a local directory, outside of its repository project. + So it could not be the actual or current version, can vary or has been modified for what ever purpose in another project. + Please leave source of origin in this file for future references. +Open Source Code License -> https://github.com/wbudic/PerlCNF/blob/master/ISC_License.md +=cut copyright \ No newline at end of file diff --git a/system/modules/CNFNode.pm b/system/modules/CNFNode.pm index fa1f821..be86980 100644 --- a/system/modules/CNFNode.pm +++ b/system/modules/CNFNode.pm @@ -288,7 +288,7 @@ sub find { $ret = $ret -> {$name} } } - return !$ret?\@arr:$ret; + return !$ret?\@arr: ref($ret) eq 'SCALAR' ? $$ret : $ret; } ## # Convinence method to find lastChild or all chidren by a certain name. @@ -556,10 +556,12 @@ sub process { if(@attr>1){ my $n = $attr[0]; my $v = $attr[1]; - if($v =~ /[<\[]\*[<\[](.*)[]>\]]\*[>\]]/){ + if($v =~ m/[<\[]\*[<\[](.*)[]>\]]\*[>\]]/){ $v = $self-> obtainLink($parser, $1) - } $v =~ m/^(['"]).*(['"])$/g; + }else{ + $v =~ m/^(['"]).*(['"])$/g; $v =~ s/^$1|$2$//g if($1 && $2 && $1 eq $2); + } $self->{$n} = $v; next; }else{ @@ -898,12 +900,13 @@ sub toScript { 1; =begin copyright -Programed by : Will Budic +Programed by : Will Budić EContactHash : 990MWWLWM8C2MI8K (https://github.com/wbudic/EContactHash.md) -Source : https://github.com/wbudic/PerlCNF.git +Source : git clone git://lifelog.hopto.org/PerlCNF + : https://github.com/wbudic/PerlCNF.git Documentation : Specifications_For_CNF_ReadMe.md This source file is copied and usually placed in a local directory, outside of its repository project. - So it could not be the actual or current version, can vary or has been modiefied for what ever purpose in another project. + So it could not be the actual or current version, can vary or has been modified for what ever purpose in another project. Please leave source of origin in this file for future references. Open Source Code License -> https://github.com/wbudic/PerlCNF/blob/master/ISC_License.md =cut copyright \ No newline at end of file diff --git a/system/modules/CNFParser.2.2.pm b/system/modules/CNFParser.2.2.pm index a4516e2..1a4c28f 100644 --- a/system/modules/CNFParser.2.2.pm +++ b/system/modules/CNFParser.2.2.pm @@ -1,6 +1,6 @@ #!/usr/bin/perl -w # -# Programed by: Will Budic +# Programed by: Will Budić # Open Source License -> https://choosealicense.com/licenses/isc/ # package CNFParser; diff --git a/system/modules/CNFParser.2.4.pm b/system/modules/CNFParser.2.4.pm index 2e95fa2..651c8c0 100644 --- a/system/modules/CNFParser.2.4.pm +++ b/system/modules/CNFParser.2.4.pm @@ -1,6 +1,6 @@ #!/usr/bin/perl -w # -# Programed by: Will Budic +# Programed by: Will Budić # Open Source License -> https://choosealicense.com/licenses/isc/ # package CNFParser; diff --git a/system/modules/CNFParser.pm b/system/modules/CNFParser.pm index 48f23d5..af5bcd7 100644 --- a/system/modules/CNFParser.pm +++ b/system/modules/CNFParser.pm @@ -15,12 +15,12 @@ require CNFNode; require CNFDateTime; # Do not remove the following no critic, no security or object issues possible. -# We can use perls default behaviour on return. +# We can use perls default behavior on return. ##no critic qw(Subroutines::RequireFinalReturn) ##no critic Perl::Critic::Policy::ControlStructures::ProhibitMutatingListFunctions -use constant VERSION => '3.3.1'; -use constant APPSET => 'APP_SETTINGS'; +use constant VERSION => '3.3.2'; +use constant APP_STS => 'APP_SETTINGS'; our @files; our %lists; our %properties; @@ -57,7 +57,7 @@ our $CONSTREQ = 0; ### # Create a new CNFParser instance. -# $path - Path to some .cnf_file file, to parse, not compsuluory to add now? Make undef. +# $path - Path to some .cnf_file file, to parse, not compulsory to add now? Make undef. # $attrs - is reference to hash of constances and settings to dynamically employ. # $del_keys - is a reference to an array of constance attributes to dynamically remove. sub new { my ($class, $path, $attrs, $del_keys, $self) = @_; @@ -69,8 +69,8 @@ sub new { my ($class, $path, $attrs, $del_keys, $self) = @_; ANONS_ARE_PUBLIC=> 1, # Anon's are shared and global for all of instances of this object, by default. ENABLE_WARNINGS => 1, # Disable this one, and you will stare into the void, about errors or operations skipped. STRICT => 1, # Enable/Disable strict processing to FATAL on errors, this throws and halts parsing on errors. - HAS_EXTENSIONS => 0, # Enable/Disable extension of custom instructions. These is disabled by default and ingored. - DEBUG => 0, # Not internally used by the parser, but possible a convienince bypass setting for code using it. + HAS_EXTENSIONS => 0, # Enable/Disable extension of custom instructions. These is disabled by default and ignored. + DEBUG => 0, # Not internally used by the parser, but possible a convenience bypass setting for code using it. CNF_CONTENT => "", # Origin of the script, this will be set by the parser, usually the path of a script file or is direct content. RUN_PROCESSORS => 1, # When enabled post parse processors are run, are these outside of the scope of the parsers executions. }; @@ -151,7 +151,7 @@ __JSON } ### # Check a value if it is CNFPerl boolean true. -# For isFalse just negate check with not, as undef is concidered false or 0. +# For isFalse just negate check with not, as undef is considered false or 0. ## sub _isTrue{ my $value = shift; @@ -311,7 +311,7 @@ sub const { my ($self,$c)=@_; # Collections are global, Reason for this is that any number of subsequent files parsed, # might contain properties that overwrite previous existing ones. # Or require ones that don't include, and expecting them to be there. -# This overwritting can be erronous, but also is not expected to be very common to happen. +# This overwriting can be erroneous, but also is not expected to be very common to happen. # Following method, provides direct access to the properties, this method shouldn't be used in general. sub collections {\%properties} @@ -320,7 +320,7 @@ sub collection { return property(@_); } ### -# Collection now returns the contained type dereferenced and is concidered a property. +# Collection now returns the contained type dereferenced and is considered a property. # Make sure you use the appropriate Perl type on the receiving end. # Note, if properties contain any scalar key row, it sure hasn't been set by this parser. # @@ -328,17 +328,21 @@ sub property { my($self, $name) = @_; if(exists($properties{$name})){ my $ret = $properties{$name}; my $ref = ref($ret); - if($ref eq 'ARRAY'){ + if($ref eq 'REF'){ + #This should ideally return and dereferenced to an reference. + return $$ret + }elsif($ref eq 'ARRAY'){ return @{$ret} }elsif($ref eq 'PropertyValueStyle'){ - return ${$ret->{plugin}} if $ret->{instructor} eq APPSET; - return $ret; - } - else{ + return ${$ret->{plugin}} if $ret->{instructor} eq APP_STS; + return $ret + }elsif($ref eq 'SCALAR'){ + return $ret + }else{ return %{$ret} } } - return %properties{$name} + return } sub data {return shift->{'__DATA__'}} @@ -574,8 +578,8 @@ sub doInstruction { my ($self,$e,$t,$v) = @_; elsif($t eq 'MACRO'){ $instructs{$e}=$v; } - elsif($t eq APPSET){ - $self->instructPlugin(InstructedDataItem -> new($e, APPSET, $v)); + elsif($t eq APP_STS){ + $self->instructPlugin(InstructedDataItem -> new($e, APP_STS, $v)); } elsif(exists $instructors{$t}){ if(not $instructors{$t}->instruct($e, $v) && $self->{STRICT}){ @@ -768,11 +772,11 @@ sub parse { my ($self, $cnf_file, $content, $del_keys) = @_; $self->{CNF_CONTENT} = 'script' } } - $content =~ m/^\!(CNF(\d+\.\d+))/; - my $CNF_VER = $1; + $content =~ m/^\!(CNF\s*(\d+\.\d+))/; + my $CNF_VER = $1; my $CNF_VER_SRC = $2; if (not $CNF_VER){ $CNF_VER="Undefined!" - }elsif(VERSION()<$2){ + }elsif(VERSION =~ m/^(\d+\.\d+)/ && $CNF_VER_SRC > $1){ $self->warn("CNF Script version is newer, are you using the latest parser version $CNF_VER?"); } $self->{CNF_VERSION} = $CNF_VER; @@ -818,13 +822,17 @@ sub parse { my ($self, $cnf_file, $content, $del_keys) = @_; } }else{ $v =~ s/\s*>$//; + if(!$t){ + $v =~ m/([\w ]*)\s+(.*)/gms; + $t = $1; + $v = $2; + } $ANONS->{$t} = $v; } }else{ - #vars are e-element,t-token or instruction,v- for value, vv -array of the lot. + # Vars are e-element,t-token or instruction,v- for value, vv -array of the lot. my ($e,$t,$v,@vv); - # Check if very old format and don't parse the data for old code compatibility to (still) do it. # This is interesting, as a newer format file is expected to use the DATA instruction and final data specified script rules. if($CNF_VER eq 'CNF2.2' && $tag =~ m/(\w+)\s*(<\d+>\s)\s*(.*\n)/mg){#It is old DATA format annon @@ -853,9 +861,9 @@ sub parse { my ($self, $cnf_file, $content, $del_keys) = @_; $tag =~ m/\s*([@%\$\.\/\w]+)\s* # The name. ([ <>\n]) # begin or close of instruction, where '\n' mark in script as instruction less. ([^<^>^^\n]+) # instruction or value of anything - ([<>\n]?) # close mark for instuction or is less if \n encountered before. + ([<>\n]?) # close mark for instruction or is less if \n encountered before. (.*) # actual value is the rest. - (>$)* # capture above value up to here from buffer, i.e. if comming from a >>> tag. + (>$)* # capture above value up to here from buffer, i.e. if coming from a >>> tag. /gmxs; ############################################################################### $e =$1; @@ -949,7 +957,7 @@ sub parse { my ($self, $cnf_file, $content, $del_keys) = @_; $value =~ s/\Q$find\E/$r/g; } } - $hsh{$name}=$value; $self->log("macro $t.$name->$value\n") if $self->{DEBUG} + $hsh{$name}=$value; $self->log("macro $t.$name->$value") if $self->{DEBUG} } } $properties{$t}=\%hsh; @@ -1228,7 +1236,7 @@ sub runPostParseProcessors { # ### -# Setup and pass to pluging CNF functionality. +# Setup and pass to plugin CNF functionality. # @TODO Currently Under development. ### sub doPlugin { @@ -1238,8 +1246,8 @@ sub doPlugin { my $pck = $plugin->{package}; my $prp = $plugin->{property}; my $sub = $plugin->{subroutine}; - if($instructor eq APPSET){ - $pck = 'ClassicAppSettings' if ! $pck; + if($instructor eq APP_STS){ + $pck = 'ClassicAPP_STStings' if ! $pck; ## no critic (RequireBarewordIncludes) require "$pck.pm"; my $obj = $pck -> new($plugin); @@ -1339,7 +1347,7 @@ sub writeOut { my ($self, $handle, $property) = @_; } $buffer .= ' 'x$spc. $key . " = $val\n"; } - $buffer .= ">>"; + $buffer .= ">>>"; return $buffer if !$handle; print $handle $buffer; return 1 @@ -1409,31 +1417,34 @@ sub log { $message = "$type $message" if $isWarning; if($message =~ /^ERROR/ || ($isWarning && $self->{ENABLE_WARNINGS})){ + $message =~ s/(\s+line\s)(\d+)\.*\s+/:$2\n/gm; warn $time . " " .$message; } elsif(%log && $log{console}){ print $time . " " .$message ."\n" } if(%log && _isTrue($log{enabled}) && $message){ + my $dir = $log{directory}; $dir = '.' if not $dir; $dir .= '/' if $dir !~ /\/$/; my $logfile = $log{file}; my $tail_cnt = $log{tail}; if($logfile){ - open (my $fh, ">>", $logfile) or die $!; - print $fh $time . " - " . $message ."\n"; - close $fh; - if($tail_cnt>0 && !$LOG_TRIM_SUB){ - $fh = File::ReadBackwards->new($logfile) or die $!; - if($fh->{lines}>$tail_cnt){ - $LOG_TRIM_SUB = sub { - my $fh = File::ReadBackwards->new($logfile) or die $!; - my @buffer; $buffer[@buffer] = $fh->readline() for (1..$tail_cnt); - open (my $fhTemp, ">", "/tmp/$logfile") or die $!; - print $fhTemp $_ foreach (reverse @buffer); - close $fhTemp; - move("/tmp/$logfile",$logfile) - } - } + mkdir $dir if not ( -e $dir and -d $dir); + open (my $fh, ">>", $dir.$logfile) or die $!; + print $fh $time . " - " . $message ."\n"; + close $fh; + if($tail_cnt>0 && !$LOG_TRIM_SUB){ + $fh = File::ReadBackwards->new($dir.$logfile) or die $!; + if($fh->{lines}>$tail_cnt){ + $LOG_TRIM_SUB = sub { + my $fh = File::ReadBackwards->new($dir.$logfile) or die $!; + my @buffer; $buffer[@buffer] = $fh->readline() for (1..$tail_cnt); + open (my $fhTemp, ">", "/tmp/$logfile") or die $!; + foreach my $line(reverse @buffer){print $fhTemp $line if $line} + close $fhTemp; + move("/tmp/$logfile",$dir.$logfile) } + } + } } } return $time . " " .$message; @@ -1511,8 +1522,9 @@ sub getTree { return; } ## -# Conviently ribs an cnf file for an pl source file to be next too in marriage. -# @$const - Dynamic instance assaignable hash with constances, optional can be undef. +# Conveniently ribs an cnf file for an pl source file to be next too in marriage. +# Ribs means the config file is same name next to it. +# @$const - Dynamic instance assignable hash with constances, optional can be undef. # @$file - Path to CNF file if missing will be created. # @return a configuration instance per script usually assigned. ## @@ -1539,7 +1551,7 @@ sub _configure{ sub _fetchScriptStat{ my $cnf_file = shift; my @stat = stat($cnf_file); - open(my $fh, "<:perlio", $cnf_file ) or die "Can't open $cnf_file -> $!"; close $fh; + #open(my $fh, "<:perlio", $cnf_file ) or die "Can't open $cnf_file -> $!"; close $fh; return \@stat; } @@ -1553,12 +1565,13 @@ undef %instructors; } 1; =begin copyright -Programed by : Will Budic +Programed by : Will Budić EContactHash : 990MWWLWM8C2MI8K (https://github.com/wbudic/EContactHash.md) -Source : https://github.com/wbudic/PerlCNF.git +Source : git clone git://lifelog.hopto.org/PerlCNF + : https://github.com/wbudic/PerlCNF.git Documentation : Specifications_For_CNF_ReadMe.md This source file is copied and usually placed in a local directory, outside of its repository project. - So it could not be the actual or current version, can vary or has been modiefied for what ever purpose in another project. + So it could not be the actual or current version, can vary or has been modified for what ever purpose in another project. Please leave source of origin in this file for future references. Open Source Code License -> https://github.com/wbudic/PerlCNF/blob/master/ISC_License.md =cut copyright diff --git a/system/modules/CNFSQL.pm b/system/modules/CNFSQL.pm index 9d96cd5..7ee49f8 100644 --- a/system/modules/CNFSQL.pm +++ b/system/modules/CNFSQL.pm @@ -516,12 +516,13 @@ undef %tables_creat_stmts;undef %views; 1; =begin copyright -Programed by : Will Budic +Programed by : Will Budić EContactHash : 990MWWLWM8C2MI8K (https://github.com/wbudic/EContactHash.md) -Source : https://github.com/wbudic/PerlCNF.git +Source : git clone git://lifelog.hopto.org/PerlCNF + : https://github.com/wbudic/PerlCNF.git Documentation : Specifications_For_CNF_ReadMe.md This source file is copied and usually placed in a local directory, outside of its repository project. - So it could not be the actual or current version, can vary or has been modiefied for what ever purpose in another project. + So it could not be the actual or current version, can vary or has been modified for what ever purpose in another project. Please leave source of origin in this file for future references. Open Source Code License -> https://github.com/wbudic/PerlCNF/blob/master/ISC_License.md =cut copyright \ No newline at end of file diff --git a/system/modules/CNFtoJSON.pm b/system/modules/CNFtoJSON.pm index c9f5e86..b8a2776 100644 --- a/system/modules/CNFtoJSON.pm +++ b/system/modules/CNFtoJSON.pm @@ -1,5 +1,5 @@ # SQL Processing part for the Configuration Network File Format. -# Programed by : Will Budic +# Programed by : Will Budić # Source Origin : https://github.com/wbudic/PerlCNF.git # Open Source License -> https://choosealicense.com/licenses/isc/ # @@ -99,4 +99,15 @@ sub _translateNL { } -1; \ No newline at end of file +1; +=begin copyright +Programed by : Will Budić +EContactHash : 990MWWLWM8C2MI8K (https://github.com/wbudic/EContactHash.md) +Source : git clone git://lifelog.hopto.org/PerlCNF + : https://github.com/wbudic/PerlCNF.git +Documentation : Specifications_For_CNF_ReadMe.md + This source file is copied and usually placed in a local directory, outside of its repository project. + So it could not be the actual or current version, can vary or has been modified for what ever purpose in another project. + Please leave source of origin in this file for future references. +Open Source Code License -> https://github.com/wbudic/PerlCNF/blob/master/ISC_License.md +=cut copyright \ No newline at end of file diff --git a/system/modules/ClassicAppSettings.pm b/system/modules/ClassicAppSettings.pm index d42822c..ff21a13 100644 --- a/system/modules/ClassicAppSettings.pm +++ b/system/modules/ClassicAppSettings.pm @@ -130,12 +130,12 @@ sub sync_with($this, %store){ 1; =begin copyright -Programed by : Will Budic +Programed by : Will Budić EContactHash : 990MWWLWM8C2MI8K (https://github.com/wbudic/EContactHash.md) Source : https://github.com/wbudic/PerlCNF.git Documentation : Specifications_For_CNF_ReadMe.md This source file is copied and usually placed in a local directory, outside of its repository project. - So it could not be the actual or current version, can vary or has been modiefied for what ever purpose in another project. + So it could not be the actual or current version, can vary or has been modified for what ever purpose in another project. Please leave source of origin in this file for future references. Open Source Code License -> https://github.com/wbudic/PerlCNF/blob/master/ISC_License.md =cut copyright \ No newline at end of file diff --git a/system/modules/DataProcessorPlugin.pm b/system/modules/DataProcessorPlugin.pm index ac6a67a..d7ed32e 100644 --- a/system/modules/DataProcessorPlugin.pm +++ b/system/modules/DataProcessorPlugin.pm @@ -210,12 +210,12 @@ sub processOLD ($self, $parser, $property) { 1; =begin copyright -Programed by : Will Budic +Programed by : Will Budić EContactHash : 990MWWLWM8C2MI8K (https://github.com/wbudic/EContactHash.md) Source : https://github.com/wbudic/PerlCNF.git Documentation : Specifications_For_CNF_ReadMe.md This source file is copied and usually placed in a local directory, outside of its repository project. - So it could not be the actual or current version, can vary or has been modiefied for what ever purpose in another project. + So it could not be the actual or current version, can vary or has been modified for what ever purpose in another project. Please leave source of origin in this file for future references. Open Source Code License -> https://github.com/wbudic/PerlCNF/blob/master/ISC_License.md =cut copyright \ No newline at end of file diff --git a/system/modules/DataProcessorWorldCitiesPlugin.pm b/system/modules/DataProcessorWorldCitiesPlugin.pm index d644b57..a6c3caf 100644 --- a/system/modules/DataProcessorWorldCitiesPlugin.pm +++ b/system/modules/DataProcessorWorldCitiesPlugin.pm @@ -88,12 +88,12 @@ sub loadAndProcess ($self, $parser, $property) { 1; =begin copyright -Programed by : Will Budic +Programed by : Will Budić EContactHash : 990MWWLWM8C2MI8K (https://github.com/wbudic/EContactHash.md) Source : https://github.com/wbudic/PerlCNF.git Documentation : Specifications_For_CNF_ReadMe.md This source file is copied and usually placed in a local directory, outside of its repository project. - So it could not be the actual or current version, can vary or has been modiefied for what ever purpose in another project. + So it could not be the actual or current version, can vary or has been modified for what ever purpose in another project. Please leave source of origin in this file for future references. Open Source Code License -> https://github.com/wbudic/PerlCNF/blob/master/ISC_License.md =cut copyright \ No newline at end of file diff --git a/system/modules/DatabaseCentralPlugin.pm b/system/modules/DatabaseCentralPlugin.pm index 9da079f..c117d77 100644 --- a/system/modules/DatabaseCentralPlugin.pm +++ b/system/modules/DatabaseCentralPlugin.pm @@ -21,6 +21,7 @@ use Date::Manip; use Scalar::Util qw(looks_like_number); require CNFDateTime; +require CNFMeta; use constant VERSION => '1.1'; my ($isSQLite,$dsn)=(0,()); @@ -218,7 +219,7 @@ if($ref eq 'CNFNode'){ my $idT = CNFMeta::_deRefArray($header[$MHDR{ID_TYPE}]); ### - # Following is rare to see in code, my (wbudic) forward override conditional mapping algorithm, + # Following is rare to see in code, my (wBudić) forward override conditional mapping algorithm, # as actual data @row length could be larger to the relative column map, of what we are inserting. # I know, it looks like a unlocking a magick riddle. It indexes based on the insert statment. # @@ -731,12 +732,13 @@ sub getConfigFiles($self, $parser, $property){ 1; =begin copyright -Programed by : Will Budic +Programed by : Will Budić EContactHash : 990MWWLWM8C2MI8K (https://github.com/wbudic/EContactHash.md) -Source : https://github.com/wbudic/PerlCNF.git +Source : git clone git://lifelog.hopto.org/PerlCNF + : https://github.com/wbudic/PerlCNF.git Documentation : Specifications_For_CNF_ReadMe.md This source file is copied and usually placed in a local directory, outside of its repository project. - So it could not be the actual or current version, can vary or has been modiefied for what ever purpose in another project. + So it could not be the actual or current version, can vary or has been modified for what ever purpose in another project. Please leave source of origin in this file for future references. Open Source Code License -> https://github.com/wbudic/PerlCNF/blob/master/ISC_License.md =cut copyright \ No newline at end of file diff --git a/system/modules/HTMLIndexProcessorPlugin.pm b/system/modules/HTMLIndexProcessorPlugin.pm index afce2c1..9b3ea76 100644 --- a/system/modules/HTMLIndexProcessorPlugin.pm +++ b/system/modules/HTMLIndexProcessorPlugin.pm @@ -263,12 +263,13 @@ sub isParagraphName { 1; =begin copyright -Programed by : Will Budic +Programed by : Will Budić EContactHash : 990MWWLWM8C2MI8K (https://github.com/wbudic/EContactHash.md) -Source : https://github.com/wbudic/PerlCNF.git +Source : git clone git://lifelog.hopto.org/PerlCNF + : https://github.com/wbudic/PerlCNF.git Documentation : Specifications_For_CNF_ReadMe.md This source file is copied and usually placed in a local directory, outside of its repository project. - So it could not be the actual or current version, can vary or has been modiefied for what ever purpose in another project. + So it could not be the actual or current version, can vary or has been modified for what ever purpose in another project. Please leave source of origin in this file for future references. Open Source Code License -> https://github.com/wbudic/PerlCNF/blob/master/ISC_License.md =cut copyright \ No newline at end of file diff --git a/system/modules/HTMLProcessorPlugin.pm b/system/modules/HTMLProcessorPlugin.pm index 2977a31..96168f7 100644 --- a/system/modules/HTMLProcessorPlugin.pm +++ b/system/modules/HTMLProcessorPlugin.pm @@ -199,12 +199,12 @@ sub isParagraphName { 1; =begin copyright -Programed by : Will Budic +Programed by : Will Budić EContactHash : 990MWWLWM8C2MI8K (https://github.com/wbudic/EContactHash.md) Source : https://github.com/wbudic/PerlCNF.git Documentation : Specifications_For_CNF_ReadMe.md This source file is copied and usually placed in a local directory, outside of its repository project. - So it could not be the actual or current version, can vary or has been modiefied for what ever purpose in another project. + So it could not be the actual or current version, can vary or has been modified for what ever purpose in another project. Please leave source of origin in this file for future references. Open Source Code License -> https://github.com/wbudic/PerlCNF/blob/master/ISC_License.md =cut copyright \ No newline at end of file diff --git a/system/modules/MarkdownPlugin.pm b/system/modules/MarkdownPlugin.pm index 39484d9..bd8dfff 100644 --- a/system/modules/MarkdownPlugin.pm +++ b/system/modules/MarkdownPlugin.pm @@ -809,7 +809,7 @@ div .cnf { 1; =begin copyright -Programed by : Will Budic +Programed by : Will Budić EContactHash : 990MWWLWM8C2MI8K (https://github.com/wbudic/EContactHash.md) Open Source Code License -> https://github.com/wbudic/PerlCNF/blob/master/ISC_License.md diff --git a/system/modules/RSSFeedsPlugin.pm b/system/modules/RSSFeedsPlugin.pm index 4684954..ceee7b7 100644 --- a/system/modules/RSSFeedsPlugin.pm +++ b/system/modules/RSSFeedsPlugin.pm @@ -397,12 +397,12 @@ my $buffer = capture_stdout { =cut scrap =begin copyright -Programed by : Will Budic +Programed by : Will Budić EContactHash : 990MWWLWM8C2MI8K (https://github.com/wbudic/EContactHash.md) Source : https://github.com/wbudic/PerlCNF.git Documentation : Specifications_For_CNF_ReadMe.md This source file is copied and usually placed in a local directory, outside of its repository project. - So it could not be the actual or current version, can vary or has been modiefied for what ever purpose in another project. + So it could not be the actual or current version, can vary or has been modified for what ever purpose in another project. Please leave source of origin in this file for future references. Open Source Code License -> https://github.com/wbudic/PerlCNF/blob/master/ISC_License.md =cut copyright \ No newline at end of file diff --git a/system/modules/Settings.pm b/system/modules/Settings.pm index c4c59b6..7cfb1db 100644 --- a/system/modules/Settings.pm +++ b/system/modules/Settings.pm @@ -2,7 +2,7 @@ # # Web interaction, reusable tri state of configuration concerns, set of utilities. # -# Programed by: Will Budic +# Programed by: Will Budić # Open Source License -> https://choosealicense.com/licenses/isc/ # package Settings; @@ -939,4 +939,15 @@ sqlPubors {$SQL_PUB} /; } -1; \ No newline at end of file +1; +=begin copyright +Programed by : Will Budić +EContactHash : 990MWWLWM8C2MI8K (https://github.com/wbudic/EContactHash.md) +Source : git clone git://lifelog.hopto.org/PerlCNF + : https://github.com/wbudic/PerlCNF.git +Documentation : Specifications_For_CNF_ReadMe.md + This source file is copied and usually placed in a local directory, outside of its repository project. + So it could not be the actual or current version, can vary or has been modified for what ever purpose in another project. + Please leave source of origin in this file for future references. +Open Source Code License -> https://github.com/wbudic/PerlCNF/blob/master/ISC_License.md +=cut copyright \ No newline at end of file diff --git a/system/modules/TestManagerOld.pm b/system/modules/TestManagerOld.pm index 6f825a2..8c4393a 100644 --- a/system/modules/TestManagerOld.pm +++ b/system/modules/TestManagerOld.pm @@ -3,7 +3,7 @@ # Test Manager to make test case source code more readable and organised. # This is initial version, not supporting fall through and multiple test files and cases. # -# Programed by: Will Budic +# Programed by: Will Budić # Open Source License -> https://choosealicense.com/licenses/isc/ # package TestManager; diff --git a/tests/testInclude.pl b/tests/testInclude.pl index d5ab9ba..b888a86 100644 --- a/tests/testInclude.pl +++ b/tests/testInclude.pl @@ -11,6 +11,7 @@ require CNFParser; my $test = TestManager -> new($0); my $cnf; + try{ ### # Test instance creation. diff --git a/tests/testTree.pl b/tests/testTree.pl index 4beab75..a4fcaed 100644 --- a/tests/testTree.pl +++ b/tests/testTree.pl @@ -230,8 +230,6 @@ $test->evaluate("\$TEST/test",$nada,'me too'); $test->isDefined('node/@@/p1/b', $val); $test->evaluate('node/@@/p1/b', $val, '2' ); - - # $test->done(); # diff --git a/vscode_local_extensions/extensions.json b/vscode_local_extensions/extensions.json index de52e06..78945e6 100644 --- a/vscode_local_extensions/extensions.json +++ b/vscode_local_extensions/extensions.json @@ -1 +1 @@ -[{"identifier":{"id":"wbudic.perlcnf"},"version":"0.0.2","location":{"$mid":1,"path":"/home/will/dev/PerlCNF/vscode_local_extensions/wbudic.perlcnf-0.0.2","scheme":"file"},"relativeLocation":"wbudic.perlcnf-0.0.2"},{"identifier":{"id":"richterger.perl","uuid":"effbf376-b9ad-4395-9b0e-8cf0537fbf04"},"version":"2.6.1","location":{"$mid":1,"fsPath":"/home/will/dev/PerlCNF/vscode_local_extensions/richterger.perl-2.6.1","path":"/home/will/dev/PerlCNF/vscode_local_extensions/richterger.perl-2.6.1","scheme":"file"},"relativeLocation":"richterger.perl-2.6.1","metadata":{"id":"effbf376-b9ad-4395-9b0e-8cf0537fbf04","publisherId":"f5ad92f6-de6c-4381-a399-f8a7201ceb52","publisherDisplayName":"Gerald Richter","targetPlatform":"undefined","isApplicationScoped":false,"updated":true,"isPreReleaseVersion":false,"installedTimestamp":1690363217626,"preRelease":false}}] \ No newline at end of file +[{"identifier":{"id":"wbudic.perlcnf"},"version":"0.0.2","location":{"$mid":1,"path":"/home/will/dev_new/PerlCNF/vscode_local_extensions/wbudic.perlcnf-0.0.2","scheme":"file"},"relativeLocation":"wbudic.perlcnf-0.0.2","metadata":{"isApplicationScoped":true}} -- 2.34.1