Changeset 34276 for main/trunk

Timestamp:

2020-07-21T14:09:10+12:00 (4 years ago)

Author:

kjdon

Message:

modified the code that added Coordinate metadata when we have got both Latitude and Longitude. The previous code assumed you were alsways going to see these in the order Latitude then Longitude. Why? paradice gardens coll has them in the reverse order. so instead of assuming we have latitude when we are processing longitude, now for each one, if we have got the other, then add coords.

File:

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

main/trunk/greenstone2/perllib/doc.pm

@@ -1161 +1161 @@
 
         my $direction;
+        # TODO does the following work, with eq latitude? the above code implies can be xxxxx.Latitude. should use metaname??
         if($value =~ m/^-/)
         {
@@ -1183 +1184 @@
                 }
             }
-            
+
+            # what is this???? completely does nothing...
             #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,
@@ -1189 +1191 @@
                                                                  # in the section. Also for LatShort, Longitude, LngShort.
         }
+
+        # if we have both Latitude and Longitude, then add coordinate metadata (not sure why, but someone else added it)
+        my $latitude;
+        my $longitude;
+        if($field =~ m/^(.+\.)?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");
+            if (defined $latitude) {
+            $longitude = $value;
+            }
+        } else {
+            # we are dealing with Latitude - if we have already seen Longitude, then add both as Coordinate metadata
+            $longitude = $self->get_metadata_element ($section, "Longitude");
+            if (defined $longitude) {
+            $latitude = $value;
+            }
+        }
+        if (defined $latitude && defined $longitude) {
+            ##rint STDERR "adding coords for $section, $latitude, $longitude\n";
+            $self->processCoordinate($section, $latitude, $longitude);
+        } else {
+            ##rint STDERR "lat or long not defined, not adding coords for $section\n";
+        }
         
-        if($field =~ m/^(.+\.)?Longitude$/) {
-            # if we are dealing with Longitude meta, we should 1. have Latitude meta too; 2. already have processed Latitude meta
-            # in that case, add both Lat and Lng of this section as a Coordinate meta
-            my $latitude = $self->get_metadata_element ($section, "Latitude");
-            my $longitude = $value;
-            # TODO: would like all Longitude meta placed together, followed by all Coordinate meta,
-            # but the following will add all such coord meta to the doc object and the end of this function will add Longitude meta
-            $self->processCoordinate($section, $latitude, $longitude);
-        }
     }