Changeset 38753 for main/trunk/greenstone2

Timestamp:

2024-02-20T11:43:55+13:00 (4 months ago)

Author:

kjdon

Message:

field may be ex.Latitude, so use metaname (has had namespace removed) when testing if eq Latitude/Longitude. Note, haven't tested this

File:

• main/trunk/greenstone2/perllib/doc.pm (modified) (4 diffs)

main/trunk/greenstone2/perllib/doc.pm

@@ -1217 +1217 @@
         if($value =~ m/^-/)
         {
-            $direction = ($field eq "Latitude") ? "S" : "W"; 
+            $direction = ($metaname eq "Latitude") ? "S" : "W"; 
         }
         else
         {
-            $direction = ($field eq "Latitude") ? "N" : "E"; 
+            $direction = ($metaname eq "Latitude") ? "N" : "E"; 
         }
         
@@ -1227 +1227 @@
         if(defined $beforeDec && defined $afterDec)
         {
-                    my $name = ($field eq "Latitude") ? "LatShort" : "LngShort";
+                    my $name = ($metaname eq "Latitude") ? "LatShort" : "LngShort";
                     # only do the following if we haven't already done it
                     if (!$self->contains_metadata_value($section, $name, $beforeDec . $direction)) {
@@ -1243 +1243 @@
             #Only add the metadata if it has not already been added
             my $metaMap = $self->get_metadata_hashmap($section); # metaMap not used and called function has no apparent side-effects,
-                                                                 # but this line appears important for ensuring uniqueness of (Latitude, value) meta
-                                                                 # in the section. Also for LatShort, Longitude, LngShort.
+                    # but this line appears important for ensuring uniqueness of (Latitude, value) meta
+                    # in the section. Also for LatShort, Longitude, LngShort.
         }
 
@@ -1250 +1250 @@
         my $latitude;
         my $longitude;
-        if($field =~ m/^(.+\.)?Longitude$/) {
+        if($metaname eq "Longitude") {
             # if we are dealing with Longitude meta, and we have already seen Latitude, then add Coordinate metadata 
             $latitude = $self->get_metadata_element ($section, "Latitude");