Bug#395422: vcquery: Use N property if FN is not available

[Gregor Jasny]

Package: lbdb
Version: 0.33
Severity: wishlist
Tags: patch


Hi,

In the VCF file that is exported to the iPod is no FN property given.
Instead a multi value N proprerty is used. The attached patch read the N
property if no FN property exists.

Thanks,
Gregor

-- System Information:
Debian Release: testing/unstable
  APT prefers unstable
  APT policy: (500, 'unstable'), (1, 'experimental')
Architecture: i386 (i686)
Shell:  /bin/sh linked to /bin/bash
Kernel: Linux 2.6.18
Locale: LANG=C, LC_CTYPE=C (charmap=ANSI_X3.4-1968)

Versions of packages lbdb depends on:
ii  libc6                         2.5-0exp2  GNU C Library: Shared libraries
ii  libvformat1                   1.13-4     Library to read and write vcard fi
ii  perl                          5.8.8-6.1  Larry Wall's Practical Extraction 

lbdb recommends no packages.

-- no debconf information

--- vcquery.orig	2006-10-26 23:47:51.000000000 +0200
+++ vcquery.c	2006-10-26 23:49:19.000000000 +0200
@@ -55,6 +55,24 @@
       if ((fullname = vf_get_prop_value_string(prop, 0)))
 	fullname = strdup(fullname);
 
+    /* No full name, lets try name */
+    if (!fullname && vf_get_property(&prop, vfobj, VFGP_FIND, NULL, "N", NULL)) {
+      char name[STRING+1] = { 0 };
+      size_t available = STRING;
+      int props = 0;
+
+      while (available > 0 && (propval = vf_get_prop_value_string(prop, props++))) {
+        strncat(name, propval, available);
+        available -= strlen(propval);
+
+        if (available > 0)
+          strncat(name, " ", available--);
+      }
+
+      if (available < STRING)
+        fullname = strdup(name);
+    }
+
     if (vf_get_property(&prop, vfobj, VFGP_FIND, NULL, "EMAIL", NULL)) {
       do {
 	int props = 0;