Bug fixes for S4S Imaging Demo

hapi-fhir-jpaserver-example/src/main/java/ca/uhn/fhir/jpa/demo/Utl.java

@@ -236,10 +236,19 @@ public static List<Map<String, List<String>>> wadoQuery(String cmd, String lastU
 				String dcmKey = member.getKey();
 				List<String> dcmValues = new ArrayList<String>();
 				try {
-					JsonArray dcmJsonValues = member.getValue().getAsJsonObject().get("Value").getAsJsonArray();
+					JsonObject dcmJsonObj = member.getValue().getAsJsonObject();
+					boolean isPN = dcmJsonObj.get("vr").getAsString().equals("PN");
+					JsonArray dcmJsonValues = dcmJsonObj.get("Value").getAsJsonArray();
 					for (int k = 0; k < dcmJsonValues.size(); k++) {
-						String dcmv = dcmJsonValues.get(k).toString();
-						dcmv = dcmv.replaceAll("^\"|\"$", "");
+						String dcmv;
+						if (isPN) {
+							JsonObject pnObj = dcmJsonValues.get(k).getAsJsonObject();
+							JsonElement alphabetic = pnObj.get("Alphabetic");
+							dcmv = (alphabetic == null) ? "" : alphabetic.getAsString();
+						} else {
+							dcmv = dcmJsonValues.get(k).toString();
+							dcmv = dcmv.replaceAll("^\"|\"$", "");
+						}
 						dcmValues.add(dcmv);
 					}
 				} catch (NullPointerException e) {

hapi-fhir-jpaserver-example/src/main/java/ca/uhn/fhir/jpa/demo/WadoRsInterceptor.java

@@ -114,33 +114,19 @@ private void forwardRequest(String prefix, HttpServletRequest req, HttpServletRe
 				if (read <= 0) break;
 				conn.getOutputStream().write(buffer, 0, read);
 			}
-			try {
-				if(conn.getResponseCode() == 503) {
-					System.out.println("Waiting for connection.");
-					Thread.sleep(1000);
-				} else {
-					System.out.println("Response status: " + Integer.toString(conn.getResponseCode()));
-				}
-			} catch (Throwable e) {
-				System.out.println("Response status: " + Integer.toString(conn.getResponseCode()));
+			resp.setStatus(conn.getResponseCode());
+			for (int i = 0; ; ++i) {
+				final String header = conn.getHeaderFieldKey(i);
+				final String value = conn.getHeaderField(i);
+				if (header == null && value == null) break;
+				if (header != null) resp.setHeader(header, value);
 			}
-			if(conn.getResponseCode() == 503){
-				System.out.println("\n\n #### Waiting for image transfer. Re-run to complete. ####\n\n");
-			} else {
-				resp.setStatus(conn.getResponseCode());
-				for (int i = 0; ; ++i) {
-					final String header = conn.getHeaderFieldKey(i);
-					if (header == null) break;
-					final String value = conn.getHeaderField(i);
-					resp.setHeader(header, value);
-				}
 
-				InputStream is = conn.getInputStream();
-				OutputStream os = resp.getOutputStream();
-				IOUtils.copy(is, os);
-				is.close();
-				os.close();
-			}
+			InputStream is = conn.getInputStream();
+			OutputStream os = resp.getOutputStream();
+			IOUtils.copy(is, os);
+			is.close();
+			os.close();
 		} catch (Exception e) {
 			e.printStackTrace();
 			// pass

hapi-fhir-jpaserver-example/src/main/webapp/WEB-INF/web-non-polling-subscription-dstu2.xml

@@ -76,7 +76,7 @@
 		<init-param>
 			<description>A comma separated list of allowed headers when making a non simple CORS request.</description>
 			<param-name>cors.allowed.headers</param-name>
-			<param-value>X-FHIR-Starter,Origin,Accept,X-Requested-With,Content-Type,Access-Control-Request-Method,Access-Control-Request-Headers</param-value>
+			<param-value>X-FHIR-Starter,Origin,Accept,X-Requested-With,Content-Type,Access-Control-Request-Method,Access-Control-Request-Headers,Authorization</param-value>
 		</init-param>
 		<init-param>
 			<description>A comma separated list non-standard response headers that will be exposed to XHR2 object.</description>

hapi-fhir-jpaserver-example/src/main/webapp/WEB-INF/web-non-polling-subscription-dstu3.xml

@@ -76,7 +76,7 @@
 		<init-param>
 			<description>A comma separated list of allowed headers when making a non simple CORS request.</description>
 			<param-name>cors.allowed.headers</param-name>
-			<param-value>X-FHIR-Starter,Origin,Accept,X-Requested-With,Content-Type,Access-Control-Request-Method,Access-Control-Request-Headers</param-value>
+			<param-value>X-FHIR-Starter,Origin,Accept,X-Requested-With,Content-Type,Access-Control-Request-Method,Access-Control-Request-Headers,Authorization</param-value>
 		</init-param>
 		<init-param>
 			<description>A comma separated list non-standard response headers that will be exposed to XHR2 object.</description>

hapi-fhir-jpaserver-example/src/main/webapp/WEB-INF/web-polling-subscription-dstu2.xml

@@ -76,7 +76,7 @@
 		<init-param>
 			<description>A comma separated list of allowed headers when making a non simple CORS request.</description>
 			<param-name>cors.allowed.headers</param-name>
-			<param-value>X-FHIR-Starter,Origin,Accept,X-Requested-With,Content-Type,Access-Control-Request-Method,Access-Control-Request-Headers</param-value>
+			<param-value>X-FHIR-Starter,Origin,Accept,X-Requested-With,Content-Type,Access-Control-Request-Method,Access-Control-Request-Headers,Authorization</param-value>
 		</init-param>
 		<init-param>
 			<description>A comma separated list non-standard response headers that will be exposed to XHR2 object.</description>

hapi-fhir-jpaserver-example/src/main/webapp/WEB-INF/web.xml

@@ -76,7 +76,7 @@
 		<init-param>
 			<description>A comma separated list of allowed headers when making a non simple CORS request.</description>
 			<param-name>cors.allowed.headers</param-name>
-			<param-value>X-FHIR-Starter,Origin,Accept,X-Requested-With,Content-Type,Access-Control-Request-Method,Access-Control-Request-Headers</param-value>
+			<param-value>X-FHIR-Starter,Origin,Accept,X-Requested-With,Content-Type,Access-Control-Request-Method,Access-Control-Request-Headers,Authorization</param-value>
 		</init-param>
 		<init-param>
 			<description>A comma separated list non-standard response headers that will be exposed to XHR2 object.</description>