go-netdicom: Match the SOP class list for C-{FIND,GET,MOVE} to dcmtk's

Summary: This may solve the problem where some dcm4chee servers bail out on C-GET requests. More auto-generated stringer definitions. Handle the combination of (VR=UN, length=undefined). It's converted to mean (VR=SQ, length=undefined). Reviewers: jbredno Reviewed By: jbredno Differential Revision: https://phabricator.grailbio.com/D7827 fbshipit-source-id: 1490f59
grailbio · Nov 14, 2017 · bb972d5 · bb972d5
1 parent 0d850ab
commit bb972d5
Show file tree

Hide file tree

Showing 12 changed files with 167 additions and 111 deletions.
diff --git a/dimse/dimse.go b/dimse/dimse.go
@@ -1,6 +1,7 @@
 package dimse
 
 //go:generate ./generate_dimse_messages.py
+//go:generate stringer -type StatusCode
 
 // Implements message types defined in P3.7.
 //

diff --git a/dimse/statuscode_string.go b/dimse/statuscode_string.go
diff --git a/pdu/abortreasontype_string.go b/pdu/abortreasontype_string.go
diff --git a/pdu/presentationcontextresult_string.go b/pdu/presentationcontextresult_string.go
diff --git a/pdu/rejectreasontype_string.go b/pdu/rejectreasontype_string.go
diff --git a/pdu/rejectresulttype_string.go b/pdu/rejectresulttype_string.go
diff --git a/pdu/sourcetype_string.go b/pdu/sourcetype_string.go
diff --git a/pdu/type_string.go b/pdu/type_string.go
diff --git a/qrlevel_string.go b/qrlevel_string.go
diff --git a/sampleclient/sampleclient.go b/sampleclient/sampleclient.go
@@ -17,8 +17,10 @@ var (
 	storeFlag         = flag.String("store", "", "If set, issue C-STORE to copy this file to the remote server")
 	aeTitleFlag       = flag.String("ae-title", "testclient", "AE title of the client")
 	remoteAETitleFlag = flag.String("remote-ae-title", "testserver", "AE title of the server")
-	findFlag          = flag.String("find", "", "If nonempty, issue a C-FIND.")
-	getFlag           = flag.String("get", "", "If nonempty, issue a C-GET.")
+	findFlag          = flag.Bool("find", false, "Issue a C-FIND.")
+	getFlag           = flag.Bool("get", false, "Issue a C-GET.")
+	seriesFlag        = flag.String("series", "", "Study series UID to retrieve in C-{FIND,GET}.")
+	studyFlag         = flag.String("study", "", "Study instance UID to retrieve in C-{FIND,GET}.")
 )
 
 func newServiceUser(sopClasses []string) *netdicom.ServiceUser {
@@ -48,46 +50,13 @@ func cStore(inPath string) {
 	vlog.Infof("C-STORE finished successfully")
 }
 
-func cGet1(argStr string) {
-	su := newServiceUser(sopclass.QRGetClasses)
-	defer su.Release()
-	args := []*dicom.Element{
-		dicom.MustNewElement(dicomtag.QueryRetrieveLevel, "SERIES"),
-		dicom.MustNewElement(dicomtag.SeriesInstanceUID, "1.2.840.113681.183783719.1496821562.4928.395"),
+func generateCFindElements() (netdicom.QRLevel, []*dicom.Element) {
+	if *seriesFlag != "" {
+		return netdicom.QRLevelSeries, []*dicom.Element{dicom.MustNewElement(dicomtag.SeriesInstanceUID, *seriesFlag)}
 	}
-	n := 0
-	err := su.CGet(netdicom.QRLevelPatient,
-		args,
-		func(transferSyntaxUID, sopClassUID, sopInstanceUID string, data []byte) dimse.Status {
-			vlog.Infof("%d: C-GET data; transfersyntax=%v, sopclass=%v, sopinstance=%v data %dB",
-				n, transferSyntaxUID, sopClassUID, sopInstanceUID, len(data))
-			n++
-			return dimse.Success
-		})
-	vlog.Infof("C-GET finished: %v", err)
-}
-
-func cGet(argStr string) {
-	su := newServiceUser(sopclass.QRGetClasses)
-	defer su.Release()
-	args := []*dicom.Element{
-		dicom.MustNewElement(dicomtag.StudyInstanceUID, "1.2.840.113681.183783719.1496821562.4928.389"),
+	if *studyFlag != "" {
+		return netdicom.QRLevelStudy, []*dicom.Element{dicom.MustNewElement(dicomtag.StudyInstanceUID, *studyFlag)}
 	}
-	n := 0
-	err := su.CGet(netdicom.QRLevelStudy,
-		args,
-		func(transferSyntaxUID, sopClassUID, sopInstanceUID string, data []byte) dimse.Status {
-			vlog.Infof("%d: C-GET data; transfersyntax=%v, sopclass=%v, sopinstance=%v data %dB",
-				n, transferSyntaxUID, sopClassUID, sopInstanceUID, len(data))
-			n++
-			return dimse.Success
-		})
-	vlog.Infof("C-GET finished: %v", err)
-}
-
-func cFind(argStr string) {
-	su := newServiceUser(sopclass.QRFindClasses)
-	defer su.Release()
 	args := []*dicom.Element{
 		dicom.MustNewElement(dicomtag.SpecificCharacterSet, "ISO_IR 100"),
 		dicom.MustNewElement(dicomtag.AccessionNumber, ""),
@@ -106,7 +75,29 @@ func cFind(argStr string) {
 				dicom.MustNewElement(dicomtag.ScheduledPerformingPhysicianName, ""),
 				dicom.MustNewElement(dicomtag.ScheduledProcedureStepStatus, ""))),
 	}
-	for result := range su.CFind(netdicom.QRLevelStudy, args) {
+	return netdicom.QRLevelPatient, args
+}
+
+func cGet() {
+	su := newServiceUser(sopclass.QRGetClasses)
+	defer su.Release()
+	qrLevel, args := generateCFindElements()
+	n := 0
+	err := su.CGet(qrLevel, args,
+		func(transferSyntaxUID, sopClassUID, sopInstanceUID string, data []byte) dimse.Status {
+			vlog.Infof("%d: C-GET data; transfersyntax=%v, sopclass=%v, sopinstance=%v data %dB",
+				n, transferSyntaxUID, sopClassUID, sopInstanceUID, len(data))
+			n++
+			return dimse.Success
+		})
+	vlog.Infof("C-GET finished: %v", err)
+}
+
+func cFind() {
+	su := newServiceUser(sopclass.QRFindClasses)
+	defer su.Release()
+	qrLevel, args := generateCFindElements()
+	for result := range su.CFind(qrLevel, args) {
 		if result.Err != nil {
 			vlog.Errorf("C-FIND error: %v", result.Err)
 			continue
@@ -124,11 +115,11 @@ func main() {
 
 	if *storeFlag != "" {
 		cStore(*storeFlag)
-	} else if *findFlag != "" {
-		cFind(*findFlag)
-	} else if *getFlag != "" {
-		cGet(*getFlag)
+	} else if *findFlag {
+		cFind()
+	} else if *getFlag {
+		cGet()
 	} else {
-		vlog.Fatal("Either -store or -find must be set")
+		vlog.Fatal("Either -store, -get, or -find must be set")
 	}
 }
diff --git a/serviceuser.go b/serviceuser.go
@@ -2,6 +2,8 @@ package netdicom
 
 // This file implements the ServiceUser (i.e., a DICOM DIMSE client) class.
 
+//go:generate stringer -type QRLevel
+
 import (
 	"fmt"
 	"net"
@@ -251,6 +253,9 @@ const (
 	// QRLevelStudy chooses Study-Root QR model.  P3.4, C.3.2
 	QRLevelStudy
 
+	// QRLevelSeries chooses Study-Root QR model, but using "SERIES" QueryRetrieveLevel.  P3.4, C.3.2
+	QRLevelSeries
+
 	qrOpCFind qrOpType = iota
 	qrOpCGet
 	qrOpCMove
@@ -277,7 +282,7 @@ func encodeQRPayload(opType qrOpType, qrLevel QRLevel, filter []*dicom.Element,
 			sopClassUID = dicomuid.PatientRootQRMove
 		}
 		qrLevelString = "PATIENT"
-	case QRLevelStudy:
+	case QRLevelStudy, QRLevelSeries:
 		switch opType {
 		case qrOpCFind:
 			sopClassUID = dicomuid.StudyRootQRFind
@@ -287,6 +292,9 @@ func encodeQRPayload(opType qrOpType, qrLevel QRLevel, filter []*dicom.Element,
 			sopClassUID = dicomuid.StudyRootQRMove
 		}
 		qrLevelString = "STUDY"
+		if qrLevel == QRLevelSeries {
+			qrLevelString = "SERIES"
+		}
 	default:
 		return contextManagerEntry{}, nil, fmt.Errorf("Invalid C-FIND QR lever: %d", qrLevel)
 	}
@@ -450,8 +458,9 @@ func (su *ServiceUser) CGet(qrLevel QRLevel, filter []*dicom.Element,
 		}
 		if resp.Status.Status != dimse.StatusPending {
 			if resp.Status.Status != 0 {
-				// TODO: report error if status!= 0
-				panic(resp)
+				e := fmt.Errorf("Received C-GET error: %+v", resp)
+				vlog.Error(e)
+				return e
 			}
 			break
 		}