Changeset 9130

Timestamp:

2005-02-22T13:40:56+13:00 (19 years ago)

Author:

mdewsnip

Message:

Allowed the use of "|" characters as well as "\" for separating levels, to work with the GLI. Also finished off the "-suppresslastlevel" option, which someone whose name begins with Katherine had forgotten to do.

File:

• trunk/gsdl/perllib/classify/AutoHierarchy.pm (modified) (6 diffs)

trunk/gsdl/perllib/classify/AutoHierarchy.pm

@@ -64 +64 @@
     'desc' => "{AutoHierarchy.separator}",
     'type' => "regexp",
-    'deft' => "[\\\\\\\/]",
+    'deft' => "[\\\\\\\/|\\\\\\\|]",
     'reqd' => "no" },
       { 'name' => "suppresslastlevel",
@@ -95 +95 @@
     my $firstvalueonly = 0;
     my $allvalues = 0;
+    my $suppresslastlevel = 0;
 
     if (!parsargv::parse(\@_, 
@@ -103 +104 @@
              q^firstvalueonly^, \$firstvalueonly,
              q^allvalues^, \$allvalues,
-
+             q^suppresslastlevel^, \$suppresslastlevel,
              "allow_extra_options")) {
     
@@ -121 +122 @@
     
     if (!$separator) {
-    $separator = "[\\\/]";
+    $separator = "[\\\/|\\\|]";
     }
     $self->{'separator'} = $separator;
@@ -138 +139 @@
     $self->{'allvalues'} = $allvalues;
 
-    $self->{'uniquelastbit'} = 1;
+    if ($suppresslastlevel != 0) {
+    $suppresslastlevel = 1;
+    }
+    $self->{'suppresslastlevel'} = $suppresslastlevel;
+
     # sortname is handled a bit differently - kjdon
     # undef means to sort, but use the metadata value from -metadata
@@ -216 +221 @@
     $path_hash = $self->{'path_hash'};
     my @chunks = split (/$self->{'separator'}/, $metavalue);
-    if ($self->{'uniquelastbit'}) {
+    if ($self->{'suppresslastlevel'}) {
         pop(@chunks); # remove the last element from the end
     }