Commit 97c2bfa2 authored by Administrator's avatar Administrator

[FIX + REPORT BUG] node.metadata in json from postgresql.

parent fb990118
from django.http import HttpResponseNotFound, HttpResponse, Http404 from django.http import HttpResponseNotFound, HttpResponse, Http404
from django.core.exceptions import PermissionDenied, SuspiciousOperation from django.core.exceptions import PermissionDenied, SuspiciousOperation
from django.core.exceptions import ValidationError from django.core.exceptions import ValidationError
from django.core.urlresolvers import reverse
from django.db.models import Avg, Max, Min, Count, Sum from django.db.models import Avg, Max, Min, Count, Sum
# from node.models import Language, ResourceType, Resource # from node.models import Language, ResourceType, Resource
...@@ -10,6 +11,8 @@ from sqlalchemy import text, distinct ...@@ -10,6 +11,8 @@ from sqlalchemy import text, distinct
from sqlalchemy.sql import func from sqlalchemy.sql import func
from sqlalchemy.orm import aliased from sqlalchemy.orm import aliased
import json
from .db import * from .db import *
...@@ -578,7 +581,8 @@ class Nodes(APIView): ...@@ -578,7 +581,8 @@ class Nodes(APIView):
'id': node.id, 'id': node.id,
'name': node.name, 'name': node.name,
# 'type': node.type__name, # 'type': node.type__name,
'metadata': dict(node.metadata), #'metadata': dict(node.metadata),
'metadata': node.metadata,
}) })
# deleting node by id # deleting node by id
......
...@@ -619,8 +619,8 @@ def node_link(request, corpus_id): ...@@ -619,8 +619,8 @@ def node_link(request, corpus_id):
data = [] data = []
corpus = Node.objects.get(id=corpus_id) corpus = session.query(Node).filter(Node.id==corpus_id).first()
filename = MEDIA_ROOT + '/corpora/%s/%s_%s.json' % (request.user , corpus.parent.id, corpus_id) filename = MEDIA_ROOT + '/corpora/%s/%s_%s.json' % (request.user , corpus.parent_id, corpus_id)
print("file exists?:",os.path.isfile(filename)) print("file exists?:",os.path.isfile(filename))
if os.path.isfile(filename): if os.path.isfile(filename):
json_data = open(filename,"r") json_data = open(filename,"r")
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment