--- a/scrape.py
+++ b/scrape.py
@@ -3,17 +3,6 @@
 import urllib2
 from BeautifulSoup import BeautifulSoup
 import re
-
-couch = couchdb.Server() # Assuming localhost:5984
-# If your CouchDB server is running elsewhere, set it up like this:
-# couch = couchdb.Server('http://example.com:5984/')
-
-# select database
-agencydb = couch['disclosr-agencies']
-
-for row in agencydb.view('app/getScrapeRequired'): #not recently scraped agencies view?
-    agency = agencydb.get(row.id)
-    print agency['agencyName']
 
 #http://diveintopython.org/http_web_services/etags.html
 class NotModifiedHandler(urllib2.BaseHandler):  
@@ -23,9 +12,10 @@
         return addinfourl
 
 def scrapeAndStore(URL, depth, agency):
-    URL = "http://www.hole.fi/jajvirta/weblog/"
+    URL = "http://www.google.com"
     req = urllib2.Request(URL)
-    
+    etag = 'y'
+    last_modified = 'y'
     #if there is a previous version sotred in couchdb, load caching helper tags
     if etag:
         req.add_header("If-None-Match", etag)
@@ -41,24 +31,46 @@
     file_size = headers.getheader("Content-Length") 
     mime_type = headers.getheader("Content-Type") 
      
-    if hasattr(url_handle, 'code') and url_handle.code == 304:
-        print "the web page has not been modified"
+    if hasattr(url_handle, 'code'): 
+        if url_handle.code == 304:
+            print "the web page has not been modified"
+        else: 
+            #do scraping
+            html = url_handle.read()
+            # http://www.crummy.com/software/BeautifulSoup/documentation.html
+            soup = BeautifulSoup(html)
+        links = soup.findAll('a') # soup.findAll('a', id=re.compile("^p-"))
+        for link in links:
+            print link['href']
+            #for each unique link
+            #if html mimetype
+            # go down X levels,
+            # diff with last stored attachment, store in document
+            #if not
+            #   remember to save parentURL and title (link text that lead to document)
+    
+    #store as attachment epoch-filename
     else:
         print "error %s in downloading %s", url_handle.code, URL
         #record/alert error to error database
     
-    #do scraping
-    html = ?
-    # http://www.crummy.com/software/BeautifulSoup/documentation.html
-    soup = BeautifulSoup(html)
-links = soup.findAll('a') # soup.findAll('a', id=re.compile("^p-"))
-for link in links:
-    print link['href']
-    #for each unique link
-    #if html mimetype
-    # go down X levels,
-    # diff with last stored attachment, store in document
-    #if not
-    #   remember to save parentURL and title (link text that lead to document)
     
-    #store as attachment epoch-filename
+
+
+
+
+
+
+
+
+
+couch = couchdb.Server('http://192.168.1.148:5984/')
+
+# select database
+agencydb = couch['disclosr-agencies']
+
+for row in agencydb.view('app/getScrapeRequired'): #not recently scraped agencies view?
+    agency = agencydb.get(row.id)
+    print agency['name']
+scrapeAndStore("A",1,1)
+