Changeset 10218 for trunk/gsdl/perllib/classify/AZCompactSectionList.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/AZCompactSectionList.pm (modified) (4 diffs)

trunk/gsdl/perllib/classify/AZCompactSectionList.pm

@@ -23 +23 @@
 
 sub new {
-    my $class = shift (@_);
-    my $self = new AZCompactList($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 ($class) = shift (@_);
+    my ($classifierslist,$inputargs,$hashArgOptLists) = @_;
+    push(@$classifierslist, $class);
+
+    if(defined $arguments){ push(@{$hashArgOptLists->{"ArgList"}},@{$arguments});}
+    if(defined $options) { push(@{$hashArgOptLists->{"OptList"}},$options)};
+
+    my $self = (defined $hashArgOptLists)? new AZCompactList($classifierslist,$inputargs,$hashArgOptLists): new AZCompactList($classifierslist,$inputargs);
 
     return bless $self, $class;
@@ -117 +114 @@
 # 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)"); warn $@ if $@;
         }
         else
@@ -127 +125 @@
             # SECTIONFIX?
             #eval ("\$listclassobj = new SectionList($args)");
-            eval ("\$listclassobj = new SectionList(\@args)");
+            eval ("\$listclassobj = new SectionList([],\$ptArgs)");
         }
         }
@@ -143 +141 @@
         # SECTIONFIX?
         #eval ("\$listclassobj = new AZCompactList($args)");
-        eval ("\$listclassobj = new AZCompactList(\@args)");
+        my $ptArgs = \@args;
+        eval ("\$listclassobj = new AZCompactList([],\$ptArgs)");
         }
         if ($@) {