Changeset 13312

Timestamp:

2006-11-22T10:38:19+13:00 (17 years ago)

Author:

kjdon

Message:

upgraded these so they work properly with classinfo.pl

Location:

trunk/niupepa/perllib/classify

Files:

• NPDateList.pm (modified) (1 diff)
• NPepaList.pm (modified) (2 diffs)

trunk/niupepa/perllib/classify/NPDateList.pm

@@ -30 +30 @@
 use DateList;
 
+use strict;
+no strict 'refs'; # allow filehandles to be variables and viceversa
+
 sub BEGIN {
-    @ISA = ('DateList');
+    @NPDateList::ISA = ('DateList');
+}
+
+my $arguments;
+
+my $options = { 'name'     => "NPDateList",
+        'desc'     => "Niupepa specific DateList",
+        'abstract' => "no",
+        'inherits' => "yes" };
+
+sub new {
+    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 = new DateList($classifierslist, $inputargs, $hashArgOptLists);
+
+    return bless $self, $class;
 }
 

trunk/niupepa/perllib/classify/NPepaList.pm

@@ -29 +29 @@
 package NPepaList;
 
+use BasClas;
+
+use strict;
+no strict 'refs'; # allow filehandles to be variables and viceversa
+
+sub BEGIN {
+    @NPepaList::ISA = ('BasClas');
+}
+
+my $arguments;
+
+my $options = { 'name'     => "NPepaList",
+        'desc'     => "Classifies Niupepa documents by series",
+        'abstract' => "no",
+        'inherits' => "yes" };
+
 sub new {
-    my ($class, @options) = @_;
+    my ($class) = shift (@_);
+    
+    my ($classifierslist,$inputargs,$hashArgOptLists) = @_;
+    push(@$classifierslist, $class);
 
-    return bless {
-    'list'=>{},
-    'metaname' => 'Series',
-    'sortname' => 'Date'
-    }, $class;
+    if(defined $arguments){ push(@{$hashArgOptLists->{"ArgList"}},@{$arguments});}
+    if(defined $options) { push(@{$hashArgOptLists->{"OptList"}},$options)};
+
+    my $self = new BasClas($classifierslist, $inputargs, $hashArgOptLists);
+
+    if ($self->{'info_only'}) {
+    # don't worry about any options etc
+    return bless $self, $class;
+    }
+
+    $self->{'list'} = {};
+    $self->{'metaname'} = "Series";
+    $self->{'sortname'} = "Date";
+    
+    return bless $self, $class;
+
 }
 
@@ -92 +122 @@
     my $classifyinfo = $self->get_entry ('Series', 'VList', 'Invisible');
 
-    foreach $series (sort bydate keys %{$self->{'list'}}) {
+    foreach my $series (sort bydate keys %{$self->{'list'}}) {
     my $cinfo = $self->get_entry ($series, 'VList');
-    foreach $OID (sort {$self->{'list'}->{$series}->{$a} 
+    foreach my $OID (sort {$self->{'list'}->{$series}->{$a} 
                 cmp $self->{'list'}->{$series}->{$b};} keys %{$self->{'list'}->{$series}}) {
         push (@{$cinfo->{'contains'}}, {'OID'=>$OID});