Added OX='n' -W-='n' case to gen_NFPA.sh

Also fixed re typo in Location regexp compile

diff --git a/chem_web.py b/chem_web.py
index 5494e6e44748dbcdaf493d6baa1a14cb49861c7e..203d2002b5fde0393d801e685c3a571dbd361092 100755 (executable)
--- a/chem_web.py
+++ b/chem_web.py
@@ -189,7 +189,7 @@ class docs (object) :
             db._refresh()
             formdata = web.input()
             user_regexp = formdata['regexp']
             db._refresh()
             formdata = web.input()
             user_regexp = formdata['regexp']

-            regexp = re.compile(user_regexp, 'I') # Case insensitive
+            regexp = re.compile(user_regexp, re.I) # Case insensitive

             path = dgen.door_warning(lambda r: regexp.match(r['Location']))
             print file(path, 'rb').read() ,
 
             path = dgen.door_warning(lambda r: regexp.match(r['Location']))
             print file(path, 'rb').read() ,
 

diff --git a/docs/mp/gen_NFPA.sh b/docs/mp/gen_NFPA.sh
index 805746729b6ee1e5f4e35777227b317debb55c48..4014905e5ae56a57f8e9b09799740425224663e4 100755 (executable)
--- a/docs/mp/gen_NFPA.sh
+++ b/docs/mp/gen_NFPA.sh
@@ -65,6 +65,8 @@ then
 elif [ "$W" == "y" ]
 then
     echo "o := btex {\medfont \W} etex;"
 elif [ "$W" == "y" ]
 then
     echo "o := btex {\medfont \W} etex;"

+else # both are "n"
+    echo "o := btex etex"

 fi
 
 if [ $REDIRECT -ne 0 ]
 fi
 
 if [ $REDIRECT -ne 0 ]