move UCD to saner place, and add some missing keyword definitions (that

need docstrings...)

Author: keflavich

astroquery/vizier/core.py

@@ -48,6 +48,21 @@ class VizierClass(BaseQuery):
     def __init__(self, columns=["*"], column_filters={}, catalog=None,
                  keywords=None, ucd="", timeout=conf.timeout,
                  vizier_server=conf.server, row_limit=conf.row_limit):
+        """
+        Parameters
+        ----------
+        columns : list
+            List of strings
+        column_filters : dict
+        catalog : str or None
+        keywords : str or None
+        ucd : string
+            "Unified Content Description" column descriptions.  Specifying
+            these will select only catalogs that have columns matching the
+            column descriptions defined on the Vizier web pages.
+            See http://vizier.u-strasbg.fr/vizier/vizHelp/1.htx#ucd and
+            http://cds.u-strasbg.fr/w/doc/UCD/
+        """
 
         super(VizierClass, self).__init__()
         self.columns = columns
@@ -154,7 +169,7 @@ def keywords(self):
         self._keywords = None
 
     def find_catalogs(self, keywords, include_obsolete=False, verbose=False,
-                      ucd='', max_catalogs=None, return_type='votable'):
+                      max_catalogs=None, return_type='votable'):
         """
         Search Vizier for catalogs based on a set of keywords, e.g. author name
 
@@ -165,12 +180,6 @@ def find_catalogs(self, keywords, include_obsolete=False, verbose=False,
             From `Vizier <http://vizier.u-strasbg.fr/doc/asu-summary.htx>`_:
             "names or words of title of catalog. The words are and'ed, i.e.
             only the catalogues characterized by all the words are selected."
-        ucd : string
-            "Unified Content Description" column descriptions.  Specifying
-            these will select only catalogs that have columns matching the
-            column descriptions defined on the Vizier web pages.
-            See http://vizier.u-strasbg.fr/vizier/vizHelp/1.htx#ucd and
-            http://cds.u-strasbg.fr/w/doc/UCD/
         include_obsolete : bool, optional
             If set to True, catalogs marked obsolete will also be returned.
         max_catalogs : int or None
@@ -201,8 +210,7 @@ def find_catalogs(self, keywords, include_obsolete=False, verbose=False,
 
         data_payload = {'-words': keywords, '-meta.all': 1}
 
-        ucd_ = self._schema_ucd.validate(ucd)
-        data_payload['-ucd'] = ucd_
+        data_payload['-ucd'] = self.ucd
 
         if max_catalogs is not None:
             data_payload['-meta.max'] = max_catalogs