Changeset 16462

Timestamp:

2008-07-18T15:26:04+12:00 (15 years ago)

Author:

ak19

Message:

1. FEDORA_VERSION has become the secondary environment variable when running FLI. It has replaced FEDORA2_HOME/FEDORA3_HOME.

Location:

gsdl/trunk/perllib

Files:

• g2futil.pm (modified) (1 diff)
• plugouts/FedoraMETSPlugout.pm (modified) (1 diff)
• plugouts/METSPlugout.pm (modified) (1 diff)

gsdl/trunk/perllib/g2futil.pm

@@ -183 +183 @@
     my $type = undef;
     
-    if ($ENV{'FEDORA2_HOME'}) {
-    $type = "metslikefedora1";
+    if ($ENV{'FEDORA_VERSION'} =~ m/^2/) { # checking if major version is 2
+        $type = "metslikefedora1";
     }
     else {

gsdl/trunk/perllib/plugouts/FedoraMETSPlugout.pm

@@ -90 +90 @@
     my $extra_schema = undef;
 
-    if ($ENV{'FEDORA2_HOME'}) {
-    $extra_schema = "http://www.fedora.info/definitions/1/0/mets-fedora-ext.xsd";
+    if ($ENV{'FEDORA_VERSION'} =~ m/^2/) { # checking if major version is 2
+        $extra_schema = "http://www.fedora.info/definitions/1/0/mets-fedora-ext.xsd";
     }
     else {

gsdl/trunk/perllib/plugouts/METSPlugout.pm

@@ -198 +198 @@
     print $handle '           xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"' . "\n";
     print $handle '           xmlns:gsdl3="http://www.greenstone.org/namespace/gsdlmetadata/1.0/"' . "\n";
-    if ($ENV{'FEDORA2_HOME'}) {
-    print $handle '           xmlns:xlink="http://www.w3.org/TR/xlink"' ."\n";
+    if ($ENV{'FEDORA_VERSION'} =~ m/^2/) { # checking if major version is 2
+        print $handle '           xmlns:xlink="http://www.w3.org/TR/xlink"' ."\n";
     }
     else {