summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChristian Grothoff <christian@grothoff.org>2019-12-08 23:04:41 +0100
committerChristian Grothoff <christian@grothoff.org>2019-12-08 23:04:41 +0100
commit496b9ba6a97ba03f2fa3ca1a8eebae270f008349 (patch)
treefef59e047cd039cc8a2b61a860a2c07ba456aab0
parenta76247276d5bc6520ccb849e043c4f52a2b40d8b (diff)
downloadexchange-496b9ba6a97ba03f2fa3ca1a8eebae270f008349.tar.gz
exchange-496b9ba6a97ba03f2fa3ca1a8eebae270f008349.tar.bz2
exchange-496b9ba6a97ba03f2fa3ca1a8eebae270f008349.zip
fix matchingdemo-2019-12-09-01
-rw-r--r--src/exchange/taler-exchange-httpd_terms.c16
-rw-r--r--src/lib/test_exchange_api.conf2
2 files changed, 12 insertions, 6 deletions
diff --git a/src/exchange/taler-exchange-httpd_terms.c b/src/exchange/taler-exchange-httpd_terms.c
index 499c09a5..b3d7c344 100644
--- a/src/exchange/taler-exchange-httpd_terms.c
+++ b/src/exchange/taler-exchange-httpd_terms.c
@@ -45,7 +45,7 @@ struct Terms
/**
* The desired language.
*/
- const char *language;
+ char *language;
/**
* Number of bytes in @e terms.
@@ -215,13 +215,21 @@ TEH_handler_terms (struct TEH_RequestHandler *rh,
p->mime_type)) )
{
if ( (NULL == t) ||
+ (! mime_matches (mime,
+ t->mime_type)) ||
(language_matches (lang,
- p->mime_type) >
+ p->language) >
language_matches (lang,
- t->mime_type) ) )
+ t->language) ) )
t = p;
}
}
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+ "Best match for %s/%s: %s / %s\n",
+ lang,
+ mime,
+ (NULL != t) ? t->mime_type : "<none>",
+ (NULL != t) ? t->language : "<none>");
}
if (NULL == t)
@@ -440,7 +448,7 @@ load_terms (const char *path,
struct Terms t = {
.mime_type = mime,
.terms = buf,
- .language = lang,
+ .language = GNUNET_strdup (lang),
.terms_size = bsize
};
diff --git a/src/lib/test_exchange_api.conf b/src/lib/test_exchange_api.conf
index 813202ae..ccb5a782 100644
--- a/src/lib/test_exchange_api.conf
+++ b/src/lib/test_exchange_api.conf
@@ -26,8 +26,6 @@ PORT = 8083
[exchange]
-TERMS_ETAG = 0
-TERMS_DIR = /home/grothoff/share/taler-exchange/tos/
# how long is one signkey valid?
signkey_duration = 4 weeks