Add --directory-only to dicomfind, dicompull

This option allows these tools to explicitly limit the search to
whatever metadata is present in the DICOMDIR (or sqlite) file.
Ideally, the default behavior (only go to files for metadata not
present in the DICOMDIR) would be adequate, but vtkDICOMDirectory
seems to have a bug that causes it to scan the files unnecessarily,
and I haven't yet tracked down that bug.

Author: dgobbi

Programs/dicomfind.cxx

@@ -78,6 +78,7 @@ void dicomfind_usage(FILE *file, const char *cp)
     "  -exec ... %s      Execute the given command for every file matched.\n"
     "  -execdir ... +    Go to directory and execute command on every series.\n"
     "  -execdir ... %s   Go to directory and execute command on every file.\n"
+    "  --directory-only  Do not scan files themselves if DICOMDIR is present.\n"
     "  --ignore-dicomdir Ignore the DICOMDIR file even if it is present.\n"
     "  --charset <cs>    Charset to use if SpecificCharacterSet is missing.\n"
     "  --help            Print a brief help message.\n"
@@ -569,6 +570,7 @@ int MAINMACRO(int argc, char *argv[])
   QueryTagList qtlist;
   vtkDICOMItem query;
   bool followSymlinks = true;
+  bool onlyDicomdir = false;
   bool ignoreDicomdir = false;
   bool requirePixelData = false;
   bool findSeries = false;
@@ -714,6 +716,10 @@ int MAINMACRO(int argc, char *argv[])
       }
       argi = argj;
     }
+    else if (strcmp(arg, "--directory-only") == 0)
+    {
+      onlyDicomdir = true;
+    }
     else if (strcmp(arg, "--ignore-dicomdir") == 0)
     {
       ignoreDicomdir = true;
@@ -767,6 +773,10 @@ int MAINMACRO(int argc, char *argv[])
     finder->SetScanDepth(scandepth);
     finder->SetFindQuery(query);
     finder->SetIgnoreDicomdir(ignoreDicomdir);
+    if (onlyDicomdir)
+    {
+      finder->SetQueryFilesToNever();
+    }
     finder->SetFollowSymlinks(followSymlinks);
     finder->SetRequirePixelData(requirePixelData);
     finder->SetFindLevel(

Programs/dicompull.cxx

@@ -67,6 +67,7 @@ void dicompull_usage(FILE *file, const char *cp)
     "  -name pattern     Set file names to match (with \"*\" or \"?\").\n"
     "  -image            Restrict the search to files with PixelData.\n"
     "  -series           Find all files in series if even one file matches.\n"
+    "  --directory-only  Do not scan files for search if DICOMDIR is present.\n"
     "  --ignore-dicomdir Ignore the DICOMDIR file even if it is present.\n"
     "  --charset <cs>    Charset to use if SpecificCharacterSet is missing.\n"
     "  --silent          Do not report any progress information.\n"
@@ -307,6 +308,7 @@ int MAINMACRO(int argc, char *argv[])
   vtkDICOMItem query;
   bool requirePixelData = false;
   bool findSeries = false;
+  bool onlyDicomdir = false;
   bool ignoreDicomdir = false;
   vtkDICOMCharacterSet charset;
   bool silent = false;
@@ -433,6 +435,10 @@ int MAINMACRO(int argc, char *argv[])
     {
       findSeries = true;
     }
+    else if (strcmp(arg, "--directory-only") == 0)
+    {
+      onlyDicomdir = true;
+    }
     else if (strcmp(arg, "--ignore-dicomdir") == 0)
     {
       ignoreDicomdir = true;
@@ -551,6 +557,10 @@ int MAINMACRO(int argc, char *argv[])
     finder->SetScanDepth(scandepth);
     finder->SetFindQuery(query);
     finder->SetIgnoreDicomdir(ignoreDicomdir);
+    if (onlyDicomdir)
+    {
+      finder->SetQueryFilesToNever();
+    }
     finder->SetFollowSymlinks(followSymlinks);
     finder->SetRequirePixelData(requirePixelData);
     finder->SetFindLevel(