Changeset 6976

Timestamp:

2004-03-09T14:14:56+13:00 (20 years ago)

Author:

kjdon

Message:

removed Johns construction error stuff so that it dies during new if metadata and hfile args are not valid

File:

• trunk/gsdl/perllib/classify/Hierarchy.pm (modified) (4 diffs)

trunk/gsdl/perllib/classify/Hierarchy.pm

@@ -26 +26 @@
 # classifier plugin for generating hierarchical classifications
 
-# 12/05/02 Added usage datastructure - John Thompson
-# 12/05/02 Modified new() so as not to die on error, only on init() - John Thompson
 
 package Hierarchy;
@@ -95 +93 @@
              "allow_extra_options")) {
     
-    $self->{'construction_error'} = "Incorrect options passed to $class, check your collect.cfg file.";
+    print STDERR "\nIncorrect options passed to $class, check your collect.cfg file\n";
+    $self->print_txt_usage("");  # Use default resource bundle
+    die "\n";
+
     }
 
     if (!$metadata) {
-    $self->{'construction_error'} = "Hierarchy error: no metadata supplied.";
+    print STDERR "$class: -metadata option REQUIRED \n";
+    $self->print_txt_usage("");  # Use default resource bundle
+    
+    die "$class: -metadata option REQUIRED\n";
+    }
+    
+    if (!$hfile) {
+    print STDERR "$class: -hfile option REQUIRED \n";
+    $self->print_txt_usage("");  # Use default resource bundle
+    
+    die "$class: -hfile option REQUIRED\n";
     }
     
@@ -106 +117 @@
     $sortname = $metadata unless ($sortname); 
     $sortname = undef if $sortname =~ /^nosort$/;
+    
     my $subjectfile;
-
-    if (!$hfile) {
-    $self->{'construction_error'} = "Hierarchy error: No -hfile supplied.";
-    }
-    else 
-    {
-    $subjectfile = &util::filename_cat($ENV{'GSDLCOLLECTDIR'},"etc", $hfile);
+    $subjectfile = &util::filename_cat($ENV{'GSDLCOLLECTDIR'},"etc", $hfile);
+    if (!-e $subjectfile) {
+    my $collfile = $subjectfile;
+    $subjectfile = &util::filename_cat($ENV{'GSDLHOME'},"etc", $hfile);
     if (!-e $subjectfile) {
-        my $collfile = $subjectfile;
-        $subjectfile = &util::filename_cat($ENV{'GSDLHOME'},"etc", $hfile);
-        if (!-e $subjectfile) {
-        my $outhandle = $self->{'outhandle'};
-        $self->print_txt_usage("");  # Use default resource bundle
-        print STDERR "\nHierarchy Error: Can't locate subject file $hfile\n";
-        print STDERR "This file should be in $collfile or $subjectfile\n";
-        die "\n";
-        }
+        my $outhandle = $self->{'outhandle'};
+        print STDERR "\nHierarchy Error: Can't locate subject file $hfile\n";
+        print STDERR "This file should be in $collfile or $subjectfile\n";
+        $self->print_txt_usage("");  # Use default resource bundle
+        print STDERR "\nHierarchy Error: Can't locate subject file $hfile\n";
+        print STDERR "This file should be in $collfile or $subjectfile\n";
+        die "\n";
     }
     }
@@ -140 +147 @@
 sub init {
     my $self = shift (@_);
-    
-    if(defined $self->{'construction_error'} || !defined $self->{'metaname'} || !defined $self->{'subjectfile'}) {
-    print STDERR "Error: " , $self->{'construction_error'} , "\n";
-    $self->print_txt_usage("");  # Use default resource bundle
-    die "\n";
-    }
     
     # read in the subject file