HPCC-10299 Revise based on review

Rename WUSFapplication to WUSFcustom;
Set WUSFcustom inside addWUQueryFilterApplication().

common/workunit/workunit.cpp

@@ -2390,7 +2390,7 @@ public:
                     namefilterhi.set(fv);
                 else if (subfmt==WUSFwildwuid)
                     namefilter.set(fv);
-                else if (subfmt==WUSFapplication)
+                else if (subfmt==WUSFcustom)
                     query.append("[").append(fv).append("]");
                 else if (!fv || !*fv)
                     unknownAttributes.append(getEnumText(subfmt,workunitSortFields));

common/workunit/workunit.hpp

@@ -1102,7 +1102,7 @@ enum WUSortField
     WUSFtotalthortime = 20,
     WUSFwildwuid = 21,
     WUSFecl = 22,
-    WUSFapplication = 23,
+    WUSFcustom = 23,
     WUSFterm = 0,
     WUSFreverse = 256,
     WUSFnocase = 512,

esp/services/ws_workunits/ws_workunitsService.cpp

@@ -1660,14 +1660,14 @@ bool addWUQueryFilterTime(WUSortField *filters, unsigned short &count, MemoryBuf
     return true;
 }
 
-bool addWUQueryFilterApplication(WUSortField *filters, unsigned short &count, MemoryBuffer &buff, const char *appname, const char *appkey, const char *appdata, WUSortField sortField)
+bool addWUQueryFilterApplication(WUSortField *filters, unsigned short &count, MemoryBuffer &buff, const char *appname, const char *appkey, const char *appdata)
 {
     if (isEmpty(appname) && isEmpty(appkey) && isEmpty(appdata)) //no application filter
         return false;
     VStringBuffer path("Application/%s/%s", appname && *appname ? appname : "*", appkey && *appkey ? appkey : "*");
     if(appdata && *appdata)
         path.append("=?~\"").append(appdata).append("\"");
-    filters[count++] = sortField;
+    filters[count++] = WUSFcustom;
     buff.append(path.str());
     return true;
 }
@@ -1764,7 +1764,7 @@ void doWUQueryWithSort(IEspContext &context, IEspWUQueryRequest & req, IEspWUQue
 
     addWUQueryFilterTime(filters, filterCount, filterbuf, req.getStartDate(), WUSFwuid);
     addWUQueryFilterTime(filters, filterCount, filterbuf, req.getEndDate(), WUSFwuidhigh);
-    addWUQueryFilterApplication(filters, filterCount, filterbuf, req.getApplicationName(), req.getApplicationKey(), req.getApplicationData(), WUSFapplication);
+    addWUQueryFilterApplication(filters, filterCount, filterbuf, req.getApplicationName(), req.getApplicationKey(), req.getApplicationData());
 
     filters[filterCount] = WUSFterm;