Changeset 9351

Timestamp:

2005-03-10T11:55:52+13:00 (19 years ago)

Author:

davidb

Message:

Two changes:

1. Fusing files with the same root filename is meant to be selective based on plugin options, e.g. -in_order_ext pdf,doc,txt however as the code stood, ALL filenames with the same root were merged. Additional book-keeping information added to allow for the more selective version.

2. Format for start_doclink revised to be more general (needs Or, parent ...)

File:

• trunk/gsdl/perllib/plugins/BasPlug.pm (modified) (6 diffs)

trunk/gsdl/perllib/plugins/BasPlug.pm

@@ -354 +354 @@
     if ((defined $associate_ext) && ($associate_ext ne "")) {
     my @exts = split(/,/,$associate_ext);
-    
+
     my %associate_ext_lookup = ();
     foreach my $e (@exts) {
-        $assoicate_ext_lookup{$e} = 1;
+        $associate_ext_lookup{$e} = 1;
     }
 
@@ -486 +486 @@
         }
         else {
-        $file_prefix_rec->{'exts'}->{$file_ext} = 1;
+        if (defined $self->{'associate_ext_lookup'}->{$file_ext}) {
+            $file_prefix_rec->{'exts'}->{$file_ext} = 1;
+        }
         }
     }
@@ -515 +517 @@
     if (defined $file_prefix_rec) {
     my $tie_to = $file_prefix_rec->{'tie_to'};
+
     if (defined $tie_to) {
         if ($tie_to eq $file_ext) {
@@ -555 +558 @@
     my $associate_ext = $self->{'associate_ext'};
 
+
     return 0 if (!$associate_ext);
 
@@ -564 +568 @@
 
     my $file_prefix_rec = $self->{'shared_fileroot'}->{$file_prefix};
-
+    
     if ($self->tie_to_filename($file_ext,$file_prefix_rec)) {
 
@@ -966 +970 @@
         
         my ($doc_ext) = ($tail_filename =~ m/^.*\.(.*)$/);
-        my $start_doclink = "<a href=\"_httpcollection_/index/assoc/[archivedir]/$tail_filename\">";
+        my $start_doclink = "<a href=\"_httpcollection_/index/assoc/{Or}{[parent(Top):archivedir],[archivedir]}/$tail_filename\">";
         my $srcicon = "_icon".$doc_ext."_";
         my $end_doclink = "</a>";