changed all name lookups to report IUPAC name, except when unavailable

ChemID.py

@@ -155,10 +155,10 @@ def smiles2name(smiles):
     # first try chemicals package
     try:
         cm = chemicals.search_chemical(smiles)
-        if cm.common_name:
-            name = cm.common_name
-        elif cm.iupac_name:
+        if cm.iupac_name:
             name = cm.iupac_name
+        elif cm.common_name:
+            name = cm.common_name
     except:
         name = None
     # then try pubchem for compounds
@@ -237,7 +237,7 @@ def cas2name(cas):
     if not name:
         try:
             cm = chemicals.search_chemical(cas)
-            name = cm.common_name
+            name = cm.iupac_name
         except:
             name = None
     # then try cirpy
@@ -268,7 +268,8 @@ def string2name(string):
     # try chemicals package
     try:
         cm = chemicals.search_chemical(string)
-        name = cm.common_name
+        name = cm.iupac_name
+        #name = cm.common_name
         origin = 'chemicals'
     except KeyboardInterrupt:
         raise
@@ -280,10 +281,11 @@ def string2name(string):
         try:
             compounds = pcp.get_compounds(string, namespace='name')
             c = compounds[0]
-            #name = c.iupac_name
-            #if not name:
+            if c.iupac_name:
+                name = c.iupac_name
+            if not name:
             # have seen empty iupac_name before, try synonyms if this happens
-            name = c.synonyms[0]
+                name = c.synonyms[0]
             origin = 'PubChem'
         except:
             name = None