Merge pull request #1362 from afishbeck/ecl_defname

Command line should default jobname when deploying ecl file or archive

Reviewed-By: Richard Chapman <rchapman@hpccsystems.com>

ecl/eclcmd/eclcmd_core.cpp

@@ -354,11 +354,6 @@ public:
                 fprintf(stderr, "\nCluster must be specified when publishing ECL Text or Archive\n");
                 return false;
             }
-            if (optName.isEmpty())
-            {
-                fprintf(stderr, "\nQuery name must be specified when publishing an ECL Text or Archive\n");
-                return false;
-            }
         }
         return true;
     }
@@ -477,12 +472,7 @@ public:
         {
             if (optCluster.isEmpty())
             {
-                fprintf(stderr, "\nCluster must be specified when publishing ECL Text or Archive\n");
-                return false;
-            }
-            if (optName.isEmpty())
-            {
-                fprintf(stderr, "\nQuery name must be specified when publishing an ECL Text or Archive\n");
+                fprintf(stderr, "\nCluster must be specified when running ECL Text or Archive\n");
                 return false;
             }
         }

esp/services/ws_workunits/ws_workunitsService.cpp

@@ -3255,6 +3255,12 @@ void deployArchive(IEspContext &context, IEspWUDeployWorkunitRequest & req, IEsp
 
     if (notEmpty(req.getName()))
         wu->setJobName(req.getName());
+    else if (notEmpty(req.getFileName()))
+    {
+        StringBuffer name;
+        splitFilename(req.getFileName(), NULL, NULL, &name, NULL);
+        wu->setJobName(name.str());
+    }
 
     Owned<IWUQuery> query=wu->updateQuery();
     StringBuffer text(obj.length(), obj.toByteArray());
@@ -3327,8 +3333,6 @@ void deploySharedObject(IEspContext &context, IEspWUDeployWorkunitRequest & req,
         Owned<ILocalWorkUnit> embeddedWU = createLocalWorkUnit();
         embeddedWU->loadXML(wuXML);
         queryExtendedWU(wu)->copyWorkUnit(embeddedWU);
-        //Owned<IWUQuery> query = workunit->updateQuery();
-        //query->setQueryText(eclQuery.s.str());
     }
 
     StringBuffer dllurl;