Towards 1.2.4

[pazpar2-moved-to-github.git] / src / settings.c

diff --git a/src/settings.c b/src/settings.c
index 55cd512..34159eb 100644 (file)
--- a/src/settings.c
+++ b/src/settings.c
@@ -67,6 +67,7 @@ static char *hard_settings[] = {
     "pz:pqf_prefix",
     "pz:sort",
     "pz:recordfilter",
+    "pz:pqf_strftime",
     0
 };
 
@@ -362,7 +363,7 @@ static void update_database(void *context, struct database *db)
                 // target-specific value trumps wildcard. Delete.
                 *sp = (*sp)->next; // unlink.....
             }
-            else if (!zurl_wildcard((*sp)->target))
+            else if (zurl_wildcard((*sp)->target) < zurl_wildcard(set->target))
                 // Db already contains higher-priority setting. Abort search
                 break;
             else