main -> livejournal       cgi-bin/ljfeed.pl
--- cvs/livejournal/cgi-bin/ljfeed.pl	2004-07-21 18:28:31.000000000 -0700
+++ cgi-bin/ljfeed.pl	2005-02-17 18:36:41.000000000 -0800
@@ -379,30 +379,30 @@
     
     # setup userprops we will need
     LJ::load_user_props($u, qw{
-        aolim icq yahoo jabber msn url urlname external_foaf_url
+        aolim icq yahoo jabber msn url urlname external_foaf_url state city country journaltitle
     });
 
     # create bare foaf document, for now
     $ret = "<?xml version='1.0'?>\n";
     $ret .= LJ::run_hook("bot_director", "<!-- ", " -->");
     $ret .= "<rdf:RDF\n";
-    $ret .= "   xml:lang=\"en\"\n";
     $ret .= "   xmlns:rdf=\"http://www.w3.org/1999/02/22-rdf-syntax-ns#\"\n";
     $ret .= "   xmlns:rdfs=\"http://www.w3.org/2000/01/rdf-schema#\"\n";
     $ret .= "   xmlns:foaf=\"http://xmlns.com/foaf/0.1/\"\n";
+    $ret .= "   xmlns:vcard=\"http://www.w3.org/2001/vcard-rdf/3.0#\"\n";
+    $ret .= "   xmlns:bio=\"http://purl.org/vocab/bio/0.1/\"\n";
     $ret .= "   xmlns:dc=\"http://purl.org/dc/elements/1.1/\">\n";
 
     # precompute some values
     my $digest = Digest::SHA1::sha1_hex('mailto:' . $u->{email});
-    
-    # channel attributes
-    $ret .= ($comm ? "  <foaf:Group>\n" : "  <foaf:Person>\n");
-    $ret .= "    <foaf:nick>$u->{user}</foaf:nick>\n";
-    if ($u->{bdate} && $u->{bdate} ne "0000-00-00" && !$comm && $u->{allow_infoshow} eq 'Y') {
-        my $bdate = $u->{bdate};
-        $bdate =~ s/^0000-//;
-        $ret .= "    <foaf:dateOfBirth>$bdate</foaf:dateOfBirth>\n";
+    if (!$u->{external_foaf_url}) {
+        $ret .= "  <foaf:PersonalProfileDocument rdf:about=''>\n";
+        $ret .= "      <foaf:maker rdf:nodeID='a'/>\n";
+        $ret .= "      <foaf:primaryTopic rdf:nodeID='a'/>\n";
+        $ret .= "  </foaf:PersonalProfileDocument>\n";
     }
+    # channel attributes
+    $ret .= ($comm ? "  <foaf:Group rdf:nodeID='a'>\n" : "  <foaf:Person rdf:nodeID='a'>\n");
     $ret .= "    <foaf:mbox_sha1sum>$digest</foaf:mbox_sha1sum>\n";
     $ret .= "    <foaf:page>\n";
     $ret .= "      <foaf:Document rdf:about=\"$LJ::SITEROOT/userinfo.bml?user=$u->{user}\">\n";
@@ -435,13 +435,35 @@
         }
     }
     
-    # include a user's journal page and web site info
-    $ret .= "    <foaf:weblog rdf:resource=\"" . LJ::journal_base($u) . "/\"/>\n";
+    # include a user's journal page, name/nick and web site info
+    $ret .= "    <foaf:name>".LJ::exml($u->{name})."</foaf:name>\n" if $u->{name};
+    $ret .= "    <foaf:nick>$u->{user}</foaf:nick>\n";
+    $ret .= "    <foaf:logo rdf:resource='$LJ::USERPIC_ROOT/$u->{defaultpicid}/$u->{userid}' />\n" if ($u->{defaultpicid});
+    $ret .= "    <foaf:weblog rdf:resource='" . LJ::journal_base($u) . "/'";
+    $ret .= " dc:title=\"" . LJ::exml($u->{journaltitle}) . "\"" if $u->{journaltitle}; 
+    $ret .= "/>\n";
     if ($u->{url}) {
         $ret .= "    <foaf:homepage rdf:resource=\"" . LJ::eurl($u->{url});
         $ret .= "\" dc:title=\"" . LJ::exml($u->{urlname}) . "\" />\n";
     }
     
+    if ($u->{bdate} && $u->{bdate} ne "0000-00-00" && !$comm && $u->{allow_infoshow} eq 'Y') {
+        my $bdate = $u->{bdate};
+        $bdate =~ s/^0000-//;
+        $ret .= "    <bio:event><bio:Birth><bio:date>$bdate</bio:date></bio:Birth></bio:event>\n";
+    }
+    if ($u->{allow_contactshow} eq 'Y' && ($u->{country} || $u->{state} || $u->{city})) {
+        my %countries = ();
+        my %states = ();
+        my ($country, $state);
+        LJ::load_codes({ "country" => \%countries, "state" => \%states });
+        $ret .= "   <vCard:ADR rdf:parseType=\"Resource\">\n";
+        $ret .= "      <vcard:Locality>" . LJ::exml($u->{city}) . "</vcard:Locality>\n" if $u->{city};
+        $ret .= "      <vcard:Region>" . LJ::exml($states{$u->{state}}) . "</vcard:Region>" if $u->{state};
+        $ret .= "      <vcard:Country>" . LJ::exml($countries{$u->{country}}) . "</vcard:Region>" if $u->{state};
+        $ret .= "   </vcard:ADR>\n";
+    }
+        
     # interests, please!
     # arrayref of interests rows: [ intid, intname, intcount ]
     my $intu = LJ::get_interests($u);