Merge pull request #11 from fabfab1/develop

Error corrections

Author: Forni B

EnCAB/EnCAB.py

@@ -19,6 +19,24 @@
 os.chdir(__location__)
 
 
+class Logger(object):
+    def __init__(self):
+        self.terminal = sys.stdout
+        self.log = open('log.txt', 'w')
+
+    def write(self, message):
+        self.terminal.write(message)
+        self.log.write(message)
+
+    def flush(self):
+        pass
+
+# save text to log.txt
+logger = Logger()
+sys.stdout = logger
+sys.stderr = logger
+
+
 def files_index(website_dir):
     """ Generate dict of file names from first subdirectories """
 
@@ -59,7 +77,6 @@ def parse(filename, index):
         tree = ET.parse(filename)
     except ET.ParseError as err:
         print(f'[Err] "{os.path.basename(filename)}" {err}.')
-        input()
         sys.exit()
 
     """
@@ -103,7 +120,7 @@ def parse(filename, index):
                       .format(d_type.tag+'/'+d_type.text.replace(' ','_'), os.path.basename(filename)))
 
     # Check operations
-    op = False
+    op_result = False
     if root.find('algdata/results'):
         for var in root.find('algdata/results'):
             # Check <unit> in results
@@ -116,9 +133,8 @@ def parse(filename, index):
                           .format('units/'+unit.replace(' ', '_'), os.path.basename(filename)))
             # Check <op> in results
             if not var.find('op').text:
-                print(f'[Err] Missing <op> in "{os.path.basename(filename)}"')
-            else:
-                op = True
+                print(f'[Err] Missing <op> in <results> in "{os.path.basename(filename)}"')
+            op_result = True
     if root.find('algdata/variables'):
         for var in root.find('algdata/variables'):
             # Check <unit> in variables
@@ -130,11 +146,8 @@ def parse(filename, index):
                     print('[Err] "{}"  from "{}" not found in website files.'
                           .format('units/'+unit.replace(' ', '_'), os.path.basename(filename)))
             # Check <op> in variables
-            if not op:
-                if var.find('op').text:
-                    op = True
-    if not op:
-        print(f'[Err] Missing <op> in "{os.path.basename(filename)}"')
+            if not op_result and (var.find('op') is None or not var.find('op').text):
+                print(f'[Err] Missing <op> in "{os.path.basename(filename)}"')
 
     # TODO: all errors trap (check codes and info) [NOT everything must be present]
 
@@ -237,14 +250,6 @@ def generate_html(template, blocks_data):
         .get_template(filename).render(blocks_data=blocks_data)
 
 
-def perror(text):
-    """ Print the error and write it to log """
-
-    print(text)  # TODO
-
-    return
-
-
 def check_config():
     """ Base check to assert existence of files and directories """
 

EnCAB/log.txt

@@ -16,51 +16,8 @@ Press ENTER to Continue, Ctrl-C to Abort.
 
 [*] Generating indexes...
 [*] Importing algorithms data...
-[Err] "algorithm_type/weight_calculations" from "Abrams_1994_46_3.xml" not found in website files.
-[Err] "position_in_process/material" from "Abrams_1994_46_3.xml" not found in website files.
-
-[Err] Missing <unit> in "Abrams_1994_47_3.xml"
-[Err] Missing <unit> in "Abrams_1994_47_3.xml"
-[Err] Missing <unit> in "Abrams_1994_47_3.xml"
 [Err] Missing <unit> in "Abrams_1994_47_3.xml"
 [Err] Missing <unit> in "Abrams_1994_47_3.xml"
-[Err] Missing <unit> in "Abrams_1994_47_3.xml"
-
-[Err] "algorithm_type/tool" from "Abrams_1994_48_1.xml" not found in website files.
-
-[Err] "units/cm2"  from "Abrams_1994_49_1.xml" not found in website files.
-[Err] "units/cm2"  from "Abrams_1994_49_2.xml" not found in website files.
-
-[Err] "source_type/experimental_archaeology" from "Aurenche_1981_46.xml" not found in website files.
-[Err] "source_geographical_location/" from "Aurenche_1981_46.xml" not found in website folders.
-[Err] "units/percentage"  from "Aurenche_1981_46.xml" not found in website files.
-[Err] "algorithm_type/building_wall" from "Aurenche_1981_54.xml" not found in website files.
-[Err] "material/pise'" from "Aurenche_1981_54.xml" not found in website files.
-[Err] "source_type/experimental_archaeology" from "Aurenche_1981_54.xml" not found in website files.
-[Err] "source_geographical_location/" from "Aurenche_1981_54.xml" not found in website folders.
-[Err] "units/cm"  from "Aurenche_1981_54.xml" not found in website files.
-[Err] "units/days"  from "Aurenche_1981_54.xml" not found in website files.
-[Err] "source_geographical_location/" from "Aurenche_1981_66.xml" not found in website folders.
-[Err] "units/bricks"  from "Aurenche_1981_66.xml" not found in website files.
-[Err] "source_geographical_location/" from "Buccellati_2016_108.xml" not found in website folders.
-[Err] "source_geographical_location/" from "Buccellati_2016_109.xml" not found in website folders.
-[Err] "source_geographical_location/" from "Cornerstones_2006_132.xml" not found in website folders.
-[Err] "units/cm"  from "Cornerstones_2006_132.xml" not found in website files.
-[Err] "units/cm"  from "Cornerstones_2006_132.xml" not found in website files.
-[Err] "source_geographical_location/" from "Cornerstones_2006_133.xml" not found in website folders.
-[Err] "units/calcius"  from "Cornerstones_2006_133.xml" not found in website files.
-[Err] "units/piece"  from "Cornerstones_2006_133.xml" not found in website files.
-[Err] "algorithm_type/building_wall" from "Garner_1984_5.xml" not found in website files.
-[Err] "source_geographical_location/" from "Garner_1984_5.xml" not found in website folders.
-[Err] "units/m"  from "Garner_1984_5.xml" not found in website files.
-[Err] "source_geographical_location/" from "Heimpel_2009_223.xml" not found in website folders.
-[Err] "units/bricks"  from "Heimpel_2009_223.xml" not found in website files.
-[Err] "source_geographical_location/" from "Minke_1994_55.xml" not found in website folders.
-[Err] "units/units"  from "Minke_1994_55.xml" not found in website files.
-[Err] "source_geographical_location/" from "Robson_1999_67.xml" not found in website folders.
-[Err] "source_geographical_location/" from "Wulff_1966_126.xml" not found in website folders.
-[Err] "units/calcius"  from "Wulff_1966_126.xml" not found in website files.
-[Err] "units/gypsum"  from "Wulff_1966_126.xml" not found in website files.
 [*] Writing data...
 
 [+] Done!

EnCAB/templates/algorithm.html

@@ -10,8 +10,8 @@
 <b>{{ b.find('reference').text|replace('_','&nbsp;') }}</b>
 <table class="data">
     <tr>
-        <td class="col-1">Al Statement:</td><td class="col-2">{{ b.find('algdata/algorithm_statement').text or '' }}</td>
-        <td class="col-3">Al Math:</td><td class="col-4">{{ b.find('algdata/algorithm_math').text or '' }}</td>
+        <td class="col-1 AI-Statement">Al Statement:</td><td class="col-2 AI-Statement-input">{{ b.find('algdata/algorithm_statement').text or '' }}</td>
+        <td class="col-3 AI-Math">Al Math:</td><td class="col-4 AI-Math-input">{{ b.find('algdata/algorithm_math').text or '' }}</td>
     </tr>
     <tr>
         <td colspan="4">{%- if b.find('algdata/variables') %}
@@ -68,14 +68,14 @@
     <tr>
         <td>How to cite:</td><td>EnCAB alg. - {{ b.find('reference').text }}</td>
         <td>Created by/on:</td><td>{% if b.find('algauthors/creation_author_group/author') %}<a href="../bibliography/bibliography.html#{{(b.find('algauthors/creation_author_group/author/surname').text or '').strip('.,')|replace(' ','')}}{{(b.find('algauthors/creation_author_group/author/firstname').text or '').strip('.,')|replace(' ','')}}">{{(b.find('algauthors/creation_author_group/author/surname').text or '')}} {{(b.find('algauthors/creation_author_group/author/firstname').text or '')}}</a>{% endif %}
-        {%- if b.find('algauthors/creation_author_group/creation_date').text %}, {{ b.find('algauthors/creation_author_group/creation_date').text }}{% endif %}</td>
+        {%- if b.find('algauthors/creation_author_group/author/creation_date').text %}, {{ b.find('algauthors/creation_author_group/author/creation_date').text }}{% endif %}</td>
     </tr>
     <tr>
         <td>Input data:</td><td><a href="../algorithms_data/{{filename}}">{{ filename }}</a></td>
         <td>Modified by/on:</td><td>
         {%- for modification_author in b.find('algauthors/modification_author_group') %}
             <a href="../bibliography/bibliography.html#{{(modification_author.find('surname').text or '').strip('.,')|replace(' ','')}}{{(modification_author.find('firstname').text or '').strip('.,')|replace(' ','')}}">{{(modification_author.find('surname').text or '')}} {{(modification_author.find('firstname').text or '')}}</a>
-            {%- if modification_author.find('creation_date').text %}, {{ modification_author_group.find('creation_date').text }}{% endif %}
+            {%- if modification_author.find('modification_date').text %}, {{ modification_author.find('modification_date').text }}{% endif %}
         {%- if not loop.last %}; {% endif %}{% endfor %}</td>
     </tr>
 </table>

EnCAB/to-do programming.txt

@@ -1,15 +1,9 @@
 List of things still to do in EnCAB Program:
 
-PRIORITY 1
-----------
-Created by/on field is missing the 'on' portion, which should be taken from <creation_date>. I assume same needs to be done for Modified by/on. Only the author's name would be linked, as you have it now.
 
-source_geography seems to give an error in the log.txt for missing HTML file when it is there.
 
+- check Aurence <op>
 
-PRIORITY 2
-----------
-in the algorithm table, it would be good if the "Al Statement" and "Al Math:" as well as their inputs could be different in the style.css (so a total of 4 styles), so that they can individually be made bold or italics or slightly larger font so as to make them stand out.
 
 The HTML files where the algorithms are placed should have links to anchors for the different categories; example, at the top of 'Algorithms by Material' instead of links to the individual algorithms (Abrans 1994_47_1 etc) there should be links to the materials, so 'earth', 'mudbrick', 'pise'', 'plaster' etc. The same for the algorithm_type.html and the algorithm_position_in_process.html. The algorithm_bibliography.html would instead be by author_year, so Abrams 1994.
 
@@ -20,7 +14,7 @@ write programming page
 write Bernardo bio page
 
 
-PRIORITY 3
 ----------
+
 create a CSV data dump from all the input files used (also the ones with errors) with the XML tags as headers. Filename should be "EnCAB_input_xyz.csv" where xyz is the date (year month day format) and time. the seperator should be a tab character (the error trapping should give an error if there is a tab used in the input, and should replace that character with 5 spaces when sending to the CSV file)