Changeset 545 for trunk/gsdl/perllib/classify/List.pm

Timestamp:

1999-09-08T12:27:29+12:00 (25 years ago)

Author:

sjboddie

Message:

changed sorting slightly

File:

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

trunk/gsdl/perllib/classify/List.pm

@@ -27 +27 @@
 # options are:
 # metadata=Metaname -- (optional) all documents with Metaname metadata
-#                      will be included in list, list will be sorted
-#                      by this element. if not included all documents
-#                      will be included in list in build (random) order
+#                      will be included in list. if not included all documents
+#                      will be included in list.
+# sort=Meta         -- (optional) sort documents in list alphabetically by
+#                      Meta. by default it will sort by Metaname, if neither
+#                      are set documents will be in build (random) order.
+#                      Meta may be Filename to sort by original filename or
+#                      nosort to force not to sort
 # title=Title       -- (optional) the title field for this classification.
 #                      if not included title field will be Metaname. 
@@ -42 +46 @@
 
     my $list = [];
-    my ($metaname, $title);
+    my ($metaname, $title, $sortname);
 
     foreach $option (@options) {
@@ -50 +54 @@
     } elsif ($option =~ /^title=(.*)$/i) {
         $title = $1;
+    } elsif ($option =~ /^sort=(.*)$/i) {
+        $sortname = $1;
     }
     }
@@ -61 +67 @@
     }
 
+    if (defined $sortname && $sortname =~ /^nosort$/i) {
+    $sortname = undef;
+    } elsif (!defined $sortname && defined $metaname) {
+    $sortname = $metaname;
+    }
+
     return bless {
     'list'=>$list,
     'metaname' => $metaname,
-    'title' => $title
+    'title' => $title,
+    'sortname' => $sortname
     }, $class;
 }
@@ -71 +84 @@
     my $self = shift (@_);
 
-    if (defined $self->{'metaname'}) {
+    if (defined $self->{'sortname'}) {
     $self->{'list'} = {};
     } else {
@@ -84 +97 @@
     my $doc_OID = $doc_obj->get_OID();
 
-    if (defined $self->{'metaname'}) {
-    my $metavalue = $doc_obj->get_metadata_element ($doc_obj->get_top_section(),
-                             $self->{'metaname'});
-    if (defined $metavalue) {
-        if ($self->{'metaname'} eq 'Creator') {
-        &sorttools::format_string_name_english (\$metavalue);
+    my $sortmeta = "";
+    if (defined $self->{'sortname'}) {
+    if ($self->{'sortname'} =~ /^filename$/i) {
+        $sortmeta = $doc_obj->get_source_filename();
+    } else {
+        $sortmeta = $doc_obj->get_metadata_element($doc_obj->get_top_section(),
+                               $self->{'sortname'});
+        if ($self->{'sortname'} eq "Creator") {
+        &sorttools::format_string_name_english (\$sortmeta);
         } else {
-        &sorttools::format_string_english (\$metavalue);
+        &sorttools::format_string_english (\$sortmeta);
         }
+    }
+    $sortmeta = "" unless defined $sortmeta;
+
+    if (defined $self->{'metaname'}) {
+        my $metavalue = $doc_obj->get_metadata_element ($doc_obj->get_top_section(),
+                                $self->{'metaname'});
+        if (defined $metavalue) {
+        if (defined $self->{'list'}->{$doc_OID}) {
+            print STDERR "WARNING: List::classify called multiple times for $doc_OID\n";
+        } 
+        $self->{'list'}->{$doc_OID} = $sortmeta;
+        }
+    } else {
         if (defined $self->{'list'}->{$doc_OID}) {
-        print STDERR "metavalue: $metavalue\n";
-        print STDERR "title: $self->{'title'}\n";
         print STDERR "WARNING: List::classify called multiple times for $doc_OID\n";
         } 
-        $self->{'list'}->{$doc_OID} = $metavalue;
+        $self->{'list'}->{$doc_OID} = $sortmeta;
     }
     } else {
-    push (@{$self->{'list'}}, $doc_OID);
+    if (defined $self->{'metaname'}) {
+        my $metavalue = $doc_obj->get_metadata_element ($doc_obj->get_top_section(),
+                                $self->{'metaname'});
+        if (defined $metavalue) {
+        push (@{$self->{'list'}}, $doc_OID);
+        }
+    } else {
+        push (@{$self->{'list'}}, $doc_OID);
+    }               
     }
 }
@@ -108 +143 @@
     my $self = shift (@_);
 
-    my $contains = "";
     my @list = ();
-    if (defined $self->{'metaname'}) {
+    if (defined $self->{'sortname'}) {
     if (keys %{$self->{'list'}}) {
         @list = sort {$self->{'list'}->{$a}