浏览代码

HPCC-13960 Add PublishedBy as filter in WUListQueries

Also can sort the Queries by PublishedBy.

Signed-off-by: wangkx <kevin.wang@lexisnexis.com>
wangkx 10 年之前
父节点
当前提交
d113f16077

+ 1 - 0
common/workunit/workunit.cpp

@@ -2408,6 +2408,7 @@ mapEnums querySortFields[] =
    { WUQSFActivited, "@activated" },
    { WUQSFSuspendedByUser, "@suspended" },
    { WUQSFLibrary, "Library"},
+   { WUQSFPublishedBy, "@publishedBy" },
    { WUQSFterm, NULL }
 };
 

+ 1 - 0
common/workunit/workunit.hpp

@@ -1253,6 +1253,7 @@ enum WUQuerySortField
     WUQSFActivited = 14,
     WUQSFSuspendedByUser = 15,
     WUQSFLibrary = 16,
+    WUQSFPublishedBy = 17,
     WUQSFterm = 0,
     WUQSFreverse = 256,
     WUQSFnocase = 512,

+ 2 - 1
esp/scm/ws_workunits.ecm

@@ -1272,6 +1272,7 @@ ESPrequest [nil_remove] WUListQueriesRequest
     [min_ver("1.50")] string WUID;
     [min_ver("1.51")] string QueryID;
     [min_ver("1.51")] string QueryName;
+    [min_ver("1.56")] string PublishedBy;
 
     nonNegativeInteger PageSize(0);
     nonNegativeInteger PageStartFrom(0);
@@ -1609,7 +1610,7 @@ ESPresponse [exceptions_inline] WUGetStatsResponse
 };
 
 ESPservice [
-    version("1.55"), default_client_version("1.55"),
+    version("1.56"), default_client_version("1.56"),
     noforms,exceptions_inline("./smc_xslt/exceptions.xslt"),use_method_name] WsWorkunits
 {
     ESPmethod [resp_xsl_default("/esp/xslt/workunits.xslt")]     WUQuery(WUQueryRequest, WUQueryResponse);

+ 3 - 0
esp/services/ws_workunits/ws_workunitsQuerySets.cpp

@@ -1299,6 +1299,8 @@ bool CWsWorkunitsEx::onWUListQueries(IEspContext &context, IEspWUListQueriesRequ
             sortOrder[0] = (WUQuerySortField) (WUQSFwarnTimeLimit | WUQSFnumeric);
         else if (strieq(sortBy, "Priority"))
             sortOrder[0] = (WUQuerySortField) (WUQSFpriority | WUQSFnumeric);
+        else if (strieq(sortBy, "PublishedBy"))
+            sortOrder[0] = WUQSFPublishedBy;
         else if (strieq(sortBy, "QuerySetId"))
             sortOrder[0] = WUQSFQuerySet;
         else
@@ -1318,6 +1320,7 @@ bool CWsWorkunitsEx::onWUListQueries(IEspContext &context, IEspWUListQueriesRequ
     addWUQSQueryFilter(filters, filterCount, filterBuf, req.getQueryName(), (WUQuerySortField) (WUQSFname | WUQSFwild));
     addWUQSQueryFilter(filters, filterCount, filterBuf, req.getWUID(), WUQSFwuid);
     addWUQSQueryFilter(filters, filterCount, filterBuf, req.getLibraryName(), (WUQuerySortField) (WUQSFLibrary | WUQSFnocase));
+    addWUQSQueryFilter(filters, filterCount, filterBuf, req.getPublishedBy(), (WUQuerySortField) (WUQSFPublishedBy | WUQSFwild));
     if (!req.getMemoryLimitLow_isNull())
         addWUQSQueryFilterInt64(filters, filterCount, filterBuf, req.getMemoryLimitLow(), (WUQuerySortField) (WUQSFmemoryLimit | WUQSFnumeric));
     if (!req.getMemoryLimitHigh_isNull())