Changeset 9519

Timestamp:

2005-03-31T11:43:50+12:00 (19 years ago)

Author:

mdewsnip

Message:

What's all this hard-wired sorting by Date business? (Meant the -sort option was ignored for AZCompactSectionList).

Location:

trunk/gsdl/perllib/classify

Files:

• AZCompactList.pm (modified) (3 diffs)
• AZCompactSectionList.pm (modified) (3 diffs)

trunk/gsdl/perllib/classify/AZCompactList.pm

@@ -336 +336 @@
         }
     }
-    # what is this for??????
-    my $date = $doc_obj->get_metadata_element($thissection,"Date");
-    $self->{'reclassify'}->{$full_doc_OID} = [$doc_obj,$date];
+
+    # This is used in reclassify below for AZCompactSectionList
+    my $sortmeta = $doc_obj->get_metadata_element($thissection, $self->{'sortname'});
+    $self->{'reclassify'}->{$full_doc_OID} = [$doc_obj,$sortmeta];
     }
 }
@@ -524 +525 @@
     if (exists $self->{'classifiers'}->{$node_name})
     {
-        my ($doc_obj,$date) = @{$self->{'reclassify'}->{$doc_OID}};
+        my ($doc_obj, $sortmeta) = @{$self->{'reclassify'}->{$doc_OID}};
 
         # record the metadata value offset temporarily, so eg AZList can
         # get the correct metadata value (for multi-valued metadata fields)
         $doc_obj->{'mdoffset'}=$mdoffset;
-
-        ## date appears to not be used in classifier call ####
 
         if ($doc_OID =~ m/^[^\.]*\.([\d\.]+)$/)
@@ -542 +541 @@
             # classify can't handle multi-level section
             $self->{'classifiers'}->{$node_name}->{'classifyobj'}
-            ->classify_section($section, $doc_obj, $date);
+            ->classify_section($section, $doc_obj, $sortmeta);
         }
         }

trunk/gsdl/perllib/classify/AZCompactSectionList.pm

@@ -117 +117 @@
 # buttonname is also used for the node's title
         push @args, ("-buttonname", "$metavalue");
-        push @args, ("-sort", "Date");
+        push @args, ("-sort", $self->{'sortname'});
 
         if ($doclevel =~ m/^top(level)?/i)
@@ -198 +198 @@
         if ($metavalue =~ m/^$resafe_node_name$/i) 
         {
-        my ($doc_obj,$date) = @{$self->{'reclassify'}->{$doc_OID}};
-
-        ## date appears to not be used in classifier call ####
+        my ($doc_obj, $sortmeta) = @{$self->{'reclassify'}->{$doc_OID}};
 
         # SECTIONFIX?  section must include multiple levels, e.g. '1.12'
@@ -209 +207 @@
             # SECTIONFIX? classify can't handle multi-level section
             #->classify($doc_obj, "Section=$1"); 
-            ->classify_section($1, $doc_obj, $date);
+            ->classify_section($1, $doc_obj, $sortmeta);
         }
         else