Index: trunk/ippTools/src/pzgetexp.c
===================================================================
--- trunk/ippTools/src/pzgetexp.c	(revision 12093)
+++ trunk/ippTools/src/pzgetexp.c	(revision 14023)
@@ -68,5 +68,5 @@
 {
     PS_ASSERT_PTR_NON_NULL(config, NULL);
-    // find last fileset/exp_id (if we have one)
+    // find last fileset/exp_name (if we have one)
     bool haveLastFileSet = false;
     psString lastFileSet = NULL;
@@ -90,5 +90,5 @@
             haveLastFileSet = true;
             bool status = false;
-            lastFileSet = psStringCopy(psMetadataLookupStr(&status, output->data[0], "exp_id"));
+            lastFileSet = psStringCopy(psMetadataLookupStr(&status, output->data[0], "exp_name"));
             psFree(output);
         }
@@ -142,5 +142,5 @@
     {
         char *query = "CREATE TEMPORARY TABLE incoming" 
-            " (exp_id VARCHAR(64), camera VARCHAR(64), telescope VARCHAR(64), dateobs DATETIME, exp_type VARCHAR(64), uri VARCHAR(255), PRIMARY KEY(exp_id, camera, telescope))"
+            " (exp_name VARCHAR(64), camera VARCHAR(64), telescope VARCHAR(64), dateobs DATETIME, exp_type VARCHAR(64), uri VARCHAR(255), PRIMARY KEY(exp_name, camera, telescope))"
            " ENGINE=MEMORY";
         if (!p_psDBRunQuery(config->dbh, query)) {
@@ -156,5 +156,5 @@
 
     {
-        char *query = "INSERT INTO incoming (exp_id, camera, telescope, dateobs, exp_type, uri) VALUES (?, ?, ?, ?, ?, ?)";
+        char *query = "INSERT INTO incoming (exp_name, camera, telescope, dateobs, exp_type, uri) VALUES (?, ?, ?, ?, ?, ?)";
 
         long inserted = p_psDBRunQueryPrepared(config->dbh, newSummitExps, query);
@@ -188,12 +188,12 @@
             "INSERT INTO pzPendingExp" 
             "   SElECT"
-            "       incoming.exp_id,"
+            "       incoming.exp_name,"
             "       incoming.camera,"
             "       incoming.telescope"
             "   FROM incoming"
             "   LEFT JOIN summitExp"
-            "       USING(exp_id, camera, telescope)"
+            "       USING(exp_name, camera, telescope)"
             "   WHERE"
-            "       summitExp.exp_id is NULL"
+            "       summitExp.exp_name is NULL"
             "       AND summitExp.camera is NULL"
             "       AND summitExp.telescope is NULL";
@@ -218,7 +218,7 @@
             "   FROM incoming"
             "   LEFT JOIN summitExp"
-            "       USING(exp_id, camera, telescope)"
+            "       USING(exp_name, camera, telescope)"
             "   WHERE"
-            "       summitExp.exp_id is NULL"
+            "       summitExp.exp_name is NULL"
             "       AND summitExp.camera is NULL"
             "       AND summitExp.telescope is NULL";
@@ -296,5 +296,5 @@
         psListIterator *tokenCursor = psListIteratorAlloc(tokens, 0, false);
         char *uri       = psListGetAndIncrement(tokenCursor);
-        char *exp_id    = psListGetAndIncrement(tokenCursor); // fileset
+        char *exp_name    = psListGetAndIncrement(tokenCursor); // fileset
         char *dateobsStr= psListGetAndIncrement(tokenCursor); // datetime
         char *exp_type  = psListGetAndIncrement(tokenCursor); // type
@@ -302,6 +302,6 @@
         // create a new metadata to represent this line and it's values
         psMetadata *md = psMetadataAlloc();
-        if (!psMetadataAddStr(md, PS_LIST_TAIL, "exp_id", 0, NULL, exp_id)) {
-            psError(PS_ERR_UNKNOWN, false, "failed to add item exp_id");
+        if (!psMetadataAddStr(md, PS_LIST_TAIL, "exp_name", 0, NULL, exp_name)) {
+            psError(PS_ERR_UNKNOWN, false, "failed to add item exp_name");
             psFree(md);
             psFree(tokenCursor);