From a5c13b107460a55b50424d6c6bd6a77abf71300d Mon Sep 17 00:00:00 2001 From: "Steinar H. Gunderson" Date: Mon, 26 Mar 2007 21:57:46 +0200 Subject: [PATCH 1/1] =?utf8?q?Add=20an=20=E2=80=9Cequipment=20used?= =?utf8?q?=E2=80=9D=20header=20on=20top=20of=20all=20image=20listings.?= MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit --- perl/Sesse/pr0n/Index.pm | 45 +++++++++++++++++++ templates/bilder.knatten.com/equipment-end | 1 + templates/bilder.knatten.com/equipment-start | 3 ++ templates/default/equipment-end | 1 + templates/default/equipment-start | 3 ++ .../images.tg05.gathering.org/equipment-end | 1 + .../images.tg05.gathering.org/equipment-start | 3 ++ .../itk-bilder.samfundet.no/equipment-end | 1 + .../itk-bilder.samfundet.no/equipment-start | 3 ++ .../skoyen.bilder.knatten.com/equipment-end | 1 + .../skoyen.bilder.knatten.com/equipment-start | 3 ++ .../equipment-end | 1 + .../equipment-start | 3 ++ 13 files changed, 69 insertions(+) create mode 100644 templates/bilder.knatten.com/equipment-end create mode 100644 templates/bilder.knatten.com/equipment-start create mode 100644 templates/default/equipment-end create mode 100644 templates/default/equipment-start create mode 100644 templates/images.tg05.gathering.org/equipment-end create mode 100644 templates/images.tg05.gathering.org/equipment-start create mode 100644 templates/itk-bilder.samfundet.no/equipment-end create mode 100644 templates/itk-bilder.samfundet.no/equipment-start create mode 100644 templates/skoyen.bilder.knatten.com/equipment-end create mode 100644 templates/skoyen.bilder.knatten.com/equipment-start create mode 100644 templates/skoyen.bildereks.knatten.com/equipment-end create mode 100644 templates/skoyen.bildereks.knatten.com/equipment-start diff --git a/perl/Sesse/pr0n/Index.pm b/perl/Sesse/pr0n/Index.pm index ca02b75..f8f4404 100644 --- a/perl/Sesse/pr0n/Index.pm +++ b/perl/Sesse/pr0n/Index.pm @@ -152,6 +152,51 @@ sub handler { print_nextprev($r, $event, \%settings, \%defsettings); print_selected($r, $event, \%settings, \%defsettings) if ($num_selected > 0); print_fullscreen($r, $event, \%settings, \%defsettings); + + # Find the equipment used + my $eq = $dbh->prepare(' + SELECT DISTINCT + model.value AS model, + coalesce(lens_spec.value, lens.value) AS lens + FROM images i + LEFT JOIN exif_info model ON i.id=model.image + LEFT JOIN ( SELECT * FROM exif_info WHERE tag=\'Lens\' ) lens ON i.id=lens.image + LEFT JOIN ( SELECT * FROM exif_info WHERE tag=\'LensSpec\') lens_spec ON i.id=lens_spec.image + WHERE event=? AND model.tag=\'Model\' + ORDER BY 1,2') + or die "Couldn't prepare to find equipment: $!"; + $eq->execute($event) + or die "Couldn't find equipment: $!"; + + my @equipment = (); + my %cameras_seen = (); + while (my $ref = $eq->fetchrow_hashref) { + if (!defined($ref->{'lens'}) && exists($cameras_seen{$ref->{'model'}})) { + # + # Some compact cameras seem to add lens info sometimes and not at other + # times; if we have seen a camera with at least one specific lens earlier, + # just ignore entries without a lens. + # + next; + } + push @equipment, $ref; + $cameras_seen{$ref->{'model'}} = 1; + } + $eq->finish; + + if (scalar @equipment > 0) { + Sesse::pr0n::Templates::print_template($r, "equipment-start"); + for my $e (@equipment) { + $r->print("
  • " . $e->{'model'}); + if (defined($e->{'lens'})) { + $r->print(", " . $e->{'lens'} . "
    • \n"); + } else { + $r->print("\n"); + } + } + Sesse::pr0n::Templates::print_template($r, "equipment-end"); + } + my $toclose = 0; my $lastupl = ""; diff --git a/templates/bilder.knatten.com/equipment-end b/templates/bilder.knatten.com/equipment-end new file mode 100644 index 0000000..3d3a44c --- /dev/null +++ b/templates/bilder.knatten.com/equipment-end @@ -0,0 +1 @@ + diff --git a/templates/bilder.knatten.com/equipment-start b/templates/bilder.knatten.com/equipment-start new file mode 100644 index 0000000..d803172 --- /dev/null +++ b/templates/bilder.knatten.com/equipment-start @@ -0,0 +1,3 @@ +

    Utstyr brukt

    + + diff --git a/templates/default/equipment-start b/templates/default/equipment-start new file mode 100644 index 0000000..c97efd8 --- /dev/null +++ b/templates/default/equipment-start @@ -0,0 +1,3 @@ +

    Equipment used

    + + diff --git a/templates/images.tg05.gathering.org/equipment-start b/templates/images.tg05.gathering.org/equipment-start new file mode 100644 index 0000000..c97efd8 --- /dev/null +++ b/templates/images.tg05.gathering.org/equipment-start @@ -0,0 +1,3 @@ +

    Equipment used

    + + diff --git a/templates/itk-bilder.samfundet.no/equipment-start b/templates/itk-bilder.samfundet.no/equipment-start new file mode 100644 index 0000000..d803172 --- /dev/null +++ b/templates/itk-bilder.samfundet.no/equipment-start @@ -0,0 +1,3 @@ +

    Utstyr brukt

    + + diff --git a/templates/skoyen.bilder.knatten.com/equipment-start b/templates/skoyen.bilder.knatten.com/equipment-start new file mode 100644 index 0000000..d803172 --- /dev/null +++ b/templates/skoyen.bilder.knatten.com/equipment-start @@ -0,0 +1,3 @@ +

    Utstyr brukt

    + + diff --git a/templates/skoyen.bildereks.knatten.com/equipment-start b/templates/skoyen.bildereks.knatten.com/equipment-start new file mode 100644 index 0000000..d803172 --- /dev/null +++ b/templates/skoyen.bildereks.knatten.com/equipment-start @@ -0,0 +1,3 @@ +

    Utstyr brukt

    + +