Index: trunk/ippTools/src/chiptool.c
===================================================================
--- trunk/ippTools/src/chiptool.c	(revision 6667)
+++ trunk/ippTools/src/chiptool.c	(revision 6668)
@@ -149,5 +149,5 @@
 static bool doneMode(pxConfig *config)
 {
-    // get exp_id/class/class_id/url from the CLI // add the completed imfile to
+    // get exp_id/class/class_id/uri from the CLI // add the completed imfile to
     // the p2DoneImfile tables // remove corresponding entries from the
     // p2PendingImfile table // check to see if any p2PendingExps have no
Index: trunk/ippTools/src/chiptoolConfig.c
===================================================================
--- trunk/ippTools/src/chiptoolConfig.c	(revision 6667)
+++ trunk/ippTools/src/chiptoolConfig.c	(revision 6668)
@@ -66,5 +66,5 @@
     psMetadataAddStr(arguments, PS_LIST_TAIL, "-class",  0, "define class", "");
     psMetadataAddStr(arguments, PS_LIST_TAIL, "-class_id",  0, "define class ID", "");
-    psMetadataAddStr(arguments, PS_LIST_TAIL, "-url",  0, "define URL", "");
+    psMetadataAddStr(arguments, PS_LIST_TAIL, "-uri",  0, "define URL", "");
 
     if (config->mode == PX_MODE_NONE) {
@@ -91,5 +91,5 @@
     config->class_id = psMetadataLookupStr(&status, arguments,
         "-class_id");
-    config->url = psMetadataLookupStr(&status, arguments, "-url");
+    config->uri = psMetadataLookupStr(&status, arguments, "-uri");
 
     // XXX why is "" being returned when -[foo] isn't specified?
@@ -103,5 +103,5 @@
     EMPTY_TO_NULL_STRING(config->class);
     EMPTY_TO_NULL_STRING(config->class_id);
-    EMPTY_TO_NULL_STRING(config->url);
+    EMPTY_TO_NULL_STRING(config->uri);
 
     psMetadata *where = psMetadataAlloc();
Index: trunk/ippTools/src/p2insertPendingFrames.c
===================================================================
--- trunk/ippTools/src/p2insertPendingFrames.c	(revision 6667)
+++ trunk/ippTools/src/p2insertPendingFrames.c	(revision 6668)
@@ -57,5 +57,5 @@
                 rawImage->exp_id,
                 rawImage->class_id,
-                rawImage->url,
+                rawImage->uri,
                 "my stats",
                 "my recipe",
Index: trunk/ippTools/src/p2pendingToDone.c
===================================================================
--- trunk/ippTools/src/p2pendingToDone.c	(revision 6667)
+++ trunk/ippTools/src/p2pendingToDone.c	(revision 6668)
@@ -41,5 +41,5 @@
                 pendingImage->exp_id,
                 pendingImage->class_id,
-                pendingImage->url,
+                pendingImage->uri,
                 "my stats", // stats
                 "my recipe", // recipe
@@ -74,5 +74,5 @@
             pendingImfile->exp_id,
             pendingImfile->class_id,
-            pendingImfile->url,
+            pendingImfile->uri,
             "my recipe", // recipe
             "my stats", // stats
Index: trunk/ippTools/src/p2rawToPending.c
===================================================================
--- trunk/ippTools/src/p2rawToPending.c	(revision 6667)
+++ trunk/ippTools/src/p2rawToPending.c	(revision 6668)
@@ -33,5 +33,5 @@
                 rawImage->exp_id,
                 rawImage->class_id,
-                rawImage->url,
+                rawImage->uri,
                 "my stats",      // stats
                 "my recipe",     // recipe
Index: trunk/ippTools/src/pxconfig.c
===================================================================
--- trunk/ippTools/src/pxconfig.c	(revision 6667)
+++ trunk/ippTools/src/pxconfig.c	(revision 6668)
@@ -24,5 +24,5 @@
     config->class           = NULL;
     config->class_id        = NULL;
-    config->url             = NULL;
+    config->uri             = NULL;
     config->where           = NULL;
 
@@ -45,5 +45,5 @@
     psFree(config->class);
     psFree(config->class_id);
-    psFree(config->url);
+    psFree(config->uri);
     psFree(config->where);
 }
Index: trunk/ippTools/src/pxframes.c
===================================================================
--- trunk/ippTools/src/pxframes.c	(revision 6667)
+++ trunk/ippTools/src/pxframes.c	(revision 6668)
@@ -33,4 +33,5 @@
 }
 
+PX_FRAME_ALLOC(pzPendingFrame, pzPendingExp);
 PX_FRAME_ALLOC(newFrame, newExp);
 PX_FRAME_ALLOC(rawDetrendFrame, rawDetrendExp);
@@ -55,5 +56,5 @@
             imfiletype##Row *image = frame->images->data[j]; \
             fprintf (stream, "%s %s %s\n", \
-                image->exp_id, image->class_id, image->url); \
+                image->exp_id, image->class_id, image->uri); \
             psMetadata *md = imfiletype##MetadataFromObject(image); \
             psMetadataAddMetadata(output, PS_LIST_TAIL, #imfiletype,  PS_META_DUPLICATE_OK, NULL, md); \
@@ -69,4 +70,5 @@
 } 
 
+PX_FRAME_PRINT(pzPendingFrame, pzPendingImfile);
 PX_FRAME_PRINT(newFrame, newImfile);
 PX_FRAME_PRINT(rawScienceFrame, rawImfile);
@@ -143,5 +145,5 @@
                 newImfile->exp_id,
                 newImfile->class_id,
-                newImfile->url,
+                newImfile->uri,
                 "my stats"
             )
@@ -202,5 +204,5 @@
                 newImfile->exp_id,
                 newImfile->class_id,
-                newImfile->url,
+                newImfile->uri,
                 "my stats"
             )
Index: trunk/ippTools/src/pxtools.h
===================================================================
--- trunk/ippTools/src/pxtools.h	(revision 6667)
+++ trunk/ippTools/src/pxtools.h	(revision 6668)
@@ -46,7 +46,17 @@
     char *class;
     char *class_id;
-    char *url;
+    char *uri;
     psMetadata *where;
 } pxConfig;
+
+typedef struct {
+    pzPendingExpRow *exposure;
+    psArray *images;
+} pzPendingFrame;
+
+pzPendingFrame *pzPendingExpFrameAlloc(
+    pzPendingExpRow *exposure,
+    psArray *images
+);
 
 typedef struct {