Merge branch 'master' of ssh://gogs.davidventura.com.ar:443/david/alexis2

db.py

@@ -22,6 +22,7 @@ class db():
     def filter_articles(self, filter, limit=80):
         db_filter={}
         db_filter["matches"]=True
+        db_filter["deleted"]=False
         db_filter["scrap_date"]={}
         if "maxdate" in filter and len(filter["maxdate"])>7:
             db_filter["scrap_date"]["$lt"]=datetime.datetime.strptime(filter["maxdate"],"%Y-%m-%d")
@@ -67,6 +68,10 @@ class db():
         ret=self.c_articles.find_one({"_id":ObjectId(id)})
         return self.jsonable(ret)
 
+    def delete_article(self,artid):
+        self.c_articles.update({"_id":ObjectId(artid)},{"$set":{"deleted":True}})
+        return True
+
     def sources(self,id=None):
         if id is None:
             return [ self.jsonable(p) for p in self.c_sources.find() ]

news.py

@@ -86,6 +86,7 @@ class News():
                 "kw": self.MATCHING_KW,
                 "html": self.HTML, 
                 "error": self.ERROR,
+                "deleted": False,
                 "title": self.TITLE
                 }
 

web.py

@@ -56,6 +56,13 @@ def get_keywords():
 def get_articles():
     return jsonify(d.filter_articles({},limit=15)) 
 
+
+@app.route(BASEPATH+'/article/delete/<string:art_id>', methods=['GET'])
+def delete_article(art_id):
+    if not d.delete_article(art_id):
+        abort(401)
+    return jsonify({'ok':"ok"})
+
 @app.route(BASEPATH+'/article/<string:art_id>', methods=['GET'])
 def get_article(art_id):
     art=d.article(art_id)