Index: trunk/psModules/src/config/pmConfig.c
===================================================================
--- trunk/psModules/src/config/pmConfig.c	(revision 20639)
+++ trunk/psModules/src/config/pmConfig.c	(revision 21314)
@@ -156,4 +156,7 @@
     // the file structure is used to carry pmFPAfiles
     config->files = psMetadataAlloc ();
+
+    config->sourceId = 0;
+    config->imageId = 0;
     return config;
 }
@@ -917,4 +920,30 @@
             }
 
+            psArgumentRemove(argNum, argc, argv);
+        }
+    }
+
+    argNum = psArgumentGet(*argc, argv, "-image_id");
+    if (argNum > 0) {
+        psArgumentRemove(argNum, argc, argv);
+        if (argNum >= *argc) {
+            psWarning("-image_id command-line switch provided without the required id number");
+        } else {
+            if (!sscanf(argv[argNum], "%" PRId64, &config->imageId)) {
+                psWarning("Failed to parse image_id value %s", argv[argNum]);
+            }
+            psArgumentRemove(argNum, argc, argv);
+        }
+    }
+
+    argNum = psArgumentGet(*argc, argv, "-source_id");
+    if (argNum > 0) {
+        psArgumentRemove(argNum, argc, argv);
+        if (argNum >= *argc) {
+            psWarning("-source_id command-line switch provided without the required id number");
+        } else {
+            if (!sscanf(argv[argNum], "%" PRId64, &config->sourceId)) {
+                psWarning("Failed to parse image_id value %s", argv[argNum]);
+            }
             psArgumentRemove(argNum, argc, argv);
         }