Changeset 8515

Timestamp:

2004-11-11T14:20:55+13:00 (19 years ago)

Author:

chi

Message:

Add a new method metadata_read to identify any specific or extra metadata sets.

File:

• trunk/gsdl/perllib/plugin.pm (modified) (4 diffs)

trunk/gsdl/perllib/plugin.pm

@@ -105 +105 @@
 }
 
-sub read {
-    my ($pluginfo, $base_dir, $file, $metadata, $processor, $maxdocs, $gli, $aux) = @_;
-  
+sub metadata_read {
+    my ($pluginfo, $base_dir, $file, $metadata, $extrametakeys, $extrametadata, $processor, $maxdocs, $gli, $aux) = @_;
 
     $maxdocs = -1 unless defined $maxdocs && $maxdocs =~ /\d/;
     $gli = 0 unless defined $gli;
 
- 
     my $rv = 0;
     my $glifile = $file;
     
     $glifile =~ s/^[\/\\]+//; # file sometimes starts with a / so get rid of it
+    
     # Announce to GLI that we are handling a file
     print STDERR "<File n='$glifile'>\n" if $gli;
-
- 
+    
     # the .kill file is a handy (if not very elegant) way of aborting 
     # an import.pl or buildcol.pl process
@@ -127 +125 @@
     die "\n";
     }
-    
+
     my $had_error = 0;
     # pass this file by each of the plugins in turn until one
@@ -136 +134 @@
     # 0 - blocked
     # anything else for successful processing
+    
     foreach my $plugobj (@$pluginfo) {
-    $rv = $plugobj->read($pluginfo, $base_dir, $file, 
+
+    $rv = $plugobj->metadata_read($pluginfo, $base_dir, $file, 
+                 $metadata, $extrametakeys, $extrametadata, $processor, $maxdocs, $gli, $aux);
+
+    if (defined $rv) {
+        if ($rv == -1) {
+            # an error has occurred
+        $had_error = 1;
+        print STDERR "<ProcessingError n='$glifile'>\n" if $gli;
+        } else {
+            return $rv;
+        }
+    } # else undefined - was not recognised by the plugin
+    }
+
+    return 0;
+}
+
+sub read {
+    my ($pluginfo, $base_dir, $file, $metadata, $processor, $maxdocs, $gli, $aux) = @_;
+
+    $maxdocs = -1 unless defined $maxdocs && $maxdocs =~ /\d/;
+    $gli = 0 unless defined $gli;
+
+    my $rv = 0;
+    my $glifile = $file;
+    
+    $glifile =~ s/^[\/\\]+//; # file sometimes starts with a / so get rid of it
+    
+    # Announce to GLI that we are handling a file
+    print STDERR "<File n='$glifile'>\n" if $gli;
+    
+    # the .kill file is a handy (if not very elegant) way of aborting 
+    # an import.pl or buildcol.pl process
+    if (-e &util::filename_cat ($ENV{'GSDLCOLLECTDIR'}, ".kill")) {
+    gsprintf($outhandle, "{plugin.kill_file}\n");
+    die "\n";
+    }
+
+    my $had_error = 0;
+    # pass this file by each of the plugins in turn until one
+    # is found which will process it
+    # read must return:
+    # undef - could not recognise
+    # -1 - tried but error
+    # 0 - blocked
+    # anything else for successful processing
+    
+    foreach my $plugobj (@$pluginfo) {
+
+        $rv = $plugobj->read($pluginfo, $base_dir, $file, 
                  $metadata, $processor, $maxdocs, $gli, $aux);
-        if (defined $rv) {
+
+    if (defined $rv) {
         if ($rv == -1) {
             # an error has occurred
@@ -173 +223 @@
     $stats->{'num_not_recognised'} ++;
     }
-
     return 0;
 }