<?xml version="1.0" encoding="UTF-8"?>
<commit>
  <added type="array">
    <added>
      <filename>addressbooker.py</filename>
    </added>
  </added>
  <modified type="array">
    <modified>
      <diff>@@ -16,5 +16,8 @@ handlers:
 - url: /step3.*
   script: step3.py
 
+- url: /merge/.*
+  script: addressbooker.py
+
 - url: /.*
   script: feedfetcher.py</diff>
      <filename>app.yaml</filename>
    </modified>
    <modified>
      <diff>@@ -243,14 +243,19 @@ class Fetcher(webapp.RequestHandler):
       self.RenderEntry(entry)
 
   def RenderEntry(self, entry):
-    self.response.out.write('&lt;h3&gt;Entry Title: %s&lt;/h3&gt;' % (
+    if entry.title and entry.title.text:
+      self.response.out.write('&lt;h3&gt;Entry Title: %s&lt;/h3&gt;' % (
         entry.title.text.decode('UTF-8')))
+    else:
+      self.response.out.write(&quot;&lt;h3&gt;(title-less entry)&lt;/h3&gt;&quot;);
+      
     if entry.content and entry.content.text:
       self.response.out.write('&lt;p&gt;Content: %s&lt;/p&gt;' % (
           entry.content.text.decode('UTF-8')))
     elif entry.summary and entry.summary.text:
       self.response.out.write('&lt;p&gt;Summary: %s&lt;/p&gt;' % (
           entry.summary.text.decode('UTF-8')))
+      
     for link in entry.link:
       self.RenderLink(link)
 </diff>
      <filename>feedfetcher.py</filename>
    </modified>
    <modified>
      <diff>@@ -9,4 +9,3 @@ indexes:
 # manually, move them above the marker line.  The index.yaml file is
 # automatically uploaded to the admin console when you next deploy
 # your application using appcfg.py.
-</diff>
      <filename>index.yaml</filename>
    </modified>
  </modified>
  <removed type="array"/>
  <parents type="array">
    <parent>
      <id>41b58d301913443be36876f49988cd3e3ce23fa7</id>
    </parent>
  </parents>
  <author>
    <name>Brad Fitzpatrick</name>
    <email>brad@danga.com</email>
  </author>
  <url>http://github.com/bradfitz/addressbooker/commit/0ed12f303456dd5c9bb3da0a58eb81ce123292b6</url>
  <id>0ed12f303456dd5c9bb3da0a58eb81ce123292b6</id>
  <committed-date>2008-11-28T21:25:18-08:00</committed-date>
  <authored-date>2008-11-28T21:25:18-08:00</authored-date>
  <message>forked feedfetcher into addressbooker; start of parsing JSON.</message>
  <tree>0e426b83317d9034bc8cf91b12311af4be63dbfb</tree>
  <committer>
    <name>Brad Fitzpatrick</name>
    <email>brad@danga.com</email>
  </committer>
</commit>
