gal-mj-digikam: Use image title

diff --git a/bin/gal-mj-digikam b/bin/gal-mj-digikam
index 649b09a35a974c7b6e3170918d6716c6598fb351..913806d5fbeb911ef500008ed18dcb64a1537b07 100755 (executable)
--- a/bin/gal-mj-digikam
+++ b/bin/gal-mj-digikam
@@ -52,12 +52,16 @@ my $res = $dbh->selectall_arrayref( <<AMEN, { Slice => {} },
                p.latitudeNumber AS lat,
                p.longitudeNumber AS lon,
                p.altitude AS alt,
-               inf.creationDate AS cdate
+               inf.creationDate AS cdate,
+               cmt.comment
        FROM Images i
        JOIN ImageTags t ON (i.id = t.imageid)
        LEFT JOIN ImagePositions p ON (i.id = p.imageid)
        LEFT JOIN ImageInformation inf ON (i.id = inf.imageid)
-       WHERE i.album=? AND t.tagid=?
+       LEFT JOIN ImageComments cmt ON (i.id = cmt.imageid)
+       WHERE i.album=?
+         AND t.tagid=?
+         AND ((cmt.type=3 AND cmt.language='x-default' AND cmt.author IS NULL) OR cmt.type IS NULL)
        ORDER BY cdate, i.modificationDate
 AMEN
        $album_id,
@@ -66,7 +70,13 @@ AMEN
 
 open OUT, '|-', $ENV{GALLERY_ROOT} . '/bin/gal-scan' or die "Cannot feed gal scan\n";
 for my $r (@$res) {
-       print OUT "$photos_root/$album/" . $r->{name}, "\n";
+       print OUT join("\t",
+                       "$photos_root/$album/" . $r->{name},
+                       '-',            # no ID
+                       '-',            # rotation = autodetect
+                       '-',            # transform = autodetect
+                       $r->{comment} // "",
+               ), "\n";
        for my $k (qw(lat lon alt)) {
                print OUT "\t$k=", $r->{$k}, "\n" if defined $r->{$k};
        }