Changeset 38357 for main/trunk/greenstone2

Timestamp:

2023-11-14T10:35:07+13:00 (7 months ago)

Author:

kjdon

Message:

if we are adding Latitude and Longitude to a section, then we also add corresponding LatShort, LngShort, Coordinate metadata. This is fine for import, but when we are running buildcol, we are reading in the doc.xml and I guess this add_metadata method is being called for each metadata to create teh doc obj in memory. resulting in adding LatShort/LngShort/Coord all over again. Now lets test whether we already have the particular value before adding it again.

File:

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

main/trunk/greenstone2/perllib/doc.pm

@@ -1063 +1063 @@
 }
 
+# Does this section contain the specified field->value pair?
+sub contains_metadata_value {
+    my $self = shift (@_);
+    my ($section, $field, $value, $ignore_namespace) = @_;
+
+    $ignore_namespace = 0 unless defined $ignore_namespace;
+
+    my $section_ptr = $self->_lookup_section($section);
+    if (!defined $section_ptr) {
+        print STDERR "doc::get_metadata couldn't find section ",
+        $section, "\n";
+        return 0;
+    }
+
+    # Remove any namespace if we are being told to ignore them
+    if($ignore_namespace) {
+    $field =~ s/^.*\.//;
+    }
+
+    my @metadata = ();
+    foreach my $data (@{$section_ptr->{'metadata'}}) {
+
+    my $data_name = $data->[0];
+
+    # Remove any namespace if we are being told to ignore them
+    if($ignore_namespace) {
+        $data_name =~ s/^.*\.//;
+    }   
+    # we always remove ex. (but not any subsequent namespace) - ex. maybe there in doc_obj, but we will never ask for it.
+    $data_name =~ s/^ex\.([^.]+)$/$1/;
+        if ($data_name eq $field && $data->[1] eq $value) {
+            return 1;
+        }
+    }
+    # if we get here, we haven't found it.
+    return 0;
+    
+}
+
 # $value is optional
 sub delete_metadata {
@@ -1175 +1214 @@
 
         my $direction;
-        # TODO does the following work, with eq latitude? the above code implies can be xxxxx.Latitude. should use metaname??
+        # TODO does the following work, with eq xx.Latitude? the above code implies can be xxxxx.Latitude. should use metaname??
         if($value =~ m/^-/)
         {
@@ -1188 +1227 @@
         if(defined $beforeDec && defined $afterDec)
         {
-            my $name = ($field eq "Latitude") ? "LatShort" : "LngShort";
+                    my $name = ($field eq "Latitude") ? "LatShort" : "LngShort";
+                    # only do the following if we haven't already done it
+                    if (!$self->contains_metadata_value($section, $name, $beforeDec . $direction)) {
             push (@{$section_ptr->{'metadata'}}, [$name, $beforeDec . $direction]);
             
@@ -1198 +1239 @@
                 }
             }
-
+                    }
             # what is this???? completely does nothing...
             #Only add the metadata if it has not already been added
@@ -1402 +1443 @@
     #push (@{$section_ptr->{'metadata'}}, ["Longitude", $longitude]);
 
+        if ($self->contains_metadata_value($section, "Coordinate", "$latitude $longitude")) {
+            # it looks like we have already processed these values
+            return;
+        }
     push (@{$section_ptr->{'metadata'}}, ["Coordinate", "$latitude $longitude"]); # "$latitude$lat_direction $longitude$lng_direction"