Commit d790f62d authored by PkSM3's avatar PkSM3

[DEF] commit for pulling from unstable

parent 093402df
...@@ -218,7 +218,6 @@ def project(request, project_id): ...@@ -218,7 +218,6 @@ def project(request, project_id):
#form = CorpusForm(request.POST, request.FILES) #form = CorpusForm(request.POST, request.FILES)
#print(str(request.POST)) #print(str(request.POST))
name = str(request.POST['name']) name = str(request.POST['name'])
try: try:
resource_type = ResourceType.objects.get(id=str(request.POST['type'])) resource_type = ResourceType.objects.get(id=str(request.POST['type']))
except Exception as error: except Exception as error:
...@@ -258,6 +257,8 @@ def project(request, project_id): ...@@ -258,6 +257,8 @@ def project(request, project_id):
) )
corpus.save() corpus.save()
print(request.user, resource_type , file )
print(corpus.language) print(corpus.language)
corpus.add_resource( corpus.add_resource(
user=request.user, user=request.user,
......
...@@ -129,11 +129,38 @@ class Node(CTENode): ...@@ -129,11 +129,38 @@ class Node(CTENode):
return Resource.objects.select_related('node_resource').filter(node_resource__node = self) return Resource.objects.select_related('node_resource').filter(node_resource__node = self)
def add_resource(self, **kwargs): def add_resource(self, **kwargs):
print("printing arguments for add_resource():")
print(kwargs)
from django.core.files.storage import default_storage
from django.core.files.base import ContentFile
import os
thefile = kwargs["file"]
path = default_storage.save('tmp/somename.zip', ContentFile(thefile.read()))
tmp_file = os.path.join(MEDIA_ROOT, path)
print(tmp_file)
kwargs["file"] = tmp_file
print("final kwargs:")
print(kwargs)
# only for tests # only for tests
resource = Resource(guid=str(time()), digest=str(time()), **kwargs ) resource = Resource(guid=str(time()), digest=str(time()), **kwargs )
#resource = Resource(**kwargs) #resource = Resource(**kwargs)
resource.save() resource.save()
print("printing rresource.file:")
print(resource.file)
# print("printing the resource 01____:")
# print(resource.file)
# print("printing the resource 02____: asdasdasd")
# User # User
if 'user' not in kwargs and 'user_id' not in kwargs: if 'user' not in kwargs and 'user_id' not in kwargs:
resource.user = self.user resource.user = self.user
...@@ -170,6 +197,8 @@ class Node(CTENode): ...@@ -170,6 +197,8 @@ class Node(CTENode):
'europress_french' : EuropressFileParser, 'europress_french' : EuropressFileParser,
'europress_english' : EuropressFileParser, 'europress_english' : EuropressFileParser,
})[resource.type.name]() })[resource.type.name]()
print("parse_resources:")
print(resource.file)
metadata_list += parser.parse(str(resource.file)) metadata_list += parser.parse(str(resource.file))
# retrieve info from the database # retrieve info from the database
type_id = NodeType.objects.get(name='Document').id type_id = NodeType.objects.get(name='Document').id
......
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