diff -r 7d016d52be36 -r f2d54d2841f3 src/catedit/api.py --- a/src/catedit/api.py Fri Dec 12 16:45:47 2014 +0100 +++ b/src/catedit/api.py Tue Dec 16 11:14:55 2014 +0100 @@ -1,6 +1,6 @@ from flask.ext.restful import Resource, fields, Api, reqparse from flask import request -from app import app, cache +from catedit import app, cache from models import Category, CategoryManager from rdflib import Graph, RDF from utils import * @@ -8,7 +8,9 @@ from config import * import os + api = Api(app) +logger = app.logger cat_parser = reqparse.RequestParser() cat_parser.add_argument('label', type=str) @@ -41,29 +43,30 @@ cat_manager_instance = CategoryManager() new_property_list = [] - # print args["property_predicate"] - # print args["property_object"] + + logger.debug(args["property_predicate"]) + logger.debug(args["property_object"]) for property_predicate, property_object in zip( args["property_predicate"], args["property_object"]): if property_object: property_object_to_append = property_object # if URIRef category, we must prefix id with namespace - if app.config["PROPERTY_LIST"] \ - [property_predicate] \ - ["object_type"] == "uriref-category" : - property_object_to_append = app.config["ONTOLOGY_NAMESPACE"] \ - + property_object - # print property_object_to_append + if (app.config["PROPERTY_LIST"] + [property_predicate] + ["object_type"]) == "uriref-category": + property_object_to_append = \ + app.config["ONTOLOGY_NAMESPACE"] + property_object + logger.debug(property_object_to_append) new_property_list.append((property_predicate, property_object_to_append)) - # print new_property_list + logger.debug(new_property_list) c = cat_manager_instance.load_cat(cat_id) c.edit_category(new_description=args["description"], new_label=args["label"], new_other_properties=new_property_list) cat_manager_instance.save_cat(c, message=args["commit_message"]) - # print "put id: "+c.cat_id + logger.debug("put id: "+c.cat_id) cache.clear() return c.cat_graph.serialize(format='turtle'), 200 # Maybe not send the whole cat back, see if it's worth it @@ -72,28 +75,28 @@ def post(self): args = cat_parser.parse_args() property_list = [] - # print args["property_predicate"] - # print args["property_object"] + logger.debug(args["property_predicate"]) + logger.debug(args["property_object"]) for property_predicate, property_object in zip( request.form.getlist('property_predicate'), request.form.getlist('property_object')): if property_object: - if app.config["PROPERTY_LIST"] \ - [property_predicate] \ - ["object_type"] == "uriref-category": + if (app.config["PROPERTY_LIST"] + [property_predicate] + ["object_type"]) == "uriref-category": property_list.append((property_predicate, app.config["ONTOLOGY_NAMESPACE"] - +property_object)) + + property_object)) else: property_list.append((property_predicate, property_object)) - # print property_list + logger.debug(property_list) c = Category(label=args["label"], description=args["description"], other_properties=property_list) cat_manager_instance = CategoryManager() cat_manager_instance.save_cat(c, message=args["commit_message"]) - # print "post id: "+c.cat_id + logger.debug("post id: "+c.cat_id) cache.clear() return c.cat_graph.serialize(format='turtle'), 201 @@ -105,7 +108,7 @@ else: message = request.form["delete_message"] cat_manager_instance.delete_cat(cat_id, message=message) - # print "delete id: "+cat_id + logger.debug("delete id: "+cat_id) cache.clear() return 204