X-Git-Url: https://git.decadent.org.uk/gitweb/?a=blobdiff_plain;f=Memories%2FPhoto.pm;h=98444a7bbe0c8a001835c076c610c4a4175cf3a7;hb=b637f6e61ec3f236de28a3d502f70ce7aacba84e;hp=4279dc97c0eb4c622ec365390d97dd424938ae3e;hpb=0ac6758a593e0e8ebad7af6aba3c3512d4d8280f;p=memories.git

diff --git a/Memories/Photo.pm b/Memories/Photo.pm
index 4279dc9..98444a7 100644
--- a/Memories/Photo.pm
+++ b/Memories/Photo.pm
@@ -54,6 +54,7 @@ sub do_upload :Exported {
     }
 
     $photo->make_thumb;
+    $r->{params}{tags} ||= join " ", map { qq{"$_"} } $photo->tags_exif;
     $photo->add_tags($r->{params}{tags});
     $photo->add_to_imageseek_library;
     Memories->zap_cache();
@@ -318,4 +319,19 @@ sub description {
 sub title_exif { shift->_grovel_metadata( 'Headline', 'Title'); }
 sub license { shift->_grovel_metadata( 'Rights Usage Terms', 'Usage Terms' ) }
 sub copyright { shift->_grovel_metadata( 'Rights', 'Copyright', 'Copyright Notice') }
+
+# This one's slightly different since we want everything we can get...
+sub tags_exif {
+    my $self = shift;
+    my %md = map {%$_} values %{$self->exif_info};
+    my %tags = 
+        map { s/\s+/-/g; lc $_ => 1  }
+        map { split /\s*,\s*/, $md{$_}}
+        grep {$md{$_} and $md{$_} =~/[^ 0:]/}
+        (qw(Keywords Subject City State Location Country Province-State), 
+        'Transmission Reference', 'Intellectual Genre', 
+        'Country-Primary Location Name'
+        );
+    return keys %tags;
+}
 1;