public/gallery3-contrib
Archived
1
0
Fork 0
Code Releases Activity

Fixes for the initial commit which turned out to have been the wrong file (oops)

Browse Source 
Support for the Debian Stable version of exiv2, 0.16.
This commit is contained in:
Kriss Andsten 2010-11-28 11:22:50 +08:00 committed by Bharat Mediratta
parent 9165ff3594
commit 3567291609
3 changed files with 39 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

45
3.0/modules/author/helpers/author.php
View File

@ -33,8 +33,25 @@ class author_Core {
$user_name = $owner->full_name;
$exiv = module::get_var('author', 'exiv_path');
$version = module::get_var('author', 'exiv_version');
/*
Debian stable ships with exiv2 0.16 at the time of writing. You get
roughly the same output out of the utility as with 0.20, but you have
to invoke it several times.
The real threshhold for this might be somewhere between 0.16 and 0.20,
but the 0.16 way of doing things is forward compatible.
*/
$exivData = array();
exec("$exiv -p a " . escapeshellarg($item->file_path()), $exivData);
if ($version < 0.20) {
exec("$exiv -p x " . escapeshellarg($item->file_path()), $exivData);
exec("$exiv -p i " . escapeshellarg($item->file_path()), $exivData);
exec("$exiv -p t " . escapeshellarg($item->file_path()), $exivData);
} else {
exec("$exiv -p a " . escapeshellarg($item->file_path()), $exivData);
}
$has = array();
$mod = array();
foreach ($exivData as $line)
@ -55,20 +72,26 @@ class author_Core {
}
if (!array_key_exists('Exif.Image.Artist', $has)) { $mod['Exif.Image.Artist'] = $byline; }
if (!array_key_exists('Xmp.dc.creator', $has)) { $mod['Xmp.dc.creator'] = $byline; }
if (!array_key_exists('Iptc.Application2.Byline', $has)) { $mod['Iptc.Application2.Byline'] = $byline; }
# Apply our own image terms URL.
$terms = module::get_var("author", "usage_terms")
if ($terms != '') {
$mod['Xmp.xmpRights.UsageTerms'] = 'http://wiki.sverok.se/wiki/Bildbank-Bilder';
}
# ..and credit.
$credit = module::get_var("author", "credit")
/* Apply the credit block */
$credit = module::get_var("author", "credit");
if ($credit != '') {
$mod['Iptc.Application2.Credit'] = $credit;
}
/*
Older versions doesn't support XMP writing.
*/
if ($version >= 0.20) {
if (!array_key_exists('Xmp.dc.creator', $has)) { $mod['Xmp.dc.creator'] = $byline; }
/* Apply our own image terms URL */
$terms = module::get_var("author", "usage_terms");
if ($terms != '') {
$mod['Xmp.xmpRights.UsageTerms'] = 'http://wiki.sverok.se/wiki/Bildbank-Bilder';
}
}
$line = $exiv . ' ';
foreach ($mod as $key => $value) {

4
3.0/modules/author/helpers/author_installer.php
View File

@ -48,6 +48,10 @@ class author_installer {
}
else {
module::set_var("author", "exiv_path", $exiv);
$out = array();
exec("$exiv -V", $out);
$parts = split(' ', $out[0]);
module::set_var("author", "exiv_version", $parts[1]);
}
}

2
3.0/modules/author/module.info
View File

@ -1,3 +1,3 @@
name = "Author"
description = "Allows for the display and modification of the Author/Photographer/Byline data in photos."
version = 1
version = 2