I don't think I should be surprised that my patch is not merged if I forget to send it to the list as well...

And this was not intended to make hanatos look bad, lately I had problems to use thunderbird correctly, oh my...


-------- Original Message --------
Subject: Re: [darktable-devel] [Patch] Feature Request #9136: wildcards for color labels in "collect images" module
Date:   Sun, 20 Jan 2013 16:23:04 +0100
From:   Max Killer <hal.from.2...@gmail.com>
To:     johannes hanika <hana...@gmail.com>



On Sun 20 Jan 2013 08:38:49 AM CET, johannes hanika wrote:
On Sun, Jan 20, 2013 at 5:02 AM, Max Killer <hal.from.2...@gmail.com> wrote:
On Sat 19 Jan 2013 04:18:32 PM CET, Frederic Crozat wrote:

2013/1/19 Simon Harhues <simon.harh...@muenster.de>:

-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1

Hi,

Am 19.01.2013 15:24, schrieb Frederic Crozat:

If
you don't specify any value as color label, it acts as a wildcard (on
1.1.x).


for me it doesn't, but just displays images with the red (=first) colour
label. Using darktable 1.1.2


Oh, indeed, I just happened to test with red color label.

Then I guess Max patch should go in.

--
Frederic Crozat



I recreated the patch with after a comment from houz, not to mark the "%" as
to translate.

cool, to complete the exercise, do you want to create your patch using
`git format-patch' ? you would need to commit your changes first, but
that will also give you the chance to put down a commit message for
it, and you'll have your name in the log.

-jo

after a violent fight with git and thanks to the help of boucman I
created a correct patch.
I guess strcpy wpuld also work instead of snprintf...

hal



>From 10759815090d1628078c47eb4d93a84e219dbb26 Mon Sep 17 00:00:00 2001
From: hal <hal.from.2...@gmail.com>
Date: Sun, 20 Jan 2013 15:53:43 +0100
Subject: [PATCH] Smal change to allow '%' as a wildcard for collect by
 colorlabel.

---
 src/common/collection.c |    1 +
 1 file changed, 1 insertion(+)

diff --git a/src/common/collection.c b/src/common/collection.c
index cd84566..de00069 100644
--- a/src/common/collection.c
+++ b/src/common/collection.c
@@ -454,6 +454,7 @@ get_query_string(const dt_collection_properties_t property, const gchar *escaped
       else if(strcmp(escaped_text,_("blue")  )==0) color=3;
       else if(strcmp(escaped_text,_("purple"))==0) color=4;
       snprintf(query, 1024, "(id in (select imgid from color_labels where color=%d))", color);
+      if     (strcmp(escaped_text,"%"     )==0) snprintf(query, 1024, "(id in (select imgid from color_labels where color IS NOT NULL))");
     }
     break;
 
-- 
1.7.10.4


------------------------------------------------------------------------------
Master Visual Studio, SharePoint, SQL, ASP.NET, C# 2012, HTML5, CSS,
MVC, Windows 8 Apps, JavaScript and much more. Keep your skills current
with LearnDevNow - 3,200 step-by-step video tutorials by Microsoft
MVPs and experts. ON SALE this month only -- learn more at:
http://p.sf.net/sfu/learnnow-d2d
_______________________________________________
darktable-devel mailing list
darktable-devel@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/darktable-devel

Reply via email to