Changeset 7175

Timestamp:

2004-04-01T14:01:06+12:00 (20 years ago)

Author:

kjdon

Message:

fixed the bug where AZCompactList wasn't sorting Creators properly (by surname)

Location:

trunk/gsdl/perllib/classify

Files:

• AZCompactList.pm (modified) (3 diffs)
• BasClas.pm (modified) (1 diff)

trunk/gsdl/perllib/classify/AZCompactList.pm

@@ -301 +301 @@
             $formatted_metavalue="";
         }
-
         push(@{$self->{'list'}->{$full_doc_OID}},$formatted_metavalue);
         push(@{$self->{'listmetavalue'}->{$full_doc_OID}} ,$metavalue);
@@ -439 +438 @@
         }
         
-        #$formatted_node = $self->format_metadata_for_sorting($self->{'metaname'}, $formatted_node, $doc_obj); 
-        # should be using the above, but we have no doc obj any more
-        if ($self->{'metaname'} =~ m/^Creator(:.*)?$/)
-        {
-            &sorttools::format_string_name_english(\$formatted_node);
-        } 
-        else 
-        {
-            &sorttools::format_string_english(\$formatted_node);
-        }
+        $formatted_node = $self->format_metadata_for_sorting($self->{'metaname'}, $formatted_node); 
 
         # In case our formatted string is empty...
@@ -544 +534 @@
     my $title_a = $self->{'reclassifylist'}->{$a};
     my $title_b = $self->{'reclassifylist'}->{$b};
-
+    
     if ($title_a =~ m/^(\d+(\.\d+)?)/)
     {

trunk/gsdl/perllib/classify/BasClas.pm

@@ -278 +278 @@
     } 
     
-    my $lang = $doc_obj->get_metadata_element ($doc_obj->get_top_section(), 'Language');
+    my $lang;
+    if (defined $doc_obj) {
+    $lang = $doc_obj->get_metadata_element ($doc_obj->get_top_section(), 'Language');
+    }
     $lang = 'en' unless defined $lang;
     if ($lang eq 'en') {
-    if ($metaname eq "Creator") {
+    if ($metaname =~ /^(\w+\.)?Creator(:.*)?/) {
         &sorttools::format_string_name_english (\$metavalue);
     } else {