Changeset 24748 for main/trunk/greenstone2/bin

Timestamp:

2011-10-11T11:24:25+13:00 (13 years ago)

Author:

davidb

Message:

Support for -site in pluginfo.pl added

File:

• main/trunk/greenstone2/bin/script/pluginfo.pl (modified) (3 diffs)

main/trunk/greenstone2/bin/script/pluginfo.pl

@@ -69 +69 @@
 
 my $arguments =
-    [ { 'name' => "collection",
+    [ { 'name' => "site",
+    'desc' => "{pluginfo.site}",
+    'type' => "string",
+    'reqd' => "no" },
+      { 'name' => "collection",
     'desc' => "{pluginfo.collection}",
     'type' => "string",
@@ -101 +105 @@
 
 sub main {
+    my $site = "";
     my $collection = "";
     my $xml = 0;
@@ -177 +182 @@
     }
 
-    if ($collection ne "") {
-    $ENV{'GSDLCOLLECTDIR'} = &util::filename_cat ($ENV{'GSDLHOME'}, "collect", $collection);
-    } else {
-    $ENV{'GSDLCOLLECTDIR'} = $ENV{'GSDLHOME'};
+    if ($site ne "") {
+    # assume Greenstone 3
+    if ($collection ne "") {
+        $ENV{'GSDLCOLLECTDIR'} = &util::filename_cat ($ENV{'GSDL3HOME'}, "sites", $site, "collect", $collection);
+    } else {
+        # Probably more useful to default to GS2 area for plugins
+        $ENV{'GSDLCOLLECTDIR'} = $ENV{'GSDLHOME'};
+    }
+    }
+    else {
+    if ($collection ne "") {
+        $ENV{'GSDLCOLLECTDIR'} = &util::filename_cat ($ENV{'GSDLHOME'}, "collect", $collection);
+    } else {
+        $ENV{'GSDLCOLLECTDIR'} = $ENV{'GSDLHOME'};
+    }
     }