* @return GNUNET_OK on success
*/
int
-GNUNET_FS_getopt_configure_set_keywords (struct GNUNET_GETOPT_CommandLineProcessorContext* ctx,
+GNUNET_FS_getopt_set_keywords (struct GNUNET_GETOPT_CommandLineProcessorContext* ctx,
void *scls,
const char *option,
const char *value)
* @return GNUNET_OK on success
*/
int
-GNUNET_FS_getopt_configure_set_metadata (struct GNUNET_GETOPT_CommandLineProcessorContext* ctx,
+GNUNET_FS_getopt_set_metadata (struct GNUNET_GETOPT_CommandLineProcessorContext* ctx,
void *scls,
const char *option,
const char *value)
{
struct GNUNET_CONTAINER_MetaData **mm = scls;
- EXTRACTOR_KeywordType type;
+ enum EXTRACTOR_MetaType type;
const char *typename;
const char *typename_i18n;
struct GNUNET_CONTAINER_MetaData *meta;
"utf-8"
#endif
);
- type = EXTRACTOR_getHighestKeywordTypeNumber ();
+ type = EXTRACTOR_metatype_get_max ();
while (type > 0)
{
type--;
- typename = EXTRACTOR_getKeywordTypeAsString (type);
+ typename = EXTRACTOR_metatype_to_string (type);
typename_i18n = dgettext (LIBEXTRACTOR_GETTEXT_DOMAIN, typename);
if ((strlen (tmp) >= strlen (typename) + 1) &&
(tmp[strlen (typename)] == ':') &&
(0 == strncmp (typename, tmp, strlen (typename))))
{
- GNUNET_CONTAINER_meta_data_insert (meta, type, &tmp[strlen (typename) + 1]);
+ GNUNET_CONTAINER_meta_data_insert (meta,
+ "<gnunet>",
+ type,
+ EXTRACTOR_METAFORMAT_UTF8,
+ "text/plain",
+ &tmp[strlen (typename) + 1],
+ strlen (&tmp[strlen (typename) + 1])+1);
GNUNET_free (tmp);
tmp = NULL;
break;
(tmp[strlen (typename_i18n)] == ':') &&
(0 == strncmp (typename_i18n, tmp, strlen (typename_i18n))))
{
- GNUNET_CONTAINER_meta_data_insert (meta, type,
- &tmp[strlen (typename_i18n) + 1]);
+ GNUNET_CONTAINER_meta_data_insert (meta,
+ "<gnunet>",
+ type,
+ EXTRACTOR_METAFORMAT_UTF8,
+ "text/plain",
+ &tmp[strlen (typename_i18n) + 1],
+ strlen (&tmp[strlen (typename_i18n) + 1]) + 1);
GNUNET_free (tmp);
tmp = NULL;
break;
}
if (tmp != NULL)
{
- GNUNET_CONTAINER_meta_data_insert (meta, EXTRACTOR_UNKNOWN, tmp);
+ GNUNET_CONTAINER_meta_data_insert (meta,
+ "<gnunet>",
+ EXTRACTOR_METATYPE_UNKNOWN,
+ EXTRACTOR_METAFORMAT_UTF8,
+ "text/plain",
+ tmp,
+ strlen(tmp) + 1);
GNUNET_free (tmp);
printf (_
("Unknown metadata type in metadata option `%s'. Using metadata type `unknown' instead.\n"),