Changeset 8510

Timestamp:

2004-11-11T13:59:37+13:00 (19 years ago)

Author:

chi

Message:

Add a new method metadat_read to deal with specific (or external) metadata in the first pass. Also, provide a smart_block option to store associated images and stylesheet files for each of html files. This is intended to provide a better soultion when there are multiple types of files in a single data item.

File:

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

trunk/gsdl/perllib/plugins/BasPlug.pm

@@ -319 +319 @@
              q^cover_image^, \$self->{'cover_image'},
              q^separate_cjk^, \$self->{'separate_cjk'},
+             q^smart_block^, \$self->{'smart_block'},
              "allow_extra_options")) {
 
@@ -325 +326 @@
     die "\n";
     }
+    $self->{'file_blocks'} = {};
 
     return bless $self, $class;
@@ -388 +390 @@
 
     return "";
+}
+
+sub metadata_read {
+    my $self = shift (@_);  
+    my ($pluginfo, $base_dir, $file, $metadata, $extrametakeys, $extrametadata, $processor, $maxdocs, $gli) = @_;
+    return undef;
 }
 
@@ -413 +421 @@
     &gsprintf(STDERR, "{BasPlug.read_must_be_implemented}") && die "\n";
     }
+    my $smart_block = $self->{'smart_block'};
 
     my $outhandle = $self->{'outhandle'};
@@ -419 +428 @@
     $filename = &util::filename_cat ($base_dir, $file) if $base_dir =~ /\w/;
 
-    if ($self->{'block_exp'} ne "" && $filename =~ /$self->{'block_exp'}/) {
+
+    if ($smart_block){
+    if (defined $self->{'file_blocks'}->{$filename} && $self->{'file_blocks'}->{$filename} == 1){
+        return 0; # blocked
+    }
+    } elsif ($self->{'block_exp'} ne "" && $filename =~ /$self->{'block_exp'}/) {
     $self->{'num_blocked'} ++;
     return 0; # blocked
     }
+    
     if ($filename !~ /$self->{'process_exp'}/ || !-f $filename) {
     return undef; # can't recognise
@@ -440 +455 @@
 
     my ($filemeta) = $file =~ /([^\\\/]+)$/;
+
     # how do we know what encoding the filename is in?
     $doc_obj->add_metadata($doc_obj->get_top_section(), "Source", &ghtml::dmsafe($filemeta));
@@ -464 +480 @@
     # include any metadata passed in from previous plugins 
     # note that this metadata is associated with the top level section
+
     $self->extra_metadata ($doc_obj, $doc_obj->get_top_section(), $metadata);
 
@@ -553 +570 @@
     return $file_derived_title;
 }
-
 
 sub title_fallback
@@ -722 +738 @@
     foreach my $field (keys(%$metadata)) {
     # $metadata->{$field} may be an array reference
-    if (ref ($metadata->{$field}) eq "ARRAY") {
+
+    if ($field eq "gsdlassocfile_tobe") {
+        # 'gsdlassocfile_tobe' is artificially introduced metadata
+        # that is used to signal that certain additional files should
+        # be tied to this document.  Useful in situations where a
+        # metadata pass in the plugin pipeline works out some files
+        # need to be associated with a document, but the document hasn't
+        # been formed yet.
+        
+        my $equiv_form = "";
+        foreach my $gaf (@{$metadata->{$field}}) {
+        #print STDERR "**** gsdlassocfile_tobe = $gaf\n";
+        my ($full_filename,$mimetype) = ($gaf =~ m/^(.*):(.*):$/);
+        my ($tail_filename) = ($full_filename =~ /^.*[\/\\](.+?)$/);
+        my $filename = $full_filename;
+                  
+        $doc_obj->associate_file($full_filename,$tail_filename,$mimetype);
+        
+        my ($doc_ext) = ($tail_filename =~ m/^.*\.(.*)$/);
+        my $start_doclink = "<a href=\"_httpcollection_/index/assoc/[archivedir]/$tail_filename\">";
+        my $srcicon = "_icon".$doc_ext."_";
+        my $end_doclink = "</a>";
+
+        $equiv_form .= " $start_doclink\{If\}{$srcicon,$srcicon,$doc_ext\}$end_doclink";        
+        }
+        $doc_obj->add_utf8_metadata ($cursection, "equivlink", $equiv_form); 
+    }
+    elsif (ref ($metadata->{$field}) eq "ARRAY") {
         map { 
         $doc_obj->add_utf8_metadata ($cursection, $field, $_);