Changeset 8728

Timestamp:

2004-12-03T11:57:26+13:00 (19 years ago)

Author:

kjdon

Message:

changed reinit a bit so that things that only need to be done once get done outside the loop instead of inside it.

File:

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

trunk/gsdl/perllib/classify/AZCompactList.pm

@@ -246 +246 @@
     my @sectionlist = ();
     my $topsection = $doc_obj->get_top_section();
-
     my $metaname = $self->{'metaname'};
     my $outhandle = $self->{'outhandle'};
@@ -272 +271 @@
     my $full_doc_OID 
         = ($thissection ne "") ? "$doc_OID.$thissection" : $doc_OID;
-
     if (defined $self->{'list_mvpair'}->{$full_doc_OID}) 
     {
@@ -318 +316 @@
 
         my $formatted_metavalue = $metavalue;
+        # how do we know how to format the metadata cos we don't know which kind of metadata this value is
         $formatted_metavalue = $self->format_metadata_for_sorting($self->{'metaname'}, $formatted_metavalue, $doc_obj);
         
@@ -336 +335 @@
         }
     }
+    # what is this for??????
     my $date = $doc_obj->get_metadata_element($thissection,"Date");
     $self->{'reclassify'}->{$full_doc_OID} = [$doc_obj,$date];
@@ -377 +377 @@
         {
 ###     print STDERR "*** pushing on $cs_metavalue\n";
-
         push(@multiple_classlist,[$_,$i,$metavalue]); 
         } 
@@ -410 +409 @@
     # Create classifiers objects for each entry >= mingroup
     my $metavalue;
+    my $doclevel = $self->{'doclevel'};
+    my $mingroup = $self->{'mingroup'};
+    my @metaname_list = split('/',$self->{'metaname'});
+    my $metaname = shift(@metaname_list);
+    my $hierarchical = 0;
+    if (!(@metaname_list == 0)) {
+    $hierarchical = 1;
+    $metaname = join('/',@metaname_list);
+    }
     foreach $metavalue (keys %mtfreq)
     {
-    if ($mtfreq{$metavalue} >= $self->{'mingroup'})
+    if ($mtfreq{$metavalue} >= $mingroup)
     {
         # occurs more often than minimum required to compact into a group
         my $listclassobj;
-        my $doclevel = $self->{'doclevel'};
-        my $metaname  = $self->{'metaname'};
-        my $mingroup = $self->{'mingroup'};
-
-        my @metaname_list = split('/',$metaname);
-        $metaname = shift(@metaname_list);
-        if (@metaname_list==0)
-        {
+        
+        if (!$hierarchical) 
+        {   
         my @args;
         push @args, ("-metadata", "$metaname");
@@ -441 +444 @@
         else
         {
-        $metaname = join('/',@metaname_list);
         
         my @args;