<?xml version="1.0" encoding="UTF-8"?>
<commit>
  <added type="array"/>
  <modified type="array">
    <modified>
      <diff>@@ -4,6 +4,10 @@ from twitter_api import getTwits
 twits = getTwits()
 words = []
 for twit in twits:
-   words.append(extractKeyWords(twit))
+    words.append(extractKeyWords(twit))
+photos = getFlickers()
+for photo in photos:
+    photo_tags = extractKeyWords(photo) + photo.tags
+    words.append(photo_tags)
 
 print words
\ No newline at end of file</diff>
      <filename>analyser.py</filename>
    </modified>
    <modified>
      <diff>@@ -1,31 +1,31 @@
 from urllib import urlopen,urlencode
 
 class Dummy():
-   def __init__(self,dummy):
-      self.dummy = dummy
+    def __init__(self,dummy):
+        self.dummy = dummy
 
-   def relevant_content(self):
-      return self.dummy
+    def relevant_content(self):
+        return self.dummy
 
-   def __str__(self):
-      return &quot;dummy: %s&quot;%(self.dummy)
+    def __str__(self):
+        return &quot;dummy: %s&quot;%(self.dummy)
 
-   __repr__ = __str__
+    __repr__ = __str__
 
 def extractKeyWords(contextable):
-   dic_params ={
-      &quot;appid&quot; : &quot;teventomeeter&quot;,
-      &quot;context&quot; : contextable.relevant_content(),
-      &quot;output&quot; : 'json', 
-   }
-   params = urlencode(dic_params)
-   urlbase = &quot;http://search.yahooapis.com/ContentAnalysisService/V1/termExtraction?%s&quot;%(params)
-   results = urlopen(urlbase)
-   jsonResults = results.read()
-   dic = eval(jsonResults)
-   return dic['ResultSet']['Result']
+    dic_params ={
+        &quot;appid&quot; : &quot;teventomeeter&quot;,
+        &quot;context&quot; : contextable.relevant_content(),
+        &quot;output&quot; : 'json', 
+    }
+    params = urlencode(dic_params)
+    urlbase = &quot;http://search.yahooapis.com/ContentAnalysisService/V1/termExtraction?%s&quot;%(params)
+    results = urlopen(urlbase)
+    jsonResults = results.read()
+    dic = eval(jsonResults)
+    return dic['ResultSet']['Result']
    
 
 if __name__ == '__main__':
-   dummy = Dummy(raw_input(&quot;Enter Text\n&quot;))
-   print extractKeyWords(dummy)
\ No newline at end of file
+    dummy = Dummy(raw_input(&quot;Enter Text\n&quot;))
+    print extractKeyWords(dummy)
\ No newline at end of file</diff>
      <filename>content_analyst_api.py</filename>
    </modified>
    <modified>
      <diff>@@ -5,45 +5,50 @@ from flickr_keys import *
 
 
 class Photo:
-  def __init__(self,url,tags):
-     self.tags = tags
-     self.url = url
+    def __init__(self,url,tags):
+        self.tags = tags
+        self.url = url
+        self.content_tags = {}
 
-  def relevant_content(self):
-     return &quot;&quot;
+    def relevant_content(self):
+        return &quot;&quot;
 
-  def __str__(self):
-     return &quot;text: %s tags: %s&quot;%(self.text,self.tags)
+    def __str__(self):
+        return &quot;text: %s tags: %s&quot;%(self.text,self.tags)
 
-  __repr__ = __str__
+    __repr__ = __str__
 
 def authFlickr(format='etree'):
-   &quot;&quot;&quot;login no flickr&quot;&quot;&quot;
-   f = flickrapi.FlickrAPI(webapi,secret=websecret,format=format)
-   return f
+    &quot;&quot;&quot;login no flickr&quot;&quot;&quot;
+    f = flickrapi.FlickrAPI(webapi,secret=websecret,format=format)
+    return f
 
 def get_json(text):
