Corrected script for html generation

mwetter · mwetter · commit d14e4094b89d · 2026-05-04T10:26:06.000-07:00
diff --git a/bin/cleanHTML.py b/bin/cleanHTML.py
@@ -96,7 +96,9 @@ def validateLine(line, filNam):
   <!-- Custom changes for Modelica -->
   <link href="../Resources/www/css/modelicaDoc.css" rel="stylesheet">
 
-</head>
+</head>''',
+                    '<body>':
+                     '''
 <body>
   <div id="navbar" class="navbar navbar-default ">
   <div class="container-fluid">
@@ -118,7 +120,7 @@ def validateLine(line, filNam):
               <li><a href="{homepage}">Home</a></li>
               <li><a href="{library_name}.html">Modelica</a></li>
         </ul>
-      </div>
+    </div>
   </div>
 </div>
 <div class="page-content">'''.format( \
@@ -197,13 +199,22 @@ def validateLine(line, filNam):
         # be nothing else than an address information, i.e., no date.
         # Hence, we change this entry.
         found = False
-        for iLin in range(len(lines)-2):
-            if "<address>" in lines[iLin].strip() and "</address>" in lines[iLin+2].strip():
-                lines[iLin+1] = '''<p></p>
+        for iLin in range(len(lines)):
+            linStr = lines[iLin].strip()
+            if linStr.startswith('<address>') or \
+            linStr.startswith('<a href="http://www.3ds.com/">Automatically generated</a>') or \
+            linStr.startswith('</address>') or \
+            linStr.startswith('</body>') or \
+            linStr.startswith('</html>'):
+                lines[iLin] = '\n'
+                found = True
+
+        lines.append('''
+</div> <!-- page-content -->
 <footer>
 <div class="footer">
   <p>
-    <a href=\"{homepage}\">{homepage}</a>
+    <a href="{homepage}">{homepage}</a>
   </p>
 </div>
 </footer>
@@ -212,15 +223,15 @@ def validateLine(line, filNam):
 ================================================== -->
 <!-- Placed at the end of the document so the pages load faster -->
 <script src="https://ajax.googleapis.com/ajax/libs/jquery/1.12.4/jquery.min.js"></script>
-<script>window.jQuery || document.write('<script src="../Resources/www/js/jquery.min.js"><\/script>')</script>
+<script>window.jQuery || document.write('<script src="../Resources/www/js/jquery.min.js"><\\/script>')</script>
 <script src="../Resources/www/js/bootstrap.min.js"></script>
 <!-- IE10 viewport hack for Surface/desktop Windows 8 bug -->
 <script src="../Resources/www/js/ie10-viewport-bug-workaround.js"></script>
 
   </body>
 
-</html>'''.format(homepage = HOMEPAGE)
-                found = True
+</html>'''.format(homepage = HOMEPAGE))
+
         if found:
             filObj=open(filNam, 'w')
             filObj.writelines(lines)
