Changeset 10218 for trunk/gsdl/perllib/classify/AZCompactList.pm

Timestamp:

2005-07-06T15:27:45+12:00 (19 years ago)

Author:

kjdon

Message:

Jeffrey's new parsing modifications, committed approx 6 July, 15.16

File:

• trunk/gsdl/perllib/classify/AZCompactList.pm (modified) (16 diffs)

trunk/gsdl/perllib/classify/AZCompactList.pm

@@ -62 +62 @@
     'desc' => "{AZCompactList.sort}",
     'type' => "string",
-    'deft' => "Title",
+#   'deft' => "Title",
     'reqd' => "no" },
       { 'name' => "removeprefix",
@@ -121 +121 @@
 
 sub new {
-    my $class = shift (@_);
-    my $self = new BasClas($class, @_);
-
-    # 14-05-02 To allow for proper inheritance of arguments - John Thompson
-    my $option_list = $self->{'option_list'};
-    push( @{$option_list}, $options );
-
-    if ($self->{'info_only'}) {
-    # created from classinfo.pl - don't need to parse the arguments
-    return bless $self, $class;
-    }
-
-    my ($metaname, $title, $removeprefix, $removesuffix);
-    my $sortname = "Title";
-    my $mingroup = 2;
-    my $minnesting = 20;
-    my $mincompact = 10;
-    my $maxcompact = 30;
-    my $doclevel = "top";
-    my $firstvalueonly = 0;
-    my $allvalues = 0;
-    my $freqsort = 0;
-    my $recopt   = undef;
-
-    if (!parsargv::parse(\@_, 
-             q^metadata/.*/^, \$metaname,
-             q^buttonname/.*/^, \$title,
-             q^sort/.*/^, \$sortname,
-             q^removeprefix/.*/^, \$removeprefix,
-             q^removesuffix/.*/^, \$removesuffix,
-             q^mingroup/.*/2^, \$mingroup,
-             q^minnesting/.*/20^, \$minnesting,
-             q^mincompact/.*/10^, \$mincompact,
-             q^maxcompact/.*/30^, \$maxcompact,
-             q^doclevel/.*/top^, \$doclevel,
-             q^firstvalueonly^, \$firstvalueonly,
-             q^allvalues^, \$allvalues,
-             q^freqsort/.*/0^, \$freqsort,
-             q^recopt/.*/-1^, \$recopt,  # Used in nested metadata such as -metadata Year/Organisation
-
-             "allow_extra_options")) {
-    
-    print STDERR "\nIncorrect options passed to $class, check your collect.cfg file\n";
-    $self->print_txt_usage("");  # Use default resource bundle
-    die "\n";
-    }
-
-    if (!defined($metaname)) {
+    my ($class) = shift (@_);
+    my ($pluginlist,$inputargs,$hashArgOptLists) = @_;
+    push(@$pluginlist, $class);
+
+    if(defined $arguments){ push(@{$hashArgOptLists->{"ArgList"}},@{$arguments});}
+    if(defined $options) { push(@{$hashArgOptLists->{"OptList"}},$options)};
+
+    my $self = (defined $hashArgOptLists)? new BasClas($pluginlist,$inputargs,$hashArgOptLists): new BasClas($pluginlist,$inputargs);
+
+    if (!$self->{"metadata"}) {
     my $outhandle = $self->{'outhandle'};
     print $outhandle "AZCompactList Error: required option -metadata not supplied\n";
@@ -175 +137 @@
     }
 
-    $title = $self->generate_title_from_metadata($metaname) unless ($title);
-    #$title = $metaname unless ($title);
-
+    # Manually set $self parameters.
     $self->{'list'} = {};
     $self->{'listmetavalue'} = {};
@@ -183 +143 @@
     $self->{'reclassify'} = {};
     $self->{'reclassifylist'} = {};
-    $self->{'metaname'} = $metaname;
-    $self->{'title'} = "$title";     # title for the titlebar.
-    $self->{'sortname'} = $sortname;
-
-    if (defined($removeprefix) && $removeprefix) {
-    $removeprefix =~ s/^\^//; # don't need a leading ^
-    $self->{'removeprefix'} = $removeprefix;
-    }
-    if (defined($removesuffix) && $removesuffix) {
-    $removesuffix =~ s/\$$//; # don't need a trailing $
-    $self->{'removesuffix'} = $removesuffix;
-    }
-    $self->{'mingroup'} = $mingroup;
-    $self->{'minnesting'} = $minnesting;
-    $self->{'mincompact'} = $mincompact;
-    $self->{'maxcompact'} = $maxcompact;
-    $self->{'doclevel'} = $doclevel;
-
-    if ($firstvalueonly != 0) {
-    $firstvalueonly = 1;
-    }
-    $self->{'firstvalueonly'} = $firstvalueonly;
-  
-    if ($allvalues != 0) {
-    $allvalues = 1;
-    }
-    $self->{'allvalues'} = $allvalues;
-    if ($freqsort != 0) {
-    $freqsort = 1;
-    }
-    $self->{'freqsort'} = $freqsort;
-
-    if ($recopt == -1) {
-    $recopt = undef; 
-    } else {
-    $recopt = "on";
-    }
-    $self->{'recopt'} = $recopt;
+
+    $self->{'buttonname'} = $self->generate_title_from_metadata($self->{'metadata'}) unless ($self->{'buttonname'});
+    
+    if (defined($self->{"removeprefix"}) && $self->{"removeprefix"}) {
+    $self->{"removeprefix"} =~ s/^\^//; # don't need a leading ^
+    }
+    if (defined($self->{"removesuffix"}) && $self->{"removesuffix"}) {
+    $self->{"removesuffix"} =~ s/\$$//; # don't need a trailing $
+    }
+    
+    $self->{'recopt'} = ($self->{'recopt'} == 0) ? undef : "on";
+
+    # Clean out the unused keys
+    if($self->{"removeprefix"} eq "") {delete $self->{"removeprefix"};}
+    if($self->{"removesuffix"} eq "") {delete $self->{"removesuffix"};}
 
     return bless $self, $class;
@@ -247 +184 @@
     my @sectionlist = ();
     my $topsection = $doc_obj->get_top_section();
-    my $metaname = $self->{'metaname'};
+    my $metaname = $self->{'metadata'};
     my $outhandle = $self->{'outhandle'};
 
@@ -317 +254 @@
 
         my $formatted_metavalue =
-          sorttools::format_metadata_for_sorting($self->{'metaname'},
+          sorttools::format_metadata_for_sorting($self->{'metadata'},
                              $metavalue, $doc_obj);
         
@@ -338 +275 @@
 
     # This is used in reclassify below for AZCompactSectionList
-    my $sortmeta = $doc_obj->get_metadata_element($thissection, $self->{'sortname'});
+    my $sortmeta = $doc_obj->get_metadata_element($thissection, $self->{'sort'});
     $self->{'reclassify'}->{$full_doc_OID} = [$doc_obj,$sortmeta];
     }
@@ -413 +350 @@
     my $doclevel = $self->{'doclevel'};
     my $mingroup = $self->{'mingroup'};
-    my @metaname_list = split(/\/|\|/,$self->{'metaname'});
+    my @metaname_list = split(/\/|\|/,$self->{'metadata'});
     my $metaname = shift(@metaname_list);
     my $hierarchical = 0;
@@ -433 +370 @@
         # buttonname is also used for the node's title
         push @args, ("-buttonname", "$metavalue");
-        push @args, ("-sort", $self->{'sortname'});
-
+        push @args, ("-sort", $self->{'sort'});
+
+        my $ptArgs = \@args;
         if ($doclevel =~ m/^top(level)?/i)
         {
-            eval ("\$listclassobj = new List(\@args)"); 
-            warn $@ if $@;
+            eval ("\$listclassobj = new List([],\$ptArgs)"); 
         }
         else
         {
-            eval ("\$listclassobj = new SectionList(\@args)"); 
-            warn $@ if $@;
+            eval ("\$listclassobj = new SectionList([],\$ptArgs)");
         }
         }
@@ -453 +389 @@
         # buttonname is also used for the node's title
         push @args, ("-buttonname", "$metavalue");
-        push @args, ("-sort", $self->{'sortname'});
+        push @args, ("-sort", $self->{'sort'});
 
         if (defined $self->{'removeprefix'}) {
@@ -466 +402 @@
         push @args, "-recopt ";
 
-        eval ("\$listclassobj = new AZCompactList(\@args)");
-        warn $@ if $@;
-        }
+        my $ptArgs = \@args;
+        eval ("\$listclassobj = new AZCompactList([],\$ptArgs)");
+        }
+        
         if ($@) {
         print $outhandle "$@";
@@ -493 +430 @@
         }
 
-        $formatted_node = &sorttools::format_metadata_for_sorting($self->{'metaname'}, $formatted_node); 
+        $formatted_node = &sorttools::format_metadata_for_sorting($self->{'metadata'}, $formatted_node); 
 
         # In case our formatted string is empty...
@@ -671 +608 @@
     my $self = shift (@_);
     my ($title, $childtype, $metaname, $thistype) = @_;
-
     # organise into classification structure
     my %classifyinfo = ('childtype'=>$childtype,
@@ -694 +630 @@
 
     # top level
-    my @metanames = split(/\/|\|/,$self->{'metaname'});
+    my @metanames = split(/\/|\|/,$self->{'metadata'});
     my $metaname = shift(@metanames);
 
@@ -700 +636 @@
     $childtype = "VList" if (scalar (@$classlistref) <= $self->{'minnesting'});
 
+    my $title = $self->{'buttonname'}; # should always be defined by now.
     my $classifyinfo;
     if (!defined($self->{'recopt'}))
     {
-    my $title = $self->{'title'}; # should always be defined by now....
-    $title = $metaname unless defined $title; 
     $classifyinfo 
         = $self->get_entry ($title, $childtype, $metaname, "Invisible");
@@ -710 +645 @@
     else
     {
-    my $title = $self->{'title'};
     $classifyinfo 
         = $self->get_entry ($title, $childtype, $metaname, "VList");