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

trunk/gsdl/perllib/classify/DateList.pm

@@ -79 +79 @@
 
 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 ($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 BasClas($classifierslist,$inputargs,$hashArgOptLists): new BasClas($classifierslist,$inputargs);
+
+    # Manually set $self parameters.
     $self->{'list'} = {};
 
-    my ($datemeta, $sortmeta);
-    $self->{'nogroup'}=0;
-    if (!parsargv::parse(\@_, 
-                         q^bymonth^, \$self->{'bymonth'},
-             q^nogroup^, \$self->{'nogroup'},
-             q^metadata/.*/^, \$datemeta,
-             q^sort/.*/^, \$sortmeta,
-             q^reverse_sort^, \$self->{'reverse_sort'},
-                         "allow_extra_options")) {
-    $self->print_txt_usage("");  # Use default resource bundle
-    die "\n";
-    }
-
-    if (!defined $datemeta || $datemeta eq "") {
-    $datemeta = "Date";
-    }
-    $self->{'datemeta'} = $datemeta;
-
-    if (defined $sortmeta && $sortmeta ne "") {
-    $self->{'sortmeta'} = $sortmeta;
-    }
+    if (!defined $self->{"metadata"} || $self->{"metadata"} eq "") {
+    $self->{'metadata'} = "Date";
+    }
+    
     return bless $self, $class;
 }
@@ -128 +109 @@
 
     my $doc_OID = $doc_obj->get_OID();
-    my $date = $doc_obj->get_metadata_element ($doc_obj->get_top_section(), $self->{'datemeta'});
+    my $date = $doc_obj->get_metadata_element ($doc_obj->get_top_section(), $self->{'metadata'});
     
     my $sort_other = "";
-    if (defined $self->{'sortmeta'} && $self->{'sortmeta'} ne "") {
-    $sort_other = $doc_obj->get_metadata_element ($doc_obj->get_top_section(), $self->{'sortmeta'});
-    $sort_other = &sorttools::format_metadata_for_sorting($self->{'sortmeta'}, $sort_other, $doc_obj);
+    if (defined $self->{'sort'} && $self->{'sort'} ne "") {
+    $sort_other = $doc_obj->get_metadata_element ($doc_obj->get_top_section(), $self->{'sort'});
+    $sort_other = &sorttools::format_metadata_for_sorting($self->{'sort'}, $sort_other, $doc_obj);
     }
     # if this document doesn't contain Date element we won't 
@@ -143 +124 @@
     } 
 
-    
     $self->{'list'}->{$doc_OID} = "$date$sort_other";
     }
@@ -169 +149 @@
             'Title'=>$title,
             'contains'=>[],
-            'mdtype'=>$self->{'datemeta'});
+            'mdtype'=>$self->{'metadata'});
     $classifyinfo{'thistype'} = $thistype 
     if defined $thistype && $thistype =~ /\w/;