From: maxious Date: Sat, 04 Feb 2012 11:59:20 +0000 Subject: Don't hit the same URL twice in the same day X-Git-Url: https://maxious.lambdacomplex.org/git/?p=disclosr.git&a=commitdiff&h=d54e7489c2429c31e23118a4661d1e102af66160 --- Don't hit the same URL twice in the same day Former-commit-id: fc7d691cec408a85b38dc74e1fece1e3f10f388e --- --- a/scrape.py +++ b/scrape.py @@ -15,13 +15,25 @@ addinfourl.code = code return addinfourl -def fetchURL(docsdb, url, agencyID): +def fetchURL(docsdb, url, fieldName, agencyID, scrape_again=True): hash = hashlib.md5(url).hexdigest() req = urllib2.Request(url) - print "Fetching %s", url + print "Fetching %s" % url doc = docsdb.get(hash) if doc == None: - doc = {'_id': hash, 'agencyID': agencyID} + doc = {'_id': hash, 'agencyID': agencyID, 'url': url, 'fieldName':fieldName} + else: + if (time.time() - doc['page_scraped']) < 3600: + print "Uh oh, trying to scrape URL again too soon!" + last_attachment_fname = doc["_attachments"].keys()[-1] + last_attachment = docsdb.get_attachment(doc,last_attachment_fname) + return (doc['mime_type'],last_attachment) + if scrape_again == False: + print "Not scraping this URL again as requested" + return (None,None) + + time.sleep(3) # wait 3 seconds to give webserver time to recover + #if there is a previous version stored in couchdb, load caching helper tags if doc.has_key('etag'): req.add_header("If-None-Match", doc['etag']) @@ -33,6 +45,8 @@ headers = url_handle.info() # the addinfourls have the .info() too doc['etag'] = headers.getheader("ETag") doc['last_modified'] = headers.getheader("Last-Modified") + doc['date'] = headers.getheader("Date") + doc['page_scraped'] = time.time() doc['web_server'] = headers.getheader("Server") doc['powered_by'] = headers.getheader("X-Powered-By") doc['file_size'] = headers.getheader("Content-Length") @@ -40,7 +54,7 @@ if hasattr(url_handle, 'code'): if url_handle.code == 304: print "the web page has not been modified" - return None + return (None,None) else: content = url_handle.read() docsdb.save(doc) @@ -49,15 +63,16 @@ return (doc['mime_type'], content) #store as attachment epoch-filename else: - print "error %s in downloading %s", url_handle.code, URL - #record/alert error to error database - + print "error %s in downloading %s" % url_handle.code, URL + doc['error'] = "error %s in downloading %s" % url_handle.code, URL + docsdb.save(doc) + return (None,None) -def scrapeAndStore(docsdb, url, depth, agencyID): - (mime_type,content) = fetchURL(docsdb, url, agencyID) - if content != None: +def scrapeAndStore(docsdb, url, depth, fieldName, agencyID): + (mime_type,content) = fetchURL(docsdb, url, fieldName, agencyID) + if content != None and depth > 0: if mime_type == "text/html" or mime_type == "application/xhtml+xml" or mime_type =="application/xml": # http://www.crummy.com/software/BeautifulSoup/documentation.html soup = BeautifulSoup(content) @@ -70,21 +85,18 @@ print "Removing element", nav['class'] nav.extract() links = soup.findAll('a') # soup.findAll('a', id=re.compile("^p-")) + linkurls = set([]) for link in links: if link.has_key("href"): if link['href'].startswith("http"): - linkurl = link['href'] + # lets not do external links for now + # linkurls.add(link['href']) + None else: - linkurl = urljoin(url,link['href']) - print linkurl - #for each unique link - # if - #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) - + linkurls.add(urljoin(url,link['href'].replace(" ","%20"))) + for linkurl in linkurls: + #print linkurl + scrapeAndStore(docsdb, linkurl, depth-1, fieldName, agencyID) couch = couchdb.Server('http://127.0.0.1:5984/') @@ -95,5 +107,10 @@ for row in agencydb.view('app/getScrapeRequired'): #not recently scraped agencies view? agency = agencydb.get(row.id) print agency['name'] - scrapeAndStore(docsdb, agency['website'],1,agency['_id']) + for key in agency.keys(): + if key == 'website' or key.endswith('URL'): + print key + scrapeAndStore(docsdb, agency[key],agency['scrapeDepth'],key,agency['_id']) + agency['metadata']['lastscraped'] = time.time() + agencydb.save(agency)