From 64376f493ac225954912f9419480518ebe4b373a Mon Sep 17 00:00:00 2001
From: Samo Penic <samo.penic@gmail.com>
Date: Wed, 21 Nov 2018 14:25:30 +0000
Subject: [PATCH] Fixes in loading templates.

---
 GenerateTests.py |   52 +++++++++++++++++++++-------------------------------
 setup.py         |    2 ++
 2 files changed, 23 insertions(+), 31 deletions(-)

diff --git a/GenerateTests.py b/GenerateTests.py
index 3ab0c8d..986c3e6 100644
--- a/GenerateTests.py
+++ b/GenerateTests.py
@@ -1,44 +1,34 @@
 from aoi_gen.BerkiParse import BerkiParse
 from aoi_gen.Problem import ProblemSource, Problem
 from aoi_gen.Exam import Exam
+import pkg_resources
+import os
 
+if pkg_resources.resource_dir is not None:
+    template_path = os.path.join(pkg_resources.resource_dir, "/textemplates")
+else:
+    template_path = "aoi_gen/textemplates"
 
 if __name__ == "__main__":
-    # from glob import glob
-    #
-    # # THIS IS TO BE READ FROM THE DATABASE
-    # filelist = glob("testcases/*")
-    # naloge = []
-    # for i, f in enumerate(filelist):
-    #     with open(f) as fd:
-    #         cont = fd.read()
-    #     naloge.append((i, cont))
-    # source=[]
-    # for nal in naloge:
-    #     par=BerkiParse(nal[1])
-    #     par.parseSections()
-    #     source.append(ProblemSource(parser=par))
-
     settings = {
-        'exam_title': "Naslov izpita",
-        'date': "27.10.2018",
-        'faculty_name': "Fakulteta test",
-        'faculty_id': 0,
-        'exam_id': 0,
-        'last_line': "Empty line",
-        'start_number': 100,
-        'sid_prefill': "11x0xxxx", }
+        "exam_title": "Naslov izpita",
+        "date": "27.10.2018",
+        "faculty_name": "Fakulteta test",
+        "faculty_id": 0,
+        "exam_id": 0,
+        "last_line": "Empty line",
+        "start_number": 100,
+        "sid_prefill": "11x0xxxx",
+    }
 
-    student_list=[
-        ("64990162", "Samo Penic"),
-    ]
+    student_list = [("64990162", "Samo Penic")]
 
-    exam=Exam(settings=settings, student_list=student_list, number_of_papers=5)
+    exam = Exam(settings=settings, student_list=student_list, number_of_papers=5, template=template_path)
     exam.loadProblemsFromDirectory("testcases/*.txt")
     exam.generatePapers()
-    text=exam.exam_to_template()
-    #print(text)
-    exam_matrix=exam.get_answers()
+    text = exam.exam_to_template()
+    # print(text)
+    exam_matrix = exam.get_answers()
     print(exam_matrix)
-    with open('preverjanje.tex','w') as problem_fd:
+    with open("preverjanje.tex", "w") as problem_fd:
         problem_fd.write(text)
diff --git a/setup.py b/setup.py
index 6d27172..4304fc4 100644
--- a/setup.py
+++ b/setup.py
@@ -9,4 +9,6 @@
     author_email="samo.penic@gmail.com",
     url="",
     packages=["aoi_gen"],
+    include_package_data=True,
+    package_data={'aoi_gen': ['textemplates/*.tpl']},
 )

--
Gitblit v1.8.0