Add a new table "exif_info" which contains all the EXIF tags for all images.

diff --git a/perl/Sesse/pr0n/Common.pm b/perl/Sesse/pr0n/Common.pm
index 1f1eac878537ebaffcfdb4e0c54187d0bfdf1841..a43c50af72c2b0b8974521765c171ba3c32e3487 100644 (file)
--- a/perl/Sesse/pr0n/Common.pm
+++ b/perl/Sesse/pr0n/Common.pm
@@ -184,7 +184,7 @@ sub get_cache_location {
        }
 }
 
-sub update_width_height {
+sub update_image_info {
        my ($r, $id, $width, $height) = @_;
 
        # Also find the date taken if appropriate (from the EXIF tag etc.)
@@ -202,6 +202,19 @@ sub update_width_height {
                 undef, $width, $height, $datetime, $id)
                or die "Couldn't update width/height in SQL: $!";
 
+       $dbh->do('DELETE FROM exif_info WHERE image=?',
+               undef, $id)
+               or die "Couldn't delete old EXIF information in SQL: $!";
+
+       my $q = $dbh->prepare('INSERT INTO exif_info (image,tag,value) VALUES (?,?,?)')
+               or die "Couldn't prepare inserting EXIF information: $!";
+
+       for my $key (keys %$info) {
+               next if ref $info->{$key};
+               $q->execute($id, $key, $info->{$key})
+                       or die "Couldn't insert EXIF information in database: $!";
+       }
+
        # update the last_picture cache as well (this should of course be done
        # via a trigger, but this is less complicated :-) )
        $dbh->do('UPDATE last_picture_cache SET last_picture=GREATEST(last_picture, ?) WHERE event=(SELECT event FROM images WHERE id=?)',
@@ -320,7 +333,7 @@ sub ensure_cached {
                # Update the SQL database if it doesn't contain the required info
                if ($dbwidth == -1 || $dbheight == -1) {
                        $r->log->info("Updating width/height for $id: $width x $height");
-                       update_width_height($r, $id, $width, $height);
+                       update_image_info($r, $id, $width, $height);
                }
                        
                # We always want RGB JPEGs

diff --git a/sql/pr0n.sql b/sql/pr0n.sql
index 157143203775abc45cfe101a375668e652eef333..ddfa7af36dcbd75d86efd3b7656c95695fb6a920 100644 (file)
--- a/sql/pr0n.sql
+++ b/sql/pr0n.sql
@@ -58,6 +58,15 @@ CREATE TABLE users (
     vhost character varying(32) NOT NULL
 );
 
+CREATE TABLE exif_info (
+    image integer NOT NULL REFERENCES images (id),
+    tag varchar NOT NULL,
+    value varchar NOT NULL,
+
+    PRIMARY KEY ( image, tag )
+);
+    
+
 GRANT INSERT ON TABLE deleted_images TO pr0n;
 GRANT INSERT,SELECT,UPDATE,DELETE ON TABLE events TO pr0n;
 GRANT INSERT,SELECT,UPDATE,DELETE ON TABLE fake_files TO pr0n;
@@ -65,4 +74,4 @@ GRANT INSERT,SELECT,UPDATE ON TABLE imageid_seq TO pr0n;
 GRANT INSERT,SELECT,UPDATE,DELETE ON TABLE images TO pr0n;
 GRANT INSERT,SELECT,UPDATE,DELETE ON TABLE shadow_files TO pr0n;
 GRANT SELECT ON TABLE users TO pr0n;
-
+GRANT SELECT,INSERT,DELETE ON TABLE exif_info TO pr0n;