Changeset 809 for trunk

Timestamp:

1999-12-07T10:43:37+13:00 (24 years ago)

Author:

sjboddie

Message:

plugins now take options, maxdocs is always defined

Location:

trunk/gsdl/perllib

Files:

• plugin.pm (modified) (3 diffs)
• plugins/ArcPlug.pm (modified) (1 diff)
• plugins/GMLPlug.pm (modified) (1 diff)
• plugins/IndexPlug.pm (modified) (1 diff)
• plugins/RecPlug.pm (modified) (1 diff)

trunk/gsdl/perllib/plugin.pm

@@ -29 +29 @@
 
 sub load_plugins {
-    my ($collection, $plugin_list) = @_;
+    my ($plugin_list) = @_;
     my @plugin_objects = ();
 
-    foreach $plugin (@$plugin_list) {
+    foreach $pluginoptions (@$plugin_list) {
+    my $pluginname = shift @$pluginoptions;
+    next unless defined $pluginname;
+
     # find the plugin
     my $colplugname = &util::filename_cat($ENV{'GSDLCOLLECTDIR'},"perllib/plugins", 
-                          "${plugin}.pm");
+                          "${pluginname}.pm");
     my $mainplugname = &util::filename_cat($ENV{'GSDLHOME'},"perllib/plugins", 
-                           "${plugin}.pm");
+                           "${pluginname}.pm");
     if (-e $colplugname) { require $colplugname; }
     elsif (-e $mainplugname) { require $mainplugname; }
-    else { die "ERROR - couldn't find plugin $plugin\n"; }
+    else { die "ERROR - couldn't find plugin \"$pluginname\"\n"; }
 
     # create a plugin object
     my ($plugobj);
-    eval ("\$plugobj = new $plugin()");
+    map { $_ = "\"$_\""; } @$pluginoptions;
+    my $options = join (",", @$pluginoptions);
+    eval ("\$plugobj = new \$pluginname($options)");
     die "$@" if $@;
-
+    
     # add this object to the list
     push (@plugin_objects, $plugobj);
@@ -55 +60 @@
 
 sub read {
-    my ($pluginfo, $base_dir, $file, $metadata, $processor, $maxdocs) = @_;
+    my ($pluginfo, $base_dir, $file, $metadata, $processor, $maxdocs, $aux) = @_;
 
+    $maxdocs = -1 unless defined $maxdocs && $maxdocs =~ /\d/;
     my $rv = 0;
 
@@ -63 +69 @@
     foreach $plugobj (@$pluginfo) {
     $rv = $plugobj->read($pluginfo, $base_dir, $file, 
-                 $metadata, $processor, $maxdocs);
+                 $metadata, $processor, $maxdocs, $aux);
     return $rv if defined $rv;
     }

trunk/gsdl/perllib/plugins/ArcPlug.pm

@@ -78 +78 @@
     # process each file
     foreach $subfile (@$file_list) {
-        last if (defined $maxdocs && $maxdocs =~ /\d/ && $count >= $maxdocs);
+        last if ($maxdocs != -1 && $count >= $maxdocs);
 
         my $tmp = &util::filename_cat ($file, $subfile->[0]);

trunk/gsdl/perllib/plugins/GMLPlug.pm

@@ -153 +153 @@
     my ($assoc_file_info);
     foreach $assoc_file_info (@$assoc_files) {
-    my ($assoc_file, $mime_type) = split (":", $assoc_file_info);
+    my ($assoc_file, $mime_type, $dir) = split (":", $assoc_file_info);
+    $dir = "" unless defined $dir;
     $doc_obj->associate_file(&util::filename_cat($parent_dir, $assoc_file),
-                 $assoc_file, $mime_type);
+                 &util::filename_cat($dir, $assoc_file), $mime_type);
                  
     }

trunk/gsdl/perllib/plugins/IndexPlug.pm

@@ -105 +105 @@
     my $count = 0;
     foreach $docfile (keys (%$list)) {
-    last if (defined $maxdocs && $maxdocs =~ /\d/ && $count >= $maxdocs);
+    last if ($maxdocs != -1 && $count >= $maxdocs);
     $metadata = {}; # at present we can do this as metadata
                     # will always be empty when it arrives

trunk/gsdl/perllib/plugins/RecPlug.pm

@@ -89 +89 @@
     # process each file
     foreach $subfile (@dir) {
-        last if (defined $maxdocs && $maxdocs =~ /\d/ && $count >= $maxdocs);
+        last if ($maxdocs != -1 && $count >= $maxdocs);
 
         if ($subfile !~ /^\.\.?$/) {