Changeset 8512

Timestamp:

2004-11-11T14:05:18+13:00 (19 years ago)

Author:

chi

Message:

Add a new metadata_read method in the first pass in order to identify any specific or extra metadata sets, also provide a better solution for HTMLPlug to identify all the associated images file and stylesheet files.

File:

• trunk/gsdl/perllib/plugins/RecPlug.pm (modified) (7 diffs)

trunk/gsdl/perllib/plugins/RecPlug.pm

@@ -157 +157 @@
     $self->{'parser'} = $parser;
     $self->{'in_filename'} = 0;
-    
-    }
-    
+    }
+
     return bless $self, $class;
 }
@@ -249 +248 @@
     my %extrametadata;               # maps from filespec to extra metadata keys
     my @extrametakeys;               # keys of %extrametadata in order read
-    
+
     if ($read_metadata_files) {
-
-    # read the directory "metadata.xml" file
+    #read the directory "metadata.xml" file
     my $metadatafile = &util::filename_cat ($dirname, 'metadata.xml');
     if (-e $metadatafile) {
@@ -261 +259 @@
     }
     }
-
+    
     # import each of the files in the directory
     my $out_metadata; 
     my $num_files = scalar(@dir);
+    for (my $i = 0; $i < scalar(@dir); $i++) {
+    my $subfile = $dir[$i];
+    my $this_file_base_dir = $base_dir;
+    last if ($maxdocs != -1 && $count >= $maxdocs);
+    next if ($subfile =~ /^\.\.?$/);
+    #next if ($read_metadata_files && $subfile =~ /metadata\.xml$/);
+
+    # Recursively read each $subfile
+    print $outhandle "RecPlug metadata recurring: $subfile\n" if ($verbosity > 2);
+    
+    $count += &plugin::metadata_read ($pluginfo, $this_file_base_dir,
+                      &util::filename_cat($file, $subfile),
+                      $out_metadata, \@extrametakeys, \%extrametadata,
+                      $processor, $maxdocs, $gli);
+    $additionalmetadata = 1;
+    }
+   
+    
+    # import each of the files in the directory
+    $count=0;
     for (my $i = 0; $i <= scalar(@dir); $i++) {
     # When every file in the directory has been done, pause for a moment (figuratively!)
@@ -293 +311 @@
         }
         }
-
         # When the new files have been processed, check again
         $num_files = scalar(@dir);
@@ -343 +360 @@
     # Next add metadata read in XML files (if it is supplied)
     if ($additionalmetadata == 1) {
-
         my ($filespec, $mdref);
         foreach $filespec (@extrametakeys) {
@@ -357 +373 @@
     # Recursively read each $subfile
     print $outhandle "RecPlug recurring: $subfile\n" if ($verbosity > 2);
-
-    $count += &plugin::read ($pluginfo, $this_file_base_dir, 
+    
+    $count += &plugin::read ($pluginfo, $this_file_base_dir,
                  &util::filename_cat($file, $subfile),
                  $out_metadata, $processor, $maxdocs, $gli);
     }
 
-    return $count;    
+    return $count;
 }
 
@@ -383 +399 @@
     $self->{'parser'}->parsefile($filename);
     };
+
     if ($@) {
     die "RecPlug: ERROR $filename is not a well formed metadata.xml file ($@)\n";