Changeset 9461

Timestamp:

2005-03-18T10:46:03+13:00 (19 years ago)

Author:

davidb

Message:

Hierarchy of metadata can now be expressed dc.Format|dc.Title in addition to
dc.Format/dc.Title (to make it more consistent with other parts of Greenstone).

Also changed level in hierarchy that it switches from a recursive call to
AZCompactList to SectionList/List. Was at 0, now at 1.

File:

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

trunk/gsdl/perllib/classify/AZCompactList.pm

@@ -186 +186 @@
     $self->{'title'} = "$title";     # title for the titlebar.
     $self->{'sortname'} = $sortname;
+
     if (defined($removeprefix) && $removeprefix) {
     $removeprefix =~ s/^\^//; # don't need a leading ^
@@ -249 +250 @@
     my $outhandle = $self->{'outhandle'};
 
-    $metaname =~ s/(\/.*)//; # grab first name in n1/n2/n3 list
+    $metaname =~ s/(\/|\|).*//; # grab first name in n1/n2/n3 or n1|n2|n3 list
     my @commameta_list = split(/,/, $metaname);
 
@@ -411 +412 @@
     my $doclevel = $self->{'doclevel'};
     my $mingroup = $self->{'mingroup'};
-    my @metaname_list = split('/',$self->{'metaname'});
+    my @metaname_list = split(/\/|\|/,$self->{'metaname'});
     my $metaname = shift(@metaname_list);
     my $hierarchical = 0;
-    if (!(@metaname_list == 0)) {
+    if (scalar(@metaname_list) > 1) {
     $hierarchical = 1;
     $metaname = join('/',@metaname_list);
@@ -435 +436 @@
         if ($doclevel =~ m/^top(level)?/i)
         {
-            eval ("\$listclassobj = new List(\@args)"); warn $@ if $@;
+            eval ("\$listclassobj = new List(\@args)"); 
+            warn $@ if $@;
         }
         else
         {
-            eval ("\$listclassobj = new SectionList(\@args)");
+            eval ("\$listclassobj = new SectionList(\@args)"); 
+            warn $@ if $@;
         }
         }
@@ -449 +452 @@
         # buttonname is also used for the node's title
         push @args, ("-buttonname", "$metavalue");
+        push @args, ("-sort", $self->{'sortname'});
         push @args, ("-doclevel", "$doclevel");
         push @args, ("-mingroup", $mingroup);
@@ -454 +458 @@
 
         eval ("\$listclassobj = new AZCompactList(\@args)");
+        warn $@ if $@;
         }
         if ($@) {
@@ -682 +687 @@
 
     # top level
-    my @metanames = split("/",$self->{'metaname'});
+    my @metanames = split(/\/|\|/,$self->{'metaname'});
     my $metaname = shift(@metanames);