Changeset 25557 for main

Timestamp:

2012-05-09T14:46:30+12:00 (12 years ago)

Author:

sjm84

Message:

Add in subsets of Latitude and Longitude metadata if the collection has it

File:

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

main/trunk/greenstone2/perllib/doc.pm

@@ -956 +956 @@
     my $self = shift (@_);
     my ($section, $field, $value) = @_;
-
+    
     $self->delete_metadata ($section, $field);
     $self->add_utf8_metadata ($section, $field, $value);
@@ -968 +968 @@
     my $self = shift (@_);
     my ($section, $field, $value) = @_;
-
+    
     $self->add_utf8_metadata ($section, $field,
                   &unicode::ascii2utf8(\$value));
@@ -976 +976 @@
     my $self = shift (@_);
     my ($section, $field, $value) = @_;
-
-#    my ($cpackage,$cfilename,$cline,$csubr,$chas_args,$cwantarray) = caller(1);
-#    my ($lcfilename) = ($cfilename =~ m/([^\\\/]*)$/);
-#    print STDERR "** Calling method: $lcfilename:$cline $cpackage->$csubr\n";
+    
+    #    my ($cpackage,$cfilename,$cline,$csubr,$chas_args,$cwantarray) = caller(1);
+    #    my ($lcfilename) = ($cfilename =~ m/([^\\\/]*)$/);
+    #    print STDERR "** Calling method: $lcfilename:$cline $cpackage->$csubr\n";
 
     my $section_ptr = $self->_lookup_section($section);
@@ -1004 +1004 @@
 
     # double check that the value is utf-8
-#    if (!&unicode::check_is_utf8($value)) {
-#   print STDERR "doc::add_utf8_metadata - warning: '$field''s value $value wasn't utf8.";
-#   &unicode::ensure_utf8(\$value);
-#   print STDERR " Tried converting to utf8: $value\n";
-#    }
+    #    if (!&unicode::check_is_utf8($value)) {
+    #   print STDERR "doc::add_utf8_metadata - warning: '$field''s value $value wasn't utf8.";
+    #   &unicode::ensure_utf8(\$value);
+    #   print STDERR " Tried converting to utf8: $value\n";
+    #    }
+
+    #If the metadata value is either a latitude or a longitude value then we want to save a shortened version for spacial searching purposes
+    if($field eq "Latitude" || $field eq "Longitude")
+    {
+        my $direction;
+        if($value =~ m/^-/)
+        {
+            $direction = ($field eq "Latitude") ? "S" : "W"; 
+        }
+        else
+        {
+            $direction = ($field eq "Latitude") ? "N" : "E"; 
+        }
+        
+        my ($beforeDec, $afterDec) = ($value =~ m/^-?([0-9]+)\.([0-9]+)$/);
+        if(defined $beforeDec && defined $afterDec)
+        {
+            my $name = ($field eq "Latitude") ? "LatShort" : "LngShort";
+            push (@{$section_ptr->{'metadata'}}, [$name, $beforeDec . $direction]);
+            
+            for(my $i = 2; $i <= 4; $i++)
+            {
+                if(length($afterDec) >= $i)
+                {
+                    push (@{$section_ptr->{'metadata'}}, [$name, substr($afterDec, 0, $i)]);
+                }
+            }
+            
+            #Only add the metadata if it has not already been added
+            my $metaMap = $self->get_metadata_hashmap($section);
+        }
+    }
 
     push (@{$section_ptr->{'metadata'}}, [$field, $value]);