fix the exception and the switch between VO providers.

Author: ejoliet

src/firefly/java/edu/caltech/ipac/firefly/server/persistence/NedSearch.java

@@ -10,10 +10,7 @@
 import edu.caltech.ipac.firefly.server.util.ipactable.DataGroupReader;
 import edu.caltech.ipac.firefly.server.util.ipactable.TableDef;
 import edu.caltech.ipac.firefly.util.DataSetParser;
-import edu.caltech.ipac.util.DataGroup;
-import edu.caltech.ipac.util.DataObject;
-import edu.caltech.ipac.util.DataType;
-import edu.caltech.ipac.util.IpacTableUtil;
+import edu.caltech.ipac.util.*;
 
 import java.io.File;
 import java.io.UnsupportedEncodingException;
@@ -45,6 +42,13 @@ protected String getFilePrefix(TableServerRequest request) {
     protected File postProcessData(File dgFile, TableServerRequest request) throws Exception {
         String url = "http://ned.ipac.caltech.edu/cgi-bin/objsearch?objname=%s&extend=no&list_limit=5&img_stamp=YES";
         final DataGroup resDg = DataGroupReader.read(dgFile);
+        //Check if this is the first time (original table to be postporcess)  for a different usage (Statistic/XYWithWerror, etc.
+        if (!StringUtils.isEmpty(resDg.getAttribute("joined"))) {
+            return dgFile;
+        } else {
+            resDg.addAttribute("joined", "true");
+        }
+
         TableDef tableDef = IpacTableUtil.getMetaInfo(dgFile);
         int maxWidth = NED_OBJECT_NAME.length();
         Iterator<DataObject> iterator = resDg.iterator();

src/firefly/js/tables/TableUtil.js

@@ -184,7 +184,9 @@ export function makeVOCatalogRequest(title, params={}, options={}) {
     var req = {startIdx: 0, pageSize: 100};
     options.use = options.use || 'catalog_overlay';
     const tbl_id = options.tbl_id || uniqueTblId();
-    const id = params.ned?'NedSearch':'ConeSearchByURL';
+    const providerid = voProviders[params.providerName];
+
+    const id = providerid || 'ConeSearchByURL';
     const UserTargetWorldPt = params.UserTargetWorldPt || params.position;  // may need to convert to worldpt.
     var META_INFO = Object.assign(options.META_INFO || {}, {title, tbl_id});
 
@@ -194,6 +196,8 @@ export function makeVOCatalogRequest(title, params={}, options={}) {
     return omitBy(Object.assign(req, options, params, {id, tbl_id, META_INFO, UserTargetWorldPt}), isNil);
 }
 
+const voProviders = {'NED':'NedSearch'};
+
 /**
  * create a deep clone of the given request.  tbl_id is removed from the cloned request.
  * @param {TableRequest} request  the original request to clone

src/firefly/js/visualize/ui/CatalogSelectViewPanel.jsx

@@ -45,6 +45,7 @@ const COLDEF1 = 9;
 const COLDEF2 = 8;
 const dropdownName = 'IrsaCatalogDropDown';
 const constraintskey = 'inputconstraint';
+const voProviders = [{name: 'NED', id: 'NedSearch'}];
 
 /**
  * Globally scoped here, master table, columns object
@@ -262,11 +263,11 @@ function doVoSearch(request, providerName = '') {
             [ServerParams.USER_TARGET_WORLD_PT]: request[ServerParams.USER_TARGET_WORLD_PT],
             SearchMethod: 'Cone',
             radius: conesize, //degree!
-            ned:true,
+            providerName,
             accessUrl
         }
     );
-    dispatchTableSearch(tReq);
+    dispatchTableSearch(tReq, {backgroundable:true});
 }
 
 function doLoadTable(request) {