Fix return from NPM search

Author: Grahame Grieve

release-notes.md

@@ -1,7 +1,7 @@
 ## Change Notes for {ver}:
 
-* 
+* Fix return from NPM search
 
 ## Conformance Notes:
 
-* 
+* tx.fhir.org passed 305 HL7 terminology service tests (mode 'tx.fhir.org', tests v1.7.7-SNAPSHOT, runner v6.5.14)

server/endpoint_packages.pas

@@ -93,7 +93,7 @@   TFHIRPackageWebServer = class (TFhirWebServerEndpoint)
     procedure servePage(fn : String; request : TIdHTTPRequestInfo; response : TIdHTTPResponseInfo; secure : boolean);
     procedure serveDownload(secure : boolean; id, version : String; response : TIdHTTPResponseInfo);
     procedure serveVersions(id, sort : String; secure : boolean; request : TIdHTTPRequestInfo; response : TIdHTTPResponseInfo);
-    procedure serveSearch(name, dependson, canonicalPkg, canonicalUrl, FHIRVersion, dependency, sort : String; secure : boolean; request : TIdHTTPRequestInfo; response : TIdHTTPResponseInfo);
+    procedure serveSearch(name, dependson, canonicalPkg, canonicalUrl, FHIRVersion, dependency, sort : String; secure, objWrapper : boolean; request : TIdHTTPRequestInfo; response : TIdHTTPResponseInfo);
     procedure serveUpdates(date : TFslDateTime; secure : boolean; response : TIdHTTPResponseInfo);
     procedure serveProtectForm(request : TIdHTTPRequestInfo; response : TIdHTTPResponseInfo; id : String);
     procedure serveLog(request : TIdHTTPRequestInfo; response : TIdHTTPResponseInfo);
@@ -1208,12 +1208,13 @@ function sel(this, that : String) : string;
 end;
 
 procedure TFHIRPackageWebServer.serveSearch(name, dependson, canonicalPkg, canonicalUrl,
-  FHIRVersion, dependency, sort: String; secure: boolean;
+  FHIRVersion, dependency, sort: String; secure, objWrapper: boolean;
   request: TIdHTTPRequestInfo; response: TIdHTTPResponseInfo);
 var
   conn : TFDBConnection;
   json : TJsonArray;
-  v : TJsonObject;
+  v, obj, w : TJsonObject;
+  e : TJsonNode;
   filter, src, dep : String;
   vars : TFslMap<TFHIRObject>;
   list : TFslList<TJsonObject>;
@@ -1340,10 +1341,26 @@ procedure TFHIRPackageWebServer.serveSearch(name, dependson, canonicalPkg, canon
         end
         else
         begin
-          src := TJsonWriterDirect.writeArrayStr(json, true);
+          if objWrapper then
+          begin
+            obj := TJsonObject.create;
+            try
+              for e in json do
+              begin
+                w := TJsonObject.create;
+                obj.forceArr['objects'].add(w);
+                w.obj['package'] := (e as TJsonObject).link;
+              end;
+              src := TJsonWriterDirect.writeObjectStr(obj, true);
+            finally
+              obj.free;
+            end;
+          end
+          else
+            src := TJsonWriterDirect.writeArrayStr(json, true);
           response.ContentType := 'application/json';
           response.ContentText := src;
-        end;   
+        end;
       finally
         json.free;
         deps.free;
@@ -1666,7 +1683,7 @@ function TFHIRPackageWebServer.doRequest(AContext: TIdContext; request: TIdHTTPR
     begin
       if not pm.has('lastUpdated') then
       begin
-        serveSearch(pm['name'], pm['dependson'], pm['pkgcanonical'], pm['canonical'], pm['fhirversion'], pm['dependency'], pm['sort'], secure, request, response);
+        serveSearch(pm['name'], pm['dependson'], pm['pkgcanonical'], pm['canonical'], pm['fhirversion'], pm['dependency'], pm['sort'], secure, false, request, response);
         result := 'Search Packages';
       end
       else if pm['lastUpdated'].startsWith('-') then
@@ -1682,7 +1699,7 @@ function TFHIRPackageWebServer.doRequest(AContext: TIdContext; request: TIdHTTPR
     end
     else if (request.CommandType = hcGET) and (request.Document = '/packages/-/v1/search') then
     begin
-      serveSearch(pm['text'], pm['dependson'], pm['pkgcanonical'], pm['canonical'], pm['fhirversion'], pm['dependency'], pm['sort'], secure, request, response);
+      serveSearch(pm['text'], pm['dependson'], pm['pkgcanonical'], pm['canonical'], pm['fhirversion'], pm['dependency'], pm['sort'], secure, true, request, response);
       result := 'Search Packages (v1)';
     end
     else if (request.CommandType = hcGET) and (request.Document = '/packages/log') then