-   start_str = 'jsonFlickrApi('
-   if text.startswith(start_str):
+    start_str = 'jsonFlickrApi('
+    if text.startswith(start_str):
        text = text[len(start_str):-1]
-   json = simplejson.loads(text)
-   return json
+    json = simplejson.loads(text)
+    return json
 
 def getFlickers():
+   tag_count = 0
    flickr = authFlickr()
-   recent = flickr.photos_getrecent(user_id=userid, per_page='3',format='json')
+   recent = flickr.photos_getrecent(user_id=userid, per_page='300',format='json')
    recent_json = get_json(recent)
    photos = []
    for photo in recent_json['photos']['photo']:
        photo_json = get_json(flickr.photos_getInfo(photo_id=photo['id'], format='json'))
-       photos.append({'url': (&quot;http://farm%(farm)s.static.flickr.com/%(server)s/%(id)s_%(secret)s.jpg&quot; % photo),
-                    'json': photo_json,
-                   })
-
-   for photo in photos:
-       print photo
+       try:
+           photo_object = Photo(
+                (&quot;http://farm%(farm)s.static.flickr.com/%(server)s/%(id)s_%(secret)s.jpg&quot; % photo),
+                [tag['_content'] for tag in photo_json['photo']['tags']['tag']]
+                )
+           photos.append(photo_object)
+           tag_count += len(photo_object.tags)
+       except: pass
+   print tag_count       
    return photos
 
 
 if __name__=='__main__':
-   print getFlickers()
+    getFlickers()</diff>
      <filename>flickr_api.py</filename>
    </modified>
    <modified>
      <diff>@@ -6,30 +6,30 @@ IDEAS
 '''
 
 class Twit:
-   def __init__(self,text):
-      self.text = text
-      self.content_tags = []
-   
-   def relevant_content(self):
-      return self.text
-      
-   def __str__(self):
-      return &quot;'%s'&quot;%(self.text)
-   
-   __repr__ = __str__
+    def __init__(self,text):
+        self.text = text
+        self.content_tags = {}
+
+    def relevant_content(self):
+        return self.text
+
+    def __str__(self):
+        return &quot;'%s'&quot;%(self.text)
+
+    __repr__ = __str__
 
 def getTwits():
-   tw = twitter.Twitter()
-   timeline = tw.statuses.public_timeline()
-   twits = []
-   for t in timeline:
-      try:
-         twit = Twit(str(t['text']))
-         twits.append(twit)
-      except UnicodeError:
-         pass
-         
-   return twits
+    tw = twitter.Twitter()
+    timeline = tw.statuses.public_timeline()
+    twits = []
+    for t in timeline:
+        try:
+            twit = Twit(str(t['text']))
+            twits.append(twit)
+        except UnicodeError:
+            pass
+     
+    return twits
    
 if __name__ == '__main__':
    print getTwits()</diff>
      <filename>twitter_api.py</filename>
    </modified>
  </modified>
  <removed type="array"/>
  <parents type="array">
    <parent>
      <id>1744809ffbf6815d66d7b123e6fdb26620dc387f</id>
    </parent>
  </parents>
  <author>
    <name>Fabs</name>
    <email>fabriciosn@gmail.com</email>
  </author>
  <url>http://github.com/Fabs/eventomeeter/commit/f2e64d5813904e214cfc6ecb461aa9a4a7e1fba7</url>
  <id>f2e64d5813904e214cfc6ecb461aa9a4a7e1fba7</id>
  <committed-date>2008-11-08T18:36:42-08:00</committed-date>
  <authored-date>2008-11-08T18:36:42-08:00</authored-date>
  <message>Some alterations for clustering tags</message>
  <tree>14c4062b508da25da12310d38b5abc6fff0648da</tree>
  <committer>
    <name>Fabs</name>
    <email>fabriciosn@gmail.com</email>
  </committer>
</commit>
